sc/prj/build.lst | 4 - sc/source/filter/lotus/lotform.cxx | 84 ++++++++++++++++++------------------- sd/CppunitTest_sd_filters_test.mk | 5 -- sd/Module_sd.mk | 4 - sd/prj/build.lst | 2 5 files changed, 45 insertions(+), 54 deletions(-)
New commits: commit 173ecc14ce4baa6bd2c47ab603066431848afdd2 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Feb 9 14:16:48 2012 +0000 ByteString->rtl::Ostring diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index d649c44..c9457d8 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -47,7 +47,7 @@ extern WKTYP eTyp; static const sal_Char* GetAddInName( const sal_uInt8 nIndex ); -static DefTokenId lcl_KnownAddIn( const ByteString& sTest ); +static DefTokenId lcl_KnownAddIn(const rtl::OString& rTest); //extern double decipher_Number123( sal_uInt32 nValue ); @@ -65,23 +65,23 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri if( eOc == ocNoName ) { - ByteString t; + rtl::OString t; if( pExtString ) { - const ByteString s( "@<<@123>>" ); + const rtl::OString s(RTL_CONSTASCII_STRINGPARAM("@<<@123>>")); t = pExtString; - xub_StrLen n = t.Search( s ); - if( n != STRING_NOTFOUND ) - t.Erase( 0, n + s.Len() ); + sal_Int32 n = t.indexOf(s); + if( n != -1 ) + t = t.copy(n + s.getLength()); t = comphelper::string::stripEnd(t, '('); eOc = lcl_KnownAddIn( t ); if( eOc == ocNoName ) - t.Insert( "L123_", 0 ); + t = rtl::OString(RTL_CONSTASCII_STRINGPARAM("L123_")) + t; } else t = "#UNKNOWN FUNC NAME#"; @@ -1994,79 +1994,77 @@ const sal_Char* GetAddInName( const sal_uInt8 n ) } -DefTokenId lcl_KnownAddIn( const ByteString& sTest ) +DefTokenId lcl_KnownAddIn( const rtl::OString& rTest ) { DefTokenId eId = ocNoName; - if( sTest == "FACT" ) + if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("FACT"))) eId = ocFact; - else if(sTest== "ISEMPTY") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ISEMPTY"))) eId=ocIsEmpty; - else if(sTest== "DEGTORAD") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("DEGTORAD"))) eId=ocRad; - else if(sTest== "RADTODEG") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("RADTODEG"))) eId=ocDeg; - else if(sTest== "SIGN") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SIGN"))) eId=ocPlusMinus; - else if(sTest== "ACOSH") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOSH"))) eId=ocArcCosHyp; - else if(sTest== "ACOTH") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOTH"))) eId=ocArcCotHyp; - else if(sTest== "ASINH") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ASINH"))) eId=ocArcSinHyp; - else if(sTest== "ATANH") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ATANH"))) eId=ocArcTanHyp; - else if(sTest== "COSH") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COSH"))) eId=ocCosHyp; - else if(sTest== "COTH") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COTH"))) eId=ocCotHyp; - else if(sTest== "SINH") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SINH"))) eId=ocSinHyp; - else if(sTest== "TANH") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("TANH"))) eId=ocTanHyp; - else if(sTest== "EVEN") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("EVEN"))) eId=ocIsEven; - else if(sTest== "ODD") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ODD"))) eId=ocIsOdd; - else if(sTest== "ACOT") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOT"))) eId=ocArcCot; - else if(sTest== "COT") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COT"))) eId=ocCot; - else if(sTest== "TRUNC") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("TRUNC"))) eId=ocTrunc; - else if(sTest== "GEOMEAN") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("GEOMEAN"))) eId=ocGeoMean; - else if(sTest== "HARMEAN") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("HARMEAN"))) eId=ocHarMean; - else if(sTest== "CORREL") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CORREL"))) eId=ocCorrel; - else if(sTest== "MEDIAN") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("MEDIAN"))) eId=ocMedian; - else if(sTest== "COV") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COV"))) eId=ocCovar; - else if(sTest== "SKEWNESS") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SKEWNESS"))) eId=ocSchiefe; - else if(sTest== "CHITEST") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CHITEST"))) eId=ocChiTest; - else if(sTest== "FTEST") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("FTEST"))) eId=ocFTest; - else if(sTest== "AVEDEV") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("AVEDEV"))) eId=ocAveDev; - else if(sTest== "PRODUCT") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("PRODUCT"))) eId=ocProduct; - else if(sTest== "PERMUT") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("PERMUT"))) eId=ocVariationen; - else if(sTest== "GAMMALN") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("GAMMALN"))) eId=ocGammaLn; - else if(sTest== "POISSON") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("POISSON"))) eId=ocPoissonDist; - else if(sTest== "NORMAL") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("NORMAL"))) eId=ocNormDist; - else if(sTest== "CRITBINOMIAL") + else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CRITBINOMIAL"))) eId=ocKritBinom; return eId; - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit a54763b4e5539b8450a0d867fbd816dcf23b74ac Author: Caolán McNamara <caol...@redhat.com> Date: Thu Feb 9 14:15:43 2012 +0000 ensure correct sc dependencies diff --git a/sc/prj/build.lst b/sc/prj/build.lst index bbc6303..bf5e7d4 100644 --- a/sc/prj/build.lst +++ b/sc/prj/build.lst @@ -1,2 +1,2 @@ -sc sc : basic filter TRANSLATIONS:translations vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg scripting NULL -sc sc\prj nmake - all sc_prj NULL +sc sc : basic filter TRANSLATIONS:translations vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg scripting chart2 eventattacher forms scaddins xmlsecurity NULL +sc sc\prj nmake - all sc_prj NULL commit bf4484037c4ccb31493c0d863b92ed6dbff9d1ad Author: Caolán McNamara <caol...@redhat.com> Date: Thu Feb 9 13:19:09 2012 +0000 fix filters test dependencies diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index b4de440..54d8310 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -42,8 +42,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sd_filters_test, \ drawinglayer \ editeng \ fileacc \ - for \ - forui \ i18nisolang1 \ msfilter \ oox \ @@ -93,7 +91,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\ dbaccess/util/dba \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ - forms/util/frm \ framework/util/fwk \ i18npool/util/i18npool \ oox/util/oox \ @@ -112,8 +109,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ - xmlsecurity/util/xsec_fw \ - xmlsecurity/util/xmlsecurity \ )) $(eval $(call gb_CppunitTest_add_old_components,sd_filters_test,\ diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index b1dbe0c..d4c080d 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -43,10 +43,8 @@ $(eval $(call gb_Module_add_targets,sd,\ ifneq ($(OS),DRAGONFLY) $(eval $(call gb_Module_add_check_targets,sd,\ CppunitTest_sd_uimpress \ + CppunitTest_sd_filters_test \ )) -# disabled for now, seems to have incomplete deps and hangs on a build from scratch -# CppunitTest_sd_filters_test \ - endif diff --git a/sd/prj/build.lst b/sd/prj/build.lst index 3b37cc6..b4dc93d 100644 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -1,3 +1,3 @@ -sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff NULL +sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess NULL sd sd usr1 - all sd_mkout NULL sd sd\prj nmake - all sd_prj NULL
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits