filter/UIConfig_xsltdlg.mk        |    1 
 filter/inc/filter.hrc             |    1 
 filter/source/pdf/impdialog.cxx   |  136 ++++-------
 filter/source/pdf/impdialog.hrc   |   55 ----
 filter/source/pdf/impdialog.hxx   |   40 +--
 filter/source/pdf/impdialog.src   |  165 -------------
 filter/uiconfig/ui/pdfviewpage.ui |  464 ++++++++++++++++++++++++++++++++++++++
 7 files changed, 543 insertions(+), 319 deletions(-)

New commits:
commit 1e467c8b38b4308af48a7dd4e34888bbd935bfc5
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Jul 4 09:28:59 2013 +0100

    convert pdf view page to .ui format
    
    Change-Id: I738dd72f66658f60025152c9c3db765dbcb981ac

diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk
index d474ec5..6cb146c 100644
--- a/filter/UIConfig_xsltdlg.mk
+++ b/filter/UIConfig_xsltdlg.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,filter,\
     filter/uiconfig/ui/pdflinkspage \
     filter/uiconfig/ui/pdfsecuritypage \
     filter/uiconfig/ui/pdfuserinterfacepage \
+    filter/uiconfig/ui/pdfviewpage \
        filter/uiconfig/ui/testxmlfilter \
        filter/uiconfig/ui/xmlfiltersettings \
 ))
diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc
index ec5879b..8077a81 100644
--- a/filter/inc/filter.hrc
+++ b/filter/inc/filter.hrc
@@ -32,7 +32,6 @@
 // warning, next range is RID_FILTER_START + 100 !
 
 #define HID_FILTER_PDF_OPTIONS      "HID_FILTER_PDF_OPTIONS"
-#define HID_FILTER_PDF_INITIAL_VIEW   "HID_FILTER_PDF_INITIAL_VIEW"
 #define HID_FILTER_PDF_SIGNING        "HID_FILTER_PDF_SIGNING"
 
 #endif
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 73b6592..d4d43be 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -822,47 +822,33 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl)
     return 0;
 }
 
-/////////////////////////////////////////////////////////////////
 // the option features tab page
