[Libreoffice-commits] .: 3 commits - binfilter/bf_sfx2 binfilter/bf_svtools

[Caolán McNamara]

 binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx               |    9 +++++----
 binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx                 |    6 +++---
 binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx |    4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 59c7bf9e8593bc204523d3405f32560d7d8278ef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 29 00:28:23 2011 +0100

    sync with api changes

diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
index 65deff0..1d90864 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
@@ -287,8 +287,8 @@ const SfxFilter* SfxFilterContainer::aMethod(                   \
  */
 /*N*/ IMPL_CONTAINER_LOOP(
 /*N*/     GetFilter4Extension, const String&,
-/*N*/     pFilter->GetWildcard() != String() && pFilter->GetWildcard() != DEFINE_CONST_UNICODE("*.*") && pFilter->GetWildcard() != '*' &&
-/*N*/   WildCard( ToUpper_Impl( pFilter->GetWildcard().getGlob() ), ';' ) == ToUpper_Impl( aArg ))
+/*N*/     !pFilter->GetWildcard().Matches(String()) && !pFilter->GetWildcard().Matches(DEFINE_CONST_UNICODE("*.*")) && !pFilter->GetWildcard().Matches('*') &&
+/*N*/   WildCard( ToUpper_Impl( pFilter->GetWildcard().getGlob() ), ';' ).Matches(ToUpper_Impl( aArg )))
 
 
 //----------------------------------------------------------------
@@ -537,7 +537,7 @@ void SfxFilterMatcher::AddContainer( SfxFilterContainer* pC )
 /*N*/       if( !pFilter )
 /*N*/       {
 /*N*/           pFilter = GetFilter4Extension( rMedium.GetURLObject().GetName(), nMust, nDont );
-/*N*/           if( !pFilter || pFilter->GetWildcard()==DEFINE_CONST_UNICODE("*.*") || pFilter->GetWildcard() == '*' )
+/*N*/           if( !pFilter || pFilter->GetWildcard().Matches(DEFINE_CONST_UNICODE("*.*")) || pFilter->GetWildcard().Matches('*') )
 /*N*/               pFilter = 0;
 /*N*/       }
 /*N*/   }
@@ -798,7 +798,8 @@ const SfxFilter* SfxFilterMatcher::Type(                        \
 /*N*/   const SfxFilter* pFilter =
 /*N*/       pThis->GetFilter4Extension( *pString, SFX_FILTER_IMPORT );
 /*N*/   if( pFilter && !pFilter->GetWildcard().Matches( String() ) &&
-/*N*/       pFilter->GetWildcard() != DEFINE_CONST_UNICODE("*.*") && pFilter->GetWildcard() != '*' )
+/*N*/       !pFilter->GetWildcard().Matches(DEFINE_CONST_UNICODE("*.*")) &&
+/*N*/       !pFilter->GetWildcard().Matches('*') )
 /*N*/       return sal_True;
 /*N*/   return sal_False;
 /*?*/ }
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
index 3852859..c68cf0e 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
@@ -110,9 +110,9 @@ namespace binfilter {
 /*N*/       aShort += ';';
 /*N*/       aShort += aLong;
 /*N*/   }
-/*N*/   aWildCard = aShort;
+/*N*/   aWildCard.setGlob(aShort);
 /*N*/
-/*N*/     nVersion = SOFFICE_FILEFORMAT_50;
+/*N*/   nVersion = SOFFICE_FILEFORMAT_50;
 /*N*/   bPlugDataSearched = 0;
 /*N*/   pPlugData = 0;
 /*N*/   aUIName = aFilterName;
commit 2582881fadcc6aa2ea97331ca7370172205c4b29
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Aug 28 00:18:02 2011 +0100

    update for api

diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
index 6e10d8d..a247f6f 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
@@ -1206,7 +1206,7 @@ void SgfFontOne::ReadOne( const rtl::OString& rID, ByteString& Dsc )
             else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("MAC"))) SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
             else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYMBOL"))) SVChSet=RTL_TEXTENCODING_SYMBOL;
             else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYSTEM"))) SVChSet = gsl_getSystemTextEncoding();
-            else if (comphelper::string::isAsciiDecimalString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.toInt32());
+            else if (comphelper::string::isdigitAsciiString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.toInt32());
         }
     }
 }
@@ -1265,7 +1265,7 @@ void SgfFontLst::ReadList()
             FID = aCfg.GetKeyName( i );
             FID = FID.EraseAllChars(); // Leerzeichen weg
             Dsc = aCfg.ReadKey( i );
-            if ( comphelper::string::isAsciiDecimalString(FID) )
+            if ( comphelper::string::isdigitAsciiString(FID) )
             {
                 P=new SgfFontOne;                                   // neuer Eintrag
                 if (Last!=NULL) Last->Next=P; else pList=P; Last=P; // einklinken
commit 48833540eb368cd32fa19eeb917876e5cd815991
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Aug 27 22:15:15 2011 +0100

    track api change

diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
index 0ca2c46..65deff0 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
@@ -288,7 +288,7 @@ const SfxFilter* SfxFilterContainer::aMethod(                   \
 /*N*/ IMPL_CONTAINER_LOOP(
 /*N*/     GetFilter4Extension, const String&,
 /*N*/     pFilter->GetWildcard() != String() && pFilter->GetWildcard() != DEFINE_CONST_UNICODE("*.*") && pFilter->GetWildcard() != '*' &&
-/*N*/   WildCard( ToUpper_Impl( pFilter->GetWildcard()() ), ';' ) == ToUpper_Impl( aArg ))
+/*N*/   WildCard( ToUpper_Impl( pFilter->GetWildcard().getGlob() ), ';' ) == ToUpper_Impl( aArg ))
 
 
 //----------------------------------------------------------------
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
index c1cb8a0..3852859 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
@@ -78,7 +78,7 @@ namespace binfilter {
 
 /*N*/ void SfxFilter::InitMembers_Impl()
 /*N*/ {
-/*N*/   String aExts = GetWildcard()();
+/*N*/   String aExts = GetWildcard().getGlob();
 /*N*/   String aShort, aLong;
 /*N*/   String aRet;
 /*N*/   sal_uInt16 nMaxLength =