[Libreoffice-commits] core.git: 2 commits - sc/source sfx2/inc sfx2/source vcl/uiconfig

[Caolán McNamara]

 sc/source/ui/docshell/tablink.cxx |    2 +-
 sc/source/ui/unoobj/scdetect.cxx  |    4 ++--
 sfx2/inc/sfx2/fcontnr.hxx         |    2 +-
 sfx2/source/bastyp/fltfnc.cxx     |    2 +-
 vcl/uiconfig/ui/printdialog.ui    |    1 -
 5 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit fdfd5c111de740456bc03df727b9c74a617237fc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 5 23:56:16 2013 +0000

    String->OUString
    
    Change-Id: I42193a40a0b5b905a721cb511d69836385bfcb40

diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index f42810f..e71e387 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -482,7 +482,7 @@ bool ScDocumentLoader::GetFilterName( const String& rFileName,
         if ( bWithInteraction )
             pMedium->UseInteractionHandler(true);   // #i73992# no longer called from GuessFilter
 
-        SfxFilterMatcher aMatcher( rtl::OUString("scalc") );
+        SfxFilterMatcher aMatcher("scalc");
         if( bWithContent )
             aMatcher.GuessFilter( *pMedium, &pSfxFilter );
         else
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 998e201..20cd22c 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -320,7 +320,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
     else
     {
         // container for Calc filters
-        SfxFilterMatcher aMatcher( rtl::OUString("scalc") );
+        SfxFilterMatcher aMatcher("scalc");
         if ( aPreselectedFilterName.Len() )
             pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName );
         else if( aTypeName.Len() )
@@ -425,7 +425,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
                     }
 
                     if ( aTypeName.Len() )
-                        pFilter = SfxFilterMatcher( rtl::OUString("scalc") ).GetFilter4EA( aTypeName );
+                        pFilter = SfxFilterMatcher("scalc").GetFilter4EA( aTypeName );
                 }
             }
             else
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index 37a5777..b2eb214 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.hxx
@@ -108,7 +108,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcher : private boost::noncopyable
     friend class SfxFilterMatcherIter;
     SfxFilterMatcher_Impl &m_rImpl;
 public:
-                        SfxFilterMatcher( const String& rFact );
+                        SfxFilterMatcher( const OUString& rFact );
                         SfxFilterMatcher();
                         ~SfxFilterMatcher();
 
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 3bd1f58..796ae01 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -297,7 +297,7 @@ namespace
     }
 }
 
-SfxFilterMatcher::SfxFilterMatcher( const String& rName )
+SfxFilterMatcher::SfxFilterMatcher( const OUString& rName )
     : m_rImpl( getSfxFilterMatcher_Impl(rName) )
 {
     ++nSfxFilterMatcherCount;
commit 8c34306b355d34488cc15889d55c6c7f0eff4f4b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 6 00:23:26 2013 +0000

    drop bottom padding
    
    Change-Id: Idf7cb08121cae2c183ed5bc012d848b31429ff49

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 4ef0a6b..22e759c 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1298,7 +1298,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkBox" id="box10">