[Libreoffice-commits] core.git: 2 commits - extras/source sfx2/source

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml |    8 +++++++-
 sfx2/source/bastyp/fltfnc.cxx               |    2 +-
 sfx2/source/doc/docfile.cxx                 |   10 +++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 45739fad0b1d55e72cc1ed508b8ea33a74219290
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 22 10:00:42 2013 +0000

    fix sfx2 build
    
    Change-Id: I17b8ab426e7aabeb5db9d49391e0c1be99e63a51

diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 049823b..97dbaec 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -551,7 +551,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
 
     sal_Bool bPreview = rMedium.IsPreview_Impl();
     SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False);
-    if ( bPreview && rMedium.IsRemote() && ( !pReferer || pReferer->GetValue().CompareToAscii("private:searchfolder:",21 ) != COMPARE_EQUAL ) )
+    if ( bPreview && rMedium.IsRemote() && ( !pReferer || !pReferer->GetValue().match("private:searchfolder:") ) )
         return ERRCODE_ABORT;
 
     ErrCode nErr = GuessFilter( rMedium, &pFilter );
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index d2f6164..0fc15a8 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1721,12 +1721,12 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet&
     SFX_ITEMSET_ARG( &aTargetSet, pNewPassItem, SfxStringItem, SID_PASSWORD, false );
     SFX_ITEMSET_ARG( GetItemSet(), pOldPassItem, SfxStringItem, SID_PASSWORD, false );
     if ( ( !pNewPassItem && !pOldPassItem )
-      || ( pNewPassItem && pOldPassItem && pNewPassItem->GetValue().Equals( pOldPassItem->GetValue() ) ) )
+      || ( pNewPassItem && pOldPassItem && pNewPassItem->GetValue() == pOldPassItem->GetValue() ) )
     {
         // the filter must be the same
         SFX_ITEMSET_ARG( &aTargetSet, pNewFilterItem, SfxStringItem, SID_FILTER_NAME, false );
         SFX_ITEMSET_ARG( GetItemSet(), pOldFilterItem, SfxStringItem, SID_FILTER_NAME, false );
-        if ( pNewFilterItem && pOldFilterItem && pNewFilterItem->GetValue().Equals( pOldFilterItem->GetValue() ) )
+        if ( pNewFilterItem && pOldFilterItem && pNewFilterItem->GetValue() == pOldFilterItem->GetValue() )
         {
             // get the input stream and copy it
             // in case of success return true
@@ -2459,7 +2459,7 @@ void SfxMedium::Init_Impl()
     pImp->bDisposeStorage = false;
 
     SFX_ITEMSET_ARG( pImp->m_pSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false);
-    if ( pSalvageItem && !pSalvageItem->GetValue().Len() )
+    if ( pSalvageItem && pSalvageItem->GetValue().isEmpty() )
     {
         pSalvageItem = NULL;
         pImp->m_pSet->ClearItem( SID_DOC_SALVAGE );
@@ -2492,7 +2492,7 @@ void SfxMedium::Init_Impl()
         }
     }
 
-    if ( pSalvageItem && pSalvageItem->GetValue().Len() )
+    if ( pSalvageItem && !pSalvageItem->GetValue().isEmpty() )
     {
         pImp->m_aLogicName = pSalvageItem->GetValue();
         DELETEZ( pImp->m_pURLObj );
@@ -2894,7 +2894,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
     if( pSalvageItem )
     {
         // QUESTION: there is some treatment of Salvage in Init_Impl; align!
-        if ( pSalvageItem->GetValue().Len() )
+        if ( !pSalvageItem->GetValue().isEmpty() )
         {
             // if an URL is provided in SalvageItem that means that the FileName refers to a temporary file
             // that must be copied here
commit 321bd3a06e3aa78f3223ef1aa7a0baac9176f83d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 22 09:15:44 2013 +0000

    more custom widgets for glade catalog
    
    Change-Id: I9637244a7f117496feeb879618a28ba55ced84f4

diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml
index e028f73..0612baa 100644
--- a/extras/source/glade/libreoffice-catalog.xml
+++ b/extras/source/glade/libreoffice-catalog.xml
@@ -30,8 +30,14 @@
     <glade-widget-class title="Color ListBox" name="svtlo-ColorListBox"
                         generic-name="LookUpComboBox" parent="GtkComboBox"
                         icon-name="widget-gtk-combobox"/>
+    <glade-widget-class title="Font Name ListBox" name="svtlo-FontNameBox"
+                        generic-name="Font name ListBox" parent="GtkComboBox"
+                        icon-name="widget-gtk-combobox"/>
+    <glade-widget-class title="Font Size ListBox" name="svtlo-FontSizeBox"
+                        generic-name="Font Size ListBox" parent="GtkComboBox"
+                        icon-name="widget-gtk-combobox"/>
     <glade-widget-class title="Line ListBox" name="svtlo-LineListBox"
-                        generic-name="LineListBox" parent="GtkComboBox"
+                        generic-name="Line ListBox" parent="GtkComboBox"
                         icon-name="widget-gtk-combobox"/>
     <glade-widget-class title="Language ListBox" name="svxcorelo-SvxLanguageBox"
                         generic-name="LanguageBox" parent="GtkComboBox"