[Libreoffice-commits] .: 6 commits - basic/source cui/source filter/source sc/source sd/source starmath/inc starmath/source svx/source sw/source tools/inc tools/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jun 28 05:54:48 PDT 2012
basic/source/basmgr/basicmanagerrepository.cxx | 4 -
basic/source/classes/eventatt.cxx | 3 -
basic/source/classes/sbxmod.cxx | 6 --
basic/source/comp/exprtree.cxx | 2
basic/source/runtime/methods.cxx | 7 +--
basic/source/runtime/methods1.cxx | 4 -
basic/source/runtime/step2.cxx | 2
basic/source/sbx/sbxform.cxx | 2
basic/source/sbx/sbxvar.cxx | 2
cui/source/dialogs/hldocntp.cxx | 5 --
cui/source/dialogs/hlinettp.cxx | 6 --
cui/source/dialogs/hlmailtp.cxx | 2
cui/source/dialogs/thesdlg.cxx | 2
cui/source/options/optpath.cxx | 10 ++--
cui/source/tabpages/numpages.cxx | 9 +---
cui/source/tabpages/tparea.cxx | 2
cui/source/tabpages/tpbitmap.cxx | 4 -
cui/source/tabpages/tpcolor.cxx | 4 -
cui/source/tabpages/tpgradnt.cxx | 2
cui/source/tabpages/tphatch.cxx | 2
cui/source/tabpages/tplnedef.cxx | 2
cui/source/tabpages/tplneend.cxx | 2
filter/source/graphicfilter/ios2met/ios2met.cxx | 2
sc/source/core/data/attrib.cxx | 10 ++--
sc/source/core/data/docpool.cxx | 8 +--
sc/source/core/data/drwlayer.cxx | 10 ++--
sc/source/core/data/global.cxx | 3 -
sc/source/core/data/stlpool.cxx | 4 -
sc/source/core/data/stlsheet.cxx | 2
sc/source/core/tool/docoptio.cxx | 2
sc/source/core/tool/viewopti.cxx | 2
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/app/msgpool.cxx | 2
sc/source/ui/app/scmod.cxx | 8 +--
sc/source/ui/app/uiitems.cxx | 18 ++++----
sc/source/ui/docshell/docsh.cxx | 8 +--
sc/source/ui/docshell/docsh3.cxx | 7 +--
sc/source/ui/drawfunc/chartsh.cxx | 2
sc/source/ui/drawfunc/drawsh2.cxx | 2
sc/source/ui/drawfunc/drformsh.cxx | 2
sc/source/ui/drawfunc/drtxtob.cxx | 2
sc/source/ui/drawfunc/graphsh.cxx | 2
sc/source/ui/drawfunc/oleobjsh.cxx | 2
sc/source/ui/formdlg/dwfunctr.cxx | 11 ++--
sc/source/ui/miscdlgs/acredlin.cxx | 2
sc/source/ui/miscdlgs/crnrdlg.cxx | 2
sc/source/ui/miscdlgs/mtrindlg.cxx | 2
sc/source/ui/navipi/navipi.cxx | 2
sc/source/ui/unoobj/chartuno.cxx | 2
sc/source/ui/unoobj/textuno.cxx | 2
sc/source/ui/view/auditsh.cxx | 2
sc/source/ui/view/cellsh.cxx | 5 --
sc/source/ui/view/editsh.cxx | 4 -
sc/source/ui/view/formatsh.cxx | 2
sc/source/ui/view/hdrcont.cxx | 5 --
sc/source/ui/view/output2.cxx | 12 ++---
sc/source/ui/view/pgbrksh.cxx | 2
sc/source/ui/view/pivotsh.cxx | 2
sc/source/ui/view/prevwsh.cxx | 4 -
sc/source/ui/view/printfun.cxx | 3 -
sc/source/ui/view/tabview4.cxx | 8 +--
sc/source/ui/view/tabvwsh4.cxx | 2
sc/source/ui/view/tabvwsh9.cxx | 2
sc/source/ui/view/viewdata.cxx | 2
sc/source/ui/view/viewfun2.cxx | 7 +--
sc/source/ui/view/viewfun3.cxx | 12 +----
sd/source/core/sdpage.cxx | 4 -
sd/source/ui/func/fuconstr.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 4 -
sd/source/ui/unoidl/sddetect.cxx | 17 +++----
starmath/inc/utility.hxx | 3 -
starmath/source/document.cxx | 14 +++---
starmath/source/edit.cxx | 6 +-
starmath/source/format.cxx | 8 +--
starmath/source/mathtype.cxx | 8 +--
starmath/source/node.cxx | 4 -
starmath/source/smdetect.cxx | 2
starmath/source/smmod.cxx | 2
starmath/source/symbol.cxx | 4 -
starmath/source/view.cxx | 4 -
svx/source/dialog/linkwarn.cxx | 4 -
svx/source/dialog/pfiledlg.cxx | 2
svx/source/dialog/svxbmpnumvalueset.cxx | 3 -
sw/source/filter/html/swhtml.cxx | 6 --
sw/source/filter/rtf/rtfnum.cxx | 35 ++++++++++++---
sw/source/filter/ww1/w1class.cxx | 2
sw/source/filter/ww8/writerwordglue.cxx | 22 ++++-----
sw/source/filter/ww8/wrtw8esh.cxx | 2
sw/source/filter/ww8/wrtw8num.cxx | 2
sw/source/filter/ww8/wrtw8sty.cxx | 10 ++--
sw/source/filter/ww8/wrtww8.cxx | 16 +++----
sw/source/filter/ww8/wrtww8gr.cxx | 4 -
sw/source/filter/ww8/ww8atr.cxx | 4 -
sw/source/filter/ww8/ww8par.cxx | 10 ++--
sw/source/filter/ww8/ww8par2.cxx | 6 +-
sw/source/filter/ww8/ww8par3.cxx | 10 ++--
sw/source/filter/ww8/ww8par4.cxx | 10 ++--
sw/source/filter/ww8/ww8par5.cxx | 22 ++++-----
sw/source/filter/xml/wrtxml.cxx | 10 +---
sw/source/ui/dochdl/swdtflvr.cxx | 3 -
sw/source/ui/envelp/labelexp.cxx | 3 -
sw/source/ui/fldui/flddb.cxx | 6 --
sw/source/ui/fldui/flddinf.cxx | 3 -
sw/source/ui/fldui/flddok.cxx | 3 -
sw/source/ui/fldui/fldfunc.cxx | 3 -
sw/source/ui/fldui/fldmgr.cxx | 3 -
sw/source/ui/fldui/fldref.cxx | 3 -
sw/source/ui/index/cntex.cxx | 5 --
sw/source/ui/index/cnttab.cxx | 14 ++----
sw/source/ui/misc/glosdoc.cxx | 7 +--
sw/source/ui/uiview/viewport.cxx | 3 -
tools/inc/tools/inetmsg.hxx | 54 ++++++++++++------------
tools/source/inet/inetmsg.cxx | 40 ++++-------------
tools/source/inet/inetstrm.cxx | 9 +---
tools/source/string/tustring.cxx | 6 --
unusedcode.easy | 1
116 files changed, 329 insertions(+), 380 deletions(-)
New commits:
commit ba23ece286671f8f9b5baf245239996e1e1fabdb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 28 12:18:31 2012 +0100
probably the last uses of the one argument String::CreateFromAscii variant
Change-Id: I36aab317da2f69f12aaefc24895ad9eaa6b69a7c
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 8d0c2eb..f3ef0b1 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -297,14 +297,14 @@ namespace basic
SvtPathOptions aPathCFG;
String aAppBasicDir( aPathCFG.GetBasicPath() );
if ( !aAppBasicDir.Len() )
- aPathCFG.SetBasicPath( String::CreateFromAscii("$(prog)") );
+ aPathCFG.SetBasicPath(rtl::OUString("$(prog)"));
// soffice.new search only in user dir => first dir
String aAppFirstBasicDir = aAppBasicDir.GetToken(1);
// Create basic and load it
// AppBasicDir is now a PATH
- INetURLObject aAppBasic( SvtPathOptions().SubstituteVariable( String::CreateFromAscii("$(progurl)") ) );
+ INetURLObject aAppBasic( SvtPathOptions().SubstituteVariable(rtl::OUString("$(progurl)")) );
aAppBasic.insertName( Application::GetAppName() );
BasicManager* pBasicManager = new BasicManager( new StarBASIC, &aAppBasicDir );
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 06b055f..d535eee 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -349,8 +349,7 @@ Any implFindDialogLibForDialog( const Any& rDlgAny, SbxObject* pBasic )
{
Any aRetDlgLibAny;
- SbxVariable* pDlgLibContVar = pBasic->Find
- ( String::CreateFromAscii("DialogLibraries"), SbxCLASS_OBJECT );
+ SbxVariable* pDlgLibContVar = pBasic->Find(rtl::OUString("DialogLibraries"), SbxCLASS_OBJECT);
if( pDlgLibContVar && pDlgLibContVar->ISA(SbUnoObject) )
{
SbUnoObject* pDlgLibContUnoObj = (SbUnoObject*)(SbxBase*)pDlgLibContVar;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index a676fc8..e31ceeb 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1093,8 +1093,6 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
{
OSL_TRACE("About to run %s, vba compatmode is %d", rtl::OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), mbVBACompat );
static sal_uInt16 nMaxCallLevel = 0;
- static String aMSOMacroRuntimeLibName = String::CreateFromAscii( "Launcher" );
- static String aMSOMacroRuntimeAppSymbol = String::CreateFromAscii( "Application" );
sal_uInt16 nRes = 0;
sal_Bool bDelInst = sal_Bool( GetSbData()->pInst == NULL );
@@ -1129,7 +1127,7 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
// Launcher problem
// i80726 The Find below will genarate an error in Testtool so we reset it unless there was one before already
sal_Bool bWasError = SbxBase::GetError() != 0;
- SbxVariable* pMSOMacroRuntimeLibVar = Find( aMSOMacroRuntimeLibName, SbxCLASS_OBJECT );
+ SbxVariable* pMSOMacroRuntimeLibVar = Find( rtl::OUString("Launcher"), SbxCLASS_OBJECT );
if ( !bWasError && (SbxBase::GetError() == SbxERR_PROC_UNDEFINED) )
SbxBase::ResetError();
if( pMSOMacroRuntimeLibVar )
@@ -1139,7 +1137,7 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
{
sal_uInt16 nGblFlag = pMSOMacroRuntimeLib->GetFlags() & SBX_GBLSEARCH;
pMSOMacroRuntimeLib->ResetFlag( SBX_GBLSEARCH );
- SbxVariable* pAppSymbol = pMSOMacroRuntimeLib->Find( aMSOMacroRuntimeAppSymbol, SbxCLASS_METHOD );
+ SbxVariable* pAppSymbol = pMSOMacroRuntimeLib->Find( rtl::OUString("Application"), SbxCLASS_METHOD );
pMSOMacroRuntimeLib->SetFlag( nGblFlag );
if( pAppSymbol )
{
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 02db392..79eeedf 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -142,7 +142,7 @@ static SbiSymDef* AddSym
sal_uInt16 n = 1;
for( short i = 0; i < pPar->GetSize(); i++ )
{
- String aPar = String::CreateFromAscii( "PAR" );
+ String aPar = rtl::OUString("PAR");
aPar += ++n;
pProc->GetParams().AddSym( aPar );
}
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 9943ad3..4f6680c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -56,6 +56,7 @@
#include "errobject.hxx"
#include <comphelper/processfactory.hxx>
+#include <comphelper/string.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/util/DateTime.hpp>
@@ -2375,7 +2376,6 @@ RTLFUNC(IsMissing)
// Function looks for wildcards, removes them and always returns the pure path
String implSetupWildcard( const String& rFileParam, SbiRTLData* pRTLData )
{
- static String aAsterisk = String::CreateFromAscii( "*" );
static sal_Char cDelim1 = (sal_Char)'/';
static sal_Char cDelim2 = (sal_Char)'\\';
static sal_Char cWild1 = '*';
@@ -2410,7 +2410,7 @@ String implSetupWildcard( const String& rFileParam, SbiRTLData* pRTLData )
return aPathStr;
}
- String aPureFileName;
+ rtl::OUString aPureFileName;
if( nLastDelim == STRING_NOTFOUND )
{
aPureFileName = aFileParam;
@@ -2424,11 +2424,10 @@ String implSetupWildcard( const String& rFileParam, SbiRTLData* pRTLData )
// Try again to get a valid URL/UNC-path with only the path
String aPathStr = getFullPath( aFileParam );
- xub_StrLen nPureLen = aPureFileName.Len();
// Is there a pure file name left? Otherwise the path is
// invalid anyway because it was not accepted by OSL before
- if( nPureLen && aPureFileName != aAsterisk )
+ if (comphelper::string::equals(aPureFileName, '*'))
{
pRTLData->pWildCard = new WildCard( aPureFileName );
}
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 42ea005..19f4823 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1631,7 +1631,7 @@ RTLFUNC(Join)
if( nParCount == 3 )
aDelim = rPar.Get(2)->GetString();
else
- aDelim = String::CreateFromAscii( " " );
+ aDelim = rtl::OUString(" ");
String aRetStr;
short nLower, nUpper;
@@ -1671,7 +1671,7 @@ RTLFUNC(Split)
if( nParCount >= 3 )
aDelim = rPar.Get(2)->GetString();
else
- aDelim = String::CreateFromAscii( " " );
+ aDelim = rtl::OUString(" ");
sal_Int32 nCount = -1;
if( nParCount == 4 )
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 05d1d22..d6d97a5 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -89,7 +89,7 @@ SbxVariable* SbiRuntime::FindElement
PushVar( p );
StepARGV();
nOp1 = nOp1 | 0x8000; // indicate params are present
- aName = String::CreateFromAscii("Evaluate");
+ aName = rtl::OUString("Evaluate");
}
if( bLocal )
{
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index 0961774..abcb2ec 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -972,7 +972,7 @@ String SbxBasicFormater::BasicFormat( double dNumber, String sFormatStrg )
{
if( sNegFormatStrg.Len() == 0 && bPosFormatFound )
{
- sTempStrg = String::CreateFromAscii("-");
+ sTempStrg = rtl::OUString("-");
sTempStrg += sPosFormatStrg;
}
else
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 96d9bc4..61092c5 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -387,7 +387,7 @@ void SbxVariable::SetParent( SbxObject* p )
}
if ( !bFound )
{
- String aMsg = String::CreateFromAscii( "dangling: [" );
+ String aMsg = rtl::OUString("dangling: [");
aMsg += GetName();
aMsg.AppendAscii( "].SetParent([" );
aMsg += p->GetName();
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 0e3af31..628f7f9 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -354,9 +354,8 @@ void SvxHyperlinkNewDocTp::DoApply ()
// create items
SfxStringItem aName( SID_FILE_NAME, aStrDocName );
- SfxStringItem aReferer( SID_REFERER, UniString::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) );
- SfxStringItem aFrame( SID_TARGETNAME, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_blank" ) ) );
+ SfxStringItem aReferer( SID_REFERER, rtl::OUString("private:user") );
+ SfxStringItem aFrame( SID_TARGETNAME, rtl::OUString("_blank") );
String aStrFlags ( sal_Unicode('S') );
if ( maRbtEditLater.IsChecked() )
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index ea7f2ad..8957a14 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -427,10 +427,8 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl)
/////////////////////////////////////////////////
// Open URL if available
- SfxStringItem aName( SID_FILE_NAME, UniString::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( "http://" ) ) );
- SfxStringItem aRefererItem( SID_REFERER, UniString::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) );
+ SfxStringItem aName( SID_FILE_NAME, rtl::OUString("http://") );
+ SfxStringItem aRefererItem( SID_REFERER, rtl::OUString("private:user") );
SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True );
SfxBoolItem aSilent( SID_SILENT, sal_True );
SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True );
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 0f84219..476ab9a 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -170,7 +170,7 @@ String SvxHyperlinkMailTp::CreateAbsoluteURL() const
{
if ( maEdSubject.GetText() != aEmptyStr )
{
- String aQuery = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "subject=" ) );
+ String aQuery = rtl::OUString("subject=");
aQuery.Append( maEdSubject.GetText() );
aURL.SetParam(aQuery);
}
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 0328a59..4c47b37 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -670,7 +670,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage )
// adjust language
String aStr( GetText() );
aStr.Erase( aStr.Search( sal_Unicode( '(' ) ) - 1 );
- aStr.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ) );
+ aStr.Append( rtl::OUString(" (") );
aStr += SvtLanguageTable().GetLanguageString( nLanguage );
aStr.Append( sal_Unicode( ')' ) );
SetText( aStr ); // set window title
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5dac4d4..4c0f03b 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -76,11 +76,11 @@ using namespace svx;
#define ITEMID_TYPE 1
#define ITEMID_PATH 2
-#define POSTFIX_INTERNAL String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_internal" ) )
-#define POSTFIX_USER String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_user" ) )
-#define POSTFIX_WRITABLE String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_writable" ) )
-#define VAR_ONE String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "%1" ) )
-#define IODLG_CONFIGNAME String(DEFINE_CONST_UNICODE("FilePicker_Save"))
+#define POSTFIX_INTERNAL rtl::OUString("_internal")
+#define POSTFIX_USER rtl::OUString("_user")
+#define POSTFIX_WRITABLE rtl::OUString("_writable")
+#define VAR_ONE rtl::OUString("%1")
+#define IODLG_CONFIGNAME rtl::OUString("FilePicker_Save")
// struct OptPath_Impl ---------------------------------------------------
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 2d13aa7..8936ebc 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -170,8 +170,7 @@ sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
Font& lcl_GetDefaultBulletFont()
{
static sal_Bool bInit = 0;
- static Font aDefBulletFont( UniString::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ),
+ static Font aDefBulletFont( rtl::OUString("StarSymbol"),
String(), Size( 0, 14 ) );
if(!bInit)
{
@@ -1287,7 +1286,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
aLevelLB.InsertEntry( UniString::CreateFromInt32(i));
if(pSaveNum->GetLevelCount() > 1)
{
- String sEntry( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "1 - " ) ) );
+ String sEntry(rtl::OUString("1 - "));
sEntry += UniString::CreateFromInt32( pSaveNum->GetLevelCount() );
aLevelLB.InsertEntry(sEntry);
aLevelLB.SelectEntry(sEntry);
@@ -2712,7 +2711,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
Point aPos(250,0);
pDebugFixedText->SetPosSizePixel(aPos, aSize);
- pDebugFixedText->SetText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Das ist ein Debug-Text" ) ) );
+ pDebugFixedText->SetText(rtl::OUString("Das ist ein Debug-Text"));
#endif
aStandardPB.SetAccessibleRelationMemberOf(&aPositionFL);
@@ -3045,7 +3044,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
aLevelLB.InsertEntry(UniString::CreateFromInt32(i));
if(pSaveNum->GetLevelCount() > 1)
{
- String sEntry( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "1 - ") ) );
+ String sEntry(rtl::OUString("1 - "));
sEntry.Append( UniString::CreateFromInt32( pSaveNum->GetLevelCount() ) );
aLevelLB.InsertEntry(sEntry);
aLevelLB.SelectEntry(sEntry);
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index e29dd2c..ea2c812 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -2244,7 +2244,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
if( aTsbStepCount.GetState() == STATE_NOCHECK )
{
if( aNumFldStepCount.GetText().Len() == 0 )
- aNumFldStepCount.SetText( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "64") ));
+ aNumFldStepCount.SetText(rtl::OUString("64"));
aNumFldStepCount.Enable();
}
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 01adb76..80880f1 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -706,7 +706,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
{
ResMgr& rMgr = CUI_MGR();
- SvxOpenGraphicDialog aDlg( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Import" ) ) );
+ SvxOpenGraphicDialog aDlg(rtl::OUString("Import"));
aDlg.EnableLink(sal_False);
if( !aDlg.Execute() )
@@ -1014,7 +1014,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl)
aFile.Append( pBitmapList->GetName() );
if( aFile.getExtension().isEmpty() )
- aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sob" ) ) );
+ aFile.SetExtension(rtl::OUString("sob"));
}
aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index bf027bc..8f5cfc0 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -990,7 +990,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
case CM_RGB:
{
String aStr( aLbColorModel.GetSelectEntry() );
- String aColorStr( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "~X" ) ) );
+ String aColorStr(rtl::OUString("~X"));
xub_StrLen nIdx = 1;
aColorStr.SetChar( nIdx, aStr.GetChar( 0 ) );
aFtColorModel1.SetText( aColorStr );
@@ -1035,7 +1035,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
case CM_CMYK:
{
String aStr( aLbColorModel.GetSelectEntry() );
- String aColorStr( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "~X" ) ) );
+ String aColorStr(rtl::OUString("~X"));
xub_StrLen nIdx = 1;
aColorStr.SetChar( nIdx, aStr.GetChar( 0 ) );
aFtColorModel1.SetText( aColorStr );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 39802fc..46b60ee 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -734,7 +734,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
aFile.Append( pGradientList->GetName() );
if( aFile.getExtension().isEmpty() )
- aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sog" ) ) );
+ aFile.SetExtension(rtl::OUString("sog"));
}
aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 678763e..e86eecc 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -770,7 +770,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
aFile.Append( pHatchingList->GetName() );
if( aFile.getExtension().isEmpty() )
- aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "soh" ) ) );
+ aFile.SetExtension(rtl::OUString("soh"));
}
aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 72563d2..825e9b7 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -834,7 +834,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
aFile.Append( pDashList->GetName() );
if( aFile.getExtension().isEmpty() )
- aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sod" ) ) );
+ aFile.SetExtension(rtl::OUString("sod"));
}
aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 460b9ed..e2d8c0f 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -633,7 +633,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl)
aFile.Append( pLineEndList->GetName() );
if( aFile.getExtension().isEmpty() )
- aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "soe" ) ) );
+ aFile.SetExtension(rtl::OUString("soe"));
}
aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index be8d38a..c5f2402 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2265,7 +2265,7 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize)
str[ 32 ] = 0;
String aStr( (const sal_Char*)str, osl_getThreadTextEncoding() );
if ( aStr.CompareIgnoreCaseToAscii( "Helv" ) == COMPARE_EQUAL )
- aStr = String::CreateFromAscii( "Helvetica" );
+ aStr = rtl::OUString("Helvetica");
pF->aFont.SetName( aStr );
break;
}
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 17c0f9d..0c51238 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -335,8 +335,8 @@ SfxItemPresentation ScProtectionAttr::GetPresentation
{
String aStrYes ( ScGlobal::GetRscString(STR_YES) );
String aStrNo ( ScGlobal::GetRscString(STR_NO) );
- String aStrSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( ": " ));
- String aStrDelim = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( ", " ));
+ rtl::OUString aStrSep(": ");
+ rtl::OUString aStrDelim( ", ");
switch ( ePres )
{
@@ -716,7 +716,7 @@ bool ScPageHFItem::PutValue( const uno::Any& rVal, sal_uInt8 /* nMemberId */ )
String ScPageHFItem::GetValueText() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScPageHFItem"));
+ return rtl::OUString("ScPageHFItem");
}
//------------------------------------------------------------------------
@@ -953,7 +953,7 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation
const IntlWrapper* /* pIntl */
) const
{
- String aDel = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(": "));
+ rtl::OUString aDel(": ");
rText.Erase();
switch ( ePres )
@@ -1070,7 +1070,7 @@ ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem )
String ScDoubleItem::GetValueText() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScDoubleItem"));
+ return rtl::OUString("ScDoubleItem");
}
//------------------------------------------------------------------------
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 9fa6bca..f2c9661 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -193,7 +193,7 @@ static SfxItemInfo const aItemInfos[] =
ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts )
- : SfxItemPool ( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScDocumentPool")),
+ : SfxItemPool ( rtl::OUString("ScDocumentPool"),
ATTR_STARTINDEX, ATTR_ENDINDEX,
aItemInfos, NULL, bLoadRefCounts ),
pSecondary ( pSecPool )
@@ -298,7 +298,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts )
ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) );
else
ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet,
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_STANDARD)) ); //! without name?
+ rtl::OUString(STRING_STANDARD) ); //! without name?
ppPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE );
ppPoolDefaults[ ATTR_ULSPACE - ATTR_STARTINDEX ] = new SvxULSpaceItem( ATTR_ULSPACE );
@@ -703,7 +703,7 @@ SfxItemPresentation lcl_HFPresentation
SfxItemIter aIter( rSet );
pItem = aIter.FirstItem();
String aText;
- String aDel = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( " + " ));
+ rtl::OUString aDel(" + ");
while( pItem )
{
@@ -793,7 +793,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
sal_uInt16 nW = rItem.Which();
String aStrYes ( ScGlobal::GetRscString(STR_YES) );
String aStrNo ( ScGlobal::GetRscString(STR_NO) );
- String aStrSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(": "));
+ rtl::OUString aStrSep(": ");
switch( nW )
{
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index bc8a2b0..4770347 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -263,11 +263,11 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
rPool.FreezeIdRanges(); // the pool is also used directly
SdrLayerAdmin& rAdmin = GetLayerAdmin();
- rAdmin.NewLayer(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("vorne")), SC_LAYER_FRONT);
- rAdmin.NewLayer(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("hinten")), SC_LAYER_BACK);
- rAdmin.NewLayer(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("intern")), SC_LAYER_INTERN);
- rAdmin.NewLayer(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Controls")), SC_LAYER_CONTROLS);
- rAdmin.NewLayer(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("hidden")), SC_LAYER_HIDDEN);
+ rAdmin.NewLayer(rtl::OUString("vorne"), SC_LAYER_FRONT);
+ rAdmin.NewLayer(rtl::OUString("hinten"), SC_LAYER_BACK);
+ rAdmin.NewLayer(rtl::OUString("intern"), SC_LAYER_INTERN);
+ rAdmin.NewLayer(rtl::OUString("Controls"), SC_LAYER_CONTROLS);
+ rAdmin.NewLayer(rtl::OUString("hidden"), SC_LAYER_HIDDEN);
// "Controls" is new - must also be created when loading
// Link fuer URL-Fields setzen
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 635281c..b646b6f 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -921,8 +921,7 @@ void ScGlobal::OpenURL( const String& rURL, const String& rTarget )
SfxStringItem aTarget( SID_TARGETNAME, rTarget );
if ( nScClickMouseModifier & KEY_MOD1 ) // control-click -> into new window
- aTarget.SetValue(
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("_blank")) );
+ aTarget.SetValue(rtl::OUString("_blank"));
SfxViewFrame* pFrame = NULL;
String aReferName;
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 96e7cfb..66eef1d 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -446,7 +446,7 @@ void ScStyleSheetPool::CreateStandardStyles()
// Kopfzeile:
// [\TABELLE\ (\DATEI\)][leer][\DATUM\, \ZEIT\]
//----------------------------------------
- aStr = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(" ()"));
+ aStr = rtl::OUString(" ()");
pEdEngine->SetText( aStr );
pEdEngine->QuickInsertField( SvxFieldItem(SvxFileField(), EE_FEATURE_FIELD), ESelection(0,2,0,2) );
pEdEngine->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection() );
@@ -454,7 +454,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pHeaderItem->SetLeftArea( *pTxtObj );
pHeaderItem->SetCenterArea( *pEmptyTxtObj );
DELETEZ( pTxtObj );
- aStr = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+ aStr = rtl::OUString(", ");
pEdEngine->SetText( aStr );
pEdEngine->QuickInsertField( SvxFieldItem(SvxTimeField(), EE_FEATURE_FIELD), ESelection(0,2,0,2) );
pEdEngine->QuickInsertField( SvxFieldItem(SvxDateField(Date( Date::SYSTEM ),SVXDATETYPE_VAR), EE_FEATURE_FIELD),
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index d99797b..e13f0ec 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -336,7 +336,7 @@ const String& ScStyleSheet::GetFollow() const
sal_Bool ScStyleSheet::SetName( const String& rNew )
{
- String aFileStdName = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_STANDARD));
+ String aFileStdName = rtl::OUString(STRING_STANDARD);
if ( rNew == aFileStdName && aFileStdName != ScGlobal::GetRscString(STR_STYLENAME_STANDARD) )
return false;
else
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 6be2114..6edad4e 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -154,7 +154,7 @@ ScTpCalcItem::~ScTpCalcItem()
String ScTpCalcItem::GetValueText() const
{
- return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("ScTpCalcItem") );
+ return rtl::OUString("ScTpCalcItem");
}
//------------------------------------------------------------------------
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index fe89db8..353ca32 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -262,7 +262,7 @@ ScTpViewItem::~ScTpViewItem()
String ScTpViewItem::GetValueText() const
{
- return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("ScTpViewItem") );
+ return rtl::OUString("ScTpViewItem");
}
//------------------------------------------------------------------------
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index f8c69a4..f857d8f 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2038,7 +2038,7 @@ ScPosWnd::ScPosWnd( Window* pParent ) :
nTipVisible ( 0 ),
bFormulaMode( false )
{
- Size aSize( GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("GW99999:GW99999")) ),
+ Size aSize( GetTextWidth( rtl::OUString("GW99999:GW99999") ),
GetTextHeight() );
aSize.Width() += 25; // ??
aSize.Height() = CalcWindowSizePixel(11); // Funktionen: 10 MRU + "andere..."
diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx
index ece7ce6..0d8a010 100644
--- a/sc/source/ui/app/msgpool.cxx
+++ b/sc/source/ui/app/msgpool.cxx
@@ -52,7 +52,7 @@ static SfxItemInfo const aMsgItemInfos[] =
//------------------------------------------------------------------------
ScMessagePool::ScMessagePool()
- : SfxItemPool ( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScMessagePool")),
+ : SfxItemPool ( rtl::OUString("ScMessagePool"),
MSGPOOL_START, MSGPOOL_END,
aMsgItemInfos, NULL ),
//
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 602cfe9..5d424ab 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -158,7 +158,7 @@ ScModule::ScModule( SfxObjectFactory* pFact ) :
{
// im ctor ist der ResManager (DLL-Daten) noch nicht initialisiert!
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("StarCalc"))); // fuer Basic
+ SetName(rtl::OUString("StarCalc")); // fuer Basic
ResetDragObject();
SetClipObject( NULL, NULL );
@@ -386,15 +386,13 @@ void ScModule::Execute( SfxRequest& rReq )
{
case SID_CHOOSE_DESIGN:
{
- String aMacroName =
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Template.Samples.ShowStyles"));
+ rtl::OUString aMacroName("Template.Samples.ShowStyles");
SfxApplication::CallAppBasic( aMacroName );
}
break;
case SID_EURO_CONVERTER:
{
- String aMacroName =
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Euro.ConvertRun.Main"));
+ rtl::OUString aMacroName("Euro.ConvertRun.Main");
SfxApplication::CallAppBasic( aMacroName );
}
break;
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index a03fb39..ddddf2e 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -86,7 +86,7 @@ ScInputStatusItem::~ScInputStatusItem()
String ScInputStatusItem::GetValueText() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("InputStatus"));
+ return rtl::OUString("InputStatus");
}
int ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const
@@ -194,7 +194,7 @@ ScSortItem::~ScSortItem()
String ScSortItem::GetValueText() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("SortItem"));
+ return rtl::OUString("SortItem");
}
//------------------------------------------------------------------------
@@ -301,7 +301,7 @@ bool ScQueryItem::GetAdvancedQuerySource(ScRange& rSource) const
String ScQueryItem::GetValueText() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("QueryItem"));
+ return rtl::OUString("QueryItem");
}
//------------------------------------------------------------------------
@@ -365,7 +365,7 @@ ScSubTotalItem::~ScSubTotalItem()
String ScSubTotalItem::GetValueText() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("SubTotalItem"));
+ return rtl::OUString("SubTotalItem");
}
//------------------------------------------------------------------------
@@ -426,7 +426,7 @@ ScUserListItem::~ScUserListItem()
String ScUserListItem::GetValueText() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScUserListItem"));
+ return rtl::OUString("ScUserListItem");
}
//------------------------------------------------------------------------
@@ -492,7 +492,7 @@ ScConsolidateItem::~ScConsolidateItem()
String ScConsolidateItem::GetValueText() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScConsolidateItem"));
+ return rtl::OUString("ScConsolidateItem");
}
//------------------------------------------------------------------------
@@ -553,7 +553,7 @@ ScPivotItem::~ScPivotItem()
String ScPivotItem::GetValueText() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScPivotItem"));
+ return rtl::OUString("ScPivotItem");
}
//------------------------------------------------------------------------
@@ -606,7 +606,7 @@ ScSolveItem::~ScSolveItem()
String ScSolveItem::GetValueText() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScSolveItem"));
+ return rtl::OUString("ScSolveItem");
}
//------------------------------------------------------------------------
@@ -656,7 +656,7 @@ ScTabOpItem::~ScTabOpItem()
String ScTabOpItem::GetValueText() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScTabOpItem"));
+ return rtl::OUString("ScTabOpItem");
}
//------------------------------------------------------------------------
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index e70cf2d..7c9d0a4 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2227,7 +2227,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed )
INetURLObject aTmpFile( rMed.GetPhysicalName(), INET_PROT_FILE );
if ( bHasMemo )
- aTmpFile.setExtension( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("dbt")) );
+ aTmpFile.setExtension(rtl::OUString("dbt"));
if ( eError != eERR_OK )
{
if (!GetError())
@@ -2243,7 +2243,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed )
SfxStringItem* pNameItem =
(SfxStringItem*) rMed.GetItemSet()->GetItem( SID_FILE_NAME );
INetURLObject aDbtFile( pNameItem->GetValue(), INET_PROT_FILE );
- aDbtFile.setExtension( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("dbt")) );
+ aDbtFile.setExtension(rtl::OUString("dbt"));
if ( IsDocument( aDbtFile ) && !KillFile( aDbtFile ) )
bRet = false;
if ( bRet && !MoveFile( aTmpFile, aDbtFile ) )
@@ -2510,7 +2510,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) :
SfxObjectShell( rShell.GetCreateMode() ),
SfxListener(),
aDocument ( SCDOCMODE_DOCUMENT, this ),
- aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TEXT"))),
+ aDdeTextFmt(rtl::OUString("TEXT")),
nPrtToScreenFactor( 1.0 ),
pImpl ( new DocShell_Impl ),
bHeaderOn ( true ),
@@ -2556,7 +2556,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) :
ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
SfxObjectShell( i_nSfxCreationFlags ),
aDocument ( SCDOCMODE_DOCUMENT, this ),
- aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TEXT"))),
+ aDdeTextFmt(rtl::OUString("TEXT")),
nPrtToScreenFactor( 1.0 ),
pImpl ( new DocShell_Impl ),
bHeaderOn ( true ),
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 1672492..394afb3 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -375,8 +375,8 @@ void ScDocShell::CalcOutputFactor()
return;
}
- String aTestString = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890123456789" ));
+ rtl::OUString aTestString(
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890123456789");
long nPrinterWidth = 0;
long nWindowWidth = 0;
const ScPatternAttr* pPattern = (const ScPatternAttr*)&aDocument.GetPool()->
@@ -860,8 +860,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
return; //! nichts zu tun - Fehlermeldung?
// ab hier kein return mehr
- ScProgress aProgress( this,
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("...")),
+ ScProgress aProgress( this, rtl::OUString("..."),
nNewActionCount );
sal_uLong nLastMergeAction = pSourceTrack->GetLast()->GetActionNumber();
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 44f1c6c..4140633 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -53,7 +53,7 @@ ScChartShell::ScChartShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId(HID_SCSHELL_CHARTSH);
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ChartObject")));
+ SetName(rtl::OUString("ChartObject"));
}
ScChartShell::~ScChartShell()
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 87cf0b5..09668e1 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -72,7 +72,7 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) :
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId( HID_SCSHELL_DRAWSH );
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Drawing")));
+ SetName(rtl::OUString("Drawing"));
}
ScDrawShell::~ScDrawShell()
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 036b157..08542be 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -53,7 +53,7 @@ ScDrawFormShell::ScDrawFormShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId(HID_SCSHELL_DRAWFORMSH);
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("DrawForm")));
+ SetName(rtl::OUString("DrawForm"));
}
ScDrawFormShell::~ScDrawFormShell()
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 9029b5c..170804c 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -129,7 +129,7 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) :
}
SetHelpId( HID_SCSHELL_DRTXTOB );
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("DrawText")));
+ SetName(rtl::OUString("DrawText"));
}
ScDrawTextObjectBar::~ScDrawTextObjectBar()
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 655df34..92a2899 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -87,7 +87,7 @@ ScGraphicShell::ScGraphicShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId(HID_SCSHELL_GRAPHIC);
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("GraphicObject")));
+ SetName(rtl::OUString("GraphicObject"));
}
ScGraphicShell::~ScGraphicShell()
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index a414281..fdf06d9 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -53,7 +53,7 @@ ScOleObjectShell::ScOleObjectShell(ScViewData* pData) :
ScDrawShell(pData)
{
SetHelpId(HID_SCSHELL_OLEOBEJCTSH);
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("OleObject")));
+ SetName(rtl::OUString("OleObject"));
}
ScOleObjectShell::~ScOleObjectShell()
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 093b579..e331108 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -147,7 +147,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
StartListening( *pBindingsP, sal_True );
Point aTopLeft=aCatBox.GetPosPixel();
- String aString=String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ww"));
+ rtl::OUString aString("ww");
Size aTxtSize( aFiFuncDesc.GetTextWidth(aString), aFiFuncDesc.GetTextHeight() );
nMinWidth=aTxtSize.Width()+aTopLeft.X()
+2*aFuncList.GetPosPixel().X();
@@ -334,8 +334,7 @@ void ScFunctionDockWin::SetLeftRightSize()
aDiffSize.Width()-=aNewSize.Width();
aDiffSize.Height()-=aNewSize.Height();
- String aString = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ww"));
-
+ rtl::OUString aString("ww");
Size aTxtSize( aFuncList.GetTextWidth(aString), aFuncList.GetTextHeight() );
Range aYRange(3*aTxtSize.Height()+aFuncList.GetPosPixel().Y(),
@@ -668,7 +667,7 @@ sal_Bool ScFunctionDockWin::Close()
SfxChildAlignment ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */,
SfxChildAlignment aChildAlign)
{
- String aString = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ww"));
+ String aString = rtl::OUString("ww");
Size aTxtSize( aFiFuncDesc.GetTextWidth(aString), aFiFuncDesc.GetTextHeight() );
if(!bInit)
{
@@ -879,7 +878,7 @@ void ScFunctionDockWin::DoEnter(sal_Bool /* bOk */) //@@ ???
aArgStr = aFirstArgStr;
if ( nArgs != VAR_ARGS )
{ // no VarArgs or Fix plus VarArgs, but not VarArgs only
- String aArgSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "; " ));
+ rtl::OUString aArgSep("; ");
sal_uInt16 nFix = ( nArgs < VAR_ARGS ? nArgs : nArgs - VAR_ARGS + 1 );
for ( sal_uInt16 nArg = 1;
nArg < nFix && !pDesc->pDefArgFlags[nArg].bOptional; nArg++ )
@@ -1062,7 +1061,7 @@ void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo)
if ( pInfo->aExtraString.Len() )
{
xub_StrLen nPos = pInfo->aExtraString.Search(
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScFuncList:")));
+ rtl::OUString("ScFuncList:"));
// Versuche, den Alignment-String "ALIGN:(...)" einzulesen; wenn
// er nicht vorhanden ist, liegt eine "altere Version vor
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 9964504..326e80f 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1849,7 +1849,7 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo)
if ( pInfo->aExtraString.Len() )
{
xub_StrLen nPos = pInfo->aExtraString.Search(
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("AcceptChgDat:")));
+ rtl::OUString("AcceptChgDat:"));
// Versuche, den Alignment-String "ALIGN:(...)" einzulesen; wenn
// er nicht vorhanden ist, liegt eine "altere Version vor
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index fc6db60..c0e12be 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -511,7 +511,7 @@ void ScColRowNameRangesDlg::UpdateNames()
const ScAddress::Details aDetails(pDoc->GetAddressConvention());
String aString;
- String strDelim = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( " --- " ));
+ rtl::OUString strDelim(" --- ");
aString = strDelim;
aString += ScGlobal::GetRscString( STR_COLUMN );
aString += strDelim;
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index 91eb54c..1c02f92 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -128,7 +128,7 @@ void ScMetricInputDlg::CalcPositions()
aFtSize.Width() = aFtEditTitle.GetTextWidth(aFtEditTitle.GetText());
// add mnemonic char width to fixed text width
- aFtSize.Width() += aFtEditTitle.GetTextWidth(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("(W)")));
+ aFtSize.Width() += aFtEditTitle.GetTextWidth(rtl::OUString("(W)"));
aFtEditTitle.SetSizePixel( aFtSize );
aNewPos.Y() = aEdValue.GetPosPixel().Y();
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 654b836..e262d6b 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -659,7 +659,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
// eListMode wird von aussen gesetzt, Root weiter unten
aLbDocuments.SetDropDownLineCount(9);
- String aOpen = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( " (" ));
+ rtl::OUString aOpen(" (");
aStrActive = aOpen;
aStrActive += String( ScResId( STR_ACTIVE ) );
aStrActive += ')'; // " (aktiv)"
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 7cd7995..275c19a 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -260,7 +260,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName,
if( sRangeStr.Len() )
xReceiver->attachDataProvider( xDataProvider );
else
- sRangeStr = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "all" ) );
+ sRangeStr = rtl::OUString("all");
uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( pDocShell->GetModel(), uno::UNO_QUERY );
xReceiver->attachNumberFormatsSupplier( xNumberFormatsSupplier );
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 35103c6..f2686a8 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -330,7 +330,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs
void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData )
{
- String aDummy(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "???" )));
+ rtl::OUString aDummy("???");
rData.aTitle = aDummy;
rData.aLongDocName = aDummy;
rData.aShortDocName = aDummy;
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index e449073..5e5ede5 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -69,7 +69,7 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) :
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId( HID_SCSHELL_AUDIT );
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Auditing")));
+ SetName(rtl::OUString("Auditing"));
}
//------------------------------------------------------------------------
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index a9a9e1d..4e22913 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -87,7 +87,7 @@ ScCellShell::ScCellShell(ScViewData* pData) :
bPastePossible(false)
{
SetHelpId(HID_SCSHELL_CELLSH);
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Cell")));
+ SetName(rtl::OUString("Cell"));
}
ScCellShell::~ScCellShell()
@@ -684,8 +684,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
// In interpreter may happen via rescheduled Basic
if ( pDoc->IsInInterpreter() )
- rSet.Put( SfxStringItem( nWhich,
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("...")) ) );
+ rSet.Put( SfxStringItem( nWhich, rtl::OUString("...") ) );
else
{
sal_uInt16 nErrCode = 0;
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index e5e03c1..42b4076 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -107,7 +107,7 @@ ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) :
{
SetPool( pEditView->GetEditEngine()->GetEmptyItemSet().GetPool() );
SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() );
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("EditCell")));
+ SetName(rtl::OUString("EditCell"));
}
ScEditShell::~ScEditShell()
@@ -1108,7 +1108,7 @@ String ScEditShell::GetSelectionText( sal_Bool bWholeWord )
ESelection aSel = pEditView->GetSelection();
String aStrCurrentDelimiters = pEngine->GetWordDelimiters();
- pEngine->SetWordDelimiters( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(" .,;\"'")) );
+ pEngine->SetWordDelimiters(rtl::OUString(" .,;\"'"));
aStrSelection = pEngine->GetWord( aSel.nEndPara, aSel.nEndPos );
pEngine->SetWordDelimiters( aStrCurrentDelimiters );
}
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 6d3e5ec..97b5b0f 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -164,7 +164,7 @@ ScFormatShell::ScFormatShell(ScViewData* pData) :
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId(HID_SCSHELL_FORMATSH);
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Format")));
+ SetName(rtl::OUString("Format"));
}
ScFormatShell::~ScFormatShell()
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 4af5337..539e782 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -89,15 +89,14 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn
bBoldSet = sal_True;
Size aSize = LogicToPixel( Size(
- GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888")) ),
+ GetTextWidth(rtl::OUString("8888")),
GetTextHeight() ) );
aSize.Width() += 4; // Platz fuer hervorgehobene Umrandung
aSize.Height() += 3;
SetSizePixel( aSize );
nWidth = nSmallWidth = aSize.Width();
- nBigWidth = LogicToPixel( Size( GetTextWidth(
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888888")) ), 0 ) ).Width() + 5;
+ nBigWidth = LogicToPixel( Size( GetTextWidth(rtl::OUString("8888888")), 0 ) ).Width() + 5;
SetBackground(); // sonst Probleme auf OS/2 !?!?!
}
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 4f002fd..0801604 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -548,7 +548,7 @@ sal_Bool ScDrawStringsVars::SetText( ScBaseCell* pCell )
void ScDrawStringsVars::SetHashText()
{
- SetAutoText( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("###")) );
+ SetAutoText(rtl::OUString("###"));
}
void ScDrawStringsVars::RepeatToFill( long colWidth )
@@ -2802,7 +2802,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) )
{
- rParam.mpEngine->SetText( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("###")) );
+ rParam.mpEngine->SetText(rtl::OUString("###"));
nEngineWidth = (long) rParam.mpEngine->CalcTextWidth();
if (rParam.mbPixelToLogic)
nNeededPixel = pRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width();
@@ -3184,7 +3184,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam)
if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) )
{
- rParam.mpEngine->SetText( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("###")) );
+ rParam.mpEngine->SetText(rtl::OUString("###"));
nEngineWidth = (long) rParam.mpEngine->CalcTextWidth();
if (rParam.mbPixelToLogic)
nNeededPixel = pRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width();
@@ -3554,7 +3554,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam)
if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) )
{
- rParam.mpEngine->SetText( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("###")) );
+ rParam.mpEngine->SetText(rtl::OUString("###"));
nEngineWidth = (long) rParam.mpEngine->CalcTextWidth();
if (rParam.mbPixelToLogic)
nNeededPixel = pRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width();
@@ -3936,7 +3936,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam)
if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) )
{
- rParam.mpEngine->SetText( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("###")) );
+ rParam.mpEngine->SetText(rtl::OUString("###"));
nEngineWidth = (long) rParam.mpEngine->CalcTextWidth();
if (rParam.mbPixelToLogic)
nNeededPixel = pRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width();
@@ -4345,7 +4345,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam)
if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) )
{
- rParam.mpEngine->SetText( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("###")) );
+ rParam.mpEngine->SetText(rtl::OUString("###"));
nEngineWidth = (long) rParam.mpEngine->CalcTextWidth();
if (rParam.mbPixelToLogic)
nNeededPixel = pRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width();
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index 6e91521..3186eac 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -59,7 +59,7 @@ ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) :
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId( HID_SCSHELL_PAGEBREAK );
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("PageBreak")));
+ SetName(rtl::OUString("PageBreak"));
}
//------------------------------------------------------------------------
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index 22a0790..31d0a7b 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -76,7 +76,7 @@ ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) :
pMgr->SetMaxUndoActionCount( 0 );
}
SetHelpId( HID_SCSHELL_PIVOTSH );
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Pivot")));
+ SetName(rtl::OUString("Pivot"));
}
//------------------------------------------------------------------------
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 43f9794..4b94585 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -148,7 +148,7 @@ void ScPreviewShell::Construct( Window* pParent )
pVerScroll->Show( false );
pCorner->Show();
SetHelpId( HID_SCSHELL_PREVWSH );
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Preview")));
+ SetName(rtl::OUString("Preview"));
}
ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
@@ -217,7 +217,7 @@ void ScPreviewShell::InitStartTable(SCTAB nTab)
String ScPreviewShell::GetDescription() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(" ** Test ** "));
+ return rtl::OUString(" ** Test ** ");
}
Size ScPreviewShell::GetOptimalSizePixel() const
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 7f5b665..9e028de 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1850,8 +1850,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, sal_Bool bDoPrint, ScPreviewLocation
ScAutoFontColorMode eColorMode = bUseStyleColor ? SC_AUTOCOL_DISPLAY : SC_AUTOCOL_PRINT;
((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).GetFont( aMarkFont, eColorMode );
pDev->SetFont( aMarkFont );
- long nMarkLen = pDev->GetTextWidth(
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("GW99999:")));
+ long nMarkLen = pDev->GetTextWidth(rtl::OUString("GW99999:"));
// ohne Space, weil's eh selten so weit kommt
Size aDataSize = aPageRect.GetSize();
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 90d1531..fe36239 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -76,9 +76,9 @@ void ScTabView::ShowRefTip()
SCROW nRows = nEndY+1-nStartY;
String aHelp = ScGlobal::GetRscString( STR_QUICKHELP_REF );
- aHelp.SearchAndReplace( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("%1")),
+ aHelp.SearchAndReplace( rtl::OUString("%1"),
String::CreateFromInt32(nRows) );
- aHelp.SearchAndReplace( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("%2")),
+ aHelp.SearchAndReplace( rtl::OUString("%2"),
String::CreateFromInt32(nCols) );
ScSplitPos eWhich = aViewData.GetActivePart();
@@ -272,9 +272,9 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
aHelpStr = ScGlobal::GetRscString( STR_TIP_RESIZEMATRIX );
SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig
SCROW nRows = nEndY + 1 - aViewData.GetRefStartY();
- aHelpStr.SearchAndReplace( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("%1")),
+ aHelpStr.SearchAndReplace( rtl::OUString("%1"),
String::CreateFromInt32(nRows) );
- aHelpStr.SearchAndReplace( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("%2")),
+ aHelpStr.SearchAndReplace( rtl::OUString("%2"),
String::CreateFromInt32(nCols) );
}
else if ( aViewData.GetDelMark( aDelRange ) )
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 4222c06..1f0f4a3 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1506,7 +1506,7 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode )
bReadOnly = pDocSh->IsReadOnly();
- SetName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("View")) ); // fuer SBX
+ SetName(rtl::OUString("View")); // fuer SBX
Color aColBlack( COL_BLACK );
SetPool( &SC_MOD()->GetPool() );
SetWindow( GetActiveWin() );
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index 17ee9de..f3045e0 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -152,7 +152,7 @@ ScInputHandler* ScTabViewShell::GetInputHandler() const
String ScTabViewShell::GetDescription() const
{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(" ** Test ** "));
+ return rtl::OUString(" ** Test ** ");
}
void ScTabViewShell::ExecImageMap( SfxRequest& rReq )
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index b09c188..667f726 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2269,7 +2269,7 @@ void ScViewData::ReadUserData(const String& rData)
}
String aTabOpt;
- xub_StrLen nTagLen = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(TAG_TABBARWIDTH)).Len();
+ xub_StrLen nTagLen = RTL_CONSTASCII_LENGTH(TAG_TABBARWIDTH);
// nicht pro Tabelle:
SCTAB nTabStart = 2;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index f1c8f18..1303b72 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2467,10 +2467,10 @@ void ScViewFunc::MoveTable(
// execute without SFX_CALLMODE_RECORD, because already contained in move command
- String aUrl = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("private:factory/"));
+ String aUrl = rtl::OUString("private:factory/");
aUrl.AppendAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); // "scalc"
SfxStringItem aItem( SID_FILE_NAME, aUrl );
- SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
+ SfxStringItem aTarget( SID_TARGETNAME, rtl::OUString("_blank") );
const SfxPoolItem* pRetItem = GetViewData()->GetDispatcher().Execute(
SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aItem, &aTarget, 0L );
@@ -2515,8 +2515,7 @@ void ScViewFunc::MoveTable(
{
while (pDestDoc->GetTableCount() > 1)
pDestDoc->DeleteTab(0);
- pDestDoc->RenameTab( 0,
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("______42_____")),
+ pDestDoc->RenameTab( 0, rtl::OUString("______42_____"),
false );
}
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 45be517..e6b558d 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -587,10 +587,8 @@ void ScViewFunc::PasteFromSystem()
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) );
{
- sal_uLong nBiff8 = SotExchange::RegisterFormatName(
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff8")));
- sal_uLong nBiff5 = SotExchange::RegisterFormatName(
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff5")));
+ sal_uLong nBiff8 = SotExchange::RegisterFormatName(rtl::OUString("Biff8"));
+ sal_uLong nBiff5 = SotExchange::RegisterFormatName(rtl::OUString("Biff5"));
// als erstes SvDraw-Model, dann Grafik
// (Grafik darf nur bei einzelner Grafik drinstehen)
@@ -705,10 +703,8 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran
{
TransferableDataHelper aDataHelper( rxTransferable );
{
- sal_uLong nBiff8 = SotExchange::RegisterFormatName(
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff8")));
- sal_uLong nBiff5 = SotExchange::RegisterFormatName(
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff5")));
+ sal_uLong nBiff8 = SotExchange::RegisterFormatName(rtl::OUString("Biff8"));
+ sal_uLong nBiff5 = SotExchange::RegisterFormatName(rtl::OUString("Biff5"));
sal_uLong nFormatId = 0;
// als erstes SvDraw-Model, dann Grafik
// (Grafik darf nur bei einzelner Grafik drinstehen)
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 8511f00..5f5d5cc 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2560,8 +2560,8 @@ const String& SdPage::GetName() const
}
else if (mePageKind == PK_HANDOUT && mbMaster)
{
- aCreatedPageName += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( " (" ));
- aCreatedPageName += String(SdResId(STR_HANDOUT));
+ aCreatedPageName += rtl::OUString(" (");
+ aCreatedPageName += SdResId(STR_HANDOUT).toString();
aCreatedPageName += sal_Unicode( ')' );
}
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index b84c591..c8e9195 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -390,7 +390,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
* Objects was created on the slide master page
***********************************************/
String aName( pPage->GetLayoutName() );
- String aSep = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ) );
+ String aSep = rtl::OUString(SD_LT_SEPARATOR);
sal_uInt16 n = aName.Search(aSep);
n = n + aSep.Len();
aName.Erase(n);
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 7f51e8e..1462fad 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -147,7 +147,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
String aExt;
String aAllSpec( SdResId( STR_ALL_FILES ) );
- xFilterManager->appendFilter( aAllSpec, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.*" ) ) );
+ xFilterManager->appendFilter( aAllSpec, rtl::OUString("*.*") );
xFilterManager->setCurrentFilter( aAllSpec ); // set default-filter (<All>)
// Get main filter
@@ -173,7 +173,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() );
// get Powerpoint filter
- aExt = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( ".ppt" ) );
+ aExt = rtl::OUString(".ppt");
pFilter = aMatch.GetFilter4Extension( aExt );
if( pFilter )
xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() );
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index ba0fd11..8b2032d 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -177,13 +177,13 @@ SdFilterDetect::~SdFilterDetect()
const SfxFilter* pFilter = 0;
String aFilterName;
- String aPrefix = String::CreateFromAscii( "private:factory/" );
+ String aPrefix = rtl::OUString("private:factory/");
if( aURL.Match( aPrefix ) == aPrefix.Len() )
{
if( SvtModuleOptions().IsImpress() )
{
String aPattern( aPrefix );
- aPattern += String::CreateFromAscii("simpress");
+ aPattern += rtl::OUString("simpress");
if ( aURL.Match( aPattern ) >= aPattern.Len() )
pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
}
@@ -191,7 +191,7 @@ SdFilterDetect::~SdFilterDetect()
if( !pFilter && SvtModuleOptions().IsDraw() )
{
String aPattern( aPrefix );
- aPattern += String::CreateFromAscii("sdraw");
+ aPattern += rtl::OUString("sdraw");
if ( aURL.Match( aPattern ) >= aPattern.Len() )
pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
}
@@ -317,9 +317,9 @@ SdFilterDetect::~SdFilterDetect()
//TODO/LATER: using this method impress is always preferred if no flat detecion has been made
// this should been discussed!
if ( SvtModuleOptions().IsImpress() )
- pFilter = SfxFilterMatcher( String::CreateFromAscii("simpress") ).GetFilter4EA( aTypeName );
+ pFilter = SfxFilterMatcher( rtl::OUString("simpress") ).GetFilter4EA( aTypeName );
else if ( SvtModuleOptions().IsDraw() )
- pFilter = SfxFilterMatcher( String::CreateFromAscii("sdraw") ).GetFilter4EA( aTypeName );
+ pFilter = SfxFilterMatcher( rtl::OUString("sdraw") ).GetFilter4EA( aTypeName );
}
}
}
@@ -369,9 +369,8 @@ SdFilterDetect::~SdFilterDetect()
*pStm >> n8;
if ( ( n8 & 0xf0 ) == 0 ) // we are supporting binary cgm format only, so
{ // this is a small test to exclude cgm text
- const String aName = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "CGM - Computer Graphics Metafile" ) );
- SfxFilterMatcher aMatch( String::CreateFromAscii("simpress") );
- pFilter = aMatch.GetFilter4FilterName( aName );
+ SfxFilterMatcher aMatch(rtl::OUString("simpress"));
+ pFilter = aMatch.GetFilter4FilterName(rtl::OUString("CGM - Computer Graphics Metafile"));
}
}
}
@@ -394,7 +393,7 @@ SdFilterDetect::~SdFilterDetect()
aFilterConfigItem.WriteInt32( "Resolution" , nBase );
}
- SfxFilterMatcher aMatch( String::CreateFromAscii("sdraw") );
+ SfxFilterMatcher aMatch(rtl::OUString("sdraw"));
pFilter = aMatch.GetFilter4FilterName( aName );
}
}
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 6bc3a1b..f9591c7 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -52,9 +52,7 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const String& _rFil
// replace filename
String sInfoText = m_aInfoText.GetText();
- sInfoText.SearchAndReplaceAll(
- UniString::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( "%FILENAME" ) ), _rFileName );
+ sInfoText.SearchAndReplaceAll(rtl::OUString("%FILENAME"), _rFileName);
m_aInfoText.SetText( sInfoText );
// load state of "warning on" checkbox from misc options
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index a73aaa2..99b4bc3 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -177,7 +177,7 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind )
// add the All-Filter
String aAllFilter( ResId( STR_EXTFILTER_ALL, DIALOG_MGR() ) );
- maFileDlg.AddFilter( aAllFilter, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.*" ) ) );
+ maFileDlg.AddFilter(aAllFilter, rtl::OUString("*.*"));
// and activate him
maFileDlg.SetCurrentFilter( aAllFilter );
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 6758b92..cd505ac 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -106,8 +106,7 @@ static const sal_Unicode aBulletTypes[] =
static Font& lcl_GetDefaultBulletFont()
{
static sal_Bool bInit = 0;
- static Font aDefBulletFont( UniString::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ),
+ static Font aDefBulletFont( rtl::OUString("StarSymbol"),
String(), Size( 0, 14 ) );
if(!bInit)
{
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 1015afb..4f3e0dc 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -157,8 +157,7 @@ HTMLReader::HTMLReader()
String HTMLReader::GetTemplateName() const
{
- String sTemplate(
- String::CreateFromAscii(TOOLS_CONSTASCII_STRINGPARAM("internal")) );
+ String sTemplate(rtl::OUString("internal"));
sTemplate += INET_PATH_TOKEN;
sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM("html") );
String sTemplateWithoutExt( sTemplate );
@@ -2035,8 +2034,7 @@ void SwHTMLParser::NextToken( int nToken )
if( bInsertUnknown )
{
- String aComment(
- String::CreateFromAscii(TOOLS_CONSTASCII_STRINGPARAM("HTML: <")) );
+ String aComment(rtl::OUString("HTML: <"));
if( (HTML_TOKEN_ONOFF & nToken) != 0 && (1 & nToken) != 0 )
aComment += '/';
aComment += sSaveToken;
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 8ef6eef..a6b3498 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -363,8 +363,7 @@ void SwRTFParser::ReadListTable()
if( pCurRule && pCurRule->IsContinusNum() )
lcl_ExpandNumFmts( *pCurRule );
- String sTmp( String::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( RTF_NUMRULE_NAME " 1" )));
+ String sTmp(rtl::OUString(RTF_NUMRULE_NAME " 1"));
aEntry.nListDocPos = pDoc->MakeNumRule( sTmp, 0, sal_False, SvxNumberFormat::LABEL_ALIGNMENT );
pCurRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
// #i91400#
@@ -564,8 +563,7 @@ void SwRTFParser::ReadListOverrideTable()
aListArr[ n ].nListDocPos ];
pOrigRule = pRule;
- String sTmp( String::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( RTF_NUMRULE_NAME " 1" )));
+ String sTmp(rtl::OUString(RTF_NUMRULE_NAME " 1"));
aEntry.nListDocPos = pDoc->MakeNumRule( sTmp, pRule );
pRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
// #i91400#
@@ -814,8 +812,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
{
// dann muessen wir die mal anlegen
nNewNumSectDef &= ~nNewFlag;
- String sTmp( String::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( RTF_NUMRULE_NAME " 1" )));
+ String sTmp(rtl::OUString(RTF_NUMRULE_NAME " 1"));
SwListEntry aEntry( nListNo, 0, pDoc->MakeNumRule( sTmp ));
aEntry.nListNo = nListNo;
aListArr.push_back( aEntry );
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 63f953f..787e2fb 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -937,7 +937,7 @@ long Ww1Bookmarks::Len() const
const String Ww1Bookmarks::GetName() const
{
if( nIsEnd )
- return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "???" ));
+ return rtl::OUString("???");
return aNames.GetStr( nPlcIdx[0] );
}
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 8816e7b..a515b2c 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -745,10 +745,10 @@ namespace sw
bool bForceJapanese = ( STRING_NOTFOUND != rParams.SearchChar( sJChars.getStr() ) );
if ( bForceJapanese )
{
- rParams.SearchAndReplaceAll( String::CreateFromAscii( "ee" ),
- String::CreateFromAscii( "yyyy" ) );
- rParams.SearchAndReplaceAll( String::CreateFromAscii( "EE" ),
- String::CreateFromAscii( "YYYY" ) );
+ rParams.SearchAndReplaceAll( rtl::OUString( "ee" ),
+ rtl::OUString( "yyyy" ) );
+ rParams.SearchAndReplaceAll( rtl::OUString( "EE" ),
+ rtl::OUString( "YYYY" ) );
}
if (LANGUAGE_FRENCH != nDocLang)
{
@@ -764,10 +764,10 @@ namespace sw
// Force to NatNum when finding one of 'oOA'
String sOldParams( rParams );
- rParams.SearchAndReplaceAll( String::CreateFromAscii( "o" ),
- String::CreateFromAscii( "m" ) );
- rParams.SearchAndReplaceAll( String::CreateFromAscii( "O" ),
- String::CreateFromAscii( "M" ) );
+ rParams.SearchAndReplaceAll( rtl::OUString( "o" ),
+ rtl::OUString( "m" ) );
+ rParams.SearchAndReplaceAll( rtl::OUString( "O" ),
+ rtl::OUString( "M" ) );
bool bForceNatNum = !sOldParams.Equals( rParams );
if (LANGUAGE_FRENCH != nDocLang)
{
@@ -814,7 +814,7 @@ namespace sw
if (nChar == '/')
{
// MM We have to escape '/' in case it's used as a char
- rParams.Replace(nI, 1, CREATE_CONST_ASC("\\/"));
+ rParams.Replace(nI, 1, rtl::OUString("\\/"));
nI++;
nLen++;
}
@@ -944,10 +944,10 @@ namespace sw
rLang = LANGUAGE_JAPANESE;
if (bForceNatNum)
- rParams.Insert(CREATE_CONST_ASC("[NatNum1][$-411]"),0);
+ rParams.Insert(rtl::OUString("[NatNum1][$-411]"),0);
if (bHijri)
- rParams.Insert(CREATE_CONST_ASC("[~hijri]"), 0);
+ rParams.Insert(rtl::OUString("[~hijri]"), 0);
pFormatter->PutEntry(rParams, nCheckPos, nType, nKey, rLang);
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index d2205e2..df0c10b 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2827,7 +2827,7 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb
//Open the ObjectPool
SvStorageRef xObjPool = rWW8Wrt.GetWriter().GetStorage().OpenSotStorage(
- CREATE_CONST_ASC(SL::aObjectPool), STREAM_READWRITE |
+ rtl::OUString(SL::aObjectPool), STREAM_READWRITE |
STREAM_SHARE_DENYALL);
//Create a destination storage for the microsoft control
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 2ac82b1..0f73341 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -54,7 +54,7 @@ using namespace sw::util;
sal_uInt16 MSWordExportBase::DuplicateNumRule( const SwNumRule *pRule, sal_uInt8 nLevel, sal_uInt16 nVal )
{
sal_uInt16 nNumId = USHRT_MAX;
- String sPrefix( CREATE_CONST_ASC( "WW8TempExport" ) );
+ String sPrefix(rtl::OUString("WW8TempExport"));
sPrefix += String::CreateFromInt32( nUniqueList++ );
SwNumRule* pMyNumRule =
new SwNumRule( pDoc->GetUniqueNumRuleName( &sPrefix ),
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 26eef0b..2a1d4bb 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -534,7 +534,7 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos )
String aName = pFmt->GetName();
if ( aName.EqualsAscii( "Default" ) )
- aName = String::CreateFromAscii( "Normal" );
+ aName = rtl::OUString("Normal");
m_rExport.AttrOutput().StartStyle( aName, bFmtColl,
nBase, nWwNext, GetWWId( *pFmt ), nPos,
@@ -772,13 +772,13 @@ void wwFontHelper::InitFontTable(bool bWrtWW8,const SwDoc& rDoc)
{
mbWrtWW8 = bWrtWW8;
- GetId(wwFont(CREATE_CONST_ASC("Times New Roman"), PITCH_VARIABLE,
+ GetId(wwFont(rtl::OUString("Times New Roman"), PITCH_VARIABLE,
FAMILY_ROMAN, RTL_TEXTENCODING_MS_1252,bWrtWW8));
- GetId(wwFont(CREATE_CONST_ASC("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN,
+ GetId(wwFont(rtl::OUString("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN,
RTL_TEXTENCODING_SYMBOL,bWrtWW8));
- GetId(wwFont(CREATE_CONST_ASC("Arial"), PITCH_VARIABLE, FAMILY_SWISS,
+ GetId(wwFont(rtl::OUString("Arial"), PITCH_VARIABLE, FAMILY_SWISS,
RTL_TEXTENCODING_MS_1252,bWrtWW8));
const SvxFontItem* pFont = (const SvxFontItem*)GetDfltAttr(RES_CHRATR_FONT);
@@ -2051,7 +2051,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
// Additional paragraph containing a space to
// assure that by WW created RTF from written WW8
// does not crash WW.
- rWrt.WriteStringAsPara( String::CreateFromAscii( " " ) );
+ rWrt.WriteStringAsPara( rtl::OUString(" ") );
}
}
}
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 4ba4538..9c662da 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -223,8 +223,8 @@ public:
#define ANZ_DEFAULT_STYLES 16
// die Namen der StorageStreams
-#define sMainStream CREATE_CONST_ASC("WordDocument")
-#define sCompObj CREATE_CONST_ASC("\1CompObj")
+#define sMainStream rtl::OUString("WordDocument")
+#define sCompObj rtl::OUString("\1CompObj")
static void WriteDop( WW8Export& rWrt )
{
@@ -1440,7 +1440,7 @@ sal_uInt16 WW8Export::AddRedlineAuthor( sal_uInt16 nId )
if( !pRedlAuthors )
{
pRedlAuthors = new WW8_WrtRedlineAuthor;
- pRedlAuthors->AddName(CREATE_CONST_ASC("Unknown"));
+ pRedlAuthors->AddName(rtl::OUString("Unknown"));
}
return pRedlAuthors->AddName( SW_MOD()->GetRedlineAuthor( nId ) );
}
@@ -2596,7 +2596,7 @@ void WW8Export::WriteFkpPlcUsw()
some magic. cmc
*/
/* Similiarly having msvbasic storage seems to also trigger creating this stream */
- GetWriter().GetStorage().OpenSotStorage(CREATE_CONST_ASC(SL::aObjectPool),
+ GetWriter().GetStorage().OpenSotStorage(rtl::OUString(SL::aObjectPool),
STREAM_READWRITE | STREAM_SHARE_DENYALL);
}
@@ -2930,9 +2930,9 @@ void WW8Export::ExportDocument_Impl()
if( bWrtWW8 )
{
pFib->fWhichTblStm = 1;
- xTableStrm = GetWriter().GetStorage().OpenSotStream(CREATE_CONST_ASC(SL::a1Table),
+ xTableStrm = GetWriter().GetStorage().OpenSotStream(rtl::OUString(SL::a1Table),
STREAM_STD_WRITE );
- xDataStrm = GetWriter().GetStorage().OpenSotStream(CREATE_CONST_ASC(SL::aData),
+ xDataStrm = GetWriter().GetStorage().OpenSotStream(rtl::OUString(SL::aData),
STREAM_STD_WRITE );
xDataStrm->SetBufferSize( 32768 ); // fuer Grafiken
@@ -3109,7 +3109,7 @@ void WW8Export::ExportDocument_Impl()
{
xDataStrm.Clear();
pDataStrm = 0;
- GetWriter().GetStorage().Remove(CREATE_CONST_ASC(SL::aData));
+ GetWriter().GetStorage().Remove(rtl::OUString(SL::aData));
}
}
}
@@ -3406,7 +3406,7 @@ void WW8Export::RestoreMacroCmds()
try
{
uno::Reference < io::XStream > xSrcStream =
- xSrcRoot->openStreamElement( CREATE_CONST_ASC(SL::aMSMacroCmds), embed::ElementModes::READ );
+ xSrcRoot->openStreamElement( rtl::OUString(SL::aMSMacroCmds), embed::ElementModes::READ );
SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xSrcStream );
if ( pStream && SVSTREAM_OK == pStream->GetError())
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index c0008d7..041f718 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -233,7 +233,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
pDataAdr = pSpecOLE + 2; //WW6 sprm is 1 but has 1 byte len as well.
SvStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage(
- CREATE_CONST_ASC(SL::aObjectPool), STREAM_READWRITE |
+ rtl::OUString(SL::aObjectPool), STREAM_READWRITE |
STREAM_SHARE_DENYALL );
if( xObjStg.Is() )
@@ -353,7 +353,7 @@ void WW8Export::OutputLinkedOLE( const rtl::OUString& rOleId )
SotStorageRef xObjSrc = SotStorage::OpenOLEStorage( xOleStg, rOleId, STREAM_READ );
SotStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage(
- CREATE_CONST_ASC(SL::aObjectPool), STREAM_READWRITE |
+ rtl::OUString(SL::aObjectPool), STREAM_READWRITE |
STREAM_SHARE_DENYALL );
if( xObjStg.Is() && xObjSrc.Is() )
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index c87d9a7..02475f9 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1933,7 +1933,7 @@ void WW8Export::StartCommentOutput(const String& rName)
void WW8Export::EndCommentOutput(const String& rName)
{
- String sStr(CREATE_CONST_ASC(" ["));
+ String sStr(rtl::OUString(" ["));
sStr += rName;
sStr.APPEND_CONST_ASC("] ");
OutputField(0, ww::eQUOTE, sStr, WRITEFIELD_CMD_END | WRITEFIELD_END |
@@ -2414,7 +2414,7 @@ void WW8Export::WritePostItBegin( ww::bytes* pOut )
String FieldString(ww::eField eIndex)
{
- String sRet(CREATE_CONST_ASC(" "));
+ String sRet(rtl::OUString(" "));
if (const char *pField = ww::GetEnglishFieldName(eIndex))
sRet.InsertAscii(pField, 1);
return sRet;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index cc5e021..536b1bb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -206,7 +206,7 @@ bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rx
oox::StorageRef vbaStg = root.openSubStorage( CREATE_OUSTRING( "Macros" ), false );
if ( vbaStg.get() )
{
- oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), CREATE_CONST_ASC( "Writer") );
+ oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), rtl::OUString("Writer") );
bRet = aVbaPrj.importVbaProject( *vbaStg );
}
}
@@ -3611,7 +3611,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
maSectionManager(*this),
m_aExtraneousParas(rD),
maInsertedTables(rD),
- maSectionNameGenerator(rD,CREATE_CONST_ASC("WW")),
+ maSectionNameGenerator(rD, rtl::OUString("WW")),
maGrfNameGenerator(bNewDoc,String('G')),
maParaStyleMapper(rD),
maCharStyleMapper(rD),
@@ -4125,7 +4125,7 @@ void SwWW8ImplReader::StoreMacroCmds()
try
{
uno::Reference < io::XStream > xStream =
- xRoot->openStreamElement( CREATE_CONST_ASC(SL::aMSMacroCmds), embed::ElementModes::READWRITE );
+ xRoot->openStreamElement( rtl::OUString(SL::aMSMacroCmds), embed::ElementModes::READWRITE );
SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xStream );
sal_uInt8 *pBuffer = new sal_uInt8[pWwFib->lcbCmds];
@@ -4774,7 +4774,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
pTableStream = &rTableStream;
pTableStream->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
- rDataStream = pStg->OpenSotStream(CREATE_CONST_ASC(SL::aData),
+ rDataStream = pStg->OpenSotStream(rtl::OUString(SL::aData),
STREAM_STD_READ | STREAM_NOCREATE );
if (rDataStream.Is() && SVSTREAM_OK == rDataStream->GetError())
@@ -5653,7 +5653,7 @@ sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, String& rStorageName,
{
rStorageName = '_';
rStorageName += rtl::OUString::valueOf(nPictureId);
- rSrcStorage = rReader.pStg->OpenSotStorage(CREATE_CONST_ASC(
+ rSrcStorage = rReader.pStg->OpenSotStorage(rtl::OUString(
SL::aObjectPool));
if (!rReader.mpDocShell)
bRet=false;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 345347f..1b15974 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -774,7 +774,7 @@ SwNumRule* SwWW8ImplReader::GetStyRule()
if( pStyles->pStyRule ) // Bullet-Style bereits vorhanden
return pStyles->pStyRule;
- const String aBaseName(CREATE_CONST_ASC( "WW8StyleNum" ));
+ const String aBaseName(rtl::OUString("WW8StyleNum"));
const String aName( rDoc.GetUniqueNumRuleName( &aBaseName, false) );
// #i86652#
@@ -850,7 +850,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
// If NumRuleItems were set, either directly or through inheritance, disable them now
pAktColl->SetFmtAttr( SwNumRuleItem() );
- String aName(CREATE_CONST_ASC( "Outline" ));
+ String aName(rtl::OUString("Outline"));
SwNumRule aNR( rDoc.GetUniqueNumRuleName( &aName ),
SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
OUTLINE_RULE );
@@ -4298,7 +4298,7 @@ void WW8RStyle::ImportOldFormatStyles()
if (const sal_Char *pStr = GetEnglishNameFromSti(eSti))
sName = String(pStr, RTL_TEXTENCODING_ASCII_US);
else
- sName = String(CREATE_CONST_ASC("Unknown"));
+ sName = rtl::OUString("Unknown");
}
else // user style
{
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 6ffa47d..77b81ab 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1035,7 +1035,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
{
// wird erstmal zur Bildung des Style Namens genommen
- String sPrefix(CREATE_CONST_ASC("WW8Num"));
+ String sPrefix(rtl::OUString("WW8Num"));
sPrefix += String::CreateFromInt32(nUniqueList++);
// #i86652#
sal_uInt16 nRul =
@@ -1270,7 +1270,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
break;
// Nauemsprefix aufbauen: fuer NumRule-Name (eventuell)
// und (falls vorhanden) fuer Style-Name (dann auf jeden Fall)
- String sPrefix(CREATE_CONST_ASC( "WW8NumSt" ));
+ String sPrefix(rtl::OUString("WW8NumSt"));
sPrefix += String::CreateFromInt32( nLfo + 1 );
// jetzt dem pNumRule seinen RICHTIGEN Wert zuweisen !!!
// (bis dahin war hier die Parent NumRule vermerkt )
@@ -2227,7 +2227,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
}
WW8FormulaListBox::WW8FormulaListBox(SwWW8ImplReader &rR)
- : WW8FormulaControl( CREATE_CONST_ASC(SL::aListBox), rR)
+ : WW8FormulaControl(rtl::OUString(SL::aListBox), rR)
{
}
@@ -2436,7 +2436,7 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference <
}
WW8FormulaCheckBox::WW8FormulaCheckBox(SwWW8ImplReader &rR)
- : WW8FormulaControl( CREATE_CONST_ASC(SL::aCheckBox), rR)
+ : WW8FormulaControl(rtl::OUString(SL::aCheckBox), rR)
{
}
@@ -2502,7 +2502,7 @@ sal_Bool WW8FormulaCheckBox::Import(const uno::Reference <
}
WW8FormulaEditBox::WW8FormulaEditBox(SwWW8ImplReader &rR)
- : WW8FormulaControl( CREATE_CONST_ASC(SL::aTextField) ,rR)
+ : WW8FormulaControl(rtl::OUString(SL::aTextField) ,rR)
{
}
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 2765d2c..5e7f1ac 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -87,7 +87,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
// 0x2c, 0x30 Skalierung x,y in Promille
// 0x34, 0x38, 0x3c, 0x40 Crop Left, Top, Right, Bot in tw
- SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( CREATE_CONST_ASC( "\3PIC" ),
+ SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( rtl::OUString("\3PIC"),
STREAM_STD_READ | STREAM_NOCREATE);
SvStorageStream* pS = xSrc3;
pS->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -132,7 +132,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
SvStorageRef& rSrc1)
{
- SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( CREATE_CONST_ASC("\3META"),
+ SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( rtl::OUString("\3META"),
STREAM_STD_READ | STREAM_NOCREATE);
SvStorageStream* pSt = xSrc2;
pSt->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -188,7 +188,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1)
{
// 03-META-Stream nicht da. Vielleicht ein 03-PICT ?
- SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream( CREATE_CONST_ASC( "\3PICT" ));
+ SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream(rtl::OUString("\3PICT"));
SvStorageStream* pStp = xSrc4;
pStp->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
sal_uInt8 aTestA[10]; // Ist der 01Ole-Stream ueberhaupt vorhanden
@@ -355,7 +355,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
// ergibt Name "_4711"
aSrcStgName += String::CreateFromInt32( nObjLocFc );
- SvStorageRef xSrc0 = pStg->OpenSotStorage(CREATE_CONST_ASC(SL::aObjectPool));
+ SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool));
SvStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName,
STREAM_READWRITE| STREAM_SHARE_DENYALL );
@@ -432,7 +432,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
{
- SvStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream( CREATE_CONST_ASC( "\3ObjInfo" ),
+ SvStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream(rtl::OUString("\3ObjInfo"),
STREAM_STD_READ | STREAM_NOCREATE );
if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() )
{
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index f35563e..1377713 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -360,7 +360,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
// needed if the filterflags say we will convert bookmarks
// to SetExpFields! And this the exception!
- String sHex(CREATE_CONST_ASC( "\\x" ));
+ rtl::OUString sHex("\\x");
bool bSetAsHex;
bool bAllowCr = SwFltGetFlag(nFieldFlags,
SwFltControlStack::ALLOW_FLD_CR) ? true : false;
@@ -586,10 +586,10 @@ String GetWordDefaultDateStringAsUS(SvNumberFormatter* pFormatter, sal_uInt16 nL
// #i36594#
// Fix provided by mloiseleur at openoffice.org.
// A default date can have already 4 year digits, in some case
- const xub_StrLen pos = sParams.Search( CREATE_CONST_ASC("YYYY") );
+ const xub_StrLen pos = sParams.Search(rtl::OUString("YYYY"));
if ( pos == STRING_NOTFOUND )
{
- sParams.SearchAndReplace(CREATE_CONST_ASC("YY"), CREATE_CONST_ASC("YYYY"));
+ sParams.SearchAndReplace(rtl::OUString("YY"), rtl::OUString("YYYY"));
}
return sParams;
}
@@ -633,7 +633,7 @@ short SwWW8ImplReader::GetTimeDatePara(String& rStr, sal_uInt32& rFormat,
}
if (bHijri)
- sParams.Insert(CREATE_CONST_ASC("[~hijri]"), 0);
+ sParams.Insert(rtl::OUString("[~hijri]"), 0);
sal_uInt16 nCheckPos = 0;
sal_Int16 nType = NUMBERFORMAT_DEFINED;
@@ -765,7 +765,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
String sOleId = '_';
sOleId += String::CreateFromInt32( maFieldStack.back().mnObjLocFc );
- SvStorageRef xSrc0 = pStg->OpenSotStorage(CREATE_CONST_ASC(SL::aObjectPool));
+ SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool));
SvStorageRef xSrc1 = xSrc0->OpenSotStorage( sOleId, STREAM_READ );
// Store it now!
@@ -1147,7 +1147,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
// Wenn keins dieser Sonderzeichen enthalten ist, wird 0 zurueckgeliefert.
void SwWW8ImplReader::MakeTagString( String& rStr, const String& rOrg )
{
- String sHex( CREATE_CONST_ASC( "\\x" ));
+ rtl::OUString sHex("\\x");
bool bAllowCr = SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_IN_TEXT )
|| SwFltGetFlag( nFieldFlags, SwFltControlStack::ALLOW_FLD_CR );
sal_Unicode cChar;
@@ -1215,7 +1215,7 @@ void SwWW8ImplReader::MakeTagString( String& rStr, const String& rOrg )
void SwWW8ImplReader::InsertTagField( const sal_uInt16 nId, const String& rTagText )
{
- String aName( CREATE_CONST_ASC( "WwFieldTag" ) );
+ String aName(rtl::OUString("WwFieldTag"));
if( SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_DO_ID ) ) // Nummer?
aName += String::CreateFromInt32( nId ); // ausgeben ?
@@ -1388,7 +1388,7 @@ long SwWW8ImplReader::MapBookmarkVariables(const WW8FieldDesc* pF,
}
else
{
- sName = CREATE_CONST_ASC("WWSetBkmk");
+ sName = rtl::OUString("WWSetBkmk");
nNo = pReffingStck->aFieldVarNames.size()+1;
sName += String::CreateFromInt32(nNo);
nNo += pPlcxMan->GetBook()->GetIMax();
@@ -1509,7 +1509,7 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, String& rStr )
eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, String& rStr )
{
if( !pNumFldType ){ // 1. Mal
- SwSetExpFieldType aT( &rDoc, CREATE_CONST_ASC("AutoNr"), nsSwGetSetExpType::GSE_SEQ );
+ SwSetExpFieldType aT( &rDoc, rtl::OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ );
pNumFldType = rDoc.InsertFldType( aT );
}
SwSetExpField aFld( (SwSetExpFieldType*)pNumFldType, aEmptyStr,
@@ -2011,7 +2011,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr )
}
else
{
- rDoc.InsertString(*pPaM, CREATE_CONST_ASC("###"));
+ rDoc.InsertString(*pPaM, rtl::OUString("###"));
}
return FLD_OK;
@@ -3301,7 +3301,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
if ( aIt != aPattern.end() )
{
SwFormToken aNumberEntrySeparator( TOKEN_TEXT );
- aNumberEntrySeparator.sText = String::CreateFromAscii(" ");
+ aNumberEntrySeparator.sText = rtl::OUString(" ");
aPattern.insert( ++aIt, aNumberEntrySeparator );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list