padmin/uiconfig/ui/printerdevicepage.ui  |    4 ++--
 sw/source/ui/uno/SwXDocumentSettings.cxx |    6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 5573ee341b1fc38d26fcfabffbfb23eb3cadea68
Author: Caolán McNamara <[email protected]>
Date:   Fri May 17 11:47:00 2013 +0100

    unknown printer metrics property results in empty settings.xml
    
    regression since 0fd4d12c6233da2ac1936cd89838b006ffec5192
    
    Change-Id: I894fe80f6c531af5c335dc1f3ba1c0ffaca1e07f

diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx 
b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 8944837..080f3b7 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -1085,6 +1085,12 @@ void SwXDocumentSettings::_getSingleValue( const 
comphelper::PropertyInfo & rInf
             rValue.setValue( &bTmp, ::getBooleanCppuType() );
         }
         break;
+        case HANDLE_USE_OLD_PRINTER_METRICS:
+        {
+            sal_Bool bTmp = sal_False;
+            rValue.setValue( &bTmp, ::getBooleanCppuType() );
+        }
+        break;
         case HANDLE_TABS_RELATIVE_TO_INDENT:
         {
             sal_Bool bTmp = 
mpDoc->get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT);
commit 539f4074dd37f3ba3abe8db3cbe379b9926b4618
Author: Caolán McNamara <[email protected]>
Date:   Fri May 17 09:21:16 2013 +0100

    add some borders
    
    Change-Id: I54660a200b76fbc9e7fc2ad1d7a595b8f8eb8b6a

diff --git a/padmin/uiconfig/ui/printerdevicepage.ui 
b/padmin/uiconfig/ui/printerdevicepage.ui
index a054891..45dc095 100644
--- a/padmin/uiconfig/ui/printerdevicepage.ui
+++ b/padmin/uiconfig/ui/printerdevicepage.ui
@@ -142,7 +142,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkTreeView" id="options">
+      <object class="GtkTreeView" id="options:border">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <child internal-child="selection">
@@ -157,7 +157,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkTreeView" id="values">
+      <object class="GtkTreeView" id="values:border">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <child internal-child="selection">
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to