Index: filter/source/pdf/impdialog.cxx
===================================================================
RCS file: /cvs/framework/filter/source/pdf/impdialog.cxx,v
retrieving revision 1.14.20.4
diff -u -p -u -r1.14.20.4 impdialog.cxx
--- filter/source/pdf/impdialog.cxx 13 Mar 2006 11:41:03 -0000 1.14.20.4
+++ filter/source/pdf/impdialog.cxx 15 Mar 2006 22:48:27 -0000
@@ -81,10 +81,12 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window
maFlPages( this, ResId( 1 ) ),
maConfigItem( String( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/PDF/Export/" ) ), &rFilterData ),
+ maConfigI18N( String( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/I18N/CTL/" ) ) ),
mbIsPresentation( sal_False ),
mbIsWriter( sal_False ),
mbSelectionPresent( sal_False ),
+ mbUseCTLFont( sal_False ),
mbUseLosslessCompression( sal_True ),
mnQuality( 90 ),
mbReduceImageResolution( sal_False ),
@@ -167,6 +169,9 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window
{
}
+//get the CTL (Complex Text Layout) from general options, returns TRUE if we have a CTL font on our hands.
+ mbUseCTLFont = maConfigI18N.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "CTLFont" ) ), sal_False );
+
mbUseLosslessCompression = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseLosslessCompression" ) ), sal_False );
mnQuality = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), 90 );
mbReduceImageResolution = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ReduceImageResolution" ) ), sal_False );
@@ -495,7 +500,8 @@ ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage
maRbPgLySinglePage( this, ResId( RB_PGLY_SINGPG, paResMgr ) ),
maRbPgLyContinue( this, ResId( RB_PGLY_CONT, paResMgr ) ),
maRbPgLyContinueFacing( this, ResId( RB_PGLY_CONTFAC, paResMgr ) ),
- maCbPgLyFirstOnLeft( this, ResId( CB_PGLY_FIRSTLEFT, paResMgr ) )
+ maCbPgLyFirstOnLeft( this, ResId( CB_PGLY_FIRSTLEFT, paResMgr ) ),
+ mbUseCTLFont( sal_False )
{
mpaResMgr = paResMgr;
FreeResource();
@@ -542,12 +548,13 @@ void ImpPDFTabOpnFtrPage::GetFilterConfi
else if( maRbPgLyContinueFacing.IsChecked() )
paParent->mnPageLayout = 3;
- paParent->mbFirstPageLeft = maCbPgLyFirstOnLeft.IsChecked();
+ paParent->mbFirstPageLeft = ( mbUseCTLFont ) ? maCbPgLyFirstOnLeft.IsChecked() : sal_False;
}
// -----------------------------------------------------------------------------
void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent )
{
+ mbUseCTLFont = paParent->mbUseCTLFont;
switch( paParent->mnPageLayout )
{
default:
@@ -596,9 +603,14 @@ void ImpPDFTabOpnFtrPage::SetFilterConfi
break;
};
- maRbPgLyContinueFacing.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl ) );
- maCbPgLyFirstOnLeft.Check( paParent->mbFirstPageLeft );
- ToggleRbPgLyContinueFacingHdl( NULL );
+ if( !mbUseCTLFont )
+ maCbPgLyFirstOnLeft.Hide( );
+ else
+ {
+ maRbPgLyContinueFacing.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl ) );
+ maCbPgLyFirstOnLeft.Check( paParent->mbFirstPageLeft );
+ ToggleRbPgLyContinueFacingHdl( NULL );
+ }
}
IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, void*, p )
Index: filter/source/pdf/impdialog.hxx
===================================================================
RCS file: /cvs/framework/filter/source/pdf/impdialog.hxx,v
retrieving revision 1.12.20.4
diff -u -p -u -r1.12.20.4 impdialog.hxx
--- filter/source/pdf/impdialog.hxx 13 Mar 2006 11:41:04 -0000 1.12.20.4
+++ filter/source/pdf/impdialog.hxx 15 Mar 2006 22:48:27 -0000
@@ -72,6 +72,7 @@ private:
FixedLine maFlPages; //ugly hack: It seems the dialog is not resizable in any way
FilterConfigItem maConfigItem;
+ FilterConfigItem maConfigI18N;
Any maSelection;
@@ -82,6 +83,7 @@ protected:
sal_Bool mbIsPresentation;
sal_Bool mbIsWriter;
sal_Bool mbSelectionPresent;
+ sal_Bool mbUseCTLFont;
sal_Bool mbUseLosslessCompression;
sal_Int32 mnQuality;
sal_Bool mbReduceImageResolution;
@@ -198,6 +200,7 @@ class ImpPDFTabOpnFtrPage : public SfxTa
RadioButton maRbPgLyContinueFacing;
CheckBox maCbPgLyFirstOnLeft;
+ sal_Bool mbUseCTLFont;
ResMgr* mpaResMgr;
DECL_LINK( ToggleRbPgLyContinueFacingHdl, void* );
Index: filter/source/pdf/impdialog.src
===================================================================
RCS file: /cvs/framework/filter/source/pdf/impdialog.src,v
retrieving revision 1.26.20.4
diff -u -p -u -r1.26.20.4 impdialog.src
--- filter/source/pdf/impdialog.src 13 Mar 2006 11:41:04 -0000 1.26.20.4
+++ filter/source/pdf/impdialog.src 15 Mar 2006 22:48:27 -0000
@@ -348,7 +348,7 @@ TabPage RID_PDF_TAB_OPNFTR
TabPage RID_PDF_TAB_VPREFER
{
HelpId = 0 ;
- Text[ de ] = "Benutzungsschnittstelle" ;
+ Text[ de ] = "Benutzeroberfläche" ;
Text[ en-US ] = "User Interface" ;
TAB_PDF_SIZE;
@@ -398,7 +398,7 @@ TabPage RID_PDF_TAB_VPREFER
{
Pos = MAP_APPFONT ( 6 , 64 ) ;
Size = MAP_APPFONT (162 , 8 ) ;
- Text[ de ] = "Benutzungsoberflächenoptionen" ;
+ Text[ de ] = "Benutzeroberflächenoptionen" ;
Text[ en-US ] = "User interface options" ;
};
CheckBox CB_UOP_HIDEVMENUBAR
Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs
===================================================================
RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
retrieving revision 1.112.6.3
diff -u -p -u -r1.112.6.3 Common.xcs
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs 13 Mar 2006 11:39:36 -0000 1.112.6.3
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 15 Mar 2006 22:48:28 -0000
@@ -4784,7 +4784,7 @@ Dymamic border coloring means that when
- If the property ReduceImageResolution is set to true all images will be reduced to the given value. in DPI.
+ If the property ReduceImageResolution is set to true all images will be reduced to the given value in DPI.
@@ -4827,7 +4827,7 @@ Dymamic border coloring means that when
SJ
Specifies if notes are exported to PDF.
- true
+ false
Index: vcl/source/gdi/pdfwriter_impl.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/pdfwriter_impl.cxx,v
retrieving revision 1.86.60.2
diff -u -p -u -r1.86.60.2 pdfwriter_impl.cxx
--- vcl/source/gdi/pdfwriter_impl.cxx 13 Mar 2006 11:40:29 -0000 1.86.60.2
+++ vcl/source/gdi/pdfwriter_impl.cxx 15 Mar 2006 22:48:31 -0000
@@ -4379,23 +4379,23 @@ bool PDFWriterImpl::emitCatalog()
switch( m_aContext.PDFDocumentAction )
{
- case PDFWriter::ActionDefault :
+ case PDFWriter::ActionDefault : //do nothing, this is the Acrobat default
default:
- aLine.append( "/OpenAction [0 /XYZ null null null" ); //page 0 (first) open Default, leave without it
break;
case PDFWriter::FitInWindow :
- aLine.append( "/OpenAction [0 /Fit" ); //Open fit page
+ aLine.append( "/OpenAction[0 /Fit]\n" ); //Open fit page
break;
case PDFWriter::FitWidth :
- aLine.append( "/OpenAction [0 /FitH " );
+ aLine.append( "/OpenAction[0 /FitH " );
aLine.append( m_nInheritedPageHeight );//Open fit width
+ aLine.append( "]\n" );
break;
case PDFWriter::FitVisible :
- aLine.append( "/OpenAction [0 /FitBH " );
+ aLine.append( "/OpenAction[0 /FitBH " );
aLine.append( m_nInheritedPageHeight );//Open fit visible
+ aLine.append( "]\n" );
break;
}
- aLine.append( "]\n" );
// viewer preferences, if we had some, then emit
if( m_aContext.HideViewerToolbar ||
( m_aContext.Version > PDFWriter::PDF_1_3 && m_aDocInfo.Title.Len() && m_aContext.DisplayPDFDocumentTitle ) ||