-// 
-----------------------------------------------------------------------------
-ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage( Window* pParent,
-                                          const SfxItemSet& rCoreSet ) :
-    SfxTabPage( pParent, PDFFilterResId( RID_PDF_TAB_OPNFTR ), rCoreSet ),
-
-    maFlInitialView( this, PDFFilterResId( FL_INITVIEW ) ),
-    maRbOpnPageOnly( this, PDFFilterResId( RB_OPNMODE_PAGEONLY ) ),
-    maRbOpnOutline( this, PDFFilterResId( RB_OPNMODE_OUTLINE ) ),
-    maRbOpnThumbs( this, PDFFilterResId( RB_OPNMODE_THUMBS ) ),
-    maFtInitialPage( this, PDFFilterResId( FT_MAGNF_INITIAL_PAGE ) ),
-    maNumInitialPage( this, PDFFilterResId( NUM_MAGNF_INITIAL_PAGE ) ),
-
-    maFlMagnification( this, PDFFilterResId( FL_MAGNIFICATION ) ),
-    maRbMagnDefault( this, PDFFilterResId( RB_MAGNF_DEFAULT ) ),
-    maRbMagnFitWin( this, PDFFilterResId( RB_MAGNF_WIND ) ),
-    maRbMagnFitWidth( this, PDFFilterResId( RB_MAGNF_WIDTH ) ),
-    maRbMagnFitVisible( this, PDFFilterResId( RB_MAGNF_VISIBLE ) ),
-    maRbMagnZoom( this, PDFFilterResId( RB_MAGNF_ZOOM ) ),
-    maNumZoom( this, PDFFilterResId( NUM_MAGNF_ZOOM ) ),
-
-    m_aVerticalLine(this, PDFFilterResId(FL_INITVIEW_VERTICAL)),
-
-    maFlPageLayout( this, PDFFilterResId( FL_PAGE_LAYOUT ) ),
-    maRbPgLyDefault( this, PDFFilterResId( RB_PGLY_DEFAULT ) ),
-    maRbPgLySinglePage( this, PDFFilterResId( RB_PGLY_SINGPG ) ),
-    maRbPgLyContinue( this, PDFFilterResId( RB_PGLY_CONT ) ),
-    maRbPgLyContinueFacing( this, PDFFilterResId( RB_PGLY_CONTFAC ) ),
-    maCbPgLyFirstOnLeft( this, PDFFilterResId( CB_PGLY_FIRSTLEFT ) ),
-    mbUseCTLFont( sal_False )
+ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(Window* pParent, const SfxItemSet& 
rCoreSet)
+    : SfxTabPage(pParent, "PdfViewPage","filter/ui/pdfviewpage.ui", rCoreSet)
+    , mbUseCTLFont(false)
 {
-    FreeResource();
-
-    maRbMagnDefault.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
-    maRbMagnFitWin.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
-    maRbMagnFitWidth.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
-    maRbMagnFitVisible.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
-    maRbMagnZoom.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
-    maNumZoom.SetAccessibleName(maRbMagnZoom.GetText());
-    maNumZoom.SetAccessibleRelationLabeledBy(&maRbMagnZoom);
+    get(mpRbOpnPageOnly, "pageonly");
+    get(mpRbOpnOutline, "outline");
+    get(mpRbOpnThumbs, "thumbs");
+    get(mpNumInitialPage, "page");
+    get(mpRbMagnDefault, "fitdefault");
+    get(mpRbMagnFitWin, "fitwin");
+    get(mpRbMagnFitWidth, "fitwidth");
+    get(mpRbMagnFitVisible, "fitvis");
+    get(mpRbMagnZoom, "fitzoom");
+    get(mpNumZoom, "zoom");
+    get(mpRbPgLyDefault, "defaultlayout");
+    get(mpRbPgLySinglePage, "singlelayout");
+    get(mpRbPgLyContinue, "contlayout");
+    get(mpRbPgLyContinueFacing, "contfacinglayout");
+    get(mpCbPgLyFirstOnLeft, "firstonleft");
+
+    mpRbMagnDefault->SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
+    mpRbMagnFitWin->SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
+    mpRbMagnFitWidth->SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
+    mpRbMagnFitVisible->SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
+    mpRbMagnZoom->SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
+    mpNumZoom->SetAccessibleName(mpRbMagnZoom->GetText());
 }
 
 // 
