ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

ditch String::CreateFromAscii

Browse Source 
Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691
This commit is contained in:
Caolán McNamara
2012-07-03 21:24:35 +01:00
parent 285289275d
commit bccf34c19a
353 changed files with 990 additions and 1054 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basctl/source/basicide/basobj2.cxx
+7 -7
View File
@@ -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;
}
basctl/source/basicide/iderdll.cxx
+1 -1
View File
@@ -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 );
basctl/source/basicide/macrodlg.cxx
+2 -4
View File
@@ -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 );
basctl/source/basicide/moduldl2.cxx
+1 -1
View File
@@ -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_ );
basic/source/basmgr/basmgr.cxx
+18 -18
View File
@@ -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
basic/source/classes/image.cxx
+1 -1
View File
@@ -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;
}
basic/source/classes/sb.cxx
+8 -8
View File
@@ -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() )
{
basic/source/comp/parser.cxx
+3 -3
View File
@@ -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 );
}
basic/source/runtime/ddectrl.cxx
+1 -1
View File
@@ -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;
}
)
basic/source/runtime/methods.cxx
+6 -6
View File
@@ -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
{
basic/source/runtime/methods1.cxx
+1 -1
View File
@@ -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 );
}
basic/source/runtime/sbdiagnose.cxx
+1 -1
View File
@@ -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 );
basic/source/runtime/stdobj.cxx
+3 -3
View File
@@ -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;
basic/source/sbx/sbxcoll.cxx
+8 -8
View File
@@ -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 );
}
basic/source/sbx/sbxobj.cxx
+4 -4
View File
@@ -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;
connectivity/source/drivers/dbase/DConnection.cxx
+1 -1
View File
@@ -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()
connectivity/source/drivers/dbase/DIndex.cxx
+2 -2
View File
@@ -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++)
connectivity/source/drivers/dbase/DTable.cxx
+7 -7
View File
@@ -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);
}
}
cui/source/customize/acccfg.cxx
+2 -2
View File
@@ -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 )
{
cui/source/customize/cfgutil.cxx
+1 -1
View File
@@ -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 );
cui/source/dialogs/cuicharmap.cxx
+1 -1
View File
@@ -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 );
cui/source/dialogs/cuiimapwnd.cxx
+1 -1
View File
@@ -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 );
}
cui/source/dialogs/hlinettp.cxx
+2 -4
View File
@@ -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
cui/source/dialogs/hlmailtp.cxx
+2 -4
View File
@@ -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
cui/source/dialogs/hltpbase.cxx
+5 -5
View File
@@ -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
cui/source/dialogs/multifil.cxx
+1 -1
View File
@@ -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 )
cui/source/dialogs/plfilter.cxx
+1 -1
View File
@@ -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;
cui/source/dialogs/scriptdlg.cxx
+8 -9
View File
@@ -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() ) );
cui/source/dialogs/thesdlg.cxx
+1 -3
View File
@@ -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;
cui/source/options/doclinkdialog.cxx
+2 -3
View File
@@ -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());
cui/source/options/fontsubs.cxx
+2 -2
View File
@@ -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;
cui/source/options/optgdlg.cxx
+3 -3
View File
@@ -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
cui/source/options/optinet2.cxx
+1 -1
View File
@@ -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() )
{
cui/source/options/optjava.cxx
+1 -1
View File
@@ -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 )
{
cui/source/options/optlingu.cxx
+1 -1
View File
@@ -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 -------------------------------------------------
cui/source/options/optpath.cxx
+1 -1
View File
@@ -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;
cui/source/options/treeopt.cxx
+8 -8
View File
@@ -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
}
}
cui/source/tabpages/grfpage.cxx
+1 -1
View File
@@ -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) {
cui/source/tabpages/macroass.cxx
+2 -2
View File
@@ -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 ) ) );
}
}
dbaccess/source/ui/browser/brwctrlr.cxx
+1 -1
View File
@@ -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!" );
dbaccess/source/ui/browser/sbagrid.cxx
+1 -1
View File
@@ -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;
}
dbaccess/source/ui/control/FieldDescControl.cxx
+5 -5
View File
@@ -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;
dbaccess/source/ui/dlg/DbAdminImpl.cxx
+3 -3
View File
@@ -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;
}
}
dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+2 -2
View File
@@ -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();
dbaccess/source/ui/dlg/admincontrols.cxx
+1 -1
View File
@@ -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
dbaccess/source/ui/dlg/dbadmin.cxx
+21 -21
View File
@@ -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();
dbaccess/source/ui/dlg/dbfindex.cxx
+2 -2
View File
@@ -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) );
dbaccess/source/ui/dlg/directsql.cxx
+4 -4
View File
@@ -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;
dbaccess/source/ui/dlg/generalpage.cxx
+1 -1
View File
@@ -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 )
{
dbaccess/source/ui/dlg/paramdialog.cxx
+1 -1
View File
@@ -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;
dbaccess/source/ui/misc/UITools.cxx
+3 -4
View File
@@ -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 )
{
dbaccess/source/ui/misc/WTypeSelect.cxx
+1 -1
View File
@@ -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);
dbaccess/source/ui/querydesign/QueryDesignView.cxx
+3 -3
View File
@@ -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(',');
}
}
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+5 -5
View File
@@ -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;
dbaccess/source/ui/querydesign/querycontroller.cxx
+1 -1
View File
@@ -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;
}
}
desktop/source/app/dispatchwatcher.cxx
+6 -2
View File
@@ -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;
editeng/source/items/paraitem.cxx
+2 -2
View File
@@ -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;
}
editeng/source/misc/acorrcfg.cxx
+1 -1
View File
@@ -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 );
extensions/source/abpilot/abpfinalpage.cxx
+1 -2
View File
@@ -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;
}
extensions/source/bibliography/datman.cxx
+4 -5
View File
@@ -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++ )
{
extensions/source/dbpilots/commonpagesdbp.cxx
+1 -2
View File
@@ -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 )
{
extensions/source/propctrlr/browserline.cxx
+1 -1
View File
@@ -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();
extensions/source/propctrlr/eformshelper.cxx
+1 -1
View File
@@ -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
extensions/source/propctrlr/fontdialog.cxx
+1 -1
View File
@@ -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();
extensions/source/propctrlr/formcomponenthandler.cxx
+2 -3
View File
@@ -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 )
{
extensions/source/propctrlr/standardcontrol.cxx
+1 -1
View File
@@ -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 );
extensions/source/propctrlr/usercontrol.cxx
+1 -1
View File
@@ -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 ) );
}
extensions/source/scanner/sane.cxx
+1 -1
View File
@@ -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;
extensions/source/scanner/sanedlg.cxx
+1 -1
View File
@@ -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;
filter/source/graphicfilter/icgm/actimpr.cxx
+3 -3
View File
@@ -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() )
filter/source/msfilter/msdffimp.cxx
+2 -2
View File
@@ -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;
}
}
filter/source/msfilter/msoleexp.cxx
+1 -1
View File
@@ -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;
}
}
forms/source/richtext/richtextvclcontrol.cxx
+2 -2
View File
@@ -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 )
forms/source/solar/control/navtoolbar.cxx
+4 -4
View File
@@ -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;
}
forms/source/xforms/binding.cxx
+1 -1
View File
@@ -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
formula/source/core/api/FormulaCompiler.cxx
+6 -6
View File
@@ -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;
}
}
fpicker/source/office/iodlgimp.cxx
+1 -1
View File
@@ -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();
framework/source/fwe/classes/addonmenu.cxx
+2 -4
View File
@@ -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;
framework/source/services/license.cxx
+1 -1
View File
@@ -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 );
framework/source/uiconfiguration/imagemanagerimpl.cxx
+3 -4
View File
@@ -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;
framework/source/uielement/macrosmenucontroller.cxx
+6 -6
View File
@@ -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;
framework/source/uielement/menubarmanager.cxx
+1 -3
View File
@@ -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;
idl/source/objects/bastype.cxx
+1 -1
View File
@@ -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( ')' );
idl/source/objects/module.cxx
+4 -4
View File
@@ -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 )
idl/source/prj/command.cxx
+4 -4
View File
@@ -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);
}
}
idl/source/prj/database.cxx
+1 -1
View File
@@ -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());
lingucomponent/source/lingutil/lingutil.cxx
+3 -3
View File
@@ -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_" );
linguistic/source/dicimp.cxx
-9
View File
@@ -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),
linguistic/source/dicimp.hxx
+1 -2
View File
@@ -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
linguistic/source/dlistimp.cxx
+6 -6
View File
@@ -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
linguistic/source/lngsvcmgr.cxx
+4 -4
View File
@@ -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();
lotuswordpro/source/filter/lwpnumericfmt.cxx
+6 -6
View File
@@ -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(")");
}
}
lotuswordpro/source/filter/lwpnumericfmt.hxx
+40 -40
View File
@@ -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
}
lotuswordpro/source/filter/lwptblformula.cxx
+22 -22
View File
@@ -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);
lotuswordpro/source/filter/lwptoc.cxx
+1 -1
View File
@@ -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;
}
oox/source/export/chartexport.cxx
+1 -1
View File
@@ -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;
}
padmin/source/adddlg.cxx
+6 -6
View File
@@ -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();
padmin/source/padialog.cxx
+1 -1
View File
@@ -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;
padmin/source/pamain.cxx
+1 -1
View File
@@ -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;
padmin/source/prtsetup.cxx
+1 -1
View File
@@ -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 );
}

Some files were not shown because too many files have changed in this diff Show More