Index: filter/source/pdf/impdialog.cxx
===================================================================
RCS file: /cvs/framework/filter/source/pdf/impdialog.cxx,v
retrieving revision 1.14.20.3
diff -u -p -u -r1.14.20.3 impdialog.cxx
--- filter/source/pdf/impdialog.cxx 10 Mar 2006 11:11:02 -0000 1.14.20.3
+++ filter/source/pdf/impdialog.cxx 12 Mar 2006 16:49:01 -0000
@@ -102,10 +102,10 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window
mbCenterWindow( sal_False ),
mbOpenInFullScreenMode( sal_False ),
mbDisplayPDFDocumentTitle( sal_False ),
- mbDirectionR2L( sal_False ),
mnMagnification( 0 ),
mnInitialView( 0 ),
mnPageLayout( 0 ),
+ mbFirstPageLeft( sal_False ),
mbIsRangeChecked( sal_False ),
msPageRange( ' ' ),
@@ -192,12 +192,12 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window
mbResizeWinToInit = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ResizeWindowToInitialPage" ) ), sal_False );
mbCenterWindow = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "CenterWindow" ) ), sal_False );
mbOpenInFullScreenMode = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenInFullScreenMode" ) ), sal_False );
- mbDisplayPDFDocumentTitle = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "DisplayPDFDocumentTitle" ) ), sal_False );
- mbDirectionR2L = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "DirectionR2L" ) ), sal_False );
+ mbDisplayPDFDocumentTitle = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "DisplayPDFDocumentTitle" ) ), sal_True );
mnInitialView = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "InitialView" ) ), 0 );
mnMagnification = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Magnification" ) ), 0 );
mnPageLayout = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageLayout" ) ), 0 );
+ mbFirstPageLeft = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPageOnLeft" ) ), sal_False );
//queue the tab pages for later creation (created when first shown)
AddTabPage( RID_PDF_TAB_VPREFER, ImpPDFTabViewerPage::Create, 0 );
@@ -291,11 +291,11 @@ Sequence< PropertyValue > ImpPDFTabDialo
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ResizeWindowToInitialPage" ) ), mbResizeWinToInit );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "CenterWindow" ) ), mbCenterWindow );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "DisplayPDFDocumentTitle" ) ), mbDisplayPDFDocumentTitle );
- maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "DirectionR2L" ) ), mbDirectionR2L );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenInFullScreenMode" ) ), mbOpenInFullScreenMode );
maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "InitialView" ) ), mnInitialView );
maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Magnification" ) ), mnMagnification);
maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageLayout" ) ), mnPageLayout );
+ maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPageOnLeft" ) ), mbFirstPageLeft );
Sequence< PropertyValue > aRet( maConfigItem.GetFilterData() );
@@ -494,7 +494,8 @@ ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage
maRbPgLyDefault( this, ResId( RB_PGLY_DEFAULT, paResMgr ) ),
maRbPgLySinglePage( this, ResId( RB_PGLY_SINGPG, paResMgr ) ),
maRbPgLyContinue( this, ResId( RB_PGLY_CONT, paResMgr ) ),
- maRbPgLyContinueFacing( this, ResId( RB_PGLY_CONTFAC, paResMgr ) )
+ maRbPgLyContinueFacing( this, ResId( RB_PGLY_CONTFAC, paResMgr ) ),
+ maCbPgLyFirstOnLeft( this, ResId( CB_PGLY_FIRSTLEFT, paResMgr ) )
{
mpaResMgr = paResMgr;
FreeResource();
@@ -541,6 +542,7 @@ void ImpPDFTabOpnFtrPage::GetFilterConfi
else if( maRbPgLyContinueFacing.IsChecked() )
paParent->mnPageLayout = 3;
+ paParent->mbFirstPageLeft = maCbPgLyFirstOnLeft.IsChecked();
}
// -----------------------------------------------------------------------------
@@ -593,6 +595,16 @@ void ImpPDFTabOpnFtrPage::SetFilterConfi
maRbMagnFitVisible.Check();
break;
};
+
+ maRbPgLyContinueFacing.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl ) );
+ maCbPgLyFirstOnLeft.Check( paParent->mbFirstPageLeft );
+ ToggleRbPgLyContinueFacingHdl( NULL );
+}
+
+IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, void*, p )
+{
+ maCbPgLyFirstOnLeft.Enable( maRbPgLyContinueFacing.IsChecked() );
+ return 0;
}
////////////////////////////////////////////////////////
@@ -612,11 +624,7 @@ ImpPDFTabViewerPage::ImpPDFTabViewerPage
maFlUIOptions( this, ResId( FL_USRIFOPT, paResMgr ) ),
maCbHideViewerMenubar( this, ResId( CB_UOP_HIDEVMENUBAR, paResMgr ) ),
maCbHideViewerToolbar( this, ResId( CB_UOP_HIDEVTOOLBAR, paResMgr ) ),
- maCbHideViewerWindowControls( this, ResId( CB_UOP_HIDEVWINCTRL, paResMgr ) ),
-
- maFlDirContrl( this, ResId( FL_DIRCONTR, paResMgr ) ),
- maRbL2R( this, ResId( RB_LEFTRIGHT, paResMgr ) ),
- maRbR2L( this, ResId( RB_RIGHTLEFT, paResMgr ) )
+ maCbHideViewerWindowControls( this, ResId( CB_UOP_HIDEVWINCTRL, paResMgr ) )
{
mpaResMgr = paResMgr;
FreeResource();
@@ -648,7 +656,6 @@ void ImpPDFTabViewerPage::GetFilterConfi
paParent->mbOpenInFullScreenMode = maCbOpenFullScreen.IsChecked();
paParent->mbCenterWindow = maCbCenterWindow.IsChecked();
paParent->mbDisplayPDFDocumentTitle = maCbDispDocTitle.IsChecked();
- paParent->mbDirectionR2L = maRbR2L.IsChecked();
}
// -----------------------------------------------------------------------------
@@ -662,8 +669,5 @@ void ImpPDFTabViewerPage::SetFilterConfi
maCbOpenFullScreen.Check( paParent->mbOpenInFullScreenMode );
maCbCenterWindow.Check( paParent->mbCenterWindow );
maCbDispDocTitle.Check( paParent->mbDisplayPDFDocumentTitle );
-
- maRbR2L.Check( paParent->mbDirectionR2L );
- maRbL2R.Check( !paParent->mbDirectionR2L );
}
Index: filter/source/pdf/impdialog.hrc
===================================================================
RCS file: /cvs/framework/filter/source/pdf/impdialog.hrc,v
retrieving revision 1.8.20.1
diff -u -p -u -r1.8.20.1 impdialog.hrc
--- filter/source/pdf/impdialog.hrc 9 Mar 2006 09:50:11 -0000 1.8.20.1
+++ filter/source/pdf/impdialog.hrc 12 Mar 2006 16:49:01 -0000
@@ -97,6 +97,7 @@
#define RB_PGLY_SINGPG 91
#define RB_PGLY_CONT 92
#define RB_PGLY_CONTFAC 93
+#define CB_PGLY_FIRSTLEFT 94
//controls for viewer preferences tab page
#define FL_WINOPT 100
@@ -109,7 +110,3 @@
#define CB_UOP_HIDEVMENUBAR 106
#define CB_UOP_HIDEVTOOLBAR 107
#define CB_UOP_HIDEVWINCTRL 108
-
-#define FL_DIRCONTR 109
-#define RB_LEFTRIGHT 110
-#define RB_RIGHTLEFT 111
Index: filter/source/pdf/impdialog.hxx
===================================================================
RCS file: /cvs/framework/filter/source/pdf/impdialog.hxx,v
retrieving revision 1.12.20.3
diff -u -p -u -r1.12.20.3 impdialog.hxx
--- filter/source/pdf/impdialog.hxx 10 Mar 2006 11:11:03 -0000 1.12.20.3
+++ filter/source/pdf/impdialog.hxx 12 Mar 2006 16:49:01 -0000
@@ -99,11 +99,11 @@ protected:
sal_Bool mbCenterWindow;
sal_Bool mbOpenInFullScreenMode;
sal_Bool mbDisplayPDFDocumentTitle;
- sal_Bool mbDirectionR2L;
sal_Int32 mnMagnification;
sal_Int32 mnInitialView;
sal_Int32 mnPageLayout;
+ sal_Bool mbFirstPageLeft;
sal_Bool mbIsRangeChecked;
String msPageRange;
@@ -196,9 +196,12 @@ class ImpPDFTabOpnFtrPage : public SfxTa
RadioButton maRbPgLySinglePage;
RadioButton maRbPgLyContinue;
RadioButton maRbPgLyContinueFacing;
+ CheckBox maCbPgLyFirstOnLeft;
ResMgr* mpaResMgr;
+ DECL_LINK( ToggleRbPgLyContinueFacingHdl, void* );
+
public:
ImpPDFTabOpnFtrPage( Window* pParent,
const SfxItemSet& rSet,
@@ -226,10 +229,6 @@ class ImpPDFTabViewerPage : public SfxTa
CheckBox maCbHideViewerToolbar;
CheckBox maCbHideViewerWindowControls;
- FixedLine maFlDirContrl;
- RadioButton maRbL2R;
- RadioButton maRbR2L;
-
ResMgr* mpaResMgr;
public:
Index: filter/source/pdf/impdialog.src
===================================================================
RCS file: /cvs/framework/filter/source/pdf/impdialog.src,v
retrieving revision 1.26.20.3
diff -u -p -u -r1.26.20.3 impdialog.src
--- filter/source/pdf/impdialog.src 10 Mar 2006 09:43:49 -0000 1.26.20.3
+++ filter/source/pdf/impdialog.src 12 Mar 2006 16:49:01 -0000
@@ -222,8 +222,8 @@ TabPage RID_PDF_TAB_GENER
TabPage RID_PDF_TAB_OPNFTR
{
HelpId = 0 ;
- Text[ de ] = "Document Open Options" ;
- Text[ en-US ] = "Document Open Options" ;
+ Text[ de ] = "Anfangsdarstellung" ;
+ Text[ en-US ] = "Initial View" ;
TAB_PDF_SIZE;
////////////////////////////////////////
@@ -231,28 +231,28 @@ TabPage RID_PDF_TAB_OPNFTR
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 162 , 8 ) ;
- Text[ de ] = "Initial view" ;
- Text[ en-US ] = "Initial view" ;
+ Text[ de ] = "Bereiche" ;
+ Text[ en-US ] = "Panes" ;
};
RadioButton RB_OPNMODE_PAGEONLY
{
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "~Page only" ;
+ Text[ de ] = "Nur Seite" ;
Text[ en-US ] = "~Page only" ;
};
RadioButton RB_OPNMODE_OUTLINE
{
Pos = MAP_APPFONT ( 12 , 26 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "~Bookmarks and page" ;
+ Text[ de ] = "Lesezeichen-Fenster und Seite" ;
Text[ en-US ] = "~Bookmarks and page" ;
};
RadioButton RB_OPNMODE_THUMBS
{
Pos = MAP_APPFONT ( 12 , 38 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "~Thumbnails and page" ;
+ Text[ de ] = "Seiten-Fenster und Seite" ;
Text[ en-US ] = "~Thumbnails and page" ;
};
@@ -261,7 +261,7 @@ TabPage RID_PDF_TAB_OPNFTR
{
Pos = MAP_APPFONT ( 6 , 52 ) ;
Size = MAP_APPFONT ( 162 , 8 ) ;
- Text[ de ] = "Magnification" ;
+ Text[ de ] = "Vergrößerung" ;
Text[ en-US ] = "Magnification" ;
};
RadioButton RB_MAGNF_DEFAULT
@@ -269,7 +269,7 @@ TabPage RID_PDF_TAB_OPNFTR
// see PDF ref v 1.5 tab 8.2, pg. 542 ( /XYZ )
Pos = MAP_APPFONT ( 12 , 64 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "~Default" ;
+ Text[ de ] = "Standard" ;
Text[ en-US ] = "~Default" ;
};
RadioButton RB_MAGNF_WIND
@@ -277,7 +277,7 @@ TabPage RID_PDF_TAB_OPNFTR
// see PDF ref v 1.5 tab 8.2, pg. 542 ( /Fit )
Pos = MAP_APPFONT ( 12 , 76 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "~Fit in window" ;
+ Text[ de ] = "Fenstergröße" ;
Text[ en-US ] = "~Fit in window" ;
};
RadioButton RB_MAGNF_WIDTH
@@ -285,7 +285,7 @@ TabPage RID_PDF_TAB_OPNFTR
// see PDF ref v 1.5 tab 8.2, pg. 542 ( /FitH top )
Pos = MAP_APPFONT ( 12 , 88 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "Fit ~width" ;
+ Text[ de ] = "Fensterbreite" ;
Text[ en-US ] = "Fit ~width" ;
};
RadioButton RB_MAGNF_VISIBLE
@@ -293,7 +293,7 @@ TabPage RID_PDF_TAB_OPNFTR
// see PDF ref v 1.5 tab 8.2, pg. 542 ( /FitBH top )
Pos = MAP_APPFONT ( 12 , 100 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "First ~visible" ;
+ Text[ de ] = "Seitenbreite" ;
Text[ en-US ] = "Fit ~visible" ;
Text [ x-comment ] = " ";
};
@@ -303,38 +303,44 @@ TabPage RID_PDF_TAB_OPNFTR
{
Pos = MAP_APPFONT ( 6 , 114 ) ;
Size = MAP_APPFONT (162 , 8 ) ;
- Text[ de ] = "Page layout" ;
+ Text[ de ] = "Seitenlayout" ;
Text[ en-US ] = "Page layout" ;
};
RadioButton RB_PGLY_DEFAULT
{
Pos = MAP_APPFONT ( 12 , 126 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "D~efault" ;
+ Text[ de ] = "Standard" ;
Text[ en-US ] = "D~efault" ;
};
RadioButton RB_PGLY_SINGPG
{
Pos = MAP_APPFONT ( 12 , 138 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "~Single page" ;
+ Text[ de ] = "Einzelne Seite" ;
Text[ en-US ] = "~Single page" ;
};
RadioButton RB_PGLY_CONT
{
Pos = MAP_APPFONT ( 12 , 150 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "~Continuous" ;
+ Text[ de ] = "Fortlaufend" ;
Text[ en-US ] = "~Continuous" ;
};
-
RadioButton RB_PGLY_CONTFAC
{
Pos = MAP_APPFONT ( 12 , 162 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "C~ontinuous facing" ;
+ Text[ de ] = "Fortlaufend - Doppelseiten" ;
Text[ en-US ] = "C~ontinuous facing" ;
};
+ CheckBox CB_PGLY_FIRSTLEFT
+ {
+ Pos = MAP_APPFONT ( 22 , 174 ) ;
+ Size = MAP_APPFONT ( 145 , 10 ) ;
+ Text[ de ] = "Erste Seite ist links" ;
+ Text[ en-US ] = "First page is ~left" ;
+ };
};
//----------------------------------------------------------
@@ -342,8 +348,8 @@ TabPage RID_PDF_TAB_OPNFTR
TabPage RID_PDF_TAB_VPREFER
{
HelpId = 0 ;
- Text[ de ] = "Viewer Options" ;
- Text[ en-US ] = "Viewer Options" ;
+ Text[ de ] = "Benutzungsschnittstelle" ;
+ Text[ en-US ] = "User Interface" ;
TAB_PDF_SIZE;
//////////////////////////////////////
@@ -351,7 +357,7 @@ TabPage RID_PDF_TAB_VPREFER
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT (162 , 8 ) ;
- Text[ de ] = "Window options" ;
+ Text[ de ] = "Fensteroptionen" ;
Text[ en-US ] = "Window options" ;
};
@@ -360,22 +366,22 @@ TabPage RID_PDF_TAB_VPREFER
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
TabStop = TRUE ;
- Text[ de ] = "~Resize window to initial page" ;
+ Text[ de ] = "Fenster an erste Seite anpassen" ;
Text[ en-US ] = "~Resize window to initial page";
};
- CheckBox CB_WNDOPT_CNTRWIN //was CB_CENTWINDOW
+ CheckBox CB_WNDOPT_CNTRWIN
{
Pos = MAP_APPFONT ( 12 , 26 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
TabStop = TRUE ;
- Text[ de ] = "~Center window on screen" ;
+ Text[ de ] = "Fenster auf Bildschirm zentrieren" ;
Text[ en-US ] = "~Center window on screen";
};
- CheckBox CB_WNDOPT_OPNFULL // was RB_OPNMODE_FULL
+ CheckBox CB_WNDOPT_OPNFULL
{
Pos = MAP_APPFONT ( 12 , 38 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "~Open in full screen mode" ;
+ Text[ de ] = "Im Vollbildmodus öffnen" ;
Text[ en-US ] = "~Open in full screen mode" ;
};
CheckBox CB_DISPDOCTITLE
@@ -383,7 +389,7 @@ TabPage RID_PDF_TAB_VPREFER
Pos = MAP_APPFONT ( 12 , 50 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
TabStop = TRUE ;
- Text[ de ] = "~Display document title" ;
+ Text[ de ] = "Dokumenttitel anzeigen" ;
Text[ en-US ] = "~Display document title";
};
@@ -392,7 +398,7 @@ TabPage RID_PDF_TAB_VPREFER
{
Pos = MAP_APPFONT ( 6 , 64 ) ;
Size = MAP_APPFONT (162 , 8 ) ;
- Text[ de ] = "User interface options" ;
+ Text[ de ] = "Benutzungsoberflächenoptionen" ;
Text[ en-US ] = "User interface options" ;
};
CheckBox CB_UOP_HIDEVMENUBAR
@@ -400,7 +406,7 @@ TabPage RID_PDF_TAB_VPREFER
Pos = MAP_APPFONT ( 12 , 76 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
TabStop = TRUE ;
- Text[ de ] = "Hide ~menubar" ;
+ Text[ de ] = "Menüleiste ausblenden" ;
Text[ en-US ] = "Hide ~menubar";
};
CheckBox CB_UOP_HIDEVTOOLBAR
@@ -408,7 +414,7 @@ TabPage RID_PDF_TAB_VPREFER
Pos = MAP_APPFONT ( 12 , 88 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
TabStop = TRUE ;
- Text[ de ] = "Hide ~toolbar" ;
+ Text[ de ] = "Werkzeugleisten ausblenden" ;
Text[ en-US ] = "Hide ~toolbar";
};
CheckBox CB_UOP_HIDEVWINCTRL
@@ -416,32 +422,9 @@ TabPage RID_PDF_TAB_VPREFER
Pos = MAP_APPFONT ( 12 , 100 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
TabStop = TRUE ;
- Text[ de ] = "Hide ~window controls" ;
+ Text[ de ] = "Fenstersteuerelemente ausblenden" ;
Text[ en-US ] = "Hide ~window controls";
};
-
-///////////////////////////
- FixedLine FL_DIRCONTR
- {
- Pos = MAP_APPFONT ( 6 , 114 ) ;
- Size = MAP_APPFONT ( 162 , 8 ) ;
- Text[ de ] = "Main reading order for text" ;
- Text[ en-US ] = "Main reading order for text" ;
- };
- RadioButton RB_LEFTRIGHT
- {
- Pos = MAP_APPFONT ( 12 , 126 ) ;
- Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "~Left to right" ;
- Text[ en-US ] = "~Left to right" ;
- };
- RadioButton RB_RIGHTLEFT
- {
- Pos = MAP_APPFONT ( 12 , 138 ) ;
- Size = MAP_APPFONT ( 155 , 10 ) ;
- Text[ de ] = "R~ight to left" ;
- Text[ en-US ] = "R~ight to left" ;
- };
};
//----------------------------------------------------------
@@ -467,14 +450,14 @@ TabDialog RID_PDF_EXPORT_DLG
PageItem
{
Identifier = RID_PDF_TAB_OPNFTR;
- Text [ de ] = "Document Open Options";
- Text [ en-US ] = "Document Open Options";
+ Text [ de ] = "Anfangsdarstellung";
+ Text [ en-US ] = "Initial View";
};
PageItem
{
Identifier = RID_PDF_TAB_VPREFER;
- Text [ de ] = "Viewer Options";
- Text [ en-US ] = "Viewer Options";
+ Text [ de ] = "Benutzungsschnittstelle";
+ Text [ en-US ] = "User Interface";
};
};
};
Index: filter/source/pdf/pdfexport.cxx
===================================================================
RCS file: /cvs/framework/filter/source/pdf/pdfexport.cxx,v
retrieving revision 1.44.46.1
diff -u -p -u -r1.44.46.1 pdfexport.cxx
--- filter/source/pdf/pdfexport.cxx 9 Mar 2006 09:50:11 -0000 1.44.46.1
+++ filter/source/pdf/pdfexport.cxx 12 Mar 2006 16:49:01 -0000
@@ -324,14 +324,14 @@ sal_Bool PDFExport::Export( const OUStri
rFilterData[ nData ].Value >>= aContext.OpenInFullScreenMode;
else if ( rFilterData[ nData ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "DisplayPDFDocumentTitle" ) ) )
rFilterData[ nData ].Value >>= aContext.DisplayPDFDocumentTitle;
- else if ( rFilterData[ nData ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "DirectionR2L" ) ) )
- rFilterData[ nData ].Value >>= aContext.DirectionR2L;
else if ( rFilterData[ nData ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "InitialView" ) ) )
rFilterData[ nData ].Value >>= nPDFDocumentMode;
else if ( rFilterData[ nData ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "Magnification" ) ) )
rFilterData[ nData ].Value >>= nPDFDocumentAction;
else if ( rFilterData[ nData ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "PageLayout" ) ) )
rFilterData[ nData ].Value >>= nPDFPageLayout;
+ else if ( rFilterData[ nData ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPageOnLeft" ) ) )
+ rFilterData[ nData ].Value >>= aContext.FirstPageLeft;
}
aContext.URL = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI);
aContext.Version = PDFWriter::PDF_1_4;
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.2
diff -u -p -u -r1.112.6.2 Common.xcs
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs 10 Mar 2006 09:44:05 -0000 1.112.6.2
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 12 Mar 2006 16:49:03 -0000
@@ -4925,14 +4925,7 @@ Dymamic border coloring means that when
beppec56
Specifies that the title of the document, if present in the document properties, is displayed in the PDF viewer window title bar.
- false
-
-
-
- beppec56
- Specifie the
-
- false
+ true
@@ -5010,12 +5003,19 @@ Dymamic border coloring means that when
- Display the pages in two columns odd pages on the left, to have the odd pages on the right the DirectionR2L properties should be used as well.
+ Display the pages in two columns odd pages on the right, to have the odd pages on the left the FirstPageOnLeft property should be used as well.
0
+
+
+ beppec56
+ Used with the value 3 of the PageLayout property above, true if the first page (odd) should be on the left side of the screen.
+
+ false
+
Index: vcl/inc/pdfwriter.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/pdfwriter.hxx,v
retrieving revision 1.15.112.1
diff -u -p -u -r1.15.112.1 pdfwriter.hxx
--- vcl/inc/pdfwriter.hxx 9 Mar 2006 09:47:29 -0000 1.15.112.1
+++ vcl/inc/pdfwriter.hxx 12 Mar 2006 16:49:03 -0000
@@ -476,8 +476,8 @@ public:
bool OpenInFullScreenMode;
bool CenterWindow;
bool DisplayPDFDocumentTitle;
- bool DirectionR2L;
PDFPageLayout PageLayout;
+ bool FirstPageLeft;
PDFWriterContext() :
Version( PDFWriter::PDF_1_4 ),
@@ -492,8 +492,8 @@ public:
OpenInFullScreenMode( false ),
CenterWindow( false ),
DisplayPDFDocumentTitle( false ),
- DirectionR2L( false ),
- PageLayout( PDFWriter::DefaultLayout )
+ PageLayout( PDFWriter::DefaultLayout ),
+ FirstPageLeft( false )
{}
};
Index: vcl/source/gdi/pdfwriter_impl.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/pdfwriter_impl.cxx,v
retrieving revision 1.86.60.1
diff -u -p -u -r1.86.60.1 pdfwriter_impl.cxx
--- vcl/source/gdi/pdfwriter_impl.cxx 9 Mar 2006 09:47:30 -0000 1.86.60.1
+++ vcl/source/gdi/pdfwriter_impl.cxx 12 Mar 2006 16:49:05 -0000
@@ -4357,8 +4357,8 @@ bool PDFWriterImpl::emitCatalog()
aLine.append( "/PageLayout/OneColumn\n" );
break;
case PDFWriter::ContinuousFacing :
-//the effect of odd page on the right ( /PageLayout/TwoColumnLeft ) can be achieved with DirectionR2L (see below)
- aLine.append( "/PageLayout/TwoColumnRight\n" );
+//the flag m_aContext.FirstPageLeft below is used to set the page on the left side
+ aLine.append( "/PageLayout/TwoColumnRight\n" );//odd page on the right side
break;
}
if( m_aContext.PDFDocumentMode != PDFWriter::ModeDefault && !m_aContext.OpenInFullScreenMode )
@@ -4401,7 +4401,7 @@ bool PDFWriterImpl::emitCatalog()
( m_aContext.Version > PDFWriter::PDF_1_3 && m_aDocInfo.Title.Len() && m_aContext.DisplayPDFDocumentTitle ) ||
m_aContext.HideViewerMenubar ||
m_aContext.HideViewerWindowControls || m_aContext.FitWindow ||
- m_aContext.CenterWindow || m_aContext.DirectionR2L ||
+ m_aContext.CenterWindow || (m_aContext.FirstPageLeft && m_aContext.PageLayout == PDFWriter::ContinuousFacing ) ||
m_aContext.OpenInFullScreenMode )
{
aLine.append( "/ViewerPreferences<<" );
@@ -4417,8 +4417,8 @@ bool PDFWriterImpl::emitCatalog()
aLine.append("/CenterWindow true\n");
if( m_aContext.Version > PDFWriter::PDF_1_3 && m_aDocInfo.Title.Len() && m_aContext.DisplayPDFDocumentTitle )
aLine.append( "/DisplayDocTitle true\n" );
- if( m_aContext.DirectionR2L )
- aLine.append("/Direction /R2L\n");
+ if( m_aContext.FirstPageLeft && m_aContext.PageLayout == PDFWriter::ContinuousFacing )
+ aLine.append("/Direction/R2L\n");
if( m_aContext.OpenInFullScreenMode )
switch( m_aContext.PDFDocumentMode )
{