-----------------------------------------------------------------------------
@@ -881,35 +867,35 @@ SfxTabPage*  ImpPDFTabOpnFtrPage::Create( Window* pParent,
 void ImpPDFTabOpnFtrPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
 {
     paParent->mnInitialView = 0;
-    if( maRbOpnOutline.IsChecked() )
+    if( mpRbOpnOutline->IsChecked() )
         paParent->mnInitialView = 1;
-    else if( maRbOpnThumbs.IsChecked() )
+    else if( mpRbOpnThumbs->IsChecked() )
         paParent->mnInitialView = 2;
 
     paParent->mnMagnification = 0;
-    if( maRbMagnFitWin.IsChecked() )
+    if( mpRbMagnFitWin->IsChecked() )
         paParent->mnMagnification = 1;
-    else if( maRbMagnFitWidth.IsChecked() )
+    else if( mpRbMagnFitWidth->IsChecked() )
         paParent->mnMagnification = 2;
-    else if( maRbMagnFitVisible.IsChecked() )
+    else if( mpRbMagnFitVisible->IsChecked() )
         paParent->mnMagnification = 3;
-    else if( maRbMagnZoom.IsChecked() )
+    else if( mpRbMagnZoom->IsChecked() )
     {
         paParent->mnMagnification = 4;
-        paParent->mnZoom = static_cast<sal_Int32>(maNumZoom.GetValue());
+        paParent->mnZoom = static_cast<sal_Int32>(mpNumZoom->GetValue());
     }
 
-    paParent->mnInitialPage = 
static_cast<sal_Int32>(maNumInitialPage.GetValue());
+    paParent->mnInitialPage = 
static_cast<sal_Int32>(mpNumInitialPage->GetValue());
 
     paParent->mnPageLayout = 0;
-    if( maRbPgLySinglePage.IsChecked() )
+    if( mpRbPgLySinglePage->IsChecked() )
         paParent->mnPageLayout = 1;
-    else if( maRbPgLyContinue.IsChecked() )
+    else if( mpRbPgLyContinue->IsChecked() )
         paParent->mnPageLayout = 2;
-    else if( maRbPgLyContinueFacing.IsChecked() )
+    else if( mpRbPgLyContinueFacing->IsChecked() )
         paParent->mnPageLayout = 3;
 
-    paParent->mbFirstPageLeft = ( mbUseCTLFont ) ? 
maCbPgLyFirstOnLeft.IsChecked() : sal_False;
+    paParent->mbFirstPageLeft = ( mbUseCTLFont ) ? 
mpCbPgLyFirstOnLeft->IsChecked() : sal_False;
 }
 
 // 
-----------------------------------------------------------------------------
@@ -920,16 +906,16 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const  
ImpPDFTabDialog* paParent
     {
     default:
     case 0:
-        maRbPgLyDefault.Check();
+        mpRbPgLyDefault->Check();
         break;
     case 1:
-        maRbPgLySinglePage.Check();
+        mpRbPgLySinglePage->Check();
         break;
     case 2:
-        maRbPgLyContinue.Check();
+        mpRbPgLyContinue->Check();
         break;
     case 3:
-        maRbPgLyContinueFacing.Check();
+        mpRbPgLyContinueFacing->Check();
         break;
     };
 
@@ -937,13 +923,13 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const  
ImpPDFTabDialog* paParent
     {
     default:
     case 0:
-        maRbOpnPageOnly.Check();
+        mpRbOpnPageOnly->Check();
         break;
     case 1:
-        maRbOpnOutline.Check();
+        mpRbOpnOutline->Check();
         break;
     case 2:
-        maRbOpnThumbs.Check();
+        mpRbOpnThumbs->Check();
         break;
     };
 
@@ -951,49 +937,49 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const  
ImpPDFTabDialog* paParent
     {
     default:
     case 0:
-        maRbMagnDefault.Check();
-        maNumZoom.Enable( sal_False );
+        mpRbMagnDefault->Check();
+        mpNumZoom->Enable( sal_False );
         break;
     case 1:
-        maRbMagnFitWin.Check();
-        maNumZoom.Enable( sal_False );
+        mpRbMagnFitWin->Check();
+        mpNumZoom->Enable( sal_False );
         break;
     case 2:
-        maRbMagnFitWidth.Check();
-        maNumZoom.Enable( sal_False );
+        mpRbMagnFitWidth->Check();
+        mpNumZoom->Enable( sal_False );
         break;
     case 3:
-        maRbMagnFitVisible.Check();
-        maNumZoom.Enable( sal_False );
+        mpRbMagnFitVisible->Check();
+        mpNumZoom->Enable( sal_False );
         break;
     case 4:
-        maRbMagnZoom.Check();
-        maNumZoom.Enable( sal_True );
+        mpRbMagnZoom->Check();
+        mpNumZoom->Enable( sal_True );
         break;
     };
 
-    maNumZoom.SetValue( paParent->mnZoom );
-    maNumInitialPage.SetValue( paParent->mnInitialPage );
+    mpNumZoom->SetValue( paParent->mnZoom );
+    mpNumInitialPage->SetValue( paParent->mnInitialPage );
 
     if( !mbUseCTLFont )
-        maCbPgLyFirstOnLeft.Hide( );
+        mpCbPgLyFirstOnLeft->Hide( );
     else
     {
-        maRbPgLyContinueFacing.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbPgLyContinueFacingHdl ) );
-        maCbPgLyFirstOnLeft.Check( paParent->mbFirstPageLeft );
+        mpRbPgLyContinueFacing->SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbPgLyContinueFacingHdl ) );
+        mpCbPgLyFirstOnLeft->Check( paParent->mbFirstPageLeft );
         ToggleRbPgLyContinueFacingHdl( NULL );
     }
 }
 
 IMPL_LINK_NOARG(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl)
 {
-    maCbPgLyFirstOnLeft.Enable( maRbPgLyContinueFacing.IsChecked() );
+    mpCbPgLyFirstOnLeft->Enable( mpRbPgLyContinueFacing->IsChecked() );
     return 0;
 }
 
 IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, void*, )
 {
-    maNumZoom.Enable( maRbMagnZoom.IsChecked() );
+    mpNumZoom->Enable( mpRbMagnZoom->IsChecked() );
     return 0;
 }
 
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index fa86c24..207482b 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -89,61 +89,6 @@
 #define CB_VIEWPDF                  35
 
 
