diff options
255 files changed, 695 insertions, 901 deletions
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx index a864fbe463ca..357166c27a7b 100644 --- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/uno/Reference.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/wintypes.hxx> namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard { diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 62896ac4d4ff..70e88d357292 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -637,14 +637,14 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, mbOwnBasMgr = true; OUString aExtension = aInitUrlInetObj.getExtension(); - if( aExtension.compareToAscii( "xlc" ) == COMPARE_EQUAL ) + if( aExtension == "xlc" ) { meInitMode = CONTAINER_INIT_FILE; INetURLObject aLibPathInetObj( aInitUrlInetObj ); aLibPathInetObj.removeSegment(); maLibraryPath = aLibPathInetObj.GetMainURL( INetURLObject::NO_DECODE ); } - else if( aExtension.compareToAscii( "xlb" ) == COMPARE_EQUAL ) + else if( aExtension == "xlb" ) { meInitMode = LIBRARY_INIT_FILE; uno::Reference< embed::XStorage > xDummyStor; @@ -1308,7 +1308,7 @@ void SfxLibraryContainer::checkStorageURL( const OUString& aSourceURL, } INetURLObject aInetObj( aExpandedSourceURL ); OUString aExtension = aInetObj.getExtension(); - if( aExtension.compareToAscii( "xlb" ) == COMPARE_EQUAL ) + if( aExtension == "xlb" ) { // URL to xlb file aLibInfoFileURL = aExpandedSourceURL; diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 0df51e1e1d88..8125ab90521e 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <vcl/window.hxx> #include <toolkit/helper/vclunohelper.hxx> // for SolarMutex diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 7ac81f8f654a..e98c58e8a9a7 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <utility> #include <algorithm> diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 943081c9d5d1..9b0fdc91b69b 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -32,7 +32,7 @@ #include "NumberFormatterWrapper.hxx" #include "RegressionCurveHelper.hxx" #include <rtl/math.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx index 72a7b21ba21d..61e6755f3e90 100644 --- a/chart2/source/tools/ResId.cxx +++ b/chart2/source/tools/ResId.cxx @@ -19,7 +19,6 @@ #include "ResId.hxx" #include "ResourceManager.hxx" -#include <tools/string.hxx> namespace chart { diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index c2c6507ce798..ef480dddd3de 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -71,8 +71,8 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_STAT_CONSTPLUS - SCHATTR_START] = new SvxDoubleItem (0.0, SCHATTR_STAT_CONSTPLUS); ppPoolDefaults[SCHATTR_STAT_CONSTMINUS - SCHATTR_START] = new SvxDoubleItem (0.0, SCHATTR_STAT_CONSTMINUS); ppPoolDefaults[SCHATTR_STAT_INDICATE - SCHATTR_START] = new SvxChartIndicateItem (CHINDICATE_NONE, SCHATTR_STAT_INDICATE); - ppPoolDefaults[SCHATTR_STAT_RANGE_POS - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, String()); - ppPoolDefaults[SCHATTR_STAT_RANGE_NEG - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, String()); + ppPoolDefaults[SCHATTR_STAT_RANGE_POS - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, OUString()); + ppPoolDefaults[SCHATTR_STAT_RANGE_NEG - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, OUString()); ppPoolDefaults[SCHATTR_STAT_ERRORBAR_TYPE - SCHATTR_START] = new SfxBoolItem(SCHATTR_STAT_ERRORBAR_TYPE, true); ppPoolDefaults[SCHATTR_STYLE_DEEP - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_DEEP, 0); diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index d956fde6d165..c2f87a2ade2e 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -35,6 +35,7 @@ #include "FDatabaseMetaDataResultSet.hxx" #include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/types.hxx> +#include <tools/string.hxx> using namespace connectivity::calc; using namespace connectivity::file; diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index bc2e3da7e305..45aaabd7300e 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx @@ -32,6 +32,7 @@ #include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/types.hxx> +#include <tools/string.hxx> #include <ucbhelper/content.hxx> using namespace ::comphelper; diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index 7f0c00c46a15..3e26231dc936 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/ucb/UniversalContentBroker.hpp> #include <com/sun/star/ucb/SortedDynamicResultSetFactory.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <tools/string.hxx> #include <tools/urlobj.hxx> #include "file/FDriver.hxx" #include "file/FTable.hxx" diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index bcaacfaba3fa..902304c4f69a 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -23,18 +23,16 @@ #include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include "connectivity/OSubComponent.hxx" -#ifndef _MAP_ -#include <map> -#endif #include "connectivity/CommonTools.hxx" #include "OTypeInfo.hxx" -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/ucb/XDynamicResultSet.hpp> #include "connectivity/sqlparse.hxx" #include "connectivity/sqliterator.hxx" #include "TConnection.hxx" #include "file/filedllapi.hxx" +#include <map> namespace connectivity { diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index e29d2fb1e597..b18eb0d444be 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -41,6 +41,7 @@ #include <comphelper/propertycontainer.hxx> #include "file/fanalyzer.hxx" #include <comphelper/broadcasthelper.hxx> +#include <tools/string.hxx> #include "TSortIndex.hxx" #define SQL_COLUMN_NOTFOUND STRING_NOTFOUND diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 1a55181f6434..f554ef00afbb 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -218,16 +218,16 @@ void SvxHyperlinkNewDocTp::FillDocumentList () |* |************************************************************************/ -void SvxHyperlinkNewDocTp::GetCurentItemData ( String& aStrURL, String& aStrName, +void SvxHyperlinkNewDocTp::GetCurentItemData ( OUString& rStrURL, String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ) { // get data from dialog-controls - aStrURL = maCbbPath.GetText(); + rStrURL = maCbbPath.GetText(); INetURLObject aURL; - if ( ImplGetURLObject( aStrURL, maCbbPath.GetBaseURL(), aURL ) ) + if ( ImplGetURLObject( rStrURL, maCbbPath.GetBaseURL(), aURL ) ) { - aStrURL = aURL.GetMainURL( INetURLObject::NO_DECODE ); + rStrURL = aURL.GetMainURL( INetURLObject::NO_DECODE ); } GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode ); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index d5092b9f4c60..a5ab744552c4 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -151,15 +151,15 @@ String SvxHyperlinkDocTp::GetCurrentURL () |* |************************************************************************/ -void SvxHyperlinkDocTp::GetCurentItemData ( String& aStrURL, String& aStrName, +void SvxHyperlinkDocTp::GetCurentItemData ( OUString& rStrURL, String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ) { // get data from standard-fields - aStrURL = GetCurrentURL(); + rStrURL = GetCurrentURL(); - if( aStrURL.EqualsIgnoreCaseAscii( sFileScheme ) ) - aStrURL=aEmptyStr; + if( rStrURL.equalsIgnoreAsciiCase( sFileScheme ) ) + rStrURL=""; GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode ); } @@ -198,8 +198,8 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0, GetParent() ); - String aOldURL( GetCurrentURL() ); - if( aOldURL.EqualsIgnoreCaseAscii( sFileScheme, 0, sizeof( sFileScheme ) - 1 ) ) + OUString aOldURL( GetCurrentURL() ); + if( aOldURL.startsWithIgnoreAsciiCase( sFileScheme ) ) { aDlg.SetDisplayDirectory( aOldURL ); } @@ -234,15 +234,15 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl) { if ( GetPathType ( maStrURL ) == Type_ExistsFile || - maStrURL == aEmptyStr || - maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) || - maStrURL.SearchAscii( sHash ) == 0 ) + maStrURL.isEmpty() || + maStrURL.equalsIgnoreAsciiCase( sFileScheme ) || + maStrURL.indexOf( sHash ) == 0 ) { mpMarkWnd->SetError( LERR_NOERROR ); EnterWait(); - if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) ) + if ( maStrURL.equalsIgnoreAsciiCase( sFileScheme ) ) mpMarkWnd->RefreshTree ( aEmptyStr ); else mpMarkWnd->RefreshTree ( maStrURL ); @@ -284,12 +284,12 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl) IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl) { if ( IsMarkWndVisible() && ( GetPathType( maStrURL )==Type_ExistsFile || - maStrURL == aEmptyStr || - maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) ) ) + maStrURL.isEmpty() || + maStrURL.equalsIgnoreAsciiCase( sFileScheme ) ) ) { EnterWait(); - if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) ) + if ( maStrURL.equalsIgnoreAsciiCase( sFileScheme ) ) mpMarkWnd->RefreshTree ( aEmptyStr ); else mpMarkWnd->RefreshTree ( maStrURL ); @@ -352,9 +352,9 @@ void SvxHyperlinkDocTp::SetMarkStr ( const String& aStrMark ) |* |************************************************************************/ -SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType ( String& aStrPath ) +SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType ( const OUString& rStrPath ) { - INetURLObject aURL( aStrPath, INET_PROT_FILE ); + INetURLObject aURL( rStrPath, INET_PROT_FILE ); if( aURL.HasError() ) return Type_Invalid; diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index ab3786a083a7..bbd51e242a91 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -171,11 +171,11 @@ void SvxHyperlinkInternetTp::setFTPUser(const String& rUser, const String& rPass |* |************************************************************************/ -void SvxHyperlinkInternetTp::GetCurentItemData ( String& aStrURL, String& aStrName, +void SvxHyperlinkInternetTp::GetCurentItemData ( OUString& rStrURL, String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ) { - aStrURL = CreateAbsoluteURL(); + rStrURL = CreateAbsoluteURL(); GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode ); } @@ -262,8 +262,8 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl) IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl) { - String aStrLogin ( maEdLogin.GetText() ); - if ( aStrLogin.EqualsIgnoreCaseAscii( sAnonymous ) ) + OUString aStrLogin ( maEdLogin.GetText() ); + if ( aStrLogin.equalsIgnoreAsciiCase( sAnonymous ) ) { maCbAnonymous.Check(); ClickAnonymousHdl_Impl(NULL); @@ -492,11 +492,11 @@ void SvxHyperlinkInternetTp::SetOnlineMode( sal_Bool /*bEnable*/ ) // State of target-button in subject to the current url-string // ( Can't display any targets in an document, if there is no // valid url to a document ) - String aStrCurrentTarget(comphelper::string::stripEnd(maCbbTarget.GetText(), ' ')); + OUString aStrCurrentTarget(comphelper::string::stripEnd(maCbbTarget.GetText(), ' ')); - if( aStrCurrentTarget == aEmptyStr || - aStrCurrentTarget.EqualsIgnoreCaseAscii( sHTTPScheme ) || - aStrCurrentTarget.EqualsIgnoreCaseAscii( sHTTPSScheme ) ) + if( aStrCurrentTarget.isEmpty() || + aStrCurrentTarget.equalsIgnoreAsciiCase( sHTTPScheme ) || + aStrCurrentTarget.equalsIgnoreAsciiCase( sHTTPSScheme ) ) maBtTarget.Enable( sal_False ); else maBtTarget.Enable( sal_True ); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index d799c6ce2db5..ef36989d5679 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -136,11 +136,11 @@ void SvxHyperlinkMailTp::FillDlgFields ( String& aStrURL ) |* |************************************************************************/ -void SvxHyperlinkMailTp::GetCurentItemData ( String& aStrURL, String& aStrName, +void SvxHyperlinkMailTp::GetCurentItemData ( OUString& rStrURL, String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ) { - aStrURL = CreateAbsoluteURL(); + rStrURL = CreateAbsoluteURL(); GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode ); } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 2ede80c294dc..762a58110fca 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -414,12 +414,12 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable() return ( (SvxMacroTableDtor*)pHyperlinkItem->GetMacroTbl() ); } -// try to detect the current protocol that is used in aStrURL -String SvxHyperlinkTabPageBase::GetSchemeFromURL( String aStrURL ) +// try to detect the current protocol that is used in rStrURL +OUString SvxHyperlinkTabPageBase::GetSchemeFromURL( const OUString& rStrURL ) { String aStrScheme; - INetURLObject aURL( aStrURL ); + INetURLObject aURL( rStrURL ); INetProtocol aProtocol = aURL.GetProtocol(); // #77696# @@ -427,23 +427,23 @@ String SvxHyperlinkTabPageBase::GetSchemeFromURL( String aStrURL ) // to detect if an Url is valid or not :-( if ( aProtocol == INET_PROT_NOT_VALID ) { - if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTP_SCHEME, 0, 7 ) ) + if ( rStrURL.startsWithIgnoreAsciiCase( INET_HTTP_SCHEME ) ) { aStrScheme = OUString( INET_HTTP_SCHEME ); } - else if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTPS_SCHEME, 0, 8 ) ) + else if ( rStrURL.startsWithIgnoreAsciiCase( INET_HTTPS_SCHEME ) ) { aStrScheme = OUString( INET_HTTPS_SCHEME ); } - else if ( aStrURL.EqualsIgnoreCaseAscii( INET_FTP_SCHEME, 0, 6 ) ) + else if ( rStrURL.startsWithIgnoreAsciiCase( INET_FTP_SCHEME ) ) { aStrScheme = OUString( INET_FTP_SCHEME ); } - else if ( aStrURL.EqualsIgnoreCaseAscii( INET_MAILTO_SCHEME, 0, 7 ) ) + else if ( rStrURL.startsWithIgnoreAsciiCase( INET_MAILTO_SCHEME ) ) { aStrScheme = OUString( INET_MAILTO_SCHEME ); } - else if ( aStrURL.EqualsIgnoreCaseAscii( INET_NEWS_SCHEME, 0, 5 ) ) + else if ( rStrURL.startsWithIgnoreAsciiCase( INET_NEWS_SCHEME ) ) { aStrScheme = OUString( INET_NEWS_SCHEME ); } @@ -492,7 +492,8 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet) // Fill output-ItemSet sal_Bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) { - String aStrURL, aStrName, aStrIntName, aStrFrame; + OUString aStrURL; + String aStrName, aStrIntName, aStrFrame; SvxLinkInsertMode eMode; GetCurentItemData ( aStrURL, aStrName, aStrIntName, aStrFrame, eMode); @@ -563,7 +564,8 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet) HideMarkWnd (); // retrieve data of dialog - String aStrURL, aStrName, aStrIntName, aStrFrame; + OUString aStrURL; + String aStrName, aStrIntName, aStrFrame; SvxLinkInsertMode eMode; GetCurentItemData ( aStrURL, aStrName, aStrIntName, aStrFrame, eMode); diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index 427c42b5ddb9..66a68a1cf0d8 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -29,6 +29,8 @@ #include <com/sun/star/plugin/PluginManager.hpp> #include <com/sun/star/plugin/XPluginManager.hpp> +#include <tools/string.hxx> + using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 609ef3440d3a..c7a29c38ee23 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -22,7 +22,6 @@ #include <vector> #include <boost/ptr_container/ptr_vector.hpp> #include <rtl/ustring.hxx> -#include <tools/string.hxx> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 61c7386ae85c..a04f5ed860d8 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -32,7 +32,7 @@ #include <tools/link.hxx> #include <comphelper/uno3.hxx> #include <comphelper/stl_types.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> namespace svxform { class FmSearchConfigItem; diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 63e9b76518ac..9a5c7bf532c1 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -20,13 +20,13 @@ #ifndef SVX_DBREGISTER_HXX #define SVX_DBREGISTER_HXX -#include "optpath.hxx" -#include <tools/string.hxx> #include <comphelper/stl_types.hxx> -#include <svl/poolitem.hxx> -#include "ControlFocusHelper.hxx" +#include <rtl/ustring.hxx> #include <sfx2/basedlgs.hxx> +#include <svl/poolitem.hxx> #include <svtools/simptabl.hxx> +#include "optpath.hxx" +#include "ControlFocusHelper.hxx" class SvTreeListEntry; namespace svx diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 0f5832a59453..9ae773810a5b 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -48,7 +48,7 @@ private: protected: void FillDlgFields ( String& aStrURL ); - void GetCurentItemData ( String& aStrURL, String& aStrName, + void GetCurentItemData ( OUString& rStrURL, String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 786a422f94b5..0ef62b25e6e2 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -42,7 +42,7 @@ private: FixedText maFtFullURL; ImageButton maBtBrowse; - String maStrURL; + OUString maStrURL; sal_Bool mbMarkWndOpen; @@ -59,11 +59,11 @@ private: enum EPathType { Type_Unknown, Type_Invalid, Type_ExistsFile, Type_File, Type_ExistsDir, Type_Dir }; - EPathType GetPathType ( String& aStrPath ); + EPathType GetPathType ( const OUString& rStrPath ); protected: void FillDlgFields ( String& aStrURL ); - void GetCurentItemData ( String& aStrURL, String& aStrName, + void GetCurentItemData ( OUString& rStrURL, String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); virtual sal_Bool ShouldOpenMarkWnd () {return mbMarkWndOpen;} diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index c79ead82657c..419465d455f7 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -74,7 +74,7 @@ private: protected: virtual void FillDlgFields ( String& aStrURL ); - virtual void GetCurentItemData ( String& aStrURL, String& aStrName, + virtual void GetCurentItemData ( OUString& rStrURL, String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); virtual sal_Bool ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );} diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 9fdb4a5b22ab..0cbc6b2acbaf 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -52,7 +52,7 @@ private: protected: virtual void FillDlgFields ( String& aStrURL ); - virtual void GetCurentItemData ( String& aStrURL, String& aStrName, + virtual void GetCurentItemData ( OUString& rStrURL, String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 8e80f17d2d01..945c104cce29 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -105,7 +105,7 @@ protected: void InitStdControls (); virtual void FillStandardDlgFields ( SvxHyperlinkItem* pHyperlinkItem ); virtual void FillDlgFields ( String& aStrURL ) = 0; - virtual void GetCurentItemData ( String& aStrURL, String& aStrName, + virtual void GetCurentItemData ( OUString& rStrURL, String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ) = 0; virtual String CreateUiNameFromURL( const String& aStrURL ); @@ -118,7 +118,7 @@ protected: String aEmptyStr; - static String GetSchemeFromURL( String aStrURL ); + static OUString GetSchemeFromURL( const OUString& rStrURL ); inline void DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; } diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 73e01e5ad2c1..84dee6977a6a 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -19,15 +19,15 @@ #ifndef _ICCDLG_HXX #define _ICCDLG_HXX +#include <rtl/ustring.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <svtools/ivctrl.hxx> #include <vcl/tabpage.hxx> #include <vcl/msgbox.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/image.hxx> -#include <svtools/ivctrl.hxx> -#include <svl/itempool.hxx> -#include <svl/itemset.hxx> -#include <tools/string.hxx> #include <vector> #define CTRLS_OFFSET 3 diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 12761d031cf5..57dd1d72f150 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -21,17 +21,17 @@ //------------------------------------------------------------------------ -#include <vcl/window.hxx> -#include <tools/color.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <sfx2/tabdlg.hxx> +#include <svx/langbox.hxx> +#include <svx/fontlb.hxx> +#include <tools/color.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> #include <vcl/toolbox.hxx> #include <vcl/field.hxx> -#include <svx/langbox.hxx> -#include <svx/fontlb.hxx> +#include <vcl/window.hxx> //------------------------------------------------------------------------ diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index a8eeed37bd50..03f7a78a1c95 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -22,6 +22,7 @@ // header for TYPEINFO #include <tools/rtti.hxx> +#include <tools/string.hxx> // header for ConfigItem #include <unotools/configitem.hxx> // header for SfxPoolItem diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 4bd0d32a256e..a93f6aacf509 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -20,9 +20,10 @@ #ifndef _OFFAPP_CONNPOOLSETTINGS_HXX_ #define _OFFAPP_CONNPOOLSETTINGS_HXX_ -#include <tools/string.hxx> #include <comphelper/stl_types.hxx> +#include <rtl/ustring.hxx> #include <svl/poolitem.hxx> +#include <tools/string.hxx> //........................................................................ namespace offapp diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 084a17198290..fede730be3c3 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -150,8 +150,8 @@ void _SfxMacroTabPage::EnableButtons() String sEventMacro; sEventMacro = ((SvLBoxString*)pE->GetItem( LB_MACROS_ITEMPOS ))->GetText(); - String sScriptURI = mpImpl->pMacroLB->GetSelectedScriptURI(); - mpImpl->pAssignPB->Enable( !mpImpl->bReadOnly && !sScriptURI.EqualsIgnoreCaseAscii( sEventMacro ) ); + OUString sScriptURI = mpImpl->pMacroLB->GetSelectedScriptURI(); + mpImpl->pAssignPB->Enable( !mpImpl->bReadOnly && !sScriptURI.equalsIgnoreAsciiCase( sEventMacro ) ); } else mpImpl->pAssignPB->Enable( sal_False ); diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 38d513fcd07f..3037e5e01af2 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -94,12 +94,12 @@ sal_Bool ODbaseIndexDialog::GetTable(const String& _rName, TableInfoListIterator { if (m_bCaseSensitiv) { - if (_rPosition->aTableName.Equals(_rName)) + if (_rPosition->aTableName.equals(_rName)) return sal_True; } else { - if (_rPosition->aTableName.EqualsIgnoreCaseAscii(_rName)) + if (_rPosition->aTableName.equalsIgnoreAsciiCase(_rName)) return sal_True; } } @@ -127,7 +127,7 @@ OTableIndex ODbaseIndexDialog::implRemoveIndex(const String& _rName, TableIndexL ++aSearch, ++nPos ) { - if ( m_bCaseSensitiv ? aSearch->GetIndexFileName().Equals(_rName) : aSearch->GetIndexFileName().EqualsIgnoreCaseAscii(_rName) ) + if ( m_bCaseSensitiv ? aSearch->GetIndexFileName().equals(_rName) : aSearch->GetIndexFileName().equalsIgnoreAsciiCase(_rName) ) { aReturn = *aSearch; @@ -425,12 +425,12 @@ void ODbaseIndexDialog::SetCtrls() checkButtons(); } -void OTableInfo::WriteInfFile( const String& rDSN ) const +void OTableInfo::WriteInfFile( const OUString& rDSN ) const { // open INF file INetURLObject aURL; aURL.SetSmartProtocol(INET_PROT_FILE); - String aDsn = rDSN; + OUString aDsn = rDSN; { SvtPathOptions aPathOptions; aDsn = aPathOptions.SubstituteVariable(aDsn); diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 2ee8a043485c..c9cf1f40854c 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -36,15 +36,15 @@ namespace dbaui class OTableIndex { private: - String aIndexFileName; + OUString aIndexFileName; public: OTableIndex() { } OTableIndex( const OTableIndex& _rSource) : aIndexFileName(_rSource.aIndexFileName) { } - OTableIndex( const String& rFileName ) : aIndexFileName( rFileName ) { } + OTableIndex( const OUString& rFileName ) : aIndexFileName( rFileName ) { } - void SetIndexFileName( const String& rFileName ) { aIndexFileName = rFileName; } - String GetIndexFileName() const { return aIndexFileName; } + void SetIndexFileName( const OUString& rFileName ) { aIndexFileName = rFileName; } + OUString GetIndexFileName() const { return aIndexFileName; } }; typedef ::std::list< OTableIndex > TableIndexList; @@ -58,14 +58,14 @@ class OTableInfo { friend class ODbaseIndexDialog; private: - String aTableName; + OUString aTableName; TableIndexList aIndexList; public: OTableInfo() { } - OTableInfo( const String& rName ) : aTableName(rName) { } + OTableInfo( const OUString& rName ) : aTableName(rName) { } - void WriteInfFile( const String& rDSN ) const; + void WriteInfFile( const OUString& rDSN ) const; }; typedef ::std::list< OTableInfo > TableInfoList; diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 51d83a05d60e..6a833b29f7a0 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -20,6 +20,7 @@ #define DBAUI_GENERALUNDO_HXX #include <svl/undo.hxx> +#include <tools/string.hxx> #include "moduledbu.hxx" namespace dbaui diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index a33f4fd33981..16c415601baa 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -88,7 +88,7 @@ namespace dbaui virtual void Command(const CommandEvent& rEvt); OTableWindow* GetTabWin(){ return m_pTabWin; } - SvTreeListEntry* GetEntryFromText( const String& rEntryText ); + SvTreeListEntry* GetEntryFromText( const OUString& rEntryText ); private: using SvTreeListBox::ExecuteDrop; diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 63a6fca44189..d3439342d398 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -329,12 +329,12 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal) { case HTML_O_ALIGN: { - const String& rOptVal = rOption.GetString(); - if (rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right )) + const OUString& rOptVal = rOption.GetString(); + if (rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_right )) eVal = SVX_HOR_JUSTIFY_RIGHT; - else if (rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_center )) + else if (rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_center )) eVal = SVX_HOR_JUSTIFY_CENTER; - else if (rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_left )) + else if (rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_left )) eVal = SVX_HOR_JUSTIFY_LEFT; else eVal = SVX_HOR_JUSTIFY_STANDARD; diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index 4df0a3562b11..593c6fb0f5a5 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -35,7 +35,7 @@ namespace dbaui { { LocalResourceAccess aCharsetStrings( RSC_CHARSETS, RSC_RESOURCE ); - m_aSystemDisplayName = String( ModuleRes( 1 ) ); + m_aSystemDisplayName = ModuleRes( 1 ).toString(); } } diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index 303efe032af1..d3058b90c4f8 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -25,6 +25,7 @@ #include "moduledbu.hxx" #include <svl/undo.hxx> +#include <tools/string.hxx> #include <osl/diagnose.h> #include <boost/scoped_ptr.hpp> diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 652a4c3437d9..6f4d85402ca9 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -572,7 +572,7 @@ void OSelectionBrowseBox::clearEntryFunctionField(const String& _sFieldName,OTab { if ( isFieldNameAsterix( _sFieldName ) && (!_pEntry->isNoneFunction() || _pEntry->IsGroupBy()) ) { - String sFunctionName; + OUString sFunctionName; GetFunctionName(SQL_TOKEN_COUNT,sFunctionName); String sOldLocalizedFunctionName = _pEntry->GetFunction(); if ( !sOldLocalizedFunctionName.Equals(sFunctionName) || _pEntry->IsGroupBy() ) @@ -800,7 +800,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& // do we have a aggregate function and only a function? else if ( SQL_ISRULE(pColumnRef,general_set_fct) ) { - String sLocalizedFunctionName; + OUString sLocalizedFunctionName; if ( GetFunctionName(pColumnRef->getChild(0)->getTokenID(),sLocalizedFunctionName) ) { String sOldLocalizedFunctionName = aSelEntry->GetFunction(); @@ -1052,9 +1052,9 @@ sal_Bool OSelectionBrowseBox::SaveModified() sal_uInt16 nPos = m_pFunctionCell->GetSelectEntryPos(); // these functions are only available in CORE String sFunctionName = m_pFunctionCell->GetEntry(nPos); - String sGroupFunctionName = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1); + OUString sGroupFunctionName = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1); sal_Bool bGroupBy = sal_False; - if ( sGroupFunctionName.Equals(sFunctionName) ) // check if the function name is GROUP + if ( sGroupFunctionName.equals(sFunctionName) ) // check if the function name is GROUP { bGroupBy = sal_True; @@ -1555,7 +1555,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _n if ( pEntry->GetFunctionType() & (FKT_AGGREGATE) ) { - String sFunctionName = pEntry->GetFunction(); + OUString sFunctionName = pEntry->GetFunction(); if ( GetFunctionName(sal_uInt32(-1),sFunctionName) ) pEntry->SetFunction(sFunctionName); } @@ -2211,7 +2211,7 @@ OUString OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const return aText; } -sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId,String& rFkt) +sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId, OUString& rFkt) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); sal_Bool bErg=sal_True; @@ -2268,7 +2268,7 @@ sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId,Strin xub_StrLen i; for ( i = 0; i < nCount-1; i++) // grouping is not counted { - if(rFkt.EqualsIgnoreCaseAscii(m_aFunctionStrings.GetToken(i))) + if(rFkt.equalsIgnoreAsciiCase(m_aFunctionStrings.GetToken(i))) { rFkt = m_aFunctionStrings.GetToken(i); break; @@ -2340,16 +2340,16 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, con break; case BROW_FUNCTION_ROW: { - String sGroupFunctionName = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1); + OUString sGroupFunctionName = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1); pEntry->SetFunction(strNewText); // first reset this two member sal_Int32 nFunctionType = pEntry->GetFunctionType(); nFunctionType &= ~FKT_AGGREGATE; pEntry->SetFunctionType(nFunctionType); - if ( pEntry->IsGroupBy() && !sGroupFunctionName.EqualsIgnoreCaseAscii(strNewText) ) + if ( pEntry->IsGroupBy() && !sGroupFunctionName.equalsIgnoreAsciiCase(strNewText) ) pEntry->SetGroupBy(sal_False); - if ( sGroupFunctionName.EqualsIgnoreCaseAscii(strNewText) ) + if ( sGroupFunctionName.equalsIgnoreAsciiCase(strNewText) ) pEntry->SetGroupBy(sal_True); else if ( strNewText.Len() ) { diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index bce9fce6f13a..6cb5ad3cd582 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -226,7 +226,7 @@ namespace dbaui Rectangle GetInvalidRect( sal_uInt16 nColId ); long GetRealRow(long nRow) const; long GetBrowseRow(long nRowId) const; - sal_Bool GetFunctionName(sal_uInt32 _nFunctionTokenId,String& rFkt); + sal_Bool GetFunctionName(sal_uInt32 _nFunctionTokenId, OUString& rFkt); void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow,sal_Bool& _bListAction); void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow); OTableFields& getFields() const; diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 6e718abe5015..5da7356a41f8 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -80,7 +80,7 @@ OTableWindowListBox::~OTableWindowListBox() m_pTabWin = NULL; } -SvTreeListEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText ) +SvTreeListEntry* OTableWindowListBox::GetEntryFromText( const OUString& rEntryText ) { // iterate through the list SvTreeList* pTreeList = GetModel(); @@ -100,7 +100,7 @@ SvTreeListEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText } while( pEntry ) { - if((bCase ? rEntryText == GetEntryText(pEntry) : rEntryText.EqualsIgnoreCaseAscii(GetEntryText(pEntry)))) + if((bCase ? rEntryText == GetEntryText(pEntry) : rEntryText.equalsIgnoreAsciiCase(GetEntryText(pEntry)))) { return pEntry; } diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 1f6f744e21b4..973d3f6aee72 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; -static CharSet lcl_GetDefaultTextEncodingForRTF() +static rtl_TextEncoding lcl_GetDefaultTextEncodingForRTF() { OUString aLangString( Application::GetSettings().GetLanguageTag().getLanguage()); @@ -463,7 +463,7 @@ void SvxRTFParser::ReadFontTable() OUString sAltNm, sFntNm; sal_Bool bIsAltFntNm = sal_False, bCheckNewFont; - CharSet nSystemChar = lcl_GetDefaultTextEncodingForRTF(); + rtl_TextEncoding nSystemChar = lcl_GetDefaultTextEncodingForRTF(); pFont->SetCharSet( nSystemChar ); SetEncoding( nSystemChar ); @@ -516,7 +516,7 @@ void SvxRTFParser::ReadFontTable() case RTF_FDECOR: pFont->SetFamily( FAMILY_DECORATIVE ); break; - // for technical/symbolic font of the CharSet is changed! + // for technical/symbolic font of the rtl_TextEncoding is changed! case RTF_FTECH: pFont->SetCharSet( RTL_TEXTENCODING_SYMBOL ); // deliberate fall through @@ -526,14 +526,14 @@ void SvxRTFParser::ReadFontTable() case RTF_FCHARSET: if (-1 != nTokenValue) { - CharSet nCharSet = rtl_getTextEncodingFromWindowsCharset( + rtl_TextEncoding nrtl_TextEncoding = rtl_getTextEncodingFromWindowsCharset( (sal_uInt8)nTokenValue); - pFont->SetCharSet(nCharSet); + pFont->SetCharSet(nrtl_TextEncoding); //When we're in a font, the fontname is in the font //charset, except for symbol fonts I believe - if (nCharSet == RTL_TEXTENCODING_SYMBOL) - nCharSet = RTL_TEXTENCODING_DONTKNOW; - SetEncoding(nCharSet); + if (nrtl_TextEncoding == RTL_TEXTENCODING_SYMBOL) + nrtl_TextEncoding = RTL_TEXTENCODING_DONTKNOW; + SetEncoding(nrtl_TextEncoding); } break; case RTF_FPRQ: diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index b1315861e34c..cd52e33e2157 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -44,7 +44,7 @@ void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc, Font rFont.SetStyleName( rDesc.StyleName ); rFont.SetSize( Size( rDesc.Width, rDesc.Height ) ); rFont.SetFamily( (FontFamily)rDesc.Family ); - rFont.SetCharSet( (CharSet)rDesc.CharSet ); + rFont.SetCharSet( (rtl_TextEncoding)rDesc.CharSet ); rFont.SetPitch( (FontPitch)rDesc.Pitch ); rFont.SetOrientation( (short)(rDesc.Orientation*10) ); rFont.SetKerning( rDesc.Kerning ); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 668dcc31a9b5..dbaa913ac0b5 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -1500,9 +1500,9 @@ void BibDataManager::SetMeAsUidListener() OUString theFieldName; for( sal_Int32 i=0; i<nCount; i++ ) { - String aName= pFields[i]; + const OUString& rName = pFields[i]; - if(aName.EqualsIgnoreCaseAscii(StrUID)) + if (rName.equalsIgnoreAsciiCase(StrUID)) { theFieldName=pFields[i]; break; @@ -1544,9 +1544,9 @@ void BibDataManager::RemoveMeAsUidListener() OUString theFieldName; for( sal_Int32 i=0; i<nCount; i++ ) { - String aName= pFields[i]; + const OUString& rName = pFields[i]; - if(aName.EqualsIgnoreCaseAscii(StrUID)) + if (rName.equalsIgnoreAsciiCase(StrUID)) { theFieldName=pFields[i]; break; diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index d8a64739bfd8..f254d28db79d 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -874,7 +874,7 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope for ( sal_uInt16 n=0; n<nCount; n++ ) { BibStatusDispatch *pObj = &aStatusListeners[n]; - if(COMPARE_EQUAL == pObj->aURL.Path.compareToAscii("Bib/MenuFilter")) + if (pObj->aURL.Path == "Bib/MenuFilter") { FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; @@ -889,7 +889,7 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope pObj->xListener->statusChanged( aEvent ); bMenuFilter=sal_True; } - else if(COMPARE_EQUAL == pObj->aURL.Path.compareToAscii("Bib/query")) + else if (pObj->aURL.Path == "Bib/query") { FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 50dbebb419d4..dc0a92146d99 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -548,9 +548,9 @@ namespace pcr if ( xBinding.is() ) { // find a nice name for it - String sBaseName(PcrRes(RID_STR_BINDING_UI_NAME).toString()); + OUString sBaseName(PcrRes(RID_STR_BINDING_UI_NAME).toString()); sBaseName += OUString(" "); - String sNewName; + OUString sNewName; sal_Int32 nNumber = 1; do { diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 9c008cc38b79..08ca0a3539f6 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -24,7 +24,6 @@ #include <cppuhelper/implbase1.hxx> #include <rtl/ustring.hxx> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <vcl/gdimtf.hxx> #include <vcl/metaact.hxx> #include <vcl/metric.hxx> diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 0e1c78fe5587..2db7139db17e 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -19,6 +19,7 @@ #include "Currency.hxx" #include <tools/debug.hxx> +#include <tools/string.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/svapp.hxx> #include <unotools/syslocale.hxx> diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 71f063b08834..9716c532912b 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -58,6 +58,7 @@ #include <rtl/ustrbuf.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> +#include <tools/string.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index d089eef3b363..20689d368b52 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/awt/ActionEvent.hpp> #include <com/sun/star/awt/XActionListener.hpp> +#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> #include <vcl/svapp.hxx> diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 199a13ce045f..cf8d179b1ebf 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -156,20 +156,20 @@ namespace } //----------------------------------------------------------------------------- - String GetFsysExtension_Impl( const String& rFile, const String& rLastFilterExt ) + OUString GetFsysExtension_Impl( const OUString& rFile, const OUString& rLastFilterExt ) { - xub_StrLen nDotPos = rFile.SearchBackward( '.' ); - if ( nDotPos != STRING_NOTFOUND ) + sal_Int32 nDotPos = rFile.lastIndexOf( '.' ); + if ( nDotPos != -1 ) { - if ( rLastFilterExt.Len() ) + if ( !rLastFilterExt.isEmpty() ) { - if ( rFile.Copy( nDotPos + 1 ).EqualsIgnoreCaseAscii( rLastFilterExt ) ) - return String( rLastFilterExt ); + if ( rFile.copy( nDotPos + 1 ).equalsIgnoreAsciiCase( rLastFilterExt ) ) + return rLastFilterExt; } else - return String( rFile.Copy( nDotPos ) ); + return rFile.copy( nDotPos ); } - return String(); + return OUString(); } //----------------------------------------------------------------------------- diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 237c0db7f61e..b03c7e9a1a8e 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -454,7 +454,7 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL& const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException) { - SAL_INFO("fwk.autorecovery", "AutoRecovery::dispatch() starts ..." << OUString(aURL.Complete)); + SAL_INFO("fwk.autorecovery", "AutoRecovery::dispatch() starts ..." << aURL.Complete); // valid request ? sal_Int32 eNewJob = AutoRecovery::implst_classifyJob(aURL); diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index d39c90eed17d..af9776ea9110 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1941,7 +1941,6 @@ sal_Bool Desktop::implcp_ctor( const css::uno::Reference< css::uno::XComponentCo ); } -//***************************************************************************************************************** // We work with valid listener only. sal_Bool Desktop::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { @@ -1951,7 +1950,6 @@ sal_Bool Desktop::implcp_addEventListener( const css::uno::Reference< css::lang: ); } -//***************************************************************************************************************** // We work with valid listener only. sal_Bool Desktop::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index e0d138881f1d..23f8cc58ff14 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -3255,7 +3255,6 @@ sal_Bool Frame::implcp_windowDeactivated( const css::lang::EventObject& aEvent ) ); } -//***************************************************************************************************************** sal_Bool Frame::implcp_disposing( const css::lang::EventObject& aEvent ) { return ( diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index ff9335c2117d..d85ba149bfd5 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -66,7 +66,6 @@ using namespace com::sun::star::container; namespace framework{ -//*********************************************** // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 6d7bf4e6317c..5cb09b9ec20a 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -422,9 +422,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID return pIt; } -//***************************************************************************************************************** // TabWindowService -//***************************************************************************************************************** FwkTabWindow* TabWindowService::mem_TabWin () { FwkTabWindow* pWin = NULL; diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index b8942958cfde..e265e2c04e8b 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -330,7 +330,6 @@ void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Referen xInit->initialize(lInitData); } -//----------------------------------------------- OUString TaskCreatorService::impl_filterNames( const OUString& sName ) { OUString sFiltered; diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 19bca3b684ad..13e42d977696 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -325,11 +325,6 @@ OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL return OUString(); } -//_________________________________________________________________________________________________________________ -// debug methods -//_________________________________________________________________________________________________________________ - - } // namespace framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx index bce450f9c96f..359fc0fa5e15 100644 --- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx @@ -21,7 +21,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index 7cf2311de719..13fb133ddfde 100644 --- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index e38086fc8d28..06d9068cc0ee 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -24,7 +24,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <vcl/font.hxx> #include <basegfx/color/bcolor.hxx> #include <vector> diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index c5c492e85800..7ec841e50134 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -20,8 +20,8 @@ #ifndef _SVX_ACCESSIBLE_EDITABLE_TEXT_PARA_HXX #define _SVX_ACCESSIBLE_EDITABLE_TEXT_PARA_HXX +#include <rtl/ustring.hxx> #include <tools/gen.hxx> -#include <tools/string.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/compbase9.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/include/editeng/AccessibleStringWrap.hxx b/include/editeng/AccessibleStringWrap.hxx index 3252d1533edb..1d0a9a811d09 100644 --- a/include/editeng/AccessibleStringWrap.hxx +++ b/include/editeng/AccessibleStringWrap.hxx @@ -20,10 +20,9 @@ #ifndef _ACCESSIBLESTRINGWRAP_HXX #define _ACCESSIBLESTRINGWRAP_HXX -#include <sal/types.h> -#include <tools/string.hxx> - #include <editeng/editengdllapi.h> +#include <sal/types.h> +#include <rtl/ustring.hxx> class OutputDevice; class SvxFont; diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx index 6fc197fb1394..fef8807e07ec 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -19,9 +19,9 @@ #ifndef _SVX_CSCOITEM_HXX #define _SVX_CSCOITEM_HXX -#include <tools/string.hxx> #include <editeng/colritem.hxx> #include <editeng/editengdllapi.h> +#include <rtl/ustring.hxx> // class SvxCharSetColorItem --------------------------------------------- diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx index 6ddf0e847175..0369c25e80b0 100644 --- a/include/editeng/editstat.hxx +++ b/include/editeng/editstat.hxx @@ -20,7 +20,7 @@ #ifndef _EDITSTAT_HXX #define _EDITSTAT_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <i18nlangtag/lang.h> #define EE_CNTRL_USECHARATTRIBS 0x00000001 // Use of hard character attributes diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index 8f9c7abcb35d..6f87e077ad08 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -19,8 +19,8 @@ #ifndef _EDT_ABSTDLG_HXX #define _EDT_ABSTDLG_HXX +#include <rtl/ustring.hxx> #include <tools/solar.h> -#include <tools/string.hxx> #include <editeng/editengdllapi.h> #include <i18nlangtag/lang.h> #include <com/sun/star/uno/Reference.hxx> diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index e083e86f72e8..0536c79ca33c 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -19,10 +19,10 @@ #ifndef _SVX_FONTITEM_HXX #define _SVX_FONTITEM_HXX +#include <editeng/editengdllapi.h> +#include <rtl/ustring.hxx> #include <svl/poolitem.hxx> -#include <tools/string.hxx> #include <vcl/font.hxx> -#include "editeng/editengdllapi.h" class SvXMLUnitConverter; diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx index 8a64415484a7..153a8fff9bc4 100644 --- a/include/editeng/itemtype.hxx +++ b/include/editeng/itemtype.hxx @@ -23,7 +23,7 @@ #include <editeng/eerdll.hxx> // forward --------------------------------------------------------------- -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/resid.hxx> #include <tools/bigint.hxx> #include <svl/poolitem.hxx> diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 0ed0a841e1d8..d1a9c3412caa 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -19,8 +19,8 @@ #ifndef _SVX_NUMITEM_HXX #define _SVX_NUMITEM_HXX +#include <rtl/ustring.hxx> #include <tools/link.hxx> -#include <tools/string.hxx> #include <svl/poolitem.hxx> #include <editeng/svxenum.hxx> #include <tools/gen.hxx> diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 3b3f18bfea72..b8f1236567d7 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -19,14 +19,12 @@ #ifndef _OUTLINER_HXX #define _OUTLINER_HXX -#include <tools/gen.hxx> -#include <tools/string.hxx> - -#include <svl/brdcst.hxx> - #include <editeng/editdata.hxx> #include <editeng/numitem.hxx> #include <i18nlangtag/lang.h> +#include <rtl/ustring.hxx> +#include <svl/brdcst.hxx> +#include <tools/gen.hxx> #include <tools/color.hxx> #include <tools/contnr.hxx> #include <vcl/graph.hxx> diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx index 8aa45c2157d2..64ffdd2df509 100644 --- a/include/editeng/outlobj.hxx +++ b/include/editeng/outlobj.hxx @@ -22,11 +22,11 @@ ////////////////////////////////////////////////////////////////////////////// -#include <tools/solar.h> -#include <tools/string.hxx> -#include <rsc/rscsfx.hxx> #include <editeng/paragraphdata.hxx> -#include "editeng/editengdllapi.h" +#include <editeng/editengdllapi.h> +#include <rtl/ustring.hxx> +#include <rsc/rscsfx.hxx> +#include <tools/solar.h> class EditTextObject; class ImplOutlinerParaObject; diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 41d07530cabe..3a7855f69b1c 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -19,10 +19,10 @@ #ifndef _SVX_SPLWRAP_HXX #define _SVX_SPLWRAP_HXX +#include <editeng/editengdllapi.h> #include <editeng/svxenum.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.hxx> -#include "editeng/editengdllapi.h" // forward --------------------------------------------------------------- diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 4a5a83a147e9..856c19439c7c 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -20,9 +20,9 @@ #ifndef _SVXRTF_HXX #define _SVXRTF_HXX -#include <tools/string.hxx> #include <svl/itemset.hxx> #include <svtools/parrtf.hxx> +#include <rtl/ustring.hxx> #include <editeng/editengdllapi.h> diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx index 74e2163ac544..fecbb4a6d815 100644 --- a/include/editeng/swafopt.hxx +++ b/include/editeng/swafopt.hxx @@ -20,12 +20,10 @@ #ifndef EE_SVXSWAFOPT_HXX #define EE_SVXSWAFOPT_HXX +#include <editeng/editengdllapi.h> #include <o3tl/sorted_vector.hxx> - -#include <tools/string.hxx> - +#include <rtl/ustring.hxx> #include <vcl/font.hxx> -#include "editeng/editengdllapi.h" class SmartTagMgr; diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index 0a3b6912d9a3..215785a6b2d1 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -22,11 +22,11 @@ #include <com/sun/star/accessibility/TextSegment.hpp> -#include <tools/solar.h> #include <i18nlangtag/lang.h> +#include <rtl/ustring.hxx> #include <tools/gen.hxx> +#include <tools/solar.h> #include <vcl/mapmod.hxx> -#include <tools/string.hxx> #include <tools/color.hxx> #include <svl/poolitem.hxx> #include <svl/itempool.hxx> diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx index a1c24c44d37e..c63f50239323 100644 --- a/include/editeng/unolingu.hxx +++ b/include/editeng/unolingu.hxx @@ -21,7 +21,7 @@ #define _UNO_LINGU_HXX #include <i18nlangtag/lang.h> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <com/sun/star/util/Language.hpp> #include <com/sun/star/linguistic2/XLinguServiceManager2.hpp> #include <com/sun/star/linguistic2/XLinguProperties.hpp> diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx index d543ac33786b..dab61f82eb87 100644 --- a/include/filter/msfilter/rtfutil.hxx +++ b/include/filter/msfilter/rtfutil.hxx @@ -10,10 +10,11 @@ #ifndef INCLUDED_MSFILTER_RTFUTIL_HXX #define INCLUDED_MSFILTER_RTFUTIL_HXX -#include "filter/msfilter/msfilterdllapi.h" +#include <filter/msfilter/msfilterdllapi.h> #include <rtl/string.hxx> +#include <rtl/ustring.hxx> #include <rtl/textenc.h> -#include <tools/string.hxx> +#include <tools/solar.h> namespace msfilter { namespace rtfutil { diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 4cba0ec06e30..0f5c6b32b1a2 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -20,8 +20,8 @@ #ifndef _SVDFPPT_HXX #define _SVDFPPT_HXX +#include <rtl/ustring.hxx> #include <tools/solar.h> -#include <tools/string.hxx> #include <tools/gen.hxx> #include <tools/color.hxx> #include <svx/svdobj.hxx> diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index c1e94da9a7a4..963ca1b568ca 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -20,10 +20,10 @@ #ifndef FORMULA_COMPILER_HXX_INCLUDED #define FORMULA_COMPILER_HXX_INCLUDED -#include "formula/formuladllapi.h" -#include <tools/string.hxx> -#include <tools/debug.hxx> +#include <formula/formuladllapi.h> #include <rtl/ustrbuf.hxx> +#include <rtl/ustring.hxx> +#include <tools/debug.hxx> #include <boost/shared_ptr.hpp> #include <boost/unordered_map.hpp> @@ -34,7 +34,7 @@ #include "formula/grammar.hxx" #include "formula/token.hxx" #include "formula/ExternalReferenceHelper.hxx" - +#include <tools/string.hxx> #define FORMULA_MAXJUMPCOUNT 32 /* maximum number of jumps (ocChose) */ #define FORMULA_MAXTOKENS 8192 /* maximum number of tokens in formula */ diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx index c5d3919366df..d8182a9d64cd 100644 --- a/include/formula/IFunctionDescription.hxx +++ b/include/formula/IFunctionDescription.hxx @@ -24,7 +24,7 @@ #include <memory> #include "formula/formuladllapi.h" #include <rtl/ustring.hxx> -#include <tools/string.hxx> +#include <tools/solar.h> #include <com/sun/star/sheet/XFormulaParser.hpp> #include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp> diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx index d7d60b55d43c..536521a0329e 100644 --- a/include/formula/formdata.hxx +++ b/include/formula/formdata.hxx @@ -20,9 +20,9 @@ #ifndef FORMULA_FORMDATA_HXX #define FORMULA_FORMDATA_HXX -#include <tools/string.hxx> +#include <formula/formuladllapi.h> +#include <rtl/ustring.hxx> #include <tools/gen.hxx> -#include "formula/formuladllapi.h" //============================================================================ namespace formula diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx index c717dd4de34d..41095da99364 100644 --- a/include/formula/formulahelper.hxx +++ b/include/formula/formulahelper.hxx @@ -20,11 +20,11 @@ #ifndef FORMULA_FORMULA_HELPER_HXX #define FORMULA_FORMULA_HELPER_HXX -#include "formula/IFunctionDescription.hxx" +#include <formula/IFunctionDescription.hxx> +#include <formula/formuladllapi.h> +#include <rtl/ustring.hxx> #include <vector> -#include <tools/string.hxx> #include <memory> -#include "formula/formuladllapi.h" class SvtSysLocale; class CharClass; diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx index da5c4dccec2e..546ab574f6a6 100644 --- a/include/linguistic/misc.hxx +++ b/include/linguistic/misc.hxx @@ -35,7 +35,7 @@ #include <cppuhelper/implbase1.hxx> // helper for implementations #include <unotools/pathoptions.hxx> #include <i18nlangtag/lang.h> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <unotools/charclass.hxx> #include <osl/thread.h> #include <osl/mutex.hxx> diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index d9ab7f16fd79..917cc2ced113 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -35,14 +35,12 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <cppuhelper/weak.hxx> +#include <rtl/ustring.hxx> +#include <svl/lstner.hxx> #include <tools/link.hxx> #include <tools/stream.hxx> -#include <tools/string.hxx> -#include <svl/lstner.hxx> - -#include <cppuhelper/weak.hxx> #include <ucbhelper/content.hxx> - #include <vector> class SvKeyValueIterator; @@ -78,17 +76,6 @@ public: StreamMode nOpenMode, const SfxFilter *pFilter = 0, SfxItemSet *pSet = 0 ); - //TODO: the next, non-defined overload is only there to - // detect uses of the above (String, StreamMode, etc.) - // overload from when it still had an additional third - // parameter sal_Bool bDirect, where now a leftover - // "false" or "sal_False" could be mistaken for a null - // pointer argument for the pFilter parameter; it can be - // removed once we are confident all old uses of the - // original overload have been adapted (in platform - // specific code etc.): - SfxMedium(String const &, StreamMode, void *) - SAL_DELETED_FUNCTION; /** * @param pSet does NOT take ownership diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx index bd2d41e92da8..2470155462e8 100644 --- a/include/sfx2/docfilt.hxx +++ b/include/sfx2/docfilt.hxx @@ -19,23 +19,22 @@ #ifndef _SFX_DOCFILT_HACK_HXX #define _SFX_DOCFILT_HACK_HXX -#include <sal/config.h> -#include <sfx2/dllapi.h> -#include <sal/types.h> -#include <tools/solar.h> -#include <tools/string.hxx> #include <com/sun/star/plugin/PluginDescription.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp> #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/uno/RuntimeException.hpp> +#include <comphelper/documentconstants.hxx> +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sal/types.h> +#include <sfx2/dllapi.h> +#include <sfx2/sfxdefs.hxx> +#include <tools/solar.h> #include <tools/wldcrd.hxx> -#include <comphelper/documentconstants.hxx> #define SFX_FILTER_STARTPRESENTATION 0x20000000L -#include <sfx2/sfxdefs.hxx> - class SfxFilterContainer; class SotStorage; diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index beee0aff0138..414991d7728d 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -20,13 +20,12 @@ #ifndef _SFX_DOCINSERT_HXX #define _SFX_DOCINSERT_HXX +#include <rtl/ustring.hxx> +#include <sfx2/dllapi.h> #include <tools/errcode.hxx> #include <tools/link.hxx> -#include <tools/string.hxx> #include <vector> -#include "sfx2/dllapi.h" - namespace sfx2 { class FileDialogHelper; } class SfxMedium; class SfxItemSet; diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx index f79a4b5f327b..cc3fc4e0ea74 100644 --- a/include/sfx2/doctempl.hxx +++ b/include/sfx2/doctempl.hxx @@ -19,11 +19,11 @@ #ifndef _SFXDOCTEMPL_HXX #define _SFXDOCTEMPL_HXX -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include "sal/types.h" +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sal/types.h> +#include <sfx2/dllapi.h> #include <tools/ref.hxx> -#include <tools/string.hxx> // CLASS ----------------------------------------------------------------- diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index 67fbc847bceb..f178a40544cd 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -22,7 +22,6 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include "sfx2/sfx.hrc" -#include <tools/string.hxx> #include <svl/hint.hxx> #include <unotools/eventcfg.hxx> #include <rtl/ustring.hxx> diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index b2944162c008..163eef9a1388 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> #include <tools/solar.h> -#include <tools/string.hxx> #include <tools/errcode.hxx> #include <vcl/dialog.hxx> #include <vcl/edit.hxx> diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 7bff40381ee9..510f79bdd664 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -54,11 +54,12 @@ namespace com } } } -#include <tools/ref.hxx> -#include <tools/string.hxx> + +#include <comphelper/namedvaluecollection.hxx> +#include <rtl/ustring.hxx> #include <svl/brdcst.hxx> #include <svl/poolitem.hxx> -#include <comphelper/namedvaluecollection.hxx> +#include <tools/ref.hxx> #include <vector> class SvBorder; diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index dae89392d709..7837849f8768 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -19,14 +19,13 @@ #ifndef _SFX_FRMDESCRHXX #define _SFX_FRMDESCRHXX -#include "sal/config.h" -#include "sfx2/dllapi.h" - +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sfx2/dllapi.h> #include <sfx2/sfxsids.hrc> #include <svl/poolitem.hxx> -#include <tools/urlobj.hxx> -#include <tools/string.hxx> #include <tools/gen.hxx> +#include <tools/urlobj.hxx> class SvStream; struct SfxFrameDescriptor_Impl; diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index f8ddc888d242..909a5ae09823 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.hxx @@ -19,13 +19,12 @@ #ifndef _LINKMGR_HXX #define _LINKMGR_HXX -#include "sal/config.h" -#include "sfx2/dllapi.h" +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sfx2/dllapi.h> #include <sfx2/linksrc.hxx> -#include <tools/string.hxx> - -#include <vector> #include <set> +#include <vector> class SfxObjectShell; class Graphic; diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index 5b8d1b1d8c2e..71ccb16b8888 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -20,12 +20,12 @@ #define _LNKBASE_HXX #include <com/sun/star/io/XInputStream.hpp> -#include "sal/config.h" -#include "sfx2/dllapi.h" +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sfx2/dllapi.h> +#include <sfx2/linksrc.hxx> #include <sot/exchange.hxx> #include <tools/ref.hxx> -#include <tools/string.hxx> -#include <sfx2/linksrc.hxx> namespace com { namespace sun { namespace star { namespace uno { diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx index 87f3d09010e4..ff89a4d5cc0b 100644 --- a/include/sfx2/mailmodelapi.hxx +++ b/include/sfx2/mailmodelapi.hxx @@ -19,12 +19,12 @@ #ifndef INCLUDED_SFX_MAILMODEL_HXX #define INCLUDED_SFX_MAILMODEL_HXX -#include <vector> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> -#include "tools/link.hxx" -#include <tools/string.hxx> -#include "sfx2/dllapi.h" +#include <rtl/ustring.hxx> +#include <sfx2/dllapi.h> +#include <tools/link.hxx> +#include <vector> // class AddressList_Impl ------------------------------------------------ typedef ::std::vector< OUString > AddressList_Impl; diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx index 1e70ae99cf2f..e324946c4164 100644 --- a/include/sfx2/mieclip.hxx +++ b/include/sfx2/mieclip.hxx @@ -20,11 +20,11 @@ #ifndef _MIECLIP_HXX #define _MIECLIP_HXX -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include "sal/types.h" +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sal/types.h> +#include <sfx2/dllapi.h> #include <tools/solar.h> -#include <tools/string.hxx> class SvStream; class SotDataObject; diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index f08bb68824e2..41780767474f 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -19,10 +19,11 @@ #ifndef _SFX_MINFITEM_HXX #define _SFX_MINFITEM_HXX -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include <tools/string.hxx> +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sfx2/dllapi.h> #include <svl/poolitem.hxx> + class BasicManager; class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index c2b7d2b3e5ad..5fa53213e559 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.hxx @@ -19,8 +19,12 @@ #ifndef _SFXMNUITEM_HXX #define _SFXMNUITEM_HXX -#include "sal/config.h" -#include "sfx2/dllapi.h" +#include <com/sun/star/frame/XDispatch.hpp> +#include <com/sun/star/util/URL.hpp> +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sfx2/ctrlitem.hxx> +#include <sfx2/dllapi.h> class SfxVirtualMenu; class SfxBindings; @@ -30,11 +34,6 @@ class PopupMenu; class SfxUnoMenuControl; class SfxUnoControllerItem; struct SfxMenuCtrlFactory; -#include <tools/string.hxx> -#include <sfx2/ctrlitem.hxx> - -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/util/URL.hpp> class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem { diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx index 891bcac0402b..9f0a4eb84c4e 100644 --- a/include/sfx2/msgpool.hxx +++ b/include/sfx2/msgpool.hxx @@ -19,13 +19,11 @@ #ifndef _SFXMSGPOOL_HXX #define _SFXMSGPOOL_HXX -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include "sal/types.h" - +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sal/types.h> +#include <sfx2/dllapi.h> #include <sfx2/msg.hxx> -#include <tools/string.hxx> - #include <string> #include <vector> diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index 3a0a81b59d1f..f852a0009a6a 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -19,15 +19,12 @@ #ifndef _SFXOBJFACE_HXX #define _SFXOBJFACE_HXX -#include "sal/config.h" - -#include "rtl/ustring.hxx" -#include "sfx2/dllapi.h" -#include "sal/types.h" -#include <tools/string.hxx> -#include <tools/resid.hxx> - +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sal/types.h> +#include <sfx2/dllapi.h> #include <sfx2/msg.hxx> +#include <tools/resid.hxx> struct SfxFormalArgument; struct SfxInterface_Impl; diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index a3e059bb3a62..b5455a8216ad 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -19,17 +19,15 @@ #ifndef _SFX_SHELL_HXX #define _SFX_SHELL_HXX -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include "sal/types.h" #include <com/sun/star/embed/VerbDescriptor.hpp> +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sal/types.h> +#include <sfx2/dllapi.h> +#include <sfx2/sfxuno.hxx> +#include <svl/brdcst.hxx> #include <tools/debug.hxx> #include <tools/rtti.hxx> -#include <svl/brdcst.hxx> - -#include <tools/string.hxx> - -#include <sfx2/sfxuno.hxx> class ResMgr; class Window; diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx index 67beb335833a..69915308004f 100644 --- a/include/sfx2/styfitem.hxx +++ b/include/sfx2/styfitem.hxx @@ -19,13 +19,12 @@ #ifndef _SFX_STYFITEM_HXX #define _SFX_STYFITEM_HXX -#include "sal/config.h" -#include "sfx2/dllapi.h" - +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sfx2/dllapi.h> #include <vcl/bitmap.hxx> #include <vcl/image.hxx> #include <tools/rc.hxx> -#include <tools/string.hxx> #include <rsc/rscsfx.hxx> #include <vector> diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx index 93278038fec5..30fa06ea2dbe 100644 --- a/include/sfx2/tplpitem.hxx +++ b/include/sfx2/tplpitem.hxx @@ -19,12 +19,12 @@ #ifndef _SFX_TPLPITEM_HXX #define _SFX_TPLPITEM_HXX -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include <tools/string.hxx> -#include <tools/rtti.hxx> +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sfx2/dllapi.h> #include <svl/flagitem.hxx> #include <svl/style.hrc> +#include <tools/rtti.hxx> class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem { diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx index 7ff45729dad1..a4184c15dc2f 100644 --- a/include/sfx2/viewfac.hxx +++ b/include/sfx2/viewfac.hxx @@ -19,9 +19,9 @@ #ifndef _VIEWFAC_HXX #define _VIEWFAC_HXX -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include <tools/string.hxx> +#include <rtl/ustring.hxx> +#include <sal/config.h> +#include <sfx2/dllapi.h> #include <tools/resid.hxx> class SfxViewFrame; diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 4fba3e33b213..4ce510ad133f 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -20,12 +20,11 @@ #ifndef _SFXITEMPOOL_HXX #define _SFXITEMPOOL_HXX -#include "svl/svldllapi.h" - #include <limits.h> -#include <tools/solar.h> -#include <tools/string.hxx> +#include <rtl/string.hxx> #include <svl/poolitem.hxx> +#include <svl/svldllapi.h> +#include <tools/solar.h> #include <vector> class SvStream; diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 85e006e7270f..c6c218aec46f 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -21,11 +21,11 @@ // class SvxMacroItem ---------------------------------------------------- -#include "svl/svldllapi.h" +#include <rtl/ustring.hxx> +#include <svl/svldllapi.h> #include <svl/poolitem.hxx> #include <tools/rtti.hxx> #include <tools/debug.hxx> -#include <tools/string.hxx> #include <map> class SvStream; diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx index fdedea036d00..5ed3fbf9838e 100644 --- a/include/svl/nfkeytab.hxx +++ b/include/svl/nfkeytab.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVTOOLS_NFKEYTAB_HXX #include <vector> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> //! For ImpSvNumberformatScan: first the short symbols, then the long symbols! //! e.g. first TT then TTTT @@ -34,7 +34,7 @@ // Note: 2005-09-02: the above applies to the binary file format. // // ER 15.12.99: This table is externally only to be used with method -// String SvNumberformat::GetMappedFormatstring( const NfKeywordTable&, const LocaleDataWrapper& ); +// OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable&, const LocaleDataWrapper& ); // and method // void SvNumberFormatter::FillKeywordTable( NfKeywordTable&, LanguageType ); enum NfKeywordIndex diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index b16775fa9848..80820c51ee57 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -19,9 +19,9 @@ #ifndef _UNDO_HXX #define _UNDO_HXX -#include "svl/svldllapi.h" +#include <svl/svldllapi.h> +#include <rtl/ustring.hxx> #include <tools/rtti.hxx> -#include <tools/string.hxx> #include <boost/scoped_ptr.hpp> diff --git a/include/svl/urlbmk.hxx b/include/svl/urlbmk.hxx index 672a9ec544a0..89d02cb70a29 100644 --- a/include/svl/urlbmk.hxx +++ b/include/svl/urlbmk.hxx @@ -20,8 +20,7 @@ #ifndef _URLBMK_HXX #define _URLBMK_HXX - -#include <tools/string.hxx> +#include <rtl/ustring.hxx> //========================================================================= diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx index e7d9ddc3ab91..34002b3d1701 100644 --- a/include/svx/ParseContext.hxx +++ b/include/svx/ParseContext.hxx @@ -19,12 +19,10 @@ #ifndef SVX_QUERYDESIGNCONTEXT_HXX #define SVX_QUERYDESIGNCONTEXT_HXX -#include "svx/svxdllapi.h" #include <connectivity/IParseContext.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> +#include <svx/svxdllapi.h> #include <unotools/localedatawrapper.hxx> - - #include <vector> namespace svxform diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx index 98ddfc9441ec..9b5647657f77 100644 --- a/include/svx/XPropertyEntry.hxx +++ b/include/svx/XPropertyEntry.hxx @@ -19,8 +19,8 @@ #ifndef _XPROPERTYENTRY_HXX #define _XPROPERTYENTRY_HXX +#include <rtl/ustring.hxx> #include <svx/svxdllapi.h> -#include <tools/string.hxx> #include <vcl/bitmap.hxx> // --------------------- diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx index 5edd213026e7..ab9b8442c231 100644 --- a/include/svx/fmsearch.hxx +++ b/include/svx/fmsearch.hxx @@ -21,16 +21,16 @@ #define _FMSEARCH_HXX #include <com/sun/star/sdbc/XResultSet.hpp> -#include <vcl/dialog.hxx> +#include <comphelper/stl_types.hxx> +#include <comphelper/uno3.hxx> +#include <rtl/ustring.hxx> +#include <svx/svxdllapi.h> #include <vcl/button.hxx> -#include <vcl/fixed.hxx> -#include <vcl/edit.hxx> #include <vcl/combobox.hxx> +#include <vcl/dialog.hxx> +#include <vcl/edit.hxx> +#include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#include <comphelper/uno3.hxx> -#include <comphelper/stl_types.hxx> -#include <tools/string.hxx> -#include "svx/svxdllapi.h" namespace com { namespace sun { namespace star { namespace util { diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index e277f0533f64..be886bc95840 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -20,10 +20,10 @@ #ifndef _SVX_GALLERY1_HXX_ #define _SVX_GALLERY1_HXX_ -#include <tools/string.hxx> -#include <tools/urlobj.hxx> +#include <rtl/ustring.hxx> #include <svl/brdcst.hxx> -#include "svx/svxdllapi.h" +#include <svx/svxdllapi.h> +#include <tools/urlobj.hxx> #include <cstdio> #include <vector> diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index c6e5ce414db8..70efc190c69e 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -19,11 +19,11 @@ #ifndef _SVX_HLNKITEM_HXX #define _SVX_HLNKITEM_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <svl/poolitem.hxx> #include <sfx2/sfxsids.hrc> #include <svl/macitem.hxx> -#include "svx/svxdllapi.h" +#include <svx/svxdllapi.h> #define HYPERDLG_EVENT_MOUSEOVER_OBJECT 0x0001 #define HYPERDLG_EVENT_MOUSECLICK_OBJECT 0x0002 diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index ee96b09a42fc..3ee4a84af154 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -22,6 +22,7 @@ #include <boost/shared_ptr.hpp> #include <vector> #include <editeng/numitem.hxx> +#include <tools/string.hxx> #include <vcl/font.hxx> namespace svx { namespace sidebar { diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 00fa70f9e19b..416112743f3b 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -20,7 +20,6 @@ #define _SVX_PAGEITEM_HXX #include <svl/poolitem.hxx> -#include <tools/string.hxx> #include "svx/svxdllapi.h" diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index eec572efb2f4..11adda2d06f1 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -20,12 +20,11 @@ #ifndef _SVDETC_HXX #define _SVDETC_HXX -#include <tools/string.hxx> - -#include <vcl/outdev.hxx> -#include <tools/shl.hxx> +#include <rtl/ustring.hxx> #include <editeng/outliner.hxx> -#include "svx/svxdllapi.h" +#include <svx/svxdllapi.h> +#include <tools/shl.hxx> +#include <vcl/outdev.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/include/svx/svdglob.hxx b/include/svx/svdglob.hxx index 655fd6093dd9..a028e9f5b65d 100644 --- a/include/svx/svdglob.hxx +++ b/include/svx/svdglob.hxx @@ -20,9 +20,8 @@ #ifndef _SVDGLOB_HXX #define _SVDGLOB_HXX +#include <rtl/ustring.hxx> #include <sal/config.h> -#include <tools/string.hxx> - #include <svx/svxdllapi.h> //************************************************************ diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index faeae356b0e7..d6e2afb0c255 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -20,13 +20,13 @@ #ifndef _SVDMARK_HXX #define _SVDMARK_HXX -#include <vector> - -#include <tools/string.hxx> -#include "svx/svxdllapi.h" +#include <rtl/ustring.hxx> +#include <svx/svxdllapi.h> #include <svx/sdrobjectuser.hxx> +#include <tools/solar.h> #include <set> +#include <vector> class Rectangle; class SdrPage; diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index e3f4f28c3b9d..c8ed6c29dc4b 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -22,12 +22,12 @@ #include <com/sun/star/uno/Sequence.hxx> #include <cppuhelper/weakref.hxx> +#include <rtl/ustring.hxx> #include <sot/storage.hxx> #include <tools/link.hxx> #include <tools/weakbase.hxx> #include <vcl/mapmod.hxx> #include <svl/brdcst.hxx> -#include <tools/string.hxx> #include <tools/datetime.hxx> #include <svl/hint.hxx> diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index b0c623206714..18660b70c6a1 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -22,24 +22,24 @@ #include <memory> #include <typeinfo> -#include <cppuhelper/weakref.hxx> -#include <vcl/mapmod.hxx> -#include <tools/string.hxx> -#include <tools/weakbase.hxx> #include <com/sun/star/uno/Any.hxx> +#include <cppuhelper/weakref.hxx> +#include <rtl/ustring.hxx> #include <svl/lstner.hxx> -#include <vcl/timer.hxx> +#include <svl/poolitem.hxx> #include <svx/svdsob.hxx> #include <svx/svdtypes.hxx> // fuer SdrLayerID #include <svx/svdglue.hxx> // Klebepunkte #include <svx/xdash.hxx> #include <svx/xpoly.hxx> #include <svx/xenum.hxx> -#include <vcl/bitmapex.hxx> #include <svx/sdrobjectuser.hxx> -#include "svx/svxdllapi.h" -#include "svx/shapeproperty.hxx" -#include <svl/poolitem.hxx> +#include <svx/svxdllapi.h> +#include <svx/shapeproperty.hxx> +#include <tools/weakbase.hxx> +#include <vcl/bitmapex.hxx> +#include <vcl/mapmod.hxx> +#include <vcl/timer.hxx> #include <boost/optional.hpp> #include <boost/ptr_container/ptr_vector.hpp> diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 8b11872172c3..a3fba13c8b21 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -21,13 +21,13 @@ #define _SVDPAGV_HXX #include <com/sun/star/awt/XControlContainer.hpp> -#include <tools/string.hxx> +#include <cppuhelper/implbase4.hxx> +#include <rtl/ustring.hxx> #include <svl/lstner.hxx> #include <svx/svdhlpln.hxx> -#include <cppuhelper/implbase4.hxx> #include <svx/svdsob.hxx> #include <svx/svdtypes.hxx> -#include "svx/svxdllapi.h" +#include <svx/svxdllapi.h> #include <cppuhelper/implbase3.hxx> #include <vector> diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index c86fd0d35582..ad9698705ed8 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -20,15 +20,13 @@ #ifndef _SVDTRANS_HXX #define _SVDTRANS_HXX +#include <rtl/ustring.hxx> +#include <svx/svxdllapi.h> +#include <tools/fract.hxx> #include <tools/gen.hxx> #include <tools/poly.hxx> -#include <tools/fract.hxx> - -#include <vcl/mapmod.hxx> -#include <tools/string.hxx> -#include "svx/svxdllapi.h" - #include <vcl/field.hxx> +#include <vcl/mapmod.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/include/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx index 7b9b7f2bd4be..84ef1d244fba 100644 --- a/include/svx/swframeposstrings.hxx +++ b/include/svx/swframeposstrings.hxx @@ -19,8 +19,8 @@ #ifndef _SVXSWFRAMEPOSSTRINGS_HXX #define _SVXSWFRAMEPOSSTRINGS_HXX -#include <tools/string.hxx> -#include "svx/svxdllapi.h" +#include <rtl/ustring.hxx> +#include <svx/svxdllapi.h> /* contains strings needed for positioning dialogs diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx index 32dd1632db51..f69f7f4640fb 100644 --- a/include/svx/txenctab.hxx +++ b/include/svx/txenctab.hxx @@ -19,10 +19,10 @@ #ifndef _SVX_TXENCTAB_HXX #define _SVX_TXENCTAB_HXX -#include <tools/resary.hxx> -#include <tools/string.hxx> #include <rtl/textenc.h> -#include "svx/svxdllapi.h" +#include <rtl/ustring.hxx> +#include <svx/svxdllapi.h> +#include <tools/resary.hxx> //======================================================================== diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 23960e7fb8ea..466ee5d76ac3 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -20,9 +20,9 @@ #ifndef _SVX_XMLEXCHG_HXX_ #define _SVX_XMLEXCHG_HXX_ +#include <rtl/ustring.hxx> #include <svtools/transfer.hxx> -#include <tools/string.hxx> -#include "svx/svxdllapi.h" +#include <svx/svxdllapi.h> namespace com { namespace sun { diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index 5d4463b96b17..baea5fb4cef7 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -20,6 +20,7 @@ #define _XTABLE_HXX #include <rtl/ref.hxx> +#include <rtl/ustring.hxx> #include <svx/xpoly.hxx> #include <svx/xdash.hxx> #include <svx/xhatch.hxx> @@ -28,7 +29,6 @@ #include <svx/xlnasit.hxx> #include <tools/color.hxx> -#include <tools/string.hxx> #include <tools/contnr.hxx> #include <cppuhelper/weak.hxx> diff --git a/include/tools/string.hxx b/include/tools/string.hxx index 435ca9bb9363..a8448e6bd49c 100644 --- a/include/tools/string.hxx +++ b/include/tools/string.hxx @@ -136,7 +136,6 @@ private: TOOLS_DLLPRIVATE UniString& Expand( xub_StrLen nCount, sal_Unicode cExpandChar ); TOOLS_DLLPRIVATE sal_Bool Equals( const sal_Unicode* pCharStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - TOOLS_DLLPRIVATE sal_Bool EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr ) const; TOOLS_DLLPRIVATE xub_StrLen Search( const sal_Unicode* pCharStr, xub_StrLen nIndex = 0 ) const; public: UniString(); @@ -231,16 +230,10 @@ public: xub_StrLen nLen = STRING_LEN ) const; sal_Bool Equals( const UniString& rStr ) const; sal_Bool EqualsAscii( const sal_Char* pAsciiStr ) const; - sal_Bool EqualsIgnoreCaseAscii( const UniString& rStr ) const; - sal_Bool EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const; sal_Bool Equals( const UniString& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const; sal_Bool EqualsAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - sal_Bool EqualsIgnoreCaseAscii( const UniString& rStr, - xub_StrLen nIndex, xub_StrLen nLen ) const; - sal_Bool EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr, - xub_StrLen nIndex, xub_StrLen nLen ) const; xub_StrLen Match( const UniString& rStr ) const; diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx index 076535e5feb6..6154c40c3a19 100644 --- a/include/vcl/FilterConfigItem.hxx +++ b/include/vcl/FilterConfigItem.hxx @@ -23,7 +23,7 @@ #include <vcl/dllapi.h> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Reference.h> diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index d6725202b6e1..62d29e679ce3 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -19,8 +19,8 @@ #ifndef _VCL_ABSTDLG_HXX #define _VCL_ABSTDLG_HXX +#include <rtl/ustring.hxx> #include <tools/solar.h> -#include <tools/string.hxx> #include <vcl/dllapi.h> class Window; diff --git a/include/vcl/controllayout.hxx b/include/vcl/controllayout.hxx index b337ec730f88..84ce03146a0b 100644 --- a/include/vcl/controllayout.hxx +++ b/include/vcl/controllayout.hxx @@ -20,9 +20,9 @@ #ifndef _VCL_CONTROLLAYOUT_HXX #define _VCL_CONTROLLAYOUT_HXX -#include <vector> +#include <rtl/ustring.hxx> #include <tools/gen.hxx> -#include <tools/string.hxx> +#include <vector> #include <vcl/dllapi.h> class Control; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 77a277f17df8..d58bd5dde37d 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -21,6 +21,7 @@ #define _SV_EDIT_HXX #include <tools/solar.h> +#include <tools/string.hxx> #include <vcl/dllapi.h> #include <vcl/timer.hxx> #include <vcl/ctrl.hxx> diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index cae3c1b839ed..1bf9e746f9c1 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -20,9 +20,9 @@ #ifndef _SV_FONT_HXX #define _SV_FONT_HXX +#include <rtl/ustring.hxx> #include <sal/types.h> #include <vcl/dllapi.h> -#include <tools/string.hxx> #include <i18nlangtag/languagetag.hxx> #include <tools/color.hxx> #include <vcl/vclenum.hxx> diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 737229e0066b..a2e2034def15 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -20,11 +20,11 @@ #ifndef _SV_GFXLINK_HXX #define _SV_GFXLINK_HXX -#include <vcl/dllapi.h> +#include <rtl/ustring.hxx> +#include <tools/stream.hxx> #include <tools/solar.h> +#include <vcl/dllapi.h> #include <vcl/mapmod.hxx> -#include <tools/string.hxx> -#include <tools/stream.hxx> // ------------- // - ImpBuffer - diff --git a/include/vcl/graph.h b/include/vcl/graph.h index e6f85432445a..713b303a9225 100644 --- a/include/vcl/graph.h +++ b/include/vcl/graph.h @@ -20,9 +20,9 @@ #ifndef _SV_GRAPH_H #define _SV_GRAPH_H -#include <vcl/dllapi.h> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/solar.h> +#include <vcl/dllapi.h> // --------------- // - GraphicType - diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx index 0ae55a77c514..7fa35aba748d 100644 --- a/include/vcl/i18nhelp.hxx +++ b/include/vcl/i18nhelp.hxx @@ -21,9 +21,9 @@ #define _VCL_I18NHELP_HXX #include <com/sun/star/uno/Reference.h> -#include <osl/mutex.hxx> #include <i18nlangtag/languagetag.hxx> -#include <tools/string.hxx> +#include <osl/mutex.hxx> +#include <rtl/ustring.hxx> #include <vcl/dllapi.h> namespace com { diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index 0e1747b956dc..7b31ff2e0363 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -20,10 +20,10 @@ #ifndef _SV_KEYCODE_HXX #define _SV_KEYCODE_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/solar.h> -#include <vcl/dllapi.h> #include <tools/resid.hxx> +#include <vcl/dllapi.h> #include <vcl/keycodes.hxx> #include <vcl/vclenum.hxx> diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx index f6447254ed60..4d366434717e 100644 --- a/include/vcl/mnemonic.hxx +++ b/include/vcl/mnemonic.hxx @@ -20,10 +20,10 @@ #ifndef _SV_MNEMONIC_HXX #define _SV_MNEMONIC_HXX -#include <vcl/dllapi.h> -#include <tools/string.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/i18n/XCharacterClassification.hpp> +#include <rtl/ustring.hxx> +#include <vcl/dllapi.h> // --------------------- // - ImplMnemonicTypes - diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index 0868da96120e..f39e080643b0 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -23,11 +23,10 @@ #include <vector> #include <boost/unordered_map.hpp> -#include "tools/string.hxx" -#include "tools/stream.hxx" -#include "rtl/string.hxx" - -#include "vcl/dllapi.h" +#include <tools/stream.hxx> +#include <rtl/string.hxx> +#include <rtl/ustring.hxx> +#include <vcl/dllapi.h> #include "com/sun/star/lang/Locale.hpp" diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx index 1be7622cacbe..0a2c76c57687 100644 --- a/include/vcl/quickselectionengine.hxx +++ b/include/vcl/quickselectionengine.hxx @@ -20,10 +20,8 @@ #ifndef VCL_QUICKSELECTIONENGINE_HXX #define VCL_QUICKSELECTIONENGINE_HXX -#include "dllapi.h" - -#include <tools/string.hxx> - +#include <rtl/ustring.hxx> +#include <vcl/dllapi.h> #include <memory> class KeyEvent; diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx index ab48231d23c2..6abd4b0ce6e6 100644 --- a/include/vcl/stdtext.hxx +++ b/include/vcl/stdtext.hxx @@ -20,7 +20,7 @@ #ifndef _VCL_STDTEXT_HXX #define _VCL_STDTEXT_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/solar.h> #include <vcl/dllapi.h> diff --git a/include/vcl/strhelper.hxx b/include/vcl/strhelper.hxx index 078f176fdec0..2b32e0dd6cdc 100644 --- a/include/vcl/strhelper.hxx +++ b/include/vcl/strhelper.hxx @@ -19,12 +19,10 @@ #ifndef _PSPRINT_STRHELPER_HXX_ #define _PSPRINT_STRHELPER_HXX_ -#include "vcl/dllapi.h" - -#include <tools/string.hxx> -#include <rtl/math.hxx> - #include <cstring> +#include <rtl/math.hxx> +#include <rtl/ustring.hxx> +#include <vcl/dllapi.h> namespace psp { diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 9a116d7750ea..ba2cf9e3e973 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -29,8 +29,8 @@ #include <vector> #include <comphelper/solarmutex.hxx> +#include <rtl/ustring.hxx> #include <osl/thread.hxx> -#include <tools/string.hxx> #include <tools/link.hxx> #include <tools/solar.h> #include <vcl/dllapi.h> diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx index bf3f4bf34a30..353fc21902ea 100644 --- a/include/vcl/textdata.hxx +++ b/include/vcl/textdata.hxx @@ -20,10 +20,10 @@ #ifndef _TEXTDATA_HXX #define _TEXTDATA_HXX -#include <vcl/dllapi.h> +#include <rtl/ustring.hxx> #include <svl/brdcst.hxx> #include <svl/smplhint.hxx> -#include <tools/string.hxx> +#include <vcl/dllapi.h> // for Notify, if all paragraphs were deleted #define TEXT_PARA_ALL 0xFFFFFFFF diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index f449670c3030..4b8b920e8147 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -45,11 +45,12 @@ namespace svl class TextLine; class TETextPortion; +#include <rtl/ustring.hxx> #include <svl/brdcst.hxx> +#include <tools/lineend.hxx> #include <tools/link.hxx> -#include <vcl/font.hxx> -#include <tools/string.hxx> #include <tools/gen.hxx> +#include <vcl/font.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/uno/Reference.hxx> diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index e25b6381c9b2..984d264c1ded 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -20,10 +20,11 @@ #ifndef _TEXTVIEW_HXX #define _TEXTVIEW_HXX -#include <vcl/dllapi.h> -#include <vcl/textdata.hxx> #include <tools/gen.hxx> +#include <tools/lineend.hxx> +#include <vcl/dllapi.h> #include <vcl/dndhelp.hxx> +#include <vcl/textdata.hxx> class TextEngine; class OutputDevice; diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index 7245057a82df..18d2eb919d74 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -20,11 +20,11 @@ #ifndef _TXTATTR_HXX #define _TXTATTR_HXX -#include <vcl/dllapi.h> +#include <rtl/ustring.hxx> #include <tools/color.hxx> -#include <vcl/vclenum.hxx> -#include <tools/string.hxx> #include <tools/debug.hxx> +#include <vcl/vclenum.hxx> +#include <vcl/dllapi.h> class Font; diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx index 6d31e188a2d4..4b6c79be2e05 100644 --- a/include/vcl/unohelp2.hxx +++ b/include/vcl/unohelp2.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> #include <cppuhelper/weak.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <osl/mutex.hxx> namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard { diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx index a65915047f3b..1ca8803d7635 100644 --- a/padmin/source/helper.cxx +++ b/padmin/source/helper.cxx @@ -106,9 +106,9 @@ void padmin::FindFiles( const OUString& rDirectory, ::std::list< String >& rResu OUString aSuffix = rSuffixes.getToken( nToken, ';' ); if( aFileName.Len() > aSuffix.getLength()+1 ) { - String aExtension = aFileName.Copy( aFileName.Len()-aSuffix.getLength() ); + OUString aExtension = aFileName.Copy( aFileName.Len()-aSuffix.getLength() ); if( aFileName.GetChar( aFileName.Len()-aSuffix.getLength()-1 ) == '.' && - aExtension.EqualsIgnoreCaseAscii( aSuffix ) ) + aExtension.equalsIgnoreAsciiCase( aSuffix ) ) { rResult.push_back( aFileName ); break; diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index c1cf2d4ca5f1..ca0c8ebcdab4 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/task/XJob.hpp> #include <tools/debug.hxx> +#include <tools/string.hxx> #include <unotools/useroptions.hxx> #include <unotools/tempfile.hxx> #include <unotools/sharedunocomponent.hxx> diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 08f848d4773f..8a7367024902 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -332,7 +332,7 @@ private: virtual void SetError(sal_uInt16 nError); xub_StrLen NextSymbol(bool bInArray); bool IsValue( const String& ); - bool IsOpCode( const String&, bool bInArray ); + bool IsOpCode( const OUString&, bool bInArray ); bool IsOpCode2( const String& ); bool IsString(); bool IsReference( const String& ); diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index 242bb89a2bb2..a3114aab5ae7 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -21,6 +21,7 @@ #define SC_SCDOCPOL_HXX #include <svl/itempool.hxx> +#include <tools/string.hxx> #include "scdllapi.h" class ScStyleSheet; diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 72189af1ea9d..180912b147fb 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -671,7 +671,7 @@ SC_DLLPUBLIC static xub_StrLen FindUnquoted( const String& rString, sal */ SC_DLLPUBLIC static const sal_Unicode* FindUnquoted( const sal_Unicode* pString, sal_Unicode cChar, sal_Unicode cQuote = '\'' ); - static CharSet GetCharsetValue( const String& rCharSet ); + static CharSet GetCharsetValue( const OUString& rCharSet ); static String GetCharsetString( CharSet eVal ); /// a "ReadOnly" formatter for UNO/XML export diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx index db7be4a5d450..4ea65bccb138 100644 --- a/sc/inc/progress.hxx +++ b/sc/inc/progress.hxx @@ -21,6 +21,7 @@ #define SC_PROGRESS_HXX #include <sfx2/progress.hxx> +#include <tools/string.hxx> #include "scdllapi.h" class ScDocument; diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 744a589adc1a..04e02de4ae54 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -696,26 +696,26 @@ void ScGlobal::Clear() //------------------------------------------------------------------------ -CharSet ScGlobal::GetCharsetValue( const String& rCharSet ) +CharSet ScGlobal::GetCharsetValue( const OUString& rCharSet ) { // new TextEncoding values if ( CharClass::isAsciiNumeric( rCharSet ) ) { - sal_Int32 nVal = rCharSet.ToInt32(); + sal_Int32 nVal = rCharSet.toInt32(); if ( !nVal || nVal == RTL_TEXTENCODING_DONTKNOW ) return osl_getThreadTextEncoding(); return (CharSet) nVal; } // old CharSet values for compatibility - else if (rCharSet.EqualsIgnoreCaseAscii("ANSI") ) return RTL_TEXTENCODING_MS_1252; - else if (rCharSet.EqualsIgnoreCaseAscii("MAC") ) return RTL_TEXTENCODING_APPLE_ROMAN; - else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC") ) return RTL_TEXTENCODING_IBM_850; - else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_437")) return RTL_TEXTENCODING_IBM_437; - else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_850")) return RTL_TEXTENCODING_IBM_850; - else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_860")) return RTL_TEXTENCODING_IBM_860; - else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_861")) return RTL_TEXTENCODING_IBM_861; - else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_863")) return RTL_TEXTENCODING_IBM_863; - else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_865")) return RTL_TEXTENCODING_IBM_865; + else if (rCharSet.equalsIgnoreAsciiCase("ANSI") ) return RTL_TEXTENCODING_MS_1252; + else if (rCharSet.equalsIgnoreAsciiCase("MAC") ) return RTL_TEXTENCODING_APPLE_ROMAN; + else if (rCharSet.equalsIgnoreAsciiCase("IBMPC") ) return RTL_TEXTENCODING_IBM_850; + else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_437")) return RTL_TEXTENCODING_IBM_437; + else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_850")) return RTL_TEXTENCODING_IBM_850; + else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_860")) return RTL_TEXTENCODING_IBM_860; + else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_861")) return RTL_TEXTENCODING_IBM_861; + else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_863")) return RTL_TEXTENCODING_IBM_863; + else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_865")) return RTL_TEXTENCODING_IBM_865; else return osl_getThreadTextEncoding(); } diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 35bfbd788dc1..1a9a9a8c9884 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -2382,7 +2382,7 @@ Label_MaskStateMachine: // Convert symbol to token -bool ScCompiler::IsOpCode( const String& rName, bool bInArray ) +bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray ) { OpCodeHashMap::const_iterator iLook( mxSymbols->getHashMap()->find( rName)); bool bFound = (iLook != mxSymbols->getHashMap()->end()); @@ -2392,9 +2392,9 @@ bool ScCompiler::IsOpCode( const String& rName, bool bInArray ) OpCode eOp = iLook->second; if (bInArray) { - if (rName.Equals(mxSymbols->getSymbol(ocArrayColSep))) + if (rName.equals(mxSymbols->getSymbol(ocArrayColSep))) eOp = ocArrayColSep; - else if (rName.Equals(mxSymbols->getSymbol(ocArrayRowSep))) + else if (rName.equals(mxSymbols->getSymbol(ocArrayRowSep))) eOp = ocArrayRowSep; } aToken.SetOpCode(eOp); @@ -2424,7 +2424,7 @@ bool ScCompiler::IsOpCode( const String& rName, bool bInArray ) static const size_t nOdffAliases = sizeof(aOdffAliases) / sizeof(aOdffAliases[0]); for (size_t i=0; i<nOdffAliases; ++i) { - if (rName.EqualsIgnoreCaseAscii( aOdffAliases[i].pName)) + if (rName.equalsIgnoreAsciiCaseAscii( aOdffAliases[i].pName)) { ScRawToken aToken; aToken.SetOpCode( aOdffAliases[i].eOp); @@ -2819,7 +2819,7 @@ bool ScCompiler::IsMacro( const String& rName ) return false; #else - String aName( rName); + OUString aName( rName); StarBASIC* pObj = 0; SfxObjectShell* pDocSh = pDoc->GetDocumentShell(); @@ -2834,8 +2834,8 @@ bool ScCompiler::IsMacro( const String& rName ) // use only unprefixed name if encountered. BASIC doesn't allow '.' in a // function name so a function "USER.FOO" could not exist, and macro check // is assigned the lowest priority in function name check. - if (FormulaGrammar::isODFF( GetGrammar()) && aName.EqualsIgnoreCaseAscii( "USER.", 0, 5)) - aName.Erase( 0, 5); + if (FormulaGrammar::isODFF( GetGrammar()) && aName.startsWithIgnoreAsciiCase("USER.")) + aName = aName.copy(5); SbxMethod* pMeth = (SbxMethod*) pObj->Find( aName, SbxCLASS_METHOD ); if( !pMeth ) @@ -2850,7 +2850,7 @@ bool ScCompiler::IsMacro( const String& rName ) return false; } ScRawToken aToken; - aToken.SetExternal( aName.GetBuffer() ); + aToken.SetExternal( aName.getStr() ); aToken.eOp = ocMacro; pRawToken = aToken.Clone(); return true; diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 961344a887b3..c914396a90ea 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -388,7 +388,7 @@ void ScInterpreter::ScGetDateDif() { if ( MustHaveParamCount( GetByte(), 3 ) ) { - String aInterval = GetString(); + OUString aInterval = GetString(); double nDate2 = GetDouble(); double nDate1 = GetDouble(); @@ -407,7 +407,7 @@ void ScInterpreter::ScGetDateDif() long dd = nDate2 - nDate1; // Zero difference or number of days can be returned immediately. - if (dd == 0 || aInterval.EqualsIgnoreCaseAscii( "d" )) + if (dd == 0 || aInterval.equalsIgnoreAsciiCase( "d" )) { PushDouble( dd ); return; @@ -426,7 +426,7 @@ void ScInterpreter::ScGetDateDif() m2 = aDate2.GetMonth(); d2 = aDate2.GetDay(); - if ( aInterval.EqualsIgnoreCaseAscii( "m" ) ) + if ( aInterval.equalsIgnoreAsciiCase( "m" ) ) { // Return number of months. int md = m2 - m1 + 12 * (y2 - y1); @@ -434,7 +434,7 @@ void ScInterpreter::ScGetDateDif() --md; PushInt( md ); } - else if ( aInterval.EqualsIgnoreCaseAscii( "y" ) ) + else if ( aInterval.equalsIgnoreAsciiCase( "y" ) ) { // Return number of years. int yd; @@ -453,7 +453,7 @@ void ScInterpreter::ScGetDateDif() } PushInt( yd ); } - else if ( aInterval.EqualsIgnoreCaseAscii( "md" ) ) + else if ( aInterval.equalsIgnoreAsciiCase( "md" ) ) { // Return number of days, excluding months and years. // This is actually the remainder of days when subtracting years @@ -491,7 +491,7 @@ void ScInterpreter::ScGetDateDif() } PushDouble( nd ); } - else if ( aInterval.EqualsIgnoreCaseAscii( "ym" ) ) + else if ( aInterval.equalsIgnoreAsciiCase( "ym" ) ) { // Return number of months, excluding years. int md = m2 - m1 + 12 * (y2 - y1); @@ -500,7 +500,7 @@ void ScInterpreter::ScGetDateDif() md %= 12; PushInt( md ); } - else if ( aInterval.EqualsIgnoreCaseAscii( "yd" ) ) + else if ( aInterval.equalsIgnoreAsciiCase( "yd" ) ) { // Return number of days, excluding years. @@ -2527,7 +2527,7 @@ void ScInterpreter::ScHyperLink() } } -bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec ) +bool lclConvertMoney( const OUString& aSearchUnit, double& rfRate, int& rnDec ) { struct ConvertInfo { @@ -2556,8 +2556,8 @@ bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec ) }; const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( aConvertTable[0] ); - for ( size_t i = 0; i < nConversionCount; i++ ) - if ( aSearchUnit.EqualsIgnoreCaseAscii( aConvertTable[i].pCurrText ) ) + for ( size_t i = 0; i < nConversionCount; ++i ) + if ( aSearchUnit.equalsIgnoreAsciiCaseAscii( aConvertTable[i].pCurrText ) ) { rfRate = aConvertTable[i].fRate; rnDec = aConvertTable[i].nDec; @@ -2584,8 +2584,8 @@ void ScInterpreter::ScEuroConvert() bool bFullPrecision = false; if ( nParamCount >= 4 ) bFullPrecision = GetBool(); - String aToUnit( GetString() ); - String aFromUnit( GetString() ); + OUString aToUnit( GetString() ); + OUString aFromUnit( GetString() ); double fVal = GetDouble(); if ( nGlobalError ) PushError( nGlobalError); @@ -2600,11 +2600,11 @@ void ScInterpreter::ScEuroConvert() && lclConvertMoney( aToUnit, fToRate, nToDec ) ) { double fRes; - if ( aFromUnit.EqualsIgnoreCaseAscii( aToUnit ) ) + if ( aFromUnit.equalsIgnoreAsciiCase( aToUnit ) ) fRes = fVal; else { - if ( aFromUnit.EqualsIgnoreCaseAscii( aEur ) ) + if ( aFromUnit.equalsIgnoreAsciiCase( aEur ) ) fRes = fVal * fToRate; else { diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 92c3cfbdc356..02cfe1af9f62 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -56,8 +56,8 @@ #include <svl/stritem.hxx> -#include <tools/string.hxx> #include <rtl/math.hxx> +#include <rtl/ustring.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/charclass.hxx> #include <drwlayer.hxx> @@ -321,7 +321,7 @@ void ImportExcel8::ReadBasic( void ) rFilterOpt.IsLoadExcelBasicExecutable() ) { // see if we have the XCB stream - SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "XCB" ) ), STREAM_STD_READ | STREAM_NOCREATE ); + SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( OUString("XCB"), STREAM_STD_READ | STREAM_NOCREATE ); if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() ) { ScCTBWrapper wrapper; diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index a06aac110735..4239a5e8e39f 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -597,7 +597,7 @@ void ImportExcel::Externname25( void ) if( ( nOpt & 0x0001 ) || ( ( nOpt & 0xFFFE ) == 0x0000 ) ) {// external name - ScfTools::ConvertToScDefinedName( aName ); + aName = ScfTools::ConvertToScDefinedName( aName ); pExcRoot->pExtNameBuff->AddName( aName, mnLastRefIdx ); } else if( nOpt & 0x0010 ) diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 486976c415e0..72fde6c096a2 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -719,7 +719,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< { XclFontData aFontData; GetFontPropSetHelper().ReadFontProperties( aFontData, aCtrlProp, EXC_FONTPROPSET_CONTROL ); - if( (aFontData.maName.Len() > 0) && (aFontData.mnHeight > 0) ) + if( (!aFontData.maName.isEmpty() ) && (aFontData.mnHeight > 0) ) nXclFont = GetFontBuffer().Insert( aFontData, EXC_COLOR_CTRLTEXT ); } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 2c2ece8086b6..257a3dbe035b 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -945,7 +945,7 @@ namespace { sal_uInt32 lclCalcHash( const XclFontData& rFontData ) { - sal_uInt32 nHash = rFontData.maName.Len(); + sal_uInt32 nHash = rFontData.maName.getLength(); nHash += rFontData.maColor.GetColor() * 2; nHash += rFontData.mnWeight * 3; nHash += rFontData.mnCharSet * 5; @@ -975,7 +975,7 @@ XclExpFont::XclExpFont( const XclExpRoot& rRoot, // hash value for faster comparison mnHash = lclCalcHash( maData ); // record size - sal_Size nStrLen = maData.maName.Len(); + sal_Int32 nStrLen = maData.maName.getLength(); SetRecSize( ((GetBiff() == EXC_BIFF8) ? (nStrLen * 2 + 1) : nStrLen) + 15 ); } @@ -1003,7 +1003,7 @@ void XclExpFont::WriteBody( XclExpStream& rStrm ) ::set_flag( nAttr, EXC_FONTATTR_OUTLINE, maData.mbOutline ); ::set_flag( nAttr, EXC_FONTATTR_SHADOW, maData.mbShadow ); - OSL_ENSURE( maData.maName.Len() < 256, "XclExpFont::WriteBody - font name too long" ); + OSL_ENSURE( maData.maName.getLength() < 256, "XclExpFont::WriteBody - font name too long" ); XclExpString aFontName; if( GetBiff() <= EXC_BIFF5 ) aFontName.AssignByte( maData.maName, GetTextEncoding(), EXC_STR_8BITLENGTH ); @@ -1142,7 +1142,7 @@ void XclExpFontBuffer::SaveXml( XclExpXmlStream& rStrm ) void XclExpFontBuffer::InitDefaultFonts() { XclFontData aFontData; - aFontData.maName.AssignAscii( "Arial" ); + aFontData.maName = "Arial"; aFontData.SetScFamily( FAMILY_DONTKNOW ); aFontData.SetFontEncoding( ScfTools::GetSystemTextEncoding() ); aFontData.SetScHeight( 200 ); // 200 twips = 10 pt diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 813b64dae119..c598c5af3867 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -342,12 +342,12 @@ XclImpExtName::XclImpExtName( const XclImpSupbook& rSupbook, XclImpStream& rStrm maName = rStrm.GetRoot().GetScAddInName( maName ); } else if ( (eSubType == EXC_SBTYPE_EUROTOOL) && - maName.EqualsIgnoreCaseAscii( "EUROCONVERT" ) ) + maName.equalsIgnoreAsciiCase( "EUROCONVERT" ) ) meType = xlExtEuroConvert; else { meType = xlExtName; - ScfTools::ConvertToScDefinedName( maName ); + maName = ScfTools::ConvertToScDefinedName( maName ); } } else diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index c3a39c2c351f..66bc030f8c66 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -124,8 +124,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : else { // any other name - maScName = maXclName; - ScfTools::ConvertToScDefinedName( maScName ); + maScName = ScfTools::ConvertToScDefinedName( maXclName ); } // add index for local names diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index c1d9d361fb34..74cf2a429a53 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -300,7 +300,7 @@ void XclImpFont::FillToItemSet( SfxItemSet& rItemSet, XclFontItemType eType, boo // Font item // #i36997# do not set default Tahoma font from notes - bool bDefNoteFont = (eType == EXC_FONTITEM_NOTE) && (maData.maName.EqualsIgnoreCaseAscii( "Tahoma" )); + bool bDefNoteFont = (eType == EXC_FONTITEM_NOTE) && (maData.maName.equalsIgnoreAsciiCase( "Tahoma" )); if( mbFontNameUsed && !bDefNoteFont ) { rtl_TextEncoding eFontEnc = maData.GetFontEncoding(); @@ -499,12 +499,12 @@ XclImpFontBuffer::XclImpFontBuffer( const XclImpRoot& rRoot ) : case EXC_BIFF3: case EXC_BIFF4: case EXC_BIFF5: - aCtrlFontData.maName.AssignAscii( "Helv" ); + aCtrlFontData.maName = "Helv"; aCtrlFontData.mnHeight = 160; aCtrlFontData.mnWeight = EXC_FONTWGHT_BOLD; break; case EXC_BIFF8: - aCtrlFontData.maName.AssignAscii( "Tahoma" ); + aCtrlFontData.maName = "Tahoma"; aCtrlFontData.mnHeight = 160; aCtrlFontData.mnWeight = EXC_FONTWGHT_NORMAL; break; @@ -520,7 +520,7 @@ void XclImpFontBuffer::Initialize() // application font for column width calculation, later filled with first font from font list XclFontData aAppFontData; - aAppFontData.maName.AssignAscii( "Arial" ); + aAppFontData.maName = "Arial"; aAppFontData.mnHeight = 200; aAppFontData.mnWeight = EXC_FONTWGHT_NORMAL; UpdateAppFont( aAppFontData, false ); diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 5364c79330ae..94a2550f165e 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -188,7 +188,7 @@ XclFontData::XclFontData( const SvxFont& rFont ) void XclFontData::Clear() { - maName.Erase(); + maName = ""; maStyle.Erase(); maColor.SetColor( COL_AUTO ); mnHeight = 0; @@ -239,7 +239,7 @@ FontFamily XclFontData::GetScFamily( rtl_TextEncoding eDefTextEnc ) const default: eScFamily = ((eDefTextEnc == RTL_TEXTENCODING_APPLE_ROMAN) && - (maName.EqualsIgnoreCaseAscii( "Geneva" ) || maName.EqualsIgnoreCaseAscii( "Chicago" ))) ? + (maName.equalsIgnoreAsciiCase( "Geneva" ) || maName.equalsIgnoreAsciiCase( "Chicago" ))) ? FAMILY_SWISS : FAMILY_DONTKNOW; } return eScFamily; diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index b207769f8587..51b4278a14cd 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -503,13 +503,13 @@ OUString XclTools::GetBuiltInDefNameXml( sal_Unicode cBuiltIn ) sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName ) { sal_Int32 nPrefixLen = maDefNamePrefix.getLength(); - if( String(rDefName).EqualsIgnoreCaseAscii( maDefNamePrefix, 0, nPrefixLen ) ) + if( rDefName.startsWithIgnoreAsciiCase( maDefNamePrefix ) ) { for( sal_Unicode cBuiltIn = 0; cBuiltIn < EXC_BUILTIN_UNKNOWN; ++cBuiltIn ) { OUString aBuiltInName(GetXclBuiltInDefName(cBuiltIn)); sal_Int32 nBuiltInLen = aBuiltInName.getLength(); - if( String(rDefName).EqualsIgnoreCaseAscii( aBuiltInName, nPrefixLen, nBuiltInLen ) ) + if( rDefName.matchIgnoreAsciiCase( aBuiltInName, nPrefixLen ) ) { // name can be followed by underline or space character xub_StrLen nNextCharPos = nPrefixLen + nBuiltInLen; @@ -583,9 +583,9 @@ bool XclTools::IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyl sal_Int32 nNextChar = 0; sal_Int32 nPrefixLen = 0; - if( String(rStyleName).EqualsIgnoreCaseAscii( maStyleNamePrefix1, 0, maStyleNamePrefix1.getLength() ) ) + if( rStyleName.startsWithIgnoreAsciiCase( maStyleNamePrefix1 ) ) nPrefixLen = maStyleNamePrefix1.getLength(); - else if( String(rStyleName).EqualsIgnoreCaseAscii( maStyleNamePrefix2, 0, maStyleNamePrefix2.getLength() ) ) + else if( rStyleName.startsWithIgnoreAsciiCase( maStyleNamePrefix2 ) ) nPrefixLen = maStyleNamePrefix2.getLength(); if( nPrefixLen > 0 ) { @@ -594,7 +594,7 @@ bool XclTools::IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyl if( nId != EXC_STYLE_NORMAL ) { OUString aShortName = OUString::createFromAscii(ppcStyleNames[nId]); - if( String(rStyleName).EqualsIgnoreCaseAscii( aShortName, nPrefixLen, aShortName.getLength() ) && + if( rStyleName.matchIgnoreAsciiCase( aShortName, nPrefixLen ) && (nNextChar < nPrefixLen + aShortName.getLength())) { nFoundId = nId; @@ -663,10 +663,10 @@ OUString XclTools::GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_ bool XclTools::IsCondFormatStyleName( const OUString& rStyleName ) { - if( String(rStyleName).EqualsIgnoreCaseAscii( maCFStyleNamePrefix1, 0, maCFStyleNamePrefix1.getLength() ) ) + if( rStyleName.startsWithIgnoreAsciiCase( maCFStyleNamePrefix1 ) ) return true; - if( String(rStyleName).EqualsIgnoreCaseAscii( maCFStyleNamePrefix2, 0, maCFStyleNamePrefix2.getLength() ) ) + if( rStyleName.startsWithIgnoreAsciiCase( maCFStyleNamePrefix2 ) ) return true; return false; diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 3623a7d6e054..496e6a7ec7fd 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -149,17 +149,18 @@ Color ScfTools::GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 /* XXX As in sc/source/core/tool/rangenam.cxx ScRangeData::IsValidName() */ -void ScfTools::ConvertToScDefinedName( String& rName ) +OUString ScfTools::ConvertToScDefinedName(const OUString& rName ) { //fdo#37872: we don't allow points in range names any more - rName.SearchAndReplaceAll(static_cast<sal_Unicode>('.'), + String sName = rName.replace(static_cast<sal_Unicode>('.'), static_cast<sal_Unicode>('_')); - xub_StrLen nLen = rName.Len(); - if( nLen && !ScCompiler::IsCharFlagAllConventions( rName, 0, SC_COMPILER_C_CHAR_NAME ) ) - rName.SetChar( 0, '_' ); + xub_StrLen nLen = sName.Len(); + if( nLen && !ScCompiler::IsCharFlagAllConventions( sName, 0, SC_COMPILER_C_CHAR_NAME ) ) + sName.SetChar( 0, '_' ); for( xub_StrLen nPos = 1; nPos < nLen; ++nPos ) - if( !ScCompiler::IsCharFlagAllConventions( rName, nPos, SC_COMPILER_C_NAME ) ) - rName.SetChar( nPos, '_' ); + if( !ScCompiler::IsCharFlagAllConventions( sName, nPos, SC_COMPILER_C_NAME ) ) + sName.SetChar( nPos, '_' ); + return sName; } // *** streams and storages *** ----------------------------------------------- @@ -331,17 +332,17 @@ bool ScfTools::IsHTMLTablesName( const OUString& rSource ) return rSource.equalsIgnoreAsciiCase( GetHTMLTablesName() ); } -bool ScfTools::GetHTMLNameFromName( const String& rSource, OUString& rName ) +bool ScfTools::GetHTMLNameFromName( const OUString& rSource, OUString& rName ) { rName = ""; - if( rSource.EqualsIgnoreCaseAscii( GetHTMLNamePrefix(), 0, GetHTMLNamePrefix().Len() ) ) + if( rSource.startsWithIgnoreAsciiCase( GetHTMLNamePrefix() ) ) { - rName = rSource.Copy( GetHTMLNamePrefix().Len() ); + rName = rSource.copy( GetHTMLNamePrefix().Len() ); ScGlobal::AddQuotes( rName, '"', false ); } - else if( rSource.EqualsIgnoreCaseAscii( GetHTMLIndexPrefix(), 0, GetHTMLIndexPrefix().Len() ) ) + else if( rSource.startsWithIgnoreAsciiCase( GetHTMLIndexPrefix() ) ) { - OUString aIndex( rSource.Copy( GetHTMLIndexPrefix().Len() ) ); + OUString aIndex( rSource.copy( GetHTMLIndexPrefix().Len() ) ); if( CharClass::isAsciiNumeric( aIndex ) && (aIndex.toInt32() > 0) ) rName = aIndex; } diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index f28039b92baf..1a1775a10b51 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -2645,12 +2645,12 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& case HTML_O_ALIGN: { SvxCellHorJustify eVal = SVX_HOR_JUSTIFY_STANDARD; - const String& rOptVal = itr->GetString(); - if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) ) + const OUString& rOptVal = itr->GetString(); + if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_right ) ) eVal = SVX_HOR_JUSTIFY_RIGHT; - else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) ) + else if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_center ) ) eVal = SVX_HOR_JUSTIFY_CENTER; - else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_left ) ) + else if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_left ) ) eVal = SVX_HOR_JUSTIFY_LEFT; if( eVal != SVX_HOR_JUSTIFY_STANDARD ) rItemSet.Put( SvxHorJustifyItem( eVal, ATTR_HOR_JUSTIFY ) ); @@ -2660,12 +2660,12 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& case HTML_O_VALIGN: { SvxCellVerJustify eVal = SVX_VER_JUSTIFY_STANDARD; - const String& rOptVal = itr->GetString(); - if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_VA_top ) ) + const OUString& rOptVal = itr->GetString(); + if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_VA_top ) ) eVal = SVX_VER_JUSTIFY_TOP; - else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_VA_middle ) ) + else if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_VA_middle ) ) eVal = SVX_VER_JUSTIFY_CENTER; - else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_VA_bottom ) ) + else if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_VA_bottom ) ) eVal = SVX_VER_JUSTIFY_BOTTOM; if( eVal != SVX_VER_JUSTIFY_STANDARD ) rItemSet.Put( SvxVerJustifyItem( eVal, ATTR_VER_JUSTIFY ) ); diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index 437c5c754bb6..8ff00864252e 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -22,7 +22,6 @@ #include <boost/ptr_container/ptr_vector.hpp> -#include <tools/string.hxx> #include <rtl/ustring.hxx> #include "address.hxx" diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index f0de420a792c..0a6b7be537a7 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -20,9 +20,10 @@ #ifndef SC_EXCRECDS_HXX #define SC_EXCRECDS_HXX -#include <tools/solar.h> +#include <rtl/string.hxx> +#include <rtl/ustring.hxx> #include <svl/zforlist.hxx> -#include <tools/string.hxx> +#include <tools/solar.h> #include <vcl/vclenum.hxx> diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 9384d415cf87..1e232152315f 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -158,7 +158,7 @@ public: @descr Defined names in Calc may contain letters, digits (*), underscores, periods (*), colons (*), question marks, and dollar signs. (*) = not allowed at first position. */ - static void ConvertToScDefinedName( String& rName ); + static OUString ConvertToScDefinedName( const OUString& rName ); // *** streams and storages *** ----------------------------------------------- @@ -250,7 +250,7 @@ public: @param rSource The string to be determined. @param rName The HTML table name. @return true, if conversion was successful. */ - static bool GetHTMLNameFromName( const String& rSource, OUString& rName ); + static bool GetHTMLNameFromName( const OUString& rSource, OUString& rName ); private: /** Returns the prefix for table index names. */ diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index 8b292247b415..b0e2717f4739 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -21,7 +21,7 @@ #define SC_LOTFNTBF_HXX #include <tools/solar.h> - +#include <tools/string.hxx> #include "scitems.hxx" #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index 06dd7af8247d..ae07457f1b68 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -21,10 +21,7 @@ #define SC_LOTFORM_HXX #include "formel.hxx" -#include <tools/string.hxx> - - - +#include <rtl/ustring.hxx> enum FUNC_TYPE { diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index 8ed34291c8e2..4de38500df66 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -20,7 +20,7 @@ #ifndef SC_LOTIMPOP_HXX #define SC_LOTIMPOP_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include "imp_op.hxx" #include "flttypes.hxx" diff --git a/sc/source/filter/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxx index 4e6d376d5ba5..d6a654eff5e4 100644 --- a/sc/source/filter/inc/qpro.hxx +++ b/sc/source/filter/inc/qpro.hxx @@ -20,9 +20,9 @@ #ifndef SC_QPRO_HXX #define SC_QPRO_HXX +#include <rtl/ustring.hxx> #include <sal/config.h> #include "filter.hxx" -#include <tools/string.hxx> #include "flttypes.hxx" #include "ftools.hxx" diff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxx index 145d14666d07..eb58bf816735 100644 --- a/sc/source/filter/inc/qprostyle.hxx +++ b/sc/source/filter/inc/qprostyle.hxx @@ -21,9 +21,9 @@ #ifndef SC_QPROSTYLE_HXX #define SC_QPROSTYLE_HXX +#include <rtl/ustring.hxx> #include <sal/config.h> #include "filter.hxx" -#include <tools/string.hxx> #include "flttypes.hxx" #include "ftools.hxx" diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index bacc26b7c4c6..4a0f23c3132d 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -140,9 +140,9 @@ public: bool HasFormulaTokens() const; - inline XclImpExtNameType GetType() const { return meType; } - inline const String& GetName() const { return maName; } - inline sal_uInt32 GetStorageId() const { return mnStorageId; } + XclImpExtNameType GetType() const { return meType; } + const OUString& GetName() const { return maName; } + sal_uInt32 GetStorageId() const { return mnStorageId; } private: typedef ::std::auto_ptr< XclImpCachedMatrix > XclImpCachedMatrixPtr; @@ -151,7 +151,7 @@ private: XclImpCachedMatrixPtr mxDdeMatrix; /// Cached results of the DDE link. MOper* mpMOper; /// Cached values for OLE link TokenArrayPtr mxArray; /// Formula tokens for external name. - String maName; /// The name of the external name. + OUString maName; /// The name of the external name. sal_uInt32 mnStorageId; /// Storage ID for OLE object storages. XclImpExtNameType meType; /// Type of the external name. }; diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index 8511f0782374..9cd2a2e3002f 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -287,7 +287,7 @@ class SvxFont; */ struct XclFontData { - String maName; /// Font name. + OUString maName; /// Font name. String maStyle; /// String with styles (bold, italic). Color maColor; /// Font color. sal_uInt16 mnHeight; /// Font height in twips (1/20 of a point). diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index 152b1f01eddf..608a38ab6fc6 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -236,7 +236,7 @@ void OP_NamedRange( SvStream& r, sal_uInt16 /*n*/ ) String aTmp( cBuf, pLotusRoot->eCharsetQ ); - ScfTools::ConvertToScDefinedName( aTmp ); + aTmp = ScfTools::ConvertToScDefinedName( aTmp ); pLotusRoot->pRangeNames->Append( pRange, aTmp ); } @@ -275,7 +275,7 @@ void OP_SymphNamedRange( SvStream& r, sal_uInt16 /*n*/ ) strcpy( cBuf, cPuffer ); // #100211# - checked String aTmp( cBuf, pLotusRoot->eCharsetQ ); - ScfTools::ConvertToScDefinedName( aTmp ); + aTmp = ScfTools::ConvertToScDefinedName( aTmp ); pLotusRoot->pRangeNames->Append( pRange, aTmp ); } diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index 3fc0c6e343f4..216d5e81d486 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -506,8 +506,7 @@ RangeNameBufferWK3::~RangeNameBufferWK3() void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rCRD ) { - String aScName( rOrgName ); - ScfTools::ConvertToScDefinedName( aScName ); + String aScName = ScfTools::ConvertToScDefinedName(rOrgName); Entry aInsert( rOrgName, aScName, rCRD ); diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 90506f4f8954..31e5bea9521d 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -112,7 +112,6 @@ #include <tools/date.hxx> #include <i18nlangtag/lang.h> #include <comphelper/extract.hxx> -#include <tools/string.hxx> using namespace com::sun::star; using namespace xmloff::token; @@ -1274,13 +1273,13 @@ namespace { OUString getOutputString( ScDocument* pDoc, const ScAddress& aCellPos ) { if (!pDoc) - return EMPTY_OUSTRING; + return OUString(); CellType eType = pDoc->GetCellType(aCellPos); switch (eType) { case CELLTYPE_NONE: - return EMPTY_OUSTRING; + return OUString(); case CELLTYPE_EDIT: { // GetString an der EditCell macht Leerzeichen aus Umbruechen, @@ -1306,7 +1305,7 @@ OUString getOutputString( ScDocument* pDoc, const ScAddress& aCellPos ) } } - return EMPTY_OUSTRING; + return OUString(); } } diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx index be8c9f64922f..73eb197b8d8f 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.cxx @@ -48,8 +48,8 @@ ScImportOptions::ScImportOptions( const String& rStr ) if ( nTokenCount >= 3 ) { // first 3 tokens: common - String aToken( rStr.GetToken( 0, ',' ) ); - if( aToken.EqualsIgnoreCaseAscii( pStrFix ) ) + OUString aToken( rStr.GetToken( 0, ',' ) ); + if( aToken.equalsIgnoreAsciiCase( pStrFix ) ) bFixedWidth = sal_True; else nFieldSepCode = ScAsciiOptions::GetWeightedFieldSep( aToken, true); diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx index 03a887fee7ce..be2d6d6119e5 100644 --- a/sc/source/ui/inc/lnktrans.hxx +++ b/sc/source/ui/inc/lnktrans.hxx @@ -21,7 +21,7 @@ #define SC_LNKTRANS_HXX #include <svtools/transfer.hxx> - +#include <tools/string.hxx> class ScLinkTransferObj : public TransferableHelper { diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index a051c104aa30..a40500c4eed4 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -259,8 +259,8 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) // ascii export (import is handled above) INetURLObject aURL( aFileName ); - String aExt(aURL.getExtension()); - if (aExt.EqualsIgnoreCaseAscii("CSV")) + OUString aExt(aURL.getExtension()); + if (aExt.equalsIgnoreAsciiCase("CSV")) cAsciiDel = ','; else cAsciiDel = '\t'; diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index c8f8bea3455e..2e9b3431f4f4 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -98,14 +98,13 @@ public: { SolarMutexGuard aGuard; maCachedObject = uno::Any(); // clear cached object - String sName = aName; ScDocument* pDoc = mpDocShell->GetDocument(); if ( !pDoc ) throw uno::RuntimeException(); - // aName ( sName ) is generated from the stream name which can be different ( case-wise ) + // aName is generated from the stream name which can be different ( case-wise ) // from the code name - if( sName.EqualsIgnoreCaseAscii( pDoc->GetCodeName() ) ) + if( aName.equalsIgnoreAsciiCase( pDoc->GetCodeName() ) ) maCachedObject = maWorkbook; else { @@ -114,9 +113,9 @@ public: for( SCTAB i = 0; i < nCount; i++ ) { pDoc->GetCodeName( i, sCodeName ); - // aName ( sName ) is generated from the stream name which can be different ( case-wise ) + // aName is generated from the stream name which can be different ( case-wise ) // from the code name - if( String(sCodeName).EqualsIgnoreCaseAscii( sName ) ) + if( sCodeName.equalsIgnoreAsciiCase( aName ) ) { OUString sSheetName; if( pDoc->GetName( i, sSheetName ) ) diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index bd56a52eabc7..f890c017f348 100644 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx @@ -21,6 +21,7 @@ #define SD_VIEW_MASTER_PAGE_OBSERVER_HXX #include "tools/SdGlobalResourceContainer.hxx" +#include <tools/string.hxx> #include <osl/mutex.hxx> #include <memory> #include <set> diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index c2c6741d803b..bde886527a2c 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -18,6 +18,7 @@ */ +#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <sfx2/objsh.hxx> diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index e699bd07fe1f..13f8509de84a 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <tools/string.hxx> - +#include <rtl/ustring.hxx> #include <svl/aeitem.hxx> #include <vector> diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index 9bc457fcd852..28e16926f37f 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -17,13 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <tools/string.hxx> -#include <tools/stream.hxx> - -#include <svl/poolitem.hxx> +#include <rtl/ustring.hxx> #include <svl/itemset.hxx> - +#include <svl/poolitem.hxx> +#include <tools/stream.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx index 498d57bb91c7..0184425ee172 100644 --- a/svl/source/misc/fstathelper.cxx +++ b/svl/source/misc/fstathelper.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/date.hxx> -#include <tools/time.hxx> -#include <tools/string.hxx> -#include <ucbhelper/content.hxx> #include <com/sun/star/util/DateTime.hpp> #include <comphelper/processfactory.hxx> +#include <rtl/ustring.hxx> #include <svl/fstathelper.hxx> +#include <tools/date.hxx> +#include <tools/time.hxx> +#include <ucbhelper/content.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx index 341fc219d3bf..3b04585c44d4 100644 --- a/svl/source/numbers/zforscan.hxx +++ b/svl/source/numbers/zforscan.hxx @@ -19,12 +19,12 @@ #ifndef _ZFORSCAN_HXX #define _ZFORSCAN_HXX -#include <tools/string.hxx> -#include <tools/date.hxx> #include <i18nlangtag/lang.h> -#include <tools/color.hxx> +#include <rtl/ustring.hxx> #include <svl/nfkeytab.hxx> #include <svl/nfsymbol.hxx> +#include <tools/color.hxx> +#include <tools/date.hxx> class SvNumberFormatter; struct ImpSvNumberformatInfo; diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index 21307ff08f6e..375047fc5c2d 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -23,10 +23,10 @@ #include <windows.h> #include <ddeml.h> -#include <tools/string.hxx> -#include <tools/shl.hxx> #include <boost/noncopyable.hpp> +#include <rtl/ustring.hxx> #include <svl/svdde.hxx> +#include <tools/shl.hxx> #include <vector> // ---------------- diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 2f68056e2f8d..9a1627eab7e3 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -411,7 +411,6 @@ #include <tools/shl.hxx> #include <tools/solar.h> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <unicode/uchar.h> #include <uno/mapping.hxx> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 26b9361078a2..026db6e068da 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -556,7 +556,6 @@ #include <tools/resmgr.hxx> #include <tools/shl.hxx> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <tools/tenccvt.hxx> #include <tools/urlobj.hxx> #include <tools/vcompat.hxx> diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 441aef6d42fa..1656a21caafb 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -42,7 +42,6 @@ #include "accessibility.hrc" #include "svx/svdstr.hrc" #include <svx/dialmgr.hxx> -#include <tools/string.hxx> #include <svx/xdef.hxx> #include "svx/unoapi.hxx" diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index 42dc8cf5f49c..fb50173af11d 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/string.hxx> #include <unotools/pathoptions.hxx> #include <vcl/graphicfilter.hxx> #include <sfx2/docfile.hxx> diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index b389e5909092..2fc909ca0d37 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -18,7 +18,6 @@ */ #include <osl/mutex.hxx> -#include <tools/string.hxx> #include <vcl/image.hxx> #include <comphelper/accessibleselectionhelper.hxx> #include <com/sun/star/accessibility/XAccessibleTable.hpp> diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx index 5c918a0e924c..1f8d33355d28 100644 --- a/svx/source/inc/stringlistresource.hxx +++ b/svx/source/inc/stringlistresource.hxx @@ -21,7 +21,6 @@ #define SVX_STRINGLISTRESOURCE_HXX #include <tools/rc.hxx> -#include <tools/string.hxx> #include <svx/svxdllapi.h> #include <memory> diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index ae68c4b8eb96..a9ac2fd19b10 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -31,7 +31,6 @@ #include <unotools/ucbstreamhelper.hxx> -#include <tools/string.hxx> #include <svl/whiter.hxx> #include <svx/xit.hxx> #include <svx/xbtmpit.hxx> diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 57b2aaee8a70..9056a6d60702 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -18,7 +18,7 @@ */ #include <svx/xtable.hxx> -#include "svx/xattr.hxx" +#include <svx/xattr.hxx> #include <svx/xpool.hxx> #include <svx/svdattr.hxx> #include <svx/svxids.hrc> @@ -29,7 +29,7 @@ XOutdevItemPool::XOutdevItemPool( sal_uInt16 nAttrStart, sal_uInt16 nAttrEnd, sal_Bool bLoadRefCounts) -: SfxItemPool(String("XOutdevItemPool", osl_getThreadTextEncoding()), nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts) +: SfxItemPool(OUString("XOutdevItemPool"), nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts) { // prepare some defaults const OUString aNullStr; diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx index c857727adfdd..4a544ca4d4cc 100644 --- a/sw/inc/acmplwrd.hxx +++ b/sw/inc/acmplwrd.hxx @@ -24,6 +24,7 @@ #include <editeng/swafopt.hxx> #include <editeng/Trie.hxx> +#include <tools/string.hxx> class SwDoc; class SwAutoCompleteWord_Impl; diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index ccff4f09acf0..25b0808c122c 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -31,6 +31,7 @@ #include <svl/lstner.hxx> #include <svtools/embedhlp.hxx> +#include <tools/string.hxx> class SwDoc; class SfxDocumentInfoDialog; diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 0d7f5ad83609..0b90a786fb12 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -23,6 +23,7 @@ #include <frmatr.hxx> #include <swtypes.hxx> // For MAXLEVEL. #include <boost/ptr_container/ptr_vector.hpp> +#include <tools/string.hxx> class SwDoc; // For friend. @@ -35,7 +36,7 @@ protected: : SwFmt( rPool, pFmtName, pWhichRanges, pDerFrom, nFmtWhich ) { SetAuto( sal_False ); } - SwFmtColl( SwAttrPool& rPool, const String &rFmtName, + SwFmtColl( SwAttrPool& rPool, const OUString &rFmtName, const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom, sal_uInt16 nFmtWhich ) : SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich ) @@ -73,7 +74,7 @@ protected: mbAssignedToOutlineStyle(false) { pNextTxtFmtColl = this; } - SwTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName, + SwTxtFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName, SwTxtFmtColl* pDerFrom = 0, sal_uInt16 nFmtWh = RES_TXTFMTCOLL ) : SwFmtColl( rPool, rFmtCollName, aTxtFmtCollSetRange, @@ -155,7 +156,7 @@ protected: pDerFrom, RES_GRFFMTCOLL ) {} - SwGrfFmtColl( SwAttrPool& rPool, const String &rFmtCollName, + SwGrfFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName, SwGrfFmtColl* pDerFrom = 0 ) : SwFmtColl( rPool, rFmtCollName, aGrfFmtCollSetRange, pDerFrom, RES_GRFFMTCOLL ) diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index c6e5ebf2ac7e..0d3eba5d2ec1 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/text/PositionLayoutDir.hpp> #include <cppuhelper/weakref.hxx> #include <tools/gen.hxx> +#include <tools/string.hxx> #include <format.hxx> #include "swdllapi.h" diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 02f659c57382..feb01207eaa0 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -27,6 +27,7 @@ #include <format.hxx> #include <swtypes.hxx> #include <editeng/adjustitem.hxx> +#include <tools/string.hxx> class SwCharFmt; class IntlWrapper; diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 2d6bebcfce19..bc6f4a6a0c4b 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -527,10 +527,10 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, sal_uInt16 ins ) if( pMgr && sSourceName.Len() && sTableName.Len() && pMgr->OpenDataSource(sSourceName, sTableName, -1, false)) { - String sColumnName( GetColumnName( sTmpName )); - OSL_ENSURE(sColumnName.Len(), "Missing DB column name"); + OUString sColumnName( GetColumnName( sTmpName )); + OSL_ENSURE(!sColumnName.isEmpty(), "Missing DB column name"); - String sDBNum( SwFieldType::GetTypeStr(TYP_DBSETNUMBERFLD) ); + OUString sDBNum( SwFieldType::GetTypeStr(TYP_DBSETNUMBERFLD) ); sDBNum = pCharClass->lowercase(sDBNum); // Initialize again because this doesn't happen in docfld anymore for @@ -538,7 +538,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, sal_uInt16 ins ) // an DB_Field in a document. VarChange( sDBNum, pMgr->GetSelectedRecordId(sSourceName, sTableName)); - if( sDBNum.EqualsIgnoreCaseAscii(sColumnName) ) + if( sDBNum.equalsIgnoreAsciiCase(sColumnName) ) { aErrExpr.nValue.PutLong(long(pMgr->GetSelectedRecordId(sSourceName, sTableName))); return &aErrExpr; @@ -576,9 +576,9 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, sal_uInt16 ins ) pNewExp->pNext = VarTable[ ii ]; VarTable[ ii ] = pNewExp; - String sColumnName( GetColumnName( sTmpName )); - OSL_ENSURE( sColumnName.Len(), "Missing DB column name" ); - if( sColumnName.EqualsIgnoreCaseAscii( + OUString sColumnName( GetColumnName( sTmpName )); + OSL_ENSURE( !sColumnName.isEmpty(), "Missing DB column name" ); + if( sColumnName.equalsIgnoreAsciiCase( SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) )) { SwNewDBMgr *pMgr = rDoc.GetNewDBMgr(); diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx index bfbd85b346bc..ddc3289bb112 100644 --- a/sw/source/core/inc/UndoAttribute.hxx +++ b/sw/source/core/inc/UndoAttribute.hxx @@ -23,6 +23,7 @@ #include <undobj.hxx> #include <memory> #include <svl/itemset.hxx> +#include <tools/string.hxx> #include <swtypes.hxx> #include <calbck.hxx> #include <set> diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx index a31d3f607e43..67d2e78f44fc 100644 --- a/sw/source/core/inc/UndoCore.hxx +++ b/sw/source/core/inc/UndoCore.hxx @@ -22,6 +22,7 @@ #include <undobj.hxx> #include <calbck.hxx> +#include <tools/string.hxx> class SfxItemSet; class SwFmtColl; diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx index b28acb6d0abe..3cec55373a8d 100644 --- a/sw/source/core/inc/UndoDelete.hxx +++ b/sw/source/core/inc/UndoDelete.hxx @@ -22,6 +22,7 @@ #include <undobj.hxx> #include <tools/mempool.hxx> +#include <tools/string.hxx> class SwRedlineSaveDatas; class SwTxtNode; diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx index 009209f3fbbe..04b594938fcd 100644 --- a/sw/source/core/inc/UndoInsert.hxx +++ b/sw/source/core/inc/UndoInsert.hxx @@ -22,6 +22,7 @@ #include <undobj.hxx> #include <tools/mempool.hxx> +#include <tools/string.hxx> #include <swtypes.hxx> #include <IDocumentContentOperations.hxx> diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx index 247a14f01bf6..f54996bef69b 100644 --- a/sw/source/core/inc/UndoNumbering.hxx +++ b/sw/source/core/inc/UndoNumbering.hxx @@ -23,6 +23,7 @@ #include <vector> #include <undobj.hxx> #include <boost/shared_ptr.hpp> +#include <tools/string.hxx> #include <numrule.hxx> //----------- Undo for Numbering ------------------------------------- diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx index 6a8e31d38cdf..54365d104e65 100644 --- a/sw/source/core/inc/UndoOverwrite.hxx +++ b/sw/source/core/inc/UndoOverwrite.hxx @@ -20,8 +20,9 @@ #ifndef SW_UNDO_OVERWRITE_HXX #define SW_UNDO_OVERWRITE_HXX -#include <undobj.hxx> #include <com/sun/star/uno/Sequence.h> +#include <tools/string.hxx> +#include <undobj.hxx> class SwRedlineSaveDatas; class SwTxtNode; diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx index 5cc5e7d30b71..501ff59968ae 100644 --- a/sw/source/core/inc/UndoSort.hxx +++ b/sw/source/core/inc/UndoSort.hxx @@ -22,6 +22,7 @@ #include <undobj.hxx> #include <boost/ptr_container/ptr_vector.hpp> +#include <tools/string.hxx> struct SwSortOptions; class SwTableNode; diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index cd79f20e346f..61a8d271fdb0 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -28,6 +28,7 @@ #include <itabenum.hxx> #include "boost/noncopyable.hpp" #include "boost/scoped_ptr.hpp" +#include <tools/string.hxx> class SfxItemSet; diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index ebef8fface75..0254957df955 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1778,7 +1778,8 @@ void SwHTMLParser::InsertLink() } else { - String sRel, sHRef, sType; + OUString sRel; + String sHRef, sType; const HTMLOptions& rOptions2 = GetOptions(); for (size_t i = rOptions2.size(); i; ) @@ -1798,7 +1799,7 @@ void SwHTMLParser::InsertLink() } } - if( sHRef.Len() && sRel.EqualsIgnoreCaseAscii( "STYLESHEET" ) && + if( sHRef.Len() && sRel.equalsIgnoreAsciiCase( "STYLESHEET" ) && ( !sType.Len() || sType.GetToken(0,';').EqualsAscii(sCSS_mimetype) ) ) { diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 554dda044ab8..8924c24b804c 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -191,12 +191,12 @@ static HTMLOptionEnum aHTMLFileNameFldFmtTable[] = }; -sal_uInt16 SwHTMLParser::GetNumType( const String& rStr, sal_uInt16 nDfltType ) +sal_uInt16 SwHTMLParser::GetNumType( const OUString& rStr, sal_uInt16 nDfltType ) { sal_uInt16 nType = nDfltType; const HTMLOptionEnum *pOptEnums = aHTMLPageNumFldFmtTable; while( pOptEnums->pName ) - if( !rStr.EqualsIgnoreCaseAscii( pOptEnums->pName ) ) + if( !rStr.equalsIgnoreAsciiCaseAscii( pOptEnums->pName ) ) pOptEnums++; else break; @@ -352,10 +352,10 @@ void SwHTMLParser::NewField() SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter(); if( pFmtOption ) { - const String& rFmt = pFmtOption->GetString(); + const OUString& rFmt = pFmtOption->GetString(); for( sal_uInt16 k = 0; pFmtTbl[k].pName; k++ ) { - if( rFmt.EqualsIgnoreCaseAscii( pFmtTbl[k].pName ) ) + if( rFmt.equalsIgnoreAsciiCaseAscii( pFmtTbl[k].pName ) ) { nNumFmt = pFormatter->GetFormatIndex( pFmtTbl[k].eFmt, LANGUAGE_SYSTEM); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index f30669adc309..fe22a33499ba 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -92,18 +92,18 @@ HTMLOptionEnum aHTMLImgVAlignTable[] = { 0, 0 } }; -ImageMap *SwHTMLParser::FindImageMap( const String& rName ) const +ImageMap *SwHTMLParser::FindImageMap( const OUString& rName ) const { ImageMap *pMap = 0; - OSL_ENSURE( rName.GetChar(0) != '#', "FindImageName: Name beginnt mit #!" ); + OSL_ENSURE( rName[0] != '#', "FindImageName: Name beginnt mit #!" ); if( pImageMaps ) { for( sal_uInt16 i=0; i<pImageMaps->size(); i++ ) { ImageMap *pIMap = &(*pImageMaps)[i]; - if( rName.EqualsIgnoreCaseAscii( pIMap->GetName() ) ) + if( rName.equalsIgnoreAsciiCase( pIMap->GetName() ) ) { pMap = pIMap; break; diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 3a6eae63bbeb..bb4cce1d7a42 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -102,10 +102,10 @@ void SwHTMLParser::NewDivision( int nToken ) break; case HTML_O_TYPE: { - const String& rType = rOption.GetString(); - if( rType.EqualsIgnoreCaseAscii( "HEADER" ) ) + const OUString& rType = rOption.GetString(); + if( rType.equalsIgnoreAsciiCase( "HEADER" ) ) bHeader = sal_True; - else if( rType.EqualsIgnoreCaseAscii( "FOOTER" ) ) + else if( rType.equalsIgnoreAsciiCase( "FOOTER" ) ) bFooter = sal_True; } } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index b27eedaa3f4a..8a1e91e17a3f 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -5097,15 +5097,15 @@ void SwHTMLParser::InsertLineBreak() { case HTML_O_CLEAR: { - const String &aClear = rOption.GetString(); - if( aClear.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_all ) ) + const OUString &rClear = rOption.GetString(); + if( rClear.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_all ) ) { bClearLeft = sal_True; bClearRight = sal_True; } - else if( aClear.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_left ) ) + else if( rClear.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_left ) ) bClearLeft = sal_True; - else if( aClear.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) ) + else if( rClear.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_right ) ) bClearRight = sal_True; } break; @@ -5386,8 +5386,7 @@ void SwHTMLParser::InsertHorzRule() void SwHTMLParser::ParseMoreMetaOptions() { - String aName; - OUString aContent; + OUString aName, aContent; sal_Bool bHTTPEquiv = sal_False; const HTMLOptions& rHTMLOptions = GetOptions(); @@ -5414,22 +5413,22 @@ void SwHTMLParser::ParseMoreMetaOptions() // nicht geaendert wurde. Deshalb genuegt es, auf Generator und // auf refresh abzufragen, um noch nicht verarbeitete Token zu finden, // denn das sind die einzigen, die die Dok-Info nicht modifizieren. - if( aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_generator ) || - aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_refresh ) || - aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ) || - aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_content_script_type ) ) + if( aName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_META_generator ) || + aName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_META_refresh ) || + aName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_META_content_type ) || + aName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_META_content_script_type ) ) return; aContent = comphelper::string::remove(aContent, '\r'); aContent = comphelper::string::remove(aContent, '\n'); - if( aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_sdendnote ) ) + if( aName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_META_sdendnote ) ) { FillEndNoteInfo( aContent ); return; } - if( aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_sdfootnote ) ) + if( aName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_META_sdfootnote ) ) { FillFootNoteInfo( aContent ); return; diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index f2f1147803b9..f345fa6a216b 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -650,7 +650,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient // <SDFIELD> public: - static sal_uInt16 GetNumType( const String& rStr, sal_uInt16 eDfltType ); + static sal_uInt16 GetNumType( const OUString& rStr, sal_uInt16 eDfltType ); private: void NewField(); void EndField(); @@ -662,7 +662,7 @@ private: // Einfuegen von Grafiken, Plugins und Applets // Image-Maps suchen und mit Grafik-Nodes verbinden - ImageMap *FindImageMap( const String& rURL ) const; + ImageMap *FindImageMap( const OUString& rURL ) const; void ConnectImageMaps(); // Verankerung eines Fly-Frames bestimmen und entsprechende Attribute diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index 9e5d56dcb32c..00d32aa3e3a3 100644 --- a/sw/source/filter/ww1/w1filter.cxx +++ b/sw/source/filter/ww1/w1filter.cxx @@ -316,12 +316,12 @@ void Ww1Bookmarks::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16) return; } - const String & rName = GetName(); - if( rName.EqualsAscii( "_Toc", 0, 4 ) ) // "_Toc*" ist ueberfluessig + const OUString & rName = GetName(); + if( rName.startsWith( "_Toc" ) ) // "_Toc*" ist ueberfluessig return; if( rOut.IsFlagSet( SwFltControlStack::HYPO ) - && rName.EqualsIgnoreCaseAscii( "FORMULAR" ) ) + && rName.equalsIgnoreAsciiCase( "FORMULAR" ) ) rOut.SetProtect(); // Fuer UEbersetzung Bookmark -> Variable setzen @@ -910,15 +910,16 @@ oncemore: } if( pDot ) { - String sExt; + OUStringBuffer sBuf; while( *pDot != '\0' && *pDot != ' ') - sExt += *pDot++; - - if( sExt.EqualsIgnoreCaseAscii( ".tiff" ) - || sExt.EqualsIgnoreCaseAscii( ".bmp" ) - || sExt.EqualsIgnoreCaseAscii( ".gif" ) - || sExt.EqualsIgnoreCaseAscii( ".pcx" ) - || sExt.EqualsIgnoreCaseAscii( ".pic" )) + sBuf.append(*pDot++); + OUString sExt = sBuf.makeStringAndClear(); + + if( sExt.equalsIgnoreAsciiCase( ".tiff" ) + || sExt.equalsIgnoreAsciiCase( ".bmp" ) + || sExt.equalsIgnoreAsciiCase( ".gif" ) + || sExt.equalsIgnoreAsciiCase( ".pcx" ) + || sExt.equalsIgnoreAsciiCase( ".pic" )) rOut.AddGraphic( sName ); else bKnown = false; @@ -1313,7 +1314,7 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode) { // erzeugen eine fonts im sw-sinne aus den word-strukturen FontFamily eFamily = FAMILY_DONTKNOW; - String aName; + OUString aName; FontPitch ePitch = PITCH_DONTKNOW; rtl_TextEncoding eCharSet = RTL_TEXTENCODING_DONTKNOW; switch (nFCode) @@ -1323,18 +1324,18 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode) // "Symbol", and "Helv" case 0: eFamily = FAMILY_ROMAN; - aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Tms Rmn" )); + aName = "Tms Rmn"; ePitch = PITCH_VARIABLE; eCharSet = RTL_TEXTENCODING_MS_1252; break; case 1: - aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Symbol" )); + aName = "Symbol"; ePitch = PITCH_VARIABLE; eCharSet = RTL_TEXTENCODING_SYMBOL; break; case 2: eFamily = FAMILY_SWISS; - aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Helv" )); + aName = "Helv"; ePitch = PITCH_VARIABLE; eCharSet = RTL_TEXTENCODING_MS_1252; break; @@ -1354,10 +1355,10 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode) ePitch = ePitchA[pF->prgGet()]; // CharSet ........................................... eCharSet = RTL_TEXTENCODING_MS_1252; - if (aName.EqualsIgnoreCaseAscii("Symbol") - || aName.EqualsIgnoreCaseAscii("Symbol Set") - || aName.EqualsIgnoreCaseAscii("Wingdings") - || aName.EqualsIgnoreCaseAscii("ITC Zapf Dingbats") ) + if (aName.equalsIgnoreAsciiCase("Symbol") + || aName.equalsIgnoreAsciiCase("Symbol Set") + || aName.equalsIgnoreAsciiCase("Wingdings") + || aName.equalsIgnoreAsciiCase("ITC Zapf Dingbats") ) eCharSet = RTL_TEXTENCODING_SYMBOL; // FontFamily ........................................ sal_uInt16 b = pF->ffGet(); @@ -1373,7 +1374,7 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode) { OSL_ENSURE(false, "WW1Fonts::GetFont: Nicht existenter Font !"); eFamily = FAMILY_SWISS; - aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Helv" )); + aName = "Helv"; ePitch = PITCH_VARIABLE; eCharSet = RTL_TEXTENCODING_MS_1252; } @@ -1382,10 +1383,10 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode) } // Extrawurst Hypo if ( SwFltGetFlag( nFieldFlags, SwFltControlStack::HYPO ) - && ( aName.EqualsIgnoreCaseAscii("Helv") - || aName.EqualsIgnoreCaseAscii("Helvetica") ) ) + && ( aName.equalsIgnoreAsciiCase("Helv") + || aName.equalsIgnoreAsciiCase("Helvetica") ) ) { - aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Helvetica Neue" )); + aName = "Helvetica Neue"; if (eFamily==FAMILY_DONTKNOW) eFamily = FAMILY_SWISS; } @@ -1397,21 +1398,21 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode) // Nach TH sollen diese durch feste Werte ersetzt werden, // also nicht ueber System::GetStandardFont, damit keine // Namenslisten auftauchen ( Dieses koennte den User verwirren ) - if( aName.EqualsIgnoreCaseAscii("Helv")) + if( aName.equalsIgnoreAsciiCase("Helv")) { - aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Helvetica" )); + aName = "Helvetica"; if (eFamily==FAMILY_DONTKNOW) eFamily = FAMILY_SWISS; } - else if (aName.EqualsIgnoreCaseAscii("Tms Rmn")) + else if (aName.equalsIgnoreAsciiCase("Tms Rmn")) { - aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Times New Roman" )); + aName = "Times New Roman"; if (eFamily==FAMILY_DONTKNOW) eFamily = FAMILY_ROMAN; } - else if (aName.EqualsIgnoreCaseAscii("System Monospaced") ) + else if (aName.equalsIgnoreAsciiCase("System Monospaced") ) { - aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Courier" )); + aName = "Courier"; ePitch = PITCH_FIXED; } } diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 07210dc1829b..f5d523e128ac 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -79,7 +79,7 @@ bool WW8Glossary::HasBareGraphicEnd(SwDoc *pDoc,SwNodeIndex &rIdx) } bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, - bool bSaveRelFile, const std::vector<String>& rStrings, + bool bSaveRelFile, const std::vector<OUString>& rStrings, const std::vector<ww::bytes>& rExtra) { // this code will be called after reading all text into the @@ -147,7 +147,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, if(n != 0xFFFF) { rBlocks.ClearDoc(); - const String &rLNm = rStrings[nGlosEntry]; + const OUString &rLNm = rStrings[nGlosEntry]; String sShortcut = rLNm; @@ -195,7 +195,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile ) if (pGlossary && pGlossary->IsGlossaryFib() && rBlocks.StartPutMuchBlockEntries()) { //read the names of the autotext entries - std::vector<String> aStrings; + std::vector<OUString> aStrings; std::vector<ww::bytes> aData; rtl_TextEncoding eStructCharSet = diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index f6b7cbe37466..1764ce4cd63b 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -70,7 +70,7 @@ private: sal_uInt16 nStrings; bool MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, bool bSaveRelFile, - const ::std::vector<String>& rStrings, + const ::std::vector<OUString>& rStrings, const ::std::vector<ww::bytes>& rExtra); bool HasBareGraphicEnd(SwDoc *pD,SwNodeIndex &rIdx); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 108bbccfe57e..53254a438e30 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4222,7 +4222,7 @@ void SwWW8ImplReader::StoreMacroCmds() void SwWW8ImplReader::ReadDocVars() { - std::vector<String> aDocVarStrings; + std::vector<OUString> aDocVarStrings; std::vector<ww::bytes> aDocVarStringIds; std::vector<String> aDocValueStrings; WW8ReadSTTBF(!bVer67, *pTableStream, pWwFib->fcStwUser, @@ -4243,11 +4243,11 @@ void SwWW8ImplReader::ReadDocVars() for(size_t i=0; i<aDocVarStrings.size(); i++) { uno::Any aDefaultValue; - OUString name(aDocVarStrings[i]); + const OUString &rName = aDocVarStrings[i]; uno::Any aValue; aValue <<= OUString(aDocValueStrings[i]); try { - xUserDefinedProps->addProperty( name, + xUserDefinedProps->addProperty( rName, beans::PropertyAttribute::REMOVABLE, aValue ); } catch (const uno::Exception &) { @@ -4528,8 +4528,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) pWwFib->lcbSttbfRMark, rDoc ); } - // M.M. Initialize our String/ID map for Linked Sections - std::vector<String> aLinkStrings; + // Initialize our String/ID map for Linked Sections + std::vector<OUString> aLinkStrings; std::vector<ww::bytes> aStringIds; WW8ReadSTTBF(!bVer67, *pTableStream, pWwFib->fcSttbFnm, @@ -5543,7 +5543,7 @@ int SwWW8ImplReader::GetAnnotationIndex(sal_uInt32 nTag) if (!mpAtnIndexes.get() && pWwFib->lcbSttbfAtnbkmk) { mpAtnIndexes.reset(new std::map<sal_uInt32, int>()); - std::vector<String> aStrings; + std::vector<OUString> aStrings; std::vector<ww::bytes> aEntries; WW8ReadSTTBF(!bVer67, *pTableStream, pWwFib->fcSttbfAtnbkmk, pWwFib->lcbSttbfAtnbkmk, sizeof(struct WW8_ATNBE), eStructCharSet, aStrings, &aEntries); for (size_t i = 0; i < aStrings.size() && i < aEntries.size(); ++i) diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 7aa31b67d17d..f92e3e6ca308 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -449,7 +449,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, void SwWW8ImplReader::ReadRevMarkAuthorStrTabl( SvStream& rStrm, sal_Int32 nTblPos, sal_Int32 nTblSiz, SwDoc& rDocOut ) { - ::std::vector<String> aAuthorNames; + ::std::vector<OUString> aAuthorNames; WW8ReadSTTBF( !bVer67, rStrm, nTblPos, nTblSiz, bVer67 ? 2 : 0, eStructCharSet, aAuthorNames ); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index e736f99b8cb9..885066683274 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -314,10 +314,10 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) } //"_Toc*" and "_Hlt*" are unnecessary - const String* pName = pB->GetName(); + const OUString* pName = pB->GetName(); #if !defined(WW_NATIVE_TOC) - if( !pName || pName->EqualsIgnoreCaseAscii( "_Toc", 0, 4 ) - || pName->EqualsIgnoreCaseAscii( "_Hlt", 0, 4 ) ) + if( !pName || pName->startsWithIgnoreAsciiCase( "_Toc" ) + || pName->startsWithIgnoreAsciiCase( "_Hlt" ) ) return 0; #endif @@ -504,37 +504,34 @@ String FindPara( const String& rStr, sal_Unicode cToken, sal_Unicode cToken2 ) } -static SvxExtNumType GetNumTypeFromName(const String& rStr, +static SvxExtNumType GetNumTypeFromName(const OUString& rStr, bool bAllowPageDesc = false) { SvxExtNumType eTyp = bAllowPageDesc ? SVX_NUM_PAGEDESC : SVX_NUM_ARABIC; - if( rStr.EqualsIgnoreCaseAscii( "Arabi", 0, 5 ) ) // Arabisch, Arabic + if( rStr.startsWithIgnoreAsciiCase( "Arabi" ) ) // Arabisch, Arabic eTyp = SVX_NUM_ARABIC; - else if( rStr.EqualsAscii( "misch", 2, 5 ) ) // r"omisch + else if( rStr.startsWith( "misch" ) ) // r"omisch eTyp = SVX_NUM_ROMAN_LOWER; - else if( rStr.EqualsAscii( "MISCH", 2, 5 ) ) // R"OMISCH + else if( rStr.startsWith( "MISCH" ) ) // R"OMISCH eTyp = SVX_NUM_ROMAN_UPPER; - else if( rStr.EqualsIgnoreCaseAscii( "alphabeti", 0, 9 ) )// alphabetisch, alphabetic - eTyp = ( rStr.GetChar( 0 ) == 'A' ) + else if( rStr.startsWithIgnoreAsciiCase( "alphabeti" ) )// alphabetisch, alphabetic + eTyp = ( rStr[0] == 'A' ) ? SVX_NUM_CHARS_UPPER_LETTER_N : SVX_NUM_CHARS_LOWER_LETTER_N; - else if( rStr.EqualsIgnoreCaseAscii( "roman", 0, 5 ) ) // us - eTyp = ( rStr.GetChar( 0 ) == 'R' ) + else if( rStr.startsWithIgnoreAsciiCase( "roman" ) ) // us + eTyp = ( rStr[0] == 'R' ) ? SVX_NUM_ROMAN_UPPER : SVX_NUM_ROMAN_LOWER; return eTyp; } -static SvxExtNumType GetNumberPara(OUString& rStr, bool bAllowPageDesc = false) +static SvxExtNumType GetNumberPara(const OUString& rStr, bool bAllowPageDesc = false) { OUString s( FindPara( rStr, '*', '*' ) ); // Ziffernart SvxExtNumType aType = GetNumTypeFromName( s, bAllowPageDesc ); return aType; } - - - bool SwWW8ImplReader::ForceFieldLanguage(SwField &rFld, sal_uInt16 nLang) { bool bRet(false); @@ -2254,10 +2251,10 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr ) //helper function //For MS MacroButton field, the symbol in plain text is always "(" (0x28), //which should be mapped according to the macro type -bool ConvertMacroSymbol( const String& rName, String& rReference ) +bool ConvertMacroSymbol( const String& rName, OUString& rReference ) { bool bConverted = false; - if( rReference.EqualsAscii( "(" ) ) + if( rReference == "(" ) { bConverted = true; sal_Unicode cSymbol = sal_Unicode(); // silence false warning @@ -2272,7 +2269,7 @@ bool ConvertMacroSymbol( const String& rName, String& rReference ) bConverted = false; if( bConverted ) - rReference = cSymbol; + rReference = OUString(cSymbol); } return bConverted; } @@ -2282,7 +2279,7 @@ bool ConvertMacroSymbol( const String& rName, String& rReference ) eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr) { OUString aName; - String aVText; + OUString aVText; bool bNewVText = true; bool bBracket = false; WW8ReadFieldParams aReadParam( rStr ); @@ -2299,20 +2296,20 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr) case -2: if( aName.isEmpty() ) aName = aReadParam.GetResult(); - else if( !aVText.Len() || bBracket ) + else if( aVText.isEmpty() || bBracket ) { nOffset = aReadParam.GetTokenSttPtr() + 1; if( bBracket ) - aVText += ' '; + aVText += " "; aVText += aReadParam.GetResult(); if (bNewVText) { - bBracket = aVText.EqualsIgnoreCaseAscii(OUString('['), 0, 1) + bBracket = (aVText[0] == '[') ? true : false; bNewVText = false; } - else if( aVText.GetChar( aVText.Len()-1 ) == ']' ) + else if( aVText[aVText.getLength()-1] == ']' ) bBracket = false; } break; @@ -2726,20 +2723,20 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam) { case -2: { - String sTemp = rReadParam.GetResult(); - if( sTemp.EqualsIgnoreCaseAscii( "jc", 0, 2 ) ) + OUString sTemp = rReadParam.GetResult(); + if( sTemp.startsWithIgnoreAsciiCase( "jc" ) ) { - sTemp.Erase(0,2); - nJustificationCode = static_cast<sal_uInt16>(sTemp.ToInt32()); + sTemp = sTemp.copy(2); + nJustificationCode = static_cast<sal_uInt16>(sTemp.toInt32()); } - else if( sTemp.EqualsIgnoreCaseAscii( "hps", 0, 3 ) ) + else if( sTemp.startsWithIgnoreAsciiCase( "hps" ) ) { - sTemp.Erase(0,3); - nFontSize= static_cast<sal_uInt32>(sTemp.ToInt32()); + sTemp = sTemp.copy(3); + nFontSize= static_cast<sal_uInt32>(sTemp.toInt32()); } - else if( sTemp.EqualsIgnoreCaseAscii( "Font:", 0, 5 ) ) + else if( sTemp.startsWithIgnoreAsciiCase( "Font:" ) ) { - sTemp.Erase(0,5); + sTemp = sTemp.copy(5); sFontName = sTemp; } } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 279608586bc0..19e38bce35a9 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -3787,7 +3787,7 @@ bool WW8PLCFx_FLD::GetPara(long nIdx, WW8FieldDesc& rF) /* to be optimized like this: */ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen, - sal_uInt16 nExtraLen, rtl_TextEncoding eCS, std::vector<String> &rArray, + sal_uInt16 nExtraLen, rtl_TextEncoding eCS, std::vector<OUString> &rArray, std::vector<ww::bytes>* pExtraArray, ::std::vector<String>* pValueArray) { if (nLen==0) // Handle Empty STTBF @@ -3879,7 +3879,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen rArray.push_back(OStringToOUString(aTmp, eCS)); } else - rArray.push_back(aEmptyStr); + rArray.push_back(OUString()); // Skip the extra data (for bVer67 versions this must come from // external knowledge) @@ -4112,7 +4112,7 @@ String WW8PLCFx_Book::GetBookmark(long nStart,long nEnd, sal_uInt16 &nIndex) } while (i < pBook[0]->GetIMax()); } - return bFound ? aBookNames[i] : aEmptyStr; + return bFound ? aBookNames[i] : OUString(); } OUString WW8PLCFx_Book::GetUniqueBookmarkName(const OUString &rSuggestedName) @@ -4156,9 +4156,9 @@ bool WW8PLCFx_Book::MapName(OUString& rName) return bFound; } -const String* WW8PLCFx_Book::GetName() const +const OUString* WW8PLCFx_Book::GetName() const { - const String *pRet = 0; + const OUString *pRet = 0; if (!nIsEnd && (pBook[0]->GetIdx() < nIMax)) pRet = &(aBookNames[pBook[0]->GetIdx()]); return pRet; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index c643e4434d32..eccc4831e250 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -152,7 +152,7 @@ class WW8PLCFx_PCD; attention: the *extra data* of each string are SKIPPED and ignored */ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen, - sal_uInt16 nExtraLen, rtl_TextEncoding eCS, ::std::vector<String> &rArray, + sal_uInt16 nExtraLen, rtl_TextEncoding eCS, ::std::vector<OUString> &rArray, ::std::vector<ww::bytes>* pExtraArray = 0, ::std::vector<String>* pValueArray = 0); struct WW8FieldDesc @@ -713,7 +713,7 @@ class WW8PLCFx_Book : public WW8PLCFx { private: WW8PLCFspecial* pBook[2]; // Start and End Position - ::std::vector<String> aBookNames; // Name + ::std::vector<OUString> aBookNames; // Name eBookStatus* pStatus; long nIMax; // Number of Booknotes sal_uInt16 nIsEnd; @@ -735,7 +735,7 @@ public: virtual WW8_FC Where(); virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ); virtual void advance(); - const String* GetName() const; + const OUString* GetName() const; WW8_CP GetStartPos() const { return ( nIsEnd ) ? WW8_CP_MAX : pBook[0]->Where(); } long GetLen() const; diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 9bae960f29f6..c67ef7b131ed 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -2216,26 +2216,26 @@ String SwNewDBMgr::LoadAndRegisterDataSource() String sURL = xFP->getFiles().getConstArray()[0]; //data sources have to be registered depending on their extensions INetURLObject aURL( sURL ); - String sExt( aURL.GetExtension() ); + OUString sExt( aURL.GetExtension() ); Any aURLAny; Any aTableFilterAny; Any aSuppressVersionsAny; Any aInfoAny; INetURLObject aTempURL(aURL); bool bStore = true; - if(sExt.EqualsAscii("odb")) + if(sExt == "odb") { bStore = false; } - else if(sExt.EqualsIgnoreCaseAscii("sxc") - || sExt.EqualsIgnoreCaseAscii("ods") - || sExt.EqualsIgnoreCaseAscii("xls")) + else if(sExt.equalsIgnoreAsciiCase("sxc") + || sExt.equalsIgnoreAsciiCase("ods") + || sExt.equalsIgnoreAsciiCase("xls")) { OUString sDBURL("sdbc:calc:"); sDBURL += aTempURL.GetMainURL(INetURLObject::NO_DECODE); aURLAny <<= sDBURL; } - else if(sExt.EqualsIgnoreCaseAscii("dbf")) + else if(sExt.equalsIgnoreAsciiCase("dbf")) { aTempURL.removeSegment(); aTempURL.removeFinalSlash(); @@ -2247,7 +2247,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource() aFilters[0] = aURL.getBase(); aTableFilterAny <<= aFilters; } - else if(sExt.EqualsIgnoreCaseAscii("csv") || sExt.EqualsIgnoreCaseAscii("txt")) + else if(sExt.equalsIgnoreAsciiCase("csv") || sExt.equalsIgnoreAsciiCase("txt")) { aTempURL.removeSegment(); aTempURL.removeFinalSlash(); @@ -2263,14 +2263,14 @@ String SwNewDBMgr::LoadAndRegisterDataSource() aTableFilterAny <<= aFilters; } #ifdef WNT - else if(sExt.EqualsIgnoreCaseAscii("mdb")) + else if(sExt.equalsIgnoreAsciiCase("mdb")) { OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE="); sDBURL += aTempURL.PathToFileName(); aURLAny <<= sDBURL; aSuppressVersionsAny <<= makeAny(true); } - else if(sExt.EqualsIgnoreCaseAscii("accdb")) + else if(sExt.equalsIgnoreAsciiCase("accdb")) { OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA SOURCE="); sDBURL += aTempURL.PathToFileName(); @@ -2331,7 +2331,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource() ::comphelper::copyProperties( uno::Reference < beans::XPropertySet >( xSettingsDlg, uno::UNO_QUERY_THROW ), xDSSettings ); - xDSSettings->setPropertyValue( "Extension", uno::makeAny( OUString( sExt ))); + xDSSettings->setPropertyValue( "Extension", uno::makeAny( sExt )); } } diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 34fc1a39120e..4bcdfd6d6f15 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -2706,8 +2706,8 @@ sal_Bool SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData, sal_Int32 nLen = rFileName.getLength(); if( 4 < nLen && '.' == rFileName[ nLen - 4 ]) { - String sExt( rFileName.copy( nLen - 3 )); - if( sExt.EqualsIgnoreCaseAscii( "url" )) + OUString sExt( rFileName.copy( nLen - 3 )); + if( sExt.equalsIgnoreAsciiCase( "url" )) { OSL_ENSURE( !&rFileName, "how do we read today .URL - Files?" ); } diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 5fc1e8255ab0..efd8ab2952e3 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -148,11 +148,11 @@ void SwFldDBPage::Reset(const SfxItemSet&) if( !IsRefresh() ) { - String sUserData = GetUserData(); - if(sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1)) + OUString sUserData = GetUserData(); + if (sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1)) { - String sVal = sUserData.GetToken(1, ';'); - sal_uInt16 nVal = (sal_uInt16)sVal.ToInt32(); + OUString sVal = sUserData.getToken(1, ';'); + sal_uInt16 nVal = (sal_uInt16)sVal.toInt32(); if(nVal != USHRT_MAX) { for(i = 0; i < m_pTypeLB->GetEntryCount(); i++) diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 6536b12975d2..7cf2d5b204ea 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -124,11 +124,11 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) } sal_uInt16 nSelEntryData = USHRT_MAX; - String sUserData = GetUserData(); - if(sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1)) + OUString sUserData = GetUserData(); + if (sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1)) { - String sVal = sUserData.GetToken(1, ';'); - nSelEntryData = static_cast< sal_uInt16 >(sVal.ToInt32()); + OUString sVal = sUserData.getToken(1, ';'); + nSelEntryData = static_cast< sal_uInt16 >(sVal.toInt32()); } std::vector<OUString> aLst; diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 3203e24dd37e..2d55dfeed771 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -153,11 +153,11 @@ void SwFldDokPage::Reset(const SfxItemSet& ) if( !IsRefresh() ) { - String sUserData = GetUserData(); - if( sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1 )) + OUString sUserData = GetUserData(); + if (sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1)) { - String sVal = sUserData.GetToken(1, ';'); - sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.ToInt32()); + OUString sVal = sUserData.getToken(1, ';'); + sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.toInt32()); if(nVal != USHRT_MAX) { for(sal_uInt16 i = 0; i < m_pTypeLB->GetEntryCount(); i++) diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 6e9ff038ac88..576bc182b145 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -151,11 +151,11 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) if( !IsRefresh() ) { - String sUserData = GetUserData(); - if(sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1)) + OUString sUserData = GetUserData(); + if(sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1)) { - String sVal = sUserData.GetToken(1, ';'); - sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.ToInt32()); + OUString sVal = sUserData.getToken(1, ';'); + sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.toInt32()); if(nVal != USHRT_MAX) { for(sal_uInt16 i = 0; i < m_pTypeLB->GetEntryCount(); i++) diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 7fcabfa456f5..4173ec9c7a2f 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -239,12 +239,12 @@ void SwFldRefPage::Reset(const SfxItemSet& ) if( !IsRefresh() ) { - String sUserData = GetUserData(); - if(!IsRefresh() && sUserData.GetToken(0, ';'). - EqualsIgnoreCaseAscii(USER_DATA_VERSION_1)) + OUString sUserData = GetUserData(); + if(!IsRefresh() && sUserData.getToken(0, ';'). + equalsIgnoreAsciiCase(USER_DATA_VERSION_1)) { - String sVal = sUserData.GetToken(1, ';'); - sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.ToInt32()); + OUString sVal = sUserData.getToken(1, ';'); + sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.toInt32()); if(nVal != USHRT_MAX) { for(sal_uInt16 i = 0; i < m_pTypeLB->GetEntryCount(); i++) diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index cbf808fbfbc3..6f2bf7a2e8a7 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -147,11 +147,11 @@ void SwFldVarPage::Reset(const SfxItemSet& ) if( !IsRefresh() ) { - String sUserData = GetUserData(); - if(!IsRefresh() && sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1)) + OUString sUserData = GetUserData(); + if(!IsRefresh() && sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1)) { - String sVal = sUserData.GetToken(1, ';'); - sal_uInt16 nVal = (sal_uInt16)sVal.ToInt32(); + OUString sVal = sUserData.getToken(1, ';'); + sal_uInt16 nVal = (sal_uInt16)sVal.toInt32(); if( USHRT_MAX != nVal ) { for(sal_uInt16 i = 0; i < m_pTypeLB->GetEntryCount(); i++) diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index b1ecddafeecc..33bdebf643f3 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -319,7 +319,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, OUString sText; Text >>= sText; - String sFieldName; + OUString sFieldName; if( ( nType == word::WdFieldType::wdFieldEmpty ) && !sText.isEmpty() ) { SwVbaReadFieldParams aReadParam(sText); @@ -328,11 +328,11 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, } uno::Reference< text::XTextContent > xTextField; - if( nType == word::WdFieldType::wdFieldFileName || sFieldName.EqualsIgnoreCaseAscii("FILENAME") ) + if( nType == word::WdFieldType::wdFieldFileName || sFieldName.equalsIgnoreAsciiCase("FILENAME") ) { xTextField.set( Create_Field_FileName( sText ), uno::UNO_QUERY_THROW ); } - else if( nType == word::WdFieldType::wdFieldDocProperty || sFieldName.EqualsIgnoreCaseAscii("DOCPROPERTY") ) + else if( nType == word::WdFieldType::wdFieldDocProperty || sFieldName.equalsIgnoreAsciiCase("DOCPROPERTY") ) { xTextField.set( Create_Field_DocProperty( sText ), uno::UNO_QUERY_THROW ); } @@ -419,7 +419,7 @@ static const DocPropertyTable aDocPropertyTables[] = uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const OUString _text ) throw (uno::RuntimeException) { - String aDocProperty; + OUString aDocProperty; SwVbaReadFieldParams aReadParam( _text ); long nRet; while( -1 != ( nRet = aReadParam.SkipToNextToken() )) @@ -427,7 +427,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const switch( nRet ) { case -2: - if( !aDocProperty.Len() ) + if( aDocProperty.isEmpty() ) aDocProperty = aReadParam.GetResult(); break; case '*': @@ -438,7 +438,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const } aDocProperty = comphelper::string::remove(aDocProperty, '"'); OSL_TRACE("SwVbaFields::Create_Field_DocProperty, the document property name is %s ",OUStringToOString( aDocProperty, RTL_TEXTENCODING_UTF8 ).getStr() ); - if( aDocProperty.Len() == 0 ) + if( aDocProperty.isEmpty() ) { throw uno::RuntimeException(); } @@ -448,7 +448,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const // find the build in document properties for( const DocPropertyTable* pTable = aDocPropertyTables; pTable->sDocPropertyName != NULL; pTable++ ) { - if( aDocProperty.EqualsIgnoreCaseAscii( pTable->sDocPropertyName ) ) + if( aDocProperty.equalsIgnoreAsciiCaseAscii( pTable->sDocPropertyName ) ) { if( pTable->sFieldService != NULL ) sFieldService = OUString::createFromAscii(pTable->sFieldService); diff --git a/tools/source/string/strascii.cxx b/tools/source/string/strascii.cxx index 5fcea9fa7907..bf0d5a288f14 100644 --- a/tools/source/string/strascii.cxx +++ b/tools/source/string/strascii.cxx @@ -91,63 +91,6 @@ static sal_Int32 ImplStringCompareWithoutZeroAscii( const sal_Unicode* pStr1, co return nRet; } -static sal_Int32 ImplStringICompareAscii( const sal_Unicode* pStr1, const sal_Char* pStr2 ) -{ - sal_Int32 nRet; - sal_Unicode c1; - sal_Char c2; - do - { - // Convert if char is between 'A' and 'Z' - c1 = *pStr1; - c2 = *pStr2; - if ( (c1 >= 65) && (c1 <= 90) ) - c1 += 32; - if ( (c2 >= 65) && (c2 <= 90) ) - c2 += 32; - nRet = ((sal_Int32)c1)-((sal_Int32)((unsigned char)c2)); - if ( nRet != 0 ) - break; - - ++pStr1, - ++pStr2; - } - while ( c2 ); - - return nRet; -} - -static sal_Int32 ImplStringICompareAscii( const sal_Unicode* pStr1, const sal_Char* pStr2, - xub_StrLen nCount ) -{ - sal_Int32 nRet = 0; - sal_Unicode c1; - sal_Char c2; - do - { - if ( !nCount ) - break; - - // Convert if char is between 'A' and 'Z' - c1 = *pStr1; - c2 = *pStr2; - if ( (c1 >= 65) && (c1 <= 90) ) - c1 += 32; - if ( (c2 >= 65) && (c2 <= 90) ) - c2 += 32; - nRet = ((sal_Int32)c1)-((sal_Int32)((unsigned char)c2)); - if ( nRet != 0 ) - break; - - ++pStr1, - ++pStr2, - --nCount; - } - while ( c2 ); - - return nRet; -} - UniString& UniString::AssignAscii( const sal_Char* pAsciiStr ) { DBG_CHKTHIS( UniString, DbgCheckUniString ); @@ -322,15 +265,6 @@ sal_Bool UniString::EqualsAscii( const sal_Char* pAsciiStr ) const return (ImplStringCompareAscii( mpData->maStr, pAsciiStr ) == 0); } -sal_Bool UniString::EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const -{ - DBG_CHKTHIS( UniString, DbgCheckUniString ); - DBG_ASSERT( ImplDbgCheckAsciiStr( pAsciiStr, STRING_LEN ), - "UniString::EqualsIgnoreCaseAscii() - pAsciiStr include characters > 127" ); - - return (ImplStringICompareAscii( mpData->maStr, pAsciiStr ) == 0); -} - sal_Bool UniString::EqualsAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex, xub_StrLen nLen ) const { @@ -345,20 +279,6 @@ sal_Bool UniString::EqualsAscii( const sal_Char* pAsciiStr, return (ImplStringCompareAscii( mpData->maStr+nIndex, pAsciiStr, nLen ) == 0); } -sal_Bool UniString::EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr, - xub_StrLen nIndex, xub_StrLen nLen ) const -{ - DBG_CHKTHIS( UniString, DbgCheckUniString ); - DBG_ASSERT( ImplDbgCheckAsciiStr( pAsciiStr, nLen ), - "UniString::EqualsIgnoreCaseAscii() - pAsciiStr include characters > 127" ); - - // Are there enough codes for comparing? - if ( nIndex > mpData->mnLen ) - return (*pAsciiStr == 0); - - return (ImplStringICompareAscii( mpData->maStr+nIndex, pAsciiStr, nLen ) == 0); -} - xub_StrLen UniString::SearchAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex ) const { DBG_CHKTHIS( UniString, DbgCheckUniString ); diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index 4d081bd72d0e..2a73396929b0 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -124,54 +124,6 @@ STRING& STRING::Insert( const STRING& rStr, xub_StrLen nPos, xub_StrLen nLen, return *this; } -static sal_Int32 ImplStringICompareWithoutZero( const STRCODE* pStr1, const STRCODE* pStr2, - sal_Int32 nCount ) -{ - sal_Int32 nRet = 0; - STRCODE c1; - STRCODE c2; - do - { - if ( !nCount ) - break; - - // convert if char is between 'A' and 'Z' - c1 = *pStr1; - c2 = *pStr2; - if ( (c1 >= 65) && (c1 <= 90) ) - c1 += 32; - if ( (c2 >= 65) && (c2 <= 90) ) - c2 += 32; - nRet = ((sal_Int32)((STRCODEU)c1))-((sal_Int32)((STRCODEU)c2)); - - ++pStr1, - ++pStr2, - --nCount; - } - while ( nRet == 0 ); - - return nRet; -} - -sal_Bool STRING::EqualsIgnoreCaseAscii( const STRING& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const -{ - DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); - - // Are there enough codes for comparing? - if ( nIndex > mpData->mnLen ) - return (rStr.mpData->mnLen == 0); - sal_Int32 nMaxLen = mpData->mnLen-nIndex; - if ( nMaxLen < nLen ) - { - if ( rStr.mpData->mnLen != nMaxLen ) - return sal_False; - nLen = static_cast< xub_StrLen >(nMaxLen); - } - - return (ImplStringICompareWithoutZero( mpData->maStr+nIndex, rStr.mpData->maStr, nLen ) == 0); -} - STRING& STRING::Insert( STRCODE c, xub_StrLen nIndex ) { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); @@ -238,21 +190,6 @@ sal_Bool STRING::Equals( const STRING& rStr ) const return (ImplStringCompareWithoutZero( mpData->maStr, rStr.mpData->maStr, mpData->mnLen ) == 0); } -sal_Bool STRING::EqualsIgnoreCaseAscii( const STRING& rStr ) const -{ - DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); - - if ( mpData == rStr.mpData ) - return sal_True; - - if ( mpData->mnLen != rStr.mpData->mnLen ) - return sal_False; - - // compare string while ignoring case - return (ImplStringICompareWithoutZero( mpData->maStr, rStr.mpData->maStr, mpData->mnLen ) == 0); -} - sal_Bool STRING::Equals( const STRING& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx index 1d131a6c41e9..6d99dca66c01 100644 --- a/vcl/generic/fontmanager/helper.cxx +++ b/vcl/generic/fontmanager/helper.cxx @@ -23,14 +23,14 @@ #include <sys/stat.h> #include <unistd.h> #include <limits.h> - +#include <osl/file.hxx> +#include <osl/process.h> +#include <osl/thread.h> +#include <rtl/bootstrap.hxx> +#include <rtl/ustring.hxx> +#include <tools/urlobj.hxx> #include "vcl/helper.hxx" #include "vcl/ppdparser.hxx" -#include "tools/string.hxx" -#include "tools/urlobj.hxx" -#include "osl/file.hxx" -#include "osl/process.h" -#include "rtl/bootstrap.hxx" using ::rtl::Bootstrap; diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx index 53086c7f5287..a2b5b8a721b3 100644 --- a/vcl/inc/fontcache.hxx +++ b/vcl/inc/fontcache.hxx @@ -20,11 +20,9 @@ #ifndef _PSPRINT_FONTCACHE_HXX #define _PSPRINT_FONTCACHE_HXX -#include "vcl/dllapi.h" -#include "vcl/fontmanager.hxx" - -#include "tools/string.hxx" - +#include <rtl/ustring.hxx> +#include <vcl/dllapi.h> +#include <vcl/fontmanager.hxx> #include <boost/unordered_map.hpp> namespace psp diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx index 0c2df2637b76..4f00487da2c4 100644 --- a/vcl/inc/fontsubset.hxx +++ b/vcl/inc/fontsubset.hxx @@ -20,8 +20,8 @@ #ifndef _SV_FONTSUBSET_HXX #define _SV_FONTSUBSET_HXX +#include <rtl/ustring.hxx> #include <tools/gen.hxx> -#include <tools/string.hxx> #include <cstdio> #include "vcl/dllapi.h" diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index e849fa5a07fb..8abdd35192ac 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -20,8 +20,8 @@ #ifndef _SV_IMPFONT_HXX #define _SV_IMPFONT_HXX +#include <rtl/ustring.hxx> #include <tools/gen.hxx> -#include <tools/string.hxx> #include <i18nlangtag/languagetag.hxx> #include <tools/color.hxx> #include <vcl/dllapi.h> diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index e3af7b3f425a..f88a88bcfc0d 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -20,8 +20,8 @@ #ifndef _SV_OUTFONT_HXX #define _SV_OUTFONT_HXX +#include <rtl/ustring.hxx> #include <sal/types.h> -#include <tools/string.hxx> #include <i18nlangtag/lang.h> #include <tools/solar.h> #include <vcl/dllapi.h> diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 55bc006f90e5..1ae6087751be 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -21,7 +21,7 @@ #define _SV_SALWTYPE_HXX #include <i18nlangtag/lang.h> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/solar.h> class SalGraphics; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index bc4a59b89a02..3043ad7cf5d4 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -24,11 +24,10 @@ #include <osl/thread.hxx> #include <rtl/ref.hxx> - +#include <rtl/ustring.hxx> #include "tools/shl.hxx" #include "tools/link.hxx" #include "tools/fldunit.hxx" -#include "tools/string.hxx" #include "tools/color.hxx" #include "tools/debug.hxx" diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index 2b51699c1d7e..dfc4008bd158 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -20,11 +20,9 @@ #ifndef VCL_TEXTLAYOUT_HXX #define VCL_TEXTLAYOUT_HXX -#include "vcl/outdev.hxx" - +#include <rtl/ustring.hxx> #include <tools/solar.h> -#include <tools/string.hxx> - +#include <vcl/outdev.hxx> #include <memory> class Control; diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 96e2c5713fdf..115182364dd8 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -20,8 +20,8 @@ #ifndef _SV_TOOLBOX_H #define _SV_TOOLBOX_H +#include <rtl/ustring.hxx> #include <tools/gen.hxx> -#include <tools/string.hxx> #include <tools/solar.h> #include <vcl/image.hxx> #include <vcl/toolbox.hxx> diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx index 233b6beb93b7..f1769ed7221d 100644 --- a/vcl/inc/unx/i18n_status.hxx +++ b/vcl/inc/unx/i18n_status.hxx @@ -20,8 +20,6 @@ #ifndef _SAL_I18N_STATUS_HXX #define _SAL_I18N_STATUS_HXX -#include <tools/string.hxx> - #include <rtl/ustring.hxx> #include <salimestatus.hxx> diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index 9eb7ad275abb..2c2ee3b38c13 100644 --- a/vcl/inc/unx/wmadaptor.hxx +++ b/vcl/inc/unx/wmadaptor.hxx @@ -20,7 +20,7 @@ #ifndef _VCL_WMADAPTOR_HXX_ #define _VCL_WMADAPTOR_HXX_ -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/gen.hxx> #ifndef _PREX_H #include <prex.h> diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index 1dea032d652e..bf22b77bdc3b 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -17,11 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <tools/string.hxx> #include <textdoc.hxx> - #include <stdlib.h> - // compare function called by QuickSort static bool CompareStart( const TextCharAttrib* pFirst, const TextCharAttrib* pSecond ) { diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx index d5aaadc5962e..4b4afc1b5595 100644 --- a/vcl/source/edit/textdoc.hxx +++ b/vcl/source/edit/textdoc.hxx @@ -20,10 +20,9 @@ #ifndef _TEXTDOC_HXX #define _TEXTDOC_HXX +#include <rtl/ustring.hxx> #include <vcl/textdata.hxx> #include <vcl/txtattr.hxx> - -#include <tools/string.hxx> #include <vector> class TextCharAttribs : public std::vector<TextCharAttrib*> { diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx index 664de9e56dac..f8cc38bba551 100644 --- a/vcl/source/filter/FilterConfigCache.hxx +++ b/vcl/source/filter/FilterConfigCache.hxx @@ -20,12 +20,11 @@ #ifndef _FILTER_CONFIG_CACHE_HXX_ #define _FILTER_CONFIG_CACHE_HXX_ -#include <tools/string.hxx> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameAccess.hpp> - +#include <rtl/ustring.hxx> #include <vector> /** Cache to keep list of graphic filters + the filters themselves. */ diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 868cabe98173..a2ca658d55ca 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -17,11 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - +#include <rtl/alloc.h> +#include <rtl/ustring.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> -#include <tools/string.hxx> -#include <rtl/alloc.h> #include <vcl/jobset.hxx> #include <jobset.h> diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 9b1e59a07e61..09f357d30eaa 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -18,10 +18,9 @@ */ -#include <vcl/abstdlg.hxx> - +#include <rtl/ustring.hxx> #include <osl/module.hxx> -#include <tools/string.hxx> +#include <vcl/abstdlg.hxx> typedef VclAbstractDialogFactory* (SAL_CALL *FuncPtrCreateDialogFactory)(); diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 79137b8c4518..52e48a8c910d 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -20,6 +20,7 @@ // bootstrap stuff #include <rtl/bootstrap.hxx> +#include <rtl/ustring.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/servicefactory.hxx> #include <cppuhelper/bootstrap.hxx> @@ -40,7 +41,6 @@ #include <vcl/bitmapex.hxx> #include <vcl/gradient.hxx> #include <vcl/lineinfo.hxx> -#include <tools/string.hxx> #include <osl/time.h> |