summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-06-28 12:18:31 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-06-28 13:53:36 +0100
commitba23ece286671f8f9b5baf245239996e1e1fabdb (patch)
tree7314f9c83e9c92a72563856459c4a217fc42227e /sc
parent2ee701afd333ef01bc5d4f62543aaf0f5ac5ed3c (diff)
probably the last uses of the one argument String::CreateFromAscii variant
Change-Id: I36aab317da2f69f12aaefc24895ad9eaa6b69a7c
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/attrib.cxx10
-rw-r--r--sc/source/core/data/docpool.cxx8
-rw-r--r--sc/source/core/data/drwlayer.cxx10
-rw-r--r--sc/source/core/data/global.cxx3
-rw-r--r--sc/source/core/data/stlpool.cxx4
-rw-r--r--sc/source/core/data/stlsheet.cxx2
-rw-r--r--sc/source/core/tool/docoptio.cxx2
-rw-r--r--sc/source/core/tool/viewopti.cxx2
-rw-r--r--sc/source/ui/app/inputwin.cxx2
-rw-r--r--sc/source/ui/app/msgpool.cxx2
-rw-r--r--sc/source/ui/app/scmod.cxx8
-rw-r--r--sc/source/ui/app/uiitems.cxx18
-rw-r--r--sc/source/ui/docshell/docsh.cxx8
-rw-r--r--sc/source/ui/docshell/docsh3.cxx7
-rw-r--r--sc/source/ui/drawfunc/chartsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx2
-rw-r--r--sc/source/ui/drawfunc/drformsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx2
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/oleobjsh.cxx2
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx11
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx2
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/mtrindlg.cxx2
-rw-r--r--sc/source/ui/navipi/navipi.cxx2
-rw-r--r--sc/source/ui/unoobj/chartuno.cxx2
-rw-r--r--sc/source/ui/unoobj/textuno.cxx2
-rw-r--r--sc/source/ui/view/auditsh.cxx2
-rw-r--r--sc/source/ui/view/cellsh.cxx5
-rw-r--r--sc/source/ui/view/editsh.cxx4
-rw-r--r--sc/source/ui/view/formatsh.cxx2
-rw-r--r--sc/source/ui/view/hdrcont.cxx5
-rw-r--r--sc/source/ui/view/output2.cxx12
-rw-r--r--sc/source/ui/view/pgbrksh.cxx2
-rw-r--r--sc/source/ui/view/pivotsh.cxx2
-rw-r--r--sc/source/ui/view/prevwsh.cxx4
-rw-r--r--sc/source/ui/view/printfun.cxx3
-rw-r--r--sc/source/ui/view/tabview4.cxx8
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh9.cxx2
-rw-r--r--sc/source/ui/view/viewdata.cxx2
-rw-r--r--sc/source/ui/view/viewfun2.cxx7
-rw-r--r--sc/source/ui/view/viewfun3.cxx12
43 files changed, 91 insertions, 104 deletions
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 17c0f9d9f695..0c51238b9e0c 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 9fa6bca232c2..f2c9661a85e2 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 bc8a2b0e5e2b..477034766061 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 635281cfa9ef..b646b6f29671 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 96e7cfbaaf1d..66eef1d3abfc 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 d99797b53676..e13f0ec8f5c0 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 6be211411842..6edad4e3620e 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 fe89db843d62..353ca32af740 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 f8c69a49da12..f857d8f39cb8 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 ece7ce6b23d0..0d8a010b235f 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 602cfe94e939..5d424abfc7d3 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 a03fb39a6375..ddddf2e86ffe 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 e70cf2de6862..7c9d0a4cf83e 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 16724923d007..394afb3357bb 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 44f1c6cc4117..414063394aeb 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 87cf0b5c70bc..09668e1bae40 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 036b15756e7d..08542bead9d4 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 9029b5c7d646..170804cbb20a 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 655df34af193..92a289944270 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 a41428148546..fdf06d9ea9bb 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 093b57992916..e3311087b4d9 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 99645044b23c..326e80f7f8fa 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 fc6db6001c81..c0e12bead025 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 91eb54c7bec5..1c02f922a008 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 654b836c36e6..e262d6ba164d 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 7cd7995762dd..275c19a5ec6b 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 35103c6d35b5..f2686a821d65 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 e4490734f23b..5e5ede5c83bc 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 a9a9e1d5e0a2..4e2291385ef5 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 e5e03c1393d4..42b4076fdc2c 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 6d3e5ec79aae..97b5b0f8524e 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 4af53374df94..539e782c07af 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 4f002fdb1f63..0801604501b6 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 6e915213d6bb..3186eac69d64 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 22a079021f35..31d0a7b469bb 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 43f97948c419..4b94585c4cce 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 7f5b6653453c..9e028ded5c4d 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 90d15317a1d4..fe36239421c0 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 4222c0687154..1f0f4a3e8b5e 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 17ee9de39b42..f3045e06278c 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 b09c188697ce..667f726d191a 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 f1c8f189067c..1303b72a5d09 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 45be517d783f..e6b558d1d8d4 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)