-//controls for open options tab page
-#define FL_INITVIEW               80
-#define RB_OPNMODE_PAGEONLY       81
-#define RB_OPNMODE_OUTLINE        82
-#define RB_OPNMODE_THUMBS         83
-
-#define FL_MAGNIFICATION          84
-#define RB_MAGNF_DEFAULT          85
-#define RB_MAGNF_WIND             86
-#define RB_MAGNF_WIDTH            87
-#define RB_MAGNF_VISIBLE          88
-#define RB_MAGNF_ZOOM             89
-#define NUM_MAGNF_ZOOM            90
-#define FT_MAGNF_INITIAL_PAGE     91
-#define NUM_MAGNF_INITIAL_PAGE    92
-
-#define FL_PAGE_LAYOUT            93
-#define RB_PGLY_DEFAULT           94
-#define RB_PGLY_SINGPG            95
-#define RB_PGLY_CONT              96
-#define RB_PGLY_CONTFAC           97
-#define CB_PGLY_FIRSTLEFT         98
-
-//controls for security preferences tab page
-#define FL_PWD_GROUP            119
-#define BTN_SET_PWD             120
-#define FT_USER_PWD             121
-#define STR_USER_PWD_SET        122
-#define STR_USER_PWD_ENC        123
-#define STR_USER_PWD_UNSET      124
-#define STR_USER_PWD_UNENC      125
-#define STR_SET_PWD             126
-#define STR_USER_PWD_PDFA       127
-
-#define FT_OWNER_PWD            128
-#define STR_OWNER_PWD_SET       129
-#define STR_OWNER_PWD_REST      130
-#define STR_OWNER_PWD_UNSET     131
-#define STR_OWNER_PWD_UNREST    132
-#define STR_OWNER_PWD_PDFA      133
-
-#define FL_PRINT_PERMISSIONS    133
-#define RB_PRINT_NONE           134
-#define RB_PRINT_LOWRES         135
-#define RB_PRINT_HIGHRES        136
-
-#define FL_CHANGES_ALLOWED      137
-#define RB_CHANGES_NONE         138
-#define RB_CHANGES_INSDEL       139
-#define RB_CHANGES_FILLFORM     140
-#define RB_CHANGES_COMMENT      141
-#define RB_CHANGES_ANY_NOCOPY   142
-#define CB_ENDAB_COPY           143
-#define CB_ENAB_ACCESS          144
-
 #define FL_GENERAL_VERTICAL  157
 #define FL_INITVIEW_VERTICAL 158
 #define FL_VPREFER_VERTICAL  158
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index e83a72a..832e6d29 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -250,29 +250,23 @@ public:
 //class tab page viewer
 class ImpPDFTabOpnFtrPage : public SfxTabPage
 {
-    FixedLine                   maFlInitialView;
-    RadioButton                 maRbOpnPageOnly;
-    RadioButton                 maRbOpnOutline;
-    RadioButton                 maRbOpnThumbs;
-    FixedText                   maFtInitialPage;
-    NumericField                maNumInitialPage;
-
-    FixedLine                   maFlMagnification;
-    RadioButton                 maRbMagnDefault;
-    RadioButton                 maRbMagnFitWin;
-    RadioButton                 maRbMagnFitWidth;
-    RadioButton                 maRbMagnFitVisible;
-    RadioButton                 maRbMagnZoom;
-    MetricField                 maNumZoom;
-
-    FixedLine m_aVerticalLine;
-
-    FixedLine                   maFlPageLayout;
-    RadioButton                 maRbPgLyDefault;
-    RadioButton                 maRbPgLySinglePage;
-    RadioButton                 maRbPgLyContinue;
-    RadioButton                 maRbPgLyContinueFacing;
-    CheckBox                    maCbPgLyFirstOnLeft;
+    RadioButton*                mpRbOpnPageOnly;
+    RadioButton*                mpRbOpnOutline;
+    RadioButton*                mpRbOpnThumbs;
+    NumericField*               mpNumInitialPage;
+
+    RadioButton*                mpRbMagnDefault;
+    RadioButton*                mpRbMagnFitWin;
+    RadioButton*                mpRbMagnFitWidth;
+    RadioButton*                mpRbMagnFitVisible;
+    RadioButton*                mpRbMagnZoom;
+    NumericField*               mpNumZoom;
+
+    RadioButton*                mpRbPgLyDefault;
+    RadioButton*                mpRbPgLySinglePage;
+    RadioButton*                mpRbPgLyContinue;
+    RadioButton*                mpRbPgLyContinueFacing;
+    CheckBox*                   mpCbPgLyFirstOnLeft;
 
     sal_Bool                    mbUseCTLFont;
 
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index c5398ef..871d88e 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -319,171 +319,6 @@ WarningBox RID_PDF_WARNPDFAPASSWORD
 };
 
 //----------------------------------------------------------
