[Libreoffice-commits] core.git: filter/source filter/uiconfig

[Caolán McNamara]

 filter/source/pdf/impdialog.cxx      |    1 +
 filter/uiconfig/ui/pdfgeneralpage.ui |   33 +++++++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 8 deletions(-)

New commits:
commit 6b205205175b8ce599d2924550040271fd7303e5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 15 17:34:45 2013 +0100

    Resolves: fdo#33983 use 'Slides' instead of 'Pages' for impress pdf export
    
    Change-Id: Id380514f8f74783a0a0baf61cc9358f2b1bcbc47

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 8badeb4..3f7a9a4 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -627,6 +627,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
 
     if ( mbIsPresentation )
     {
+        mpRbRange->SetText(get<FixedText>("slides")->GetText());
         mpCbExportNotesPages->Show(true);
         mpCbExportNotesPages->Check(paParent->mbExportNotesPages);
         mpCbExportHiddenSlides->Show(true);
diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui
index 09bcbd1..91ecdee 100644
--- a/filter/uiconfig/ui/pdfgeneralpage.ui
+++ b/filter/uiconfig/ui/pdfgeneralpage.ui
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">1</property>
+    <property name="upper">100</property>
+    <property name="value">90</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkGrid" id="PdfGeneralPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -83,7 +90,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">3</property>
                         <property name="width">2</property>
                         <property name="height">1</property>
                       </packing>
@@ -105,6 +112,23 @@
                         <property name="height">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="slides">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Slides</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>
+                      <placeholder/>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -709,13 +733,6 @@
       </packing>
     </child>
   </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="lower">1</property>
-    <property name="upper">100</property>
-    <property name="value">90</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
       <widget name="all"/>