diff options
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/tool/cellkeytranslator.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/inc/xeescher.hxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/inc/xiescher.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbahelper.cxx | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx index ec010497a1ba..bce3f286c1ce 100644 --- a/sc/source/core/tool/cellkeytranslator.cxx +++ b/sc/source/core/tool/cellkeytranslator.cxx @@ -44,17 +44,17 @@ enum LocaleMatch static LocaleMatch lclLocaleCompare(const Locale& rLocale1, const Locale& rLocale2) { LocaleMatch eMatchLevel = LOCALE_MATCH_NONE; - if ( !rLocale1.Language.compareTo(rLocale2.Language) ) + if ( rLocale1.Language == rLocale2.Language ) eMatchLevel = LOCALE_MATCH_LANG; else return eMatchLevel; - if ( !rLocale1.Country.compareTo(rLocale2.Country) ) + if ( rLocale1.Country == rLocale2.Country ) eMatchLevel = LOCALE_MATCH_LANG_COUNTRY; else return eMatchLevel; - if ( !rLocale1.Variant.compareTo(rLocale2.Variant) ) + if ( rLocale1.Variant == rLocale2.Variant ) eMatchLevel = LOCALE_MATCH_ALL; return eMatchLevel; diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index c358c1fa43eb..58c35c01906a 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -3058,7 +3058,7 @@ void XclImpPictureObj::ReadPictFmla( XclImpStream& rStrm, sal_uInt16 nLinkSize ) if( IsOcxControl() ) { // #i26521# form controls to be ignored - if( maClassName.EqualsAscii( "Forms.HTML:Hidden.1" ) ) + if( maClassName == "Forms.HTML:Hidden.1" ) { SetProcessSdrObj( false ); return; diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 205b4cbf04ab..9c91e7246a46 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/chart/XChartDocument.hpp> #include "svx/sdtaitm.hxx" #include <boost/shared_ptr.hpp> +#include "rtl/ustring.hxx" class ScPostIt; @@ -252,7 +253,7 @@ private: virtual void WriteSubRecs( XclExpStream& rStrm ); private: - String maClassName; /// Class name of the control. + OUString maClassName; /// Class name of the control. sal_uInt32 mnStrmStart; /// Start position in 'Ctls' stream. sal_uInt32 mnStrmSize; /// Size in 'Ctls' stream. }; diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 088c6d500e34..cdb9fd23f80c 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -29,6 +29,8 @@ #include "xistring.hxx" #include <boost/shared_ptr.hpp> #include <oox/ole/olehelper.hxx> +#include "rtl/ustring.hxx" + namespace com { namespace sun { namespace star { namespace drawing { class XShape; } namespace form { class XForm; } @@ -905,7 +907,7 @@ private: private: Graphic maGraphic; /// Picture or OLE placeholder graphic. Rectangle maVisArea; /// Size of graphic. - String maClassName; /// Class name of embedded OLE object. + OUString maClassName; /// Class name of embedded OLE object. sal_uInt32 mnStorageId; /// Identifier of the storage for this object. sal_Size mnCtlsStrmPos; /// Position in 'Ctls' stream for this control. sal_Size mnCtlsStrmSize; /// Size in 'Ctls' stream for this control. diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index d6b5552b3aa0..197b311a4f88 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -563,7 +563,7 @@ ContainerUtilities::FieldInList( const uno::Sequence< OUString >& SearchList, co // I wonder why comparing lexicographically is done // when its a match is whats interesting? //if (SearchList[i].compareTo(SearchString) == 0) - if ( SearchList[i].equals( SearchString ) ) + if ( SearchList[i] == SearchString ) { retvalue = i; break; |