-//tab page for PDF Export, opening features
-TabPage  RID_PDF_TAB_OPNFTR
-{
-    HelpId = HID_FILTER_PDF_INITIAL_VIEW ;
-    Text[ en-US ] = "Initial View" ;
-    TAB_PDF_SIZE;
-    Hide = TRUE;
-
-////////////////////////////////////////
-    FixedLine FL_INITVIEW
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 164 , 8 ) ;
-        Text[ en-US ] = "Panes" ;
-    };
-    RadioButton  RB_OPNMODE_PAGEONLY
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_PAGEONLY";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 158 , 10 ) ;
-        Text[ en-US ] = "~Page only" ;
-    };
-    RadioButton  RB_OPNMODE_OUTLINE
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_OUTLINE";
-        Pos = MAP_APPFONT ( 12 , 26 ) ;
-        Size = MAP_APPFONT ( 158 , 10 ) ;
-        Text[ en-US ] = "~Bookmarks and page" ;
-    };
-    RadioButton  RB_OPNMODE_THUMBS
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_THUMBS";
-        Pos = MAP_APPFONT ( 12 , 38 ) ;
-        Size = MAP_APPFONT ( 158 , 10 ) ;
-        Text[ en-US ] = "~Thumbnails and page" ;
-    };
-
-    FixedText FT_MAGNF_INITIAL_PAGE
-    {
-        Pos = MAP_APPFONT( 12, 52 );
-        Size = MAP_APPFONT( 109, 10 );
-        Text[ en-US ] = "Open on page";
-    };
-    NumericField NUM_MAGNF_INITIAL_PAGE
-    {
-        HelpID = 
"filter:NumericField:RID_PDF_TAB_OPNFTR:NUM_MAGNF_INITIAL_PAGE";
-        Pos = MAP_APPFONT( 124, 52 );
-        Size = MAP_APPFONT( 40, 12 );
-        Value = 1;
-        Spin = TRUE;
-        Border = TRUE;
-        Minimum = 1;
-    };
-
-///////////////////////////////////////////////////
-    FixedLine FL_MAGNIFICATION
-    {
-        Pos = MAP_APPFONT ( 6 , 68 ) ;
-        Size = MAP_APPFONT ( 164 , 8 ) ;
-        Text[ en-US ] = "Magnification" ;
-    };
-    RadioButton  RB_MAGNF_DEFAULT
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_DEFAULT";
-        // see PDF ref v 1.5 tab 8.2, pg. 542 ( /XYZ )
-        Pos = MAP_APPFONT ( 12 , 80 ) ;
-        Size = MAP_APPFONT ( 158 , 10 ) ;
-        Text[ en-US ] = "~Default" ;
-    };
-    RadioButton  RB_MAGNF_WIND
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIND";
-        // see PDF ref v 1.5 tab 8.2, pg. 542 ( /Fit )
-        Pos = MAP_APPFONT ( 12 , 92 ) ;
-        Size = MAP_APPFONT ( 158 , 10 ) ;
-        Text[ en-US ] = "~Fit in window" ;
-    };
-    RadioButton  RB_MAGNF_WIDTH
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIDTH";
-        // see PDF ref v 1.5 tab 8.2, pg. 542 ( /FitH top )
-        Pos = MAP_APPFONT ( 12 , 104 ) ;
-        Size = MAP_APPFONT ( 158 , 10 ) ;
-        Text[ en-US ] = "Fit ~width" ;
-    };
-    RadioButton  RB_MAGNF_VISIBLE
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_VISIBLE";
-        // see PDF ref v 1.5 tab 8.2, pg. 542 ( /FitBH top )
-        Pos = MAP_APPFONT ( 12 , 116 ) ;
-        Size = MAP_APPFONT ( 158 , 10 ) ;
-        Text[ en-US ] = "Fit ~visible" ;
-    };
-    RadioButton  RB_MAGNF_ZOOM
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_ZOOM";
-        // see PDF ref v 1.6 tab 8.2, pg. 551 ( /XYZ left top zoom )
-        Pos = MAP_APPFONT ( 12 , 128 ) ;
-        Size = MAP_APPFONT ( 109 , 10 ) ;
-        Text[ en-US ] = "~Zoom factor" ;
-    };
-    MetricField NUM_MAGNF_ZOOM
-    {
-        HelpID = "filter:MetricField:RID_PDF_TAB_OPNFTR:NUM_MAGNF_ZOOM";
-        Pos = MAP_APPFONT( 124, 128 ) ;
-        Size = MAP_APPFONT( 40, 12 ) ;
-        Unit = FUNIT_PERCENT;
-        Value = 100;
-        Spin = TRUE;
-        Border = TRUE;
-        Minimum = 50;
-        Maximum = 1600;
-    };
-
-    FixedLine FL_INITVIEW_VERTICAL
-    {
-        Pos = MAP_APPFONT ( 175 , 3 ) ;
-        Size = MAP_APPFONT ( 4 , 171 ) ;
-        Vert = TRUE;
-    };
-
-    FixedLine FL_PAGE_LAYOUT
-    {
-        Pos = MAP_APPFONT ( 182 , 3 ) ;
-        Size = MAP_APPFONT (164 , 8 ) ;
-        Text[ en-US ] = "Page layout" ;
-    };
-    RadioButton  RB_PGLY_DEFAULT
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_DEFAULT";
-        Pos = MAP_APPFONT ( 188 , 15 ) ;
-        Size = MAP_APPFONT ( 158 , 10 ) ;
-        Text[ en-US ] = "D~efault" ;
-    };
-    RadioButton  RB_PGLY_SINGPG
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_SINGPG";
-        Pos = MAP_APPFONT ( 188 , 27 ) ;
-        Size = MAP_APPFONT ( 158 , 10 ) ;
-        Text[ en-US ] = "~Single page" ;
-    };
-    RadioButton  RB_PGLY_CONT
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONT";
-        Pos = MAP_APPFONT ( 188 , 39 ) ;
-        Size = MAP_APPFONT ( 158 , 10 ) ;
-        Text[ en-US ] = "~Continuous" ;
-    };
-    RadioButton  RB_PGLY_CONTFAC
-    {
-        HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONTFAC";
-        Pos = MAP_APPFONT ( 188 , 51 ) ;
-        Size = MAP_APPFONT ( 158 , 10 ) ;
-        Text[ en-US ] = "C~ontinuous facing" ;
-    };
-    CheckBox  CB_PGLY_FIRSTLEFT
-    {
-        HelpID = "filter:CheckBox:RID_PDF_TAB_OPNFTR:CB_PGLY_FIRSTLEFT";
-        Pos = MAP_APPFONT ( 198 , 63 ) ;
-        Size = MAP_APPFONT ( 148 , 10 ) ;
-        Text[ en-US ] = "First page is ~left" ;
-    };
-};
-
-//----------------------------------------------------------
 //tab page for PDF Export, digital signatures
 TabPage  RID_PDF_TAB_SIGNING
 {
diff --git a/filter/uiconfig/ui/pdfviewpage.ui 
b/filter/uiconfig/ui/pdfviewpage.ui
new file mode 100644
index 0000000..a680c74
--- /dev/null
+++ b/filter/uiconfig/ui/pdfviewpage.ui
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.6 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">1</property>
+    <property name="upper">2147483647</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="lower">50</property>
+    <property name="upper">1600</property>
+    <property name="value">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkBox" id="PdfViewPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="spacing">12</property>
+    <property name="homogeneous">True</property>
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkFrame" id="frame2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkGrid" id="grid1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <object class="GtkRadioButton" id="pageonly">
+                        <property name="label" translatable="yes">_Page 
only</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">outline</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="outline">
+                        <property name="label" translatable="yes">_Bookmarks 
and page</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">thumbs</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="thumbs">
+                        <property name="label" translatable="yes">_Thumbnails 
and page</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">pageonly</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkGrid" id="grid2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="column_spacing">12</property>
+                        <child>
+                          <object class="GtkLabel" id="label4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Open on 
pa_ge</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">page</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="page">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">●</property>
+                            <property name="adjustment">adjustment1</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Panes</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkGrid" id="grid3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <object class="GtkRadioButton" id="fitdefault">
+                        <property name="label" 
translatable="yes">_Default</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">fitwin</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="fitwin">
+                        <property name="label" translatable="yes">_Fit in 
window</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">fitwidth</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="fitwidth">
+                        <property name="label" translatable="yes">Fit 
_width</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">fitvis</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="fitvis">
+                        <property name="label" translatable="yes">Fit 
_visible</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">fitzoom</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkGrid" id="grid4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="column_spacing">12</property>
+                        <child>
+                          <object class="GtkRadioButton" id="fitzoom">
+                            <property name="label" translatable="yes">_Zoom 
factor</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">fitdefault</property>
+                            <accessibility>
+                              <relation type="label-for" target="zoom"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="zoom">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">●</property>
+                            <property name="adjustment">adjustment2</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="fitzoom"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">4</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" 
translatable="yes">Magnification</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkGrid" id="grid5">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <child>
+                  <object class="GtkRadioButton" id="defaultlayout">
+                    <property name="label" 
translatable="yes">D_efault</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">singlelayout</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="singlelayout">
+                    <property name="label" translatable="yes">_Single 
page</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">contlayout</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="contlayout">
+                    <property name="label" 
translatable="yes">_Continuous</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">contfacinglayout</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="contfacinglayout">
+                    <property name="label" translatable="yes">C_ontinuous 
facing</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">defaultlayout</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="firstonleft">
+                    <property name="label" translatable="yes">First page is 
_left</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Page layout</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to