diff options
353 files changed, 990 insertions, 1054 deletions
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 471becda482e..ac384bb86d3e 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -324,15 +324,15 @@ namespace aName += pMethod->GetName(); // language - String aLanguage = String::CreateFromAscii("Basic"); + rtl::OUString aLanguage("Basic"); // location - String aLocation; + rtl::OUString aLocation; ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) ); if ( aDocument.isDocument() ) { // document basic - aLocation = String::CreateFromAscii("document"); + aLocation = rtl::OUString("document"); if ( rxLimitToDocument.is() ) { @@ -366,17 +366,17 @@ namespace else { // application basic - aLocation = String::CreateFromAscii("application"); + aLocation = rtl::OUString("application"); } // script URL if ( !bError ) { - aScriptURL = String::CreateFromAscii("vnd.sun.star.script:"); + aScriptURL = rtl::OUString("vnd.sun.star.script:"); aScriptURL += aName; - aScriptURL += String::CreateFromAscii("?language="); + aScriptURL += rtl::OUString("?language="); aScriptURL += aLanguage; - aScriptURL += String::CreateFromAscii("&location="); + aScriptURL += rtl::OUString("&location="); aScriptURL += aLocation; } diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 9018f3add5db..d46c797a79c7 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -135,7 +135,7 @@ BasicIDEDLL::BasicIDEDLL() SfxModule* pMod = BASIC_MOD(); SfxObjectFactory& rFactory = BasicDocShell::Factory(); - rFactory.SetDocumentServiceName( String::CreateFromAscii( "com.sun.star.script.BasicIDE" ) ); + rFactory.SetDocumentServiceName( rtl::OUString("com.sun.star.script.BasicIDE") ); BasicDocShell::RegisterInterface( pMod ); BasicIDEShell::RegisterFactory( SVX_INTERFACE_BASIDE_VIEWSH ); diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 761be97b03c0..bd0f6fe70fcc 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -354,7 +354,7 @@ SbMethod* MacroChooser::CreateMacro() String aLibName( aDesc.GetLibName() ); if ( !aLibName.Len() ) - aLibName = String::CreateFromAscii( "Standard" ); + aLibName = rtl::OUString("Standard"); aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName ); @@ -522,8 +522,6 @@ IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox ) IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox ) { - static String aSpaceStr = String::CreateFromAscii(" "); - // Is also called if deselected! // Two function calls in every SelectHdl because // there's no separate DeselectHDL. @@ -537,7 +535,7 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox ) if ( pModule ) { String aStr = aMacrosInTxtBaseStr; - aStr += aSpaceStr; + aStr += rtl::OUString(" "); aStr += pModule->GetName(); aMacrosInTxt.SetText( aStr ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index bf7d036b25e2..6c9aacd63524 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -1532,7 +1532,7 @@ void LibPage::SetCurLib() ImpInsertLibEntry( aLibName, i ); } - SvLBoxEntry* pEntry_ = aLibBox.FindEntry( String::CreateFromAscii( "Standard" ) ); + SvLBoxEntry* pEntry_ = aLibBox.FindEntry( rtl::OUString("Standard") ); if ( !pEntry_ ) pEntry_ = aLibBox.GetEntry( 0 ); aLibBox.SetCurEntry( pEntry_ ); diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index f5ca16c35e28..8fa93f5458fb 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -101,13 +101,13 @@ typedef WeakImplHelper1< XStarBasicAccess > StarBasicAccessHelper; // Version 2 // + sal_Bool bReference -static const char* szStdLibName = "Standard"; +static const char szStdLibName[] = "Standard"; static const char szBasicStorage[] = "StarBASIC"; -static const char* szOldManagerStream = "BasicManager"; +static const char szOldManagerStream[] = "BasicManager"; static const char szManagerStream[] = "BasicManager2"; -static const char* szImbedded = "LIBIMBEDDED"; -static const char* szCryptingKey = "CryptedBasic"; -static const char* szScriptLanguage = "StarBasic"; +static const char szImbedded[] = "LIBIMBEDDED"; +static const char szCryptingKey[] = "CryptedBasic"; +static const char szScriptLanguage[] = "StarBasic"; TYPEINIT1( BasicManager, SfxBroadcaster ); DBG_NAME( BasicManager ); @@ -555,8 +555,8 @@ BasicLibInfo::BasicLibInfo() bDoLoad = sal_False; bFoundInPath = sal_False; mxScriptCont = NULL; - aStorageName = String::CreateFromAscii(szImbedded); - aRelStorageName = String::CreateFromAscii(szImbedded); + aStorageName = rtl::OUString(szImbedded); + aRelStorageName = rtl::OUString(szImbedded); } BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream ) @@ -632,8 +632,8 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA pStdLibInfo = CreateLibInfo(); pStdLibInfo->SetLib( pStdLib ); StarBASICRef xStdLib = pStdLibInfo->GetLib(); - xStdLib->SetName( String::CreateFromAscii(szStdLibName) ); - pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) ); + xStdLib->SetName( rtl::OUString(szStdLibName) ); + pStdLibInfo->SetLibName( rtl::OUString(szStdLibName) ); xStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH ); xStdLib->SetModified( sal_False ); } @@ -682,7 +682,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA else { ImpCreateStdLib( pParentFromStdLib ); - if ( rStorage.IsStream( String::CreateFromAscii(szOldManagerStream) ) ) + if ( rStorage.IsStream( rtl::OUString(szOldManagerStream) ) ) LoadOldBasicManager( rStorage ); } } @@ -816,8 +816,8 @@ BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, sal_Bool bDocMgr BasicLibInfo* pStdLibInfo = CreateLibInfo(); pStdLibInfo->SetLib( pSLib ); StarBASICRef xStdLib = pStdLibInfo->GetLib(); - xStdLib->SetName( String::CreateFromAscii(szStdLibName)); - pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) ); + xStdLib->SetName(rtl::OUString(szStdLibName)); + pStdLibInfo->SetLibName( rtl::OUString(szStdLibName) ); pSLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH ); // Save is only necessary if basic has changed @@ -835,8 +835,8 @@ void BasicManager::ImpMgrNotLoaded( const String& rStorageName ) BasicLibInfo* pStdLibInfo = CreateLibInfo(); pStdLibInfo->SetLib( new StarBASIC( NULL, mbDocMgr ) ); StarBASICRef xStdLib = pStdLibInfo->GetLib(); - xStdLib->SetName( String::CreateFromAscii(szStdLibName) ); - pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) ); + xStdLib->SetName( rtl::OUString(szStdLibName) ); + pStdLibInfo->SetLibName( rtl::OUString(szStdLibName) ); xStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH ); xStdLib->SetModified( sal_False ); } @@ -847,8 +847,8 @@ void BasicManager::ImpCreateStdLib( StarBASIC* pParentFromStdLib ) BasicLibInfo* pStdLibInfo = CreateLibInfo(); StarBASIC* pStdLib = new StarBASIC( pParentFromStdLib, mbDocMgr ); pStdLibInfo->SetLib( pStdLib ); - pStdLib->SetName( String::CreateFromAscii(szStdLibName) ); - pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) ); + pStdLib->SetName( rtl::OUString(szStdLibName) ); + pStdLibInfo->SetLibName( rtl::OUString(szStdLibName) ); pStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH ); } @@ -944,7 +944,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) SotStorageStreamRef xManagerStream = rStorage.OpenSotStream - ( String::CreateFromAscii(szOldManagerStream), eStreamReadMode ); + ( rtl::OUString(szOldManagerStream), eStreamReadMode ); String aStorName( rStorage.GetName() ); DBG_ASSERT( aStorName.Len(), "No Storage Name!" ); @@ -1287,7 +1287,7 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, s else { pLibInfo->GetLib()->SetModified( sal_True ); // Must be saved after Add! - pLibInfo->SetStorageName( String::CreateFromAscii(szImbedded) ); // Save in BasicManager-Storage + pLibInfo->SetStorageName( rtl::OUString(szImbedded) ); // Save in BasicManager-Storage } } else diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 5aecb53318de..57ca034e66f3 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -474,7 +474,7 @@ String SbiImage::GetString( short nId ) const if( nLen == 1 ) { // Force length 1 and make char 0 afterwards - String aNullCharStr( String::CreateFromAscii( " " ) ); + String aNullCharStr( rtl::OUString(" ") ); aNullCharStr.SetChar( 0, 0 ); return aNullCharStr; } diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 79fc969aecb9..c18d0eaf501f 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1915,10 +1915,10 @@ BasicCollection::BasicCollection( const XubString& rClass ) { if( !nCountHash ) { - nCountHash = MakeHashCode( String::CreateFromAscii( pCountStr ) ); - nAddHash = MakeHashCode( String::CreateFromAscii( pAddStr ) ); - nItemHash = MakeHashCode( String::CreateFromAscii( pItemStr ) ); - nRemoveHash = MakeHashCode( String::CreateFromAscii( pRemoveStr ) ); + nCountHash = MakeHashCode( rtl::OUString::createFromAscii( pCountStr ) ); + nAddHash = MakeHashCode( rtl::OUString::createFromAscii( pAddStr ) ); + nItemHash = MakeHashCode( rtl::OUString::createFromAscii( pItemStr ) ); + nRemoveHash = MakeHashCode( rtl::OUString::createFromAscii( pRemoveStr ) ); } Initialize(); @@ -1940,14 +1940,14 @@ void BasicCollection::Initialize() SetFlag( SBX_FIXED ); ResetFlag( SBX_WRITE ); SbxVariable* p; - p = Make( String::CreateFromAscii( pCountStr ), SbxCLASS_PROPERTY, SbxINTEGER ); + p = Make( rtl::OUString::createFromAscii( pCountStr ), SbxCLASS_PROPERTY, SbxINTEGER ); p->ResetFlag( SBX_WRITE ); p->SetFlag( SBX_DONTSTORE ); - p = Make( String::CreateFromAscii( pAddStr ), SbxCLASS_METHOD, SbxEMPTY ); + p = Make( rtl::OUString::createFromAscii( pAddStr ), SbxCLASS_METHOD, SbxEMPTY ); p->SetFlag( SBX_DONTSTORE ); - p = Make( String::CreateFromAscii( pItemStr ), SbxCLASS_METHOD, SbxVARIANT ); + p = Make( rtl::OUString::createFromAscii( pItemStr ), SbxCLASS_METHOD, SbxVARIANT ); p->SetFlag( SBX_DONTSTORE ); - p = Make( String::CreateFromAscii( pRemoveStr ), SbxCLASS_METHOD, SbxEMPTY ); + p = Make( rtl::OUString::createFromAscii( pRemoveStr ), SbxCLASS_METHOD, SbxEMPTY ); p->SetFlag( SBX_DONTSTORE ); if ( !xAddInfo.Is() ) { diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index 61a55da33e2b..1af42ef2fadb 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -820,7 +820,7 @@ void SbiParser::Option() void addStringConst( SbiSymPool& rPool, const char* pSym, const String& rStr ) { - SbiConstDef* pConst = new SbiConstDef( String::CreateFromAscii( pSym ) ); + SbiConstDef* pConst = new SbiConstDef( rtl::OUString::createFromAscii( pSym ) ); pConst->SetType( SbxSTRING ); pConst->Set( rStr ); rPool.Add( pConst ); @@ -828,7 +828,7 @@ void addStringConst( SbiSymPool& rPool, const char* pSym, const String& rStr ) inline void addStringConst( SbiSymPool& rPool, const char* pSym, const char* pStr ) { - addStringConst( rPool, pSym, String::CreateFromAscii( pStr ) ); + addStringConst( rPool, pSym, rtl::OUString::createFromAscii( pStr ) ); } void SbiParser::AddConstants( void ) @@ -848,7 +848,7 @@ void SbiParser::AddConstants( void ) addStringConst( aPublics, "vbVerticalTab", "\x0B" ); // Force length 1 and make char 0 afterwards - String aNullCharStr( String::CreateFromAscii( " " ) ); + String aNullCharStr( rtl::OUString(" ") ); aNullCharStr.SetChar( 0, 0 ); addStringConst( aPublics, "vbNullChar", aNullCharStr ); } diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx index b31330c06529..47f8716465b8 100644 --- a/basic/source/runtime/ddectrl.cxx +++ b/basic/source/runtime/ddectrl.cxx @@ -72,7 +72,7 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv ) IMPL_LINK_INLINE( SbiDdeControl,Data , DdeData*, pData, { - aData = String::CreateFromAscii( (char*)(const void*)*pData ); + aData = rtl::OUString::createFromAscii( (const char*)(const void*)*pData ); return 1; } ) diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 4f6680c2212c..7050093a2e14 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -446,7 +446,7 @@ RTLFUNC(CurDir) } char* pBuffer = new char[ _MAX_PATH ]; if ( _getdcwd( nCurDir, pBuffer, _MAX_PATH ) != 0 ) - rPar.Get(0)->PutString( String::CreateFromAscii( pBuffer ) ); + rPar.Get(0)->PutString( rtl::OUString::createFromAscii( pBuffer ) ); else StarBASIC::Error( SbERR_NO_DEVICE ); delete [] pBuffer; @@ -465,7 +465,7 @@ RTLFUNC(CurDir) } if( getcwd( pMem, nSize-1 ) != NULL ) { - rPar.Get(0)->PutString( String::CreateFromAscii(pMem) ); + rPar.Get(0)->PutString( rtl::OUString::createFromAscii(pMem) ); delete [] pMem; return; } @@ -877,7 +877,7 @@ RTLFUNC(Hex) snprintf( aBuffer, sizeof(aBuffer), "%X", pArg->GetInteger() ); else snprintf( aBuffer, sizeof(aBuffer), "%lX", static_cast<long unsigned int>(pArg->GetLong()) ); - rPar.Get(0)->PutString( String::CreateFromAscii( aBuffer ) ); + rPar.Get(0)->PutString( rtl::OUString::createFromAscii( aBuffer ) ); } } @@ -1300,7 +1300,7 @@ RTLFUNC(Oct) snprintf( aBuffer, sizeof(aBuffer), "%o", pArg->GetInteger() ); else snprintf( aBuffer, sizeof(aBuffer), "%lo", static_cast<long unsigned int>(pArg->GetLong()) ); - rPar.Get(0)->PutString( String::CreateFromAscii( aBuffer ) ); + rPar.Get(0)->PutString( rtl::OUString::createFromAscii( aBuffer ) ); } } @@ -1767,7 +1767,7 @@ RTLFUNC(CDateToIso) implGetDateYear( aDate ), implGetDateMonth( aDate ), implGetDateDay( aDate ) ); - String aRetStr = String::CreateFromAscii( Buffer ); + String aRetStr = rtl::OUString::createFromAscii( Buffer ); rPar.Get(0)->PutString( aRetStr ); } else @@ -2107,7 +2107,7 @@ RTLFUNC(Time) char buf[ 20 ]; snprintf( buf, sizeof(buf), "%02d:%02d:%02d", aTime.GetHour(), aTime.GetMin(), aTime.GetSec() ); - aRes = String::CreateFromAscii( buf ); + aRes = rtl::OUString::createFromAscii( buf ); } else { diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 19f4823608a4..0e418ccedf63 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -1252,7 +1252,7 @@ RTLFUNC(Environ) osl_getThreadTextEncoding())); const char* pEnvStr = getenv(aByteStr.getStr()); if ( pEnvStr ) - aResult = String::CreateFromAscii( pEnvStr ); + aResult = rtl::OUString::createFromAscii( pEnvStr ); rPar.Get(0)->PutString( aResult ); } diff --git a/basic/source/runtime/sbdiagnose.cxx b/basic/source/runtime/sbdiagnose.cxx index d54aea3f1697..95d2332e9900 100644 --- a/basic/source/runtime/sbdiagnose.cxx +++ b/basic/source/runtime/sbdiagnose.cxx @@ -61,7 +61,7 @@ void DbgReportAssertion( const sal_Char* i_assertionMessage ) SbxArrayRef const xArguments( new SbxArray( SbxVARIANT ) ); SbxVariableRef const xMessageText = new SbxVariable( SbxSTRING ); - xMessageText->PutString( String::CreateFromAscii( i_assertionMessage ) ); + xMessageText->PutString( rtl::OUString::createFromAscii(i_assertionMessage) ); xArguments->Put( xMessageText, 1 ); ErrCode const nError = xAssertionChannelBasic->Call( sCaptureFunctionName, xArguments ); diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index 89a244f56beb..2f95d51cef82 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -731,7 +731,7 @@ SbiStdObject::SbiStdObject( const String& r, StarBASIC* pb ) : SbxObject( r ) if( !p->nHash ) while( p->nArgs != -1 ) { - String aName_ = String::CreateFromAscii( p->pName ); + String aName_ = rtl::OUString::createFromAscii( p->pName ); p->nHash = SbxVariable::MakeHashCode( aName_ ); p += ( p->nArgs & _ARGSMASK ) + 1; } @@ -807,7 +807,7 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t ) short nType = ( p->nArgs & _TYPEMASK ); if( p->nArgs & _CONST ) nAccess |= SBX_CONST; - String aName_ = String::CreateFromAscii( p->pName ); + String aName_ = rtl::OUString::createFromAscii( p->pName ); SbxClassType eCT = SbxCLASS_OBJECT; if( nType & _PROPERTY ) eCT = SbxCLASS_PROPERTY; @@ -878,7 +878,7 @@ SbxInfo* SbiStdObject::GetInfo( short nIdx ) for( short i = 0; i < nPar; i++ ) { p++; - String aName_ = String::CreateFromAscii( p->pName ); + String aName_ = rtl::OUString::createFromAscii( p->pName ); sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03; if( p->nArgs & _OPT ) nFlags_ |= SBX_OPTIONAL; diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index c5868fd2a2c1..8bcde7d873f8 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -50,10 +50,10 @@ SbxCollection::SbxCollection( const XubString& rClass ) pAdd = GetSbxRes( STRING_ADDMETH ); pItem = GetSbxRes( STRING_ITEMMETH ); pRemove = GetSbxRes( STRING_REMOVEMETH ); - nCountHash = MakeHashCode( String::CreateFromAscii( pCount ) ); - nAddHash = MakeHashCode( String::CreateFromAscii( pAdd ) ); - nItemHash = MakeHashCode( String::CreateFromAscii( pItem ) ); - nRemoveHash = MakeHashCode( String::CreateFromAscii( pRemove ) ); + nCountHash = MakeHashCode( rtl::OUString::createFromAscii( pCount ) ); + nAddHash = MakeHashCode( rtl::OUString::createFromAscii( pAdd ) ); + nItemHash = MakeHashCode( rtl::OUString::createFromAscii( pItem ) ); + nRemoveHash = MakeHashCode( rtl::OUString::createFromAscii( pRemove ) ); } Initialize(); // For Access on itself @@ -86,14 +86,14 @@ void SbxCollection::Initialize() SetFlag( SBX_FIXED ); ResetFlag( SBX_WRITE ); SbxVariable* p; - p = Make( String::CreateFromAscii( pCount ), SbxCLASS_PROPERTY, SbxINTEGER ); + p = Make( rtl::OUString::createFromAscii( pCount ), SbxCLASS_PROPERTY, SbxINTEGER ); p->ResetFlag( SBX_WRITE ); p->SetFlag( SBX_DONTSTORE ); - p = Make( String::CreateFromAscii( pAdd ), SbxCLASS_METHOD, SbxEMPTY ); + p = Make( rtl::OUString::createFromAscii( pAdd ), SbxCLASS_METHOD, SbxEMPTY ); p->SetFlag( SBX_DONTSTORE ); - p = Make( String::CreateFromAscii( pItem ), SbxCLASS_METHOD, SbxOBJECT ); + p = Make( rtl::OUString::createFromAscii( pItem ), SbxCLASS_METHOD, SbxOBJECT ); p->SetFlag( SBX_DONTSTORE ); - p = Make( String::CreateFromAscii( pRemove ), SbxCLASS_METHOD, SbxEMPTY ); + p = Make( rtl::OUString::createFromAscii( pRemove ), SbxCLASS_METHOD, SbxEMPTY ); p->SetFlag( SBX_DONTSTORE ); } diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 9038679e39a0..443412bbd3bf 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -51,8 +51,8 @@ SbxObject::SbxObject( const XubString& rClass ) { pNameProp = GetSbxRes( STRING_NAMEPROP ); pParentProp = GetSbxRes( STRING_PARENTPROP ); - nNameHash = MakeHashCode( String::CreateFromAscii( pNameProp ) ); - nParentHash = MakeHashCode( String::CreateFromAscii( pParentProp ) ); + nNameHash = MakeHashCode( rtl::OUString::createFromAscii( pNameProp ) ); + nParentHash = MakeHashCode( rtl::OUString::createFromAscii( pParentProp ) ); } SbxObject::Clear(); SbxObject::SetName( rClass ); @@ -129,9 +129,9 @@ void SbxObject::Clear() pProps = new SbxArray; pObjs = new SbxArray( SbxOBJECT ); SbxVariable* p; - p = Make( String::CreateFromAscii( pNameProp ), SbxCLASS_PROPERTY, SbxSTRING ); + p = Make( rtl::OUString::createFromAscii( pNameProp ), SbxCLASS_PROPERTY, SbxSTRING ); p->SetFlag( SBX_DONTSTORE ); - p = Make( String::CreateFromAscii( pParentProp ), SbxCLASS_PROPERTY, SbxOBJECT ); + p = Make( rtl::OUString::createFromAscii( pParentProp ), SbxCLASS_PROPERTY, SbxOBJECT ); p->ResetFlag( SBX_WRITE ); p->SetFlag( SBX_DONTSTORE ); pDfltProp = NULL; diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx index bc0d23db6d97..aa88ae2290bf 100644 --- a/connectivity/source/drivers/dbase/DConnection.cxx +++ b/connectivity/source/drivers/dbase/DConnection.cxx @@ -45,7 +45,7 @@ DBG_NAME(ODbaseConnection) ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver) { DBG_CTOR(ODbaseConnection,NULL); - m_aFilenameExtension = String::CreateFromAscii("dbf"); + m_aFilenameExtension = rtl::OUString("dbf"); } //----------------------------------------------------------------------------- ODbaseConnection::~ODbaseConnection() diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index b56395eb27f5..7285bb0a27b1 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -376,7 +376,7 @@ void ODbaseIndex::createINFEntry() { // synchronize inf-file String sEntry = m_Name; - sEntry += String::CreateFromAscii(".ndx"); + sEntry += rtl::OUString(".ndx"); ::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL()); sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER); @@ -435,7 +435,7 @@ sal_Bool ODbaseIndex::DropImpl() sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); rtl::OString aKeyName; String sEntry = m_Name; - sEntry += String::CreateFromAscii(".ndx"); + sEntry += rtl::OUString(".ndx"); // delete entries from the inf file for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++) diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 63e249fbfa6f..d051f3f881cf 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -511,9 +511,9 @@ void ODbaseTable::construct() // nyi: Ugly for Unix and Mac! if ( m_aHeader.db_typ == FoxProMemo || VisualFoxPro == m_aHeader.db_typ || VisualFoxProAuto == m_aHeader.db_typ ) // foxpro uses another extension - aURL.SetExtension(String::CreateFromAscii("fpt")); + aURL.SetExtension(rtl::OUString("fpt")); else - aURL.SetExtension(String::CreateFromAscii("dbt")); + aURL.SetExtension(rtl::OUString("dbt")); // If the memo file isn't found, the data will be displayed anyhow. // However, updates can't be done @@ -677,7 +677,7 @@ void ODbaseTable::refreshIndexes() INetURLObject aURL; aURL.SetURL(getEntry(m_pConnection,m_Name)); - aURL.setExtension(String::CreateFromAscii("inf")); + aURL.setExtension(rtl::OUString("inf")); Config aInfFile(aURL.getFSysPath(INetURLObject::FSYS_DETECT)); aInfFile.SetGroup(dBASE_III_GROUP); sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); @@ -1090,7 +1090,7 @@ sal_Bool ODbaseTable::CreateImpl() if (bMemoFile) { String aExt = aURL.getExtension(); - aURL.setExtension(String::CreateFromAscii("dbt")); // extension for memo file + aURL.setExtension(rtl::OUString("dbt")); // extension for memo file Content aMemo1Content(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>()); sal_Bool bMemoAlreadyExists = sal_False; @@ -1435,7 +1435,7 @@ sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMem { if (_bHasMemoFields) { // delete the memo fields - aURL.setExtension(String::CreateFromAscii("dbt")); + aURL.setExtension(rtl::OUString("dbt")); bDropped = ::utl::UCBContentHelper::Kill(aURL.GetMainURL(INetURLObject::NO_DECODE)); } @@ -1455,7 +1455,7 @@ sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMem { } } - aURL.setExtension(String::CreateFromAscii("inf")); + aURL.setExtension(rtl::OUString("inf")); // as the inf file does not necessarily exist, we aren't allowed to use UCBContentHelper::Kill try @@ -2348,7 +2348,7 @@ void SAL_CALL ODbaseTable::renameImpl( const ::rtl::OUString& newName ) throw(:: renameFile(m_pConnection,m_Name,newName,m_pConnection->getExtension()); if ( HasMemoFields() ) { // delete the memo fields - String sExt = String::CreateFromAscii("dbt"); + rtl::OUString sExt("dbt"); renameFile(m_pConnection,m_Name,newName,sExt); } } diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 6ad0c365ebfd..a727e41b6698 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1455,7 +1455,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) // change te description of the radio button, which switch to the module // dependend accelerator configuration String sButtonText = aModuleButton.GetText(); - sButtonText.SearchAndReplace(String::CreateFromAscii("$(MODULE)"), m_sModuleUIName); + sButtonText.SearchAndReplace(rtl::OUString("$(MODULE)"), m_sModuleUIName); aModuleButton.SetText(sButtonText); if (m_xModule.is()) @@ -1540,7 +1540,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const String& sCommand) } else { - String aRet( String::CreateFromAscii("Symbols: ") ); + String aRet(rtl::OUString("Symbols: ")); xub_StrLen nPos = sCommand.SearchAscii(".uno:InsertSymbol?Symbols:string="); if ( nPos == 0 ) { diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index dc4571adf5e2..85f353d655e8 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -948,7 +948,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected() } Any value = - xPropSet->getPropertyValue( String::CreateFromAscii( "URI" ) ); + xPropSet->getPropertyValue( rtl::OUString("URI") ); value >>= uri; String* pScriptURI = new String( uri ); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index ca780f8230f3..458709259dc5 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -523,7 +523,7 @@ IMPL_LINK_NOARG(SvxCharMapData, CharHighlightHdl) snprintf( aBuf, sizeof(aBuf), "U+%04X", static_cast<unsigned>(cChar) ); if( cChar < 0x0100 ) snprintf( aBuf+6, sizeof(aBuf)-6, " (%u)", static_cast<unsigned>(cChar) ); - aText = String::CreateFromAscii( aBuf ); + aText = rtl::OUString::createFromAscii(aBuf); } aCharCodeText.SetText( aText ); diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 3374d13b5a3f..63b83b468ac8 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -86,7 +86,7 @@ URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeT maCbbTargets.InsertEntry( *rTargetList[ i ] ); if( !rTarget.Len() ) - maCbbTargets.SetText( String::CreateFromAscii( "_self" ) ); + maCbbTargets.SetText( rtl::OUString("_self") ); else maCbbTargets.SetText( rTarget ); } diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 8957a142c1b8..b310ddb2ecb4 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -346,10 +346,8 @@ void SvxHyperlinkInternetTp::RemoveImproperProtocol(const String& aProperScheme) String SvxHyperlinkInternetTp::GetSchemeFromButtons() const { if( maRbtLinktypFTP.IsChecked() ) - { - return String::CreateFromAscii( INET_FTP_SCHEME ); - } - return String::CreateFromAscii( INET_HTTP_SCHEME ); + return rtl::OUString(INET_FTP_SCHEME); + return rtl::OUString(INET_HTTP_SCHEME); } INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 476ab9abf0c1..49b43f7340c4 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -250,10 +250,8 @@ void SvxHyperlinkMailTp::RemoveImproperProtocol(const String& aProperScheme) String SvxHyperlinkMailTp::GetSchemeFromButtons() const { if( maRbtNews.IsChecked() ) - { - return String::CreateFromAscii( INET_NEWS_SCHEME ); - } - return String::CreateFromAscii( INET_MAILTO_SCHEME ); + return rtl::OUString(INET_NEWS_SCHEME); + return rtl::OUString(INET_MAILTO_SCHEME); } INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 33533a11c449..4a1a2ecb0ef6 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -531,23 +531,23 @@ String SvxHyperlinkTabPageBase::GetSchemeFromURL( String aStrURL ) { if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTP_SCHEME, 0, 7 ) ) { - aStrScheme = String::CreateFromAscii( INET_HTTP_SCHEME ); + aStrScheme = rtl::OUString( INET_HTTP_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTPS_SCHEME, 0, 8 ) ) { - aStrScheme = String::CreateFromAscii( INET_HTTPS_SCHEME ); + aStrScheme = rtl::OUString( INET_HTTPS_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_FTP_SCHEME, 0, 6 ) ) { - aStrScheme = String::CreateFromAscii( INET_FTP_SCHEME ); + aStrScheme = rtl::OUString( INET_FTP_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_MAILTO_SCHEME, 0, 7 ) ) { - aStrScheme = String::CreateFromAscii( INET_MAILTO_SCHEME ); + aStrScheme = rtl::OUString( INET_MAILTO_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_NEWS_SCHEME, 0, 5 ) ) { - aStrScheme = String::CreateFromAscii( INET_NEWS_SCHEME ); + aStrScheme = rtl::OUString( INET_NEWS_SCHEME ); } } else diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index ac3bf0d22bd7..3137db1dce50 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -58,7 +58,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) if ( IsClassPathMode() ) { aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); - aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") ); + aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), rtl::OUString("*.jar;*.zip") ); } if ( aDlg.Execute() == ERRCODE_NONE ) diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index ff6816026c4e..587a10d6c5d0 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -104,7 +104,7 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc if ( aType.Len() ) { - aText += String::CreateFromAscii( " (" ); + aText += rtl::OUString( " (" ); aText += aType; aText += ')'; pPluginNames[nIndex] = aText; diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 3a8b0757968a..3a71808b7254 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -535,7 +535,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString languag // must be a neater way to deal with the strings than as above // append the language to the dialog title String winTitle( GetText() ); - winTitle.SearchAndReplace( String::CreateFromAscii( "%MACROLANG" ), m_sLanguage ); + winTitle.SearchAndReplace( rtl::OUString( "%MACROLANG" ), m_sLanguage ); SetText( winTitle ); aScriptsBox.SetSelectHdl( LINK( this, SvxScriptOrgDialog, ScriptSelectHdl ) ); @@ -614,8 +614,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) return; } - ::rtl::OUString sName; - sName = String::CreateFromAscii("Editable") ; + ::rtl::OUString sName("Editable") ; if ( getBoolProperty( xProps, sName ) ) { @@ -626,7 +625,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) aEditButton.Disable(); } - sName = String::CreateFromAscii("Deletable") ; + sName = rtl::OUString("Deletable") ; if ( getBoolProperty( xProps, sName ) ) { @@ -637,7 +636,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) aDelButton.Disable(); } - sName = String::CreateFromAscii("Creatable") ; + sName = rtl::OUString("Creatable") ; if ( getBoolProperty( xProps, sName ) ) { @@ -648,7 +647,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) aCreateButton.Disable(); } - sName = String::CreateFromAscii("Renamable") ; + sName = rtl::OUString("Renamable") ; if ( getBoolProperty( xProps, sName ) ) { @@ -765,7 +764,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) mspNode.set( mspUserData->GetNode() , UNO_QUERY ); pParent = aScriptsBox.GetParent( pParent ); } - xProp->getPropertyValue( String::CreateFromAscii("URI" ) ) >>= tmpString; + xProp->getPropertyValue( rtl::OUString("URI" ) ) >>= tmpString; const String scriptURL( tmpString ); if ( mspNode.is() ) @@ -1211,10 +1210,10 @@ sal_Bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >& String SvxScriptOrgDialog::getListOfChildren( Reference< browse::XBrowseNode > node, int depth ) { String result; - result.Append( String::CreateFromAscii( "\n" ) ); + result.Append( rtl::OUString( "\n" ) ); for( int i=0;i<=depth;i++ ) { - result.Append( String::CreateFromAscii( "\t" ) ); + result.Append( rtl::OUString( "\t" ) ); } result.Append( String( node->getName() ) ); diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 4c47b37fa567..c8cb1b1239ff 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -63,8 +63,6 @@ using namespace ::com::sun::star; using ::rtl::OUString; -#define A2S(x) String::CreateFromAscii( x ) - // class LookUpComboBox_Impl -------------------------------------------------- LookUpComboBox_Impl::LookUpComboBox_Impl( @@ -208,7 +206,7 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St if (bIsHeader && nVal >= 0) { aText = String::CreateFromInt32( nVal ); - aText += A2S( ". " ); + aText += rtl::OUString(". "); } pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column aText += rText; diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 320385cbf13e..a672523e553b 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -71,7 +71,7 @@ namespace svx FreeResource(); - String sTemp = String::CreateFromAscii("*.odb"); + rtl::OUString sTemp("*.odb"); m_aURL.SetFilter(sTemp); m_aName.SetModifyHdl( LINK(this, ODocumentLinkDialog, OnTextModified) ); @@ -171,8 +171,7 @@ namespace svx { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0); - static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)"); - const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); if ( pFilter ) { aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 9bbe165acb2d..191799f8b855 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -124,8 +124,8 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, aCheckLB.SvxSimpleTable::SetTabs( aStaticTabs, MAP_PIXEL ); String sHeader(sHeader1); - String sTab(String::CreateFromAscii("\t")); - String sTabSpace(String::CreateFromAscii("\t ")); + rtl::OUString sTab("\t"); + rtl::OUString sTabSpace("\t "); sHeader += sTab; sHeader += sHeader2; sHeader += sTabSpace; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 99e49f6410b3..6317c83e9699 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -347,7 +347,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : for ( sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); i++ ) { - String* pData = new String( String::CreateFromAscii( aHelpFormatNames[i] ) ); + String* pData = new String( rtl::OUString::createFromAscii( aHelpFormatNames[i] ) ); aHelpFormatLB.SetEntryData( i, pData ); } } @@ -1287,7 +1287,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe const String aStr( pLanguageTable->GetString( LANGUAGE_SYSTEM ) ); String aUILang(aStr); - aUILang += String::CreateFromAscii(" - "); + aUILang += rtl::OUString(" - "); aUILang += pLanguageTable->GetString( Application::GetSettings().GetUILanguage(), true ); aUserInterfaceLB.InsertEntry(aUILang); @@ -1361,7 +1361,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe const NfCurrencyEntry& rCurr = SvNumberFormatter::GetCurrencyEntry( LANGUAGE_SYSTEM ); // insert SYSTEM entry String aDefaultCurr(aStr); - aDefaultCurr += String::CreateFromAscii(" - "); + aDefaultCurr += rtl::OUString(" - "); aDefaultCurr += rCurr.GetBankSymbol(); aCurrencyLB.InsertEntry( aDefaultCurr ); // all currencies diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index dfd413a18ba6..a8ab0d1d25d4 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -1457,7 +1457,7 @@ IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton ) rtl::OUString sUrl; ::utl::LocalFileHelper::ConvertPhysicalNameToURL(sPath, sUrl); aHelper.SetDisplayDirectory(sUrl); - aHelper.AddFilter( m_sDefaultFilterName, String::CreateFromAscii("*")); + aHelper.AddFilter( m_sDefaultFilterName, rtl::OUString("*")); if ( ERRCODE_NONE == aHelper.Execute() ) { diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 843514b1a7eb..52b5c4b3fa62 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -910,7 +910,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl) { sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 ); aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); - aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") ); + aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), rtl::OUString("*.jar;*.zip") ); String sFolder; if ( m_aPathList.GetSelectEntryCount() > 0 ) { diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index a131b3997090..a3213497dad8 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -387,7 +387,7 @@ static const char * aEidToPropName[] = static inline String lcl_GetPropertyName( EID_OPTIONS eEntryId ) { DBG_ASSERT( (unsigned int) eEntryId < SAL_N_ELEMENTS(aEidToPropName), "index out of range" ); - return String::CreateFromAscii( aEidToPropName[ (int) eEntryId ] ); + return rtl::OUString::createFromAscii( aEidToPropName[ (int) eEntryId ] ); } // class OptionsUserData ------------------------------------------------- diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 4c0f03b0d009..d2b5a5f026de 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -142,7 +142,7 @@ static String getCfgName_Impl( sal_uInt16 _nHandle ) if ( Hdl2CfgMap_Impl[ nIndex ].m_nHandle == _nHandle ) { // config name found - sCfgName = String::CreateFromAscii( Hdl2CfgMap_Impl[ nIndex ].m_pCfgName ); + sCfgName = rtl::OUString::createFromAscii( Hdl2CfgMap_Impl[ nIndex ].m_pCfgName ); break; } ++nIndex; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 95a52c63c2d1..533e8febc008 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1307,9 +1307,9 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) nMinTrail = 2; if (xProp.is()) { - xProp->getPropertyValue( String::CreateFromAscii( + xProp->getPropertyValue( rtl::OUString( UPN_HYPH_MIN_LEADING) ) >>= nMinLead; - xProp->getPropertyValue( String::CreateFromAscii( + xProp->getPropertyValue( rtl::OUString( UPN_HYPH_MIN_TRAILING) ) >>= nMinTrail; } aHyphen.GetMinLead() = (sal_uInt8)nMinLead; @@ -1340,7 +1340,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) sal_Bool bVal = sal_False; if (xProp.is()) { - xProp->getPropertyValue( String::CreateFromAscii( UPN_IS_SPELL_AUTO) ) >>= bVal; + xProp->getPropertyValue( rtl::OUString( UPN_IS_SPELL_AUTO) ) >>= bVal; } pRet->Put(SfxBoolItem(SID_AUTOSPELL_CHECK, bVal)); @@ -1489,10 +1489,10 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) if (xProp.is()) { xProp->setPropertyValue( - String::CreateFromAscii(UPN_HYPH_MIN_LEADING), + rtl::OUString(UPN_HYPH_MIN_LEADING), makeAny((sal_Int16) pHyphenItem->GetMinLead()) ); xProp->setPropertyValue( - String::CreateFromAscii(UPN_HYPH_MIN_TRAILING), + rtl::OUString(UPN_HYPH_MIN_TRAILING), makeAny((sal_Int16) pHyphenItem->GetMinTrail()) ); } bSaveSpellCheck = sal_True; @@ -1528,7 +1528,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) if (xProp.is()) { xProp->setPropertyValue( - String::CreateFromAscii(UPN_IS_SPELL_AUTO), + rtl::OUString(UPN_IS_SPELL_AUTO), makeAny(bOnlineSpelling) ); } } @@ -1702,7 +1702,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) AddTabPage( nPageId, rTextArray.GetString(i), nGroup ); } #ifdef DBG_UTIL - AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup ); + AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Interner Test"), nGroup ); #endif } @@ -1718,7 +1718,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup ); } #ifdef DBG_UTIL - AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup ); + AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Interner Test"), nGroup ); #endif } } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index ae72075aef4c..0547aa804f79 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -683,7 +683,7 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound ) ((float)aOrigSize.Width()/TWIP_TO_INCH)+0.5)); int ay = int(floor((float)aOrigPixelSize.Height() / ((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5)); - sTemp += UniString::CreateFromAscii(" "); + sTemp += rtl::OUString(" "); sTemp += CUI_RESSTR( STR_PPI ); String sPPI = UniString::CreateFromInt32(ax); if (abs(ax - ay) > 1) { diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index e61b68748efd..d2cdb020c985 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -335,13 +335,13 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) if( sScriptURI.CompareToAscii( "vnd.sun.star.script:", 20 ) == COMPARE_EQUAL ) { pThis->aTbl.Insert( - nEvent, SvxMacro( sScriptURI, String::CreateFromAscii( SVX_MACRO_LANGUAGE_SF ) ) ); + nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_SF ) ) ); } else { OSL_ENSURE( false, "_SfxMacroTabPage::AssignDeleteHdl_Impl: this branch is *not* dead? (out of interest: tell fs, please!)" ); pThis->aTbl.Insert( - nEvent, SvxMacro( sScriptURI, String::CreateFromAscii( SVX_MACRO_LANGUAGE_STARBASIC ) ) ); + nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) ); } } diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index ad0b4e647d74..d28d5821a059 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2011,7 +2011,7 @@ void SbaXDataBrowserController::ExecuteSearch() if ( pFact ) { ::std::vector< String > aContextNames; - aContextNames.push_back( String::CreateFromAscii("Standard") ); + aContextNames.push_back( rtl::OUString("Standard") ); pDialog = pFact->CreateFmSearchDialog(getBrowserView(), sInitialText, aContextNames, 0, LINK(this, SbaXDataBrowserController, OnSearchContextRequest)); } OSL_ENSURE( pDialog, "SbaXDataBrowserController::ExecuteSearch: could not get the search dialog!" ); diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 4e37c5677438..082fae181c67 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -965,7 +965,7 @@ void SbaGridControl::SetBrowserAttrs() ); if (!xDialog.is()) { - ShowServiceNotAvailableError(this, String::CreateFromAscii("com.sun.star.form.ControlFontDialog"), sal_True); + ShowServiceNotAvailableError(this, rtl::OUString("com.sun.star.form.ControlFontDialog"), sal_True); return; } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index f8e781bbe2db..2759864379de 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -972,11 +972,11 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) pNumType = new OPropListBoxCtrl( this, STR_HELP_NUMERIC_TYPE, FIELD_PROPERTY_NUMTYPE, WB_DROPDOWN ); pNumType->SetDropDownLineCount(5); - pNumType->InsertEntry( String::CreateFromAscii("Byte") ); - pNumType->InsertEntry( String::CreateFromAscii("SmallInt") ); - pNumType->InsertEntry( String::CreateFromAscii("Integer") ); - pNumType->InsertEntry( String::CreateFromAscii("Single") ); - pNumType->InsertEntry( String::CreateFromAscii("Double") ); + pNumType->InsertEntry( rtl::OUString("Byte") ); + pNumType->InsertEntry( rtl::OUString("SmallInt") ); + pNumType->InsertEntry( rtl::OUString("Integer") ); + pNumType->InsertEntry( rtl::OUString("Single") ); + pNumType->InsertEntry( rtl::OUString("Double") ); pNumType->SelectEntryPos(2); InitializeControl(pNumType,HID_TAB_ENT_NUMTYP,true); break; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index cda30378d4e4..a0d53c47c5d5 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -132,7 +132,7 @@ namespace if ( _pPortNumber ) { - sNewUrl += String::CreateFromAscii(":"); + sNewUrl += rtl::OUString::createFromAscii(":"); sNewUrl += String::CreateFromInt32(_pPortNumber->GetValue()); } @@ -524,7 +524,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const if ( sDatabaseName.Len() ) { - sNewUrl += String::CreateFromAscii("/"); + sNewUrl += rtl::OUString::createFromAscii("/"); sNewUrl += sDatabaseName; } } @@ -543,7 +543,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const sDatabaseName = pCollection->cutPrefix( pUrlItem->GetValue() ); if ( sDatabaseName.Len() ) { - sNewUrl += String::CreateFromAscii(":"); + sNewUrl += rtl::OUString::createFromAscii(":"); sNewUrl += sDatabaseName; } } diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 957aa84fdfb2..a04d977daf83 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -464,9 +464,9 @@ DBG_NAME(OTextConnectionHelper) { String sExtension; if (m_aRBAccessTextFiles.IsChecked()) - sExtension = String::CreateFromAscii("txt"); + sExtension = rtl::OUString("txt"); else if (m_aRBAccessCSVFiles.IsChecked()) - sExtension = String::CreateFromAscii("csv"); + sExtension = rtl::OUString("csv"); else { sExtension = m_aETOwnExtension.GetText(); diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index e19f92193f0d..3f859db90954 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -169,7 +169,7 @@ namespace dbaui m_aControlDependencies.enableOnRadioCheck( m_aNamedPipeRadio, m_aNamedPipe ); m_aControlDependencies.addController( ::svt::PDialogController( - new TextResetOperatorController( m_aHostName, String::CreateFromAscii( "localhost" ) ) + new TextResetOperatorController( m_aHostName, rtl::OUString("localhost") ) ) ); // sockets are available on Unix systems only, named pipes only on Windows diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 1a37952256ac..7c36e19528b1 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -328,26 +328,26 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp // create and initialize the defaults _rppDefaults = new SfxPoolItem*[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1]; SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults - *pCounter++ = new SfxStringItem(DSID_NAME, String()); - *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, String()); - *pCounter++ = new SfxStringItem(DSID_CONNECTURL, String()); + *pCounter++ = new SfxStringItem(DSID_NAME, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONNECTURL, rtl::OUString()); *pCounter++ = new OStringListItem(DSID_TABLEFILTER, Sequence< ::rtl::OUString >(&sFilterAll, 1)); *pCounter++ = new DbuTypeCollectionItem(DSID_TYPECOLLECTION, _pTypeCollection); *pCounter++ = new SfxBoolItem(DSID_INVALID_SELECTION, sal_False); *pCounter++ = new SfxBoolItem(DSID_READONLY, sal_False); - *pCounter++ = new SfxStringItem(DSID_USER, String()); - *pCounter++ = new SfxStringItem(DSID_PASSWORD, String()); - *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, String()); - *pCounter++ = new SfxStringItem(DSID_CHARSET, String()); + *pCounter++ = new SfxStringItem(DSID_USER, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_PASSWORD, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CHARSET, rtl::OUString()); *pCounter++ = new SfxBoolItem(DSID_PASSWORDREQUIRED, sal_False); *pCounter++ = new SfxBoolItem(DSID_SHOWDELETEDROWS, sal_False); *pCounter++ = new SfxBoolItem(DSID_ALLOWLONGTABLENAMES, sal_False); - *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, String()); + *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, rtl::OUString()); *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, ','); *pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, '"'); *pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, '.'); - *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, String()); - *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, String::CreateFromAscii("txt")); + *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, rtl::OUString("txt")); *pCounter++ = new SfxBoolItem(DSID_TEXTFILEHEADER, sal_True); *pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, sal_False); *pCounter++ = new SfxInt32Item(DSID_CONN_PORTNUMBER, 8100); @@ -356,16 +356,16 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxBoolItem(DSID_CONN_SHUTSERVICE, sal_False); *pCounter++ = new SfxInt32Item(DSID_CONN_DATAINC, 20); *pCounter++ = new SfxInt32Item(DSID_CONN_CACHESIZE, 20); - *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, String()); - *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, String()); + *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, rtl::OUString()); *pCounter++ = new SfxBoolItem(DSID_USECATALOG, sal_False); - *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, String()); - *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, String()); + *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, rtl::OUString()); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_PORTNUMBER, 389); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_ROWCOUNT, 100); *pCounter++ = new SfxBoolItem(DSID_SQL92CHECK, sal_False); - *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, String()); - *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, String()); + *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, rtl::OUString()); *pCounter++ = new SfxBoolItem(DSID_AUTORETRIEVEENABLED, sal_False); *pCounter++ = new SfxBoolItem(DSID_APPEND_TABLE_ALIAS, sal_False); *pCounter++ = new SfxInt32Item(DSID_MYSQL_PORTNUMBER, 3306); @@ -377,15 +377,15 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxBoolItem(DSID_SCHEMA, sal_True); *pCounter++ = new SfxBoolItem(DSID_INDEXAPPENDIX, sal_True); *pCounter++ = new SfxBoolItem(DSID_CONN_LDAP_USESSL, sal_False); - *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, String()); + *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, rtl::OUString()); *pCounter++ = new SfxBoolItem(DSID_DOSLINEENDS, sal_False); - *pCounter++ = new SfxStringItem(DSID_DATABASENAME, String()); + *pCounter++ = new SfxStringItem(DSID_DATABASENAME, rtl::OUString()); *pCounter++ = new SfxBoolItem(DSID_AS_BEFORE_CORRNAME, sal_True); *pCounter++ = new SfxBoolItem(DSID_CHECK_REQUIRED_FIELDS, sal_True); *pCounter++ = new SfxBoolItem(DSID_IGNORECURRENCY, sal_False); - *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, String()); + *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, rtl::OUString()); *pCounter++ = new SfxBoolItem(DSID_ESCAPE_DATETIME, sal_True); - *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, String()); + *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, rtl::OUString()); *pCounter++ = new OptionalBoolItem( DSID_PRIMARY_KEY_SUPPORT ); *pCounter++ = new SfxInt32Item(DSID_MAX_ROW_SCAN, 100); *pCounter++ = new SfxBoolItem( DSID_RESPECTRESULTSETTYPE,sal_False ); @@ -457,7 +457,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp }; OSL_ENSURE(sizeof(aItemInfos)/sizeof(aItemInfos[0]) == DSID_LAST_ITEM_ID,"Invalid Ids!"); - _rpPool = new SfxItemPool(String::CreateFromAscii("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID, + _rpPool = new SfxItemPool(rtl::OUString("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID, aItemInfos, _rppDefaults); _rpPool->FreezeIdRanges(); diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 747ac1f5f401..2d8d4b2434c9 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -360,7 +360,7 @@ void ODbaseIndexDialog::Init() OTableInfo& rTabInfo = m_aTableInfoList.back(); // open the INF file - aURL.setExtension(String::CreateFromAscii("inf")); + aURL.setExtension(rtl::OUString::createFromAscii("inf")); OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL); Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) ); aInfFile.SetGroup( aGroupIdent ); @@ -471,7 +471,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const } aURL.SetSmartURL(aDsn); aURL.Append(aTableName); - aURL.setExtension(String::CreateFromAscii("inf")); + aURL.setExtension(rtl::OUString::createFromAscii("inf")); OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL); Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) ); diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 6fdbc0567a84..5c917f424b58 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -226,7 +226,7 @@ DBG_NAME(DirectSQLDialog) OSL_ENSURE(xStatement.is(), "DirectSQLDialog::implExecuteStatement: no statement returned by the connection!"); // clear the output box - m_aOutput.SetText(String::CreateFromAscii("")); + m_aOutput.SetText(rtl::OUString()); if (xStatement.is()) { if (::rtl::OUString(_rStatement).toAsciiUpperCase().compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT")),6)==0 && m_pShowOutput->IsChecked()) @@ -287,9 +287,9 @@ DBG_NAME(DirectSQLDialog) void DirectSQLDialog::addStatusText(const String& _rMessage) { String sAppendMessage = String::CreateFromInt32(m_nStatusCount++); - sAppendMessage += String::CreateFromAscii(": "); + sAppendMessage += rtl::OUString(": "); sAppendMessage += _rMessage; - sAppendMessage += String::CreateFromAscii("\n\n"); + sAppendMessage += rtl::OUString("\n\n"); String sCompleteMessage = m_aStatus.GetText(); sCompleteMessage += sAppendMessage; @@ -302,7 +302,7 @@ DBG_NAME(DirectSQLDialog) void DirectSQLDialog::addOutputText(const String& _rMessage) { String sAppendMessage = _rMessage; - sAppendMessage += String::CreateFromAscii("\n"); + sAppendMessage += rtl::OUString("\n"); String sCompleteMessage = m_aOutput.GetText(); sCompleteMessage += sAppendMessage; diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index c87eed4fa0bd..34939b9bdeea 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -597,7 +597,7 @@ namespace dbaui { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - 0, ::String::CreateFromAscii("sdatabase") ); + 0, rtl::OUString::createFromAscii("sdatabase") ); const SfxFilter* pFilter = getStandardDatabaseFilter(); if ( pFilter ) { diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 840a86ecdef7..d5f5accf545c 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -222,7 +222,7 @@ DBG_NAME(OParameterDialog) LocalResourceAccess aDummy(DLG_PARAMETERS, RSC_MODALDIALOG); sMessage = String(ModuleRes(STR_COULD_NOT_CONVERT_PARAM)); } - sMessage.SearchAndReplaceAll(String::CreateFromAscii("$name$"), sName); + sMessage.SearchAndReplaceAll(rtl::OUString("$name$"), sName); ErrorBox(NULL, WB_OK, sMessage).Execute(); m_aParam.GrabFocus(); return 1L; diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 000ff80d5166..e2af63da73a8 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -926,7 +926,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, new SvxNumberInfoItem(SID_ATTR_NUMBERFORMAT_INFO) }; - SfxItemPool* pPool = new SfxItemPool(String::CreateFromAscii("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults); + SfxItemPool* pPool = new SfxItemPool(rtl::OUString("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults); pPool->SetDefaultMetric( SFX_MAPUNIT_TWIP ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same @@ -1007,8 +1007,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, //------------------------------------------------------------------------------ const SfxFilter* getStandardDatabaseFilter() { - static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)"); - const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); return pFilter; } @@ -1401,7 +1400,7 @@ sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText { SolarMutexGuard aGuard; String aMsg = String(ModuleRes(_nText)); - aMsg.SearchAndReplace(String::CreateFromAscii("%1"),String(_sName)); + aMsg.SearchAndReplace(rtl::OUString("%1"),String(_sName)); OSQLMessageBox aAsk(_pParent,String(ModuleRes(_nTitle )),aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query); if ( _bAll ) { diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 60ddd349a259..4b3078b2cb3e 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -242,7 +242,7 @@ OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream ) m_aTypeControl.Show(); m_aTypeControl.Init(); - m_etAuto.SetText(String::CreateFromAscii("10")); + m_etAuto.SetText(rtl::OUString("10")); m_etAuto.SetDecimalDigits(0); m_pbAuto.SetClickHdl(LINK(this,OWizTypeSelect,ButtonClickHdl)); m_lbColumnNames.EnableMultiSelection(sal_True); diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 02bd3f65cb86..0e9d406158da 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -941,9 +941,9 @@ namespace aWorkStr += quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote); aWorkStr += ::dbtools::quoteName(aQuote, aColumnName); } - aWorkStr += ::rtl::OUString(' '); - aWorkStr += String::CreateFromAscii( ";ASC;DESC" ).GetToken( (sal_uInt16)eOrder ); - aWorkStr += ::rtl::OUString(','); + aWorkStr += rtl::OUString(' '); + aWorkStr += rtl::OUString( ";ASC;DESC" ).getToken( (sal_uInt16)eOrder, ';' ); + aWorkStr += rtl::OUString(','); } } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 5d1c492f0348..b7a07cf1781a 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -50,8 +50,8 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; using namespace ::com::sun::star::accessibility; -const String g_strOne = String::CreateFromAscii("1"); -const String g_strZero = String::CreateFromAscii("0"); +#define g_strOne rtl::OUString("1") +#define g_strZero rtl::OUString("0") #define DEFAULT_QUERY_COLS 20 #define DEFAULT_SIZE GetTextWidth(g_strZero) * 30 @@ -1122,9 +1122,9 @@ sal_Bool OSelectionBrowseBox::SaveModified() case DataType::CLOB: if(aText.GetChar(0) != '\'' || aText.GetChar(aText.Len() -1) != '\'') { - aText.SearchAndReplaceAll(String::CreateFromAscii("'"),String::CreateFromAscii("''")); - String aTmp(String::CreateFromAscii("'")); - (aTmp += aText) += String::CreateFromAscii("'"); + aText.SearchAndReplaceAll(rtl::OUString("'"), rtl::OUString("''")); + String aTmp(rtl::OUString("'")); + (aTmp += aText) += rtl::OUString("'"); aText = aTmp; } break; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index a67519e7cb94..eb678236f3ba 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -242,7 +242,7 @@ namespace dbaui LocalResourceAccess aLocalRes( RSC_QUERY_OBJECT_TYPE, RSC_RESOURCE ); sObjectType = String( ModuleRes( (sal_uInt16)( _nCommandType + 1 ) ) ); } - sMessageText.SearchAndReplace( String::CreateFromAscii( "$object$" ), sObjectType ); + sMessageText.SearchAndReplace( rtl::OUString("$object$"), sObjectType ); return sMessageText; } } diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index b2c817d71e3f..fe295b15dc45 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -108,8 +108,12 @@ static String impl_GetFilterFromExt( OUString aUrl, SfxFilterFlags nFlags, } if( pSfxFilter ) - aFilter = ( nFlags == SFX_FILTER_EXPORT ) ? pSfxFilter->GetFilterName() : - pSfxFilter->GetServiceName(); + { + if (nFlags == SFX_FILTER_EXPORT) + aFilter = pSfxFilter->GetFilterName(); + else + aFilter = pSfxFilter->GetServiceName(); + } delete pMedium; return aFilter; diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index e306b893aac3..4549274fe90c 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -607,7 +607,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation } } - rText.SearchAndReplace( String::CreateFromAscii( "%1" ), String::CreateFromInt32( GetValue() ) ); + rText.SearchAndReplace( rtl::OUString("%1"), String::CreateFromInt32( GetValue() ) ); return ePres; } @@ -679,7 +679,7 @@ SfxItemPresentation SvxOrphansItem::GetPresentation } } - rText.SearchAndReplace( String::CreateFromAscii( "%1" ), String::CreateFromInt32( GetValue() ) ); + rText.SearchAndReplace( rtl::OUString("%1"), String::CreateFromInt32( GetValue() ) ); return ePres; } diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index bdfcf4c8f98f..3c170479c64d 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -62,7 +62,7 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() : { *pS = sAutoPath.GetToken( n, ';' ); INetURLObject aPath( *pS ); - aPath.insertName( String::CreateFromAscii("acor") ); + aPath.insertName(rtl::OUString("acor")); *pS = aPath.GetMainURL(INetURLObject::DECODE_TO_IURI); } pAutoCorrect = new SvxAutoCorrect( sSharePath, sUserPath ); diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 4df35081def6..1fbc68c29eac 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -47,8 +47,7 @@ namespace abp const SfxFilter* lcl_getBaseFilter() { - static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)"); - const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); return pFilter; } diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 9be49b7596eb..58dd7e40fabe 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -96,7 +96,6 @@ using namespace ::com::sun::star::lang; using namespace ::ucb; #define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) -#define C2S(cChar) String::CreateFromAscii(cChar) Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) { @@ -198,7 +197,7 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) catch (const Exception& e) { #ifdef DBG_UTIL - String sMsg(String::CreateFromAscii("::getColumns : catched an exception (")); + String sMsg(rtl::OUString("::getColumns : catched an exception (")); sMsg += String(e.Message); sMsg.AppendAscii(") ..."); OSL_FAIL(rtl::OUStringToOString(sMsg, RTL_TEXTENCODING_ASCII_US ).getStr()); @@ -420,7 +419,7 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) : aOKBT.SetClickHdl(LINK(this, MappingDialog_Impl, OkHdl)); String sTitle = GetText(); - sTitle.SearchAndReplace(C2S("%1"), pDatMan->getActiveDataTable(), 0); + sTitle.SearchAndReplace(rtl::OUString("%1"), pDatMan->getActiveDataTable(), 0); SetText(sTitle); aListBoxes[0] = &aIdentifierLB; @@ -1520,7 +1519,7 @@ void BibDataManager::SetMeAsUidListener() Sequence< ::rtl::OUString > aFields(xFields->getElementNames()); const ::rtl::OUString* pFields = aFields.getConstArray(); sal_Int32 nCount=aFields.getLength(); - String StrUID(C2S(STR_UID)); + rtl::OUString StrUID(STR_UID); ::rtl::OUString theFieldName; for( sal_Int32 i=0; i<nCount; i++ ) { @@ -1564,7 +1563,7 @@ void BibDataManager::RemoveMeAsUidListener() Sequence< ::rtl::OUString > aFields(xFields->getElementNames()); const ::rtl::OUString* pFields = aFields.getConstArray(); sal_Int32 nCount=aFields.getLength(); - String StrUID(C2S(STR_UID)); + rtl::OUString StrUID(STR_UID); ::rtl::OUString theFieldName; for( sal_Int32 i=0; i<nCount; i++ ) { diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 9efd6fd19198..4c3cc2b66b97 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -205,8 +205,7 @@ namespace dbp ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0); aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() ); - static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)"); - const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); if ( pFilter ) { diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 816612344e5e..4d119ccccbb7 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -401,7 +401,7 @@ namespace pcr rpButton = new PushButton( m_pTheParent, WB_NOPOINTERFOCUS ); rpButton->SetGetFocusHdl( LINK( this, OBrowserLine, OnButtonFocus ) ); rpButton->SetClickHdl( LINK( this, OBrowserLine, OnButtonClicked ) ); - rpButton->SetText( String::CreateFromAscii( "..." ) ); + rpButton->SetText(rtl::OUString("...")); } rpButton->Show(); diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 76ebdd27c18a..46fadd4bce4e 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -558,7 +558,7 @@ namespace pcr { // find a nice name for it String sBaseName( PcrRes( RID_STR_BINDING_UI_NAME ) ); - sBaseName += String::CreateFromAscii( " " ); + sBaseName += rtl::OUString(" "); String sNewName; sal_Int32 nNumber = 1; do diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 707e6d7e0ab2..66cd10d231b9 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -548,7 +548,7 @@ namespace pcr { SID_ATTR_CHAR_FONTLIST, 0 } }; - _rpPool = new SfxItemPool(String::CreateFromAscii("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID, + _rpPool = new SfxItemPool(rtl::OUString("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID, aItemInfos, _rppDefaults); _rpPool->FreezeIdRanges(); diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 5cd7b37c5ca1..f757ca79ed5f 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2893,7 +2893,7 @@ namespace pcr { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0, - ::String::CreateFromAscii("sdatabase")); + rtl::OUString("sdatabase")); ::rtl::OUString sDataSource; OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_DATASOURCE ) >>= sDataSource ); @@ -2903,8 +2903,7 @@ namespace pcr // is considered to be potentially expensive aFileDlg.SetDisplayDirectory( sDataSource ); - const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)"); - const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); if ( pFilter ) { diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index f42f186ae2be..253ff93bbf28 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -725,7 +725,7 @@ namespace pcr getTypedControlWindow()->SelectEntry( aRgbCol ); if ( !getTypedControlWindow()->IsEntrySelected( aRgbCol ) ) { // the given color is not part of the list -> insert a new entry with the hex code of the color - String aStr = String::CreateFromAscii("0x"); + String aStr = rtl::OUString("0x"); aStr += MakeHexStr(nColor,8); getTypedControlWindow()->InsertEntry( aRgbCol, aStr ); getTypedControlWindow()->SelectEntry( aRgbCol ); diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 1144e8373a6f..4eb64df3a4fd 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -325,7 +325,7 @@ namespace pcr :ONumericControl( pParent, nWinStyle ) { getTypedControlWindow()->SetUnit( FUNIT_CUSTOM ); - getTypedControlWindow()->SetCustomUnitText( String::CreateFromAscii( " ms" ) ); + getTypedControlWindow()->SetCustomUnitText(rtl::OUString(" ms")); getTypedControlWindow()->SetCustomConvertHdl( LINK( this, OTimeDurationControl, OnCustomConvert ) ); } diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 0bc0231a842a..3ace08b76098 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -1003,7 +1003,7 @@ String Sane::GetOptionUnitName( int n ) SANE_Unit nUnit = mppOptions[n]->unit; size_t nUnitAsSize = (size_t)nUnit; if( nUnitAsSize > SAL_N_ELEMENTS( ppUnits ) ) - aText = String::CreateFromAscii( "[unknown units]" ); + aText = rtl::OUString("[unknown units]"); else aText = String( ppUnits[ nUnit ], osl_getThreadTextEncoding() ); return aText; diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index ef2e0b1dfd7d..ba446451ae11 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -289,7 +289,7 @@ void SaneDlg::InitFields() else // SANE_UNIT_PIXEL { pField->SetValue( (int)fValue, FUNIT_CUSTOM ); - pField->SetCustomUnitText( String::CreateFromAscii( "Pixel" ) ); + pField->SetCustomUnitText(rtl::OUString("Pixel")); } switch( i ) { case 0: maTopLeft.X() = (int)fValue;break; diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 39454513ed2d..37ab1d68efd0 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -386,7 +386,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty if ( pFontEntry ) { nFontType = pFontEntry->nFontType; - aFontDescriptor.Name = String::CreateFromAscii( (char*)pFontEntry->pFontName ); + aFontDescriptor.Name = rtl::OUString::createFromAscii( (const char*)pFontEntry->pFontName ); } aFontDescriptor.Height = ( sal_Int16 )( ( mpCGM->pElement->nCharacterHeight * (double)1.50 ) ); if ( nFontType & 1 ) @@ -880,7 +880,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha uno::Any aFirstQuery( maXShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0) )); if( aFirstQuery >>= xText ) { - String aStr( String::CreateFromAscii( pString ) ); + String aStr( rtl::OUString::createFromAscii( pString ) ); uno::Reference< text::XTextCursor > aXTextCursor( xText->createTextCursor() ); { @@ -945,7 +945,7 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla uno::Any aFirstQuery( aShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0)) ); if( aFirstQuery >>= xText ) { - String aStr( String::CreateFromAscii( pString ) ); + String aStr( rtl::OUString::createFromAscii( pString ) ); uno::Reference< text::XTextCursor > aXTextCursor( xText->createTextCursor() ); if ( aXTextCursor.is() ) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 88c527808613..152d65e5bc94 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -7086,7 +7086,7 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS const char* pName = GetInternalServerName_Impl( aStgNm ); String sStarName; if ( pName ) - sStarName = String::CreateFromAscii( pName ); + sStarName = rtl::OUString::createFromAscii( pName ); else if ( nConvertFlags ) { static struct _ObjImpType @@ -7138,7 +7138,7 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS if ( aStgNm == aTypeName ) { - sStarName = String::CreateFromAscii( pArr->pFactoryNm ); + sStarName = rtl::OUString::createFromAscii( pArr->pFactoryNm ); break; } } diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index 0ba8b7e342c3..212074265837 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -183,7 +183,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto // flags for checking if conversion is wanted at all (SaveOptions?!) if( GetFlags() & pArr->nFlag ) { - pExpFilter = SfxFilterMatcher().GetFilter4FilterName(String::CreateFromAscii(pArr->pFilterNm)); + pExpFilter = SfxFilterMatcher().GetFilter4FilterName(rtl::OUString::createFromAscii(pArr->pFilterNm)); break; } } diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 043aeff2456c..f264f77a81cb 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -252,8 +252,8 @@ namespace frm for ( size_t i = 0; i < SAL_N_ELEMENTS( aExportFormats ); ++i ) { aFP.AddFilter( - String::CreateFromAscii( aExportFormats[i].pDescription ), - String::CreateFromAscii( aExportFormats[i].pExtension ) ); + rtl::OUString::createFromAscii( aExportFormats[i].pDescription ), + rtl::OUString::createFromAscii( aExportFormats[i].pExtension ) ); } ErrCode nResult = aFP.Execute(); if ( nResult == 0 ) diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index ad23014600e5..ae62547851ba 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -66,9 +66,9 @@ namespace frm static String getLabelString( sal_uInt16 _nResId ) { - String sLabel = String::CreateFromAscii( " " ); + String sLabel = rtl::OUString( " " ); sLabel += String( FRM_RES_STRING( _nResId ) ); - sLabel += String::CreateFromAscii( " " ); + sLabel += rtl::OUString( " " ); return sLabel; } @@ -643,11 +643,11 @@ namespace frm break; case FormFeature::MoveAbsolute: - sItemText = String::CreateFromAscii( "12345678" ); + sItemText = rtl::OUString( "12345678" ); break; case FormFeature::TotalRecords: - sItemText = String::CreateFromAscii( "123456" ); + sItemText = rtl::OUString( "123456" ); break; } diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index ae5c11e943fc..c9d47c5bcfb0 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -1028,7 +1028,7 @@ void Binding::_checkBindingID() { // no binding ID? then make one up! OUString sIDPrefix = getResource( RID_STR_XFORMS_BINDING_UI_NAME ); - sIDPrefix += String::CreateFromAscii( " " ); + sIDPrefix += rtl::OUString(" "); sal_Int32 nNumber = 0; OUString sName; do diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index b817c453471c..e2e30597def1 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -183,12 +183,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp ) { if (meSepType == COMMA_BASE) { - rStr = String::CreateFromAscii(","); + rStr = rtl::OUString(","); return true; } else if (meSepType == SEMICOLON_BASE) { - rStr = String::CreateFromAscii(";"); + rStr = rtl::OUString(";"); return true; } } @@ -197,12 +197,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp ) { if (meSepType == COMMA_BASE) { - rStr = String::CreateFromAscii(","); + rStr = rtl::OUString(","); return true; } else if (meSepType == SEMICOLON_BASE) { - rStr = String::CreateFromAscii(";"); + rStr = rtl::OUString(";"); return true; } } @@ -211,12 +211,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp ) { if (meSepType == COMMA_BASE) { - rStr = String::CreateFromAscii(";"); + rStr = rtl::OUString(";"); return true; } else if (meSepType == SEMICOLON_BASE) { - rStr = String::CreateFromAscii("|"); + rStr = rtl::OUString("|"); return true; } } diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 01b3a9436347..3cccb5905faf 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -356,7 +356,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl* { String sName = _pFilterDesc->GetName(); if ( _pFilterDesc->isGroupSeparator() ) - sName = String::CreateFromAscii( "------------------------------------------" ); + sName = rtl::OUString( "------------------------------------------" ); else sName = _pFilterDesc->GetName(); diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 1afe4c2338ac..afe39ba1b966 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -198,15 +198,13 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me PopupMenu* pHelpMenu = pMergeMenuBar->GetPopupMenu( SID_HELPMENU ); if ( !pHelpMenu ) { - sal_uInt16 nId = FindMenuId( pMergeMenuBar, String::CreateFromAscii( ".uno:HelpMenu" )); + sal_uInt16 nId = FindMenuId(pMergeMenuBar, rtl::OUString(".uno:HelpMenu")); if ( nId != USHRT_MAX ) pHelpMenu = pMergeMenuBar->GetPopupMenu( nId ); } if ( pHelpMenu ) { - static const char REFERENCECOMMAND_BEFORE[] = ".uno:About"; - // Add-Ons help menu items should be inserted after the "registration" menu item sal_uInt16 nItemCount = pHelpMenu->GetItemCount(); sal_uInt16 nInsSepAfterPos = MENU_APPEND; @@ -214,7 +212,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me AddonsOptions aOptions; // try to detect the about menu item with the command URL - sal_uInt16 nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_BEFORE )); + sal_uInt16 nId = FindMenuId(pHelpMenu, rtl::OUString(".uno:About")); sal_uInt16 nInsPos = pHelpMenu->GetItemPos( nId ); Sequence< Sequence< PropertyValue > > aAddonSubMenu; diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 97e85190f30d..c91321bd2ad7 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -422,7 +422,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM aPBPageDown.SetStyle( aStyle ); String aText = aInfo2FT.GetText(); - aText.SearchAndReplaceAll( UniString::CreateFromAscii("%PAGEDOWN"), aPBPageDown.GetText() ); + aText.SearchAndReplaceAll( rtl::OUString("%PAGEDOWN"), aPBPageDown.GetText() ); aInfo2FT.SetText( aText ); aPBDecline.SetText( aStrNotAccept ); diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 9d105ca85ee2..c97cacd3d76b 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -88,7 +88,6 @@ const sal_Int16 MAX_IMAGETYPE_VALUE = ::com::sun::star::ui::ImageType::SIZ static const char IMAGE_FOLDER[] = "images"; static const char BITMAPS_FOLDER[] = "Bitmaps"; -static const char IMAGE_EXTENSION[] = ".png"; static const char ModuleImageList[] = "private:resource/images/moduleimages"; @@ -227,7 +226,7 @@ void CmdImageList::impl_fillCommandToImageNameMap() } // We have to map commands which uses special characters like '/',':','?','\','<'.'>','|' - String aExt = String::CreateFromAscii( IMAGE_EXTENSION ); + String aExt = rtl::OUString(".png"); m_aImageCommandNameVector.resize(aCmdImageSeq.getLength() ); m_aImageNameVector.resize( aCmdImageSeq.getLength() ); @@ -592,8 +591,8 @@ sal_Bool ImageManagerImpl::implts_storeUserImages( pList->pImageItemList->push_back( pItem ); } - pList->aURL = String::CreateFromAscii("Bitmaps/"); - pList->aURL += String::CreateFromAscii( BITMAP_FILE_NAMES[nImageType] ); + pList->aURL = rtl::OUString("Bitmaps/"); + pList->aURL += rtl::OUString::createFromAscii(BITMAP_FILE_NAMES[nImageType]); uno::Reference< XTransactedObject > xTransaction; uno::Reference< XOutputStream > xOutputStream; diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 19676d3a2ca6..f750f96f275a 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -95,7 +95,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo return; // insert basic - String aCommand = String::CreateFromAscii( ".uno:MacroDialog" ); + rtl::OUString aCommand(".uno:MacroDialog"); String aDisplayName = RetrieveLabelFromCommand( aCommand ); pPopupMenu->InsertItem( 2, aDisplayName ); pPopupMenu->SetItemCommand( 2, aCommand ); @@ -174,10 +174,10 @@ String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL ) void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId ) { - const String aCmdBase = String::CreateFromAscii( ".uno:ScriptOrganizer?ScriptOrganizer.Language:string=" ); - const String ellipsis = String::CreateFromAscii( "..." ); - const ::rtl::OUString providerKey("com.sun.star.script.provider.ScriptProviderFor"); - const ::rtl::OUString languageProviderName("com.sun.star.script.provider.LanguageScriptProvider"); + const rtl::OUString aCmdBase(".uno:ScriptOrganizer?ScriptOrganizer.Language:string="); + const rtl::OUString ellipsis( "..." ); + const rtl::OUString providerKey("com.sun.star.script.provider.ScriptProviderFor"); + const rtl::OUString languageProviderName("com.sun.star.script.provider.LanguageScriptProvider"); sal_uInt16 itemId = startItemId; Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW ); Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName ); @@ -200,7 +200,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta ::rtl::OUString serviceName = serviceNames[ index ]; String aCommand = aCmdBase; String aDisplayName = String( serviceName.copy( providerKey.getLength() ) ); - if( aDisplayName.Equals( String::CreateFromAscii( "Java" ) ) || aDisplayName.Equals( String::CreateFromAscii( "Basic" ) ) ) + if( aDisplayName.Equals( rtl::OUString("Java") ) || aDisplayName.Equals( rtl::OUString("Basic") ) ) { // no entries for Java & Basic added elsewhere break; diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index e075f0b2e8f0..62fbf53817ed 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -776,7 +776,6 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::CheckAndAddMenuExtension" ); - static const char REFERENCECOMMAND_BEFORE[] = ".uno:About"; // retrieve menu extension item MenuExtensionItem aMenuItem( GetMenuExtension() ); @@ -787,7 +786,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu ) sal_uInt16 nNewItemId( 0 ); sal_uInt16 nInsertPos( MENU_APPEND ); sal_uInt16 nBeforePos( MENU_APPEND ); - String aCommandBefore( String::CreateFromAscii ( REFERENCECOMMAND_BEFORE )); + String aCommandBefore( rtl::OUString(".uno:About")); for ( sal_uInt16 n = 0; n < pMenu->GetItemCount(); n++ ) { sal_uInt16 nItemId = pMenu->GetItemId( n ); @@ -1932,7 +1931,6 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::GetPopupController" ); - String aPopupScheme = String::CreateFromAscii( "vnd.sun.star.popup:" ); SolarMutexGuard aSolarMutexGuard; diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index 87771116be98..41864df0915a 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -374,7 +374,7 @@ sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) if( pTok->IsString() ) { pTok = rInStm.GetToken_Next(); - bOk = MakeId( String::CreateFromAscii( pTok->GetString().getStr() ) ); + bOk = MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US)); } if( bOk && bBraket ) bOk = rInStm.Read( ')' ); diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 02a7cc7546d5..18756a6a6025 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -141,7 +141,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase, if( aSlotIdFile.ReadSvIdl( SvHash_SlotIdFile(), rInStm ) ) { sal_uInt32 nTokPos = rInStm.Tell(); - if( !rBase.ReadIdFile( String::CreateFromAscii( aSlotIdFile.getString().getStr() ) ) ) + if( !rBase.ReadIdFile( rtl::OStringToOUString(aSlotIdFile.getString(), RTL_TEXTENCODING_ASCII_US)) ) { rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot read file: ")); aStr.append(aSlotIdFile.getString()); @@ -231,7 +231,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase, SvToken * pTok = rInStm.GetToken_Next(); if( pTok->IsString() ) { - DirEntry aFullName( String::CreateFromAscii( pTok->GetString().getStr() ) ); + DirEntry aFullName( rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US) ); rBase.StartNewFile( aFullName.GetFull() ); if( aFullName.Find( rBase.GetPath() ) ) { @@ -334,14 +334,14 @@ sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm { pTok = rInStm.GetToken_Next(); if( pTok->IsString() ) - bOk = aBeginName.MakeId( String::CreateFromAscii( pTok->GetString().getStr() ) ); + bOk = aBeginName.MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US)); } rInStm.ReadDelemiter(); if( bOk ) { pTok = rInStm.GetToken_Next(); if( pTok->IsString() ) - bOk = aEndName.MakeId( String::CreateFromAscii( pTok->GetString().getStr() ) ); + bOk = aEndName.MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US)); } rInStm.ReadDelemiter(); if( bOk ) diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index 7a7bc82777a8..182b75723918 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -187,12 +187,12 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand ) static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv ) { // program name - pList->push_back( new String( String::CreateFromAscii(*argv) ) ); + pList->push_back( new String(rtl::OUString::createFromAscii(*argv) ) ); for( int i = 1; i < argc; i++ ) { if( '@' == **(argv +i) ) { // when @, then response file - SvFileStream aStm( String::CreateFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE ); + SvFileStream aStm( rtl::OUString::createFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE ); if( aStm.GetError() != SVSTREAM_OK ) return sal_False; @@ -214,7 +214,7 @@ static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv ) } } else if( argv[ i ] ) - pList->push_back( new String( String::CreateFromAscii( argv[ i ] ) ) ); + pList->push_back( new String( rtl::OUString::createFromAscii( argv[ i ] ) ) ); } return sal_True; } @@ -369,7 +369,7 @@ SvCommand::SvCommand( int argc, char ** argv ) { if( aPath.Len() ) aPath += DirEntry::GetSearchDelimiter(); - aPath += String::CreateFromAscii( aInc.getStr() ); + aPath += rtl::OStringToOUString(aInc, RTL_TEXTENCODING_ASCII_US); } } diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 3171197a1d07..92b161d7b30e 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -640,7 +640,7 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported pTok = rInStm.GetToken_Next(); if( pTok->IsString() ) { - DirEntry aFullName( String::CreateFromAscii( pTok->GetString().getStr() ) ); + DirEntry aFullName(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US)); if( aFullName.Find( rPath ) ) { this->AddDepFile(aFullName.GetFull()); diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index 8206cf399e48..362ede900410 100644 --- a/lingucomponent/source/lingutil/lingutil.cxx +++ b/lingucomponent/source/lingutil/lingutil.cxx @@ -117,7 +117,7 @@ std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicTy if (strcmp( pDicType, "DICT" ) == 0) { aFormatName = A2OU("DICT_SPELL"); - aDicExtension = String::CreateFromAscii( ".dic" ); + aDicExtension = rtl::OUString( ".dic" ); #ifdef SYSTEM_DICTS aSystemDir = A2OU( DICT_SYSTEM_DIR ); aSystemSuffix = aDicExtension; @@ -126,7 +126,7 @@ std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicTy else if (strcmp( pDicType, "HYPH" ) == 0) { aFormatName = A2OU("DICT_HYPH"); - aDicExtension = String::CreateFromAscii( ".dic" ); + aDicExtension = rtl::OUString( ".dic" ); #ifdef SYSTEM_DICTS aSystemDir = A2OU( HYPH_SYSTEM_DIR ); aSystemPrefix = A2OU( "hyph_" ); @@ -136,7 +136,7 @@ std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicTy else if (strcmp( pDicType, "THES" ) == 0) { aFormatName = A2OU("DICT_THES"); - aDicExtension = String::CreateFromAscii( ".dat" ); + aDicExtension = rtl::OUString( ".dat" ); #ifdef SYSTEM_DICTS aSystemDir = A2OU( THES_SYSTEM_DIR ); aSystemPrefix = A2OU( "th_" ); diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 42941cdbeda7..4ffb780bfd55 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -69,7 +69,6 @@ using ::rtl::OUString; #define MAX_HEADER_LENGTH 16 -static const sal_Char* pDicExt = "dic"; static const sal_Char* pVerStr2 = "WBSWG2"; static const sal_Char* pVerStr5 = "WBSWG5"; static const sal_Char* pVerStr6 = "WBSWG6"; @@ -196,14 +195,6 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe return nDicVersion; } - - -const String GetDicExtension() -{ - return String::CreateFromAscii( pDicExt ); -} - - DictionaryNeo::DictionaryNeo() : aDicEvtListeners( GetLinguMutex() ), eDicType (DictionaryType_POSITIVE), diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index e40a0840002b..f2e51ad3d02b 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -45,8 +45,7 @@ #define DIC_MAX_ENTRIES 30000 -sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNeg ); -const String GetDicExtension(); +sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNeg ); class DictionaryNeo : public ::cppu::WeakImplHelper2 diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index f5ac64054e0d..d8ef8dd19d86 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -330,8 +330,8 @@ void DicList::SearchForDictionaries( const rtl::OUString *pDirCnt = aDirCnt.getConstArray(); sal_Int32 nEntries = aDirCnt.getLength(); - String aDCN( String::CreateFromAscii( "dcn" ) ); - String aDCP( String::CreateFromAscii( "dcp" ) ); + rtl::OUString aDCN("dcn"); + rtl::OUString aDCP("dcp"); for (sal_Int32 i = 0; i < nEntries; ++i) { String aURL( pDirCnt[i] ); @@ -345,9 +345,9 @@ void DicList::SearchForDictionaries( String aExt(aURL.Copy(nPos + 1)); aExt.ToLowerAscii(); - if(aExt == aDCN) // negativ + if (aDCN.equals(aExt)) // negativ bNeg = sal_True; - else if(aExt == aDCP) // positiv + else if (aDCP.equals(aExt)) // positiv bNeg = sal_False; else continue; // andere Files @@ -889,14 +889,14 @@ static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bo { if (rFileURL.Len() == 0) return sal_False; - String aDIC( GetDicExtension() ); + rtl::OUString aDIC("dic"); String aExt; xub_StrLen nPos = rFileURL.SearchBackward( '.' ); if (STRING_NOTFOUND != nPos) aExt = rFileURL.Copy( nPos + 1 ); aExt.ToLowerAscii(); - if(aExt != aDIC) + if (!aDIC.equals(aExt)) return sal_False; // get stream to be used diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index b1c8055e8ca9..adf9da3a9b8c 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -986,7 +986,7 @@ void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp ) { RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Spell" ); - String aNode( String::CreateFromAscii( "ServiceManager/SpellCheckerList" ) ); + rtl::OUString aNode("ServiceManager/SpellCheckerList"); uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) ); OUString *pNames = aNames.getArray(); sal_Int32 nLen = aNames.getLength(); @@ -1025,7 +1025,7 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp ) { RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Grammar" ); - String aNode( String::CreateFromAscii( "ServiceManager/GrammarCheckerList" ) ); + rtl::OUString aNode("ServiceManager/GrammarCheckerList"); uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) ); OUString *pNames = aNames.getArray(); sal_Int32 nLen = aNames.getLength(); @@ -1068,7 +1068,7 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp ) { RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Hyph" ); - String aNode( String::CreateFromAscii( "ServiceManager/HyphenatorList" ) ); + rtl::OUString aNode("ServiceManager/HyphenatorList"); uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) ); OUString *pNames = aNames.getArray(); sal_Int32 nLen = aNames.getLength(); @@ -1111,7 +1111,7 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp ) { RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Thes" ); - String aNode( String::CreateFromAscii( "ServiceManager/ThesaurusList" ) ); + rtl::OUString aNode("ServiceManager/ThesaurusList"); uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) ); OUString *pNames = aNames.getArray(); sal_Int32 nLen = aNames.getLength(); diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx index ea025d9ebe31..8c22e0bc2af2 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.cxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx @@ -304,14 +304,14 @@ void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, String& aP { if (bNegtive) { - aPrefix = String::CreateFromAscii("("); + aPrefix = rtl::OUString("("); } if (!bPost) { aPrefix += aSymbol; if (bShowSpace) { - aPrefix +=String::CreateFromAscii(" "); + aPrefix += rtl::OUString(" "); } } } @@ -322,14 +322,14 @@ void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, String& aP aSuffix = aSymbol; if (bShowSpace) { - aSuffix.Insert(String::CreateFromAscii(" "),0); + aSuffix.Insert(rtl::OUString(" "),0); } } if (bNegtive) { - aSuffix += String::CreateFromAscii(")"); + aSuffix += rtl::OUString(")"); } } } @@ -421,11 +421,11 @@ XFStyle* LwpNumericFormat::Convert() { if (cNegative.IsDefaultPrefix() && aNegPrefix.Len() == 0) { - aNegPrefix = String::CreateFromAscii("("); + aNegPrefix = rtl::OUString("("); } if (cNegative.IsDefaultSuffix() && aNegSuffix.Len() == 0) { - aNegSuffix = String::CreateFromAscii(")"); + aNegSuffix = rtl::OUString(")"); } } diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index 72f2faa1c8d3..97ff249d0e86 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -193,50 +193,50 @@ private: void InitCurrencySymbol() { sal_uInt16 nC=FMT_ARGENTINEANPESO; - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("A")); //FMT_ARGENTINEANPESO = 1, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("A$")); //FMT_AUSTRALIANDOLLAR = 2, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("oS"),sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("BF"),sal_True, sal_True);//FMT_BELGIANFRANC = 4, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("R$"),sal_False, sal_True);//FMT_BRAZILIANCRUZEIRO = 5, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("A")); //FMT_ARGENTINEANPESO = 1, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("A$")); //FMT_AUSTRALIANDOLLAR = 2, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("oS"),sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("BF"),sal_True, sal_True);//FMT_BELGIANFRANC = 4, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R$"),sal_False, sal_True);//FMT_BRAZILIANCRUZEIRO = 5, m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("￡",RTL_TEXTENCODING_UTF8)); //FMT_BRITISHPOUND = 6, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("C$")); //FMT_CANADIANDOLLAR = 7, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("C$")); //FMT_CANADIANDOLLAR = 7, m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("PRC￥",RTL_TEXTENCODING_UTF8),sal_False,sal_True); //FMT_CHINESEYUAN = 8, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Kc"),sal_True, sal_True);//FMT_CZECHKORUNA = 9, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Dkr"),sal_False, sal_True);//FMT_DANISHKRONE = 10, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("ECU"),sal_True, sal_True);//FMT_ECU = 11, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("mk"),sal_True, sal_True);//FMT_FINNISHMARKKA = 12, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("F"),sal_True, sal_True);//FMT_FRENCHFRANC = 13, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("DM"),sal_True, sal_True);//FMT_GERMANMARK = 14, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Dr"),sal_True, sal_True);//FMT_GREEKDRACHMA = 15, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("HK$")); //FMT_HONGKONGDOLLAR = 16, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Ft"),sal_True, sal_True);//FMT_HUNGARIANFORINT = 17, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Rs"),sal_False, sal_True);//FMT_INDIANRUPEE = 18, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Rp"),sal_False, sal_True);//FMT_INDONESIANRUPIAH = 19, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Kc"),sal_True, sal_True);//FMT_CZECHKORUNA = 9, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Dkr"),sal_False, sal_True);//FMT_DANISHKRONE = 10, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("ECU"),sal_True, sal_True);//FMT_ECU = 11, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("mk"),sal_True, sal_True);//FMT_FINNISHMARKKA = 12, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("F"),sal_True, sal_True);//FMT_FRENCHFRANC = 13, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("DM"),sal_True, sal_True);//FMT_GERMANMARK = 14, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Dr"),sal_True, sal_True);//FMT_GREEKDRACHMA = 15, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("HK$")); //FMT_HONGKONGDOLLAR = 16, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Ft"),sal_True, sal_True);//FMT_HUNGARIANFORINT = 17, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rs"),sal_False, sal_True);//FMT_INDIANRUPEE = 18, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rp"),sal_False, sal_True);//FMT_INDONESIANRUPIAH = 19, m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("IR￡",RTL_TEXTENCODING_UTF8)); //FMT_IRISHPUNT = 20, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("L."),sal_False, sal_True);//FMT_ITALIANLIRA = 21, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("L."),sal_False, sal_True);//FMT_ITALIANLIRA = 21, m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("￥",RTL_TEXTENCODING_UTF8)); //FMT_JAPANESEYEN = 22, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("LF"),sal_True, sal_True);//FMT_LUXEMBOURGFRANC = 23, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Rm"),sal_False, sal_True);//FMT_MALAYSIANRINGGIT = 24, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Mex$")); //FMT_MEXICANPESO = 25, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("F"),sal_False, sal_True);//FMT_NETHERLANDSGUILDER = 26, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("NZ$")); //FMT_NEWZEALANDDOLLAR = 27, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Nkr"),sal_False, sal_True);//FMT_NORWEGIANKRONE = 28, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Zl"),sal_True, sal_True);//FMT_POLISHZLOTY = 29, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Esc."),sal_True, sal_True);//FMT_PORTUGUESEESCUDO = 30, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Leu"),sal_True, sal_True);//FMT_ROMANIANLEI = 31, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("R"),sal_True, sal_True);//FMT_RUSSIANRUBLE = 32, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("S$")); //FMT_SINGAPOREDOLLAR = 33, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Sk"),sal_True, sal_True);//FMT_SLOVAKIANKORUNA = 34, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("SIT"),sal_False, sal_True);//FMT_SLOVENIANTHOLAR = 35, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("R")); //FMT_SOUTHAFRICANRAND = 36, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("W")); //FMT_SOUTHKOREANWON = 37, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Pts"),sal_True, sal_True);//FMT_SPANISHPESETA = 38, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Skr"),sal_True, sal_True);//FMT_SWEDISHKRONA = 39, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("SFr"),sal_False, sal_True);//FMT_SWISSFRANC = 40, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("NT$")); //FMT_TAIWANDOLLAR = 41, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Bt"),sal_True, sal_True);//FMT_THAIBAHT = 42, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("$")); //FMT_USDOLLAR = 43, - m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("OTH"),sal_False, sal_True);//FMT_OTHERCURRENCY = 44, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("LF"),sal_True, sal_True);//FMT_LUXEMBOURGFRANC = 23, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rm"),sal_False, sal_True);//FMT_MALAYSIANRINGGIT = 24, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Mex$")); //FMT_MEXICANPESO = 25, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("F"),sal_False, sal_True);//FMT_NETHERLANDSGUILDER = 26, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("NZ$")); //FMT_NEWZEALANDDOLLAR = 27, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Nkr"),sal_False, sal_True);//FMT_NORWEGIANKRONE = 28, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Zl"),sal_True, sal_True);//FMT_POLISHZLOTY = 29, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Esc."),sal_True, sal_True);//FMT_PORTUGUESEESCUDO = 30, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Leu"),sal_True, sal_True);//FMT_ROMANIANLEI = 31, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R"),sal_True, sal_True);//FMT_RUSSIANRUBLE = 32, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("S$")); //FMT_SINGAPOREDOLLAR = 33, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Sk"),sal_True, sal_True);//FMT_SLOVAKIANKORUNA = 34, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("SIT"),sal_False, sal_True);//FMT_SLOVENIANTHOLAR = 35, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R")); //FMT_SOUTHAFRICANRAND = 36, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("W")); //FMT_SOUTHKOREANWON = 37, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Pts"),sal_True, sal_True);//FMT_SPANISHPESETA = 38, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Skr"),sal_True, sal_True);//FMT_SWEDISHKRONA = 39, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("SFr"),sal_False, sal_True);//FMT_SWISSFRANC = 40, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("NT$")); //FMT_TAIWANDOLLAR = 41, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Bt"),sal_True, sal_True);//FMT_THAIBAHT = 42, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("$")); //FMT_USDOLLAR = 43, + m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("OTH"),sal_False, sal_True);//FMT_OTHERCURRENCY = 44, m_aCurrencyInfo[FMT_EURO]=LwpCurrencyInfo(String("€",RTL_TEXTENCODING_UTF8)); //FMT_EURO = 52 } diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx index bdef6dfe8458..e00e68e8e451 100644 --- a/lotuswordpro/source/filter/lwptblformula.cxx +++ b/lotuswordpro/source/filter/lwptblformula.cxx @@ -128,9 +128,9 @@ sal_Bool LwpFormulaInfo::ReadText() m_pObjStrm->QuickRead( pBuf.get(), nStrLen ); *(pBuf.get()+nStrLen)='\0'; String aText; - aText += String::CreateFromAscii("\""); + aText += rtl::OUString("\""); aText.Append(String(pBuf.get(),nStrLen,osl_getThreadTextEncoding())); - aText += String::CreateFromAscii("\""); + aText += rtl::OUString("\""); m_aStack.push_back(new LwpFormulaText(aText)); return sal_True; @@ -699,64 +699,64 @@ String LwpFormulaTools::GetName(sal_uInt16 nTokenType) switch(nTokenType) { case TK_SUM: - aName = String::CreateFromAscii("SUM"); + aName = rtl::OUString("SUM"); break; case TK_IF: - aName = String::CreateFromAscii("IF");//Not supported by SODC + aName = rtl::OUString("IF");//Not supported by SODC break; case TK_COUNT: - aName = String::CreateFromAscii("COUNT");//Not supported by SODC + aName = rtl::OUString("COUNT");//Not supported by SODC break; case TK_MINIMUM: - aName = String::CreateFromAscii("MIN"); + aName = rtl::OUString("MIN"); break; case TK_MAXIMUM: - aName = String::CreateFromAscii("MAX"); + aName = rtl::OUString("MAX"); break; case TK_AVERAGE: - aName = String::CreateFromAscii("MEAN"); + aName = rtl::OUString("MEAN"); break; case TK_ADD: - aName = String::CreateFromAscii("+"); + aName = rtl::OUString("+"); break; case TK_SUBTRACT: - aName = String::CreateFromAscii("-"); + aName = rtl::OUString("-"); break; case TK_MULTIPLY: - aName = String::CreateFromAscii("*"); + aName = rtl::OUString("*"); break; case TK_DIVIDE: - aName = String::CreateFromAscii("/"); + aName = rtl::OUString("/"); break; case TK_UNARY_MINUS: - aName = String::CreateFromAscii("-"); + aName = rtl::OUString("-"); break; case TK_LESS: - aName = String::CreateFromAscii("L"); + aName = rtl::OUString("L"); break; case TK_LESS_OR_EQUAL: - aName = String::CreateFromAscii("LEQ"); + aName = rtl::OUString("LEQ"); break; case TK_GREATER: - aName = String::CreateFromAscii("G"); + aName = rtl::OUString("G"); break; case TK_GREATER_OR_EQUAL: - aName = String::CreateFromAscii("GEQ"); + aName = rtl::OUString("GEQ"); break; case TK_EQUAL: - aName = String::CreateFromAscii("EQ"); + aName = rtl::OUString("EQ"); break; case TK_NOT_EQUAL: - aName = String::CreateFromAscii("NEQ"); + aName = rtl::OUString("NEQ"); break; case TK_NOT: - aName = String::CreateFromAscii("NOT"); + aName = rtl::OUString("NOT"); break; case TK_AND: - aName = String::CreateFromAscii("AND"); + aName = rtl::OUString("AND"); break; case TK_OR: - aName = String::CreateFromAscii("OR"); + aName = rtl::OUString("OR"); break; default: assert(false); diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx index 29d8955c41f4..b5e268693ea4 100644 --- a/lotuswordpro/source/filter/lwptoc.cxx +++ b/lotuswordpro/source/filter/lwptoc.cxx @@ -153,7 +153,7 @@ void LwpTocSuperLayout::XFConvert(XFContentContainer* pCont) if(!pLevel) { // add an blank template so that SODC won't add default style to this level - pToc->AddTemplate(Int32ToOUString(i), String::CreateFromAscii(""), pTemplate); + pToc->AddTemplate(Int32ToOUString(i), rtl::OUString(), pTemplate); continue; } diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 9d68be9bbde2..0b693968ea3c 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -535,7 +535,7 @@ OUString ChartExport::parseFormula( const OUString& rRange ) String aRange( rRange ); if( aRange.SearchAscii("$") == 0 ) aRange = aRange.Copy(1); - aRange.SearchAndReplaceAllAscii(".$", String::CreateFromAscii("!$") ); + aRange.SearchAndReplaceAllAscii(".$", rtl::OUString("!$") ); aResult = aRange; } diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx index f32ee33e8836..e8b5941b77bb 100644 --- a/padmin/source/adddlg.cxx +++ b/padmin/source/adddlg.cxx @@ -206,7 +206,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton ) if( aDriver.EqualsIgnoreCaseAscii( "SGENPRT" ) ) { String aText( PaResId( RID_ERR_REMOVESGENPRT ) ); - aText.SearchAndReplace( String::CreateFromAscii( "%s" ), m_aDriverBox.GetSelectEntry( i ) ); + aText.SearchAndReplace( rtl::OUString( "%s" ), m_aDriverBox.GetSelectEntry( i ) ); ErrorBox aErrorBox( this, WB_OK | WB_DEF_OK, aText ); aErrorBox.SetText( m_aRemStr ); aErrorBox.Execute(); @@ -219,7 +219,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton ) if( aDefInfo.m_aDriverName == aPPD ) { String aText( PaResId( RID_ERR_REMOVEDEFAULTDRIVER ) ); - aText.SearchAndReplace( String::CreateFromAscii( "%s" ), m_aDriverBox.GetSelectEntry( i ) ); + aText.SearchAndReplace( rtl::OUString( "%s" ), m_aDriverBox.GetSelectEntry( i ) ); ErrorBox aErrorBox( this, WB_OK | WB_DEF_OK, aText ); aErrorBox.SetText( m_aRemStr ); aErrorBox.Execute(); @@ -239,7 +239,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton ) if( it != aPrinters.end() ) { String aText( PaResId( RID_QUERY_DRIVERUSED ) ); - aText.SearchAndReplace( String::CreateFromAscii( "%s" ), m_aDriverBox.GetSelectEntry( i ) ); + aText.SearchAndReplace( rtl::OUString( "%s" ), m_aDriverBox.GetSelectEntry( i ) ); QueryBox aBox( this, WB_YES_NO | WB_DEF_NO, aText ); aBox.SetText( m_aRemStr ); if( aBox.Execute() == RET_NO ) @@ -248,7 +248,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton ) else { String aText( PaResId( RID_QUERY_REMOVEDRIVER ) ); - aText.SearchAndReplace( String::CreateFromAscii( "%s" ), m_aDriverBox.GetSelectEntry( i ) ); + aText.SearchAndReplace( rtl::OUString( "%s" ), m_aDriverBox.GetSelectEntry( i ) ); QueryBox aBox( this, WB_YES_NO | WB_DEF_NO, aText ); aBox.SetText( m_aRemStr ); if( aBox.Execute() == RET_NO ) @@ -290,8 +290,8 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton ) if (unlink(aSysPath.getStr())) { String aText( PaResId( RID_ERR_REMOVEDRIVERFAILED ) ); - aText.SearchAndReplace( String::CreateFromAscii( "%s1" ), m_aDriverBox.GetSelectEntry( i ) ); - aText.SearchAndReplace( String::CreateFromAscii( "%s2" ), aFile ); + aText.SearchAndReplace( rtl::OUString( "%s1" ), m_aDriverBox.GetSelectEntry( i ) ); + aText.SearchAndReplace( rtl::OUString( "%s2" ), aFile ); ErrorBox aErrorBox( this, WB_OK | WB_DEF_OK, aText ); aErrorBox.SetText( m_aRemStr ); aErrorBox.Execute(); diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index 40e4d6afac6c..760b78730e08 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -435,7 +435,7 @@ void SpaPrinterController::printPage( int ) const for( unsigned int i = 0; i < SAL_N_ELEMENTS(aResIds); i++ ) { if( aResIds[i].pDirect ) - aToken = String::CreateFromAscii( aResIds[i].pDirect ); + aToken = rtl::OUString::createFromAscii(aResIds[i].pDirect); else aToken = String( PaResId( aResIds[i].nResId ) ); nMaxWidth = ( nWidth = pPrinter->GetTextWidth( aToken ) ) > nMaxWidth ? nWidth : nMaxWidth; diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx index 3e0d1cec0eec..bbfd616ed4c4 100644 --- a/padmin/source/pamain.cxx +++ b/padmin/source/pamain.cxx @@ -70,7 +70,7 @@ sal_uInt16 MyApp::Exception( sal_uInt16 nError ) switch( nError & EXC_MAJORTYPE ) { case EXC_RSCNOTLOADED: - Abort( String::CreateFromAscii( "Error: could not load language resources.\nPlease check your installation.\n" ) ); + Abort( rtl::OUString( "Error: could not load language resources.\nPlease check your installation.\n" ) ); break; } return 0; diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx index 445a8071df6a..936322baa421 100644 --- a/padmin/source/prtsetup.cxx +++ b/padmin/source/prtsetup.cxx @@ -297,7 +297,7 @@ void RTSPaperPage::update() // input slots if( m_pParent->m_aJobData.m_pParser && - (pKey = m_pParent->m_aJobData.m_pParser->getKey( String::CreateFromAscii( "InputSlot" ) )) ) + (pKey = m_pParent->m_aJobData.m_pParser->getKey( rtl::OUString("InputSlot") )) ) { m_pParent->insertAllPPDValues( m_aSlotBox, m_pParent->m_aJobData.m_pParser, pKey ); } diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index f01062ec6b25..9f88f51cbebc 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -185,7 +185,7 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task if ( pFilter ) sExt = ::comphelper::string::stripStart(pFilter->GetDefaultExtension(), '*'); else - sExt = String::CreateFromAscii(".rpt"); + sExt = rtl::OUString(".rpt"); uno::Reference< embed::XStorage > xTemp = OStorageHelper::GetTemporaryStorage(/*sFileTemp,embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE,*/uno::Reference< lang::XMultiServiceFactory >(m_xContext->getServiceManager(),uno::UNO_QUERY)); utl::DisposableComponent aTemp(xTemp); diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 9436a9d55539..6a434dd6dc72 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -95,7 +95,7 @@ FormulaDialog::~FormulaDialog() { if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( HID_RPT_FIELD_SEL_WIN ) ); aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); boost::scoped_ptr<Window> aTemp2(m_pAddField); @@ -207,7 +207,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) { m_pAddField = new OAddFieldWindow(this,m_xRowSet); m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( HID_RPT_FIELD_SEL_WIN ) ); if ( aDlgOpt.Exists() ) { m_pAddField->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index 30deb2f59146..eb127406bb75 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -31,7 +31,7 @@ namespace rptui static sal_uInt32 s_nReportFormat = (sal_uInt32)-1; if ( (sal_uInt32)-1 == s_nReportFormat ) { - s_nReportFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"reportdesign.GroupFormat\"" )); + s_nReportFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"reportdesign.GroupFormat\"" )); OSL_ENSURE((sal_uInt32)-1 != s_nReportFormat, "Bad exchange id!"); } return s_nReportFormat; diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 3e6aa10f8c06..720086177d64 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -714,7 +714,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep 0 }; - SfxItemPool* pPool( new SfxItemPool(String::CreateFromAscii("ReportCharProperties"), ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, pDefaults) ); + SfxItemPool* pPool( new SfxItemPool(rtl::OUString("ReportCharProperties"), ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, pDefaults) ); // not needed for font height pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same bool bSuccess = false; diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 1dbc751d9739..835c6d13db97 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -156,7 +156,7 @@ ODesignView::~ODesignView() } if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( UID_RPT_RPT_APP_VIEW ) ); aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -555,7 +555,7 @@ void ODesignView::toggleAddField() uno::Reference < beans::XPropertySet > xSet(rReportController.getRowSet(),uno::UNO_QUERY); m_pAddField = new OAddFieldWindow(this,xSet); m_pAddField->SetCreateHdl(LINK( &rReportController, OReportController, OnCreateHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( UID_RPT_RPT_APP_VIEW ) ); if ( aDlgOpt.Exists() ) m_pAddField->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pAddField->Update(); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index f3fa1997eea3..1218bb4c3c82 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2420,7 +2420,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ SID_ATTR_METRIC,SID_ATTR_METRIC, 0 }; - SfxItemPool* pPool( new SfxItemPool(String::CreateFromAscii("ReportPageProperties"), RPTUI_ID_LRSPACE,RPTUI_ID_METRIC, aItemInfos, pDefaults) ); + SfxItemPool* pPool( new SfxItemPool(rtl::OUString("ReportPageProperties"), RPTUI_ID_LRSPACE,RPTUI_ID_METRIC, aItemInfos, pDefaults) ); pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same @@ -3293,13 +3293,13 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs String sFunction = String(ModuleRes(STR_RPT_PN_PAGE)); ::rtl::OUString sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); - sFunction.SearchAndReplace(String::CreateFromAscii("#PAGENUMBER#"),sPageNumber); + sFunction.SearchAndReplace(rtl::OUString("#PAGENUMBER#"),sPageNumber); if ( bStateOfPage ) { ::rtl::OUString sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); sFunction += String(ModuleRes(STR_RPT_PN_PAGE_OF)); - sFunction.SearchAndReplace(String::CreateFromAscii("#PAGECOUNT#"),sPageCount); + sFunction.SearchAndReplace(rtl::OUString("#PAGECOUNT#"),sPageCount); } sal_Bool bInPageHeader = aMap.getUnpackedValueOrDefault(PROPERTY_PAGEHEADERON,sal_True); @@ -4230,7 +4230,7 @@ void OReportController::openZoomDialog() SID_ATTR_ZOOM,SID_ATTR_ZOOM, 0 }; - SfxItemPool* pPool( new SfxItemPool(String::CreateFromAscii("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, pDefaults) ); + SfxItemPool* pPool( new SfxItemPool(rtl::OUString("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, pDefaults) ); pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same try diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index 6433d94a6198..e70bd8e32495 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -41,7 +41,7 @@ sal_uInt32 OReportExchange::getDescriptorFormatId() static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"report.ReportObjectsTransfer\"")); + s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"report.ReportObjectsTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OReportExchange::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index d3db1453b31c..8a2e30e1d2a2 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -1780,7 +1780,7 @@ void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, void ScDPResultMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - lcl_DumpRow( String::CreateFromAscii("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); + lcl_DumpRow( rtl::OUString("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); if (pDataRoot) @@ -2619,7 +2619,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, void ScDPDataMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - lcl_DumpRow( String::CreateFromAscii("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); + lcl_DumpRow( rtl::OUString("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); SCROW nStartRow = rPos.Row(); const ScDPDataDimension* pDataChild = GetChildDimension(); @@ -3427,8 +3427,8 @@ ScDPDataMember* ScDPResultDimension::GetColReferenceMember( const ScDPRelativePo void ScDPResultDimension::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - String aDimName = bIsDataLayout ? String::CreateFromAscii("(data layout)") : GetName(); - lcl_DumpRow( String::CreateFromAscii("ScDPResultDimension"), aDimName, NULL, pDoc, rPos ); + rtl::OUString aDimName = bIsDataLayout ? rtl::OUString("(data layout)") : rtl::OUString(GetName()); + lcl_DumpRow( rtl::OUString("ScDPResultDimension"), aDimName, NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); @@ -3787,8 +3787,8 @@ void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim, void ScDPDataDimension::DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const { - String aDimName = String::CreateFromAscii( bIsDataLayout ? "(data layout)" : "(unknown)" ); - lcl_DumpRow( String::CreateFromAscii("ScDPDataDimension"), aDimName, NULL, pDoc, rPos ); + rtl::OUString aDimName = bIsDataLayout ? rtl::OUString("(data layout)") : rtl::OUString("(unknown)"); + lcl_DumpRow( rtl::OUString("ScDPDataDimension"), aDimName, NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index b646b6f29671..ee2bea9e45b0 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -729,7 +729,7 @@ String ScGlobal::GetCharsetString( CharSet eVal ) default: return String::CreateFromInt32( eVal ); } - return String::CreateFromAscii(pChar); + return rtl::OUString::createFromAscii(pChar); } //------------------------------------------------------------------------ diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 6afbb558f3a7..0a5f08b97603 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1164,7 +1164,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface aDesc.aDescription = pOldArgDesc->aDescription; } else - aDesc.aName = aDesc.aDescription = String::CreateFromAscii( "###" ); + aDesc.aName = aDesc.aDescription = rtl::OUString("###"); sal_Bool bOptional = ( eArgType == SC_ADDINARG_VALUE_OR_ARRAY || diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx index f32234c6fba8..ea63b57e6204 100644 --- a/sc/source/core/tool/cellkeytranslator.cxx +++ b/sc/source/core/tool/cellkeytranslator.cxx @@ -93,7 +93,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, { // Since no locale nor opcode matching is needed, simply return // the first item on the list. - rName = String::CreateFromAscii( itr->second.front().mpName ); + rName = rtl::OUString::createFromAscii( itr->second.front().mpName ); return; } @@ -113,7 +113,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( eLevel == LOCALE_MATCH_ALL ) { // Name with matching opcode and locale found. - rName = String::CreateFromAscii( itrList->mpName ); + rName = rtl::OUString::createFromAscii( itrList->mpName ); return; } else if ( eLevel > eLocaleMatchLevel ) @@ -134,7 +134,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( itrList->meOpCode == eOpCode ) { // Name with a matching opcode preferred. - rName = String::CreateFromAscii( itrList->mpName ); + rName = rtl::OUString::createFromAscii( itrList->mpName ); return; } } @@ -144,7 +144,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( eLevel == LOCALE_MATCH_ALL ) { // Name with matching locale preferred. - rName = String::CreateFromAscii( itrList->mpName ); + rName = rtl::OUString::createFromAscii( itrList->mpName ); return; } else if ( eLevel > eLocaleMatchLevel ) @@ -157,7 +157,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, } // No preferred strings found. Return the best matching name. - rName = String::CreateFromAscii(aBestMatchName); + rName = rtl::OUString::createFromAscii(aBestMatchName); } void ScCellKeywordTranslator::transKeyword(String& rName, const Locale* pLocale, OpCode eOpCode) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index dc30ff812805..6a3aa146a32b 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -136,8 +136,8 @@ void ScCompiler::fillFromAddInMap( NonConstOpCodeMapPtr xMap,FormulaGrammar::Gra char const * const * ppSymbol = reinterpret_cast< char const * const * >( reinterpret_cast< char const * >(pMap) + nSymbolOffset); - xMap->putExternal( String::CreateFromAscii( *ppSymbol), - String::CreateFromAscii( pMap->pOriginal)); + xMap->putExternal( rtl::OUString::createFromAscii( *ppSymbol), + rtl::OUString::createFromAscii( pMap->pOriginal)); } } @@ -713,7 +713,7 @@ struct Convention_A1 : public ScCompiler::Convention KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR; static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT; // '?' allowed in range names because of Xcl :-/ - static const String aAddAllowed(String::CreateFromAscii("?#")); + static const String aAddAllowed(rtl::OUString("?#")); return pCharClass->parseAnyToken( rFormula, nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); } @@ -902,7 +902,7 @@ struct ConventionOOO_A1 : public Convention_A1 else aFile = INetURLObject::decode(*p, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS); } - aFile.SearchAndReplaceAllAscii("'", String::CreateFromAscii("''")); + aFile.SearchAndReplaceAllAscii("'", rtl::OUString("''")); rBuffer.append(sal_Unicode('\'')); rBuffer.append(aFile); @@ -1372,7 +1372,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR; static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT; // '?' allowed in range names - static const String aAddAllowed = String::CreateFromAscii("?!"); + const rtl::OUString aAddAllowed("?!"); return pCharClass->parseAnyToken( rFormula, nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); } @@ -1577,7 +1577,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL KParseTokens::ASC_UNDERSCORE ; static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT; // '?' allowed in range names - static const String aAddAllowed = String::CreateFromAscii( "?-[]!" ); + const rtl::OUString aAddAllowed("?-[]!"); return pCharClass->parseAnyToken( rFormula, nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); @@ -1750,8 +1750,8 @@ void ScCompiler::CheckTabQuotes( String& rString, case FormulaGrammar::CONV_XL_OOX : if( bNeedsQuote ) { - static const String one_quote = static_cast<sal_Unicode>( '\'' ); - static const String two_quote = String::CreateFromAscii( "''" ); + const rtl::OUString one_quote(static_cast<sal_Unicode>('\'')); + const rtl::OUString two_quote("''"); // escape embedded quotes rString.SearchAndReplaceAll( one_quote, two_quote ); } diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 9683a7affd57..9c3e39d781b2 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -105,7 +105,7 @@ ScTpDefaultsItem::~ScTpDefaultsItem() String ScTpDefaultsItem::GetValueText() const { - return String::CreateFromAscii( "ScTpDefaultsItem" ); + return rtl::OUString("ScTpDefaultsItem"); } int ScTpDefaultsItem::operator==( const SfxPoolItem& rItem ) const diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 739758bdb96a..7cb1687ea26e 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -187,7 +187,7 @@ ScTpFormulaItem::~ScTpFormulaItem() String ScTpFormulaItem::GetValueText() const { - return String::CreateFromAscii( "ScTpFormulaItem" ); + return rtl::OUString("ScTpFormulaItem"); } int ScTpFormulaItem::operator==( const SfxPoolItem& rItem ) const diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 7ae0d28cac27..a6efc8f31bb4 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -103,7 +103,7 @@ ScTpPrintItem::~ScTpPrintItem() String ScTpPrintItem::GetValueText() const { - return String::CreateFromAscii( "ScTpPrintItem" ); + return rtl::OUString("ScTpPrintItem"); } int ScTpPrintItem::operator==( const SfxPoolItem& rItem ) const diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index f044f5439d53..d5ea624983c5 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -1237,7 +1237,7 @@ void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget, if (pSubTitle) { // append subtitle as the 2nd line of the title. - String aSubTitle = String::CreateFromAscii("\n"); + String aSubTitle = rtl::OUString("\n"); aSubTitle.Append(*pSubTitle); mxSrcLink->AppendString(aSubTitle); } diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index f7ee76821fc1..cde5dd1f6de2 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -308,11 +308,11 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const String& rBaseURL ) const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - String aContentType = String::CreateFromAscii( "text/html; charset=" ); + String aContentType = rtl::OUString( "text/html; charset=" ); aContentType.AppendAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( String::CreateFromAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( rtl::OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); pAttributes = xValues; } } @@ -2956,11 +2956,11 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL ) const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - String aContentType = String::CreateFromAscii( "text/html; charset=" ); + String aContentType = rtl::OUString( "text/html; charset=" ); aContentType.AppendAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( String::CreateFromAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( rtl::OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); pAttributes = xValues; } } diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 75a577bddbd0..8ea50a312820 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -209,7 +209,7 @@ void ScInputHandler::InitRangeFinder( const String& rFormula ) return; String aDelimiters = ScEditUtil::ModifyDelimiters( - String::CreateFromAscii( pMinDelimiters ) ); + rtl::OUString::createFromAscii( pMinDelimiters ) ); xub_StrLen nColon = aDelimiters.Search(':'); if ( nColon != STRING_NOTFOUND ) diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 4d2385ad90c4..29ded56fd475 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -323,7 +323,7 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" )); aArgs[0].Value = a; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:ScalingFactor"), aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); mpImpl->mbOmitPaint = false; } @@ -363,7 +363,7 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" )); aArgs[0].Value = a; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:ScalingFactor"), aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); mpImpl->mbOmitPaint = false; } diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index bf5ca0114ea5..4465b2b39813 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -394,11 +394,11 @@ String ScAsciiOptions::WriteToString() const aOutStr += ','; // Import quoted field as text. - aOutStr += String::CreateFromAscii(bQuotedFieldAsText ? "true" : "false"); + aOutStr += bQuotedFieldAsText ? rtl::OUString("true") : rtl::OUString("false"); aOutStr += ','; // Detect special nubmers. - aOutStr += String::CreateFromAscii(bDetectSpecialNumber ? "true" : "false"); + aOutStr += bDetectSpecialNumber ? rtl::OUString("true") : rtl::OUString("false"); // 9th token is used for "Save as shown" in export options // 10th token is used for "Save cell formulas" in export options diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index a7c7ab0015c3..bfc610710c99 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2649,7 +2649,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModul genModuleName = sModuleName; else { - genModuleName = String::CreateFromAscii( "Sheet1" ); + genModuleName = rtl::OUString( "Sheet1" ); nNum = 1; } while( xLib->hasByName( genModuleName ) ) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 7c9d0a4cf83e..153e17e76a62 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2455,37 +2455,37 @@ void ScDocShell::PrepareReload() String ScDocShell::GetOwnFilterName() { - return String::CreateFromAscii(pFilterSc50); + return rtl::OUString(pFilterSc50); } String ScDocShell::GetHtmlFilterName() { - return String::CreateFromAscii(pFilterHtml); + return rtl::OUString(pFilterHtml); } String ScDocShell::GetWebQueryFilterName() { - return String::CreateFromAscii(pFilterHtmlWebQ); + return rtl::OUString(pFilterHtmlWebQ); } String ScDocShell::GetAsciiFilterName() { - return String::CreateFromAscii(pFilterAscii); + return rtl::OUString(pFilterAscii); } String ScDocShell::GetLotusFilterName() { - return String::CreateFromAscii(pFilterLotus); + return rtl::OUString(pFilterLotus); } String ScDocShell::GetDBaseFilterName() { - return String::CreateFromAscii(pFilterDBase); + return rtl::OUString(pFilterDBase); } String ScDocShell::GetDifFilterName() { - return String::CreateFromAscii(pFilterDif); + return rtl::OUString(pFilterDif); } sal_Bool ScDocShell::HasAutomaticTableName( const String& rFilter ) diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 1f1211e3c847..dd572b4bab94 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -729,7 +729,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) pImpl->pRequest = new SfxRequest( rReq ); delete pImpl->pDocInserter; pImpl->pDocInserter = new ::sfx2::DocumentInserter( - String::CreateFromAscii( ScDocShell::Factory().GetShortName() ), 0 ); + rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ), 0 ); pImpl->pDocInserter->StartExecuteModal( LINK( this, ScDocShell, DialogClosedHdl ) ); return ; } diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index d42cf70fda91..d946a012db87 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -130,7 +130,7 @@ namespace // get connection - String aConnUrl = String::CreateFromAscii("sdbc:dbase:"); + String aConnUrl = rtl::OUString("sdbc:dbase:"); aConnUrl += aPath; svxform::ODataAccessCharsetHelper aHelper; diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 3ea9de72310d..888df91567e3 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -496,7 +496,7 @@ bool ScDocumentLoader::GetFilterName( const String& rFileName, if ( bWithInteraction ) pMedium->UseInteractionHandler(true); // #i73992# no longer called from GuessFilter - SfxFilterMatcher aMatcher( String::CreateFromAscii("scalc") ); + SfxFilterMatcher aMatcher( rtl::OUString("scalc") ); if( bWithContent ) aMatcher.GuessFilter( *pMedium, &pSfxFilter ); else diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 03119c05187b..11439beed8fa 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -315,7 +315,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) if ( pDocInserter ) delete pDocInserter; pDocInserter = new ::sfx2::DocumentInserter( - String::CreateFromAscii( ScDocShell::Factory().GetShortName() ) ); + rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScInsertTableDlg, DialogClosedHdl ) ); return 0; } diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 234df1b5c273..aacf026aa81b 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -111,7 +111,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl) { if ( !pDocInserter ) pDocInserter = new sfx2::DocumentInserter( - String::CreateFromAscii( ScDocShell::Factory().GetShortName() ) ); + rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScLinkedAreaDlg, DialogClosedHdl ) ); return 0; } diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 43d0bb5f84c8..0e034c46a827 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -177,7 +177,7 @@ static const SfxFilter* lcl_DetectExcelXML( SvStream& rStream, SfxFilterMatcher& rtl::OString aFileString(reinterpret_cast<const sal_Char*>(aBuffer), nBytesRead); if (aFileString.indexOf(aTryStr) >= 0) - pFound = rMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterExcelXML) ); + pFound = rMatcher.GetFilter4FilterName( rtl::OUString(pFilterExcelXML) ); } return pFound; @@ -323,18 +323,18 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) bWasReadOnly = pItem && pItem->GetValue(); const SfxFilter* pFilter = 0; - String aPrefix = String::CreateFromAscii( "private:factory/" ); + String aPrefix = rtl::OUString( "private:factory/" ); if( aURL.Match( aPrefix ) == aPrefix.Len() ) { String aPattern( aPrefix ); - aPattern += String::CreateFromAscii("scalc"); + aPattern += rtl::OUString("scalc"); if ( aURL.Match( aPattern ) >= aPattern.Len() ) pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL ); } else { // container for Calc filters - SfxFilterMatcher aMatcher( String::CreateFromAscii("scalc") ); + SfxFilterMatcher aMatcher( rtl::OUString("scalc") ); if ( aPreselectedFilterName.Len() ) pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName ); else if( aTypeName.Len() ) @@ -435,7 +435,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) } if ( aTypeName.Len() ) - pFilter = SfxFilterMatcher( String::CreateFromAscii("scalc") ).GetFilter4EA( aTypeName ); + pFilter = SfxFilterMatcher( rtl::OUString("scalc") ).GetFilter4EA( aTypeName ); } } @@ -482,7 +482,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // we can simulate it by preserving the preselected filter if the type matches // example: Excel filters for Writer aOldName = pPreselectedFilter->GetFilterName(); - bIsCalcFilter = pPreselectedFilter->GetServiceName().EqualsAscii("com.sun.star.sheet.SpreadsheetDocument"); + bIsCalcFilter = pPreselectedFilter->GetServiceName() == "com.sun.star.sheet.SpreadsheetDocument"; } if ( aOldName.EqualsAscii(pFilterEx97Temp) || !bIsCalcFilter ) @@ -498,7 +498,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) else { // else use Excel 97 filter - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterExcel97) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterExcel97) ); } } else if ( bExcel5Stream ) @@ -511,7 +511,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // we can simulate it by preserving the preselected filter if the type matches // example: Excel filters for Writer aOldName = pPreselectedFilter->GetFilterName(); - bIsCalcFilter = pPreselectedFilter->GetServiceName().EqualsAscii("com.sun.star.sheet.SpreadsheetDocument"); + bIsCalcFilter = pPreselectedFilter->GetServiceName() == "com.sun.star.sheet.SpreadsheetDocument"; } if ( aOldName.EqualsAscii(pFilterExcel95) || aOldName.EqualsAscii(pFilterEx95Temp) || @@ -522,12 +522,12 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) else if ( aOldName.EqualsAscii(pFilterEx97Temp) ) { // auto detection has found template -> return Excel5 template - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterEx5Temp) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterEx5Temp) ); } else { // sonst wird als Excel 5-Datei erkannt - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterExcel5) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterExcel5) ); } } } @@ -721,7 +721,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) } else { // gefundenen Filter einstellen - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterName[ nFilter ]) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString::createFromAscii(pFilterName[ nFilter ]) ); } bSync = false; // leave inner loop nFilter = nFilterCount; // leave outer loop @@ -754,7 +754,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) if ( aHeader.copy(0, 5).equalsL("{\\rtf", 5) ) { // test for RTF - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterRtf) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterRtf) ); } else if ( bIsXLS && (bMaybeText && !bMaybeHtml) ) { @@ -763,7 +763,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // The configured detection for Excel 2003 XML is still in XMLFilterDetect. pFilter = lcl_DetectExcelXML( rStr, aMatcher ); if (!pFilter) - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterAscii) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterAscii) ); bFakeXLS = true; } else if ( pPreselectedFilter->GetName().EqualsAscii(pFilterDBase) && lcl_MayBeDBase( rStr ) ) @@ -787,7 +787,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) } else { - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterHtmlWeb) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterHtmlWeb) ); if ( bIsXLS ) bFakeXLS = true; } diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 7884f551e9da..23e6ed4914e4 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -430,19 +430,19 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) if ( !bCellMapFilled ) { aCellMap[0].aDispName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); - aCellMap[0].aProgName = String::CreateFromAscii( SC_STYLE_PROG_STANDARD ); + aCellMap[0].aProgName = rtl::OUString( SC_STYLE_PROG_STANDARD ); aCellMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_RESULT ); - aCellMap[1].aProgName = String::CreateFromAscii( SC_STYLE_PROG_RESULT ); + aCellMap[1].aProgName = rtl::OUString( SC_STYLE_PROG_RESULT ); aCellMap[2].aDispName = ScGlobal::GetRscString( STR_STYLENAME_RESULT1 ); - aCellMap[2].aProgName = String::CreateFromAscii( SC_STYLE_PROG_RESULT1 ); + aCellMap[2].aProgName = rtl::OUString( SC_STYLE_PROG_RESULT1 ); aCellMap[3].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE ); - aCellMap[3].aProgName = String::CreateFromAscii( SC_STYLE_PROG_HEADLINE ); + aCellMap[3].aProgName = rtl::OUString( SC_STYLE_PROG_HEADLINE ); aCellMap[4].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE1 ); - aCellMap[4].aProgName = String::CreateFromAscii( SC_STYLE_PROG_HEADLINE1 ); + aCellMap[4].aProgName = rtl::OUString( SC_STYLE_PROG_HEADLINE1 ); // last entry remains empty @@ -457,10 +457,10 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) if ( !bPageMapFilled ) { aPageMap[0].aDispName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); - aPageMap[0].aProgName = String::CreateFromAscii( SC_STYLE_PROG_STANDARD ); + aPageMap[0].aProgName = rtl::OUString( SC_STYLE_PROG_STANDARD ); aPageMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_REPORT ); - aPageMap[1].aProgName = String::CreateFromAscii( SC_STYLE_PROG_REPORT ); + aPageMap[1].aProgName = rtl::OUString( SC_STYLE_PROG_REPORT ); // last entry remains empty diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 3d80796718f1..90848f49a858 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -408,7 +408,7 @@ void CompileODFFormulaToExcel( ScDocument* pDoc, const String& rOldFormula, Stri if ( pToken->GetOpCode() == ocSep ) { // Excel formula separator is ",". - rFormula = String::CreateFromAscii(","); + rFormula = rtl::OUString(","); } rNewFormula += rFormula; } diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index ea06ef21e054..b6cd0a57e126 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -184,9 +184,9 @@ ScVbaNames::Add( const css::uno::Any& Name , ScAddress aPos( static_cast< SCCOL >( aAddr.StartColumn ) , static_cast< SCROW >( aAddr.StartRow ) , static_cast< SCTAB >(aAddr.Sheet ) ); uno::Any xAny2 ; String sRangeAdd = xRange->Address( xAny2, xAny2 , xAny2 , xAny2, xAny2 ); - aContent += String::CreateFromAscii("$"); + aContent += rtl::OUString("$"); aContent += UniString(xRange->getWorksheet()->getName()); - aContent += String::CreateFromAscii("."); + aContent += rtl::OUString("."); aContent += sRangeAdd; aPosition = table::CellAddress( aAddr.Sheet , aAddr.StartColumn , aAddr.StartRow ); } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 7a887d5cf18f..ee9d3ab96a50 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -626,7 +626,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const String& rFile, sal_Bool SfxStringItem aFileNameItem( SID_FILE_NAME, aStrURL ); SfxStringItem aFilterItem( SID_FILTER_NAME, pFlt->GetName() ); // #i69524# add target, as in SfxApplication when the Open dialog is used - SfxStringItem aTargetItem( SID_TARGETNAME, String::CreateFromAscii("_default") ); + SfxStringItem aTargetItem( SID_TARGETNAME, rtl::OUString("_default") ); // Asynchron oeffnen, kann naemlich auch aus D&D heraus passieren // und das bekommt dem MAC nicht so gut ... diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 898305c6fed0..1c7154f19282 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -217,8 +217,8 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium) } else if ( maBookmarkFile != aBookmarkName && aBookmarkName.Len() ) { - sal_Bool bCreateGraphicShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.drawing.DrawingDocument" ); - sal_Bool bCreateImpressShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.presentation.PresentationDocument" ); + sal_Bool bCreateGraphicShell = pFilter->GetServiceName() == "com.sun.star.drawing.DrawingDocument"; + sal_Bool bCreateImpressShell = pFilter->GetServiceName() == "com.sun.star.presentation.PresentationDocument"; if ( bCreateGraphicShell || bCreateImpressShell ) { CloseBookmarkDoc(); diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index cb41669f0781..53c9bbc1812e 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1874,7 +1874,7 @@ IMPL_LINK_NOARG(AssistentDlg, FinishHdl) { sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0, - ::String::CreateFromAscii("simpress") ); + rtl::OUString("simpress") ); if ( aFileDlg.Execute() == ERRCODE_NONE ) aFileToOpen = aFileDlg.GetPath(); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 7a06ae4a3c56..fd235bb5fb9f 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -609,7 +609,7 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName) if (aFileName != maDropFileName) { SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE)); - SfxFilterMatcher aMatch( String::CreateFromAscii("simpress") ); + SfxFilterMatcher aMatch( rtl::OUString("simpress") ); aMed.UseInteractionHandler( sal_True ); nErr = aMatch.GuessFilter(aMed, &pFilter); } diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index b6e4ba82e046..a7a7197dbda2 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -405,7 +405,7 @@ bool DrawDocShell::IsNewPageNameValid( String & rInOutPageName, bool bResetStrin else { // check for upper/lower case roman numbering - String sReserved( String::CreateFromAscii( "cdilmvx" ) ); + String sReserved( rtl::OUString("cdilmvx") ); // gobble up all following characters contained in one reserved class String sRemainder = rInOutPageName.GetToken( 1, sal_Unicode(' ') ); diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 1462fad7aee1..7142f1aaa8d4 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -279,8 +279,8 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) if( pMedium->IsStorage() || ( pMedium->GetInStream() && SotStorage::IsStorageFile( pMedium->GetInStream() ) ) ) { - if ( pFilter->GetServiceName().EqualsAscii( "com.sun.star.presentation.PresentationDocument" ) || - pFilter->GetServiceName().EqualsAscii( "com.sun.star.drawing.DrawingDocument" ) ) + if ( pFilter->GetServiceName() == "com.sun.star.presentation.PresentationDocument" || + pFilter->GetServiceName() == "com.sun.star.drawing.DrawingDocument" ) { // Draw, Impress or PowerPoint document // the ownership of the Medium is transferred diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index cc642dc69ad7..36e0f4a29434 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -254,7 +254,7 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript Any aPage; aPage <<= rpDescriptor->GetPage()->getUnoPage(); xSet->setPropertyValue ( - String::CreateFromAscii("CurrentPage"), + rtl::OUString("CurrentPage"), aPage); } } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 8c518576d224..7fa6e94172d2 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -233,7 +233,7 @@ void Listener::ConnectToController (void) { try { - xSet->addPropertyChangeListener(String::CreateFromAscii("CurrentPage"), this); + xSet->addPropertyChangeListener(rtl::OUString("CurrentPage"), this); } catch (beans::UnknownPropertyException&) { @@ -241,7 +241,7 @@ void Listener::ConnectToController (void) } try { - xSet->addPropertyChangeListener(String::CreateFromAscii("IsMasterPageMode"), this); + xSet->addPropertyChangeListener(rtl::OUString("IsMasterPageMode"), this); } catch (beans::UnknownPropertyException&) { @@ -277,10 +277,10 @@ void Listener::DisconnectFromController (void) if (xSet.is()) { xSet->removePropertyChangeListener ( - String::CreateFromAscii("CurrentPage"), + rtl::OUString("CurrentPage"), this); xSet->removePropertyChangeListener ( - String::CreateFromAscii("IsMasterPageMode"), + rtl::OUString("IsMasterPageMode"), this); } diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 4c6ff762a8c7..5b1b671f57eb 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -253,16 +253,16 @@ Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount) String sPageNumberTemplate; if (nPageCount < 10) - sPageNumberTemplate = String::CreateFromAscii("9"); + sPageNumberTemplate = rtl::OUString("9"); else if (nPageCount < 100) - sPageNumberTemplate = String::CreateFromAscii("99"); + sPageNumberTemplate = rtl::OUString("99"); else if (nPageCount < 200) // Just for the case that 1 is narrower than 9. - sPageNumberTemplate = String::CreateFromAscii("199"); + sPageNumberTemplate = rtl::OUString("199"); else if (nPageCount < 1000) - sPageNumberTemplate = String::CreateFromAscii("999"); + sPageNumberTemplate = rtl::OUString("999"); else - sPageNumberTemplate = String::CreateFromAscii("9999"); + sPageNumberTemplate = rtl::OUString("9999"); // More then 9999 pages are not handled. const Size aSize ( diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx index 34eccd6d84ce..41c591d4e666 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx @@ -72,7 +72,7 @@ Image PagePreviewProvider::operator () ( aPreview = rRenderer.RenderPage( pPage, nWidth, - String::CreateFromAscii(""), + rtl::OUString(), false); } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 5c2c43a7052d..aa7cbbc5ef6a 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1603,7 +1603,7 @@ void CurrentPageSetter::operator() (bool) // Switch to the page last edited by setting the CurrentPage // property. Reference<beans::XPropertySet> xSet (mrBase.GetController(), UNO_QUERY_THROW); - xSet->setPropertyValue (String::CreateFromAscii("CurrentPage"), aPage); + xSet->setPropertyValue (rtl::OUString("CurrentPage"), aPage); } catch (const RuntimeException&) { diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx index b60d7590765a..1d3720a8b5b5 100644 --- a/sfx2/inc/sfx2/docfac.hxx +++ b/sfx2/inc/sfx2/docfac.hxx @@ -83,7 +83,7 @@ public: SfxObjectShellFlags GetFlags() { return nFlags; } const char* GetShortName() const { return pShortName; } String GetFactoryURL() const; // shortcut for "private:factory/GetShortName()" - String GetFactoryName() const { return String::CreateFromAscii( pShortName ); } + String GetFactoryName() const { return rtl::OUString::createFromAscii(pShortName); } String GetModuleName() const; SfxFilterContainer *GetFilterContainer( sal_Bool bForceLoad = sal_True) const; diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx index 1da1dea2d3dc..e7fd9cae9670 100644 --- a/sfx2/inc/sfx2/docfilt.hxx +++ b/sfx2/inc/sfx2/docfilt.hxx @@ -51,16 +51,16 @@ class SFX2_DLLPUBLIC SfxFilter friend class SfxFilterContainer; WildCard aWildCard; - sal_uIntPtr lFormat; + sal_uIntPtr lFormat; String aTypeName; - String aUserData; + rtl::OUString aUserData; SfxFilterFlags nFormatType; - sal_uInt16 nDocIcon; - String aServiceName; - ::rtl::OUString aMimeType; + sal_uInt16 nDocIcon; + rtl::OUString aServiceName; + rtl::OUString aMimeType; String aFilterName; String aPattern; - sal_uIntPtr nVersion; + sal_uIntPtr nVersion; String aUIName; String aDefaultTemplate; @@ -93,7 +93,7 @@ public: const String& GetTypeName() const { return aTypeName; } const String& GetUIName() const { return aUIName; } sal_uInt16 GetDocIconId() const { return nDocIcon; } - const String& GetUserData() const { return aUserData; } + const rtl::OUString& GetUserData() const { return aUserData; } const String& GetDefaultTemplate() const { return aDefaultTemplate; } void SetDefaultTemplate( const String& rStr ) { aDefaultTemplate = rStr; } sal_Bool UsesStorage() const { return GetFormat() != 0; } @@ -104,7 +104,7 @@ public: sal_uIntPtr GetVersion() const { return nVersion; } String GetSuffixes() const; String GetDefaultExtension() const; - const String& GetServiceName() const { return aServiceName; } + const rtl::OUString& GetServiceName() const { return aServiceName; } static const SfxFilter* GetDefaultFilter( const String& rName ); static const SfxFilter* GetFilterByName( const String& rName ); diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index faf204021b45..5fe31b94a532 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -260,7 +260,7 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, SfxItemSet *& rpSet, const String* pPath = NULL, sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, - const String& rStandardDir = String::CreateFromAscii( "" ), + const String& rStandardDir = rtl::OUString(), const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >()); diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx index a3ac30bfb562..02836c369666 100644 --- a/sfx2/inc/sfx2/frmhtmlw.hxx +++ b/sfx2/inc/sfx2/frmhtmlw.hxx @@ -83,7 +83,7 @@ inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, rtl_TextEncoding eDestEnc, String *pNonConvertableChars ) { - String sTmp = String::CreateFromAscii( pName ); + String sTmp = rtl::OUString::createFromAscii(pName); OutMeta( rStrm, pIndent, sTmp, rContent, bHTTPEquiv, eDestEnc, pNonConvertableChars ); } diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 3ff93a293f47..833a99b0e3e0 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -141,7 +141,7 @@ SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject, (void) eClassType; return 0; #else - SbxVariable *pVar = pBas->Make( String::CreateFromAscii(pName), eClassType, eType ); //SbxCLASS_PROPERTY + SbxVariable *pVar = pBas->Make( rtl::OUString::createFromAscii(pName), eClassType, eType ); //SbxCLASS_PROPERTY pVar->SetUserData( nSID ); pVar->SetFlag( SBX_DONTSTORE ); pObject->StartListening( pVar->GetBroadcaster() ); diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index f8d13aaf800c..7a105a34e2a6 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -435,8 +435,8 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String DBG_ASSERT( !xDoc.Is(), "Sorry, not implemented!" ); delete pSet; SfxStringItem aName( SID_FILE_NAME, rFileName ); - SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") ); - SfxStringItem aFlags( SID_OPTIONS, String::CreateFromAscii("T") ); + SfxStringItem aReferer( SID_REFERER, rtl::OUString("private:user") ); + SfxStringItem aFlags( SID_OPTIONS, rtl::OUString("T") ); SfxBoolItem aHidden( SID_HIDDEN, sal_True ); const SfxPoolItem *pRet = GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, &aName, &aHidden, &aReferer, &aFlags, 0L ); const SfxObjectItem *pObj = PTR_CAST( SfxObjectItem, pRet ); @@ -537,11 +537,11 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, GetPool() ); - String aFact = String::CreateFromAscii("private:factory/"); + String aFact = rtl::OUString("private:factory/"); aFact += aFactName; aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aFact ) ); aReq.AppendItem( SfxFrameItem( SID_DOCFRAME, GetFrame() ) ); - aReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii( "_default" ) ) ); + aReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString( "_default" ) ) ); // TODO/LATER: Should the other arguments be transfered as well? SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, sal_False); @@ -769,8 +769,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) rReq.SetArgs( *(SfxAllItemSet*)pSet ); if (aFilter.Len() >0 ) rReq.AppendItem( SfxStringItem( SID_FILTER_NAME, aFilter ) ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_default") ) ); - rReq.AppendItem( SfxStringItem( SID_REFERER, String::CreateFromAscii(SFX_REFERER_USER) ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) ); + rReq.AppendItem( SfxStringItem( SID_REFERER, rtl::OUString(SFX_REFERER_USER) ) ); delete pSet; if(!pURLList.empty()) @@ -965,7 +965,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { // don't dispatch mailto hyperlink to desktop dispatcher rReq.RemoveItem( SID_TARGETNAME ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_self") ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_self") ) ); } else if ( aINetProtocol == INET_PROT_FTP || aINetProtocol == INET_PROT_HTTP || @@ -1043,7 +1043,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) catch ( ::com::sun::star::system::SystemShellExecuteException& ) { rReq.RemoveItem( SID_TARGETNAME ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_default") ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) ); bLoadInternal = sal_True; } } @@ -1062,7 +1062,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { // hyperlink document must be loaded into a new frame rReq.RemoveItem( SID_TARGETNAME ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_default") ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) ); } } } @@ -1137,12 +1137,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, sal_False ); if ( pNewViewItem && pNewViewItem->GetValue() ) - aTarget = String::CreateFromAscii("_blank" ); + aTarget = rtl::OUString("_blank" ); } if ( bHidden ) { - aTarget = String::CreateFromAscii("_blank"); + aTarget = rtl::OUString("_blank"); DBG_ASSERT( rReq.IsSynchronCall() || pLinkItem, "Hidden load process must be done synchronously!" ); } diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index fb69193344b3..084a2d65ccd0 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -288,8 +288,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) return; } - String aName = String::CreateFromAscii("vnd.sun.star.cmd:logout"); - SfxStringItem aNameItem( SID_FILE_NAME, aName ); + SfxStringItem aNameItem( SID_FILE_NAME, rtl::OUString("vnd.sun.star.cmd:logout") ); SfxStringItem aReferer( SID_REFERER, DEFINE_CONST_UNICODE( "private/user" ) ); pAppData_Impl->pAppDispat->Execute( SID_OPENDOC, SFX_CALLMODE_SLOT, &aNameItem, &aReferer, 0L ); return; @@ -464,7 +463,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) Help* pHelp = Application::GetHelp(); if ( pHelp ) { - pHelp->Start( String::CreateFromAscii(".uno:HelpIndex"), NULL ); // show start page + pHelp->Start( rtl::OUString(".uno:HelpIndex"), NULL ); // show start page bDone = true; } break; @@ -1374,9 +1373,9 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) case SID_COMP_BIBLIOGRAPHY: { - SfxStringItem aURL(SID_FILE_NAME, String::CreateFromAscii(".component:Bibliography/View1")); - SfxStringItem aRef(SID_REFERER, String::CreateFromAscii("private:user")); - SfxStringItem aTarget(SID_TARGETNAME, String::CreateFromAscii("_blank")); + SfxStringItem aURL(SID_FILE_NAME, rtl::OUString(".component:Bibliography/View1")); + SfxStringItem aRef(SID_REFERER, rtl::OUString("private:user")); + SfxStringItem aTarget(SID_TARGETNAME, rtl::OUString("_blank")); SfxViewFrame::Current()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aURL, &aRef, &aTarget, 0L); } break; diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index ca36ecf2323d..9a07f83625b0 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -1283,7 +1283,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta sal_uInt16 nSubCount = pType->nAttribs; if ( !nSubCount ) { - pValue[nActProp].Name = String( String::CreateFromAscii( pSlot->pUnoName ) ) ; + pValue[nActProp].Name = rtl::OUString::createFromAscii(pSlot->pUnoName) ; if ( !pItem->QueryValue( pValue[nActProp].Value ) ) { rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( @@ -1302,9 +1302,9 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta nSubId |= CONVERT_TWIPS; DBG_ASSERT(( pType->aAttrib[n-1].nAID ) <= 127, "Member ID out of range" ); - String aName( String::CreateFromAscii( pSlot->pUnoName ) ) ; + String aName( rtl::OUString::createFromAscii( pSlot->pUnoName ) ) ; aName += '.'; - aName += String( String::CreateFromAscii( pType->aAttrib[n-1].pName ) ) ; + aName += rtl::OUString::createFromAscii( pType->aAttrib[n-1].pName ) ; pValue[nActProp].Name = aName; if ( !pItem->QueryValue( pValue[nActProp++].Value, nSubId ) ) { @@ -1336,7 +1336,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta sal_uInt16 nSubCount = rArg.pType->nAttribs; if ( !nSubCount ) { - pValue[nActProp].Name = String( String::CreateFromAscii( rArg.pName ) ) ; + pValue[nActProp].Name = rtl::OUString::createFromAscii( rArg.pName ) ; if ( !pItem->QueryValue( pValue[nActProp++].Value ) ) { rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( @@ -1355,9 +1355,9 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta nSubId |= CONVERT_TWIPS; DBG_ASSERT((rArg.pType->aAttrib[n-1].nAID) <= 127, "Member ID out of range" ); - String aName( String::CreateFromAscii( rArg.pName ) ) ; + String aName( rtl::OUString::createFromAscii( rArg.pName ) ) ; aName += '.'; - aName += String( String::CreateFromAscii( rArg.pType->aAttrib[n-1].pName ) ) ; + aName += rtl::OUString::createFromAscii( rArg.pType->aAttrib[n-1].pName ) ; pValue[nActProp].Name = aName; if ( !pItem->QueryValue( pValue[nActProp++].Value, nSubId ) ) { diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 842a83ec0fa8..21ed30a178ce 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -590,7 +590,7 @@ void ImplDdeItem::AdviseLoop( sal_Bool bOpen ) // A connection is re-established if( OBJECT_DDE_EXTERN == pLink->GetObjType() ) { - pLink->GetObj()->AddDataAdvise( pLink, String::CreateFromAscii( "text/plain;charset=utf-16" ), ADVISEMODE_NODATA ); + pLink->GetObj()->AddDataAdvise( pLink, rtl::OUString("text/plain;charset=utf-16"), ADVISEMODE_NODATA ); pLink->GetObj()->AddConnectAdvise( pLink ); } } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 2af76a236f98..d9e5f8a1d36e 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2238,7 +2238,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) { // set module name in checkbox text String sText( aOnStartupText ); - sText.SearchAndReplace( String::CreateFromAscii( "%MODULENAME" ), sModuleName ); + sText.SearchAndReplace( rtl::OUString("%MODULENAME"), sModuleName ); aOnStartupCB.SetText( sText ); // and show it aOnStartupCB.Show(); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 62030ef3dc44..77a30465b4fb 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -529,11 +529,11 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rM if ( aModuleName.Len() == 0 ) aModuleName = getDefaultModule_Impl(); - aHelpURL = String::CreateFromAscii("vnd.sun.star.help://"); + aHelpURL = rtl::OUString("vnd.sun.star.help://"); aHelpURL += aModuleName; if ( !aCommandURL.Len() ) - aHelpURL += String::CreateFromAscii("/start"); + aHelpURL += rtl::OUString("/start"); else { aHelpURL += '/'; diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index dc3ca0258343..313aef390038 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -218,8 +218,8 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const String& rName const SfxFilter* pFilter = aMatcher.GetFilter4FilterName(sDefaultFilter); if ( - (pFilter) && - (pFilter->GetServiceName().CompareIgnoreCaseToAscii( sServiceName ) != COMPARE_EQUAL) + pFilter && + !pFilter->GetServiceName().equalsIgnoreAsciiCase(sServiceName) ) { pFilter = 0; @@ -235,7 +235,7 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const String& rName for ( size_t i = 0, n = pFilterArr->size(); i < n; ++i ) { const SfxFilter* pCheckFilter = pFilterArr->at( i ); - if ( pCheckFilter->GetServiceName().CompareIgnoreCaseToAscii( sServiceName ) == COMPARE_EQUAL ) + if ( pCheckFilter->GetServiceName().equalsIgnoreAsciiCase(sServiceName) ) { pFilter = pCheckFilter; break; @@ -336,7 +336,7 @@ void SfxFilterMatcher_Impl::Update() for ( size_t i = 0, n = pFilterArr->size(); i < n; ++i ) { SfxFilter* pFilter = pFilterArr->at( i ); - if ( pFilter->GetServiceName() == String(aName) ) + if ( pFilter->GetServiceName() == aName ) pList->push_back( pFilter ); } } @@ -638,7 +638,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno: if ( !m_rImpl.aName.isEmpty() ) { // if this is not the global FilterMatcher: check if filter matches the document type - if ( pFilter->GetServiceName() != String(m_rImpl.aName) ) + if ( pFilter->GetServiceName() != m_rImpl.aName ) { // preferred filter belongs to another document type; now we must search the filter m_rImpl.InitForIterating(); diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 8720e53c7028..97b580a34054 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -105,7 +105,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, if( pCharSet ) { - String aContentType = String::CreateFromAscii( sHTML_MIME_text_html ); + String aContentType = rtl::OUString(sHTML_MIME_text_html); aContentType.AppendAscii( pCharSet ); OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, sal_True, eDestEnc, pNonConvertableChars ); diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 50b9196950c2..24eb85640796 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -79,7 +79,7 @@ void AppendDateTime_Impl( const util::DateTime rDT, DateTime aDT( DateTime::EMPTY ); CONVERT_DATETIME( rDT, aDT ); String aDateStr = rWrapper.getDate( aDT ); - aDateStr += String::CreateFromAscii( ", " ); + aDateStr += rtl::OUString(", "); aDateStr += rWrapper.getTime( aDT ); rRow += aDateStr; } diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 3fb16f2014b6..ccc6b1bb9101 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -341,7 +341,7 @@ void SfxRequest_Impl::Record */ { - String aCommand = String::CreateFromAscii(".uno:"); + String aCommand = rtl::OUString(".uno:"); aCommand.AppendAscii( pSlot->GetUnoName() ); ::rtl::OUString aCmd( aCommand ); if(xRecorder.is()) diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 7c9efe51d49e..b45ce723714d 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -959,7 +959,7 @@ void SfxDocumentPage::ImplUpdateSignatures() s = aMultiSignedStr; else if ( aInfos.getLength() == 1 ) { - String aCN_Id( String::CreateFromAscii( "CN" ) ); + rtl::OUString aCN_Id("CN"); const security::DocumentSignatureInformation& rInfo = aInfos[ 0 ]; s = GetDateTimeString( rInfo.SignatureDate, rInfo.SignatureTime ); s.AppendAscii( ", " ); @@ -1728,12 +1728,12 @@ void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration m_aDuration = rDuration; String sText(rDuration.Negative ? '-' : '+'); sText += m_pLine->m_sDurationFormat; - sText.SearchAndReplace(String::CreateFromAscii( "%1"), String::CreateFromInt32( rDuration.Years ) ); - sText.SearchAndReplace(String::CreateFromAscii( "%2"), String::CreateFromInt32( rDuration.Months ) ); - sText.SearchAndReplace(String::CreateFromAscii( "%3"), String::CreateFromInt32( rDuration.Days ) ); - sText.SearchAndReplace(String::CreateFromAscii( "%4"), String::CreateFromInt32( rDuration.Hours ) ); - sText.SearchAndReplace(String::CreateFromAscii( "%5"), String::CreateFromInt32( rDuration.Minutes) ); - sText.SearchAndReplace(String::CreateFromAscii( "%6"), String::CreateFromInt32( rDuration.Seconds) ); + sText.SearchAndReplace(rtl::OUString("%1"), String::CreateFromInt32( rDuration.Years ) ); + sText.SearchAndReplace(rtl::OUString("%2"), String::CreateFromInt32( rDuration.Months ) ); + sText.SearchAndReplace(rtl::OUString("%3"), String::CreateFromInt32( rDuration.Days ) ); + sText.SearchAndReplace(rtl::OUString("%4"), String::CreateFromInt32( rDuration.Hours ) ); + sText.SearchAndReplace(rtl::OUString("%5"), String::CreateFromInt32( rDuration.Minutes) ); + sText.SearchAndReplace(rtl::OUString("%6"), String::CreateFromInt32( rDuration.Seconds) ); SetText( sText ); } diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 4c3c68bb7344..7c08ca70dc06 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -190,7 +190,7 @@ namespace sfx2 sal_Int64 nFlags, sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, Window* _pPreferredParentWindow = NULL, - const String& sStandardDir = String::CreateFromAscii( "" ), + const String& sStandardDir = rtl::OUString(), const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >() ); virtual ~FileDialogHelper_Impl(); diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index bfb4bdf9b075..f19569bd1942 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -207,7 +207,7 @@ void SfxPasswordDialog::SetPasswdText( ) else { maMainPwdStr = maMinLenPwdStr; - maMainPwdStr.SearchAndReplace( String::CreateFromAscii( "$(MINLEN)" ), String::CreateFromInt32((sal_Int32) mnMinLen ), 0); + maMainPwdStr.SearchAndReplace( rtl::OUString("$(MINLEN)"), String::CreateFromInt32((sal_Int32) mnMinLen ), 0); maMinLengthFT.SetText( maMainPwdStr ); maMinLengthFT.Show(); } diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 2df1151feea1..c0400cda6754 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -254,7 +254,7 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu void SfxCommonPrintOptionsTabPage::ImplSetAccessibleNames() { - static const String cSeparator = String::CreateFromAscii( " - " ); + const rtl::OUString cSeparator(" - "); String sReduceText = aReduceGB.GetDisplayText(); sReduceText += cSeparator; diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 72a043ad6f8d..1e3b37e56e1e 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -242,7 +242,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, if ( bWithButtons ) { // Read Configuration - String aWindowId = String::CreateFromAscii("SplitWindow"); + String aWindowId = rtl::OUString("SplitWindow"); aWindowId += String::CreateFromInt32( (sal_Int32) eTbxAlign ); SvtViewOptions aWinOpt( E_WINDOW, aWindowId ); String aWinData; @@ -344,7 +344,7 @@ void SfxSplitWindow::SaveConfig_Impl() aWinData += String::CreateFromInt32( pDock->nType); } - String aWindowId = String::CreateFromAscii("SplitWindow"); + String aWindowId = rtl::OUString("SplitWindow"); aWindowId += String::CreateFromInt32( (sal_Int32) GetAlign() ); SvtViewOptions aWinOpt( E_WINDOW, aWindowId ); aWinOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aWinData ) ) ); diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index ea90d62e731a..e2de2dd28713 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -1245,9 +1245,9 @@ namespace sfx2 pMenu->InsertSeparator(); #if OSL_DEBUG_LEVEL > 0 - pMenu->InsertItem( MID_LAYOUT_TABS, String::CreateFromAscii( "Tab-Layout (exp.)" ), MIB_CHECKABLE ); + pMenu->InsertItem( MID_LAYOUT_TABS, rtl::OUString("Tab-Layout (exp.)"), MIB_CHECKABLE ); pMenu->CheckItem( MID_LAYOUT_TABS, impl_getLayout() != LAYOUT_DRAWERS ); - pMenu->InsertItem( MID_LAYOUT_DRAWERS, String::CreateFromAscii( "Drawer-Layout" ), MIB_CHECKABLE ); + pMenu->InsertItem( MID_LAYOUT_DRAWERS, rtl::OUString("Drawer-Layout"), MIB_CHECKABLE ); pMenu->CheckItem( MID_LAYOUT_DRAWERS, impl_getLayout() == LAYOUT_DRAWERS ); pMenu->InsertSeparator(); diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 996278f446c1..3607949667cb 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -116,9 +116,9 @@ SfxObjectFactory::SfxObjectFactory nFlags( nFlagsP ) { DBG_CTOR(SfxObjectFactory, 0); - pImpl->pFilterContainer = new SfxFilterContainer( String::CreateFromAscii( pName ) ); + pImpl->pFilterContainer = new SfxFilterContainer( rtl::OUString::createFromAscii( pName ) ); - String aShortName( String::CreateFromAscii( pShortName ) ); + String aShortName( rtl::OUString::createFromAscii( pShortName ) ); aShortName.ToLowerAscii(); pImpl->aClassName = rName; if ( aShortName.EqualsAscii( "swriter" ) ) @@ -347,7 +347,7 @@ String SfxObjectFactory::GetStandardTemplate( const String& rServiceName ) const SfxFilter* SfxObjectFactory::GetTemplateFilter() const { sal_uInt16 nVersion=0; - SfxFilterMatcher aMatcher ( String::CreateFromAscii( pShortName ) ); + SfxFilterMatcher aMatcher ( rtl::OUString::createFromAscii( pShortName ) ); SfxFilterMatcherIter aIter( aMatcher ); const SfxFilter *pFilter = 0; const SfxFilter *pTemp = aIter.First(); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 6271acd84493..c9685077afc1 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -1889,7 +1889,7 @@ void SfxMedium::Transfer_Impl() aAny <<= pSegmentSize->GetValue(); uno::Reference < beans::XPropertySet > xSet( pImp->xStorage, uno::UNO_QUERY ); - xSet->setPropertyValue( String::CreateFromAscii("SegmentSize"), aAny ); + xSet->setPropertyValue( rtl::OUString("SegmentSize"), aAny ); // copy the temporary storage into the disk spanned package GetStorage()->copyToStorage( xStor ); diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index e428190c1a11..df06e3a3e2f5 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -170,7 +170,7 @@ String SfxFilter::GetTypeFromStorage( const SotStorage& rStg ) } } - return pType ? String::CreateFromAscii(pType) : String(); + return pType ? rtl::OUString::createFromAscii(pType) : rtl::OUString(); } String SfxFilter::GetTypeFromStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage, sal_Bool bTemplate, @@ -238,7 +238,7 @@ String SfxFilter::GetTypeFromStorage( const com::sun::star::uno::Reference< com: String aRet; if ( pType ) { - aRet = String::CreateFromAscii(pType); + aRet = rtl::OUString::createFromAscii(pType); if ( pFilterName ) *pFilterName = aMatcher.GetFilter4EA( aRet )->GetName(); } diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index b4e604fb7f15..73e3d79abaae 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -244,7 +244,7 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent, else { // fallback - String aProgURL = SvtPathOptions().SubstituteVariable( String::CreateFromAscii("$(PROGURL)") ); + String aProgURL = SvtPathOptions().SubstituteVariable( rtl::OUString("$(PROGURL)") ); INetURLObject aObj( aProgURL ); DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Illegal URL !" ); aLastDir = aObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 8080ac39731f..d96dd1adb80b 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -941,7 +941,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) else if ( bCanUpdateFromTemplate == document::UpdateDocMode::ACCORDING_TO_CONFIG ) { String sMessage( SfxResId(STR_QRYTEMPL_MESSAGE).toString() ); - sMessage.SearchAndReplace( String::CreateFromAscii("$(ARG1)"), aTemplName ); + sMessage.SearchAndReplace( rtl::OUString("$(ARG1)"), aTemplName ); sfx2::QueryTemplateBox aBox( GetDialogParent(), sMessage ); if ( RET_YES == aBox.Execute() ) bLoad = sal_True; diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index d9305809c8a1..a1826097b2e7 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -312,7 +312,7 @@ sal_Bool SfxObjectShell::APISaveAs_Impl SFX_ITEMSET_ARG( aParams, pContentTypeItem, SfxStringItem, SID_CONTENTTYPE, sal_False ); if ( pContentTypeItem ) { - const SfxFilter* pFilter = SfxFilterMatcher( String::CreateFromAscii(GetFactory().GetShortName()) ).GetFilter4Mime( pContentTypeItem->GetValue(), SFX_FILTER_EXPORT ); + const SfxFilter* pFilter = SfxFilterMatcher( rtl::OUString::createFromAscii(GetFactory().GetShortName()) ).GetFilter4Mime( pContentTypeItem->GetValue(), SFX_FILTER_EXPORT ); if ( pFilter ) aFilterName = pFilter->GetName(); } @@ -430,7 +430,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) else { aURL = DEFINE_CONST_UNICODE( "private:factory/" ); - aURL += String::CreateFromAscii( GetFactory().GetShortName() ); + aURL += rtl::OUString::createFromAscii( GetFactory().GetShortName() ); aTitle = GetTitle(); } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index d3f713307a78..c2356bd70538 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2494,7 +2494,7 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) String aFilterName; const SfxFilter *pFilter = NULL; if ( pFilterItem ) - pFilter = SfxFilterMatcher( String::CreateFromAscii( GetFactory().GetShortName()) ).GetFilter4FilterName( aFilterName ); + pFilter = SfxFilterMatcher( rtl::OUString::createFromAscii( GetFactory().GetShortName()) ).GetFilter4FilterName( aFilterName ); SfxMedium *pMed = new SfxMedium( pSalvageItem->GetValue(), STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, pFilter ); diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index a054c92c7599..6e82028f0299 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -998,7 +998,7 @@ String SfxObjectShell::GetServiceNameFromFactory( const String& rFact ) { //! Remove everything behind name! String aFact( rFact ); - String aPrefix = String::CreateFromAscii( "private:factory/" ); + String aPrefix = rtl::OUString("private:factory/"); if ( aPrefix.Len() == aFact.Match( aPrefix ) ) aFact.Erase( 0, aPrefix.Len() ); sal_uInt16 nPos = aFact.Search( '?' ); diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index f997c6fbf404..469cbb2f831c 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -248,7 +248,7 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu ) if ( pSlot && pSlot->pUnoName ) { aCommand = DEFINE_CONST_UNICODE(".uno:"); - aCommand += String::CreateFromAscii( pSlot->GetUnoName() ); + aCommand += rtl::OUString::createFromAscii( pSlot->GetUnoName() ); } } diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 21e9e6e382a8..9a4f534a9fdd 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -493,9 +493,9 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i if (!aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("document"))) { if ( aLibrary.isEmpty() || (pDoc && ( String(aLibrary) == pDoc->GetTitle( SFX_TITLE_APINAME ) || String(aLibrary) == pDoc->GetTitle() )) ) - aLibrary = String::CreateFromAscii("document"); + aLibrary = rtl::OUString("document"); else - aLibrary = String::CreateFromAscii("application"); + aLibrary = rtl::OUString("application"); } o_normalizedDescriptor.put( PROP_SCRIPT, aScript ); diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index e591100bd8ab..9def56c2f0d2 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -54,7 +54,7 @@ String SfxViewFactory::GetAPIViewName() const return m_sViewName; if ( GetOrdinal() == 0 ) - return String::CreateFromAscii( "Default" ); + return rtl::OUString( "Default" ); return GetLegacyViewName(); } @@ -66,7 +66,7 @@ SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, fnCreate(fnC), fnInit(fnI), nOrd(nOrdinal), - m_sViewName( String::CreateFromAscii( asciiViewName ) ) + m_sViewName( rtl::OUString::createFromAscii( asciiViewName ) ) { DBG_CTOR(SfxViewFactory, 0); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 589c6608628d..14cca707bcbf 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -366,7 +366,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxAllItemSet aSet( pApp->GetPool() ); aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetURLObject().GetMainURL(INetURLObject::NO_DECODE) ) ); aSet.Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); - aSet.Put( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_blank") ) ); + aSet.Put( SfxStringItem( SID_TARGETNAME, rtl::OUString("_blank") ) ); SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False ); if ( pReferer ) aSet.Put( *pReferer ); @@ -767,7 +767,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { SfxAllItemSet aSet( pApp->GetPool() ); aSet.Put( SfxStringItem( SID_FILE_NAME, pMedium->GetName() ) ); - aSet.Put( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_blank") ) ); + aSet.Put( SfxStringItem( SID_TARGETNAME, rtl::OUString("_blank") ) ); if ( pSavedOptions ) aSet.Put( *pSavedOptions ); if ( pSavedReferer ) diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index 7f2e6ca2c057..f5611793a277 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -131,7 +131,7 @@ void SfxViewFrame::UpdateTitle() DBG_CHKTHIS(SfxViewFrame, 0); const SfxObjectFactory &rFact = GetObjectShell()->GetFactory(); - pImp->aFactoryName = String::CreateFromAscii( rFact.GetShortName() ); + pImp->aFactoryName = rtl::OUString::createFromAscii(rFact.GetShortName()); SfxObjectShell *pObjSh = GetObjectShell(); if ( !pObjSh ) @@ -230,11 +230,11 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) } SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, GetPool() ); - String aFact = String::CreateFromAscii("private:factory/"); + String aFact = rtl::OUString("private:factory/"); aFact += aFactName; aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aFact ) ); aReq.AppendItem( SfxFrameItem( SID_DOCFRAME, &GetFrame() ) ); - aReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii( "_blank" ) ) ); + aReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString( "_blank" ) ) ); SFX_APP()->ExecuteSlot( aReq ); const SfxViewFrameItem* pItem = PTR_CAST( SfxViewFrameItem, aReq.GetReturnValue() ); if ( pItem ) @@ -307,7 +307,7 @@ void SfxViewFrame::GetState_Impl( SfxItemSet &rSet ) { if ( pImp->aFactoryName.Len() ) { - String aFact = String::CreateFromAscii("private:factory/"); + String aFact = rtl::OUString("private:factory/"); aFact += pImp->aFactoryName; rSet.Put( SfxStringItem( nWhich, aFact ) ); } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 1f364c89907b..89bc6afeea59 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -558,7 +558,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) if ( pMailRecipient ) { String aRecipient( pMailRecipient->GetValue() ); - String aMailToStr( String::CreateFromAscii( "mailto:" )); + String aMailToStr(rtl::OUString("mailto:")); if ( aRecipient.Search( aMailToStr ) == 0 ) aRecipient = aRecipient.Erase( 0, aMailToStr.Len() ); diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 5ebd4d6af8b9..86f17ed6eba2 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -1669,7 +1669,7 @@ UCBStorage_Impl::UCBStorage_Impl( const String& rName, StreamMode nMode, UCBStor if ( m_bIsRoot ) { // create the special package URL for the package content - String aTemp = String::CreateFromAscii("vnd.sun.star.pkg://"); + String aTemp = rtl::OUString("vnd.sun.star.pkg://"); aTemp += String(INetURLObject::encode( aName, INetURLObject::PART_AUTHORITY, '%', INetURLObject::ENCODE_ALL )); m_aURL = aTemp; @@ -1714,7 +1714,7 @@ UCBStorage_Impl::UCBStorage_Impl( SvStream& rStream, UCBStorage* pStorage, sal_B // UCBStorages work on a content, so a temporary file for a content must be created, even if the stream is only // accessed readonly // the root storage opens the package; create the special package URL for the package content - String aTemp = String::CreateFromAscii("vnd.sun.star.pkg://"); + String aTemp = rtl::OUString("vnd.sun.star.pkg://"); aTemp += String(INetURLObject::encode( m_pTempFile->GetURL(), INetURLObject::PART_AUTHORITY, '%', INetURLObject::ENCODE_ALL )); m_aURL = aTemp; @@ -2271,10 +2271,10 @@ sal_Int16 UCBStorage_Impl::Commit() if ( pElement->m_xStream->m_bIsOLEStorage ) { // OLE storage should be stored encrytped, if the storage uses encryption - pElement->m_xStream->m_aContentType = String::CreateFromAscii("application/vnd.sun.star.oleobject"); + pElement->m_xStream->m_aContentType = rtl::OUString("application/vnd.sun.star.oleobject"); Any aValue; aValue <<= (sal_Bool) sal_True; - pElement->m_xStream->m_pContent->setPropertyValue(String::CreateFromAscii("Encrypted"), aValue ); + pElement->m_xStream->m_pContent->setPropertyValue(rtl::OUString("Encrypted"), aValue ); } pContent = pElement->GetContent(); @@ -2353,7 +2353,7 @@ sal_Int16 UCBStorage_Impl::Commit() // write a manifest file // first create a subfolder "META-inf" Content aNewSubFolder; - sal_Bool bRet = ::utl::UCBContentHelper::MakeFolder( *m_pContent, String::CreateFromAscii("META-INF"), aNewSubFolder ); + sal_Bool bRet = ::utl::UCBContentHelper::MakeFolder( *m_pContent, rtl::OUString("META-INF"), aNewSubFolder ); if ( bRet ) { // create a stream to write the manifest file - use a temp file @@ -3279,7 +3279,7 @@ String UCBStorage::CreateLinkFile( const String& rName ) // assemble a new folder name in the destination folder INetURLObject aObj( rName ); String aTmpName = aObj.GetName(); - String aTitle = String::CreateFromAscii( "content." ); + String aTitle = rtl::OUString( "content." ); aTitle += aTmpName; // create a folder and store its URL @@ -3319,7 +3319,7 @@ String UCBStorage::CreateLinkFile( const String& rName ) String aURL = aObj.GetMainURL( INetURLObject::NO_DECODE ); // store it as key/value pair - String aLink = String::CreateFromAscii("ContentURL="); + String aLink = rtl::OUString("ContentURL="); aLink += aURL; write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(*pStream, aLink, RTL_TEXTENCODING_UTF8); pStream->Flush(); diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index e5b9991c67f4..7bffea6c2e1a 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star::beans; using ::rtl::OUString; -static const char* aRootName = "Office.Math"; +static const char aRootName[] = "Office.Math"; #define SYMBOL_LIST "SymbolList" #define FONT_FORMAT_LIST "FontFormatList" @@ -409,7 +409,7 @@ const rtl::OUString SmFontFormatList::GetNewFontFormatId() const ///////////////////////////////////////////////////////////////// SmMathConfig::SmMathConfig() : - ConfigItem( String::CreateFromAscii( aRootName )) + ConfigItem(rtl::OUString(aRootName)) { pFormat = 0; pOther = 0; diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx index fc59c8f4514e..eb14f0cbf82b 100644 --- a/starmath/source/eqnolefilehdr.cxx +++ b/starmath/source/eqnolefilehdr.cxx @@ -42,7 +42,7 @@ sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) // code snippet copied from MathType::Parse // SvStorageStreamRef xSrc = pStor->OpenSotStream( - String::CreateFromAscii("Equation Native"), + rtl::OUString("Equation Native"), STREAM_STD_READ | STREAM_NOCREATE); if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) return bSuccess; diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index 1a058a047f95..411c2b8e8407 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -82,7 +82,7 @@ String GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent ) "index out opd range" ); if (FNT_MATH == nIdent) - return String::CreateFromAscii( FNTNAME_MATH ); + return rtl::OUString(FNTNAME_MATH); else { const sal_uInt16 *pTable; diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 1bff46f03b9c..2f003fd64d37 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -566,7 +566,7 @@ void MathType::TypeFaceToString(String &rTxt,sal_uInt8 nFace) int MathType::Parse(SotStorage *pStor) { SvStorageStreamRef xSrc = pStor->OpenSotStream( - String::CreateFromAscii("Equation Native"), + rtl::OUString("Equation Native"), STREAM_STD_READ | STREAM_NOCREATE); if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) return 0; diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index 6d51ae5503bd..6a24413fd2be 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -169,12 +169,12 @@ SmFilterDetect::~SmFilterDetect() bWasReadOnly = pItem && pItem->GetValue(); String aFilterName; - String aPrefix = String::CreateFromAscii( "private:factory/" ); + String aPrefix = rtl::OUString( "private:factory/" ); if( aURL.Match( aPrefix ) == aPrefix.Len() ) { const SfxFilter* pFilter = 0; String aPattern( aPrefix ); - aPattern += String::CreateFromAscii("smath"); + aPattern += rtl::OUString("smath"); if ( aURL.Match( aPattern ) >= aPattern.Len() ) { pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL ); @@ -233,7 +233,7 @@ SmFilterDetect::~SmFilterDetect() { const SfxFilter* pFilter = aPreselectedFilterName.Len() ? SfxFilterMatcher().GetFilter4FilterName( aPreselectedFilterName ) : aTypeName.Len() ? - SfxFilterMatcher(String::CreateFromAscii("smath")).GetFilter4EA( aTypeName ) : 0; + SfxFilterMatcher(rtl::OUString("smath")).GetFilter4EA( aTypeName ) : 0; String aTmpFilterName; if ( pFilter ) aTmpFilterName = pFilter->GetName(); @@ -286,7 +286,7 @@ SmFilterDetect::~SmFilterDetect() if ( aTypeName.Len() ) { const SfxFilter* pFilter = - SfxFilterMatcher( String::CreateFromAscii("smath") ).GetFilter4EA( aTypeName ); + SfxFilterMatcher( rtl::OUString("smath") ).GetFilter4EA( aTypeName ); if ( pFilter ) aFilterName = pFilter->GetName(); } @@ -332,7 +332,7 @@ SmFilterDetect::~SmFilterDetect() if ( aTypeName.Len() ) { - const SfxFilter* pFilt = SfxFilterMatcher( String::CreateFromAscii("smath") ).GetFilter4EA( aTypeName ); + const SfxFilter* pFilt = SfxFilterMatcher( rtl::OUString("smath") ).GetFilter4EA( aTypeName ); if ( pFilt ) aFilterName = pFilt->GetName(); } diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx index cc585af6323e..c2e4d5e75aee 100644 --- a/starmath/source/smdll.cxx +++ b/starmath/source/smdll.cxx @@ -65,7 +65,7 @@ namespace SmModule *pModule = new SmModule( &rFactory ); *ppShlPtr = pModule; - rFactory.SetDocumentServiceName( String::CreateFromAscii("com.sun.star.formula.FormulaProperties") ); + rFactory.SetDocumentServiceName( rtl::OUString("com.sun.star.formula.FormulaProperties") ); SmModule::RegisterInterface(pModule); SmDocShell::RegisterInterface(pModule); diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx index 2b3ddb992929..d7078cc2eb9a 100644 --- a/svl/inc/svl/inettype.hxx +++ b/svl/inc/svl/inettype.hxx @@ -266,7 +266,7 @@ public: static INetContentType GetContentType(UniString const & rTypeName); - static UniString GetContentType(INetContentType eTypeID); + static rtl::OUString GetContentType(INetContentType eTypeID); static UniString GetPresentation(INetContentType eTypeID, const ::com::sun::star::lang::Locale& aLocale); diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index 33f3070b8611..8d0244e3930f 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -94,7 +94,7 @@ public: static INetContentType GetContentType(UniString const & rTypeName); - static UniString GetContentType(INetContentType eTypeID); + static rtl::OUString GetContentType(INetContentType eTypeID); static UniString GetPresentation(INetContentType eTypeID); @@ -593,15 +593,14 @@ INetContentType Registration::GetContentType(UniString const & rTypeName) //============================================================================ // static -UniString Registration::GetContentType(INetContentType eTypeID) +rtl::OUString Registration::GetContentType(INetContentType eTypeID) { Registration &rRegistration = theRegistration::get(); TypeIDMap::iterator pEntry = rRegistration.m_aTypeIDMap.find( eTypeID ); if( pEntry != rRegistration.m_aTypeIDMap.end() ) return pEntry->second->m_aTypeName; - else - return UniString(); + return rtl::OUString(); } //============================================================================ @@ -735,7 +734,7 @@ INetContentType INetContentTypes::GetContentType(UniString const & rTypeName) //============================================================================ //static -UniString INetContentTypes::GetContentType(INetContentType eTypeID) +rtl::OUString INetContentTypes::GetContentType(INetContentType eTypeID) { static sal_Char const * aMap[CONTENT_TYPE_LAST + 1]; static bool bInitialized = false; @@ -750,10 +749,10 @@ UniString INetContentTypes::GetContentType(INetContentType eTypeID) bInitialized = true; } - UniString aTypeName = eTypeID <= CONTENT_TYPE_LAST ? - UniString::CreateFromAscii(aMap[eTypeID]) : + rtl::OUString aTypeName = eTypeID <= CONTENT_TYPE_LAST ? + rtl::OUString::createFromAscii(aMap[eTypeID]) : Registration::GetContentType(eTypeID); - if (aTypeName.Len() == 0) + if (aTypeName.isEmpty()) { OSL_FAIL("INetContentTypes::GetContentType(): Bad ID"); return rtl::OUString(CONTENT_TYPE_STR_APP_OCTSTREAM); diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx index c2c954ab7dae..4512cac56b0d 100644 --- a/svtools/bmpmaker/bmpcore.cxx +++ b/svtools/bmpmaker/bmpcore.cxx @@ -111,7 +111,7 @@ void BmpCreator::ImplCreate( const ::std::vector< DirEntry >& rInDirs, else aPrefix = String( aName, 0, 2 ); - String aNumStr( String::CreateFromAscii( rLang.maLangDir )) ; + String aNumStr(rtl::OUString::createFromAscii(rLang.maLangDir)); if( aNumStr.Len() == 1 ) aNumStr.Insert( '0', 0 ); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 4acae0d06b9a..4487a68c5776 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -164,8 +164,10 @@ void FilterMatch::createWildCardFilterList(const String& _rFilterList,::std::vec while ( nIndex != STRING_NOTFOUND ); } else + { // no filter is given -> match all - _rFilters.push_back( WildCard( String::CreateFromAscii( "*" ) ) ); + _rFilters.push_back( WildCard(rtl::OUString("*")) ); + } } // class ViewTabListBox_Impl --------------------------------------------- @@ -460,7 +462,7 @@ void NameTranslationList::Init() NameTranslationList::NameTranslationList( const INetURLObject& rBaseURL ): maTransFile( rBaseURL ), maHashedURL( rBaseURL ), - maTransFileName( String::CreateFromAscii( ".nametranslation.table" ) ) + maTransFileName( rtl::OUString(".nametranslation.table") ) { maTransFile.insertName( maTransFileName ); Init(); @@ -1793,7 +1795,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand ,mxCmdEnv ( xEnv ) { - maAllFilter = String::CreateFromAscii( "*.*" ); + maAllFilter = rtl::OUString("*.*"); mpView = new ViewTabListBox_Impl( mpAntiImpl, this, nFlags ); mpView->EnableCellFocus(); } diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx index a6844727fcbf..d57f8b6225a6 100644 --- a/svtools/source/contnr/svtreebx.cxx +++ b/svtools/source/contnr/svtreebx.cxx @@ -759,7 +759,7 @@ void SvTreeListBox::RequestingChildren( SvLBoxEntry* pParent ) { DBG_CHKTHIS(SvTreeListBox,0); if( !pParent->HasChildren() ) - InsertEntry( String::CreateFromAscii("<dummy>"), pParent, sal_False, LIST_APPEND ); + InsertEntry( rtl::OUString("<dummy>"), pParent, sal_False, LIST_APPEND ); } void SvTreeListBox::GetFocus() diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 8dcffcea938b..c59b1a57dcde 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -1288,7 +1288,7 @@ void DoubleCurrencyField::UpdateCurrencyFormat() sTemp = comphelper::string::stripStart(sTemp, ' '); sTemp = comphelper::string::stripEnd(sTemp, ' '); - sNewFormat += String::CreateFromAscii(" [$"); + sNewFormat += rtl::OUString(" [$"); sNewFormat += sTemp; sNewFormat += ']'; } diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 065615848939..3c31e1511111 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -321,7 +321,7 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL, // for pure home paths ( ~username ) the '.' at the end of rMatch // means that it poits to root catalog // this is done only for file contents since home paths parsing is usefull only for them - if ( bPureHomePath && rMatch.Equals( String::CreateFromAscii( "file:///." ) ) ) + if ( bPureHomePath && rMatch.Equals( rtl::OUString("file:///.") ) ) { // a home that refers to / @@ -1212,7 +1212,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing( if( !aHomeLocation ) aHomeLocation = ""; - aParseTilde = String::CreateFromAscii( aHomeLocation ); + aParseTilde = rtl::OUString::createFromAscii(aHomeLocation); // in case the whole path is just "~" then there should // be no trailing slash at the end @@ -1223,25 +1223,25 @@ sal_Bool SvtURLBox_Impl::TildeParsing( { // covers "~username" and "~username/..." cases xub_StrLen nNameEnd = aText.Search( '/' ); - String aUserName = aText.Copy( 1, ( nNameEnd != STRING_NOTFOUND ) ? nNameEnd : ( aText.Len() - 1 ) ); + rtl::OUString aUserName = aText.Copy( 1, ( nNameEnd != STRING_NOTFOUND ) ? nNameEnd : ( aText.Len() - 1 ) ); struct passwd* pPasswd = NULL; #ifdef SOLARIS Sequence< sal_Int8 > sBuf( 1024 ); struct passwd aTmp; - sal_Int32 nRes = getpwnam_r( OUStringToOString( OUString( aUserName ), RTL_TEXTENCODING_ASCII_US ).getStr(), + sal_Int32 nRes = getpwnam_r( OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ).getStr(), &aTmp, (char*)sBuf.getArray(), 1024, &pPasswd ); if( !nRes && pPasswd ) - aParseTilde = String::CreateFromAscii( pPasswd->pw_dir ); + aParseTilde = rtl::OUString::createFromAscii(pPasswd->pw_dir); else return sal_False; // no such user #else - pPasswd = getpwnam( OUStringToOString( OUString( aUserName ), RTL_TEXTENCODING_ASCII_US ).getStr() ); + pPasswd = getpwnam( OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ).getStr() ); if( pPasswd ) - aParseTilde = String::CreateFromAscii( pPasswd->pw_dir ); + aParseTilde = rtl::OUString::createFromAscii(pPasswd->pw_dir); else return sal_False; // no such user #endif @@ -1257,7 +1257,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing( if( !aParseTilde.Len() || aParseTilde.EqualsAscii( "/" ) ) { // "/" path should be converted to "/." - aParseTilde = String::CreateFromAscii( "/." ); + aParseTilde = rtl::OUString("/."); } else { diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index a008910b6e33..395128c40510 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -346,7 +346,7 @@ namespace svt } } else if ( bWasComplete ) - m_pImpl->InCompleteHyperLabel = InsertHyperLabel( m_pImpl->getItemCount(), ::String::CreateFromAscii( "..." ), RMINCOMPLETE ); + m_pImpl->InCompleteHyperLabel = InsertHyperLabel( m_pImpl->getItemCount(), rtl::OUString("..."), RMINCOMPLETE ); } //--------------------------------------------------------------------- @@ -371,7 +371,7 @@ namespace svt { RoadmapItem* pOldItem = GetPreviousHyperLabel( m_pImpl->getItemCount() ); m_pImpl->InCompleteHyperLabel->SetPosition( pOldItem ); - m_pImpl->InCompleteHyperLabel->Update( m_pImpl->getItemCount(), ::String::CreateFromAscii("...") ); + m_pImpl->InCompleteHyperLabel->Update( m_pImpl->getItemCount(), rtl::OUString("...") ); } } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index e423b6a1c382..67c964ec0bcc 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -797,7 +797,7 @@ void AssignmentPersistentData::Commit() if (!m_xORB.is()) return; - const String sContextServiceName = String::CreateFromAscii("com.sun.star.sdb.DatabaseContext"); + const rtl::OUString sContextServiceName("com.sun.star.sdb.DatabaseContext"); try { m_xDatabaseContext = Reference< XNameAccess >(m_xORB->createInstance(sContextServiceName), UNO_QUERY); @@ -846,7 +846,7 @@ void AssignmentPersistentData::Commit() m_aDatasource.SaveValue(); // create an interaction handler (may be needed for connecting) - const String sInteractionHandlerServiceName = String::CreateFromAscii("com.sun.star.task.InteractionHandler"); + const rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); Reference< XInteractionHandler > xHandler; try { @@ -1223,7 +1223,7 @@ void AssignmentPersistentData::Commit() aArgs[0] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")), 0, makeAny(VCLUnoHelper::GetInterface(this)), PropertyState_DIRECT_VALUE); // create the dialog object - const String sDialogServiceName = String::CreateFromAscii("com.sun.star.ui.dialogs.AddressBookSourcePilot"); + const rtl::OUString sDialogServiceName("com.sun.star.ui.dialogs.AddressBookSourcePilot"); Reference< XExecutableDialog > xAdminDialog; try { diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index b024364c4861..dd5a974042a1 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -242,7 +242,7 @@ namespace svt TabPage* pCurrentPage = GetPage(getCurrentState()); if ( pCurrentPage && pCurrentPage->GetText().Len() ) { - sCompleteTitle += String::CreateFromAscii(" - "); + sCompleteTitle += rtl::OUString(" - "); sCompleteTitle += pCurrentPage->GetText(); } diff --git a/svtools/source/filter/wmf/enhwmf.cxx b/svtools/source/filter/wmf/enhwmf.cxx index 7d04d3d40979..72ea16de8b92 100644 --- a/svtools/source/filter/wmf/enhwmf.cxx +++ b/svtools/source/filter/wmf/enhwmf.cxx @@ -254,7 +254,7 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC) // debug code - write the stream to debug file /tmp/emf-stream.emf EMFP_DEBUG(int pos = pWMF->Tell(); pWMF->Seek(0); - SvFileStream file( UniString::CreateFromAscii( "/tmp/emf-stream.emf" ), STREAM_WRITE | STREAM_TRUNC ); + SvFileStream file( rtl::OUString( "/tmp/emf-stream.emf" ), STREAM_WRITE | STREAM_TRUNC ); *pWMF >> file; file.Flush(); diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index c56cb894abc5..b23feb7d10c4 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -93,9 +93,9 @@ static sal_uInt16 aWndFunc( String aErr(SvtResId(STR_ERR_HDLMESS).toString()); String aAction(rAction); if ( aAction.Len() ) - aAction += String::CreateFromAscii( ":\n" ); - aErr.SearchAndReplace(String::CreateFromAscii( "$(ACTION)" ), aAction); - aErr.SearchAndReplace(String::CreateFromAscii( "$(ERROR)" ), rErr); + aAction += rtl::OUString(":\n"); + aErr.SearchAndReplace(rtl::OUString("$(ACTION)"), aAction); + aErr.SearchAndReplace(rtl::OUString("$(ERROR)"), rErr); MessBox* pBox; switch ( nFlags & 0xf000 ) @@ -194,7 +194,7 @@ sal_Bool SfxErrorHandler::CreateString( { for (xub_StrLen i = 0; i < rStr.Len();) { - i = rStr.SearchAndReplace(String::CreateFromAscii( "$(ARG1)" ), + i = rStr.SearchAndReplace(rtl::OUString("$(ARG1)"), pMsgInfo->GetMessageArg(), i); if (i == STRING_NOTFOUND) break; @@ -209,7 +209,7 @@ sal_Bool SfxErrorHandler::CreateString( if(pStringInfo) for (xub_StrLen i = 0; i < rStr.Len();) { - i = rStr.SearchAndReplace(String::CreateFromAscii( "$(ARG1)" ), + i = rStr.SearchAndReplace(rtl::OUString("$(ARG1)"), pStringInfo->GetErrorString(), i); if (i == STRING_NOTFOUND) break; @@ -222,8 +222,8 @@ sal_Bool SfxErrorHandler::CreateString( if (pTwoStringInfo) for (sal_uInt16 i = 0; i < rStr.Len();) { - sal_uInt16 nArg1Pos = rStr.Search(String::CreateFromAscii( "$(ARG1)" ), i); - sal_uInt16 nArg2Pos = rStr.Search(String::CreateFromAscii( "$(ARG2)" ), i); + sal_uInt16 nArg1Pos = rStr.Search(rtl::OUString("$(ARG1)"), i); + sal_uInt16 nArg2Pos = rStr.Search(rtl::OUString("$(ARG2)"), i); if (nArg1Pos < nArg2Pos) { rStr.Replace(nArg1Pos, 7, pTwoStringInfo->GetArg1()); @@ -383,8 +383,7 @@ sal_Bool SfxErrorHandler::GetErrorString( sal_uInt16 nResFlags = aErrorString.GetFlags(); if ( nResFlags ) nFlags = nResFlags; - rStr.SearchAndReplace( - String::CreateFromAscii("$(ERROR)"), aErrorString.GetString()); + rStr.SearchAndReplace(rtl::OUString("$(ERROR)"), aErrorString.GetString()); bRet = sal_True; } else @@ -397,8 +396,8 @@ sal_Bool SfxErrorHandler::GetErrorString( GetClassString(lErrId & ERRCODE_CLASS_MASK, aErrStr); if(aErrStr.Len()) - aErrStr+=String::CreateFromAscii( ".\n" ); - rStr.SearchAndReplace(String::CreateFromAscii( "$(CLASS)" ),aErrStr); + aErrStr += rtl::OUString(".\n"); + rStr.SearchAndReplace(rtl::OUString("$(CLASS)"),aErrStr); } return bRet; @@ -453,7 +452,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr) if ( aTestEr ) { rStr = ( (ResString)aTestEr ).GetString(); - rStr.SearchAndReplace( String::CreateFromAscii( "$(ARG1)" ), aArg1 ); + rStr.SearchAndReplace(rtl::OUString("$(ARG1)"), aArg1 ); bRet = true; } else @@ -467,7 +466,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr) sal_uInt16 nId = ( nErrId & ERRCODE_WARNING_MASK ) ? ERRCTX_WARNING : ERRCTX_ERROR; ResId aSfxResId( RID_ERRCTX, *pMgr ); ErrorResource_Impl aEr( aSfxResId, nId ); - rStr.SearchAndReplace( String::CreateFromAscii( "$(ERR)" ), ( (ResString)aEr ).GetString() ); + rStr.SearchAndReplace( rtl::OUString("$(ERR)"), ( (ResString)aEr ).GetString() ); } } diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 1e65ecdd40ea..044275eca64a 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -218,7 +218,7 @@ static String GetImageExtensionByFactory_Impl( const String& rURL ) if ( aPath.EqualsAscii( Fac2ExtMap_Impl[ nIndex ]._pFactory ) ) { // extension found - aExtension = String::CreateFromAscii( Fac2ExtMap_Impl[ nIndex ]._pExtension ); + aExtension = rtl::OUString::createFromAscii(Fac2ExtMap_Impl[ nIndex ]._pExtension); // and return it return aExtension; } diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 3d1df1bf1cf5..5bbd61dd4530 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -259,8 +259,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() ); aStbStatus.InsertItem( 1, 130, SIB_LEFT | SIB_IN | SIB_AUTOSIZE ); - aStbStatus.InsertItem( 2, 10 + GetTextWidth( String::CreateFromAscii( " 9999,99 cm / 9999,99 cm " ) ), SIB_CENTER | SIB_IN ); - aStbStatus.InsertItem( 3, 10 + GetTextWidth( String::CreateFromAscii( " 9999,99 cm x 9999,99 cm " ) ), SIB_CENTER | SIB_IN ); + aStbStatus.InsertItem( 2, 10 + GetTextWidth( rtl::OUString(" 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN ); + aStbStatus.InsertItem( 3, 10 + GetTextWidth( rtl::OUString(" 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN ); aStbStatus.InsertItem( 4, 20, SIB_CENTER | SIB_IN ); Resize(); @@ -572,7 +572,7 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd ) const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0]; aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) ); - aStr.Append( String::CreateFromAscii( " / " ) ); + aStr.Append( rtl::OUString(" / ") ); aStr.Append( GetUnitString( rMousePos.Y(), eFieldUnit, cSep ) ); aStbStatus.SetItemText( 2, aStr ); @@ -589,7 +589,7 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd ) const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0]; aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) ); - aStr.Append( String::CreateFromAscii( " x " ) ); + aStr.Append( rtl::OUString(" x ") ); aStr.Append( GetUnitString( rSize.Height(), eFieldUnit, cSep ) ); aStbStatus.SetItemText( 3, aStr ); diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 936748b79d7c..5ac29eb15944 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -72,7 +72,7 @@ IMapWindow::IMapWindow( Window* pParent, const ResId& rResId, const Reference< X pItemInfo = new SfxItemInfo[ 1 ]; memset( pItemInfo, 0, sizeof( SfxItemInfo ) ); - pIMapPool = new SfxItemPool( String::CreateFromAscii( "IMapItemPool" ), + pIMapPool = new SfxItemPool( rtl::OUString("IMapItemPool"), SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, pItemInfo ); pIMapPool->FreezeIdRanges(); } @@ -650,8 +650,8 @@ void IMapWindow::DoMacroAssign() SfxItemSet aSet( *pIMapPool, SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 ); SfxEventNamesItem aNamesItem(SID_EVENTCONFIG); - aNamesItem.AddEvent( String::CreateFromAscii( "MouseOver" ), String(), SFX_EVENT_MOUSEOVER_OBJECT ); - aNamesItem.AddEvent( String::CreateFromAscii( "MouseOut" ), String(), SFX_EVENT_MOUSEOUT_OBJECT ); + aNamesItem.AddEvent( rtl::OUString("MouseOver"), String(), SFX_EVENT_MOUSEOVER_OBJECT ); + aNamesItem.AddEvent( rtl::OUString("MouseOut"), String(), SFX_EVENT_MOUSEOUT_OBJECT ); aSet.Put( aNamesItem ); SvxMacroItem aMacroItem(SID_ATTR_MACROITEM); diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 9e98d91b36de..97704f8f9ab2 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -130,7 +130,7 @@ SfxItemPresentation SvxGridItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: - rText = String::CreateFromAscii("SvxGridItem"); + rText = rtl::OUString("SvxGridItem"); return ePres; default: return SFX_ITEM_PRESENTATION_NONE; diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index da43952284de..7305b1664f0f 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -274,7 +274,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s Size aDrawSize( 0, aRect.GetHeight() / 6); aFont.SetSize(aDrawSize); SetFont(aFont); - String sText(String::CreateFromAscii("ABC")); + String sText(rtl::OUString("ABC")); Point aMove(1, GetTextHeight()); sal_Unicode cArrow = 0x2193; long nAWidth = GetTextWidth(String(sText.GetChar(0))); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 294ba3c33e25..9ad1db82b843 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -857,7 +857,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) break; case RubyAdjust_INDENT_BLOCK: { - long nCharWidth = GetTextWidth(String::CreateFromAscii("X")); + long nCharWidth = GetTextWidth(rtl::OUString("X")); if(nOutTextWidth < (nRightEnd - nLeftStart - nCharWidth)) { nCharWidth /= 2; diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 0e9a9e6b1ddc..3ffdc0113a66 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star::text; #define FLYINFLY_BORDER 3 #define DEMOTEXT "Ij" -#define C2S(cChar) UniString::CreateFromAscii(cChar) - SvxSwFrameExample::SvxSwFrameExample( Window *pParent, const ResId& rResID ) : @@ -172,7 +170,7 @@ void SvxSwFrameExample::InitAllRects_Impl() { aFont.SetSize(Size(0, aParaPrtArea.GetHeight() - 2)); SetFont(aFont); - aParaPrtArea.SetSize(Size(GetTextWidth(C2S(DEMOTEXT)), GetTextHeight())); + aParaPrtArea.SetSize(Size(GetTextWidth(rtl::OUString(DEMOTEXT)), GetTextHeight())); } else { @@ -218,7 +216,7 @@ void SvxSwFrameExample::InitAllRects_Impl() } else { - sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT)); + sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(rtl::OUString(DEMOTEXT)); aFrmSize = Size(nFreeWidth / 2, (aTextLine.GetHeight() + 2) * 3); aDrawObj.SetSize(Size(Max(5L, (long)nFreeWidth / 3L), Max(5L, aFrmSize.Height() * 3L))); @@ -680,7 +678,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) } else { - DrawText(aParaPrtArea, C2S(DEMOTEXT)); + DrawText(aParaPrtArea, rtl::OUString(DEMOTEXT)); DrawRect_Impl(aDrawObj, m_aBlankCol, m_aBlankFrameCol ); } diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 3e3e1e3f2b0b..dbfd5586cab6 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -167,7 +167,7 @@ namespace svx static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\"")); + s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; @@ -651,7 +651,7 @@ namespace svx static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\"")); + s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 36e5586d9d3c..9a89732ff71b 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -71,12 +71,12 @@ namespace svx static sal_uInt32 s_nFormFormat = (sal_uInt32)-1; if ( _bExtractForm && (sal_uInt32)-1 == s_nFormFormat ) { - s_nFormFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\"" )); + s_nFormFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\"" )); OSL_ENSURE((sal_uInt32)-1 != s_nFormFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!"); } else if ( !_bExtractForm && (sal_uInt32)-1 == s_nReportFormat) { - s_nReportFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\"")); + s_nReportFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nReportFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!"); } return _bExtractForm ? s_nFormFormat : s_nReportFormat; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 13c8f3ecebc5..0ad52138a046 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -478,7 +478,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() m_aRecordOf.SetSizePixel(Size(nTextWidth,nH)); nX = sal::static_int_cast< sal_uInt16 >(nX + nTextWidth + aBorder.Width()); - nTextWidth = m_aRecordCount.GetTextWidth( String::CreateFromAscii("0000000 (00000) *") ); + nTextWidth = m_aRecordCount.GetTextWidth( rtl::OUString("0000000 (00000) *") ); m_aRecordCount.SetPosPixel(Point(nX,nY) ); m_aRecordCount.SetSizePixel(Size(nTextWidth,nH)); nX = sal::static_int_cast< sal_uInt16 >(nX + nTextWidth + aBorder.Width()); @@ -702,7 +702,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) else aText = String::CreateFromInt32(pParent->GetRowCount()); if(!pParent->m_bRecordCountFinal) - aText += String::CreateFromAscii(" *"); + aText += rtl::OUString(" *"); } else aText = String(); diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index b980704b1898..1b8b1b066437 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -57,7 +57,7 @@ namespace svx const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor ); if ( SOT_FORMATSTR_ID_XFORMS == nFormatId ) { - return SetString( ::rtl::OUString( String::CreateFromAscii("XForms-Transferable") ), _rFlavor ); + return SetString(rtl::OUString("XForms-Transferable"), _rFlavor); } return sal_False; } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index cbee3dfdc90c..d98787cc5974 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2225,7 +2225,7 @@ namespace svxform if ( sInstName.isEmpty() ) { SAL_WARN( "svx.form", "DataNavigatorWindow::CreateInstancePage(): instance without name" ); - String sTemp = String::CreateFromAscii( "untitled" ); + String sTemp = rtl::OUString("untitled"); sTemp += String::CreateFromInt32( nPageId ); sInstName = sTemp; } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index fc1b92c23e2f..24a0b87d6a95 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -130,7 +130,7 @@ sal_uInt32 OFilterItemExchange::getFormatId() static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OFilterExchangeHelper::getFormatId: bad exchange id!"); } return s_nFormat; diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index c13198482aa8..1d9be6d061d6 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -343,7 +343,7 @@ namespace svxform static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getControlPathFormatId: bad exchange id!"); } return s_nFormat; @@ -355,7 +355,7 @@ namespace svxform static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getHiddenControlModelsFormatId: bad exchange id!"); } return s_nFormat; @@ -367,7 +367,7 @@ namespace svxform static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getFieldExchangeFormatId: bad exchange id!"); } return s_nFormat; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index ab4189f9c2ba..a39bb920a9c3 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -233,7 +233,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) { m_pImpl->acquire(); SetPool( &SFX_APP()->GetPool() ); - SetName( String::CreateFromAscii( "Form" ) ); + SetName( rtl::OUString("Form") ); SetView(m_pFormView); } diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index ddf5f46f8305..e59f6bd83700 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -1000,8 +1000,8 @@ void FmSearchEngine::SearchNextImpl() { // da natuerlich in allen anderen Faellen auch * und ? im Suchstring erlaubt sind, aber nicht als WildCards zaehlen // sollen, muss ich normieren UniString aTmp(strSearchExpression); - static const UniString s_sStar = UniString::CreateFromAscii("\\*"); - static const UniString s_sQuotation = UniString::CreateFromAscii("\\?"); + const rtl::OUString s_sStar("\\*"); + const rtl::OUString s_sQuotation("\\?"); aTmp.SearchAndReplaceAll('*', s_sStar); aTmp.SearchAndReplaceAll('?', s_sQuotation); strSearchExpression = aTmp; diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index ca621e899835..195b47eb892a 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1090,7 +1090,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ ) if ( !xWizard.is() ) { - ShowServiceNotAvailableError( NULL, String::CreateFromAscii( pWizardAsciiName ), sal_True ); + ShowServiceNotAvailableError( NULL, rtl::OUString::createFromAscii(pWizardAsciiName), sal_True ); } else { diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index b3f61406466f..20c2d6d72949 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -425,7 +425,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) XBitmapEntry* pEntry = new XBitmapEntry( pBitmapItem->GetBitmapValue(), aTmpStr ); XBitmapListRef xBitmapList = XPropertyList::CreatePropertyList(XBITMAP_LIST, - String::CreateFromAscii("TmpList"))->AsBitmapList(); + rtl::OUString("TmpList"))->AsBitmapList(); xBitmapList->Insert( pEntry ); xBitmapList->SetDirty( sal_False ); pFillAttrLB->Fill( xBitmapList ); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 1bfd3d577c91..6599e85b0d0d 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -141,7 +141,7 @@ ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString& maCommand( rCmd ), mxFrame( rFrame ) { - Size aSize( GetTextWidth( String::CreateFromAscii("-100 %") ), GetTextHeight() ); + Size aSize( GetTextWidth( rtl::OUString("-100 %") ), GetTextHeight() ); aSize.Width() += 20, aSize.Height() += 6; SetSizePixel( aSize ); @@ -161,7 +161,7 @@ ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString& const long nMinVal = ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafTransparence" ) )) ? 0 : -100; SetUnit( FUNIT_CUSTOM ); - SetCustomUnitText( String::CreateFromAscii(" %") ); + SetCustomUnitText( rtl::OUString(" %") ); SetDecimalDigits( 0 ); SetMin( nMinVal ); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 78a2e14de9e6..9d647d283095 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -437,7 +437,7 @@ SvxMetricField::SvxMetricField( aCurTxt( String() ), mxFrame( rFrame ) { - Size aSize = Size(GetTextWidth( String::CreateFromAscii("99,99mm") ),GetTextHeight()); + Size aSize = Size(GetTextWidth( rtl::OUString("99,99mm") ),GetTextHeight()); aSize.Width() += 20; aSize.Height() += 6; SetSizePixel( aSize ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 014d48344c31..64dd7646ad0a 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -384,7 +384,7 @@ void SvxStyleBox_Impl::Select() bClear = true; //not only apply default style but also call 'ClearFormatting' Sequence< PropertyValue > aEmptyVals; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:ResetAttributes"), + SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ResetAttributes"), aEmptyVals); } else if( aSelEntry == aMoreKey && GetSelectEntryPos() == ( GetEntryCount() - 1 ) ) @@ -425,7 +425,7 @@ void SvxStyleBox_Impl::Select() if( bCreateNew ) { aArgs[0].Name = OUString("Param"); - SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:StyleNewByExample"), aArgs); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:StyleNewByExample"), aArgs); } else { @@ -1046,8 +1046,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFram { BindListener(); - String sCommand(String::CreateFromAscii( ".uno:BorderReducedMode" )); - AddStatusListener( sCommand ); + AddStatusListener(rtl::OUString(".uno:BorderReducedMode")); aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) ); /* diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 28b4facb981e..415cb3055b60 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -329,8 +329,7 @@ inline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, inline void SwFmt::SetName( const sal_Char* pNewName, sal_Bool bBroadcast ) { - String aTmp( String::CreateFromAscii( pNewName ) ); - SetName( aTmp, bBroadcast ); + SetName(rtl::OUString::createFromAscii(pNewName), bBroadcast); } inline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent, diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 1b86c326c89c..66533c6e3231 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1633,14 +1633,14 @@ SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2 OUStringBuffer aBuffer( rName.Len() + 15 + 6 ); aBuffer.append( OUString(rName) ); - aBuffer.append( String::CreateFromAscii("-ColumnHeaders-") ); + aBuffer.append( rtl::OUString("-ColumnHeaders-") ); aBuffer.append( static_cast<sal_Int32>( pTabFrm->GetPhyPageNum() ) ); SetName( aBuffer.makeStringAndClear() ); OUStringBuffer aBuffer2( rName.Len() + 14 ); aBuffer2.append( OUString(rName) ); - aBuffer2.append( String::CreateFromAscii("-ColumnHeaders") ); + aBuffer2.append( rtl::OUString("-ColumnHeaders") ); OUString sArg1( aBuffer2.makeStringAndClear() ); OUString sArg2( GetFormattedPageNumber() ); diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 3f9f6e4783cb..78cf03adcb98 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -393,7 +393,7 @@ SwDoc::SwDoc() _InitFieldTypes(); // Create a default OutlineNumRule (for Filters) - pOutlineRule = new SwNumRule( String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ), + pOutlineRule = new SwNumRule( rtl::OUString::createFromAscii( SwNumRule::GetOutlineRuleName() ), // #i89178# numfunc::GetDefaultPositionAndSpaceMode(), OUTLINE_RULE ); @@ -825,7 +825,7 @@ void SwDoc::ClearDoc() InitTOXTypes(); // create a dummy pagedesc for the layout - sal_uInt16 nDummyPgDsc = MakePageDesc( String::CreateFromAscii( "?DUMMY?" )); + sal_uInt16 nDummyPgDsc = MakePageDesc(rtl::OUString("?DUMMY?")); SwPageDesc* pDummyPgDsc = aPageDescs[ nDummyPgDsc ]; SwNodeIndex aSttIdx( *GetNodes().GetEndOfContent().StartOfSectionNode(), 1 ); @@ -853,7 +853,7 @@ void SwDoc::ClearDoc() delete pNumRule; pNumRuleTbl->clear(); // creation of new outline numbering rule - pOutlineRule = new SwNumRule( String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ), + pOutlineRule = new SwNumRule( rtl::OUString::createFromAscii( SwNumRule::GetOutlineRuleName() ), // #i89178# numfunc::GetDefaultPositionAndSpaceMode(), OUTLINE_RULE ); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index dcb9b1a69446..a264f7bd9b11 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -113,7 +113,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule ) } pOutlineRule->SetRuleType( OUTLINE_RULE ); - pOutlineRule->SetName( String::CreateFromAscii( + pOutlineRule->SetName( rtl::OUString::createFromAscii( SwNumRule::GetOutlineRuleName() ), *this); @@ -2605,7 +2605,7 @@ namespace listfunc const String CreateUniqueListId( const SwDoc& rDoc ) { // #i92478# - String aNewListId = String::CreateFromAscii( "list" ); + String aNewListId = rtl::OUString("list"); sal_Int64 n = Time( Time::SYSTEM ).GetTime(); n += Date( Date::SYSTEM ).GetDate(); n += rand(); diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index e781cc80b9a1..939c4472ab93 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -804,7 +804,7 @@ String SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum, } else if ( aRefNumStr.Len() > 0 ) { - aRefNumStr.Insert( String::CreateFromAscii(" "), 0 ); + aRefNumStr.Insert( rtl::OUString(" "), 0 ); bOldHadPrefix = true; } @@ -1174,7 +1174,7 @@ namespace numfunc SwDefBulletConfig::SwDefBulletConfig() : ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/Numbering/DefaultBulletList")) ), // default bullet font is now OpenSymbol - msFontname( String::CreateFromAscii("OpenSymbol") ), + msFontname( rtl::OUString("OpenSymbol") ), mbUserDefinedFontname( false ), meFontWeight( WEIGHT_DONTKNOW ), meFontItalic( ITALIC_NONE ), @@ -1195,7 +1195,7 @@ namespace numfunc void SwDefBulletConfig::SetToDefault() { - msFontname = String::CreateFromAscii("OpenSymbol"); + msFontname = rtl::OUString("OpenSymbol"); mbUserDefinedFontname = false; meFontWeight = WEIGHT_DONTKNOW; meFontItalic = ITALIC_NONE; diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 3e4ddc2e0a27..a4b3acd37eba 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -4196,9 +4196,8 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos ) aRegH.RegisterInModify( pTxtNode , *pTxtNode ); if ( pUndo ) pUndo->AddNode( *pTxtNode , sal_False ); - String aStyle = String::CreateFromAscii(""); SfxStringItem * pNewItem = (SfxStringItem*)pFmtItem->Clone(); - pNewItem->SetValue( aStyle ); + pNewItem->SetValue(rtl::OUString()); rSet.Put( *pNewItem ); pTxtNode->SetAttr( rSet ); delete pNewItem; diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index d94e417d7772..854995816a11 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -1265,7 +1265,7 @@ int lcl_FindDocShell( SfxObjectShellRef& xDocSh, const SfxFilter* pSfxFlt = 0; if( !pMed->GetError() ) { - String sFactory(String::CreateFromAscii(SwDocShell::Factory().GetShortName())); + String sFactory(rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName())); SfxFilterMatcher aMatcher( sFactory ); // kein Filter, dann suche ihn. Ansonsten teste, ob der angegebene @@ -1539,15 +1539,6 @@ int lcl_FindDocShell( SfxObjectShellRef& xDocSh, STREAM_READ ); aStrm.Seek( 0 ); -#if OSL_DEBUG_LEVEL > 1 - { - SvFileStream aDeb( String::CreateFromAscii( - "file:///d|/temp/update.txt" ), STREAM_WRITE ); - aDeb << aStrm; - } - aStrm.Seek( 0 ); -#endif - // TODO/MBA: it's impossible to set a BaseURL here! SwReader aTmpReader( aStrm, aEmptyStr, pDoc->GetDocShell()->GetMedium()->GetBaseURL(), *pPam ); diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index 91d32a80c31f..6ba3a935642a 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -296,8 +296,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk ) #if defined(UNX) rBuf += '\012'; #else - rBuf += String::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "\015\012" )); + rBuf += rtl::OUString("\015\012"); #endif } } @@ -310,7 +309,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk ) aStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); #endif WriterRef xWrt; - SwReaderWriter::GetWriter( String::CreateFromAscii( FILTER_TEXT ), String(), xWrt ); + SwReaderWriter::GetWriter( rtl::OUString(FILTER_TEXT), String(), xWrt ); if( xWrt.Is() ) { // Selektierte Bereiche in ein ASCII Dokument schreiben diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index b146f55a2c66..8df55373e57f 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1128,12 +1128,12 @@ String SwDocInfoField::Expand() const { String sText(aDuration.Negative ? '-' : '+'); sText += ViewShell::GetShellRes()->sDurationFormat; - sText.SearchAndReplace(String::CreateFromAscii( "%1"), String::CreateFromInt32( aDuration.Years ) ); - sText.SearchAndReplace(String::CreateFromAscii( "%2"), String::CreateFromInt32( aDuration.Months ) ); - sText.SearchAndReplace(String::CreateFromAscii( "%3"), String::CreateFromInt32( aDuration.Days ) ); - sText.SearchAndReplace(String::CreateFromAscii( "%4"), String::CreateFromInt32( aDuration.Hours ) ); - sText.SearchAndReplace(String::CreateFromAscii( "%5"), String::CreateFromInt32( aDuration.Minutes) ); - sText.SearchAndReplace(String::CreateFromAscii( "%6"), String::CreateFromInt32( aDuration.Seconds) ); + sText.SearchAndReplace(rtl::OUString("%1"), String::CreateFromInt32( aDuration.Years ) ); + sText.SearchAndReplace(rtl::OUString("%2"), String::CreateFromInt32( aDuration.Months ) ); + sText.SearchAndReplace(rtl::OUString("%3"), String::CreateFromInt32( aDuration.Days ) ); + sText.SearchAndReplace(rtl::OUString("%4"), String::CreateFromInt32( aDuration.Hours ) ); + sText.SearchAndReplace(rtl::OUString("%5"), String::CreateFromInt32( aDuration.Minutes) ); + sText.SearchAndReplace(rtl::OUString("%6"), String::CreateFromInt32( aDuration.Seconds) ); sVal = sText; } else diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 9afe6075568d..ba2754c6d208 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -506,7 +506,7 @@ SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const String& rName, sal_uInt1 : SwValueFieldType( pDc, RES_SETEXPFLD ), sName( rName ), pOutlChgNd( 0 ), - sDelim( String::CreateFromAscii( "." ) ), + sDelim( rtl::OUString(".") ), nType(nTyp), nLevel( UCHAR_MAX ), bDeleted( sal_False ) { @@ -684,10 +684,9 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { String sTmp; if( ::GetString( rAny, sTmp ).Len() ) -// SetDelimiter( sTmp.GetChar( 0 )); SetDelimiter( sTmp ); else - SetDelimiter(String::CreateFromAscii( " ")); + SetDelimiter(rtl::OUString(" ")); } break; case FIELD_PROP_SHORT1: diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 843dff9bcfcf..57c0c97818b3 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -2362,7 +2362,7 @@ sal_Bool SwFEShell::GetAutoSum( String& rFml ) const if( !pTab ) return sal_False; - rFml = String::CreateFromAscii( sCalc_Sum ); + rFml = rtl::OUString::createFromAscii( sCalc_Sum ); SwCellFrms aCells; if( ::GetAutoSumSel( *this, aCells )) diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 6eb1abe8d5e1..2654eaf58ebe 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -559,14 +559,14 @@ void SwTxtPortion::Paint( const SwTxtPaintInfo &rInf ) const if (rInf.OnWin() && 1==rInf.GetLen() && CH_TXT_ATR_FIELDEND==rInf.GetTxt().GetChar(rInf.GetIdx())) { rInf.DrawBackBrush( *this ); - const XubString aTxt = XubString::CreateFromAscii(CH_TXT_ATR_SUBST_FIELDEND); - rInf.DrawText( aTxt, *this, 0, aTxt.Len(), false ); + const rtl::OUString aTxt(CH_TXT_ATR_SUBST_FIELDEND); + rInf.DrawText( aTxt, *this, 0, aTxt.getLength(), false ); } else if (rInf.OnWin() && 1==rInf.GetLen() && CH_TXT_ATR_FIELDSTART==rInf.GetTxt().GetChar(rInf.GetIdx())) { rInf.DrawBackBrush( *this ); - const XubString aTxt = XubString::CreateFromAscii(CH_TXT_ATR_SUBST_FIELDSTART); - rInf.DrawText( aTxt, *this, 0, aTxt.Len(), false ); + const rtl::OUString aTxt(CH_TXT_ATR_SUBST_FIELDSTART); + rInf.DrawText( aTxt, *this, 0, aTxt.getLength(), false ); } else if( GetLen() ) { diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index c802c3aaee82..ff7f3070ae11 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -130,10 +130,10 @@ SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId) aStartToken.nAuthorityField = AUTH_FIELD_IDENTIFIER; aRet.push_back( aStartToken ); SwFormToken aSeparatorToken( TOKEN_TEXT ); - aSeparatorToken.sText = String::CreateFromAscii( ": " ); + aSeparatorToken.sText = rtl::OUString(": "); aRet.push_back( aSeparatorToken ); SwFormToken aTextToken( TOKEN_TEXT ); - aTextToken.sText = String::CreateFromAscii( ", " ); + aTextToken.sText = rtl::OUString(", "); for(sal_uInt16 i = 0; i < 5 ; i++) { diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index a27754494e5e..9848b60c04b8 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -3409,8 +3409,7 @@ namespace { rTxtNode.RemoveFromList(); // If new list style is the outline style, apply outline // level as the list level. - if ( sNumRule == - String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ) ) + if ( sNumRule.EqualsAscii(SwNumRule::GetOutlineRuleName()) ) { // #i70748# OSL_ENSURE( rTxtNode.GetTxtColl()->IsAssignedToListLevelOfOutlineStyle(), @@ -4656,8 +4655,8 @@ namespace { // If paragraph has no list level attribute set and list style // is the outline style, apply outline level as the list level. if ( !mrTxtNode.HasAttrListLevel() && - mrTxtNode.GetNumRule()->GetName() == - String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ) && + mrTxtNode.GetNumRule()->GetName().EqualsAscii( + SwNumRule::GetOutlineRuleName()) && mrTxtNode.GetTxtColl()->IsAssignedToListLevelOfOutlineStyle() ) { int nNewListLevel = mrTxtNode.GetTxtColl()->GetAssignedOutlineStyleLevel(); diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index f5e4b16fee26..56f9b33798e7 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -806,10 +806,10 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) { xub_StrLen nOldIdx(rInf.GetIdx()); xub_StrLen nOldLen(rInf.GetLen()); - String aNewText=String::CreateFromAscii(CH_TXT_ATR_SUBST_FIELDSTART); + rtl::OUString aNewText(CH_TXT_ATR_SUBST_FIELDSTART); rInf.SetText( aNewText ); rInf.SetIdx( 0 ); - rInf.SetLen( aNewText.Len() ); + rInf.SetLen( aNewText.getLength() ); aTxtSize = pLastFont->GetTextSize( rInf ); rInf.SetIdx( nOldIdx ); rInf.SetLen( nOldLen ); @@ -818,10 +818,10 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) { xub_StrLen nOldIdx(rInf.GetIdx()); xub_StrLen nOldLen(rInf.GetLen()); - String aNewText=String::CreateFromAscii(CH_TXT_ATR_SUBST_FIELDEND); + rtl::OUString aNewText(CH_TXT_ATR_SUBST_FIELDEND); rInf.SetText( aNewText ); rInf.SetIdx( 0 ); - rInf.SetLen( aNewText.Len() ); + rInf.SetLen( aNewText.getLength() ); aTxtSize = pLastFont->GetTextSize( rInf ); rInf.SetIdx( nOldIdx ); rInf.SetLen( nOldLen ); diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index f27ca9634826..df04bca69077 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -2184,12 +2184,12 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( String aNew; if (bUseCol) { - aRplc = String::CreateFromAscii( "%COLUMNLETTER" ); + aRplc = rtl::OUString("%COLUMNLETTER"); aNew = rtl::OUString(aCellName.GetBuffer(), pBuf - aCellName.GetBuffer()); } else { - aRplc = String::CreateFromAscii( "%ROWNUMBER" ); + aRplc = rtl::OUString("%ROWNUMBER"); aNew = rtl::OUString(pBuf, (aCellName.GetBuffer() + nLen) - pBuf); } xub_StrLen nPos = aTxt.Search( aRplc ); diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index a2168df6c681..a37d25c9b5a2 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -191,7 +191,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) #endif WriterRef xWrt; // TODO/MBA: looks like a BaseURL doesn't make sense here - SwReaderWriter::GetWriter( C2S(FILTER_TEXT_DLG), String(), xWrt ); + SwReaderWriter::GetWriter( rtl::OUString(FILTER_TEXT_DLG), String(), xWrt ); if( xWrt.Is() ) { SwWriter aWriter( aStream, rPam ); diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 34e2e7e5f3a7..4231b47987b2 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -1013,7 +1013,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!m_pImpl->m_bIsDescriptor) { throw uno::RuntimeException( - C2S("SwXMeta::attach(): already attached"), + rtl::OUString("SwXMeta::attach(): already attached"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1021,7 +1021,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!xRangeTunnel.is()) { throw lang::IllegalArgumentException( - C2S("SwXMeta::attach(): argument is no XUnoTunnel"), + rtl::OUString("SwXMeta::attach(): argument is no XUnoTunnel"), static_cast< ::cppu::OWeakObject* >(this), 0); } SwXTextRange *const pRange( @@ -1031,7 +1031,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!pRange && !pCursor) { throw lang::IllegalArgumentException( - C2S("SwXMeta::attach(): argument not supported type"), + rtl::OUString("SwXMeta::attach(): argument not supported type"), static_cast< ::cppu::OWeakObject* >(this), 0); } @@ -1040,7 +1040,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!pDoc) { throw lang::IllegalArgumentException( - C2S("SwXMeta::attach(): argument has no SwDoc"), + rtl::OUString("SwXMeta::attach(): argument has no SwDoc"), static_cast< ::cppu::OWeakObject* >(this), 0); } @@ -1068,14 +1068,14 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!bSuccess) { throw lang::IllegalArgumentException( - C2S("SwXMeta::attach(): cannot create meta: range invalid?"), + rtl::OUString("SwXMeta::attach(): cannot create meta: range invalid?"), static_cast< ::cppu::OWeakObject* >(this), 1); } if (!pTxtAttr) { OSL_FAIL("meta inserted, but has no text attribute?"); throw uno::RuntimeException( - C2S("SwXMeta::attach(): cannot create meta"), + rtl::OUString("SwXMeta::attach(): cannot create meta"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1107,7 +1107,7 @@ SwXMeta::getAnchor() throw (uno::RuntimeException) if (m_pImpl->m_bIsDescriptor) { throw uno::RuntimeException( - C2S("SwXMeta::getAnchor(): not inserted"), + rtl::OUString("SwXMeta::getAnchor(): not inserted"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1119,7 +1119,7 @@ SwXMeta::getAnchor() throw (uno::RuntimeException) if (!bSuccess) { throw lang::DisposedException( - C2S("SwXMeta::getAnchor(): not attached"), + rtl::OUString("SwXMeta::getAnchor(): not attached"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1243,7 +1243,7 @@ void SAL_CALL SwXMeta::setParent(uno::Reference< uno::XInterface > const& /*xParent*/) throw (uno::RuntimeException, lang::NoSupportException) { - throw lang::NoSupportException(C2S("setting parent not supported"), *this); + throw lang::NoSupportException(rtl::OUString("setting parent not supported"), *this); } // XElementAccess @@ -1274,7 +1274,7 @@ SwXMeta::createEnumeration() throw (uno::RuntimeException) if (m_pImpl->m_bIsDescriptor) { throw uno::RuntimeException( - C2S("createEnumeration(): not inserted"), + rtl::OUString("createEnumeration(): not inserted"), static_cast< ::cppu::OWeakObject* >(this)); } diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 27064efb4d4a..8a2fbbeffe6c 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -460,13 +460,13 @@ String lcl_GetCellName( sal_Int32 nColumn, sal_Int32 nRow ) #if OSL_DEBUG_LEVEL > 0 { sal_Int32 nCol, nRow2; - lcl_GetCellPosition( String::CreateFromAscii("z1"), nCol, nRow2); + lcl_GetCellPosition( rtl::OUString("z1"), nCol, nRow2); OSL_ENSURE( nCol == 51, "lcl_GetCellPosition failed" ); - lcl_GetCellPosition( String::CreateFromAscii("AA1"), nCol, nRow2); + lcl_GetCellPosition( rtl::OUString("AA1"), nCol, nRow2); OSL_ENSURE( nCol == 52, "lcl_GetCellPosition failed" ); - lcl_GetCellPosition( String::CreateFromAscii("AB1"), nCol, nRow2); + lcl_GetCellPosition( rtl::OUString("AB1"), nCol, nRow2); OSL_ENSURE( nCol == 53, "lcl_GetCellPosition failed" ); - lcl_GetCellPosition( String::CreateFromAscii("BB1"), nCol, nRow2); + lcl_GetCellPosition( rtl::OUString("BB1"), nCol, nRow2); OSL_ENSURE( nCol == 105, "lcl_GetCellPosition failed" ); } #endif diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 2a06f9614d7c..3808519ba943 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -744,7 +744,7 @@ String NameFromCharSet(rtl_TextEncoding nChrSet) OSL_ENSURE(pRet != pStart->pName, "TXT: That was an unknown language!"); - return String::CreateFromAscii(pRet); + return rtl::OUString::createFromAscii(pRet); } // for the automatic conversion (mail/news/...) diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index f45b4b0991e7..6c211f8e8bc7 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -101,12 +101,12 @@ const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_, const String SwIoSystem::GetSubStorageName( const SfxFilter& rFltr ) { /* bei den StorageFiltern noch den SubStorageNamen setzen */ - const String& rUserData = rFltr.GetUserData(); - if( rUserData.EqualsAscii(FILTER_XML) || - rUserData.EqualsAscii(FILTER_XMLV) || - rUserData.EqualsAscii(FILTER_XMLVW) ) + const rtl::OUString& rUserData = rFltr.GetUserData(); + if (rUserData == FILTER_XML || + rUserData == FILTER_XMLV || + rUserData == FILTER_XMLVW) return rtl::OUString("content.xml"); - if( rUserData.EqualsAscii(sWW6) || rUserData.EqualsAscii(FILTER_WW8) ) + if (rUserData == sWW6 || rUserData == FILTER_WW8) return rtl::OUString("WordDocument"); return rtl::OUString(); } @@ -126,7 +126,7 @@ const SfxFilter* SwIoSystem::GetFilterOfFormat(const String& rFmtNm, const SfxFilter* pFilter = aIter.First(); while ( pFilter ) { - if( pFilter->GetUserData() == rFmtNm ) + if( pFilter->GetUserData().equals(rFmtNm) ) return pFilter; pFilter = aIter.Next(); } @@ -159,11 +159,8 @@ sal_Bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter { sal_uLong nStgFmtId = rStg.GetFormat(); /*#i8409# We cannot trust the clipboard id anymore :-(*/ - if( rFilter.GetUserData().EqualsAscii(FILTER_WW8) || - rFilter.GetUserData().EqualsAscii(sWW6) ) - { + if (rFilter.GetUserData() == FILTER_WW8 || rFilter.GetUserData() == sWW6) nStgFmtId = 0; - } sal_Bool bRet = SVSTREAM_OK == rStg.GetError() && ( !nStgFmtId || rFilter.GetFormat() == nStgFmtId ) && @@ -172,12 +169,11 @@ sal_Bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter { /* Bug 53445 - es gibt Excel Docs ohne ClipBoardId! */ /* Bug 62703 - und auch WinWord Docs ohne ClipBoardId! */ - if( rFilter.GetUserData().EqualsAscii(FILTER_WW8) || - rFilter.GetUserData().EqualsAscii(sWW6) ) + if (rFilter.GetUserData() == FILTER_WW8 || rFilter.GetUserData() == sWW6) { bRet = !((rStg.IsContained( rtl::OUString("0Table")) || rStg.IsContained( rtl::OUString("1Table"))) ^ - rFilter.GetUserData().EqualsAscii(FILTER_WW8)); + (rFilter.GetUserData() == FILTER_WW8)); if (bRet && !rFilter.IsAllowedAsTemplate()) { SotStorageStreamRef xRef = @@ -234,16 +230,16 @@ sal_Bool SwIoSystem::IsFileFilter( SfxMedium& rMedium, const String& rFmtName, const SfxFilter* pFltr = aIter.First(); while ( pFltr ) { - if( pFltr->GetUserData() == rFmtName ) + if( pFltr->GetUserData().equals(rFmtName) ) { - const String& rUserData = pFltr->GetUserData(); - if( 'C' == *rUserData.GetBuffer() ) + const rtl::OUString& rUserData = pFltr->GetUserData(); + if( 'C' == rUserData[0] ) { if ( xStor.is() ) bRet = IsValidStgFilter( xStor, *pFltr ); else if ( xStg.Is() ) bRet = xStg.Is() && IsValidStgFilter( *xStg, *pFltr ); - bRet = bRet && (pFltr->GetUserData() == rFmtName); + bRet = bRet && (pFltr->GetUserData().equals(rFmtName)); } else if( !xStg.Is() && !xStor.is() ) { @@ -322,7 +318,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName, { while ( pFilter ) { - if( 'C' == *pFilter->GetUserData().GetBuffer() && IsValidStgFilter( xStor, *pFilter ) ) + if( 'C' == pFilter->GetUserData()[0] && IsValidStgFilter( xStor, *pFilter ) ) { if ( pFilter->IsOwnTemplateFormat() && !bLookForTemplate ) // found template filter; maybe there's a "normal" one also @@ -349,7 +345,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName, { while ( pFilter ) { - if( 'C' == *pFilter->GetUserData().GetBuffer() && IsValidStgFilter( *xStg, *pFilter ) ) + if( 'C' == pFilter->GetUserData()[0] && IsValidStgFilter( *xStg, *pFilter ) ) { if ( pFilter->IsOwnTemplateFormat() && !bLookForTemplate ) // found template filter; maybe there's a "normal" one also @@ -400,7 +396,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName, { String sEmptyUserData; pNm = aFilterDetect[n].IsReader(aBuffer, nBytesRead, rFileName, sEmptyUserData); - pFilterTmp = pNm ? SwIoSystem::GetFilterOfFormat(String::CreateFromAscii(pNm), pFCntnr) : 0; + pFilterTmp = pNm ? SwIoSystem::GetFilterOfFormat(rtl::OUString::createFromAscii(pNm), pFCntnr) : 0; if (pNm && pFilterTmp) { return pFilterTmp; @@ -565,7 +561,7 @@ const SfxFilter* SwIoSystem::GetTextFilter( const sal_Char* pBuf, sal_uLong nLen { bool bAuto = IsDetectableText(pBuf, nLen); const sal_Char* pNm = bAuto ? FILTER_TEXT : FILTER_TEXT_DLG; - return SwIoSystem::GetFilterOfFormat( String::CreateFromAscii(pNm), 0 ); + return SwIoSystem::GetFilterOfFormat( rtl::OUString::createFromAscii(pNm), 0 ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index e9a30e75be0c..9bf099083d96 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -302,7 +302,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, // In STYLE-Optionen den String codieren Strm() << sOut.makeStringAndClear().getStr(); if( pVal ) - HTMLOutFuncs::Out_String( Strm(), String::CreateFromAscii(pVal), + HTMLOutFuncs::Out_String( Strm(), rtl::OUString::createFromAscii(pVal), eDestEnc, &aNonConvertableCharacters ); else if( pSVal ) HTMLOutFuncs::Out_String( Strm(), *pSVal, eDestEnc, &aNonConvertableCharacters ); @@ -3401,7 +3401,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt, if( pTempFileName ) sGrfNm = *pTempFileName; sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, sGrfNm, - String::CreateFromAscii("JPG"), + rtl::OUString("JPG"), XOUTBMP_USE_NATIVE_IF_POSSIBLE ); if( !nErr ) // fehlerhaft, da ist nichts auszugeben { diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 389c75718e89..42816109099f 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -132,7 +132,7 @@ sal_uInt16 SwHTMLWriter::GetDefListLvl( const String& rNm, sal_uInt16 nPoolId ) return 1 | HTML_DLCOLL_DT; } - String sDTDD( String::CreateFromAscii(OOO_STRING_SVTOOLS_HTML_dt) ); + String sDTDD( rtl::OUString(OOO_STRING_SVTOOLS_HTML_dt) ); sDTDD += ' '; if( COMPARE_EQUAL == sDTDD.CompareTo( rNm, sDTDD.Len() ) ) // DefinitionList - term diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 9dc4cefc6954..5f09dc911e6b 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -291,8 +291,7 @@ void SwHTMLWriter::OutBasic() const SbModule *pModule = PTR_CAST( SbModule, pModules->Get(j) ); OSL_ENSURE( pModule, "Wo ist das Modul?" ); - String sLang( - String::CreateFromAscii( SVX_MACRO_LANGUAGE_STARBASIC ) ); + rtl::OUString sLang(SVX_MACRO_LANGUAGE_STARBASIC); ScriptType eType = STARBASIC; if( 0==i && 0==j ) diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 5abd02894e0a..36dfe97d31f4 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -234,7 +234,7 @@ void SwCSS1Parser::SetLinkCharFmts() OSL_ENSURE( !bLinkCharFmtsSet, "Aufruf von SetLinkCharFmts unnoetig" ); SvxCSS1MapEntry *pStyleEntry = - GetTag( String::CreateFromAscii(OOO_STRING_SVTOOLS_HTML_anchor) ); + GetTag( rtl::OUString(OOO_STRING_SVTOOLS_HTML_anchor) ); SwCharFmt *pUnvisited = 0, *pVisited = 0; if( pStyleEntry ) { @@ -250,7 +250,7 @@ void SwCSS1Parser::SetLinkCharFmts() bBodyVLinkSet |= bColorSet; } - String sTmp( String::CreateFromAscii(OOO_STRING_SVTOOLS_HTML_anchor) ); + String sTmp( rtl::OUString(OOO_STRING_SVTOOLS_HTML_anchor) ); sTmp.Append( ':' ); sTmp.AppendAscii( sCSS1_link ); pStyleEntry = GetTag( sTmp ); @@ -1204,7 +1204,7 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const String& rClass ) c } else { - String sCName( String::CreateFromAscii(sName) ); + String sCName( rtl::OUString::createFromAscii(sName) ); pCFmt = pDoc->FindCharFmtByName( sCName ); if( !pCFmt ) { @@ -1886,7 +1886,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn ) } - pPageEntry = GetPage( String::CreateFromAscii(sCSS1_first), sal_True ); + pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_first), sal_True ); if( pPageEntry ) { SetPageDescAttrs( GetFirstPageDesc(sal_True), pPageEntry->GetItemSet(), @@ -1894,7 +1894,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn ) bSetFirstPageDesc = sal_True; } - pPageEntry = GetPage( String::CreateFromAscii(sCSS1_right), sal_True ); + pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_right), sal_True ); if( pPageEntry ) { SetPageDescAttrs( GetRightPageDesc(sal_True), pPageEntry->GetItemSet(), @@ -1902,7 +1902,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn ) bSetRightPageDesc = sal_True; } - pPageEntry = GetPage( String::CreateFromAscii(sCSS1_left), sal_True ); + pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_left), sal_True ); if( pPageEntry ) SetPageDescAttrs( GetLeftPageDesc(sal_True), pPageEntry->GetItemSet(), pPageEntry->GetPropertyInfo() ); diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 9aabb328e8bd..2a9bc9425889 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -1232,7 +1232,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt, if( rHTMLWrt.GetOrigFileName() ) rGrfName = *rHTMLWrt.GetOrigFileName(); sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, rGrfName, - String::CreateFromAscii("JPG"), + rtl::OUString("JPG"), (XOUTBMP_USE_GIF_IF_SENSIBLE | XOUTBMP_USE_NATIVE_IF_POSSIBLE)); if( !nErr ) @@ -1569,7 +1569,7 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt, aGrfNm = *rHTMLWrt.GetOrigFileName(); if( aGrf.GetType() == GRAPHIC_NONE || XOutBitmap::WriteGraphic( aGrf, aGrfNm, - String::CreateFromAscii( "JPG" ), + rtl::OUString("JPG"), (XOUTBMP_USE_GIF_IF_POSSIBLE| XOUTBMP_USE_NATIVE_IF_POSSIBLE) ) != 0 ) { @@ -1628,7 +1628,7 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt, MapMode( MAP_TWIP ), MapMode( MAP_100TH_MM )); sal_uInt16 nErr = XOutBitmap::WriteGraphic( pGrfNd->GetGrf(), aGrfNm, - String::CreateFromAscii("JPG"), nFlags, &aMM100Size ); + rtl::OUString("JPG"), nFlags, &aMM100Size ); if( nErr ) // fehlerhaft, da ist nichts auszugeben { rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE; diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 9b85c922c146..b3a8af03aaf6 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -504,7 +504,7 @@ sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo, const sal_Char *pStr = SwHTMLWriter::GetNumFormat( eFmt ); if( pStr ) { - pParts[0] = String::CreateFromAscii( pStr ); + pParts[0] = rtl::OUString::createFromAscii( pStr ); nParts = 1; } } @@ -537,12 +537,12 @@ void lcl_html_outFootEndNoteInfo( Writer& rWrt, String *pParts, { xub_StrLen nPos = 0; String aTmp( pParts[i] ); - String aRep( String::CreateFromAscii("\\\\") ); + rtl::OUString aRep("\\\\"); while( STRING_NOTFOUND != (nPos = aTmp.SearchAndReplaceAscii( "\\", aRep, nPos ) ) ) nPos += 2; nPos = 0; - aRep.AssignAscii( "\\;" ); + aRep = rtl::OUString("\\;"); while( STRING_NOTFOUND != (nPos = aTmp.SearchAndReplaceAscii( ";", aRep, nPos ) ) ) nPos += 2; diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 31f00de2d0c3..2d8f4c814c90 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -1275,7 +1275,7 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt, aGrfNm = *pTempFileName; sal_uInt16 nErr = XOutBitmap::WriteGraphic( aGrf, aGrfNm, - String::CreateFromAscii("JPG"), + rtl::OUString("JPG"), (XOUTBMP_USE_GIF_IF_POSSIBLE | XOUTBMP_USE_NATIVE_IF_POSSIBLE) ); if( nErr ) // fehlerhaft, da ist nichts auszugeben diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 2966c2224f0c..fcdf0970c0af 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -1141,7 +1141,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, if(pTempFileName) rEmbGrfNm = *pTempFileName; sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, rEmbGrfNm, - String::CreateFromAscii( "JPG" ), + rtl::OUString("JPG"), XOUTBMP_USE_NATIVE_IF_POSSIBLE ); if( !nErr ) // fehlerhaft, da ist nichts auszugeben { diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index cdd6e638f7a9..81a7dd2a98c5 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -1180,17 +1180,17 @@ void SwRTFParser::ReadShpTxt(String& s) break; case '{': level++; - s.Append(String::CreateFromAscii("{")); + s.Append(rtl::OUString("{")); break; case '}': level--; - s.Append(String::CreateFromAscii("}")); + s.Append(rtl::OUString("}")); break; default: s.Append(aToken); if (bTokenHasValue) s.Append(rtl::OUString::valueOf(static_cast<sal_Int64>(nTokenValue))); - s.Append(String::CreateFromAscii(" ")); + s.Append(rtl::OUString(" ")); break; } } @@ -1488,7 +1488,7 @@ void SwRTFParser::ReadShapeObject() RTL_TEXTENCODING_ASCII_US)); SvMemoryStream aStream(const_cast<sal_Char*>(bs.getStr()), bs.getLength(), STREAM_READ); - rOutliner.Read(aStream, String::CreateFromAscii(""), EE_FORMAT_RTF); + rOutliner.Read(aStream, rtl::OUString(), EE_FORMAT_RTF); OutlinerParaObject* pParaObject=rOutliner.CreateParaObject(); pStroke->NbcSetOutlinerParaObject(pParaObject); rOutliner.Clear(); diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 287020c7ed30..b4d2e3fdc2a8 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -1088,7 +1088,7 @@ SwFltShell& SwFltShell::AddError( const sal_Char* pErr ) pFT = GetDoc().InsertFldType(aS); } SwSetExpField aFld( (SwSetExpFieldType*)pFT, - String::CreateFromAscii( pErr )); + rtl::OUString::createFromAscii( pErr )); //, VVF_INVISIBLE GetDoc().InsertPoolItem(*pPaM, SwFmtFld(aFld), 0); return *this; diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 42b003705411..8e95869b7ebc 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -766,7 +766,7 @@ void DocxAttributeOutput::CmdField_Impl( FieldInfos& rInfos ) // Replace tabs by </instrText><tab/><instrText> if ( i < ( nNbToken - 1 ) ) - RunText( String::CreateFromAscii( "\t" ) ); + RunText( rtl::OUString( "\t" ) ); } m_pSerializer->endElementNS( XML_w, XML_r ); diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index bf1b1931952b..0a946b8dba3b 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -119,17 +119,17 @@ static String lcl_getFieldCode( const IFieldmark* pFieldmark ) { if ( !pFieldmark) { return String(); } else if ( pFieldmark->GetFieldname( ) == ODF_FORMTEXT ) { - return String::CreateFromAscii(" FORMTEXT "); + return rtl::OUString(" FORMTEXT "); } else if ( pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN ) { - return String::CreateFromAscii(" FORMDROPDOWN "); + return rtl::OUString(" FORMDROPDOWN "); } else if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX ) { - return String::CreateFromAscii(" FORMCHECKBOX "); + return rtl::OUString(" FORMCHECKBOX "); } else if ( pFieldmark->GetFieldname( ) == ODF_TOC ) { - return String::CreateFromAscii(" TOC "); + return rtl::OUString(" TOC "); } else if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK ) { - return String::CreateFromAscii(" HYPERLINK "); + return rtl::OUString(" HYPERLINK "); } else if ( pFieldmark->GetFieldname( ) == ODF_PAGEREF ) { - return String::CreateFromAscii(" PAGEREF "); + return rtl::OUString(" PAGEREF "); } else { return pFieldmark->GetFieldname(); } diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 9c662da10bb9..80ec3bcc8707 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3176,7 +3176,7 @@ void WW8Export::PrepareStorage() SvGlobalName aGName( nId1, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 ); - GetWriter().GetStorage().SetClass( aGName, 0, String::CreateFromAscii( pName )); + GetWriter().GetStorage().SetClass( aGName, 0, rtl::OUString::createFromAscii( pName )); SvStorageStreamRef xStor( GetWriter().GetStorage().OpenSotStream(sCompObj) ); xStor->Write( pData, nLen ); diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index e45e0e6989c4..bdaded82da3a 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -52,7 +52,7 @@ WW8Glossary::WW8Glossary(SvStorageStreamRef &refStrm, sal_uInt8 nVersion, if (aWwFib.nFibBack >= 0x6A) //Word97 { - xTableStream = pStg->OpenSotStream(String::CreateFromAscii( + xTableStream = pStg->OpenSotStream(rtl::OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError()) diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 2f3c47fcf8b5..e4e0f7d25d95 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -967,7 +967,7 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(String &rString, WW8_CP nS rString = comphelper::string::remove(rString, 0x1); rString = comphelper::string::remove(rString, 0x5); rString = comphelper::string::remove(rString, 0x8); - rString.SearchAndReplaceAllAscii("\007\007", String::CreateFromAscii("\007\012")); + rString.SearchAndReplaceAllAscii("\007\007", rtl::OUString("\007\012")); rString.SearchAndReplaceAll(0x7, ' '); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 536b1bbcc622..e4f747b076c4 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4331,10 +4331,10 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedF aBasicImporter.import( mpDocShell->GetMedium()->GetInputStream() ); lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aBasicImporter.getProjectName() ); // Read toolbars & menus - SvStorageStreamRef refMainStream = rRoot->OpenSotStream( String::CreateFromAscii( "WordDocument" )); + SvStorageStreamRef refMainStream = rRoot->OpenSotStream( rtl::OUString( "WordDocument" )); refMainStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); WW8Fib aWwFib( *refMainStream, 8 ); - SvStorageStreamRef xTableStream = rRoot->OpenSotStream(String::CreateFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); + SvStorageStreamRef xTableStream = rRoot->OpenSotStream(rtl::OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError()) { @@ -4767,7 +4767,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream, break; } - rTableStream = pStg->OpenSotStream( String::CreateFromAscii( + rTableStream = pStg->OpenSotStream( rtl::OUString::createFromAscii( pWwFib->fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); @@ -5463,7 +5463,7 @@ sal_uLong WW8Reader::OpenMainStream( SvStorageStreamRef& rRef, sal_uInt16& rBuff { sal_uLong nRet = ERR_SWG_READ_ERROR; OSL_ENSURE( pStg, "wo ist mein Storage?" ); - rRef = pStg->OpenSotStream( String::CreateFromAscii( "WordDocument" ), STREAM_READ | STREAM_SHARE_DENYALL); + rRef = pStg->OpenSotStream( rtl::OUString("WordDocument"), STREAM_READ | STREAM_SHARE_DENYALL); if( rRef.Is() ) { diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 0efa29160747..0049b7bc1521 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -207,7 +207,7 @@ SwView* lcl_LoadDoc(SwView* pView, const String& rURL) if(rURL.Len()) { SfxStringItem aURL(SID_FILE_NAME, rURL); - SfxStringItem aTargetFrameName( SID_TARGETNAME, String::CreateFromAscii("_blank") ); + SfxStringItem aTargetFrameName( SID_TARGETNAME, rtl::OUString("_blank") ); SfxBoolItem aHidden( SID_HIDDEN, sal_True ); SfxStringItem aReferer(SID_REFERER, pView->GetDocShell()->GetTitle()); SfxObjectItem* pItem = (SfxObjectItem*)pView->GetViewFrame()->GetDispatcher()-> diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 4159f1835bda..66819aaa1ed5 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -156,7 +156,7 @@ const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rItem, String sDBName; if( (!rItem.bSynchron || !(nCol|nRow)) && (sDBName = InsertLabEnvText( rSh, rFldMgr, rItem.aWriting )).Len() && !bLast ) { - sDBName.SetToken( 3, DB_DELIM, String::CreateFromAscii("True")); + sDBName.SetToken( 3, DB_DELIM, rtl::OUString("True")); SwInsertFld_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyStr, 0, &rSh ); rFldMgr.InsertFld( aData ); } @@ -367,7 +367,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) pSh->SetMark(); // set only the mark SwSectionData aSect(CONTENT_SECTION, - String::CreateFromAscii(MASTER_LABEL)); + rtl::OUString(MASTER_LABEL)); pSh->InsertSection(aSect); } } @@ -377,7 +377,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) pSh->GetUniqueSectionName()); String sLinkName(sfx2::cTokenSeperator); sLinkName += sfx2::cTokenSeperator; - sLinkName += String::CreateFromAscii(MASTER_LABEL); + sLinkName += rtl::OUString(MASTER_LABEL); aSect.SetLinkFileName(sLinkName); aSect.SetProtectFlag(true); pSh->Insert(aDotStr); // Dummytext to allocate the Section diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 909741733987..9d51d7e6edaa 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -212,7 +212,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, pRead->SetTemplateName( pFlt->GetDefaultTemplate() ); if( pRead == ReadAscii && 0 != rMedium.GetInStream() && - pFlt->GetUserData().EqualsAscii( FILTER_TEXT_DLG ) ) + pFlt->GetUserData() == FILTER_TEXT_DLG ) { SwAsciiOptions aOpt; const SfxItemSet* pSet; @@ -411,10 +411,10 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) // Task 75666 - is the Document imported by our Microsoft-Filters? const SfxFilter* pOldFilter = GetMedium()->GetFilter(); if( pOldFilter && - ( pOldFilter->GetUserData().EqualsAscii( FILTER_WW8 ) || - pOldFilter->GetUserData().EqualsAscii( "CWW6" ) || - pOldFilter->GetUserData().EqualsAscii( "WW6" ) || - pOldFilter->GetUserData().EqualsAscii( "WW1" ) )) + ( pOldFilter->GetUserData() == FILTER_WW8 || + pOldFilter->GetUserData() == "CWW6" || + pOldFilter->GetUserData() == "WW6" || + pOldFilter->GetUserData() == "WW1" ) ) { // when saving it in our own fileformat, then remove the template // name from the docinfo. @@ -558,7 +558,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) if( pDoc->ContainsMSVBasic() ) { - sal_Bool bSave = pFlt->GetUserData().EqualsAscii( "CWW8" ) + sal_Bool bSave = pFlt->GetUserData() == "CWW8" && SvtFilterOptions::Get().IsLoadWordBasicStorage(); if ( bSave ) @@ -567,7 +567,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) OSL_ENSURE( !xStg->GetError(), "No storage available for storing VBA macros!" ); if ( !xStg->GetError() ) { - nVBWarning = SaveOrDelMSVBAStorage( (SfxObjectShell&) *this, *xStg, bSave, String::CreateFromAscii("Macros") ); + nVBWarning = SaveOrDelMSVBAStorage( (SfxObjectShell&) *this, *xStg, bSave, rtl::OUString("Macros") ); xStg->Commit(); pDoc->SetContainsMSVBasic( sal_True ); } @@ -578,7 +578,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) if( pWrtShell ) pWrtShell->EndAllTblBoxEdit(); - if( pFlt->GetUserData().EqualsAscii( "HTML") ) + if( pFlt->GetUserData() == "HTML" ) { #ifndef DISABLE_SCRIPTING SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); @@ -621,10 +621,9 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) } if( xWriter->IsStgWriter() && - ( /*xWriter->IsSw3Writer() ||*/ - pFlt->GetUserData().EqualsAscii( FILTER_XML ) || - pFlt->GetUserData().EqualsAscii( FILTER_XMLV ) || - pFlt->GetUserData().EqualsAscii( FILTER_XMLVW ) ) ) + ( pFlt->GetUserData() == FILTER_XML || + pFlt->GetUserData() == FILTER_XMLV || + pFlt->GetUserData() == FILTER_XMLVW ) ) { // determine the own Type sal_uInt8 nMyType = 0; @@ -689,7 +688,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) return bRet; } - if( pFlt->GetUserData().EqualsAscii( FILTER_TEXT_DLG ) && + if( pFlt->GetUserData() == FILTER_TEXT_DLG && ( pWrtShell || !::lcl_GetSourceView( this ) )) { SwAsciiOptions aOpt; diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index cb1e6f9a81fd..9f64bfae107e 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -798,7 +798,7 @@ void SwDocShell::Execute(SfxRequest& rReq) xFP->setDisplayDirectory( aPathOpt.GetWorkPath() ); SfxObjectFactory &rFact = GetFactory(); - SfxFilterMatcher aMatcher( String::CreateFromAscii(rFact.GetShortName()) ); + SfxFilterMatcher aMatcher( rtl::OUString::createFromAscii(rFact.GetShortName()) ); SfxFilterMatcherIter aIter( aMatcher ); uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY); const SfxFilter* pFlt = aIter.First(); @@ -807,8 +807,8 @@ void SwDocShell::Execute(SfxRequest& rReq) // --> OD #i117339# // if( pFlt && pFlt->IsAllowedAsTemplate() ) if( pFlt && pFlt->IsAllowedAsTemplate() && - ( pFlt->GetUserData().EqualsAscii("CXML") || - pFlt->GetUserData().EqualsAscii("CXMLV") ) ) + ( pFlt->GetUserData() == "CXML" || + pFlt->GetUserData() == "CXMLV" ) ) { const String sWild = pFlt->GetWildcard().getGlob(); xFltMgr->appendFilter( pFlt->GetUIName(), sWild ); @@ -818,7 +818,7 @@ void SwDocShell::Execute(SfxRequest& rReq) sal_Bool bWeb = 0 != dynamic_cast< SwWebDocShell *>( this ); const SfxFilter *pOwnFlt = SwDocShell::Factory().GetFilterContainer()-> - GetFilter4FilterName(String::CreateFromAscii("writer8")); + GetFilter4FilterName(rtl::OUString("writer8")); // make sure the default file format is also available if(bWeb) @@ -886,7 +886,7 @@ void SwDocShell::Execute(SfxRequest& rReq) // 3 - file saved in non-HTML -> QueryBox to save as HTML const SfxFilter* pHtmlFlt = SwIoSystem::GetFilterOfFormat( - String::CreateFromAscii("HTML"), + rtl::OUString("HTML"), SwWebDocShell::Factory().GetFilterContainer() ); sal_Bool bLocalHasName = HasName(); if(bLocalHasName) @@ -1225,7 +1225,7 @@ void SwDocShell::Execute(SfxRequest& rReq) { // for HTML there is only one filter!! pFlt = SwIoSystem::GetFilterOfFormat( - String::CreateFromAscii("HTML"), + rtl::OUString("HTML"), SwWebDocShell::Factory().GetFilterContainer() ); nStrId = STR_LOAD_HTML_DOC; } @@ -1233,7 +1233,7 @@ void SwDocShell::Execute(SfxRequest& rReq) { // for Global-documents we now only offer the current one. pFlt = SwGlobalDocShell::Factory().GetFilterContainer()-> - GetFilter4Extension( String::CreateFromAscii("odm") ); + GetFilter4Extension( rtl::OUString("odm") ); nStrId = STR_LOAD_GLOBAL_DOC; } @@ -1709,7 +1709,7 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL, String sURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); // Set filter: - String sFactory(String::CreateFromAscii(SwDocShell::Factory().GetShortName())); + String sFactory(rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName())); SfxFilterMatcher aMatcher( sFactory ); // search for filter in WebDocShell, too @@ -1718,7 +1718,7 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL, aMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False ); if(!pFlt) { - String sWebFactory(String::CreateFromAscii(SwWebDocShell::Factory().GetShortName())); + String sWebFactory(rtl::OUString::createFromAscii(SwWebDocShell::Factory().GetShortName())); SfxFilterMatcher aWebMatcher( sWebFactory ); aWebMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False ); } diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 1c46d35cd42e..344f684f3fde 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -586,7 +586,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) ::comphelper::getProcessServiceFactory(), SvtSysLocale().GetLocaleData().getLocale()); - String sPlus(String::CreateFromAscii(" + ")); + rtl::OUString sPlus(" + "); if ( SFX_STYLE_FAMILY_PAGE == nFamily ) { if( !pSet ) @@ -1875,13 +1875,11 @@ sal_Bool SwDocStyleSheet::IsUsed() const sal_uLong SwDocStyleSheet::GetHelpId( String& rFile ) { -static String sTemplateHelpFile = String::CreateFromAscii("swrhlppi.hlp"); - sal_uInt16 nId = 0; sal_uInt16 nPoolId = 0; unsigned char nFileId = UCHAR_MAX; - rFile = sTemplateHelpFile; + rFile = rtl::OUString("swrhlppi.hlp"); const SwFmt* pTmpFmt = 0; switch( nFamily ) diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx index 8afea9eaaec2..c65b4ba58802 100644 --- a/sw/source/ui/app/swdll.cxx +++ b/sw/source/ui/app/swdll.cxx @@ -104,12 +104,12 @@ SwDLL::SwDLL() SwModule* pModule = new SwModule( pWDocFact, pDocFact, pGlobDocFact ); *ppShlPtr = pModule; - pWDocFact->SetDocumentServiceName(C2S("com.sun.star.text.WebDocument")); + pWDocFact->SetDocumentServiceName(rtl::OUString("com.sun.star.text.WebDocument")); if ( aOpt.IsWriter() ) { - pGlobDocFact->SetDocumentServiceName(C2S("com.sun.star.text.GlobalDocument")); - pDocFact->SetDocumentServiceName(C2S("com.sun.star.text.TextDocument")); + pGlobDocFact->SetDocumentServiceName(rtl::OUString("com.sun.star.text.GlobalDocument")); + pDocFact->SetDocumentServiceName(rtl::OUString("com.sun.star.text.TextDocument")); } // register SvDraw-Fields diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index 46f5d63edfcb..d487902c9a09 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -182,7 +182,7 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, pDragDrop( 0 ), pXSelection( 0 ) { - SetName( String::CreateFromAscii("StarWriter") ); + SetName( rtl::OUString("StarWriter") ); pSwResMgr = GetResMgr(); SvxErrorHandler::ensure(); pErrorHdl = new SfxErrorHandler( RID_SW_ERRHDL, diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx index 9c300c5ceb86..4de3bca3d465 100644 --- a/sw/source/ui/cctrl/actctrl.cxx +++ b/sw/source/ui/cctrl/actctrl.cxx @@ -60,7 +60,7 @@ long NumEditAction::Notify( NotifyEvent& rNEvt ) NoSpaceEdit::NoSpaceEdit( Window* pParent, const ResId& rResId) : Edit(pParent, rResId), - sForbiddenChars(String::CreateFromAscii(" ")) + sForbiddenChars(rtl::OUString(" ")) { } diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx index 12eb296b12bb..eb76a7efe7cb 100644 --- a/sw/source/ui/config/caption.cxx +++ b/sw/source/ui/config/caption.cxx @@ -39,7 +39,7 @@ InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleI sNumberSeparator(RTL_CONSTASCII_USTRINGPARAM((". "))), nPos(1), nLevel(0), - sSeparator( String::CreateFromAscii( ": " ) ), + sSeparator( rtl::OUString(": ") ), bIgnoreSeqOpts(sal_False), bCopyAttributes(sal_False) { diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 59559c6025b8..c0dd013303c4 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -185,21 +185,18 @@ SwCompatibilityOptPage::~SwCompatibilityOptPage() void SwCompatibilityOptPage::ReplaceFormatName( String& rEntry ) { - static const String sOpenOfficeName = String::CreateFromAscii("OpenOffice.org"); - static const String sAsianName = String::CreateFromAscii("StarSuite"); - - String sFormatName( utl::ConfigManager::getProductName() ); - String sFormatVersion; - bool bOpenOffice = ( sOpenOfficeName == sFormatName ); + rtl::OUString sFormatName(utl::ConfigManager::getProductName()); + rtl::OUString sFormatVersion; + bool bOpenOffice = ( sFormatName == "OpenOffice.org" ); if ( bOpenOffice ) - sFormatVersion = String::CreateFromAscii("1.1"); + sFormatVersion = rtl::OUString("1.1"); else - sFormatVersion = String::CreateFromAscii("6.0/7"); - if ( !bOpenOffice && ( sAsianName != sFormatName ) ) - sFormatName = String::CreateFromAscii("StarOffice"); + sFormatVersion = rtl::OUString("6.0/7"); + if ( !bOpenOffice && ( sFormatName != "StarSuite" ) ) + sFormatName = rtl::OUString("StarOffice"); - rEntry.SearchAndReplace( String::CreateFromAscii("%FORMATNAME"), sFormatName ); - rEntry.SearchAndReplace( String::CreateFromAscii("%FORMATVERSION"), sFormatVersion ); + rEntry.SearchAndReplace( rtl::OUString("%FORMATNAME"), sFormatName ); + rEntry.SearchAndReplace( rtl::OUString("%FORMATVERSION"), sFormatVersion ); } sal_uLong convertBools2Ulong_Impl @@ -281,7 +278,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) m_aDefaultPB.Disable(); } String sText = m_aMainFL.GetText(); - sText.SearchAndReplace( String::CreateFromAscii("%DOCNAME"), sDocTitle ); + sText.SearchAndReplace( rtl::OUString("%DOCNAME"), sDocTitle ); m_aMainFL.SetText( sText ); // loading file formats diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index db1991f4a628..6c89e9f29f5b 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -460,7 +460,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) aLbLevel.InsertEntry(String::CreateFromInt32(i + 1)); sal_Unicode nLvl = MAXLEVEL; - String sDelim( String::CreateFromAscii( ": " ) ); + rtl::OUString sDelim(": "); if (pSh) { diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index ee54b9a8b464..961b89f81fbb 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -2476,17 +2476,17 @@ SwTestTabPage::SwTestTabPage( Window* pParent, lcl_SetPosSize(aTest9CBox , Point(116, 53), Size(74 , 10)); lcl_SetPosSize(aTest10CBox , Point(116, 66), Size(74 , 10)); - aTestFL.SetText(rtl::OUString::createFromAscii("Settings only for testpurposes")); - aTest1CBox .SetText( C2S("unused")); - aTest2CBox .SetText( C2S("dynamic")); - aTest3CBox .SetText( C2S("No calm" )); - aTest4CBox .SetText( C2S("WYSIWYG debug" )); - aTest5CBox .SetText( C2S("No idle format" )); - aTest6CBox .SetText( C2S("No screen adj" )); - aTest7CBox .SetText( C2S("win format" )); - aTest8CBox .SetText( C2S("No Scroll" )); - aTest9CBox .SetText( C2S("DrawingLayerNotLoading")); - aTest10CBox.SetText( C2S("AutoFormat by Input" )); + aTestFL.SetText(rtl::OUString("Settings only for testpurposes")); + aTest1CBox.SetText(rtl::OUString("unused")); + aTest2CBox.SetText(rtl::OUString("dynamic")); + aTest3CBox.SetText(rtl::OUString("No calm")); + aTest4CBox.SetText(rtl::OUString("WYSIWYG debug")); + aTest5CBox.SetText(rtl::OUString("No idle format")); + aTest6CBox.SetText(rtl::OUString("No screen adj")); + aTest7CBox.SetText(rtl::OUString("win format")); + aTest8CBox.SetText(rtl::OUString("No Scroll")); + aTest9CBox.SetText(rtl::OUString("DrawingLayerNotLoading")); + aTest10CBox.SetText(rtl::OUString("AutoFormat by Input")); aTestFL.Show(); aTest1CBox .Show(); aTest2CBox .Show(); diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index f2118661b21b..763327e362ce 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -170,7 +170,7 @@ int SwBaseNumRules::Load(SvStream &rStream) } SwChapterNumRules::SwChapterNumRules() : - SwBaseNumRules(C2S(CHAPTER_FILENAME)) + SwBaseNumRules(rtl::OUString(CHAPTER_FILENAME)) { } diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index b44179f0d4f8..18ab294d7526 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -137,7 +137,7 @@ void SwViewOption::DrawRectPrinter( OutputDevice *pOut, sal_uInt16 SwViewOption::GetPostItsWidth( const OutputDevice *pOut ) const { OSL_ENSURE( pOut, "no Outdev" ); - return sal_uInt16(pOut->GetTextWidth( String::CreateFromAscii(aPostItStr ))); + return sal_uInt16(pOut->GetTextWidth( rtl::OUString(aPostItStr ))); } void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bool bIsScript ) const diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 0a27f292726a..0647b8d30936 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -421,7 +421,7 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) uno::Reference<sdb::XDocumentDataSource> xDS(xNewInstance, UNO_QUERY_THROW); uno::Reference<frame::XStorable> xStore(xDS->getDatabaseDocument(), UNO_QUERY_THROW); - String sExt = String::CreateFromAscii(".odb"); + String sExt = rtl::OUString(".odb"); String sTmpName; { String sHomePath(SvtPathOptions().GetWorkPath()); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index f3359a9aa629..30ff5e122748 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -568,7 +568,7 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl) uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker(); String sPath( SvtPathOptions().SubstituteVariable( - String::CreateFromAscii("$(userurl)/database") )); + rtl::OUString("$(userurl)/database") )); aDlgHelper.SetDisplayDirectory( sPath ); uno::Reference< XFilterManager > xFltMgr(xFP, uno::UNO_QUERY); ::rtl::OUString sCSV(C2U("*.csv")); @@ -579,7 +579,7 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl) { m_sURL = xFP->getFiles().getConstArray()[0]; INetURLObject aResult( m_sURL ); - aResult.setExtension(String::CreateFromAscii("csv")); + aResult.setExtension(rtl::OUString("csv")); m_sURL = aResult.GetMainURL(INetURLObject::NO_DECODE); } } diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 8d2cf8746f70..130dc792a107 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -294,7 +294,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, Any aCol = xCols->getByName(pColNames[n]); Reference <XPropertySet> xCol; aCol >>= xCol; - Any aType = xCol->getPropertyValue(C2S("Type")); + Any aType = xCol->getPropertyValue(rtl::OUString("Type")); sal_Int32 eDataType = 0; aType >>= eDataType; switch(eDataType) @@ -832,7 +832,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox ) if( bEnableFmt ) { - (( sTxt += C2S(" (" )) += String(aSrch.sColumn) ) += (sal_Unicode)')'; + (( sTxt += rtl::OUString(" (" )) += String(aSrch.sColumn) ) += (sal_Unicode)')'; } sal_Bool bIsDBFmt = aDBColumns[ nFndPos ]->bIsDBFmt; @@ -1260,7 +1260,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, aDBFormatData.aLocale = SvxCreateLocale( rSh.GetCurLang() ); SwDBNextSetField aNxtDBFld( (SwDBNextSetFieldType*)rSh. GetFldType( 0, RES_DBNEXTSETFLD ), - C2S("1"), aEmptyStr, aDBData ); + rtl::OUString("1"), aEmptyStr, aDBData ); sal_Bool bSetCrsr = sal_True; @@ -1639,7 +1639,7 @@ void SwInsertDBColAutoPilot::Commit() SetSetProperties(rtl::OUString(), aValues); sNewNode += C2U("/ColumnSet"); - String sDelim( String::CreateFromAscii( "/__" )); + rtl::OUString sDelim("/__"); LanguageType ePrevLang = (LanguageType)-1; rtl::OUString sPrevLang; diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 6b0a789404c7..27fc513a297b 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -893,8 +893,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, // if a save_to filter is set then use it - otherwise use the default if( bEMail && !rMergeDescriptor.bSendAsAttachment ) { - String sExtension( String::CreateFromAscii( - rMergeDescriptor.bSendAsHTML ? "html" : "txt" )); + rtl::OUString sExtension = rMergeDescriptor.bSendAsHTML ? rtl::OUString("html") : rtl::OUString("txt"); pStoreToFilter = pFilterContainer->GetFilter4Extension(sExtension, SFX_FILTER_EXPORT); } else if( rMergeDescriptor.sSaveToFilter.Len()) @@ -1564,7 +1563,7 @@ sal_Int32 SwNewDBMgr::GetColumnType( const String& rDBName, Any aCol = xCols->getByName(rColNm); uno::Reference<XPropertySet> xCol; aCol >>= xCol; - Any aType = xCol->getPropertyValue(C2S("Type")); + Any aType = xCol->getPropertyValue(rtl::OUString("Type")); aType >>= nRet; } if(bDispose) @@ -2364,7 +2363,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource() Reference<XDocumentDataSource> xDS(xNewInstance, UNO_QUERY_THROW); Reference<XStorable> xStore(xDS->getDatabaseDocument(), UNO_QUERY_THROW); - String sOutputExt = String::CreateFromAscii(".odb"); + String sOutputExt = rtl::OUString(".odb"); String sTmpName; { utl::TempFile aTempFile(sNewName , &sOutputExt, &sHomePath); @@ -2446,7 +2445,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, //copy rSh to aTempFile ::rtl::OUString sTempURL; const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat( - String::CreateFromAscii( FILTER_XML ), + rtl::OUString(FILTER_XML), SwDocShell::Factory().GetFilterContainer() ); try { diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx index 16952455bd50..47b86ce92b35 100644 --- a/sw/source/ui/dbui/dbui.cxx +++ b/sw/source/ui/dbui/dbui.cxx @@ -100,15 +100,15 @@ CreateMonitor::CreateMonitor( Window *pParent ) m_aCounting (this, SW_RES( FT_COUNTING )), m_aCancelButton (this, SW_RES( PB_CANCELPRNMON )), m_sCountingPattern(), - m_sVariable_Total( String::CreateFromAscii("%Y") ), - m_sVariable_Position( String::CreateFromAscii("%X") ), + m_sVariable_Total( rtl::OUString("%Y") ), + m_sVariable_Position( rtl::OUString("%X") ), m_nTotalCount(0), m_nCurrentPosition(0) { FreeResource(); m_sCountingPattern = m_aCounting.GetText(); - m_aCounting.SetText(String::CreateFromAscii("...")); + m_aCounting.SetText(rtl::OUString("...")); } void CreateMonitor::UpdateCountingText() diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 227d79694390..9f756c267c69 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -64,7 +64,7 @@ namespace SwMailMergeHelper String CallSaveAsDialog(String& rFilter) { ErrCode nRet; - String sFactory(String::CreateFromAscii(SwDocShell::Factory().GetShortName())); + String sFactory(rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName())); ::sfx2::FileDialogHelper aDialog( ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, 0, sFactory ); diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index d9734eefb0fc..5fc7ba5ff11b 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -580,7 +580,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( m_rConfigItem(rConfig), m_eType(eType) { - m_aFieldCB.SetForbiddenChars( String::CreateFromAscii("<>")); + m_aFieldCB.SetForbiddenChars( rtl::OUString("<>")); m_aDragED.SetStyle(m_aDragED.GetStyle() |WB_NOHIDESELECTION); if( eType >= GREETING_FEMALE ) { @@ -600,7 +600,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( ResStringArray aPunctArr(SW_RES(RA_PUNCTUATION)); for(i = 0; i < aPunctArr.Count(); ++i) m_aPunctuations.push_back(aPunctArr.GetString(i)); - m_aDragED.SetText(String::CreateFromAscii(" ")); + m_aDragED.SetText(rtl::OUString(" ")); SetText( String( SW_RES( eType == GREETING_MALE ? ST_TITLE_MALE : ST_TITLE_FEMALE))); m_aAddressElementsFT.SetText(String(SW_RES(ST_SALUTATIONELEMENTS))); m_aInsertFieldIB.SetQuickHelpText(String(SW_RES(ST_INSERTSALUTATIONFIELD))); @@ -620,7 +620,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( aPreviewSize.Height() += nDiff; m_aPreviewWIN.SetSizePixel(aPreviewSize); m_aPreviewWIN.SetPosPixel(m_aFieldCB.GetPosPixel()); - m_aDragED.SetText(String::CreateFromAscii("\n\n\n\n\n")); + m_aDragED.SetText(rtl::OUString("\n\n\n\n\n")); } FreeResource(); const ResStringArray& rHeaders = m_rConfigItem.GetDefaultAddressHeaders(); @@ -1041,7 +1041,7 @@ SwAssignFieldsControl::SwAssignFieldsControl( { const XubString& rHeader = rHeaders.GetString( i ); FixedInfo* pNewText = new FixedInfo(&m_aWindow, ResId( FT_FIELDS, *rResId.GetResMgr())); - String sLabel(String::CreateFromAscii("<>")); + String sLabel(rtl::OUString("<>")); sLabel.Insert(rHeader, 1); pNewText->SetText(sLabel); ListBox* pNewLB = new ListBox(&m_aWindow, ResId(LB_FIELDS, *rResId.GetResMgr())); @@ -1474,7 +1474,7 @@ void AddressMultiLineEdit::SetText( const String& rStr ) if(nLastLen) { TextPaM aPaM(nParaCount ? nParaCount - 1 : 0, nLastLen); - pTextEngine->ReplaceText( TextSelection( aPaM ), String::CreateFromAscii("\n \n ")); + pTextEngine->ReplaceText( TextSelection( aPaM ), rtl::OUString("\n \n ")); } } } diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index af6473ab9428..c74912e5cd21 100644 --- a/sw/source/ui/dbui/mmconfigitem.cxx +++ b/sw/source/ui/dbui/mmconfigitem.cxx @@ -403,7 +403,7 @@ void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders ) { //convert the strings used for UI to numbers used for the configuration String sBlock(rBlock); - sBlock.SearchAndReplaceAllAscii("\n", String::CreateFromAscii("\\n")); + sBlock.SearchAndReplaceAllAscii("\n", rtl::OUString("\\n")); for(sal_uInt16 i = 0; i < rHeaders.Count(); ++i) { String sHeader = rHeaders.GetString( i ); diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 229ef6866790..8442329166b3 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -148,7 +148,7 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton) xFP->setDisplayDirectory( SvtPathOptions().GetWorkPath() ); SfxObjectFactory &rFact = m_pWizard->GetSwView()->GetDocShell()->GetFactory(); - SfxFilterMatcher aMatcher( String::CreateFromAscii(rFact.GetShortName()) ); + SfxFilterMatcher aMatcher( rtl::OUString::createFromAscii(rFact.GetShortName()) ); SfxFilterMatcherIter aIter( aMatcher ); Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY); const SfxFilter* pFlt = aIter.First(); diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 2e3403e7afbb..94a29dd6a82d 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -120,7 +120,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat( - String::CreateFromAscii( FILTER_XML ), + rtl::OUString( FILTER_XML ), SwDocShell::Factory().GetFilterContainer() ); //save the current document into a temporary file { @@ -151,9 +151,9 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : m_aLeftMF.SetValue(m_aLeftMF.Normalize(DEFAULT_LEFT_DISTANCE), FUNIT_TWIP); m_aTopMF.SetValue(m_aTopMF.Normalize(DEFAULT_TOP_DISTANCE), FUNIT_TWIP); - m_aZoomLB.InsertEntry(String::CreateFromAscii("50 %"), 1); - m_aZoomLB.InsertEntry(String::CreateFromAscii("75 %"), 2); - m_aZoomLB.InsertEntry(String::CreateFromAscii("100 %"), 3); + m_aZoomLB.InsertEntry(rtl::OUString("50 %"), 1); + m_aZoomLB.InsertEntry(rtl::OUString("75 %"), 2); + m_aZoomLB.InsertEntry(rtl::OUString("100 %"), 3); m_aZoomLB.SelectEntryPos(0); //page size m_aZoomLB.SetSelectHdl(LINK(this, SwMailMergeLayoutPage, ZoomHdl_Impl)); diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index b8c072145482..7519e23e7292 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -63,7 +63,7 @@ SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) : { FreeResource(); String sTemp(m_aEditFI.GetText()); - sTemp.SearchAndReplace(String::CreateFromAscii("%1"), m_aEditPB.GetText()); + sTemp.SearchAndReplace(rtl::OUString("%1"), m_aEditPB.GetText()); m_aEditFI.SetText(sTemp); m_aEditPB.SetClickHdl( LINK( this, SwMailMergeMergePage, EditDocumentHdl_Impl)); m_aFindPB.SetClickHdl( LINK( this, SwMailMergeMergePage, FindHdl_Impl )); diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 460bb072bde1..d4e346c218f8 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -85,14 +85,14 @@ using namespace ::com::sun::star::uno; String lcl_GetExtensionForDocType(sal_uLong nDocType) { - String sExtension; + rtl::OUString sExtension; switch( nDocType ) { - case MM_DOCTYPE_OOO : sExtension = String::CreateFromAscii( "odt" ); break; - case MM_DOCTYPE_PDF : sExtension = String::CreateFromAscii( "pdf" ); break; - case MM_DOCTYPE_WORD: sExtension = String::CreateFromAscii( "doc" ); break; - case MM_DOCTYPE_HTML: sExtension = String::CreateFromAscii( "html" ); break; - case MM_DOCTYPE_TEXT: sExtension = String::CreateFromAscii( "txt" ); break; + case MM_DOCTYPE_OOO : sExtension = rtl::OUString( "odt" ); break; + case MM_DOCTYPE_PDF : sExtension = rtl::OUString( "pdf" ); break; + case MM_DOCTYPE_WORD: sExtension = rtl::OUString( "doc" ); break; + case MM_DOCTYPE_HTML: sExtension = rtl::OUString( "html" ); break; + case MM_DOCTYPE_TEXT: sExtension = rtl::OUString( "txt" ); break; } return sExtension; } @@ -730,7 +730,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) INetURLObject(), utl::TempFile::CreateTempName(), URIHelper::GetMaybeFileHdl()); const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat( - String::CreateFromAscii( FILTER_XML ), + rtl::OUString( FILTER_XML ), SwDocShell::Factory().GetFilterContainer() ); uno::Sequence< beans::PropertyValue > aValues(1); @@ -1054,7 +1054,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) //Make sure we don't pick e.g. the flat xml filter //for this format pSfxFlt = SwIoSystem::GetFilterOfFormat( - String::CreateFromAscii( FILTER_XML ), + rtl::OUString( FILTER_XML ), SwDocShell::Factory().GetFilterContainer() ); } break; @@ -1072,10 +1072,9 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) SfxFilterMatcher aMatcher( pFilterContainer->GetName() ); SfxFilterMatcherIter aIter( aMatcher ); const SfxFilter* pFilter = aIter.First(); - String sFilterUserData( String::CreateFromAscii( FILTER_WW8 )); while ( pFilter ) { - if( pFilter->GetUserData() == sFilterUserData && pFilter->CanExport() ) + if( pFilter->GetUserData() == FILTER_WW8 && pFilter->CanExport() ) { pSfxFlt = pFilter; break; @@ -1159,7 +1158,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) INetURLObject(), utl::TempFile::CreateTempName(), URIHelper::GetMaybeFileHdl()); const SfxFilter *pTargetSfxFlt = SwIoSystem::GetFilterOfFormat( - String::CreateFromAscii( FILTER_XML ), + rtl::OUString( FILTER_XML ), SwDocShell::Factory().GetFilterContainer() ); uno::Sequence< beans::PropertyValue > aValues(1); diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx index 93d590c44c2d..59bb7ed34764 100644 --- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx @@ -166,8 +166,7 @@ SwSpellDialogChildWindow::SwSpellDialogChildWindow ( _pParent, nId, pBindings, pInfo), m_pSpellState(new SpellState) { - - String aPropName( String::CreateFromAscii(UPN_IS_GRAMMAR_INTERACTIVE ) ); + rtl::OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE); SvtLinguConfig().GetProperty( aPropName ) >>= m_bIsGrammarCheckingOn; } @@ -503,7 +502,7 @@ void SwSpellDialogChildWindow::SetGrammarChecking(bool bOn) uno::Any aVal; aVal <<= bOn; m_bIsGrammarCheckingOn = bOn; - String aPropName( C2S(UPN_IS_GRAMMAR_INTERACTIVE ) ); + rtl::OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE); SvtLinguConfig().SetProperty( aPropName, aVal ); // set current spell position to the start of the current sentence to // continue with this sentence after grammar checking state has been changed diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index d6ca4072e6d9..8c9fdcb9cbd6 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -86,10 +86,10 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, SwAsciiOptions aOpt; { - const String& rFindNm = String::CreateFromAscii( + const rtl::OUString sFindNm = rtl::OUString::createFromAscii( pStream ? sDialogImpExtraData : sDialogExpExtraData); - sal_uInt16 nEnd, nStt = GetExtraData().Search( rFindNm ); + sal_uInt16 nEnd, nStt = GetExtraData().Search( sFindNm ); if( STRING_NOTFOUND != nStt ) { nStt += nDialogExtraDataLen; @@ -319,10 +319,10 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions ) rOptions.WriteUserData( sData ); if( sData.Len() ) { - const String& rFindNm = String::CreateFromAscii( + const rtl::OUString sFindNm = rtl::OUString::createFromAscii( aFontLB.IsVisible() ? sDialogImpExtraData : sDialogExpExtraData); - sal_uInt16 nEnd, nStt = GetExtraData().Search( rFindNm ); + sal_uInt16 nEnd, nStt = GetExtraData().Search( sFindNm ); if( STRING_NOTFOUND != nStt ) { // called twice, so remove "old" settings @@ -332,7 +332,7 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions ) GetExtraData().Erase( nStt, nEnd - nStt + 1 ); } String sTmp(GetExtraData()); - sTmp += rFindNm; + sTmp += sFindNm; sTmp += sData; sTmp += cDialogExtraDataClose; GetExtraData() = sTmp; diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 08962f044d4f..20040c9429f7 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1104,7 +1104,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, FileSearchHdl) Application::SetDefDialogParent( this ); delete m_pDocInserter; m_pDocInserter = - new ::sfx2::DocumentInserter( String::CreateFromAscii("swriter") ); + new ::sfx2::DocumentInserter( rtl::OUString("swriter") ); m_pDocInserter->StartExecuteModal( LINK( this, SwEditRegionDlg, DlgClosedHdl ) ); return 0; } @@ -1854,7 +1854,7 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl) Application::SetDefDialogParent( this ); delete m_pDocInserter; m_pDocInserter = new ::sfx2::DocumentInserter( - String::CreateFromAscii("swriter") ); + rtl::OUString("swriter") ); m_pDocInserter->StartExecuteModal( LINK( this, SwInsertSectionTabPage, DlgClosedHdl ) ); return 0; } diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index 41bfbe087d4d..9cba41c344e7 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -774,7 +774,7 @@ sal_Bool SwGlossaryHdl::ImportGlossaries( const String& rName ) { const SfxFilter* pFilter = 0; SfxMedium* pMed = new SfxMedium( rName, STREAM_READ, 0, 0 ); - SfxFilterMatcher aMatcher( String::CreateFromAscii("swriter") ); + SfxFilterMatcher aMatcher( rtl::OUString("swriter") ); pMed->UseInteractionHandler( sal_True ); if( !aMatcher.GuessFilter( *pMed, &pFilter, sal_False ) ) { diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index db94f67c806a..a83adb2c7a6e 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -647,8 +647,8 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) { String sTmp(aQueryMB.GetMessText()); String sQuery(sTmp); - sQuery.SearchAndReplace(C2S("%1"), sMake); - sQuery.SearchAndReplace(C2S("%2"), sType); + sQuery.SearchAndReplace(rtl::OUString("%1"), sMake); + sQuery.SearchAndReplace(rtl::OUString("%2"), sType); aQueryMB.SetMessText(sQuery); short eRet = aQueryMB.Execute(); diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 14cc5b297ead..f7050da7e8a1 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -383,7 +383,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, for(sal_uInt16 nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); nEntry++) aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry)); - aAddressFldLB.SelectEntry(C2S("EMAIL")); + aAddressFldLB.SelectEntry(rtl::OUString("EMAIL")); String sPath(pModOpt->GetMailingPath()); if(!sPath.Len()) @@ -399,7 +399,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, if (!bColumn ) { - aColumnLB.SelectEntry(C2S("NAME")); + aColumnLB.SelectEntry(rtl::OUString("NAME")); } else aColumnLB.SelectEntry(pModOpt->GetNameFromColumn()); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 89d0ef3ef78a..c9a3131c5b18 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -213,7 +213,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) SetTabPage(pTabPage); String sTitle(GetText()); - sTitle.Insert(String::CreateFromAscii(": "), 0); + sTitle.Insert(rtl::OUString(": "), 0); sTitle.Insert(SW_RESSTR(STR_FLD_EDIT_DLG), 0); SetText(sTitle); diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index 262ab14efff6..0cab6a9b8414 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -107,9 +107,9 @@ void SwFldPage::Init() { SwDoc* pDoc = pSh->GetDoc(); pSh->InsertFldType( SwSetExpFieldType( pDoc, - String::CreateFromAscii("HTML_ON"), 1)); + rtl::OUString("HTML_ON"), 1)); pSh->InsertFldType( SwSetExpFieldType(pDoc, - String::CreateFromAscii("HTML_OFF"), 1)); + rtl::OUString("HTML_OFF"), 1)); } } } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 222fddfff16a..c6477bbbce6f 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1289,7 +1289,7 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt ) void SwFldVarPage::FillUserData() { - String sData(String::CreateFromAscii(USER_DATA_VERSION)); + String sData(rtl::OUString(USER_DATA_VERSION)); sData += ';'; sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 5f893dadbbad..2ee666a60f34 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -278,7 +278,7 @@ IMPL_LINK( SwJavaEditDialog, InsertFileHdl, PushButton *, pBtn ) pFileDlg = new ::sfx2::FileDialogHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, - SFXWB_INSERT, String::CreateFromAscii("swriter") ); + SFXWB_INSERT, rtl::OUString("swriter") ); } pFileDlg->StartExecuteModal( LINK( this, SwJavaEditDialog, DlgClosedHdl ) ); diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 534297a48060..535495ff3163 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -110,7 +110,7 @@ public: String GetCharacterStyle() const; }; -String SwCaptionDialog::our_aSepTextSave = String::CreateFromAscii(": "); // Caption separator text +String SwCaptionDialog::our_aSepTextSave = rtl::OUString(": "); // Caption separator text SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : @@ -507,7 +507,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV, RES_SETEXPFLD, aFldTypeName ); sal_Unicode nLvl = MAXLEVEL; - String sDelim( String::CreateFromAscii( ": " ) ); + rtl::OUString sDelim(": "); if( pFldType ) { sDelim = pFldType->GetDelimiter(); @@ -515,7 +515,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV, } aLbLevel.SelectEntryPos( nLvl < MAXLEVEL ? nLvl + 1 : 0 ); - aEdDelim.SetText( sDelim ); + aEdDelim.SetText(sDelim); ::FillCharStyleListBox( aLbCharStyle, rView.GetDocShell(), sal_True, sal_True ); aLbCharStyle.SelectEntryPos( 0 ); diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index f28bd79ec8e5..6e6330b52cbe 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.hxx @@ -75,7 +75,7 @@ class TableNameEdit : public NoSpaceEdit public: TableNameEdit(Window* pWin, const ResId& rResId) : NoSpaceEdit(pWin, rResId) - {SetForbiddenChars(String::CreateFromAscii(" .<>"));} + {SetForbiddenChars(rtl::OUString(" .<>"));} }; /* -------------------------------------------------- diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index e9af11339e75..52333d739dac 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -455,7 +455,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( } for(sal_uInt16 i = 1; i < nEndLevel; i++) { - String sPropName(C2S("ParaStyleLevel")); + String sPropName(rtl::OUString("ParaStyleLevel")); sPropName += String::CreateFromInt32( i ); lcl_SetProp(xInfo, xIdxProps, diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index d2aae21d9ef3..942a7a44beca 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -310,7 +310,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet } else { - pDescArr[nArrayIndex]->SetAuthBrackets(C2S("[]")); + pDescArr[nArrayIndex]->SetAuthBrackets(rtl::OUString("[]")); } } } @@ -458,7 +458,7 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType) } else { - pDescArr[nIndex]->SetAuthBrackets(C2S("[]")); + pDescArr[nIndex]->SetAuthBrackets(rtl::OUString("[]")); } } else if(TOX_INDEX == eType.eType) @@ -2358,7 +2358,7 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, PushButton*, pButton) String sToInsert(aAuthFieldsLB.GetSelectEntry()); SwFormToken aInsert(TOKEN_AUTHORITY); aInsert.nAuthorityField = (sal_uInt16)(sal_uIntPtr)aAuthFieldsLB.GetEntryData(nSelPos); - aTokenWIN.InsertAtSelection(String::CreateFromAscii( + aTokenWIN.InsertAtSelection(rtl::OUString::createFromAscii( SwForm::aFormAuth), aInsert); aAuthFieldsLB.RemoveEntry(sToInsert); aAuthFieldsLB.SelectEntryPos( nSelPos ? nSelPos - 1 : 0); @@ -2914,8 +2914,8 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) default:; //prevent warning } - InsertItem( pTmp ? String::CreateFromAscii(pTmp) - : aEmptyStr, aToken ); + InsertItem( pTmp ? rtl::OUString::createFromAscii(pTmp) + : rtl::OUString(), aToken ); bLastWasText = sal_False; } diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 7d7f43a0a543..fbc59561c9ba 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -525,8 +525,7 @@ SwSpellPopup::SwSpellPopup( aKeyboardLang = aLanguageTable.GetString( nLang ); // get the language that is in use - const String aMultipleLanguages = String::CreateFromAscii("*"); - String aCurrentLang = aMultipleLanguages; + String aCurrentLang = rtl::OUString("*"); nLang = SwLangHelper::GetCurrentLanguage( *pWrtSh ); if (nLang != LANGUAGE_DONTKNOW) aCurrentLang = aLanguageTable.GetString( nLang ); @@ -679,8 +678,7 @@ aInfo16( SW_RES(IMG_INFO_16) ) aKeyboardLang = aLanguageTable.GetString( nLang ); // get the language that is in use - const String aMultipleLanguages = String::CreateFromAscii("*"); - String aCurrentLang = aMultipleLanguages; + String aCurrentLang = rtl::OUString("*"); nLang = SwLangHelper::GetCurrentLanguage( *pWrtSh ); if (nLang != LANGUAGE_DONTKNOW) aCurrentLang = aLanguageTable.GetString( nLang ); diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index fe056ee6f36e..0f2b3e773d95 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -47,7 +47,7 @@ #include "bookmark.hrc" #include "misc.hrc" -const String BookmarkCombo::aForbiddenChars = String::CreateFromAscii("/\\@:*?\";,.#"); +const String BookmarkCombo::aForbiddenChars = rtl::OUString("/\\@:*?\";,.#"); IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) { diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 044402b95350..2cbb826d9c55 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -616,15 +616,14 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) SvtPathOptions aPathOpt; xFP->setDisplayDirectory(aPathOpt.GetWorkPath() ); - String sWW8( C2S( FILTER_WW8 ) ); uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY); - SfxFilterMatcher aMatcher( String::CreateFromAscii(SwDocShell::Factory().GetShortName()) ); + SfxFilterMatcher aMatcher( rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName()) ); SfxFilterMatcherIter aIter( aMatcher ); const SfxFilter* pFilter = aIter.First(); while ( pFilter ) { - if( pFilter->GetUserData() == sWW8 ) + if( pFilter->GetUserData() == FILTER_WW8 ) { xFltMgr->appendFilter( pFilter->GetUIName(), pFilter->GetWildcard().getGlob() ); diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 81c466a6dd23..e5c003f64b02 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -108,14 +108,14 @@ SwLineNumberingPage::SwLineNumberingPage( Window* pParent, { String sIntervalName = aDivIntervalFT.GetAccessibleName(); - sIntervalName += String::CreateFromAscii("("); + sIntervalName += rtl::OUString("("); sIntervalName += aDivRowsFT.GetAccessibleName(); - sIntervalName += String::CreateFromAscii(")"); + sIntervalName += rtl::OUString(")"); aDivIntervalNF.SetAccessibleName(sIntervalName); sIntervalName = aNumIntervalFT.GetAccessibleName(); - sIntervalName += String::CreateFromAscii("("); + sIntervalName += rtl::OUString("("); sIntervalName += aNumRowsFT.GetAccessibleName(); - sIntervalName += String::CreateFromAscii(")"); + sIntervalName += rtl::OUString(")"); aNumIntervalNF.SetAccessibleName(sIntervalName); FreeResource(); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 912b24b342de..2d205956e840 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -152,7 +152,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, // insert levels for(sal_uInt16 i = 1; i <= MAXLEVEL; i++) aLevelLB.InsertEntry(String::CreateFromInt32(i)); - String sEntry(String::CreateFromAscii("1 - ")); + String sEntry(rtl::OUString("1 - ")); sEntry += String::CreateFromInt32(MAXLEVEL); aLevelLB.InsertEntry(sEntry); aLevelLB.SelectEntry(sEntry); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index cfa46f51cd1c..41e00c591bad 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -177,7 +177,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent, SwWrtShell &rSh) : // the UserString is set correctly afterwards SfxTabDialog(pParent, SW_RES(DLG_TAB_OUTLINE), pSwItemSet, sal_False, &aEmptyStr), - aNullStr(C2S("____")), + aNullStr(rtl::OUString("____")), aFormMenu(SW_RES(MN_FORM)), rWrtSh(rSh), pChapterNumRules(SW_MOD()->GetChapterNumRules()), diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index f6fb3cd3f000..86f7a2f50c1f 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -384,9 +384,9 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet) void SwTextGridPage::SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue ) { - String aFieldStr = String::CreateFromAscii("( 1 -"); - aFieldStr += String::CreateFromInt32( nValue ); - aFieldStr += String::CreateFromAscii(" )"); + String aFieldStr = rtl::OUString("( 1 -"); + aFieldStr += rtl::OUString::valueOf(nValue); + aFieldStr += rtl::OUString(" )"); rField.SetText( aFieldStr ); } diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index df8c355bc450..6a3239ad1065 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -1196,7 +1196,7 @@ void SwRedlineAcceptDlg::Initialize(const String& rExtraData) { if (rExtraData.Len()) { - sal_uInt16 nPos = rExtraData.Search(C2S("AcceptChgDat:")); + sal_uInt16 nPos = rExtraData.Search(rtl::OUString("AcceptChgDat:")); // try to read the alignment string "ALIGN:(...)"; if none existing, // it's an old version diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index 64249d08709c..c59dab2a96eb 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -336,7 +336,7 @@ static const char * const aStrArr[] = { sal_uInt16 nId = pMenu->GetCurItemId(); if ( nId <= MN_CALC_ROUND ) { - String aTmp( String::CreateFromAscii(aStrArr[nId - 1]) ); + String aTmp( rtl::OUString::createFromAscii(aStrArr[nId - 1]) ); aTmp += ' '; aEdit.ReplaceSelected( aTmp ); } diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index e7867bb1443f..8d63e469a5c3 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -1936,7 +1936,7 @@ SwBaseShell::SwBaseShell(SwView& rVw) : SwWrtShell& rWrtSh = rView.GetWrtShell(); SetPool(&rWrtSh.GetAttrPool()); - SetName(C2S("Base")); + SetName(rtl::OUString("Base")); rWrtSh.SetGrfArrivedLnk( LINK( this, SwBaseShell, GraphicArrivedHdl)); } diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx index 3f5fc406a1cc..4a4137607bd6 100644 --- a/sw/source/ui/shells/beziersh.cxx +++ b/sw/source/ui/shells/beziersh.cxx @@ -62,7 +62,7 @@ TYPEINIT1(SwBezierShell,SwBaseShell) SwBezierShell::SwBezierShell(SwView &_rView): SwBaseShell( _rView ) { - SetName(C2S("Bezier")); + SetName(rtl::OUString("Bezier")); SetHelpId(SW_BEZIERSHELL); SwWrtShell *pSh = &GetShell(); diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index f91723b4ace5..200811481faf 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.cxx @@ -362,7 +362,7 @@ SwDrawShell::SwDrawShell(SwView &_rView) : SwDrawBaseShell(_rView) { SetHelpId(SW_DRAWSHELL); - SetName(String::CreateFromAscii("Draw")); + SetName(rtl::OUString("Draw")); } /************************************************************************* diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx index 1205d1bcc262..c55f685004af 100644 --- a/sw/source/ui/shells/drformsh.cxx +++ b/sw/source/ui/shells/drformsh.cxx @@ -261,7 +261,7 @@ SwDrawFormShell::SwDrawFormShell(SwView &_rView) : { SetHelpId(SW_DRAWFORMSHELL); GetShell().NoEdit(sal_True); - SetName(String::CreateFromAscii("DrawForm")); + SetName(rtl::OUString("DrawForm")); } SwDrawFormShell::~SwDrawFormShell() diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 2bb6c5ae27cc..eb8751514dfa 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -138,7 +138,7 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) : Init(); rSh.NoEdit(sal_True); - SetName(String::CreateFromAscii("ObjectText")); + SetName(rtl::OUString("ObjectText")); SetHelpId(SW_DRWTXTSHELL); } diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index d4e7b1301466..497d212d26c7 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -880,7 +880,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) SwFrameShell::SwFrameShell(SwView &_rView) : SwBaseShell( _rView ) { - SetName(String::CreateFromAscii("Frame")); + SetName(rtl::OUString("Frame")); SetHelpId(SW_FRAMESHELL); /* #96392# Use this to announce it is the frame shell who creates the diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 2e9884cb3520..20dd85f52a82 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -704,7 +704,7 @@ SwGrfShell::SwGrfShell(SwView &_rView) : SwBaseShell(_rView) { - SetName(String::CreateFromAscii("Graphic")); + SetName(rtl::OUString("Graphic")); SetHelpId(SW_GRFSHELL); } diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index 68bfdcccefb8..4b389a3f049b 100644 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.cxx @@ -92,8 +92,7 @@ namespace SwLangHelper aKeyboardLang = aLangTable.GetString( nLang ); // get the language that is in use - const String aMultipleLanguages = String::CreateFromAscii("*"); - String aCurrentLang = aMultipleLanguages; + String aCurrentLang = rtl::OUString("*"); SfxItemSet aSet(pOLV->GetAttribs()); nLang = SwLangHelper::GetCurrentLanguage( aSet,nScriptType ); if (nLang != LANGUAGE_DONTKNOW) @@ -149,11 +148,11 @@ namespace SwLangHelper // setting the new language... if (aNewLangTxt.Len() > 0) { - const String aSelectionLangPrefix( String::CreateFromAscii("Current_") ); - const String aParagraphLangPrefix( String::CreateFromAscii("Paragraph_") ); - const String aDocumentLangPrefix( String::CreateFromAscii("Default_") ); - const String aStrNone( String::CreateFromAscii("LANGUAGE_NONE") ); - const String aStrResetLangs( String::CreateFromAscii("RESET_LANGUAGES") ); + const rtl::OUString aSelectionLangPrefix("Current_"); + const rtl::OUString aParagraphLangPrefix("Paragraph_"); + const rtl::OUString aDocumentLangPrefix("Default_"); + const String aStrNone( rtl::OUString("LANGUAGE_NONE") ); + const String aStrResetLangs( rtl::OUString("RESET_LANGUAGES") ); xub_StrLen nPos = 0; bool bForSelection = true; @@ -161,20 +160,20 @@ namespace SwLangHelper if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aSelectionLangPrefix, 0 ))) { // ... for the current selection - aNewLangTxt = aNewLangTxt.Erase( nPos, aSelectionLangPrefix.Len() ); + aNewLangTxt = aNewLangTxt.Erase( nPos, aSelectionLangPrefix.getLength() ); bForSelection = true; } else if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aParagraphLangPrefix , 0 ))) { // ... for the current paragraph language - aNewLangTxt = aNewLangTxt.Erase( nPos, aParagraphLangPrefix.Len() ); + aNewLangTxt = aNewLangTxt.Erase( nPos, aParagraphLangPrefix.getLength() ); bForSelection = true; bForParagraph = true; } else if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aDocumentLangPrefix , 0 ))) { // ... as default document language - aNewLangTxt = aNewLangTxt.Erase( nPos, aDocumentLangPrefix.Len() ); + aNewLangTxt = aNewLangTxt.Erase( nPos, aDocumentLangPrefix.getLength() ); bForSelection = false; } diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 063ce1f9687a..0f9fd07c2c72 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -280,7 +280,7 @@ void SwListShell::GetState(SfxItemSet &rSet) SwListShell::SwListShell(SwView &_rView) : SwBaseShell(_rView) { - SetName(String::CreateFromAscii("List")); + SetName(rtl::OUString("List")); SetHelpId(SW_LISTSHELL); } diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index fdc63afd0ceb..5d080178d313 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.cxx @@ -199,7 +199,7 @@ SwMediaShell::SwMediaShell(SwView &_rView) : SwBaseShell(_rView) { - SetName(String::CreateFromAscii("Media Playback")); + SetName(rtl::OUString("Media Playback")); SetHelpId(SW_MEDIASHELL); } diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/ui/shells/navsh.cxx index 97898d2164d6..3cff898e025e 100644 --- a/sw/source/ui/shells/navsh.cxx +++ b/sw/source/ui/shells/navsh.cxx @@ -66,7 +66,7 @@ SwNavigationShell::SwNavigationShell(SwView &_rView): SwBaseShell( _rView ) { - SetName(C2S("Navigation")); + SetName(rtl::OUString("Navigation")); SetHelpId(SW_NAVIGATIONSHELL); } diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx index 017633c379a3..8b06595c6ec5 100644 --- a/sw/source/ui/shells/olesh.cxx +++ b/sw/source/ui/shells/olesh.cxx @@ -49,7 +49,7 @@ SwOleShell::SwOleShell(SwView &_rView) : SwFrameShell(_rView) { - SetName(String::CreateFromAscii("Object")); + SetName(rtl::OUString("Object")); SetHelpId(SW_OLESHELL); } diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index b1884b740ef6..69c28c6a55ee 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -1356,7 +1356,7 @@ void SwTableShell::GetState(SfxItemSet &rSet) SwTableShell::SwTableShell(SwView &_rView) : SwBaseShell(_rView) { - SetName(String::CreateFromAscii("Table")); + SetName(rtl::OUString("Table")); SetHelpId(SW_TABSHELL); } diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 3ad1e1ff61cb..d5eea66d6296 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -1000,7 +1000,7 @@ void SwTextShell::ExecRotateTransliteration( SfxRequest & rReq ) SwTextShell::SwTextShell(SwView &_rView) : SwBaseShell(_rView), pPostItFldMgr( 0 ) { - SetName(String::CreateFromAscii("Text")); + SetName(rtl::OUString("Text")); SetHelpId(SW_TEXTSHELL); } diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 9cb232bd3b82..4929427611cb 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -326,11 +326,11 @@ void SwTextShell::Execute(SfxRequest &rReq) // setting the new language... if (aNewLangTxt.Len() > 0) { - const String aSelectionLangPrefix( String::CreateFromAscii("Current_") ); - const String aParagraphLangPrefix( String::CreateFromAscii("Paragraph_") ); - const String aDocumentLangPrefix( String::CreateFromAscii("Default_") ); - const String aStrNone( String::CreateFromAscii("LANGUAGE_NONE") ); - const String aStrResetLangs( String::CreateFromAscii("RESET_LANGUAGES") ); + const rtl::OUString aSelectionLangPrefix("Current_"); + const rtl::OUString aParagraphLangPrefix("Paragraph_"); + const rtl::OUString aDocumentLangPrefix("Default_"); + const String aStrNone( rtl::OUString("LANGUAGE_NONE") ); + const String aStrResetLangs( rtl::OUString("RESET_LANGUAGES") ); SfxItemSet aCoreSet( GetPool(), RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE, @@ -344,20 +344,20 @@ void SwTextShell::Execute(SfxRequest &rReq) if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aSelectionLangPrefix, 0 ))) { // ... for the current selection - aNewLangTxt = aNewLangTxt.Erase( nPos, aSelectionLangPrefix.Len() ); + aNewLangTxt = aNewLangTxt.Erase( nPos, aSelectionLangPrefix.getLength() ); bForSelection = true; } else if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aParagraphLangPrefix , 0 ))) { // ... for the current paragraph language - aNewLangTxt = aNewLangTxt.Erase( nPos, aParagraphLangPrefix.Len() ); + aNewLangTxt = aNewLangTxt.Erase( nPos, aParagraphLangPrefix.getLength() ); bForSelection = true; bForParagraph = true; } else if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aDocumentLangPrefix , 0 ))) { // ... as default document language - aNewLangTxt = aNewLangTxt.Erase( nPos, aDocumentLangPrefix.Len() ); + aNewLangTxt = aNewLangTxt.Erase( nPos, aDocumentLangPrefix.getLength() ); bForSelection = false; } @@ -1331,8 +1331,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) aKeyboardLang = aLangTable.GetString( nLang ); // get the language that is in use - const String aMultipleLanguages = String::CreateFromAscii("*"); - String aCurrentLang = aMultipleLanguages; + String aCurrentLang = rtl::OUString("*"); nLang = SwLangHelper::GetCurrentLanguage( rSh ); if (nLang != LANGUAGE_DONTKNOW) aCurrentLang = aLangTable.GetString( nLang ); diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index ecdc27d8e58c..631f12bddbd9 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1199,7 +1199,7 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): mbResetFormDesignMode( false ), mbFormDesignModeToReset( false ) { - SetName(String::CreateFromAscii("PageView" )); + SetName(rtl::OUString("PageView" )); SetWindow( &aViewWin ); SetHelpId(SW_PAGEPREVIEW); _CreateScrollbar( sal_True ); diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 6da43e953213..0799925cbdc1 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -163,7 +163,7 @@ void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt16 nCurP { aFont.SetWeight( WEIGHT_NORMAL ); rOutDev.SetFont( aFont ); - String aPageStr( C2S(" [") ); + String aPageStr( rtl::OUString(" [") ); aPageStr += String( SW_RES( STR_PAGE ) ); aPageStr += ' '; aPageStr += String::CreateFromInt32( nCurPage ); @@ -255,7 +255,7 @@ void SwSrcView::SaveContentTo(SfxMedium& rMed) void SwSrcView::Init() { SetHelpId(SW_SRC_VIEWSHELL); - SetName(C2S("Source")); + SetName(rtl::OUString("Source")); SetWindow( &aEditWin ); SwDocShell* pDocShell = GetDocShell(); // wird das Doc noch geladen, dann muss die DocShell das Load @@ -304,7 +304,7 @@ void SwSrcView::Execute(SfxRequest& rReq) // search for an html filter for export SfxFilterContainer* pFilterCont = GetObjectShell()->GetFactory().GetFilterContainer(); const SfxFilter* pFilter = - pFilterCont->GetFilter4Extension( C2S("html"), SFX_FILTER_EXPORT ); + pFilterCont->GetFilter4Extension( rtl::OUString("html"), SFX_FILTER_EXPORT ); if ( pFilter ) { // filter found -> use its uiname and wildcard @@ -316,8 +316,8 @@ void SwSrcView::Execute(SfxRequest& rReq) else { // filter not found - String sHtml(C2S("HTML")); - xFltMgr->appendFilter( sHtml, C2S("*.html;*.htm") ); + rtl::OUString sHtml("HTML"); + xFltMgr->appendFilter( sHtml, rtl::OUString("*.html;*.htm") ); xFltMgr->setCurrentFilter( sHtml ) ; } @@ -446,7 +446,7 @@ void SwSrcView::GetState(SfxItemSet& rSet) String aPos( SW_RES(STR_SRCVIEW_ROW) ); TextSelection aSel = pTextView->GetSelection(); aPos += String::CreateFromInt32( aSel.GetEnd().GetPara()+1 ); - aPos +=C2S(" : "); + aPos += rtl::OUString(" : "); aPos += String(SW_RES(STR_SRCVIEW_COL)); aPos += String::CreateFromInt32( aSel.GetEnd().GetIndex()+1 ); SfxStringItem aItem( nWhich, aPos ); @@ -776,7 +776,7 @@ void SwSrcView::Load(SwDocShell* pDocShell) SfxMedium* pMedium = pDocShell->GetMedium(); const SfxFilter* pFilter = pMedium->GetFilter(); - sal_Bool bHtml = pFilter && pFilter->GetUserData().EqualsAscii("HTML"); + sal_Bool bHtml = pFilter && pFilter->GetUserData() == "HTML"; sal_Bool bDocModified = pDocShell->IsModified(); if(bHtml && !bDocModified && pDocShell->HasName()) { diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 10d7fa98c22c..4993728dd569 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -778,7 +778,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) _CreateScrollbar( sal_False ); pViewImpl = new SwView_Impl(this); - SetName(C2S("View")); + SetName(rtl::OUString("View")); SetWindow( pEditWin ); aTimer.SetTimeout( 120 ); diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index fe9792a2a9cc..8e212c5efcb2 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -506,7 +506,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq) pOpt->SetOnlineSpell(bSet); { uno::Any aVal( &bSet, ::getCppuBooleanType() ); - String aPropName( C2S(UPN_IS_SPELL_AUTO) ); + rtl::OUString aPropName(UPN_IS_SPELL_AUTO); SvtLinguConfig aCfg; aCfg.SetProperty( aPropName, aVal ); diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index df3230cce9a3..ffff020363e5 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -1981,7 +1981,7 @@ long SwView::InsertDoc( sal_uInt16 nSlotId, const String& rFileName, const Strin } else { - String sFactory = String::CreateFromAscii( pDocSh->GetFactory().GetShortName() ); + rtl::OUString sFactory = rtl::OUString::createFromAscii( pDocSh->GetFactory().GetShortName() ); pViewImpl->StartDocumentInserter( sFactory, LINK( this, SwView, DialogClosedHdl ) ); return -1; } diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index a9c065bee32c..4e668111ee7c 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -186,7 +186,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) InfoBox aInfoBox(&GetEditWin(), SW_RES(MSG_ERR_NO_FAX)); String sMsg = aInfoBox.GetMessText(); sal_uInt16 nResNo = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS; - sMsg.SearchAndReplace(String::CreateFromAscii("%1"), String(SW_RES(nResNo))); + sMsg.SearchAndReplace(rtl::OUString("%1"), String(SW_RES(nResNo))); aInfoBox.SetMessText(sMsg); aInfoBox.Execute(); SfxUInt16Item aDefPage(SID_SW_EDITOPTIONS, TP_OPTPRINT_PAGE); diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index ce57fca0ed5f..bb8d438953bd 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -330,7 +330,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage) if( !bApi && ULONG_MAX != nFound) { String aText( SW_RES( STR_NB_REPLACED ) ); - const xub_StrLen nPos = aText.Search( String::CreateFromAscii("XX") ); + const xub_StrLen nPos = aText.Search( rtl::OUString("XX") ); aText.Erase( nPos, 2 ); aText.Insert( String::CreateFromInt32( nFound ), nPos ); Window* pParentWindow = GetParentWindow( pSrchDlg ); diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx index cfe82cd74770..f002610b25ca 100644 --- a/sw/source/ui/uno/swdet2.cxx +++ b/sw/source/ui/uno/swdet2.cxx @@ -76,11 +76,10 @@ sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** pp else { //Bug 41417: JP 09.07.97: HTML documents should be loaded by WebWriter - SfxFilterContainer aFilterContainer( String::CreateFromAscii("swriter/web") ); - if( pTmp->GetUserData() != C2S(sHTML) || - String::CreateFromAscii( "com.sun.star.text.WebDocument" ) == - String( pTmp->GetServiceName() ) || - 0 == ( (*ppFilter) = SwIoSystem::GetFilterOfFormat( C2S(sHTML), + SfxFilterContainer aFilterContainer( rtl::OUString("swriter/web") ); + if( !pTmp->GetUserData().equals(sHTML) || + pTmp->GetServiceName() == "com.sun.star.text.WebDocument" || + 0 == ( (*ppFilter) = SwIoSystem::GetFilterOfFormat( rtl::OUString(sHTML), &aFilterContainer ) ) ) *ppFilter = pTmp; } diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index 7fec1f55a986..a8ac2afa7a94 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -173,13 +173,13 @@ SwFilterDetect::~SwFilterDetect() bWasReadOnly = pItem && pItem->GetValue(); const SfxFilter* pFilter = 0; - String aPrefix = String::CreateFromAscii( "private:factory/" ); + String aPrefix = rtl::OUString("private:factory/"); if( aURL.Match( aPrefix ) == aPrefix.Len() ) { if( SvtModuleOptions().IsWriter() ) { String aPattern( aPrefix ); - aPattern += String::CreateFromAscii("swriter"); + aPattern += rtl::OUString("swriter"); if ( aURL.Match( aPattern ) >= aPattern.Len() ) return aTypeName; } @@ -235,9 +235,9 @@ SwFilterDetect::~SwFilterDetect() { const SfxFilter* pPreFilter = aPreselectedFilterName.Len() ? SfxFilterMatcher().GetFilter4FilterName( aPreselectedFilterName ) : aTypeName.Len() ? - SfxFilterMatcher(String::CreateFromAscii("swriter")).GetFilter4EA( aTypeName ) : 0; + SfxFilterMatcher(rtl::OUString("swriter")).GetFilter4EA( aTypeName ) : 0; if (!pPreFilter) - pPreFilter = SfxFilterMatcher(String::CreateFromAscii("sweb")).GetFilter4EA( aTypeName ); + pPreFilter = SfxFilterMatcher(rtl::OUString("sweb")).GetFilter4EA( aTypeName ); String aFilterName; if ( pPreFilter ) { @@ -318,9 +318,9 @@ SwFilterDetect::~SwFilterDetect() else pFilter = SfxFilterMatcher().GetFilter4EA( aTypeName ); - sal_Bool bTestWriter = !pFilter || pFilter->GetServiceName().EqualsAscii("com.sun.star.text.TextDocument") || - pFilter->GetServiceName().EqualsAscii("com.sun.star.text.WebDocument"); - sal_Bool bTestGlobal = !pFilter || pFilter->GetServiceName().EqualsAscii("com.sun.star.text.GlobalDocument"); + sal_Bool bTestWriter = !pFilter || pFilter->GetServiceName() == "com.sun.star.text.TextDocument" || + pFilter->GetServiceName() == "com.sun.star.text.WebDocument"; + sal_Bool bTestGlobal = !pFilter || pFilter->GetServiceName() == "com.sun.star.text.GlobalDocument"; const SfxFilter* pOrigFilter = NULL; if ( !bTestWriter && !bTestGlobal && pFilter ) diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index e224320bf23c..bdcc408ea5e4 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -786,7 +786,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( // save document with temporary filename const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat( - String::CreateFromAscii( FILTER_XML ), + rtl::OUString( FILTER_XML ), SwDocShell::Factory().GetFilterContainer() ); String aExtension(comphelper::string::stripStart(pSfxFlt->GetDefaultExtension(), '*')); TempFile aTempFile( C2U("SwMM"), &aExtension ); diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 8dd56f56f991..3f1028656c7c 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -3286,7 +3286,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) String sSuffix('|'); if(sToCompare == sTables) { - sSuffix += UniString::CreateFromAscii(pMarkToTable); + sSuffix += rtl::OUString::createFromAscii(pMarkToTable); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getTextTables(), sToCompare, sSuffix ); @@ -3295,7 +3295,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } else if(sToCompare == sFrames) { - sSuffix += UniString::CreateFromAscii(pMarkToFrame); + sSuffix += rtl::OUString::createFromAscii(pMarkToFrame); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getTextFrames(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); @@ -3303,7 +3303,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } else if(sToCompare == sSections) { - sSuffix += UniString::CreateFromAscii(pMarkToRegion); + sSuffix += rtl::OUString::createFromAscii(pMarkToRegion); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getTextSections(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); @@ -3311,7 +3311,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } else if(sToCompare == sGraphics) { - sSuffix += UniString::CreateFromAscii(pMarkToGraphic); + sSuffix += rtl::OUString::createFromAscii(pMarkToGraphic); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getGraphicObjects(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); @@ -3319,7 +3319,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } else if(sToCompare == sOLEs) { - sSuffix += UniString::CreateFromAscii(pMarkToOLE); + sSuffix += rtl::OUString::createFromAscii(pMarkToOLE); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getEmbeddedObjects(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); @@ -3327,7 +3327,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } else if(sToCompare == sOutlines) { - sSuffix += UniString::CreateFromAscii(pMarkToOutline); + sSuffix += rtl::OUString::createFromAscii(pMarkToOutline); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( *pxDoc, sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); @@ -3499,7 +3499,7 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames(void) aRet.realloc(nOutlineCount); OUString* pResArr = aRet.getArray(); String sSuffix('|'); - sSuffix += UniString::CreateFromAscii(pMarkToOutline); + sSuffix += rtl::OUString::createFromAscii(pMarkToOutline); const SwNumRule* pOutlRule = pDoc->GetOutlineNumRule(); for (sal_uInt16 i = 0; i < nOutlineCount; ++i) { diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 62c78b20d1e0..2bcc85248634 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -75,7 +75,7 @@ void SwAttrSet::GetPresentation( SfxMapUnit ePresMetric, String &rText ) const { -static sal_Char const sKomma[] = ", "; + static sal_Char const sKomma[] = ", "; rText.Erase(); String aStr; @@ -90,7 +90,7 @@ static sal_Char const sKomma[] = ", "; ePresMetric, aStr, &rInt ); if( rText.Len() && aStr.Len() ) - rText += String::CreateFromAscii(sKomma); + rText += rtl::OUString(sKomma); rText += aStr; if( aIter.IsAtEnd() ) break; diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index a0497aa8ea3b..0b26be5c04f3 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -227,7 +227,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) { case CONTENT_TYPE_OUTLINE : { - sTypeToken = C2S(pMarkToOutline); + sTypeToken = rtl::OUString::createFromAscii(pMarkToOutline); sal_uInt16 nOutlineCount = nMemberCount = static_cast<sal_uInt16>(pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount()); if(nOutlineLevel < MAXLEVEL) @@ -243,7 +243,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) break; case CONTENT_TYPE_TABLE : - sTypeToken = C2S(pMarkToTable); + sTypeToken = rtl::OUString::createFromAscii(pMarkToTable); nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True); bEdit = sal_True; break; @@ -253,16 +253,16 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) case CONTENT_TYPE_OLE : { FlyCntType eType = FLYCNTTYPE_FRM; - sTypeToken = C2S(pMarkToFrame); + sTypeToken = rtl::OUString::createFromAscii(pMarkToFrame); if(nContentType == CONTENT_TYPE_OLE) { eType = FLYCNTTYPE_OLE; - sTypeToken = C2S(pMarkToOLE); + sTypeToken = rtl::OUString::createFromAscii(pMarkToOLE); } else if(nContentType == CONTENT_TYPE_GRAPHIC) { eType = FLYCNTTYPE_GRF; - sTypeToken = C2S(pMarkToGraphic); + sTypeToken = rtl::OUString::createFromAscii(pMarkToGraphic); } nMemberCount = pWrtShell->GetFlyCount(eType); bEdit = sal_True; @@ -330,7 +330,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) } } nMemberCount = pMember->Count(); - sTypeToken = C2S(pMarkToRegion); + sTypeToken = rtl::OUString::createFromAscii(pMarkToRegion); bEdit = sal_True; bDelete = sal_False; if(pOldMember) @@ -804,7 +804,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged) SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) : SvTreeListBox( pParent, rResId ), - sSpace(C2S(" ")), + sSpace(rtl::OUString(" ")), sRemoveIdx(SW_RES(ST_REMOVE_INDEX)), sUpdateIdx(SW_RES(ST_UPDATE)), @@ -1013,9 +1013,9 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) if(pHiddenShell) { String sHiddenEntry = pHiddenShell->GetView().GetDocShell()->GetTitle(); - sHiddenEntry += C2S(" ( "); + sHiddenEntry += rtl::OUString(" ( "); sHiddenEntry += aContextStrings[ ST_HIDDEN - ST_CONTEXT_FIRST]; - sHiddenEntry += C2S(" )"); + sHiddenEntry += rtl::OUString(" )"); pSubPop3->InsertItem(nId, sHiddenEntry); } @@ -2523,7 +2523,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) if(((SwContent*)pUserData)->IsInvisible()) { if(sEntry.Len()) - sEntry += C2S(", "); + sEntry += rtl::OUString(", "); sEntry += sInvisible; bRet = sal_True; } @@ -2959,11 +2959,11 @@ void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode) String sForbiddenChars; if(CONTENT_TYPE_BOOKMARK == nType) { - sForbiddenChars = C2S("/\\@:*?\";,.#"); + sForbiddenChars = rtl::OUString("/\\@:*?\";,.#"); } else if(CONTENT_TYPE_TABLE == nType) { - sForbiddenChars = C2S(" .<>"); + sForbiddenChars = rtl::OUString(" .<>"); } pDlg->SetForbiddenChars(sForbiddenChars); pDlg->Execute(); diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 79a1c869afa2..29814b00389c 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -726,7 +726,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pF Application::SetDefDialogParent( this ); delete pDocInserter; pDocInserter = new ::sfx2::DocumentInserter( - String::CreateFromAscii("swriter"), true ); + rtl::OUString("swriter"), true ); pDocInserter->StartExecuteModal( LINK( this, SwGlobalTree, DialogClosedHdl ) ); } else if ( pFileName->Len() ) @@ -1200,7 +1200,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) SfxStringItem aURL(SID_FILE_NAME, sFileName); SfxBoolItem aReadOnly(SID_DOC_READONLY, sal_False); - SfxStringItem aTargetFrameName( SID_TARGETNAME, String::CreateFromAscii("_blank") ); + SfxStringItem aTargetFrameName( SID_TARGETNAME, rtl::OUString("_blank") ); SfxStringItem aReferer(SID_REFERER, pActiveShell->GetView().GetDocShell()->GetTitle()); pActiveShell->GetView().GetViewFrame()->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index 1a3e6d4319d1..75f787a3f32c 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -254,14 +254,14 @@ ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( std::vector<String>& rLst ) { #ifdef WNT //fuer Windows Sonderbehandlung, da MS hier ein paar Zeichen im Dialogfont vergessen hat - p.SearchAndReplace(C2S("%1"), C2S(",,")); - p.SearchAndReplace(C2S("%2"), C2S("''")); + p.SearchAndReplace(rtl::OUString("%1"), rtl::OUString(",,")); + p.SearchAndReplace(rtl::OUString("%2"), rtl::OUString("''")); #else const SvtSysLocale aSysLocale; const LocaleDataWrapper& rLclD = aSysLocale.GetLocaleData(); //unter richtigen Betriebssystemen funktioniert es auch so - p.SearchAndReplace(C2S("%1"), rLclD.getDoubleQuotationMarkStart()); - p.SearchAndReplace(C2S("%2"), rLclD.getDoubleQuotationMarkEnd()); + p.SearchAndReplace(rtl::OUString("%1"), rLclD.getDoubleQuotationMarkStart()); + p.SearchAndReplace(rtl::OUString("%2"), rLclD.getDoubleQuotationMarkEnd()); #endif } rLst.insert(rLst.begin() + n, p); diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 903d6affc852..d04e6a5778cb 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -1091,7 +1091,7 @@ void SwNavigationPI::UpdateListBox() if ( !pDoc->IsHelpDocument() ) { String sEntry = pDoc->GetTitle(); - sEntry += C2S(" ("); + sEntry += rtl::OUString(" ("); if (pView == pActView) { nAct = nCount; @@ -1117,7 +1117,7 @@ void SwNavigationPI::UpdateListBox() { String sEntry = aContentTree.GetHiddenWrtShell()->GetView(). GetDocShell()->GetTitle(); - sEntry += C2S(" ("); + sEntry += rtl::OUString(" ("); sEntry += aStatusArr[ST_HIDDEN - ST_STATUS_FIRST]; sEntry += ')'; aDocListBox.InsertEntry(sEntry); @@ -1234,8 +1234,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt ) DELETEZ( pxObjectShell); } SfxStringItem aFileItem(SID_FILE_NAME, sFileName ); - String sOptions = C2S("HRC"); - SfxStringItem aOptionsItem( SID_OPTIONS, sOptions ); + SfxStringItem aOptionsItem( SID_OPTIONS, rtl::OUString("HRC") ); SfxLinkItem aLink( SID_DONELINK, LINK( this, SwNavigationPI, DoneLink ) ); GetActiveView()->GetViewFrame()->GetDispatcher()->Execute( diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx index bdf712cc2fd6..8f3679f6556c 100644 --- a/sw/source/ui/utlui/numfmtlb.cxx +++ b/sw/source/ui/utlui/numfmtlb.cxx @@ -242,7 +242,7 @@ void NumFormatListBox::SetFormatType(const short nFormatType) sValue = pFmt->GetFormatstring(); else if( nFormatType == NUMBERFORMAT_TEXT ) { - String sTxt(C2S("\"ABC\"")); + String sTxt(rtl::OUString("\"ABC\"")); pFormatter->GetOutputString( sTxt, nFormat, sValue, &pCol); } @@ -317,7 +317,7 @@ void NumFormatListBox::SetDefFormat(const sal_uLong nDefFmt) if (nType == NUMBERFORMAT_TEXT) { - String sTxt(C2S("\"ABC\"")); + String sTxt(rtl::OUString("\"ABC\"")); pFormatter->GetOutputString(sTxt, nDefFmt, sValue, &pCol); } else diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index 98eb46ecc3a8..e3438e6ccfa4 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -108,7 +108,7 @@ void SwOneExampleFrame::CreateErrorMessage(Window* pParent) if(SwOneExampleFrame::bShowServiceNotAvailableMessage) { String sInfo(SW_RES(STR_SERVICE_UNAVAILABLE)); - sInfo += C2S(cFrameControl); + sInfo += rtl::OUString(cFrameControl); InfoBox(pParent, sInfo).Execute(); SwOneExampleFrame::bShowServiceNotAvailableMessage = sal_False; } @@ -144,10 +144,10 @@ void SwOneExampleFrame::CreateControl() uno::Reference< beans::XPropertySet > xPrSet(xInst, uno::UNO_QUERY); uno::Any aURL; // create new doc - String sTempURL = C2S(cFactory); + rtl::OUString sTempURL(cFactory); if(sArgumentURL.Len()) sTempURL = sArgumentURL; - aURL <<= OUString(sTempURL); + aURL <<= sTempURL; uno::Sequence<beans::PropertyValue> aSeq(3); beans::PropertyValue* pValues = aSeq.getArray(); @@ -412,7 +412,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt) { String sTemp; sTemp = String::CreateFromInt32(nZoomValues[i]); - sTemp += String::CreateFromAscii(" %"); + sTemp += rtl::OUString(" %"); aSubPop1.InsertItem( ITEM_ZOOM + i + 1, sTemp); if(nZoom == nZoomValues[i]) aSubPop1.CheckItem(ITEM_ZOOM + i + 1); diff --git a/sw/source/ui/web/wgrfsh.cxx b/sw/source/ui/web/wgrfsh.cxx index c56fb9211f96..4299025c0621 100644 --- a/sw/source/ui/web/wgrfsh.cxx +++ b/sw/source/ui/web/wgrfsh.cxx @@ -50,7 +50,7 @@ SwWebGrfShell::SwWebGrfShell(SwView &_rView) : SwGrfShell(_rView) { - SetName(String::CreateFromAscii("Graphic")); + SetName(rtl::OUString("Graphic")); SetHelpId(SW_GRFSHELL); } diff --git a/sw/source/ui/web/wlistsh.cxx b/sw/source/ui/web/wlistsh.cxx index 9132acce4204..1e5ad3396ced 100644 --- a/sw/source/ui/web/wlistsh.cxx +++ b/sw/source/ui/web/wlistsh.cxx @@ -53,7 +53,7 @@ TYPEINIT1(SwWebListShell,SwListShell) SwWebListShell::SwWebListShell(SwView &_rView) : SwListShell(_rView) { - SetName(String::CreateFromAscii("List")); + SetName(rtl::OUString("List")); SetHelpId(SW_LISTSHELL); } diff --git a/sw/source/ui/web/wolesh.cxx b/sw/source/ui/web/wolesh.cxx index 37e6ffd179f6..9d93f13836a4 100644 --- a/sw/source/ui/web/wolesh.cxx +++ b/sw/source/ui/web/wolesh.cxx @@ -54,7 +54,7 @@ SwWebOleShell::SwWebOleShell(SwView &_rView) : SwOleShell(_rView) { - SetName(String::CreateFromAscii("Object")); + SetName(rtl::OUString("Object")); SetHelpId(SW_OLESHELL); } diff --git a/sw/source/ui/web/wtabsh.cxx b/sw/source/ui/web/wtabsh.cxx index 16876365ffa9..c797bf0ae5eb 100644 --- a/sw/source/ui/web/wtabsh.cxx +++ b/sw/source/ui/web/wtabsh.cxx @@ -60,7 +60,7 @@ SwWebTableShell::SwWebTableShell(SwView &_rView) : SwTableShell(_rView) { GetShell().UpdateTable(); - SetName(String::CreateFromAscii("Table")); + SetName(rtl::OUString("Table")); SetHelpId(SW_TABSHELL); } diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx index 0a38cb6fbb57..bbda0a69ed9f 100644 --- a/tools/source/fsys/tempfile.cxx +++ b/tools/source/fsys/tempfile.cxx @@ -113,7 +113,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru // ER 13.07.00 why not radix 36 [0-9A-Z] ?!? const unsigned nRadix = 26; String aName( rName ); - aName += String::CreateFromAscii( "sv" ); + aName += rtl::OUString("sv"); rName.Erase(); static unsigned long u = Time::GetSystemTicks(); diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx index f2c1efe21a30..81b953751067 100644 --- a/unotools/source/config/accelcfg.cxx +++ b/unotools/source/config/accelcfg.cxx @@ -184,7 +184,7 @@ SvtAcceleratorConfiguration::~SvtAcceleratorConfiguration() { String aUserConfig = SvtPathOptions().GetUserConfigPath(); INetURLObject aObj( aUserConfig ); - aObj.insertName( String::CreateFromAscii("GlobalKeyBindings.xml") ); + aObj.insertName( rtl::OUString("GlobalKeyBindings.xml") ); SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE|STREAM_TRUNC ); com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xOut( new utl::OOutputStreamWrapper( *pStream ) ); pImp->Commit( xOut ); diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 286932e68aae..b4098b99ead9 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -191,7 +191,7 @@ public: SvtLinguConfigItem::SvtLinguConfigItem() : - utl::ConfigItem( String::CreateFromAscii( "Office.Linguistic" ) ) + utl::ConfigItem( rtl::OUString("Office.Linguistic") ) { const uno::Sequence< OUString > &rPropertyNames = GetPropertyNames(); LoadOptions( rPropertyNames ); diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index ea7aaa856de5..195a98ff406c 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -133,17 +133,17 @@ void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang ) if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::SENTENCE_CASE ) { if( bLoad ) - loadModuleByImplName(String::CreateFromAscii("SENTENCE_CASE"), nLang); + loadModuleByImplName(rtl::OUString("SENTENCE_CASE"), nLang); } else if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::TITLE_CASE ) { if( bLoad ) - loadModuleByImplName(String::CreateFromAscii("TITLE_CASE"), nLang); + loadModuleByImplName(rtl::OUString("TITLE_CASE"), nLang); } else if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::TOGGLE_CASE ) { if( bLoad ) - loadModuleByImplName(String::CreateFromAscii("TOGGLE_CASE"), nLang); + loadModuleByImplName(rtl::OUString("TOGGLE_CASE"), nLang); } else { diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index 388f71bf02b6..2ae7fb9b1177 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1439,7 +1439,7 @@ String GetFontToSubsFontName( FontToSubsFontConverter hConverter ) return String(); const char* pName = ((ConvertChar*)hConverter)->mpSubsFontName; - return String::CreateFromAscii( pName ); + return rtl::OUString::createFromAscii( pName ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 6b634cb76529..2ec12a18e028 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -200,7 +200,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru unsigned const nRadix = 36; unsigned long const nMax = (nRadix*nRadix*nRadix*nRadix*nRadix*nRadix); String aName( rName ); - aName += String::CreateFromAscii( "lu" ); + aName += rtl::OUString( "lu" ); rName.Erase(); static unsigned long u = Time::GetSystemTicks() % nMax; @@ -209,7 +209,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru u %= nMax; String aTmp( aName ); aTmp += rtl::OUString::valueOf(static_cast<sal_Int64>(u), nRadix); - aTmp += String::CreateFromAscii( ".tmp" ); + aTmp += rtl::OUString( ".tmp" ); if ( bDir ) { @@ -285,7 +285,7 @@ void lcl_createName(TempFile_Impl& _rImpl,const String& rLeadingChars,sal_Bool _ if ( pExtension ) aTmp += *pExtension; else - aTmp += String::CreateFromAscii( ".tmp" ); + aTmp += rtl::OUString( ".tmp" ); if ( bDirectory ) { FileBase::RC err = Directory::create( aTmp ); diff --git a/unusedcode.easy b/unusedcode.easy index 358babf274df..b2f763b1dfc9 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -64,6 +64,7 @@ SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short) SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short) SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*) StgCache::Pos2Page(int) +String::CreateFromAscii(char const*) String::CreateFromAscii(char const*, unsigned short) String::String(rtl::OString const&, unsigned short, unsigned int) String::String(unsigned short const*) diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index 06ef9b70b7a3..0639d68edb8f 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -70,7 +70,7 @@ getContentPart( const String& _rRawString ) int i = 0; while ( aIDs[i] ) { - String sPartId = String::CreateFromAscii( aIDs[i++] ); + String sPartId = rtl::OUString::createFromAscii( aIDs[i++] ); xub_StrLen nContStart = _rRawString.Search( sPartId ); if ( nContStart != STRING_NOTFOUND ) { diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index be18ad6e932f..463b9a3d7734 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -350,7 +350,7 @@ void MacroWarning::SetStorage( const cssu::Reference < css::embed::XStorage >& r if( mxStore.is() && nCnt > 0 ) { mpInfos = &rInfos; - String aCN_Id( String::CreateFromAscii( "CN" ) ); + rtl::OUString aCN_Id("CN"); String s; s = GetContentPart( rInfos[ 0 ].Signer->getSubjectName(), aCN_Id ); @@ -370,7 +370,7 @@ void MacroWarning::SetCertificate( const cssu::Reference< css::security::XCertif mxCert = _rxCert; if( mxCert.is() ) { - String aCN_Id( String::CreateFromAscii( "CN" ) ); + rtl::OUString aCN_Id("CN"); String s; s = GetContentPart( mxCert->getSubjectName(), aCN_Id ); maSignsFI.SetText( s ); diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index fcf5a4c6e4ae..5603d4cefa34 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -584,7 +584,7 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt ) if ( rCommand.GetCommand() == COMMAND_CONTEXTMENU ) { PopupMenu aMenu; - aMenu.InsertItem( 1, String::CreateFromAscii( "copy to clipboard" ) ); + aMenu.InsertItem( 1, rtl::OUString("copy to clipboard") ); Point aPos; if ( rCommand.IsMouseEvent() ) diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 57f50f41314d..6d5a8f9d8e73 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -156,7 +156,7 @@ XubString Button::GetStandardText( StandardButtonType eButton ) // ok / cancel so add this only for Unix #ifdef UNX if( nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL ) - aText.Insert( String::CreateFromAscii("~"), 0 ); + aText.Insert( rtl::OUString("~"), 0 ); #endif } else diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 7dbf5706272b..8039ec0b7eac 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2261,8 +2261,8 @@ inline const ImplPdfBuiltinFontData* GetPdfFontData( const PhysicalFontFace* pFo static ImplDevFontAttributes GetDevFontAttributes( const PDFWriterImpl::BuiltinFont& rBuiltin ) { ImplDevFontAttributes aDFA; - aDFA.maName = String::CreateFromAscii( rBuiltin.m_pName ); - aDFA.maStyleName = String::CreateFromAscii( rBuiltin.m_pStyleName ); + aDFA.maName = rtl::OUString::createFromAscii( rBuiltin.m_pName ); + aDFA.maStyleName = rtl::OUString::createFromAscii( rBuiltin.m_pStyleName ); aDFA.meFamily = rBuiltin.m_eFamily; aDFA.mbSymbolFlag = (rBuiltin.m_eCharSet != RTL_TEXTENCODING_MS_1252 ); aDFA.mePitch = rBuiltin.m_ePitch; @@ -8260,7 +8260,7 @@ void PDFWriterImpl::drawStrikeoutChar( const Point& rPos, long nWidth, FontStrik //See qadevOOo/testdocs/StrikeThrough.odt for examples if you need //to tweak this - String aStrikeoutChar = String::CreateFromAscii( eStrikeout == STRIKEOUT_SLASH ? "/" : "X" ); + rtl::OUString aStrikeoutChar( eStrikeout == STRIKEOUT_SLASH ? "/" : "X" ); String aStrikeout = aStrikeoutChar; while( m_pReferenceDevice->GetTextWidth( aStrikeout ) < nWidth ) aStrikeout.Append( aStrikeout ); diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index b2c0f4240c48..25df9ba44a18 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -180,9 +180,9 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif utl::typeConvert( xCert->getNotValidBefore(), aDateTimeStart ); utl::typeConvert( xCert->getNotValidAfter(), aDateTimeEnd ); String sText = maValidDateFI.GetText(); - sText.SearchAndReplace( String::CreateFromAscii( "%SDATE%" ), + sText.SearchAndReplace( rtl::OUString( "%SDATE%" ), GetSettings().GetUILocaleDataWrapper().getDate( aDateTimeStart.GetDate() ) ); - sText.SearchAndReplace( String::CreateFromAscii( "%EDATE%" ), + sText.SearchAndReplace( rtl::OUString( "%EDATE%" ), GetSettings().GetUILocaleDataWrapper().getDate( aDateTimeEnd.GetDate() ) ); maValidDateFI.SetText( sText ); @@ -276,7 +276,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif String aLBEntry; String aDetails; // Certificate Versions are reported wrong (#i35107#) - 0 == "V1", 1 == "V2", ..., n = "V(n+1)" - aLBEntry = String::CreateFromAscii( "V" ); + aLBEntry = rtl::OUString( "V" ); aLBEntry += String::CreateFromInt32( xCert->getVersion() + 1 ); InsertElement( String( XMLSEC_RES( STR_VERSION ) ), aLBEntry, aLBEntry ); Sequence< sal_Int8 > aSeq = xCert->getSerialNumber(); @@ -293,12 +293,12 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif DateTime aDateTime( DateTime::EMPTY ); utl::typeConvert( xCert->getNotValidBefore(), aDateTime ); aLBEntry = GetSettings().GetUILocaleDataWrapper().getDate( aDateTime.GetDate() ); - aLBEntry += String::CreateFromAscii( " " ); + aLBEntry += rtl::OUString( " " ); aLBEntry += GetSettings().GetUILocaleDataWrapper().getTime( aDateTime.GetTime() ); InsertElement( String( XMLSEC_RES( STR_VALIDFROM ) ), aLBEntry, aLBEntry ); utl::typeConvert( xCert->getNotValidAfter(), aDateTime ); aLBEntry = GetSettings().GetUILocaleDataWrapper().getDate( aDateTime.GetDate() ); - aLBEntry += String::CreateFromAscii( " " ); + aLBEntry += rtl::OUString( " " ); aLBEntry += GetSettings().GetUILocaleDataWrapper().getTime( aDateTime.GetTime() ); InsertElement( String( XMLSEC_RES( STR_VALIDTO ) ), aLBEntry, aLBEntry ); |