summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorKrisztian Pinter <pin.terminator@gmail.com>2013-02-28 19:11:16 +0100
committerEike Rathke <erack@redhat.com>2013-03-04 19:33:48 +0000
commit429adbbe0d46716bc128ff8f066aae3cfc793b49 (patch)
tree36f701910981eec8f2b77a3cf21a13908d2308da /sc
parent483dbb8a7eb3626d6b1ed552d486d58e0fe149dd (diff)
RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
Change-Id: Ica78f316d481130c28da83f92561206518342eaa Reviewed-on: https://gerrit.libreoffice.org/2483 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/bcaslot.cxx2
-rw-r--r--sc/source/core/data/documen2.cxx22
-rw-r--r--sc/source/core/data/documen3.cxx78
-rw-r--r--sc/source/core/data/documen5.cxx74
-rw-r--r--sc/source/core/data/document.cxx102
-rw-r--r--sc/source/core/data/dpobject.cxx140
-rw-r--r--sc/source/core/data/dpsave.cxx94
-rw-r--r--sc/source/core/data/dptabsrc.cxx154
-rw-r--r--sc/source/core/data/funcdesc.cxx124
-rw-r--r--sc/source/core/data/table3.cxx40
-rw-r--r--sc/source/core/data/tabprotection.cxx6
-rw-r--r--sc/source/core/tool/addincfg.cxx6
-rw-r--r--sc/source/core/tool/appoptio.cxx16
-rw-r--r--sc/source/core/tool/autoform.cxx10
-rw-r--r--sc/source/core/tool/callform.cxx40
-rw-r--r--sc/source/core/tool/cellform.cxx26
-rw-r--r--sc/source/core/tool/charthelper.cxx30
-rw-r--r--sc/source/core/tool/compiler.cxx116
-rw-r--r--sc/source/core/tool/consoli.cxx2
-rw-r--r--sc/source/core/tool/dbdata.cxx20
-rw-r--r--sc/source/core/tool/defaultsoptions.cxx4
-rw-r--r--sc/source/core/tool/docoptio.cxx8
-rw-r--r--sc/source/core/tool/filtopt.cxx2
-rw-r--r--sc/source/core/tool/formulaopt.cxx20
-rw-r--r--sc/source/core/tool/formulaparserpool.cxx2
-rw-r--r--sc/source/core/tool/inputopt.cxx2
-rw-r--r--sc/source/core/tool/interpr1.cxx62
-rw-r--r--sc/source/core/tool/interpr2.cxx4
-rw-r--r--sc/source/core/tool/interpr4.cxx44
-rw-r--r--sc/source/core/tool/interpr5.cxx12
-rw-r--r--sc/source/core/tool/navicfg.cxx2
-rw-r--r--sc/source/core/tool/printopt.cxx4
-rw-r--r--sc/source/core/tool/unitconv.cxx24
-rw-r--r--sc/source/core/tool/viewopti.cxx16
-rw-r--r--sc/source/core/tool/zforauto.cxx2
35 files changed, 655 insertions, 655 deletions
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 2a0ca67b0f2d..0f5b657fcb55 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -147,7 +147,7 @@ bool ScBroadcastAreaSlot::CheckHardRecalcStateCondition() const
OSL_ENSURE( pShell, "Missing DocShell :-/" );
if ( pShell )
- pShell->SetError( SCWARN_CORE_HARD_RECALC, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ pShell->SetError( SCWARN_CORE_HARD_RECALC, OUString( OSL_LOG_PREFIX ) );
pDoc->SetAutoCalc( false );
pDoc->SetHardRecalcState( true );
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index b034bbf2b43c..10428e849dcd 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -530,7 +530,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks )
if (pSourceDoc->maTabs[i])
if (!pMarks || pMarks->GetTableSelect(i))
{
- rtl::OUString aString;
+ OUString aString;
pSourceDoc->maTabs[i]->GetName(aString);
if ( i < static_cast<SCTAB>(maTabs.size()) )
{
@@ -564,7 +564,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB nTab )
maTabs.resize(nTab+1, NULL );
}
maTabs[nTab] = new ScTable(this, nTab,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baeh")));
+ OUString("baeh"));
if (nTab < static_cast<SCTAB>(pSourceDoc->maTabs.size()) && pSourceDoc->maTabs[nTab])
maTabs[nTab]->SetLayoutRTL( pSourceDoc->maTabs[nTab]->IsLayoutRTL() );
}
@@ -587,7 +587,7 @@ void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
maTabs.resize( nTab + 1, NULL );
}
maTabs.at(nTab) = new ScTable(this, nTab,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("temp")),
+ OUString("temp"),
bExtras, bExtras);
}
@@ -765,7 +765,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
{
if (SC_TAB_APPEND == nNewPos || nNewPos >= static_cast<SCTAB>(maTabs.size()))
nNewPos = static_cast<SCTAB>(maTabs.size());
- rtl::OUString aName;
+ OUString aName;
GetName(nOldPos, aName);
// vorneweg testen, ob der Prefix als gueltig erkannt wird
@@ -890,7 +890,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
return bValid;
}
-void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModuleName, const rtl::OUString& sModuleSource );
+void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName, const OUString& sModuleSource );
sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
SCTAB nDestPos, bool bInsertNew,
@@ -915,7 +915,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
bool bValid = true;
if (bInsertNew) // neu einfuegen
{
- rtl::OUString aName;
+ OUString aName;
pSrcDoc->GetName(nSrcPos, aName);
CreateValidTabName(aName);
bValid = InsertTab(nDestPos, aName);
@@ -999,14 +999,14 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
SfxObjectShell* pSrcShell = pSrcDoc ? pSrcDoc->GetDocumentShell() : NULL;
if ( pSrcShell )
{
- rtl::OUString aLibName("Standard");
+ OUString aLibName("Standard");
const BasicManager *pBasicManager = pSrcShell->GetBasicManager();
if (pBasicManager && !pBasicManager->GetName().isEmpty())
{
aLibName = pSrcShell->GetBasicManager()->GetName();
}
- rtl::OUString sCodeName;
- rtl::OUString sSource;
+ OUString sCodeName;
+ OUString sSource;
uno::Reference< script::XLibraryContainer > xLibContainer = pSrcShell->GetBasicContainer();
uno::Reference< container::XNameContainer > xLib;
if( xLibContainer.is() )
@@ -1017,9 +1017,9 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
if( xLib.is() )
{
- rtl::OUString sSrcCodeName;
+ OUString sSrcCodeName;
pSrcDoc->GetCodeName( nSrcPos, sSrcCodeName );
- rtl::OUString sRTLSource;
+ OUString sRTLSource;
xLib->getByName( sSrcCodeName ) >>= sRTLSource;
sSource = sRTLSource;
}
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 9145356b6732..5fa9f7a181d3 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -116,10 +116,10 @@ void ScDocument::GetAllTabRangeNames(ScRangeName::TabNameCopyMap& rNames) const
rNames.swap(aNames);
}
-void ScDocument::SetAllRangeNames( const boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap)
+void ScDocument::SetAllRangeNames( const boost::ptr_map<OUString, ScRangeName>& rRangeMap)
{
- rtl::OUString aGlobalStr(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME));
- boost::ptr_map<rtl::OUString,ScRangeName>::const_iterator itr = rRangeMap.begin(), itrEnd = rRangeMap.end();
+ OUString aGlobalStr(STR_GLOBAL_RANGE_NAME);
+ boost::ptr_map<OUString,ScRangeName>::const_iterator itr = rRangeMap.begin(), itrEnd = rRangeMap.end();
for (; itr!=itrEnd; ++itr)
{
if (itr->first == aGlobalStr)
@@ -144,7 +144,7 @@ void ScDocument::SetAllRangeNames( const boost::ptr_map<rtl::OUString, ScRangeNa
}
}
-void ScDocument::GetTabRangeNameMap(std::map<rtl::OUString, ScRangeName*>& aRangeNameMap)
+void ScDocument::GetTabRangeNameMap(std::map<OUString, ScRangeName*>& aRangeNameMap)
{
for (SCTAB i = 0; i < static_cast<SCTAB>(maTabs.size()); ++i)
{
@@ -156,21 +156,21 @@ void ScDocument::GetTabRangeNameMap(std::map<rtl::OUString, ScRangeName*>& aRang
p = new ScRangeName();
SetRangeName(i, p);
}
- rtl::OUString aTableName;
+ OUString aTableName;
maTabs[i]->GetName(aTableName);
- aRangeNameMap.insert(std::pair<rtl::OUString, ScRangeName*>(aTableName,p));
+ aRangeNameMap.insert(std::pair<OUString, ScRangeName*>(aTableName,p));
}
}
-void ScDocument::GetRangeNameMap(std::map<rtl::OUString, ScRangeName*>& aRangeNameMap)
+void ScDocument::GetRangeNameMap(std::map<OUString, ScRangeName*>& aRangeNameMap)
{
GetTabRangeNameMap(aRangeNameMap);
if (!pRangeName)
{
pRangeName = new ScRangeName();
}
- rtl::OUString aGlobal(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME));
- aRangeNameMap.insert(std::pair<rtl::OUString, ScRangeName*>(aGlobal, pRangeName));
+ OUString aGlobal(STR_GLOBAL_RANGE_NAME);
+ aRangeNameMap.insert(std::pair<OUString, ScRangeName*>(aGlobal, pRangeName));
}
ScRangeName* ScDocument::GetRangeName(SCTAB nTab) const
@@ -203,7 +203,7 @@ void ScDocument::SetRangeName( ScRangeName* pNewRangeName )
}
-const ScRangeData* ScDocument::GetRangeAtBlock( const ScRange& rBlock, rtl::OUString* pName ) const
+const ScRangeData* ScDocument::GetRangeAtBlock( const ScRange& rBlock, OUString* pName ) const
{
const ScRangeData* pData = NULL;
if ( pRangeName )
@@ -390,7 +390,7 @@ bool ScDocument::IsScenario( SCTAB nTab ) const
return ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] &&maTabs[nTab]->IsScenario();
}
-void ScDocument::SetScenarioData( SCTAB nTab, const rtl::OUString& rComment,
+void ScDocument::SetScenarioData( SCTAB nTab, const OUString& rComment,
const Color& rColor, sal_uInt16 nFlags )
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] && maTabs[nTab]->IsScenario())
@@ -421,7 +421,7 @@ bool ScDocument::IsDefaultTabBgColor( SCTAB nTab ) const
return true;
}
-void ScDocument::GetScenarioData( SCTAB nTab, rtl::OUString& rComment,
+void ScDocument::GetScenarioData( SCTAB nTab, OUString& rComment,
Color& rColor, sal_uInt16& rFlags ) const
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] && maTabs[nTab]->IsScenario())
@@ -469,32 +469,32 @@ sal_uInt8 ScDocument::GetLinkMode( SCTAB nTab ) const
return SC_LINK_NONE;
}
-const rtl::OUString ScDocument::GetLinkDoc( SCTAB nTab ) const
+const OUString ScDocument::GetLinkDoc( SCTAB nTab ) const
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
return maTabs[nTab]->GetLinkDoc();
- return rtl::OUString();
+ return OUString();
}
-const rtl::OUString ScDocument::GetLinkFlt( SCTAB nTab ) const
+const OUString ScDocument::GetLinkFlt( SCTAB nTab ) const
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
return maTabs[nTab]->GetLinkFlt();
- return rtl::OUString();
+ return OUString();
}
-const rtl::OUString ScDocument::GetLinkOpt( SCTAB nTab ) const
+const OUString ScDocument::GetLinkOpt( SCTAB nTab ) const
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
return maTabs[nTab]->GetLinkOpt();
- return rtl::OUString();
+ return OUString();
}
-const rtl::OUString ScDocument::GetLinkTab( SCTAB nTab ) const
+const OUString ScDocument::GetLinkTab( SCTAB nTab ) const
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
return maTabs[nTab]->GetLinkTab();
- return rtl::OUString();
+ return OUString();
}
sal_uLong ScDocument::GetLinkRefreshDelay( SCTAB nTab ) const
@@ -504,16 +504,16 @@ sal_uLong ScDocument::GetLinkRefreshDelay( SCTAB nTab ) const
return 0;
}
-void ScDocument::SetLink( SCTAB nTab, sal_uInt8 nMode, const rtl::OUString& rDoc,
- const rtl::OUString& rFilter, const rtl::OUString& rOptions,
- const rtl::OUString& rTabName, sal_uLong nRefreshDelay )
+void ScDocument::SetLink( SCTAB nTab, sal_uInt8 nMode, const OUString& rDoc,
+ const OUString& rFilter, const OUString& rOptions,
+ const OUString& rTabName, sal_uLong nRefreshDelay )
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
maTabs[nTab]->SetLink( nMode, rDoc, rFilter, rOptions, rTabName, nRefreshDelay );
}
-bool ScDocument::HasLink( const rtl::OUString& rDoc,
- const rtl::OUString& rFilter, const rtl::OUString& rOptions ) const
+bool ScDocument::HasLink( const OUString& rDoc,
+ const OUString& rFilter, const OUString& rOptions ) const
{
SCTAB nCount = static_cast<SCTAB>(maTabs.size());
for (SCTAB i=0; i<nCount; i++)
@@ -526,8 +526,8 @@ bool ScDocument::HasLink( const rtl::OUString& rDoc,
return false;
}
-bool ScDocument::LinkExternalTab( SCTAB& rTab, const rtl::OUString& aDocTab,
- const rtl::OUString& aFileName, const rtl::OUString& aTabName )
+bool ScDocument::LinkExternalTab( SCTAB& rTab, const OUString& aDocTab,
+ const OUString& aFileName, const OUString& aTabName )
{
if ( IsClipboard() )
{
@@ -535,8 +535,8 @@ bool ScDocument::LinkExternalTab( SCTAB& rTab, const rtl::OUString& aDocTab,
return false;
}
rTab = 0;
- rtl::OUString aFilterName; // wird vom Loader gefuellt
- rtl::OUString aOptions; // Filter-Optionen
+ OUString aFilterName; // wird vom Loader gefuellt
+ OUString aOptions; // Filter-Optionen
sal_uInt32 nLinkCnt = pExtDocOptions ? pExtDocOptions->GetDocSettings().mnLinkCnt : 0;
ScDocumentLoader aLoader( aFileName, aFilterName, aOptions, nLinkCnt + 1 );
if ( aLoader.IsError() )
@@ -568,7 +568,7 @@ bool ScDocument::LinkExternalTab( SCTAB& rTab, const rtl::OUString& aDocTab,
ScTableLink* pLink = new ScTableLink( pShell, aFileName, aFilterName, aOptions, nRefreshDelay );
pLink->SetInCreate( true );
String aFilName = aFilterName;
- GetLinkManager()->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, String(aFileName),
+ GetLinkManager()->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, OUString(aFileName),
&aFilName );
pLink->Update();
pLink->SetInCreate( false );
@@ -1112,13 +1112,13 @@ void ScDocument::Fill(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScProg
nStepValue, nMaxValue, pProgress);
}
-rtl::OUString ScDocument::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY )
+OUString ScDocument::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY )
{
SCTAB nTab = rSource.aStart.Tab();
if (nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
return maTabs[nTab]->GetAutoFillPreview( rSource, nEndX, nEndY );
- return rtl::OUString();
+ return OUString();
}
void ScDocument::AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
@@ -1236,7 +1236,7 @@ void ScDocument::GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem,
bool ScDocument::SearchAndReplace(
const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, SCTAB& rTab,
const ScMarkData& rMark, ScRangeList& rMatchedRanges,
- rtl::OUString& rUndoStr, ScDocument* pUndoDoc)
+ OUString& rUndoStr, ScDocument* pUndoDoc)
{
//! getrennte Markierungen pro Tabelle verwalten !!!!!!!!!!!!!
@@ -1357,12 +1357,12 @@ SCSIZE ScDocument::Query(SCTAB nTab, const ScQueryParam& rQueryParam, bool bKeep
}
-void ScDocument::GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, rtl::OUString& rStr)
+void ScDocument::GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rStr)
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
maTabs[nTab]->GetUpperCellString( nCol, nRow, rStr );
else
- rStr = rtl::OUString();
+ rStr = OUString();
}
bool ScDocument::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScQueryParam& rQueryParam)
@@ -1585,7 +1585,7 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings )
for ( ScBaseCell* pCell = aIter.GetFirst(); pCell; pCell = aIter.GetNext() )
if ( pCell->HasStringData() )
{
- rtl::OUString aStr = pCell->GetStringData();
+ OUString aStr = pCell->GetStringData();
rStrings.insert(ScTypedStrData(aStr, 0.0, ScTypedStrData::Header));
}
}
@@ -1932,9 +1932,9 @@ void ScDocument::SetExtDocOptions( ScExtDocOptions* pNewOptions )
void ScDocument::DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow )
{
- rtl::OUString aEmpty;
- rtl::OUStringBuffer aTotal;
- rtl::OUString aCellStr;
+ OUString aEmpty;
+ OUStringBuffer aTotal;
+ OUString aCellStr;
SCCOL nCol;
SCROW nRow;
for (nRow=nStartRow; nRow<=nEndRow; nRow++)
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index d2bcac185f19..b769c4d68487 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
static void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xChartDoc,
- rtl::OUString& rRanges, chart::ChartDataRowSource& rDataRowSource,
+ OUString& rRanges, chart::ChartDataRowSource& rDataRowSource,
bool& rHasCategories, bool& rFirstCellAsLabel )
{
rHasCategories = rFirstCellAsLabel = false; // default if not in sequence
@@ -69,7 +69,7 @@ static void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument
for (long i = 0; i < nPropCount; i++)
{
const beans::PropertyValue& rProp = pPropArray[i];
- rtl::OUString aPropName(rProp.Name);
+ OUString aPropName(rProp.Name);
if ( aPropName == "CellRangeRepresentation" )
rProp.Value >>= rRanges;
@@ -84,23 +84,23 @@ static void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument
}
static void lcl_SetChartParameters( const uno::Reference< chart2::data::XDataReceiver >& xReceiver,
- const rtl::OUString& rRanges, chart::ChartDataRowSource eDataRowSource,
+ const OUString& rRanges, chart::ChartDataRowSource eDataRowSource,
bool bHasCategories, bool bFirstCellAsLabel )
{
if ( xReceiver.is() )
{
uno::Sequence< beans::PropertyValue > aArgs( 4 );
aArgs[0] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1,
+ OUString("CellRangeRepresentation"), -1,
uno::makeAny( rRanges ), beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1,
+ OUString("HasCategories"), -1,
uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1,
+ OUString("FirstCellAsLabel"), -1,
uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1,
+ OUString("DataRowSource"), -1,
uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE );
xReceiver->setArguments( aArgs );
}
@@ -136,7 +136,7 @@ void ScDocument::UpdateAllCharts()
uno::Reference< embed::XEmbeddedObject > xIPObj = ((SdrOle2Obj*)pObject)->GetObjRef();
if ( xIPObj.is() )
{
- ::rtl::OUString aIPName = ((SdrOle2Obj*)pObject)->GetPersistName();
+ OUString aIPName = ((SdrOle2Obj*)pObject)->GetPersistName();
for (size_t nPos = 0; nPos < nDataCount; ++nPos)
{
@@ -144,7 +144,7 @@ void ScDocument::UpdateAllCharts()
if (pChartObj->GetName() == aIPName)
{
ScRangeListRef aRanges = pChartObj->GetRangeList();
- rtl::OUString sRangeStr;
+ OUString sRangeStr;
aRanges->Format( sRangeStr, SCR_ABS_3D, this, GetAddressConvention() );
chart::ChartDataRowSource eDataRowSource = chart::ChartDataRowSource_COLUMNS;
@@ -187,7 +187,7 @@ void ScDocument::UpdateAllCharts()
pChartCollection->clear();
}
-bool ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, rtl::OUString& rName )
+bool ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, OUString& rName )
{
if (pDrawLayer && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
{
@@ -213,11 +213,11 @@ bool ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, rtl::OUString&
}
}
- rName = rtl::OUString();
+ rName = OUString();
return false; // nothing found
}
-void ScDocument::UpdateChartArea( const rtl::OUString& rChartName,
+void ScDocument::UpdateChartArea( const OUString& rChartName,
const ScRange& rNewArea, bool bColHeaders, bool bRowHeaders,
bool bAdd )
{
@@ -226,7 +226,7 @@ void ScDocument::UpdateChartArea( const rtl::OUString& rChartName,
UpdateChartArea( rChartName, aRLR, bColHeaders, bRowHeaders, bAdd );
}
-uno::Reference< chart2::XChartDocument > ScDocument::GetChartByName( const rtl::OUString& rChartName )
+uno::Reference< chart2::XChartDocument > ScDocument::GetChartByName( const OUString& rChartName )
{
uno::Reference< chart2::XChartDocument > xReturn;
@@ -244,7 +244,7 @@ uno::Reference< chart2::XChartDocument > ScDocument::GetChartByName( const rtl::
while (pObject)
{
if ( pObject->GetObjIdentifier() == OBJ_OLE2 &&
- rtl::OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rChartName )
+ OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rChartName )
{
xReturn.set( ScChartHelper::GetChartFromSdrObject( pObject ) );
return xReturn;
@@ -255,13 +255,13 @@ uno::Reference< chart2::XChartDocument > ScDocument::GetChartByName( const rtl::
}
return xReturn;
}
-void ScDocument::GetChartRanges( const rtl::OUString& rChartName, ::std::vector< ScRangeList >& rRangesVector, ScDocument* pSheetNameDoc )
+void ScDocument::GetChartRanges( const OUString& rChartName, ::std::vector< ScRangeList >& rRangesVector, ScDocument* pSheetNameDoc )
{
rRangesVector.clear();
uno::Reference< chart2::XChartDocument > xChartDoc( GetChartByName( rChartName ) );
if ( xChartDoc.is() )
{
- uno::Sequence< rtl::OUString > aRangeStrings;
+ uno::Sequence< OUString > aRangeStrings;
ScChartHelper::GetChartRanges( xChartDoc, aRangeStrings );
for( sal_Int32 nN=0; nN<aRangeStrings.getLength(); nN++ )
{
@@ -272,17 +272,17 @@ void ScDocument::GetChartRanges( const rtl::OUString& rChartName, ::std::vector<
}
}
-void ScDocument::SetChartRanges( const rtl::OUString& rChartName, const ::std::vector< ScRangeList >& rRangesVector )
+void ScDocument::SetChartRanges( const OUString& rChartName, const ::std::vector< ScRangeList >& rRangesVector )
{
uno::Reference< chart2::XChartDocument > xChartDoc( GetChartByName( rChartName ) );
if ( xChartDoc.is() )
{
sal_Int32 nCount = static_cast<sal_Int32>( rRangesVector.size() );
- uno::Sequence< rtl::OUString > aRangeStrings(nCount);
+ uno::Sequence< OUString > aRangeStrings(nCount);
for( sal_Int32 nN=0; nN<nCount; nN++ )
{
ScRangeList aScRangeList( rRangesVector[nN] );
- rtl::OUString sRangeStr;
+ OUString sRangeStr;
aScRangeList.Format( sRangeStr, SCR_ABS_3D, this, GetAddressConvention() );
aRangeStrings[nN]=sRangeStr;
}
@@ -290,7 +290,7 @@ void ScDocument::SetChartRanges( const rtl::OUString& rChartName, const ::std::v
}
}
-void ScDocument::GetOldChartParameters( const rtl::OUString& rName,
+void ScDocument::GetOldChartParameters( const OUString& rName,
ScRangeList& rRanges, bool& rColHeaders, bool& rRowHeaders )
{
// used for undo of changing chart source area
@@ -309,7 +309,7 @@ void ScDocument::GetOldChartParameters( const rtl::OUString& rName,
while (pObject)
{
if ( pObject->GetObjIdentifier() == OBJ_OLE2 &&
- rtl::OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rName )
+ OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rName )
{
uno::Reference< chart2::XChartDocument > xChartDoc( ScChartHelper::GetChartFromSdrObject( pObject ) );
if ( xChartDoc.is() )
@@ -317,7 +317,7 @@ void ScDocument::GetOldChartParameters( const rtl::OUString& rName,
chart::ChartDataRowSource eDataRowSource = chart::ChartDataRowSource_COLUMNS;
bool bHasCategories = false;
bool bFirstCellAsLabel = false;
- rtl::OUString aRangesStr;
+ OUString aRangesStr;
lcl_GetChartParameters( xChartDoc, aRangesStr, eDataRowSource, bHasCategories, bFirstCellAsLabel );
rRanges.Parse( aRangesStr, this );
@@ -339,7 +339,7 @@ void ScDocument::GetOldChartParameters( const rtl::OUString& rName,
}
}
-void ScDocument::UpdateChartArea( const rtl::OUString& rChartName,
+void ScDocument::UpdateChartArea( const OUString& rChartName,
const ScRangeListRef& rNewList, bool bColHeaders, bool bRowHeaders,
bool bAdd )
{
@@ -356,7 +356,7 @@ void ScDocument::UpdateChartArea( const rtl::OUString& rChartName,
while (pObject)
{
if ( pObject->GetObjIdentifier() == OBJ_OLE2 &&
- rtl::OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rChartName )
+ OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rChartName )
{
uno::Reference< chart2::XChartDocument > xChartDoc( ScChartHelper::GetChartFromSdrObject( pObject ) );
uno::Reference< chart2::data::XDataReceiver > xReceiver( xChartDoc, uno::UNO_QUERY );
@@ -366,7 +366,7 @@ void ScDocument::UpdateChartArea( const rtl::OUString& rChartName,
chart::ChartDataRowSource eDataRowSource = chart::ChartDataRowSource_COLUMNS;
bool bHasCategories = false;
bool bFirstCellAsLabel = false;
- rtl::OUString aRangesStr;
+ OUString aRangesStr;
lcl_GetChartParameters( xChartDoc, aRangesStr, eDataRowSource, bHasCategories, bFirstCellAsLabel );
bool bInternalData = xChartDoc->hasInternalDataProvider();
@@ -408,7 +408,7 @@ void ScDocument::UpdateChartArea( const rtl::OUString& rChartName,
xReceiver->attachNumberFormatsSupplier( xNumberFormatsSupplier );
}
- rtl::OUString sRangeStr;
+ OUString sRangeStr;
aNewRanges->Format( sRangeStr, SCR_ABS_3D, this, GetAddressConvention() );
lcl_SetChartParameters( xReceiver, sRangeStr, eDataRowSource, bHasCategories, bFirstCellAsLabel );
@@ -423,7 +423,7 @@ void ScDocument::UpdateChartArea( const rtl::OUString& rChartName,
}
}
-void ScDocument::UpdateChart( const rtl::OUString& rChartName )
+void ScDocument::UpdateChart( const OUString& rChartName )
{
if (!pDrawLayer || bInDtorClear)
return;
@@ -451,7 +451,7 @@ void ScDocument::UpdateChart( const rtl::OUString& rChartName )
}
}
-void ScDocument::RestoreChartListener( const rtl::OUString& rName )
+void ScDocument::RestoreChartListener( const OUString& rName )
{
// Read the data ranges from the chart object, and start listening to those ranges again
// (called when a chart is saved, because then it might be swapped out and stop listening itself).
@@ -464,7 +464,7 @@ void ScDocument::RestoreChartListener( const rtl::OUString& rName )
uno::Reference< chart2::data::XDataReceiver > xReceiver( xComponent, uno::UNO_QUERY );
if ( xChartDoc.is() && xReceiver.is() && !xChartDoc->hasInternalDataProvider())
{
- uno::Sequence<rtl::OUString> aRepresentations( xReceiver->getUsedRangeRepresentations() );
+ uno::Sequence<OUString> aRepresentations( xReceiver->getUsedRangeRepresentations() );
ScRangeListRef aRanges = new ScRangeList;
sal_Int32 nRangeCount = aRepresentations.getLength();
for ( sal_Int32 i=0; i<nRangeCount; i++ )
@@ -575,7 +575,7 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode,
}
-void ScDocument::SetChartRangeList( const rtl::OUString& rChartName,
+void ScDocument::SetChartRangeList( const OUString& rChartName,
const ScRangeListRef& rNewRangeListRef )
{
// called from ChartListener
@@ -593,7 +593,7 @@ void ScDocument::SetChartRangeList( const rtl::OUString& rChartName,
while (pObject)
{
if ( pObject->GetObjIdentifier() == OBJ_OLE2 &&
- rtl::OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rChartName )
+ OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rChartName )
{
uno::Reference< chart2::XChartDocument > xChartDoc( ScChartHelper::GetChartFromSdrObject( pObject ) );
uno::Reference< chart2::data::XDataReceiver > xReceiver( xChartDoc, uno::UNO_QUERY );
@@ -603,10 +603,10 @@ void ScDocument::SetChartRangeList( const rtl::OUString& rChartName,
chart::ChartDataRowSource eDataRowSource = chart::ChartDataRowSource_COLUMNS;
bool bHasCategories = false;
bool bFirstCellAsLabel = false;
- rtl::OUString aRangesStr;
+ OUString aRangesStr;
lcl_GetChartParameters( xChartDoc, aRangesStr, eDataRowSource, bHasCategories, bFirstCellAsLabel );
- rtl::OUString sRangeStr;
+ OUString sRangeStr;
rNewRangeListRef->Format( sRangeStr, SCR_ABS_3D, this, GetAddressConvention() );
lcl_SetChartParameters( xReceiver, sRangeStr, eDataRowSource, bHasCategories, bFirstCellAsLabel );
@@ -630,7 +630,7 @@ bool ScDocument::HasData( SCCOL nCol, SCROW nRow, SCTAB nTab )
}
uno::Reference< embed::XEmbeddedObject >
- ScDocument::FindOleObjectByName( const rtl::OUString& rName )
+ ScDocument::FindOleObjectByName( const OUString& rName )
{
if (!pDrawLayer)
return uno::Reference< embed::XEmbeddedObject >();
@@ -653,7 +653,7 @@ uno::Reference< embed::XEmbeddedObject >
{
SdrOle2Obj * pOleObject ( dynamic_cast< SdrOle2Obj * >( pObject ));
if( pOleObject &&
- rtl::OUString(pOleObject->GetPersistName()) == rName )
+ OUString(pOleObject->GetPersistName()) == rName )
{
return pOleObject->GetObjRef();
}
@@ -693,7 +693,7 @@ void ScDocument::UpdateChartListenerCollection()
if ( pObject->GetObjIdentifier() != OBJ_OLE2 )
continue;
- rtl::OUString aObjName = ((SdrOle2Obj*)pObject)->GetPersistName();
+ OUString aObjName = ((SdrOle2Obj*)pObject)->GetPersistName();
ScChartListener* pListener = pChartListenerCollection->findByName(aObjName);
if (pListener)
@@ -746,7 +746,7 @@ void ScDocument::UpdateChartListenerCollection()
pChartListenerCollection->FreeUnused();
}
-void ScDocument::AddOLEObjectToCollection(const rtl::OUString& rName)
+void ScDocument::AddOLEObjectToCollection(const OUString& rName)
{
OSL_ASSERT(pChartListenerCollection);
ScChartListenerCollection::StringSetType& rNonOleObjects =
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 543096e14eeb..8cfc787a35f7 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -134,9 +134,9 @@ void ScDocument::MakeTable( SCTAB nTab,bool _bNeedsNameCheck )
{
// Get Custom prefix
const ScDefaultsOptions& rOpt = SC_MOD()->GetDefaultsOptions();
- rtl::OUString aString = rOpt.GetInitTabPrefix();
+ OUString aString = rOpt.GetInitTabPrefix();
- aString += rtl::OUString::valueOf(static_cast<sal_Int32>(nTab+1));
+ aString += OUString::valueOf(static_cast<sal_Int32>(nTab+1));
if ( _bNeedsNameCheck )
CreateValidTabName( aString ); // no doubles
if (nTab < static_cast<SCTAB>(maTabs.size()))
@@ -163,7 +163,7 @@ bool ScDocument::HasTable( SCTAB nTab ) const
return false;
}
-bool ScDocument::GetName( SCTAB nTab, rtl::OUString& rName ) const
+bool ScDocument::GetName( SCTAB nTab, OUString& rName ) const
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()))
if (maTabs[nTab])
@@ -171,19 +171,19 @@ bool ScDocument::GetName( SCTAB nTab, rtl::OUString& rName ) const
maTabs[nTab]->GetName( rName );
return true;
}
- rName = rtl::OUString();
+ rName = OUString();
return false;
}
-rtl::OUString ScDocument::GetCopyTabName( SCTAB nTab ) const
+OUString ScDocument::GetCopyTabName( SCTAB nTab ) const
{
if (nTab < static_cast<SCTAB>(maTabNames.size()))
return maTabNames[nTab];
else
- return rtl::OUString();
+ return OUString();
}
-bool ScDocument::SetCodeName( SCTAB nTab, const rtl::OUString& rName )
+bool ScDocument::SetCodeName( SCTAB nTab, const OUString& rName )
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()))
{
@@ -193,11 +193,11 @@ bool ScDocument::SetCodeName( SCTAB nTab, const rtl::OUString& rName )
return true;
}
}
- OSL_TRACE( "**** can't set code name %s", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE( "**** can't set code name %s", OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr() );
return false;
}
-bool ScDocument::GetCodeName( SCTAB nTab, rtl::OUString& rName ) const
+bool ScDocument::GetCodeName( SCTAB nTab, OUString& rName ) const
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()))
if (maTabs[nTab])
@@ -205,13 +205,13 @@ bool ScDocument::GetCodeName( SCTAB nTab, rtl::OUString& rName ) const
maTabs[nTab]->GetCodeName( rName );
return true;
}
- rName = rtl::OUString();
+ rName = OUString();
return false;
}
-bool ScDocument::GetTable( const rtl::OUString& rName, SCTAB& rTab ) const
+bool ScDocument::GetTable( const OUString& rName, SCTAB& rTab ) const
{
- rtl::OUString aUpperName = ScGlobal::pCharClass->uppercase(rName);
+ OUString aUpperName = ScGlobal::pCharClass->uppercase(rName);
for (SCTAB i=0; i< static_cast<SCTAB>(maTabs.size()); i++)
if (maTabs[i])
@@ -240,7 +240,7 @@ void ScDocument::SetAnonymousDBData(SCTAB nTab, ScDBData* pDBData)
}
-bool ScDocument::ValidTabName( const rtl::OUString& rName )
+bool ScDocument::ValidTabName( const OUString& rName )
{
if (rName.isEmpty())
return false;
@@ -280,14 +280,14 @@ bool ScDocument::ValidTabName( const rtl::OUString& rName )
}
-bool ScDocument::ValidNewTabName( const rtl::OUString& rName ) const
+bool ScDocument::ValidNewTabName( const OUString& rName ) const
{
bool bValid = ValidTabName(rName);
TableContainer::const_iterator it = maTabs.begin();
for (; it != maTabs.end() && bValid; ++it)
if ( *it )
{
- rtl::OUString aOldName;
+ OUString aOldName;
(*it)->GetName(aOldName);
bValid = !ScGlobal::GetpTransliteration()->isEqual( rName, aOldName );
}
@@ -295,7 +295,7 @@ bool ScDocument::ValidNewTabName( const rtl::OUString& rName ) const
}
-void ScDocument::CreateValidTabName(rtl::OUString& rName) const
+void ScDocument::CreateValidTabName(OUString& rName) const
{
if ( !ValidTabName(rName) )
{
@@ -303,7 +303,7 @@ void ScDocument::CreateValidTabName(rtl::OUString& rName) const
// Get Custom prefix
const ScDefaultsOptions& rOpt = SC_MOD()->GetDefaultsOptions();
- rtl::OUString aStrTable = rOpt.GetInitTabPrefix();
+ OUString aStrTable = rOpt.GetInitTabPrefix();
bool bOk = false;
@@ -314,7 +314,7 @@ void ScDocument::CreateValidTabName(rtl::OUString& rName) const
for ( SCTAB i = static_cast<SCTAB>(maTabs.size())+1; !bOk ; i++ )
{
- rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
aBuf.append(aStrTable);
aBuf.append(static_cast<sal_Int32>(i));
rName = aBuf.makeStringAndClear();
@@ -331,7 +331,7 @@ void ScDocument::CreateValidTabName(rtl::OUString& rName) const
if ( !ValidNewTabName(rName) )
{
SCTAB i = 1;
- rtl::OUStringBuffer aName;
+ OUStringBuffer aName;
do
{
i++;
@@ -345,15 +345,15 @@ void ScDocument::CreateValidTabName(rtl::OUString& rName) const
}
}
-void ScDocument::CreateValidTabNames(std::vector<rtl::OUString>& aNames, SCTAB nCount) const
+void ScDocument::CreateValidTabNames(std::vector<OUString>& aNames, SCTAB nCount) const
{
aNames.clear();//ensure that the vector is empty
// Get Custom prefix
const ScDefaultsOptions& rOpt = SC_MOD()->GetDefaultsOptions();
- rtl::OUString aStrTable = rOpt.GetInitTabPrefix();
+ OUString aStrTable = rOpt.GetInitTabPrefix();
- rtl::OUStringBuffer rName;
+ OUStringBuffer rName;
bool bOk = false;
// First test if the prefix is valid, if so only avoid doubles
@@ -379,19 +379,19 @@ void ScDocument::CreateValidTabNames(std::vector<rtl::OUString>& aNames, SCTAB n
}
}
-void ScDocument::AppendTabOnLoad(const rtl::OUString& rName)
+void ScDocument::AppendTabOnLoad(const OUString& rName)
{
SCTAB nTabCount = static_cast<SCTAB>(maTabs.size());
if (!ValidTab(nTabCount))
// max table count reached. No more tables.
return;
- rtl::OUString aName = rName;
+ OUString aName = rName;
CreateValidTabName(aName);
maTabs.push_back( new ScTable(this, nTabCount, aName) );
}
-void ScDocument::SetTabNameOnLoad(SCTAB nTab, const rtl::OUString& rName)
+void ScDocument::SetTabNameOnLoad(SCTAB nTab, const OUString& rName)
{
if (!ValidTab(nTab) || static_cast<SCTAB>(maTabs.size()) <= nTab)
return;
@@ -413,7 +413,7 @@ void ScDocument::InvalidateStreamOnSave()
}
}
-bool ScDocument::InsertTab( SCTAB nPos, const rtl::OUString& rName,
+bool ScDocument::InsertTab( SCTAB nPos, const OUString& rName,
bool bExternalDocument )
{
SCTAB nTabCount = static_cast<SCTAB>(maTabs.size());
@@ -494,7 +494,7 @@ bool ScDocument::InsertTab( SCTAB nPos, const rtl::OUString& rName,
}
-bool ScDocument::InsertTabs( SCTAB nPos, const std::vector<rtl::OUString>& rNames,
+bool ScDocument::InsertTabs( SCTAB nPos, const std::vector<OUString>& rNames,
bool bExternalDocument, bool bNamesValid )
{
SCTAB nNewSheets = static_cast<SCTAB>(rNames.size());
@@ -752,7 +752,7 @@ bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets, ScDocument* pRefUndoDoc
}
-bool ScDocument::RenameTab( SCTAB nTab, const rtl::OUString& rName, bool /* bUpdateRef */,
+bool ScDocument::RenameTab( SCTAB nTab, const OUString& rName, bool /* bUpdateRef */,
bool bExternalDocument )
{
bool bValid = false;
@@ -768,7 +768,7 @@ bool ScDocument::RenameTab( SCTAB nTab, const rtl::OUString& rName, bool /* bUpd
for (i=0; (i< static_cast<SCTAB>(maTabs.size())) && bValid; i++)
if (maTabs[i] && (i != nTab))
{
- rtl::OUString aOldName;
+ OUString aOldName;
maTabs[i]->GetName(aOldName);
bValid = !ScGlobal::GetpTransliteration()->isEqual( rName, aOldName );
}
@@ -1669,7 +1669,7 @@ void ScDocument::InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSe
xPoolHelper = pSrcDoc->xPoolHelper;
- rtl::OUString aString;
+ OUString aString;
for (SCTAB nTab = 0; nTab <= rTabSelection.GetLastSelected(); nTab++)
if ( rTabSelection.GetTableSelect( nTab ) )
{
@@ -1705,7 +1705,7 @@ void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2,
if (pSrcDoc->pShell->GetMedium())
maFileURL = pSrcDoc->pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
- rtl::OUString aString;
+ OUString aString;
if ( nTab2 >= static_cast<SCTAB>(maTabs.size()))
maTabs.resize(nTab2 + 1, NULL);
for (SCTAB nTab = nTab1; nTab <= nTab2; nTab++)
@@ -1725,7 +1725,7 @@ void ScDocument::AddUndoTab( SCTAB nTab1, SCTAB nTab2, bool bColInfo, bool bRowI
{
if (bIsUndo)
{
- rtl::OUString aString;
+ OUString aString;
if (nTab2 >= static_cast<SCTAB>(maTabs.size()))
{
maTabs.resize(nTab2+1,NULL);
@@ -1906,12 +1906,12 @@ void ScDocument::CopyToClip(const ScClipParam& rClipParam,
{
if( *itr )
{
- rtl::OUString aTabName;
+ OUString aTabName;
(*itr)->GetName(aTabName);
pClipDoc->maTabNames.push_back(aTabName);
}
else
- pClipDoc->maTabNames.push_back(rtl::OUString());
+ pClipDoc->maTabNames.push_back(OUString());
}
pClipDoc->aDocName = aDocName;
@@ -1993,12 +1993,12 @@ void ScDocument::CopyTabToClip(SCCOL nCol1, SCROW nRow1,
{
if( *itr )
{
- rtl::OUString aTabName;
+ OUString aTabName;
(*itr)->GetName(aTabName);
pClipDoc->maTabNames.push_back(aTabName);
}
else
- pClipDoc->maTabNames.push_back(rtl::OUString());
+ pClipDoc->maTabNames.push_back(OUString());
}
PutInOrder( nCol1, nCol2 );
@@ -2901,7 +2901,7 @@ void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell,
if (nTab >= static_cast<SCTAB>(maTabs.size()))
maTabs.resize(nTab + 1,NULL);
maTabs[nTab] = new ScTable(this, nTab,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("temp")),
+ OUString("temp"),
bExtras, bExtras);
}
@@ -2921,7 +2921,7 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, bool bForceT
if (nTab >= static_cast<SCTAB>(maTabs.size()))
maTabs.resize(nTab + 1,NULL);
maTabs[nTab] = new ScTable(this, nTab,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("temp")),
+ OUString("temp"),
bExtras, bExtras);
}
@@ -2930,7 +2930,7 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, bool bForceT
}
-bool ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const rtl::OUString& rString,
+bool ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rString,
ScSetStringParam* pParam )
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
@@ -2959,22 +2959,22 @@ OUString ScDocument::GetString( SCCOL nCol, SCROW nRow, SCTAB nTab )
return EMPTY_OUSTRING;
}
-void ScDocument::GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, rtl::OUString& rString )
+void ScDocument::GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rString )
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
maTabs[nTab]->GetInputString( nCol, nRow, rString );
else
- rString = rtl::OUString();
+ rString = OUString();
}
void ScDocument::GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString )
{
- rtl::OUString aString;
+ OUString aString;
GetInputString( nCol, nRow, nTab, aString);
rString = aString;
}
-sal_uInt16 ScDocument::GetStringForFormula( const ScAddress& rPos, rtl::OUString& rString )
+sal_uInt16 ScDocument::GetStringForFormula( const ScAddress& rPos, OUString& rString )
{
// Used in formulas (add-in parameters etc), so it must use the same semantics as
// ScInterpreter::GetCellString: always format values as numbers.
@@ -3123,18 +3123,18 @@ void ScDocument::GetNumberFormatInfo( short& nType, sal_uLong& nIndex,
}
-void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, rtl::OUString& rFormula ) const
+void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rFormula ) const
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
maTabs[nTab]->GetFormula( nCol, nRow, rFormula );
else
- rFormula = rtl::OUString();
+ rFormula = OUString();
}
void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula ) const
{
- rtl::OUString aString;
+ OUString aString;
GetFormula( nCol, nRow, nTab, aString);
rFormula = aString;
}
@@ -5416,26 +5416,26 @@ sal_uLong ScDocument::GetCodeCount() const
}
-void ScDocument::PageStyleModified( SCTAB nTab, const rtl::OUString& rNewName )
+void ScDocument::PageStyleModified( SCTAB nTab, const OUString& rNewName )
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
maTabs[nTab]->PageStyleModified( rNewName );
}
-void ScDocument::SetPageStyle( SCTAB nTab, const rtl::OUString& rName )
+void ScDocument::SetPageStyle( SCTAB nTab, const OUString& rName )
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
maTabs[nTab]->SetPageStyle( rName );
}
-const rtl::OUString ScDocument::GetPageStyle( SCTAB nTab ) const
+const OUString ScDocument::GetPageStyle( SCTAB nTab ) const
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
return maTabs[nTab]->GetPageStyle();
- return rtl::OUString();
+ return OUString();
}
@@ -5615,7 +5615,7 @@ bool ScDocument::NeedPageResetAfterTab( SCTAB nTab ) const
if ( nTab + 1 < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] && maTabs[nTab+1] )
{
- rtl::OUString aNew = maTabs[nTab+1]->GetPageStyle();
+ OUString aNew = maTabs[nTab+1]->GetPageStyle();
if ( aNew != maTabs[nTab]->GetPageStyle() )
{
SfxStyleSheetBase* pStyle = xPoolHelper->GetStylePool()->Find( aNew, SFX_STYLE_FAMILY_PAGE );
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index e75e1d51de44..c31a4149c97f 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -273,11 +273,11 @@ sal_uInt16 lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSup
if ( xDimProp.is() )
{
bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) );
+ OUString(SC_UNO_DP_ISDATALAYOUT) );
//! error checking -- is "IsDataLayoutDimension" property required??
if (bFound)
nRet = ScUnoHelpFunctions::GetEnumProperty(
- xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION)),
+ xDimProp, OUString(SC_UNO_DP_ORIENTATION),
sheet::DataPilotFieldOrientation_HIDDEN );
}
}
@@ -1000,11 +1000,11 @@ bool ScDPObject::GetMembers( sal_Int32 nDim, sal_Int32 nHier, vector<ScDPLabelDa
Reference<beans::XPropertySet> xMemProp(xMember, UNO_QUERY);
if (xMemProp.is())
{
- aMem.mbVisible = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISVISIBLE)));
- aMem.mbShowDetails = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SHOWDETAILS)));
+ aMem.mbVisible = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString(SC_UNO_DP_ISVISIBLE));
+ aMem.mbShowDetails = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString(SC_UNO_DP_SHOWDETAILS));
aMem.maLayoutName = ScUnoHelpFunctions::GetStringProperty(
- xMemProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_LAYOUTNAME)), OUString());
+ xMemProp, OUString(SC_UNO_DP_LAYOUTNAME), OUString());
}
aMembers.push_back(aMem);
@@ -1158,7 +1158,7 @@ bool ScDPObject::IsDimNameInUse(const OUString& rName) const
continue;
OUString aLayoutName = ScUnoHelpFunctions::GetStringProperty(
- xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_LAYOUTNAME)), OUString());
+ xPropSet, OUString(SC_UNO_DP_LAYOUTNAME), OUString());
if (aLayoutName.equalsIgnoreAsciiCase(rName))
return true;
}
@@ -1184,10 +1184,10 @@ OUString ScDPObject::GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFla
if ( xDimName.is() && xDimProp.is() )
{
sal_Bool bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) );
+ OUString(SC_UNO_DP_ISDATALAYOUT) );
//! error checking -- is "IsDataLayoutDimension" property required??
- rtl::OUString aName;
+ OUString aName;
try
{
aName = xDimName->getName();
@@ -1202,7 +1202,7 @@ OUString ScDPObject::GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFla
if (pFlags)
*pFlags = ScUnoHelpFunctions::GetLongProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_FLAGS)), 0 );
+ OUString(SC_UNO_DP_FLAGS), 0 );
}
}
}
@@ -1228,7 +1228,7 @@ bool ScDPObject::IsDuplicated( long nDim )
try
{
uno::Any aOrigAny = xDimProp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL)) );
+ OUString(SC_UNO_DP_ORIGINAL) );
uno::Reference<uno::XInterface> xIntOrig;
if ( (aOrigAny >>= xIntOrig) && xIntOrig.is() )
bDuplicated = true;
@@ -1326,7 +1326,7 @@ static bool lcl_Dequote( const String& rSource, xub_StrLen nStartPos, xub_StrLen
if ( rSource.GetChar(nStartPos) == cQuote )
{
- rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
xub_StrLen nPos = nStartPos + 1;
const xub_StrLen nLen = rSource.Len();
@@ -1551,7 +1551,7 @@ bool ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
std::vector<String> aDataNames; // data fields (source name)
std::vector<String> aGivenNames; // data fields (compound name)
std::vector<String> aFieldNames; // column/row/data fields
- std::vector< uno::Sequence<rtl::OUString> > aFieldValues;
+ std::vector< uno::Sequence<OUString> > aFieldValues;
//
// get all the field and item names
@@ -1567,16 +1567,16 @@ bool ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY );
uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDim, uno::UNO_QUERY );
sal_Bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) );
+ OUString(SC_UNO_DP_ISDATALAYOUT) );
sal_Int32 nOrient = ScUnoHelpFunctions::GetEnumProperty(
- xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION)),
+ xDimProp, OUString(SC_UNO_DP_ORIENTATION),
sheet::DataPilotFieldOrientation_HIDDEN );
if ( !bDataLayout )
{
if ( nOrient == sheet::DataPilotFieldOrientation_DATA )
{
- rtl::OUString aSourceName;
- rtl::OUString aGivenName;
+ OUString aSourceName;
+ OUString aGivenName;
ScDPOutput::GetDataDimensionNames( aSourceName, aGivenName, xIntDim );
aDataNames.push_back( aSourceName );
aGivenNames.push_back( aGivenName );
@@ -1587,7 +1587,7 @@ bool ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
uno::Reference<container::XIndexAccess> xHiers = new ScNameToIndexAccess( xDimSupp->getHierarchies() );
sal_Int32 nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_USEDHIERARCHY)) );
+ OUString(SC_UNO_DP_USEDHIERARCHY) );
if ( nHierarchy >= xHiers->getCount() )
nHierarchy = 0;
@@ -1609,7 +1609,7 @@ bool ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
uno::Reference<container::XNameAccess> xMembers = xLevSupp->getMembers();
String aFieldName( xLevNam->getName() );
- uno::Sequence<rtl::OUString> aMemberNames( xMembers->getElementNames() );
+ uno::Sequence<OUString> aMemberNames( xMembers->getElementNames() );
aFieldNames.push_back( aFieldName );
aFieldValues.push_back( aMemberNames );
@@ -1702,9 +1702,9 @@ bool ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
// aSpecField is initialized from aFieldNames array, so exact comparison can be used.
if ( !bHasFieldName || aFieldNames[nField] == aSpecField )
{
- const uno::Sequence<rtl::OUString>& rItems = aFieldValues[nField];
+ const uno::Sequence<OUString>& rItems = aFieldValues[nField];
sal_Int32 nItemCount = rItems.getLength();
- const rtl::OUString* pItemArr = rItems.getConstArray();
+ const OUString* pItemArr = rItems.getConstArray();
for ( sal_Int32 nItem=0; nItem<nItemCount; nItem++ )
{
if ( lcl_IsAtStart( aRemaining, pItemArr[nItem], nMatched, false, &eFunc ) )
@@ -1777,7 +1777,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY );
sal_Bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) );
+ OUString(SC_UNO_DP_ISDATALAYOUT) );
if (bDataLayout)
{
// the elements of the data layout dimension can't be found by their names
@@ -1835,7 +1835,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
if ( xMbrProp.is() )
{
bShowDetails = ScUnoHelpFunctions::GetBoolProperty( xMbrProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SHOWDETAILS)) );
+ OUString(SC_UNO_DP_SHOWDETAILS) );
//! don't set bFound if property is unknown?
bFound = sal_True;
}
@@ -1870,7 +1870,7 @@ static sal_uInt16 lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>&
{
uno::Reference<container::XIndexAccess> xHiers = new ScNameToIndexAccess( xDimSupp->getHierarchies() );
long nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_USEDHIERARCHY)) );
+ OUString(SC_UNO_DP_USEDHIERARCHY) );
if ( nHierarchy >= xHiers->getCount() )
nHierarchy = 0;
@@ -1889,7 +1889,7 @@ static sal_uInt16 lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>&
try
{
aSubAny = xLevProp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SUBTOTAL)) );
+ OUString(SC_UNO_DP_SUBTOTAL) );
}
catch(uno::Exception&)
{
@@ -1955,7 +1955,7 @@ void lcl_FillOldFields( ScPivotFieldVector& rFields,
// dimension orientation, hidden by default.
long nDimOrient = ScUnoHelpFunctions::GetEnumProperty(
- xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION)),
+ xDimProp, OUString(SC_UNO_DP_ORIENTATION),
sheet::DataPilotFieldOrientation_HIDDEN );
if ( xDimProp.is() && nDimOrient == nOrient )
@@ -1967,7 +1967,7 @@ void lcl_FillOldFields( ScPivotFieldVector& rFields,
if ( nOrient == sheet::DataPilotFieldOrientation_DATA )
{
sheet::GeneralFunction eFunc = (sheet::GeneralFunction)ScUnoHelpFunctions::GetEnumProperty(
- xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_FUNCTION)),
+ xDimProp, OUString(SC_UNO_DP_FUNCTION),
sheet::GeneralFunction_NONE );
if ( eFunc == sheet::GeneralFunction_AUTO )
{
@@ -1981,14 +1981,14 @@ void lcl_FillOldFields( ScPivotFieldVector& rFields,
// is this data layout dimension?
bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty(
- xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)));
+ xDimProp, OUString(SC_UNO_DP_ISDATALAYOUT));
// is this dimension cloned?
long nDupSource = -1;
try
{
uno::Any aOrigAny = xDimProp->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL_POS)));
+ OUString(SC_UNO_DP_ORIGINAL_POS));
sal_Int32 nTmp = 0;
if (aOrigAny >>= nTmp)
nDupSource = static_cast<sal_Int32>(nTmp);
@@ -2029,13 +2029,13 @@ void lcl_FillOldFields( ScPivotFieldVector& rFields,
rField.nFuncMask = nMask;
rField.mnDupCount = nDupCount;
long nPos = ScUnoHelpFunctions::GetLongProperty(
- xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_POSITION)));
+ xDimProp, OUString(SC_UNO_DP_POSITION));
aPos.push_back(nPos);
try
{
if (nOrient == sheet::DataPilotFieldOrientation_DATA)
- xDimProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_REFVALUE)))
+ xDimProp->getPropertyValue(OUString(SC_UNO_DP_REFVALUE))
>>= rField.maFieldRef;
}
catch (uno::Exception&)
@@ -2096,15 +2096,15 @@ bool ScDPObject::FillOldParam(ScPivotParam& rParam) const
try
{
rParam.bMakeTotalCol = ScUnoHelpFunctions::GetBoolProperty( xProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_COLGRAND)), true );
+ OUString(SC_UNO_DP_COLGRAND), true );
rParam.bMakeTotalRow = ScUnoHelpFunctions::GetBoolProperty( xProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ROWGRAND)), true );
+ OUString(SC_UNO_DP_ROWGRAND), true );
// following properties may be missing for external sources
rParam.bIgnoreEmptyRows = ScUnoHelpFunctions::GetBoolProperty( xProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_IGNOREEMPTY)) );
+ OUString(SC_UNO_DP_IGNOREEMPTY) );
rParam.bDetectCategories = ScUnoHelpFunctions::GetBoolProperty( xProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_REPEATEMPTY)) );
+ OUString(SC_UNO_DP_REPEATEMPTY) );
}
catch(uno::Exception&)
{
@@ -2122,7 +2122,7 @@ static void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans
uno::Reference<container::XIndexAccess> xHiers = new ScNameToIndexAccess( xDimSupp->getHierarchies() );
long nHierarchy = ScUnoHelpFunctions::GetLongProperty(
- xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_USEDHIERARCHY)));
+ xDimProp, OUString(SC_UNO_DP_USEDHIERARCHY));
if ( nHierarchy >= xHiers->getCount() )
nHierarchy = 0;
rData.mnUsedHier = nHierarchy;
@@ -2144,15 +2144,15 @@ static void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans
return;
rData.mbShowAll = ScUnoHelpFunctions::GetBoolProperty(
- xLevProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SHOWEMPTY)));
+ xLevProp, OUString(SC_UNO_DP_SHOWEMPTY));
try
{
- xLevProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SORTING ) ) )
+ xLevProp->getPropertyValue( OUString( SC_UNO_DP_SORTING ) )
>>= rData.maSortInfo;
- xLevProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_LAYOUT ) ) )
+ xLevProp->getPropertyValue( OUString( SC_UNO_DP_LAYOUT ) )
>>= rData.maLayoutInfo;
- xLevProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_AUTOSHOW ) ) )
+ xLevProp->getPropertyValue( OUString( SC_UNO_DP_AUTOSHOW ) )
>>= rData.maShowInfo;
}
catch(uno::Exception&)
@@ -2172,16 +2172,16 @@ bool ScDPObject::FillLabelDataForDimension(
return false;
bool bData = ScUnoHelpFunctions::GetBoolProperty(
- xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)));
+ xDimProp, OUString(SC_UNO_DP_ISDATALAYOUT));
//! error checking -- is "IsDataLayoutDimension" property required??
sal_Int32 nOrigPos = -1;
- rtl::OUString aFieldName;
+ OUString aFieldName;
try
{
aFieldName = xDimName->getName();
uno::Any aOrigAny = xDimProp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL_POS)));
+ OUString(SC_UNO_DP_ORIGINAL_POS));
aOrigAny >>= nOrigPos;
}
catch(uno::Exception&)
@@ -2189,10 +2189,10 @@ bool ScDPObject::FillLabelDataForDimension(
}
OUString aLayoutName = ScUnoHelpFunctions::GetStringProperty(
- xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_LAYOUTNAME)), OUString());
+ xDimProp, OUString(SC_UNO_DP_LAYOUTNAME), OUString());
OUString aSubtotalName = ScUnoHelpFunctions::GetStringProperty(
- xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_FIELD_SUBTOTALNAME)), OUString());
+ xDimProp, OUString(SC_UNO_DP_FIELD_SUBTOTALNAME), OUString());
bool bIsValue = true; //! check
aFieldName = ScDPUtil::getSourceDimensionName(aFieldName);
@@ -2214,7 +2214,7 @@ bool ScDPObject::FillLabelDataForDimension(
GetMembers(nDim, GetUsedHierarchy(nDim), rLabelData.maMembers);
lcl_FillLabelData(rLabelData, xDimProp);
rLabelData.mnFlags = ScUnoHelpFunctions::GetLongProperty(
- xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_FLAGS)), 0);
+ xDimProp, OUString(SC_UNO_DP_FLAGS), 0);
}
return true;
}
@@ -2275,7 +2275,7 @@ bool ScDPObject::GetHierarchiesNA( sal_Int32 nDim, uno::Reference< container::XN
return bRet;
}
-bool ScDPObject::GetHierarchies( sal_Int32 nDim, uno::Sequence< rtl::OUString >& rHiers )
+bool ScDPObject::GetHierarchies( sal_Int32 nDim, uno::Sequence< OUString >& rHiers )
{
bool bRet = false;
uno::Reference< container::XNameAccess > xHiersNA;
@@ -2294,7 +2294,7 @@ sal_Int32 ScDPObject::GetUsedHierarchy( sal_Int32 nDim )
uno::Reference<container::XIndexAccess> xIntDims(new ScNameToIndexAccess( xDimsName ));
uno::Reference<beans::XPropertySet> xDim(xIntDims->getByIndex( nDim ), uno::UNO_QUERY);
if (xDim.is())
- nHier = ScUnoHelpFunctions::GetLongProperty( xDim, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_USEDHIERARCHY ) ) );
+ nHier = ScUnoHelpFunctions::GetLongProperty( xDim, OUString( SC_UNO_DP_USEDHIERARCHY ) );
return nHier;
}
@@ -2343,9 +2343,9 @@ bool ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference<
namespace {
-rtl::OUString lcl_GetDimName( const uno::Reference<sheet::XDimensionsSupplier>& xSource, long nDim )
+OUString lcl_GetDimName( const uno::Reference<sheet::XDimensionsSupplier>& xSource, long nDim )
{
- rtl::OUString aName;
+ OUString aName;
if ( xSource.is() )
{
uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
@@ -2421,7 +2421,7 @@ void ScDPObject::ConvertOrientation(
pDim = rSaveData.GetDataLayoutDimension();
else
{
- rtl::OUString aDocStr = lcl_GetDimName( xSource, nCol ); // cols must start at 0
+ OUString aDocStr = lcl_GetDimName( xSource, nCol ); // cols must start at 0
if (!aDocStr.isEmpty())
pDim = rSaveData.GetDimensionByName(aDocStr);
else
@@ -2536,7 +2536,7 @@ bool ScDPObject::HasRegisteredSources()
if ( xEnAc.is() )
{
uno::Reference<container::XEnumeration> xEnum = xEnAc->createContentEnumeration(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDPSOURCE_SERVICE )) );
+ OUString( SCDPSOURCE_SERVICE ) );
if ( xEnum.is() && xEnum->hasMoreElements() )
bFound = true;
}
@@ -2544,9 +2544,9 @@ bool ScDPObject::HasRegisteredSources()
return bFound;
}
-uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources()
+uno::Sequence<OUString> ScDPObject::GetRegisteredSources()
{
- uno::Sequence<rtl::OUString> aSeq(0);
+ uno::Sequence<OUString> aSeq(0);
// use implementation names...
@@ -2555,7 +2555,7 @@ uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources()
if ( xEnAc.is() )
{
uno::Reference<container::XEnumeration> xEnum = xEnAc->createContentEnumeration(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDPSOURCE_SERVICE )) );
+ OUString( SCDPSOURCE_SERVICE ) );
if ( xEnum.is() )
{
long nCount = 0;
@@ -2571,7 +2571,7 @@ uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources()
uno::Reference<lang::XServiceInfo> xInfo( xIntFac, uno::UNO_QUERY );
if ( xInfo.is() )
{
- rtl::OUString sName = xInfo->getImplementationName();
+ OUString sName = xInfo->getImplementationName();
aSeq.realloc( nCount+1 );
aSeq.getArray()[nCount] = sName;
@@ -2588,7 +2588,7 @@ uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources()
uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPServiceDesc& rDesc )
{
- rtl::OUString aImplName = rDesc.aServiceName;
+ OUString aImplName = rDesc.aServiceName;
uno::Reference<sheet::XDimensionsSupplier> xRet = NULL;
uno::Reference<lang::XMultiServiceFactory> xManager = comphelper::getProcessServiceFactory();
@@ -2597,7 +2597,7 @@ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPS
return xRet;
uno::Reference<container::XEnumeration> xEnum =
- xEnAc->createContentEnumeration(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCDPSOURCE_SERVICE)));
+ xEnAc->createContentEnumeration(OUString(SCDPSOURCE_SERVICE));
if (!xEnum.is())
return xRet;
@@ -2638,10 +2638,10 @@ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPS
// initialize
uno::Sequence<uno::Any> aSeq(4);
uno::Any* pArray = aSeq.getArray();
- pArray[0] <<= rtl::OUString( rDesc.aParSource );
- pArray[1] <<= rtl::OUString( rDesc.aParName );
- pArray[2] <<= rtl::OUString( rDesc.aParUser );
- pArray[3] <<= rtl::OUString( rDesc.aParPass );
+ pArray[0] <<= OUString( rDesc.aParSource );
+ pArray[1] <<= OUString( rDesc.aParName );
+ pArray[2] <<= OUString( rDesc.aParUser );
+ pArray[3] <<= OUString( rDesc.aParPass );
xInit->initialize( aSeq );
}
xRet = uno::Reference<sheet::XDimensionsSupplier>( xInterface, uno::UNO_QUERY );
@@ -2978,14 +2978,14 @@ ScDPCache* ScDPCollection::DBCaches::getExistingCache(
}
uno::Reference<sdbc::XRowSet> ScDPCollection::DBCaches::createRowSet(
- sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const ::rtl::OUString& rCommand)
+ sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand)
{
uno::Reference<sdbc::XRowSet> xRowSet;
try
{
xRowSet = uno::Reference<sdbc::XRowSet>(
comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SERVICE_ROWSET))),
+ OUString(SC_SERVICE_ROWSET)),
UNO_QUERY);
uno::Reference<beans::XPropertySet> xRowProp(xRowSet, UNO_QUERY);
@@ -3002,15 +3002,15 @@ uno::Reference<sdbc::XRowSet> ScDPCollection::DBCaches::createRowSet(
uno::Any aAny;
aAny <<= rDBName;
xRowProp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_DATASOURCENAME)), aAny );
+ OUString(SC_DBPROP_DATASOURCENAME), aAny );
aAny <<= rCommand;
xRowProp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny );
+ OUString(SC_DBPROP_COMMAND), aAny );
aAny <<= nSdbType;
xRowProp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny );
+ OUString(SC_DBPROP_COMMANDTYPE), aAny );
uno::Reference<sdb::XCompletedExecution> xExecute( xRowSet, uno::UNO_QUERY );
if ( xExecute.is() )
@@ -3419,12 +3419,12 @@ const ScDPObject* ScDPCollection::GetByName(const OUString& rName) const
OUString ScDPCollection::CreateNewName( sal_uInt16 nMin ) const
{
- OUString aBase(RTL_CONSTASCII_USTRINGPARAM("DataPilot"));
+ OUString aBase("DataPilot");
size_t n = maTables.size();
for (size_t nAdd = 0; nAdd <= n; ++nAdd) // nCount+1 tries
{
- ::rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
aBuf.append(aBase);
aBuf.append(static_cast<sal_Int32>(nMin + nAdd));
OUString aNewName = aBuf.makeStringAndClear();
@@ -3555,7 +3555,7 @@ void ScDPCollection::GetAllTables(const ScRange& rSrcRange, std::set<ScDPObject*
rRefs.swap(aRefs);
}
-void ScDPCollection::GetAllTables(const rtl::OUString& rSrcName, std::set<ScDPObject*>& rRefs) const
+void ScDPCollection::GetAllTables(const OUString& rSrcName, std::set<ScDPObject*>& rRefs) const
{
std::set<ScDPObject*> aRefs;
TablesType::const_iterator it = maTables.begin(), itEnd = maTables.end();
@@ -3585,7 +3585,7 @@ void ScDPCollection::GetAllTables(const rtl::OUString& rSrcName, std::set<ScDPOb
}
void ScDPCollection::GetAllTables(
- sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const ::rtl::OUString& rCommand,
+ sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand,
std::set<ScDPObject*>& rRefs) const
{
std::set<ScDPObject*> aRefs;
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 981eace3e908..8680726ecdf3 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -63,14 +63,14 @@ using ::std::auto_ptr;
#define SC_DPSAVEMODE_DONTKNOW 2
static void lcl_SetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp,
- const rtl::OUString& rName, sal_Bool bValue )
+ const OUString& rName, sal_Bool bValue )
{
//! move to ScUnoHelpFunctions?
xProp->setPropertyValue( rName, uno::Any( &bValue, getBooleanCppuType() ) );
}
-ScDPSaveMember::ScDPSaveMember(const ::rtl::OUString& rName) :
+ScDPSaveMember::ScDPSaveMember(const OUString& rName) :
aName( rName ),
mpLayoutName(NULL),
nVisibleMode( SC_DPSAVEMODE_DONTKNOW ),
@@ -122,7 +122,7 @@ void ScDPSaveMember::SetShowDetails(bool bSet)
nShowDetailsMode = bSet;
}
-void ScDPSaveMember::SetName( const ::rtl::OUString& rNew )
+void ScDPSaveMember::SetName( const OUString& rNew )
{
// Used only if the source member was renamed (groups).
// For UI renaming of members, a layout name must be used.
@@ -155,11 +155,11 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
if ( nVisibleMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xMembProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISVISIBLE)), (bool)nVisibleMode );
+ OUString(SC_UNO_DP_ISVISIBLE), (bool)nVisibleMode );
if ( nShowDetailsMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xMembProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SHOWDETAILS)), (bool)nShowDetailsMode );
+ OUString(SC_UNO_DP_SHOWDETAILS), (bool)nShowDetailsMode );
if (mpLayoutName)
ScUnoHelpFunctions::SetOptionalPropertyValue(xMembProp, SC_UNO_DP_LAYOUTNAME, *mpLayoutName);
@@ -169,7 +169,7 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
}
}
-ScDPSaveDimension::ScDPSaveDimension(const ::rtl::OUString& rName, bool bDataLayout) :
+ScDPSaveDimension::ScDPSaveDimension(const OUString& rName, bool bDataLayout) :
aName( rName ),
mpLayoutName(NULL),
mpSubtotalName(NULL),
@@ -212,7 +212,7 @@ ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
for (MemberList::const_iterator i=r.maMemberList.begin(); i != r.maMemberList.end() ; ++i)
{
- const ::rtl::OUString& rName = (*i)->GetName();
+ const OUString& rName = (*i)->GetName();
ScDPSaveMember* pNew = new ScDPSaveMember( **i );
maMemberHash[rName] = pNew;
maMemberList.push_back( pNew );
@@ -319,11 +319,11 @@ bool ScDPSaveDimension::operator== ( const ScDPSaveDimension& r ) const
void ScDPSaveDimension::AddMember(ScDPSaveMember* pMember)
{
- const ::rtl::OUString & rName = pMember->GetName();
+ const OUString & rName = pMember->GetName();
MemberHash::iterator aExisting = maMemberHash.find( rName );
if ( aExisting == maMemberHash.end() )
{
- std::pair< const ::rtl::OUString, ScDPSaveMember *> key( rName, pMember );
+ std::pair< const OUString, ScDPSaveMember *> key( rName, pMember );
maMemberHash.insert ( key );
}
else
@@ -335,7 +335,7 @@ void ScDPSaveDimension::AddMember(ScDPSaveMember* pMember)
maMemberList.push_back( pMember );
}
-void ScDPSaveDimension::SetName( const ::rtl::OUString& rNew )
+void ScDPSaveDimension::SetName( const OUString& rNew )
{
// Used only if the source dim was renamed (groups).
// For UI renaming of dimensions, the layout name must be used.
@@ -467,7 +467,7 @@ void ScDPSaveDimension::SetLayoutInfo(const sheet::DataPilotFieldLayoutInfo* pNe
pLayoutInfo = NULL;
}
-void ScDPSaveDimension::SetCurrentPage( const ::rtl::OUString* pPage )
+void ScDPSaveDimension::SetCurrentPage( const OUString* pPage )
{
// We use member's visibility attribute to filter by page dimension.
@@ -481,7 +481,7 @@ void ScDPSaveDimension::SetCurrentPage( const ::rtl::OUString* pPage )
}
}
-ScDPSaveMember* ScDPSaveDimension::GetExistingMemberByName(const ::rtl::OUString& rName)
+ScDPSaveMember* ScDPSaveDimension::GetExistingMemberByName(const OUString& rName)
{
MemberHash::const_iterator res = maMemberHash.find (rName);
if (res != maMemberHash.end())
@@ -489,7 +489,7 @@ ScDPSaveMember* ScDPSaveDimension::GetExistingMemberByName(const ::rtl::OUString
return NULL;
}
-ScDPSaveMember* ScDPSaveDimension::GetMemberByName(const ::rtl::OUString& rName)
+ScDPSaveMember* ScDPSaveDimension::GetMemberByName(const OUString& rName)
{
MemberHash::const_iterator res = maMemberHash.find (rName);
if (res != maMemberHash.end())
@@ -501,7 +501,7 @@ ScDPSaveMember* ScDPSaveDimension::GetMemberByName(const ::rtl::OUString& rName)
return pNew;
}
-void ScDPSaveDimension::SetMemberPosition( const ::rtl::OUString& rName, sal_Int32 nNewPos )
+void ScDPSaveDimension::SetMemberPosition( const OUString& rName, sal_Int32 nNewPos )
{
ScDPSaveMember* pMember = GetMemberByName( rName ); // make sure it exists and is in the hash
@@ -524,22 +524,22 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
sheet::DataPilotFieldOrientation eOrient = (sheet::DataPilotFieldOrientation)nOrientation;
aAny <<= eOrient;
- xDimProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION)), aAny );
+ xDimProp->setPropertyValue( OUString(SC_UNO_DP_ORIENTATION), aAny );
sheet::GeneralFunction eFunc = (sheet::GeneralFunction)nFunction;
aAny <<= eFunc;
- xDimProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_FUNCTION)), aAny );
+ xDimProp->setPropertyValue( OUString(SC_UNO_DP_FUNCTION), aAny );
if ( nUsedHierarchy >= 0 )
{
aAny <<= (sal_Int32)nUsedHierarchy;
- xDimProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_USEDHIERARCHY)), aAny );
+ xDimProp->setPropertyValue( OUString(SC_UNO_DP_USEDHIERARCHY), aAny );
}
if ( pReferenceValue )
{
aAny <<= *pReferenceValue;
- xDimProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_REFVALUE)), aAny );
+ xDimProp->setPropertyValue( OUString(SC_UNO_DP_REFVALUE), aAny );
}
if (mpLayoutName)
@@ -600,11 +600,11 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
for (long i=0; i<nSubTotalCount; i++)
pArray[i] = (sheet::GeneralFunction)pSubTotalFuncs[i];
aAny <<= aSeq;
- xLevProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SUBTOTAL)), aAny );
+ xLevProp->setPropertyValue( OUString(SC_UNO_DP_SUBTOTAL), aAny );
}
if ( nShowEmptyMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xLevProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SHOWEMPTY)), (bool)nShowEmptyMode );
+ OUString(SC_UNO_DP_SHOWEMPTY), (bool)nShowEmptyMode );
if ( pSortInfo )
ScUnoHelpFunctions::SetOptionalPropertyValue(xLevProp, SC_UNO_DP_SORTING, *pSortInfo);
@@ -635,7 +635,7 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
ScDPSaveMember* pMember = *i;
if (!pMember->GetIsVisible())
bHasHiddenMember = true;
- rtl::OUString aMemberName = pMember->GetName();
+ OUString aMemberName = pMember->GetName();
if ( xMembers->hasByName( aMemberName ) )
{
uno::Reference<uno::XInterface> xMemberInt = ScUnoHelpFunctions::AnyToInterface(
@@ -664,7 +664,7 @@ void ScDPSaveDimension::UpdateMemberVisibility(const boost::unordered_map<OUStri
for (; itrMem != itrMemEnd; ++itrMem)
{
ScDPSaveMember* pMem = *itrMem;
- const ::rtl::OUString& rMemName = pMem->GetName();
+ const OUString& rMemName = pMem->GetName();
DataMap::const_iterator itr = rData.find(rMemName);
if (itr != rData.end())
pMem->SetIsVisible(itr->second);
@@ -831,7 +831,7 @@ void ScDPSaveData::AddDimension(ScDPSaveDimension* pDim)
aDimList.push_back(pDim);
}
-ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const ::rtl::OUString& rName)
+ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const OUString& rName)
{
boost::ptr_vector<ScDPSaveDimension>::const_iterator iter;
for (iter = aDimList.begin(); iter != aDimList.end(); ++iter)
@@ -843,7 +843,7 @@ ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const ::rtl::OUString& rName
return AppendNewDimension(rName, false);
}
-ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const ::rtl::OUString& rName) const
+ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const OUString& rName) const
{
boost::ptr_vector<ScDPSaveDimension>::const_iterator iter;
for (iter = aDimList.begin(); iter != aDimList.end(); ++iter)
@@ -854,7 +854,7 @@ ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const ::rtl::OUStrin
return NULL; // don't create new
}
-ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const ::rtl::OUString& rName)
+ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const OUString& rName)
{
boost::ptr_vector<ScDPSaveDimension>::const_iterator iter;
for (iter = aDimList.begin(); iter != aDimList.end(); ++iter)
@@ -872,7 +872,7 @@ ScDPSaveDimension* ScDPSaveData::GetDataLayoutDimension()
if (pDim)
return pDim;
- return AppendNewDimension(rtl::OUString(), true);
+ return AppendNewDimension(OUString(), true);
}
ScDPSaveDimension* ScDPSaveData::GetExistingDataLayoutDimension() const
@@ -886,7 +886,7 @@ ScDPSaveDimension* ScDPSaveData::GetExistingDataLayoutDimension() const
return NULL;
}
-ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const ::rtl::OUString& rName)
+ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const OUString& rName)
{
// always insert new
@@ -899,7 +899,7 @@ ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const ::rtl::OUString& rName
return pNew;
}
-void ScDPSaveData::RemoveDimensionByName(const ::rtl::OUString& rName)
+void ScDPSaveData::RemoveDimensionByName(const OUString& rName)
{
boost::ptr_vector<ScDPSaveDimension>::iterator iter;
for (iter = aDimList.begin(); iter != aDimList.end(); ++iter)
@@ -1036,7 +1036,7 @@ static void lcl_ResetOrient( const uno::Reference<sheet::XDimensionsSupplier>& x
{
uno::Any aAny;
aAny <<= eOrient;
- xDimProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION)), aAny );
+ xDimProp->setPropertyValue( OUString(SC_UNO_DP_ORIENTATION), aAny );
}
}
}
@@ -1059,10 +1059,10 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
{
if ( nIgnoreEmptyMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xSourceProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_IGNOREEMPTY)), (bool)nIgnoreEmptyMode );
+ OUString(SC_UNO_DP_IGNOREEMPTY), (bool)nIgnoreEmptyMode );
if ( nRepeatEmptyMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xSourceProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_REPEATEMPTY)), (bool)nRepeatEmptyMode );
+ OUString(SC_UNO_DP_REPEATEMPTY), (bool)nRepeatEmptyMode );
}
catch(uno::Exception&)
{
@@ -1091,8 +1091,8 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
boost::ptr_vector<ScDPSaveDimension>::iterator iter = aDimList.begin();
for (long i = 0; iter != aDimList.end(); ++iter, ++i)
{
- rtl::OUString aName = iter->GetName();
- rtl::OUString aCoreName = ScDPUtil::getSourceDimensionName(aName);
+ OUString aName = iter->GetName();
+ OUString aCoreName = ScDPUtil::getSourceDimensionName(aName);
OSL_TRACE( "%s", aName.getStr() );
@@ -1110,7 +1110,7 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
if ( xDimProp.is() )
{
bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) );
+ OUString(SC_UNO_DP_ISDATALAYOUT) );
//! error checking -- is "IsDataLayoutDimension" property required??
}
}
@@ -1149,10 +1149,10 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
{
if ( nColumnGrandMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xSourceProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_COLGRAND)), (bool)nColumnGrandMode );
+ OUString(SC_UNO_DP_COLGRAND), (bool)nColumnGrandMode );
if ( nRowGrandMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xSourceProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ROWGRAND)), (bool)nRowGrandMode );
+ OUString(SC_UNO_DP_ROWGRAND), (bool)nRowGrandMode );
}
}
catch(uno::Exception&)
@@ -1188,7 +1188,7 @@ void ScDPSaveData::RemoveAllGroupDimensions( const OUString& rSrcDimName, std::v
const ScDPSaveGroupDimension* pExistingGroup = pDimensionData->GetGroupDimForBase(rSrcDimName);
while ( pExistingGroup )
{
- rtl::OUString aGroupDimName = pExistingGroup->GetGroupDimName();
+ OUString aGroupDimName = pExistingGroup->GetGroupDimName();
pDimensionData->RemoveGroupDimension(aGroupDimName); // pExistingGroup is deleted
// also remove SaveData settings for the dimension that no longer exists
@@ -1231,7 +1231,7 @@ void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
return;
// First, build a dimension name-to-index map.
- typedef boost::unordered_map<OUString, long, ::rtl::OUStringHash> NameIndexMap;
+ typedef boost::unordered_map<OUString, long, OUStringHash> NameIndexMap;
NameIndexMap aMap;
long nColCount = pData->GetColumnCount();
for (long i = 0; i < nColCount; ++i)
@@ -1242,7 +1242,7 @@ void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
boost::ptr_vector<ScDPSaveDimension>::iterator iter;
for (iter = aDimList.begin(); iter != aDimList.end(); ++iter)
{
- const ::rtl::OUString& rDimName = iter->GetName();
+ const OUString& rDimName = iter->GetName();
if (rDimName.isEmpty())
// empty dimension name. It must be data layout.
continue;
@@ -1258,7 +1258,7 @@ void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
for (size_t j = 0; j < mMemberCount; ++j)
{
const ScDPItemData* pMemberData = pData->GetMemberById( nDimIndex, rMembers[j] );
- rtl::OUString aMemName = pData->GetFormattedString(nDimIndex, *pMemberData);
+ OUString aMemName = pData->GetFormattedString(nDimIndex, *pMemberData);
if (iter->GetExistingMemberByName(aMemName))
// this member instance already exists. nothing to do.
continue;
@@ -1274,7 +1274,7 @@ void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
void ScDPSaveData::SyncAllDimensionMembers(ScDPTableData* pData)
{
- typedef boost::unordered_map<rtl::OUString, long, rtl::OUStringHash> NameIndexMap;
+ typedef boost::unordered_map<OUString, long, OUStringHash> NameIndexMap;
// First, build a dimension name-to-index map.
NameIndexMap aMap;
@@ -1287,7 +1287,7 @@ void ScDPSaveData::SyncAllDimensionMembers(ScDPTableData* pData)
DimsType::iterator it = aDimList.begin(), itEnd = aDimList.end();
for (it = aDimList.begin(); it != itEnd; ++it)
{
- const ::rtl::OUString& rDimName = it->GetName();
+ const OUString& rDimName = it->GetName();
if (rDimName.isEmpty())
// empty dimension name. It must be data layout.
continue;
@@ -1304,7 +1304,7 @@ void ScDPSaveData::SyncAllDimensionMembers(ScDPTableData* pData)
for (size_t j = 0; j < nMemberCount; ++j)
{
const ScDPItemData* pMemberData = pData->GetMemberById(nDimIndex, rMembers[j]);
- rtl::OUString aMemName = pData->GetFormattedString(nDimIndex, *pMemberData);
+ OUString aMemName = pData->GetFormattedString(nDimIndex, *pMemberData);
aMemNames.insert(aMemName);
}
@@ -1323,7 +1323,7 @@ bool ScDPSaveData::HasInvisibleMember(const OUString& rDimName) const
void ScDPSaveData::CheckDuplicateName(ScDPSaveDimension& rDim)
{
- const rtl::OUString aName = ScDPUtil::getSourceDimensionName(rDim.GetName());
+ const OUString aName = ScDPUtil::getSourceDimensionName(rDim.GetName());
DupNameCountType::iterator it = maDupNameCounts.find(aName);
if (it != maDupNameCounts.end())
{
@@ -1335,9 +1335,9 @@ void ScDPSaveData::CheckDuplicateName(ScDPSaveDimension& rDim)
maDupNameCounts.insert(DupNameCountType::value_type(aName, 0));
}
-void ScDPSaveData::RemoveDuplicateNameCount(const rtl::OUString& rName)
+void ScDPSaveData::RemoveDuplicateNameCount(const OUString& rName)
{
- rtl::OUString aCoreName = rName;
+ OUString aCoreName = rName;
if (ScDPUtil::isDuplicateDimension(rName))
aCoreName = ScDPUtil::getSourceDimensionName(rName);
@@ -1355,7 +1355,7 @@ void ScDPSaveData::RemoveDuplicateNameCount(const rtl::OUString& rName)
return;
}
-ScDPSaveDimension* ScDPSaveData::AppendNewDimension(const rtl::OUString& rName, bool bDataLayout)
+ScDPSaveDimension* ScDPSaveData::AppendNewDimension(const OUString& rName, bool bDataLayout)
{
if (ScDPUtil::isDuplicateDimension(rName))
// This call is for original dimensions only.
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index db21a6be4f0e..20ff80b3a391 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -141,7 +141,7 @@ ScDPSource::~ScDPSource()
delete pResData;
}
-const ::rtl::OUString* ScDPSource::GetGrandTotalName() const
+const OUString* ScDPSource::GetGrandTotalName() const
{
return mpGrandTotalName.get();
}
@@ -177,9 +177,9 @@ ScDPDimension* ScDPSource::GetDataDimension(long nIndex)
return GetDimensionsObject()->getByIndex(nDimIndex);
}
-rtl::OUString ScDPSource::GetDataDimName(long nIndex)
+OUString ScDPSource::GetDataDimName(long nIndex)
{
- rtl::OUString aRet;
+ OUString aRet;
ScDPDimension* pDim = GetDataDimension(nIndex);
if (pDim)
aRet = pDim->getName();
@@ -334,7 +334,7 @@ void ScDPSource::SetDupCount( long nNew )
nDupCount = nNew;
}
-ScDPDimension* ScDPSource::AddDuplicated(long /* nSource */, const rtl::OUString& rNewName)
+ScDPDimension* ScDPSource::AddDuplicated(long /* nSource */, const OUString& rNewName)
{
OSL_ENSURE( pDimensions, "AddDuplicated without dimensions?" );
@@ -437,7 +437,7 @@ Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<s
for (sal_Int32 i = 0; i < nFilterCount; ++i)
{
const sheet::DataPilotFieldFilter& rFilter = aFilters[i];
- const rtl::OUString& aFieldName = rFilter.FieldName;
+ const OUString& aFieldName = rFilter.FieldName;
for (long nCol = 0; nCol < nColumnCount; ++nCol)
{
if (aFieldName.equals(pData->getDimensionName(nCol)))
@@ -472,11 +472,11 @@ Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<s
return aTabData;
}
-rtl::OUString ScDPSource::getDataDescription()
+OUString ScDPSource::getDataDescription()
{
CreateRes_Impl(); // create pResData
- rtl::OUString aRet;
+ OUString aRet;
if ( pResData->GetMeasureCount() == 1 )
{
bool bTotalResult = false;
@@ -595,10 +595,10 @@ static long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vecto
return nTotal;
}
-static long lcl_GetIndexFromName( const rtl::OUString rName, const uno::Sequence<rtl::OUString>& rElements )
+static long lcl_GetIndexFromName( const OUString rName, const uno::Sequence<OUString>& rElements )
{
long nCount = rElements.getLength();
- const rtl::OUString* pArray = rElements.getConstArray();
+ const OUString* pArray = rElements.getConstArray();
for (long nPos=0; nPos<nCount; nPos++)
if (pArray[nPos] == rName)
return nPos;
@@ -768,7 +768,7 @@ void ScDPSource::CreateRes_Impl()
// TODO: Aggreate pDataNames, pDataRefValues, nDataRefOrient, and
// eDataFunctions into a structure and use vector instead of static
// or pointer arrays.
- vector<rtl::OUString> aDataNames;
+ vector<OUString> aDataNames;
vector<sheet::DataPilotFieldReference> aDataRefValues;
vector<ScSubTotalFunc> aDataFunctions;
vector<sal_uInt16> aDataRefOrient;
@@ -1096,7 +1096,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
static SfxItemPropertyMapEntry aDPSourceMap_Impl[] =
{
{MAP_CHAR_LEN(SC_UNO_DP_COLGRAND), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_DP_DATADESC), 0, &getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNO_DP_DATADESC), 0, &getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNO_DP_IGNOREEMPTY), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only
{MAP_CHAR_LEN(SC_UNO_DP_REPEATEMPTY), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only
{MAP_CHAR_LEN(SC_UNO_DP_ROWGRAND), 0, &getBooleanCppuType(), 0, 0 },
@@ -1111,7 +1111,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
return aRef;
}
-void SAL_CALL ScDPSource::setPropertyValue( const rtl::OUString& aPropertyName, const uno::Any& aValue )
+void SAL_CALL ScDPSource::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw(beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1137,7 +1137,7 @@ void SAL_CALL ScDPSource::setPropertyValue( const rtl::OUString& aPropertyName,
}
}
-uno::Any SAL_CALL ScDPSource::getPropertyValue( const rtl::OUString& aPropertyName )
+uno::Any SAL_CALL ScDPSource::getPropertyValue( const OUString& aPropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
@@ -1234,7 +1234,7 @@ void ScDPDimensions::CountChanged()
// very simple XNameAccess implementation using getCount/getByIndex
-uno::Any SAL_CALL ScDPDimensions::getByName( const rtl::OUString& aName )
+uno::Any SAL_CALL ScDPDimensions::getByName( const OUString& aName )
throw(container::NoSuchElementException,
lang::WrappedTargetException, uno::RuntimeException)
{
@@ -1252,17 +1252,17 @@ uno::Any SAL_CALL ScDPDimensions::getByName( const rtl::OUString& aName )
// return uno::Any();
}
-uno::Sequence<rtl::OUString> SAL_CALL ScDPDimensions::getElementNames() throw(uno::RuntimeException)
+uno::Sequence<OUString> SAL_CALL ScDPDimensions::getElementNames() throw(uno::RuntimeException)
{
long nCount = getCount();
- uno::Sequence<rtl::OUString> aSeq(nCount);
- rtl::OUString* pArr = aSeq.getArray();
+ uno::Sequence<OUString> aSeq(nCount);
+ OUString* pArr = aSeq.getArray();
for (long i=0; i<nCount; i++)
pArr[i] = getByIndex(i)->getName();
return aSeq;
}
-sal_Bool SAL_CALL ScDPDimensions::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL ScDPDimensions::hasByName( const OUString& aName ) throw(uno::RuntimeException)
{
long nCount = getCount();
for (long i=0; i<nCount; i++)
@@ -1350,12 +1350,12 @@ ScDPHierarchies* ScDPDimension::GetHierarchiesObject()
return pHierarchies;
}
-const rtl::OUString* ScDPDimension::GetLayoutName() const
+const OUString* ScDPDimension::GetLayoutName() const
{
return mpLayoutName.get();
}
-const rtl::OUString* ScDPDimension::GetSubtotalName() const
+const OUString* ScDPDimension::GetSubtotalName() const
{
return mpSubtotalName.get();
}
@@ -1366,7 +1366,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScDPDimension::getHierarchies()
return GetHierarchiesObject();
}
-::rtl::OUString SAL_CALL ScDPDimension::getName() throw(uno::RuntimeException)
+OUString SAL_CALL ScDPDimension::getName() throw(uno::RuntimeException)
{
if (!aName.isEmpty())
return aName;
@@ -1374,7 +1374,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScDPDimension::getHierarchies()
return pSource->GetData()->getDimensionName( nDim );
}
-void SAL_CALL ScDPDimension::setName( const ::rtl::OUString& rNewName ) throw(uno::RuntimeException)
+void SAL_CALL ScDPDimension::setName( const OUString& rNewName ) throw(uno::RuntimeException)
{
// used after cloning
aName = rNewName;
@@ -1425,7 +1425,7 @@ ScDPDimension* ScDPDimension::CreateCloneObject()
OSL_ENSURE( nSourceDim < 0, "recursive duplicate - not implemented" );
//! set new name here, or temporary name ???
- rtl::OUString aNewName = aName;
+ OUString aNewName = aName;
ScDPDimension* pNew = pSource->AddDuplicated( nDim, aNewName );
@@ -1502,8 +1502,8 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
{MAP_CHAR_LEN(SC_UNO_DP_POSITION), 0, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_DP_REFVALUE), 0, &getCppuType((sheet::DataPilotFieldReference*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_DP_USEDHIERARCHY), 0, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_DP_LAYOUTNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_DP_FIELD_SUBTOTALNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_DP_LAYOUTNAME), 0, &getCppuType(static_cast<OUString*>(0)), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_DP_FIELD_SUBTOTALNAME), 0, &getCppuType(static_cast<OUString*>(0)), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_DP_HAS_HIDDEN_MEMBER), 0, &getBooleanCppuType(), 0, 0 },
{0,0,0,0,0,0}
};
@@ -1512,7 +1512,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
return aRef;
}
-void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyName, const uno::Any& aValue )
+void SAL_CALL ScDPDimension::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw(beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1546,7 +1546,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
sal_Int32 nLength = aSeq.getLength();
if ( nLength == 0 )
{
- aSelectedPage = rtl::OUString();
+ aSelectedPage = OUString();
bHasSelectedPage = false;
bDone = sal_True;
}
@@ -1593,7 +1593,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
}
}
-uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropertyName )
+uno::Any SAL_CALL ScDPDimension::getPropertyValue( const OUString& aPropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
@@ -1667,9 +1667,9 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert
aRet <<= uno::Sequence<sheet::TableFilterField>(0);
}
else if (aPropertyName.equalsAscii(SC_UNO_DP_LAYOUTNAME))
- aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString(RTL_CONSTASCII_USTRINGPARAM(""));
+ aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString("");
else if (aPropertyName.equalsAscii(SC_UNO_DP_FIELD_SUBTOTALNAME))
- aRet <<= mpSubtotalName.get() ? *mpSubtotalName : OUString(RTL_CONSTASCII_USTRINGPARAM(""));
+ aRet <<= mpSubtotalName.get() ? *mpSubtotalName : OUString("");
else if (aPropertyName.equalsAscii(SC_UNO_DP_HAS_HIDDEN_MEMBER))
aRet <<= static_cast<sal_Bool>(mbHasHiddenMember);
else if (aPropertyName.equalsAscii(SC_UNO_DP_FLAGS))
@@ -1717,7 +1717,7 @@ ScDPHierarchies::~ScDPHierarchies()
// very simple XNameAccess implementation using getCount/getByIndex
-uno::Any SAL_CALL ScDPHierarchies::getByName( const rtl::OUString& aName )
+uno::Any SAL_CALL ScDPHierarchies::getByName( const OUString& aName )
throw(container::NoSuchElementException,
lang::WrappedTargetException, uno::RuntimeException)
{
@@ -1734,17 +1734,17 @@ uno::Any SAL_CALL ScDPHierarchies::getByName( const rtl::OUString& aName )
throw container::NoSuchElementException();
}
-uno::Sequence<rtl::OUString> SAL_CALL ScDPHierarchies::getElementNames() throw(uno::RuntimeException)
+uno::Sequence<OUString> SAL_CALL ScDPHierarchies::getElementNames() throw(uno::RuntimeException)
{
long nCount = getCount();
- uno::Sequence<rtl::OUString> aSeq(nCount);
- rtl::OUString* pArr = aSeq.getArray();
+ uno::Sequence<OUString> aSeq(nCount);
+ OUString* pArr = aSeq.getArray();
for (long i=0; i<nCount; i++)
pArr[i] = getByIndex(i)->getName();
return aSeq;
}
-sal_Bool SAL_CALL ScDPHierarchies::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL ScDPHierarchies::hasByName( const OUString& aName ) throw(uno::RuntimeException)
{
long nCount = getCount();
for (long i=0; i<nCount; i++)
@@ -1830,19 +1830,19 @@ uno::Reference<container::XNameAccess> SAL_CALL ScDPHierarchy::getLevels()
return GetLevelsObject();
}
-::rtl::OUString SAL_CALL ScDPHierarchy::getName() throw(uno::RuntimeException)
+OUString SAL_CALL ScDPHierarchy::getName() throw(uno::RuntimeException)
{
- rtl::OUString aRet; //! globstr-ID !!!!
+ OUString aRet; //! globstr-ID !!!!
switch (nHier)
{
case SC_DAPI_HIERARCHY_FLAT:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("flat"));
+ aRet = OUString("flat");
break; //! name ???????
case SC_DAPI_HIERARCHY_QUARTER:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Quarter"));
+ aRet = OUString("Quarter");
break; //! name ???????
case SC_DAPI_HIERARCHY_WEEK:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Week"));
+ aRet = OUString("Week");
break; //! name ???????
default:
OSL_FAIL( "ScDPHierarchy::getName: unexpected hierarchy" );
@@ -1851,7 +1851,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScDPHierarchy::getLevels()
return aRet;
}
-void SAL_CALL ScDPHierarchy::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException)
+void SAL_CALL ScDPHierarchy::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException)
{
OSL_FAIL("not implemented"); //! exception?
}
@@ -1900,7 +1900,7 @@ ScDPLevels::~ScDPLevels()
// very simple XNameAccess implementation using getCount/getByIndex
-uno::Any SAL_CALL ScDPLevels::getByName( const rtl::OUString& aName )
+uno::Any SAL_CALL ScDPLevels::getByName( const OUString& aName )
throw(container::NoSuchElementException,
lang::WrappedTargetException, uno::RuntimeException)
{
@@ -1917,17 +1917,17 @@ uno::Any SAL_CALL ScDPLevels::getByName( const rtl::OUString& aName )
throw container::NoSuchElementException();
}
-uno::Sequence<rtl::OUString> SAL_CALL ScDPLevels::getElementNames() throw(uno::RuntimeException)
+uno::Sequence<OUString> SAL_CALL ScDPLevels::getElementNames() throw(uno::RuntimeException)
{
long nCount = getCount();
- uno::Sequence<rtl::OUString> aSeq(nCount);
- rtl::OUString* pArr = aSeq.getArray();
+ uno::Sequence<OUString> aSeq(nCount);
+ OUString* pArr = aSeq.getArray();
for (long i=0; i<nCount; i++)
pArr[i] = getByIndex(i)->getName();
return aSeq;
}
-sal_Bool SAL_CALL ScDPLevels::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL ScDPLevels::hasByName( const OUString& aName ) throw(uno::RuntimeException)
{
long nCount = getCount();
for (long i=0; i<nCount; i++)
@@ -2118,28 +2118,28 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
return uno::Sequence<sheet::MemberResult>(0); //! Error?
}
-::rtl::OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException)
+OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException)
{
long nSrcDim = pSource->GetSourceDim( nDim );
if ( pSource->IsDateDimension( nSrcDim ) )
{
- rtl::OUString aRet; //! globstr-ID !!!!
+ OUString aRet; //! globstr-ID !!!!
if ( nHier == SC_DAPI_HIERARCHY_QUARTER )
{
switch ( nLev )
{
case SC_DAPI_LEVEL_YEAR:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Year"));
+ aRet = OUString("Year");
break;
case SC_DAPI_LEVEL_QUARTER:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Quarter"));
+ aRet = OUString("Quarter");
break;
case SC_DAPI_LEVEL_MONTH:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Month"));
+ aRet = OUString("Month");
break;
case SC_DAPI_LEVEL_DAY:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Day"));
+ aRet = OUString("Day");
break;
default:
OSL_FAIL( "ScDPLevel::getName: unexpected level" );
@@ -2151,13 +2151,13 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
switch ( nLev )
{
case SC_DAPI_LEVEL_YEAR:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Year"));
+ aRet = OUString("Year");
break;
case SC_DAPI_LEVEL_WEEK:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Week"));
+ aRet = OUString("Week");
break;
case SC_DAPI_LEVEL_WEEKDAY:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Weekday"));
+ aRet = OUString("Weekday");
break;
default:
OSL_FAIL( "ScDPLevel::getName: unexpected level" );
@@ -2170,12 +2170,12 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
ScDPDimension* pDim = pSource->GetDimensionsObject()->getByIndex(nSrcDim);
if (!pDim)
- return rtl::OUString();
+ return OUString();
return pDim->getName();
}
-void SAL_CALL ScDPLevel::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException)
+void SAL_CALL ScDPLevel::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException)
{
OSL_FAIL("not implemented"); //! exception?
}
@@ -2218,7 +2218,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo()
return aRef;
}
-void SAL_CALL ScDPLevel::setPropertyValue( const rtl::OUString& aPropertyName, const uno::Any& aValue )
+void SAL_CALL ScDPLevel::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw(beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -2239,7 +2239,7 @@ void SAL_CALL ScDPLevel::setPropertyValue( const rtl::OUString& aPropertyName, c
}
}
-uno::Any SAL_CALL ScDPLevel::getPropertyValue( const rtl::OUString& aPropertyName )
+uno::Any SAL_CALL ScDPLevel::getPropertyValue( const OUString& aPropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
@@ -2362,7 +2362,7 @@ ScDPMembers::~ScDPMembers()
// XNameAccess implementation using getCount/getByIndex
-sal_Int32 ScDPMembers::GetIndexFromName( const ::rtl::OUString& rName ) const
+sal_Int32 ScDPMembers::GetIndexFromName( const OUString& rName ) const
{
if ( aHashMap.empty() )
{
@@ -2380,7 +2380,7 @@ sal_Int32 ScDPMembers::GetIndexFromName( const ::rtl::OUString& rName ) const
return -1; // not found
}
-uno::Any SAL_CALL ScDPMembers::getByName( const rtl::OUString& aName )
+uno::Any SAL_CALL ScDPMembers::getByName( const OUString& aName )
throw(container::NoSuchElementException,
lang::WrappedTargetException, uno::RuntimeException)
{
@@ -2396,7 +2396,7 @@ uno::Any SAL_CALL ScDPMembers::getByName( const rtl::OUString& aName )
throw container::NoSuchElementException();
}
-uno::Sequence<rtl::OUString> SAL_CALL ScDPMembers::getElementNames() throw(uno::RuntimeException)
+uno::Sequence<OUString> SAL_CALL ScDPMembers::getElementNames() throw(uno::RuntimeException)
{
// Return list of names in sorted order,
// so it's displayed in that order in the field options dialog.
@@ -2409,14 +2409,14 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDPMembers::getElementNames() throw(uno::
bool bSort = !rGlobalOrder.empty();
long nCount = getCount();
- uno::Sequence<rtl::OUString> aSeq(nCount);
- rtl::OUString* pArr = aSeq.getArray();
+ uno::Sequence<OUString> aSeq(nCount);
+ OUString* pArr = aSeq.getArray();
for (long i=0; i<nCount; i++)
pArr[i] = getByIndex(bSort ? rGlobalOrder[i] : i)->getName();
return aSeq;
}
-sal_Bool SAL_CALL ScDPMembers::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL ScDPMembers::hasByName( const OUString& aName ) throw(uno::RuntimeException)
{
return ( GetIndexFromName( aName ) >= 0 );
}
@@ -2483,7 +2483,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
{
sal_Int32 nGroupBy = 0;
sal_Int32 nVal = 0;
- rtl::OUString aName;
+ OUString aName;
if ( nLev == SC_DAPI_LEVEL_YEAR ) // YEAR is in both hierarchies
{
@@ -2533,7 +2533,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
;
}
if (aName.isEmpty())
- aName = rtl::OUString::valueOf(nVal);
+ aName = OUString::valueOf(nVal);
ScDPItemData aData(nGroupBy, nVal);
SCROW nId = pSource->GetCache()->GetIdByItemData(nDim, aData);
@@ -2638,20 +2638,20 @@ long ScDPMember::GetDim() const
return nDim;
}
-rtl::OUString ScDPMember::GetNameStr() const
+OUString ScDPMember::GetNameStr() const
{
const ScDPItemData* pData = GetItemData();
if (pData)
return pSource->GetData()->GetFormattedString(nDim, *pData);
- return rtl::OUString();
+ return OUString();
}
-::rtl::OUString SAL_CALL ScDPMember::getName() throw(uno::RuntimeException)
+OUString SAL_CALL ScDPMember::getName() throw(uno::RuntimeException)
{
return GetNameStr();
}
-void SAL_CALL ScDPMember::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException)
+void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException)
{
OSL_FAIL("not implemented"); //! exception?
}
@@ -2678,7 +2678,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo(
{MAP_CHAR_LEN(SC_UNO_DP_ISVISIBLE), 0, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_DP_POSITION), 0, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_DP_SHOWDETAILS), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_DP_LAYOUTNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_DP_LAYOUTNAME), 0, &getCppuType(static_cast<OUString*>(0)), 0, 0 },
{0,0,0,0,0,0}
};
static uno::Reference<beans::XPropertySetInfo> aRef =
@@ -2686,7 +2686,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo(
return aRef;
}
-void SAL_CALL ScDPMember::setPropertyValue( const rtl::OUString& aPropertyName, const uno::Any& aValue )
+void SAL_CALL ScDPMember::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw(beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -2699,9 +2699,9 @@ void SAL_CALL ScDPMember::setPropertyValue( const rtl::OUString& aPropertyName,
aValue >>= nPosition;
else if (aPropertyName.equalsAscii(SC_UNO_DP_LAYOUTNAME))
{
- rtl::OUString aName;
+ OUString aName;
if (aValue >>= aName)
- mpLayoutName.reset(new rtl::OUString(aName));
+ mpLayoutName.reset(new OUString(aName));
}
else
{
@@ -2709,7 +2709,7 @@ void SAL_CALL ScDPMember::setPropertyValue( const rtl::OUString& aPropertyName,
}
}
-uno::Any SAL_CALL ScDPMember::getPropertyValue( const rtl::OUString& aPropertyName )
+uno::Any SAL_CALL ScDPMember::getPropertyValue( const OUString& aPropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
@@ -2721,7 +2721,7 @@ uno::Any SAL_CALL ScDPMember::getPropertyValue( const rtl::OUString& aPropertyNa
else if ( aPropertyName.equalsAscii( SC_UNO_DP_POSITION ) )
aRet <<= nPosition;
else if (aPropertyName.equalsAscii(SC_UNO_DP_LAYOUTNAME))
- aRet <<= mpLayoutName.get() ? *mpLayoutName : rtl::OUString();
+ aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString();
else
{
OSL_FAIL("unknown property");
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 32500eebdd29..4ece942f607c 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -117,11 +117,11 @@ void ScFuncDesc::Clear()
bHasSuppressedArgs = false;
}
-::rtl::OUString ScFuncDesc::GetParamList() const
+OUString ScFuncDesc::GetParamList() const
{
- ::rtl::OUString sep(ScCompiler::GetNativeSymbol(ocSep));
+ OUString sep(ScCompiler::GetNativeSymbol(ocSep));
- ::rtl::OUStringBuffer aSig;
+ OUStringBuffer aSig;
if ( nArgCount > 0 )
{
@@ -208,15 +208,15 @@ void ScFuncDesc::Clear()
return aSig.makeStringAndClear();
}
-::rtl::OUString ScFuncDesc::getSignature() const
+OUString ScFuncDesc::getSignature() const
{
- ::rtl::OUStringBuffer aSig;
+ OUStringBuffer aSig;
if(pFuncName)
{
aSig.append(*pFuncName);
- ::rtl::OUString aParamList = GetParamList();
+ OUString aParamList = GetParamList();
if( !aParamList.isEmpty() )
{
aSig.appendAscii( "( " );
@@ -231,19 +231,19 @@ void ScFuncDesc::Clear()
return aSig.makeStringAndClear();
}
-::rtl::OUString ScFuncDesc::getFormula( const ::std::vector< ::rtl::OUString >& _aArguments ) const
+OUString ScFuncDesc::getFormula( const ::std::vector< OUString >& _aArguments ) const
{
- ::rtl::OUString sep = ScCompiler::GetNativeSymbol(ocSep);
+ OUString sep = ScCompiler::GetNativeSymbol(ocSep);
- ::rtl::OUStringBuffer aFormula;
+ OUStringBuffer aFormula;
if(pFuncName)
{
aFormula.append( *pFuncName );
aFormula.appendAscii( "(" );
- ::std::vector< ::rtl::OUString >::const_iterator aIter = _aArguments.begin();
- ::std::vector< ::rtl::OUString >::const_iterator aEnd = _aArguments.end();
+ ::std::vector< OUString >::const_iterator aIter = _aArguments.begin();
+ ::std::vector< OUString >::const_iterator aEnd = _aArguments.end();
if ( nArgCount > 0 && aIter != aEnd )
{
@@ -291,9 +291,9 @@ sal_uInt16 ScFuncDesc::GetSuppressedArgCount() const
return nCount;
}
-::rtl::OUString ScFuncDesc::getFunctionName() const
+OUString ScFuncDesc::getFunctionName() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
if ( pFuncName )
sRet = *pFuncName;
return sRet;
@@ -304,9 +304,9 @@ const formula::IFunctionCategory* ScFuncDesc::getCategory() const
return ScGlobal::GetStarCalcFunctionMgr()->getCategory(nCategory);
}
-::rtl::OUString ScFuncDesc::getDescription() const
+OUString ScFuncDesc::getDescription() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
if ( pFuncDesc )
sRet = *pFuncDesc;
return sRet;
@@ -349,7 +349,7 @@ void ScFuncDesc::initArgumentInfo() const
if ( bIncomplete && pFuncName )
{
ScUnoAddInCollection& rAddIns = *ScGlobal::GetAddInCollection();
- ::rtl::OUString aIntName(rAddIns.FindFunction( *pFuncName, true )); // pFuncName is upper-case
+ OUString aIntName(rAddIns.FindFunction( *pFuncName, true )); // pFuncName is upper-case
if ( !aIntName.isEmpty() )
{
@@ -377,12 +377,12 @@ sal_uInt32 ScFuncDesc::getParameterCount() const
return nArgCount;
}
-::rtl::OUString ScFuncDesc::getParameterName(sal_uInt32 _nPos) const
+OUString ScFuncDesc::getParameterName(sal_uInt32 _nPos) const
{
return *(ppDefArgNames[_nPos]);
}
-::rtl::OUString ScFuncDesc::getParameterDescription(sal_uInt32 _nPos) const
+OUString ScFuncDesc::getParameterDescription(sal_uInt32 _nPos) const
{
return *(ppDefArgDescs[_nPos]);
}
@@ -453,20 +453,20 @@ ScFunctionList::ScFunctionList() :
sal_uInt16 nNextId = SC_OPCODE_LAST_OPCODE_ID + 1; // FuncID for AddIn functions
// Interpretation of AddIn list
- ::rtl::OUString aDefArgNameValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"));
- ::rtl::OUString aDefArgNameString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("string"));
- ::rtl::OUString aDefArgNameValues = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("values"));
- ::rtl::OUString aDefArgNameStrings = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("strings"));
- ::rtl::OUString aDefArgNameCells = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cells"));
- ::rtl::OUString aDefArgNameNone = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("none"));
- ::rtl::OUString aDefArgDescValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a value"));
- ::rtl::OUString aDefArgDescString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a string"));
- ::rtl::OUString aDefArgDescValues = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("array of values"));
- ::rtl::OUString aDefArgDescStrings = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("array of strings"));
- ::rtl::OUString aDefArgDescCells = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("range of cells"));
- ::rtl::OUString aDefArgDescNone = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("none"));
-
- ::rtl::OUString aArgName, aArgDesc;
+ OUString aDefArgNameValue = OUString("value");
+ OUString aDefArgNameString = OUString("string");
+ OUString aDefArgNameValues = OUString("values");
+ OUString aDefArgNameStrings = OUString("strings");
+ OUString aDefArgNameCells = OUString("cells");
+ OUString aDefArgNameNone = OUString("none");
+ OUString aDefArgDescValue = OUString("a value");
+ OUString aDefArgDescString = OUString("a string");
+ OUString aDefArgDescValues = OUString("array of values");
+ OUString aDefArgDescStrings = OUString("array of strings");
+ OUString aDefArgDescCells = OUString("range of cells");
+ OUString aDefArgDescNone = OUString("none");
+
+ OUString aArgName, aArgDesc;
const FuncCollection& rFuncColl = *ScGlobal::GetFuncCollection();
FuncCollection::const_iterator it = rFuncColl.begin(), itEnd = rFuncColl.end();
for (; it != itEnd; ++it)
@@ -479,73 +479,73 @@ ScFunctionList::ScFunctionList() :
pDesc->nCategory = ID_FUNCTION_GRP_ADDINS;
pDesc->pFuncName = new OUString(pAddInFuncData->GetInternalName().toAsciiUpperCase());
- ::rtl::OUStringBuffer aBuf(aArgDesc);
+ OUStringBuffer aBuf(aArgDesc);
aBuf.append(sal_Unicode('\n'));
aBuf.appendAscii("( AddIn: ");
aBuf.append(pAddInFuncData->GetModuleName());
aBuf.appendAscii(" )");
- pDesc->pFuncDesc = new ::rtl::OUString(aBuf.makeStringAndClear());
+ pDesc->pFuncDesc = new OUString(aBuf.makeStringAndClear());
pDesc->nArgCount = nArgs;
if (nArgs)
{
pDesc->pDefArgFlags = new ScFuncDesc::ParameterFlags[nArgs];
- pDesc->ppDefArgNames = new ::rtl::OUString*[nArgs];
- pDesc->ppDefArgDescs = new ::rtl::OUString*[nArgs];
+ pDesc->ppDefArgNames = new OUString*[nArgs];
+ pDesc->ppDefArgDescs = new OUString*[nArgs];
for (sal_uInt16 j = 0; j < nArgs; ++j)
{
pDesc->pDefArgFlags[j].bOptional = false;
pDesc->pDefArgFlags[j].bSuppress = false;
pAddInFuncData->getParamDesc( aArgName, aArgDesc, j+1 );
if ( !aArgName.isEmpty() )
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aArgName );
+ pDesc->ppDefArgNames[j] = new OUString( aArgName );
else
{
switch (pAddInFuncData->GetParamType(j+1))
{
case PTR_DOUBLE:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameValue );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameValue );
break;
case PTR_STRING:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameString );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameString );
break;
case PTR_DOUBLE_ARR:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameValues );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameValues );
break;
case PTR_STRING_ARR:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameStrings );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameStrings );
break;
case PTR_CELL_ARR:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameCells );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameCells );
break;
default:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameNone );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameNone );
break;
}
}
if ( !aArgDesc.isEmpty() )
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aArgDesc );
+ pDesc->ppDefArgDescs[j] = new OUString( aArgDesc );
else
{
switch (pAddInFuncData->GetParamType(j+1))
{
case PTR_DOUBLE:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescValue );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescValue );
break;
case PTR_STRING:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescString );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescString );
break;
case PTR_DOUBLE_ARR:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescValues );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescValues );
break;
case PTR_STRING_ARR:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescStrings );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescStrings );
break;
case PTR_CELL_ARR:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescCells );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescCells );
break;
default:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescNone );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescNone );
break;
}
}
@@ -641,7 +641,7 @@ const formula::IFunctionManager* ScFunctionCategory::getFunctionManager() const
return m_pMgr;
}
-::rtl::OUString ScFunctionCategory::getName() const
+OUString ScFunctionCategory::getName() const
{
if ( m_sName.isEmpty() )
m_sName = ScFunctionMgr::GetCategoryName(m_nCategory+1);
@@ -712,13 +712,13 @@ ScFunctionMgr::~ScFunctionMgr()
delete aCatLists[i];
}
-const ScFuncDesc* ScFunctionMgr::Get( const ::rtl::OUString& rFName ) const
+const ScFuncDesc* ScFunctionMgr::Get( const OUString& rFName ) const
{
const ScFuncDesc* pDesc = NULL;
if (rFName.getLength() <= pFuncList->GetMaxFuncNameLen())
{
::boost::scoped_ptr<ScFuncDesc> dummy(new ScFuncDesc);
- dummy->pFuncName = new ::rtl::OUString(rFName);
+ dummy->pFuncName = new OUString(rFName);
::std::vector<const ScFuncDesc*>::iterator lower =
::std::lower_bound(aCatLists[0]->begin(), aCatLists[0]->end(),
static_cast<const ScFuncDesc*>(dummy.get()), ScFuncDesc::compareByName);
@@ -784,7 +784,7 @@ const formula::IFunctionCategory* ScFunctionMgr::getCategory(sal_uInt32 nCategor
return pRet;
}
-const formula::IFunctionDescription* ScFunctionMgr::getFunctionByName(const ::rtl::OUString& _sFunctionName) const
+const formula::IFunctionDescription* ScFunctionMgr::getFunctionByName(const OUString& _sFunctionName) const
{
return Get(_sFunctionName);
}
@@ -802,12 +802,12 @@ void ScFunctionMgr::fillLastRecentlyUsedFunctions(::std::vector< const formula::
}
}
-::rtl::OUString ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber )
+OUString ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber )
{
if ( _nCategoryNumber > SC_FUNCGROUP_COUNT )
{
OSL_FAIL("Invalid category number!");
- return ::rtl::OUString();
+ return OUString();
}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -898,17 +898,17 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
}
}
- pDesc->pFuncName = new ::rtl::OUString( ScCompiler::GetNativeSymbol( static_cast<OpCode>( aRes.GetId())));
- pDesc->pFuncDesc = new ::rtl::OUString( SC_RESSTR(1) );
+ pDesc->pFuncName = new OUString( ScCompiler::GetNativeSymbol( static_cast<OpCode>( aRes.GetId())));
+ pDesc->pFuncDesc = new OUString( SC_RESSTR(1) );
if (nArgs)
{
- pDesc->ppDefArgNames = new ::rtl::OUString*[nArgs];
- pDesc->ppDefArgDescs = new ::rtl::OUString*[nArgs];
+ pDesc->ppDefArgNames = new OUString*[nArgs];
+ pDesc->ppDefArgDescs = new OUString*[nArgs];
for (sal_uInt16 i = 0; i < nArgs; ++i)
{
- pDesc->ppDefArgNames[i] = new ::rtl::OUString(SC_RESSTR(2*(i+1) ));
- pDesc->ppDefArgDescs[i] = new ::rtl::OUString(SC_RESSTR(2*(i+1)+1));
+ pDesc->ppDefArgNames[i] = new OUString(SC_RESSTR(2*(i+1) ));
+ pDesc->ppDefArgDescs[i] = new OUString(SC_RESSTR(2*(i+1)+1));
}
}
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 52c45a8ded81..33d3cb516654 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -80,13 +80,13 @@ using namespace ::com::sun::star::i18n;
@return Returns TRUE if a numeral element is found in a given string, or
FALSE if no numeral element is found.
*/
-bool SplitString( const rtl::OUString &sWhole,
- rtl::OUString &sPrefix, rtl::OUString &sSuffix, double &fNum )
+bool SplitString( const OUString &sWhole,
+ OUString &sPrefix, OUString &sSuffix, double &fNum )
{
i18n::LocaleDataItem aLocaleItem = ScGlobal::pLocaleData->getLocaleItem();
// Get prefix element
- rtl::OUString sEmpty, sUser = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-" ));
+ OUString sEmpty, sUser = OUString( "-" );
ParseResult aPRPre = ScGlobal::pCharClass->parsePredefinedToken(
KParseType::IDENTNAME, sWhole, 0,
KParseTokens::ANY_LETTER, sUser, KParseTokens::ANY_LETTER, sUser );
@@ -137,7 +137,7 @@ bool SplitString( const rtl::OUString &sWhole,
short Compare( const String &sInput1, const String &sInput2,
const bool bCaseSens, const ScUserListData* pData, const CollatorWrapper *pCW )
{
- rtl::OUString sStr1( sInput1 ), sStr2( sInput2 ), sPre1, sSuf1, sPre2, sSuf2;
+ OUString sStr1( sInput1 ), sStr2( sInput2 ), sPre1, sSuf1, sPre2, sSuf2;
do
{
@@ -401,8 +401,8 @@ short ScTable::CompareCell( sal_uInt16 nSort,
if ( bStr1 && bStr2 ) // nur Strings untereinander als String vergleichen!
{
- rtl::OUString aStr1;
- rtl::OUString aStr2;
+ OUString aStr1;
+ OUString aStr2;
if (eType1 == CELLTYPE_STRING)
aStr1 = ((ScStringCell*)pCell1)->GetString();
else
@@ -919,7 +919,7 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
// (frueher nur, wenn eine Spalte mehrfach vorkam)
bool bTestPrevSub = ( nLevelCount > 1 );
- rtl::OUString aSubString;
+ OUString aSubString;
String aOutString;
bool bIgnoreCase = !rParam.bCaseSens;
@@ -974,7 +974,7 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
bChanged = false;
if (!bTotal)
{
- rtl::OUString aString;
+ OUString aString;
for (i=0; i<=aRowEntry.nGroupNo && !bChanged; i++)
{
GetString( nGroupCol[i], nRow, aString );
@@ -983,7 +983,7 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
// wenn sortiert, ist "leer" eine eigene Gruppe
// sonst sind leere Zellen unten erlaubt
bChanged = ( ( !aString.isEmpty() || rParam.bDoSort ) &&
- aString != rtl::OUString(*pCompString[i]) );
+ aString != OUString(*pCompString[i]) );
}
if ( bChanged && bTestPrevSub )
{
@@ -1352,7 +1352,7 @@ public:
bool bOk = false;
bool bTestEqual = false;
bool bMatchWholeCell = mbMatchWholeCell;
- rtl::OUString aCellStr;
+ OUString aCellStr;
if (isPartialTextMatchOp(rEntry))
// may have to do partial textural comparison.
bMatchWholeCell = false;
@@ -1451,7 +1451,7 @@ public:
}
else
{
- const rtl::OUString& rQueryStr = rItem.maString;
+ const OUString& rQueryStr = rItem.maString;
String aCell( mpTransliteration->transliterate(
aCellStr, ScGlobal::eLnge, 0, aCellStr.getLength(),
NULL ) );
@@ -1839,7 +1839,7 @@ void lcl_PrepareQuery( const ScDocument* pDoc, ScTable* pTab, ScQueryParam& rPar
SCSIZE ScTable::Query(ScQueryParam& rParamOrg, bool bKeepSub)
{
ScQueryParam aParam( rParamOrg );
- typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> StrSetType;
+ typedef boost::unordered_set<OUString, OUStringHash> StrSetType;
StrSetType aStrSet;
bool bStarted = false;
@@ -1889,12 +1889,12 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, bool bKeepSub)
bResult = true;
else
{
- rtl::OUString aStr;
+ OUString aStr;
for (SCCOL k=aParam.nCol1; k <= aParam.nCol2; k++)
{
- rtl::OUString aCellStr;
+ OUString aCellStr;
GetString(k, j, aCellStr);
- rtl::OUStringBuffer aBuf(aStr);
+ OUStringBuffer aBuf(aStr);
aBuf.append(aCellStr);
aBuf.append(static_cast<sal_Unicode>(1));
aStr = aBuf.makeStringAndClear();
@@ -1946,7 +1946,7 @@ bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow
{
bool bValid = true;
SCCOL* pFields = new SCCOL[nCol2-nCol1+1];
- rtl::OUString aCellStr;
+ OUString aCellStr;
SCCOL nCol = nCol1;
OSL_ENSURE( rQueryParam.nTab != SCTAB_MAX, "rQueryParam.nTab no value, not bad but no good" );
SCTAB nDBTab = (rQueryParam.nTab == SCTAB_MAX ? nTab : rQueryParam.nTab);
@@ -1955,7 +1955,7 @@ bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow
// Erste Zeile muessen Spaltenkoepfe sein
while (bValid && (nCol <= nCol2))
{
- rtl::OUString aQueryStr;
+ OUString aQueryStr;
GetUpperCellString(nCol, nRow1, aQueryStr);
bool bFound = false;
SCCOL i = rQueryParam.nCol1;
@@ -2037,7 +2037,7 @@ bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
bool bValid;
bool bFound;
- rtl::OUString aCellStr;
+ OUString aCellStr;
SCSIZE nIndex = 0;
SCROW nRow = nRow1;
OSL_ENSURE( rQueryParam.nTab != SCTAB_MAX, "rQueryParam.nTab no value, not bad but no good" );
@@ -2075,7 +2075,7 @@ bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
GetUpperCellString(nCol1 + 1, nRow, aCellStr);
for (SCCOL i=rQueryParam.nCol1; (i <= nDBCol2) && (!bFound); i++)
{
- rtl::OUString aFieldStr;
+ OUString aFieldStr;
if ( nTab == nDBTab )
GetUpperCellString(i, nDBRow1, aFieldStr);
else
@@ -2118,7 +2118,7 @@ bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
// Vierte Spalte Wert
if (bValid)
{
- rtl::OUString aStr;
+ OUString aStr;
GetString(nCol1 + 3, nRow, aStr);
rEntry.GetQueryItem().maString = aStr;
rEntry.bDoQuery = true;
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index 28bd99b2e84c..750aa10cfa8e 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -66,9 +66,9 @@ OUString ScPassHashHelper::getHashURI(ScPasswordHash eHash)
switch (eHash)
{
case PASSHASH_SHA1:
- return OUString(RTL_CONSTASCII_USTRINGPARAM(URI_SHA1));
+ return OUString(URI_SHA1);
case PASSHASH_XL:
- return OUString(RTL_CONSTASCII_USTRINGPARAM(URI_XLS_LEGACY));
+ return OUString(URI_XLS_LEGACY);
case PASSHASH_UNSPECIFIED:
default:
;
@@ -309,7 +309,7 @@ bool ScTableProtectionImpl::verifyPassword(const String& aPassText) const
{
#if DEBUG_TAB_PROTECTION
fprintf(stdout, "ScTableProtectionImpl::verifyPassword: input = '%s'\n",
- OUStringToOString(rtl::OUString(aPassText), RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(OUString(aPassText), RTL_TEXTENCODING_UTF8).getStr());
#endif
if (mbEmptyPass)
diff --git a/sc/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx
index 9ed7749245e0..e322f12928e5 100644
--- a/sc/source/core/tool/addincfg.cxx
+++ b/sc/source/core/tool/addincfg.cxx
@@ -33,9 +33,9 @@ using namespace com::sun::star;
#define CFGPATH_ADDINS "Office.CalcAddIns/AddInInfo"
ScAddInCfg::ScAddInCfg() :
- ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_ADDINS )) )
+ ConfigItem( OUString( CFGPATH_ADDINS ) )
{
- uno::Sequence<rtl::OUString> aNames(1); // one entry: empty string
+ uno::Sequence<OUString> aNames(1); // one entry: empty string
EnableNotification( aNames );
}
@@ -44,7 +44,7 @@ void ScAddInCfg::Commit()
OSL_FAIL("ScAddInCfg shouldn't be modified");
}
-void ScAddInCfg::Notify( const uno::Sequence<rtl::OUString>& )
+void ScAddInCfg::Notify( const uno::Sequence<OUString>& )
{
// forget all add-in information, re-initialize when needed next time
ScGlobal::GetAddInCollection()->Clear();
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 084cef23d482..70901270e433 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -289,7 +289,7 @@ Sequence<OUString> ScAppCfg::GetLayoutPropertyNames()
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
- pNames[SCLAYOUTOPT_MEASURE] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Other/MeasureUnit/Metric") );
+ pNames[SCLAYOUTOPT_MEASURE] = OUString( "Other/MeasureUnit/Metric" );
return aNames;
}
@@ -386,13 +386,13 @@ Sequence<OUString> ScAppCfg::GetCompatPropertyNames()
}
ScAppCfg::ScAppCfg() :
- aLayoutItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_LAYOUT )) ),
- aInputItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_INPUT )) ),
- aRevisionItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_REVISION )) ),
- aContentItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_CONTENT )) ),
- aSortListItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_SORTLIST )) ),
- aMiscItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_MISC )) ),
- aCompatItem( OUString(RTL_CONSTASCII_USTRINGPARAM(CFGPATH_COMPAT )) )
+ aLayoutItem( OUString( CFGPATH_LAYOUT ) ),
+ aInputItem( OUString( CFGPATH_INPUT ) ),
+ aRevisionItem( OUString( CFGPATH_REVISION ) ),
+ aContentItem( OUString( CFGPATH_CONTENT ) ),
+ aSortListItem( OUString( CFGPATH_SORTLIST ) ),
+ aMiscItem( OUString( CFGPATH_MISC ) ),
+ aCompatItem( OUString(CFGPATH_COMPAT ) )
{
sal_Int32 nIntVal = 0;
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 4e14754a4fad..8ff595ed4d7b 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -967,19 +967,19 @@ ScAutoFormat::iterator ScAutoFormat::find(const ScAutoFormatData* pData)
return itEnd;
}
-ScAutoFormat::const_iterator ScAutoFormat::find(const rtl::OUString& rName) const
+ScAutoFormat::const_iterator ScAutoFormat::find(const OUString& rName) const
{
return maData.find(rName);
}
-ScAutoFormat::iterator ScAutoFormat::find(const rtl::OUString& rName)
+ScAutoFormat::iterator ScAutoFormat::find(const OUString& rName)
{
return maData.find(rName);
}
bool ScAutoFormat::insert(ScAutoFormatData* pNew)
{
- rtl::OUString aName = pNew->GetName();
+ OUString aName = pNew->GetName();
return maData.insert(aName, pNew).second;
}
@@ -1019,7 +1019,7 @@ bool ScAutoFormat::Load()
SvtPathOptions aPathOpt;
aURL.SetSmartURL( aPathOpt.GetUserConfigPath() );
aURL.setFinalSlash();
- aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( sAutoTblFmtName ) ) );
+ aURL.Append( OUString( sAutoTblFmtName ) );
SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_READ );
SvStream* pStream = aMedium.GetInStream();
@@ -1080,7 +1080,7 @@ bool ScAutoFormat::Save()
SvtPathOptions aPathOpt;
aURL.SetSmartURL( aPathOpt.GetUserConfigPath() );
aURL.setFinalSlash();
- aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( sAutoTblFmtName ) ) );
+ aURL.Append( OUString( sAutoTblFmtName ) );
SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_WRITE );
SvStream* pStream = aMedium.GetOutStream();
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index b2f4a3cc4331..6080cb9954d0 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -76,10 +76,10 @@ typedef void (CALLTYPE* FARPROC) ( void );
class ModuleData
{
friend class ModuleCollection;
- rtl::OUString aName;
+ OUString aName;
osl::Module* pInstance;
public:
- ModuleData(const rtl::OUString& rStr, osl::Module* pInst) : aName(rStr), pInstance(pInst) {}
+ ModuleData(const OUString& rStr, osl::Module* pInst) : aName(rStr), pInstance(pInst) {}
ModuleData(const ModuleData& rData) : aName(rData.aName)
{
#ifndef DISABLE_DYNLOADING
@@ -90,7 +90,7 @@ public:
}
~ModuleData() { delete pInstance; }
- const rtl::OUString& GetName() const { return aName; }
+ const OUString& GetName() const { return aName; }
osl::Module* GetInstance() const { return pInstance; }
void FreeInstance() { delete pInstance; pInstance = 0; }
};
@@ -98,8 +98,8 @@ public:
//------------------------------------------------------------------------
FuncData::FuncData(const ModuleData*pModule,
- const rtl::OUString& rIName,
- const rtl::OUString& rFName,
+ const OUString& rIName,
+ const OUString& rFName,
sal_uInt16 nNo,
sal_uInt16 nCount,
const ParamType* peType,
@@ -133,18 +133,18 @@ namespace {
class ModuleCollection
{
- typedef boost::ptr_map<rtl::OUString, ModuleData> MapType;
+ typedef boost::ptr_map<OUString, ModuleData> MapType;
MapType maData;
public:
ModuleCollection() {}
ModuleCollection(const ModuleCollection& r) : maData(r.maData) {}
- const ModuleData* findByName(const rtl::OUString& rName) const;
+ const ModuleData* findByName(const OUString& rName) const;
void insert(ModuleData* pNew);
void clear();
};
-const ModuleData* ModuleCollection::findByName(const rtl::OUString& rName) const
+const ModuleData* ModuleCollection::findByName(const OUString& rName) const
{
MapType::const_iterator it = maData.find(rName);
return it == maData.end() ? NULL : it->second;
@@ -155,7 +155,7 @@ void ModuleCollection::insert(ModuleData* pNew)
if (!pNew)
return;
- rtl::OUString aName = pNew->GetName();
+ OUString aName = pNew->GetName();
maData.insert(aName, pNew);
}
@@ -170,7 +170,7 @@ ModuleCollection aModuleCollection;
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-bool InitExternalFunc(const rtl::OUString& rModuleName)
+bool InitExternalFunc(const OUString& rModuleName)
{
#ifdef DISABLE_DYNLOADING
(void) rModuleName;
@@ -181,7 +181,7 @@ bool InitExternalFunc(const rtl::OUString& rModuleName)
if (pTemp)
return false;
- rtl::OUString aNP;
+ OUString aNP;
aNP = rModuleName;
bool bRet = false;
@@ -386,12 +386,12 @@ bool FuncData::Unadvice( double nHandle )
//------------------------------------------------------------------------
-const rtl::OUString& FuncData::GetModuleName() const
+const OUString& FuncData::GetModuleName() const
{
return pModuleData->GetName();
}
-bool FuncData::getParamDesc( ::rtl::OUString& aName, ::rtl::OUString& aDesc, sal_uInt16 nParam ) const
+bool FuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam ) const
{
bool bRet = false;
if ( nParam <= nParamCount )
@@ -405,15 +405,15 @@ bool FuncData::getParamDesc( ::rtl::OUString& aName, ::rtl::OUString& aDesc, sal
*pcName = *pcDesc = 0;
sal_uInt16 nFuncNo = nNumber; // nicht per Reference versauen lassen..
((::GetParamDesc)fProc)( nFuncNo, nParam, pcName, pcDesc );
- aName = ::rtl::OUString( pcName, 256, osl_getThreadTextEncoding() );
- aDesc = ::rtl::OUString( pcDesc, 256, osl_getThreadTextEncoding() );
+ aName = OUString( pcName, 256, osl_getThreadTextEncoding() );
+ aDesc = OUString( pcDesc, 256, osl_getThreadTextEncoding() );
bRet = true;
}
}
if ( !bRet )
{
- aName = ::rtl::OUString();
- aDesc = ::rtl::OUString();
+ aName = OUString();
+ aDesc = OUString();
}
return bRet;
}
@@ -421,13 +421,13 @@ bool FuncData::getParamDesc( ::rtl::OUString& aName, ::rtl::OUString& aDesc, sal
FuncCollection::FuncCollection() {}
FuncCollection::FuncCollection(const FuncCollection& r) : maData(r.maData) {}
-const FuncData* FuncCollection::findByName(const rtl::OUString& rName) const
+const FuncData* FuncCollection::findByName(const OUString& rName) const
{
MapType::const_iterator it = maData.find(rName);
return it == maData.end() ? NULL : it->second;
}
-FuncData* FuncCollection::findByName(const rtl::OUString& rName)
+FuncData* FuncCollection::findByName(const OUString& rName)
{
MapType::iterator it = maData.find(rName);
return it == maData.end() ? NULL : it->second;
@@ -435,7 +435,7 @@ FuncData* FuncCollection::findByName(const rtl::OUString& rName)
void FuncCollection::insert(FuncData* pNew)
{
- rtl::OUString aName = pNew->GetInternalName();
+ OUString aName = pNew->GetInternalName();
maData.insert(aName, pNew);
}
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 4a3ecc668d50..54d324531601 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -34,7 +34,7 @@ const ScFormulaCell* pLastFormulaTreeTop = 0;
// -----------------------------------------------------------------------
-void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUString& rString,
+void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, OUString& rString,
Color** ppColor, SvNumberFormatter& rFormatter,
sal_Bool bNullVals,
sal_Bool bFormula,
@@ -44,7 +44,7 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUStrin
*ppColor = NULL;
if (&rFormatter==NULL)
{
- rString = rtl::OUString();
+ rString = OUString();
return;
}
@@ -53,13 +53,13 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUStrin
{
case CELLTYPE_STRING:
{
- rtl::OUString aCellString = ((ScStringCell*)pCell)->GetString();
+ OUString aCellString = ((ScStringCell*)pCell)->GetString();
rFormatter.GetOutputString( aCellString, nFormat, rString, ppColor, bUseStarFormat );
}
break;
case CELLTYPE_EDIT:
{
- rtl::OUString aCellString = ((ScEditCell*)pCell)->GetString();
+ OUString aCellString = ((ScEditCell*)pCell)->GetString();
rFormatter.GetOutputString( aCellString, nFormat, rString, ppColor );
}
break;
@@ -67,7 +67,7 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUStrin
{
double nValue = ((ScValueCell*)pCell)->GetValue();
if ( !bNullVals && nValue == 0.0 )
- rString = rtl::OUString();
+ rString = OUString();
else
{
if( eForceTextFmt == ftCheck )
@@ -77,7 +77,7 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUStrin
}
if( eForceTextFmt == ftForce )
{
- rtl::OUString aTemp;
+ OUString aTemp;
rFormatter.GetOutputString( nValue, 0, aTemp, ppColor );
rFormatter.GetOutputString( aTemp, nFormat, rString, ppColor );
}
@@ -105,7 +105,7 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUStrin
(!pFCell->GetDocument()->GetMacroInterpretLevel()
|| pFCell->IsRunning()) )
{
- rString = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..."));
+ rString = OUString("...");
}
else
{
@@ -119,12 +119,12 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUStrin
if (nErrCode != 0)
rString = ScGlobal::GetErrorString(nErrCode);
else if ( pFCell->IsEmptyDisplayedAsString() )
- rString = rtl::OUString();
+ rString = OUString();
else if ( pFCell->IsValue() )
{
double fValue = pFCell->GetValue();
if ( !bNullVals && fValue == 0.0 )
- rString = rtl::OUString();
+ rString = OUString();
else if ( pFCell->IsHybridValueCell() )
rString = pFCell->GetString();
else
@@ -132,7 +132,7 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUStrin
}
else
{
- rtl::OUString aCellString = pFCell->GetString();
+ OUString aCellString = pFCell->GetString();
rFormatter.GetOutputString( aCellString, nFormat, rString, ppColor, bUseStarFormat );
}
}
@@ -140,17 +140,17 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUStrin
}
break;
default:
- rString = rtl::OUString();
+ rString = OUString();
break;
}
}
-void ScCellFormat::GetInputString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUString& rString,
+void ScCellFormat::GetInputString( ScBaseCell* pCell, sal_uLong nFormat, OUString& rString,
SvNumberFormatter& rFormatter )
{
if (&rFormatter==NULL)
{
- rString = rtl::OUString();
+ rString = OUString();
return;
}
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 5c7d9be7b0ff..38a1ffdf0804 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -211,7 +211,7 @@ uno::Reference< chart2::XChartDocument > ScChartHelper::GetChartFromSdrObject( S
}
void ScChartHelper::GetChartRanges( const uno::Reference< chart2::XChartDocument >& xChartDoc,
- uno::Sequence< rtl::OUString >& rRanges )
+ uno::Sequence< OUString >& rRanges )
{
rRanges.realloc(0);
uno::Reference< chart2::data::XDataSource > xDataSource( xChartDoc, uno::UNO_QUERY );
@@ -238,7 +238,7 @@ void ScChartHelper::GetChartRanges( const uno::Reference< chart2::XChartDocument
}
void ScChartHelper::SetChartRanges( const uno::Reference< chart2::XChartDocument >& xChartDoc,
- const uno::Sequence< rtl::OUString >& rRanges )
+ const uno::Sequence< OUString >& rRanges )
{
uno::Reference< chart2::data::XDataSource > xDataSource( xChartDoc, uno::UNO_QUERY );
if( !xDataSource.is() )
@@ -253,7 +253,7 @@ void ScChartHelper::SetChartRanges( const uno::Reference< chart2::XChartDocument
try
{
- rtl::OUString aPropertyNameRole( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Role")) );
+ OUString aPropertyNameRole( OUString("Role") );
uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aLabeledDataSequences( xDataSource->getDataSequences() );
sal_Int32 nRange=0;
@@ -317,13 +317,13 @@ void ScChartHelper::AddRangesIfProtectedChart( ScRangeListVector& rRangesVector,
svt::EmbeddedObjectRef::TryRunningState( xEmbeddedObj );
uno::Reference< beans::XPropertySet > xProps( xEmbeddedObj->getComponent(), uno::UNO_QUERY );
if ( xProps.is() &&
- ( xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ) ) >>= bDisableDataTableDialog ) &&
+ ( xProps->getPropertyValue( OUString( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog ) &&
bDisableDataTableDialog )
{
ScChartListenerCollection* pCollection = pDocument->GetChartListenerCollection();
if (pCollection)
{
- ::rtl::OUString aChartName = pSdrOle2Obj->GetPersistName();
+ OUString aChartName = pSdrOle2Obj->GetPersistName();
const ScChartListener* pListener = pCollection->findByName(aChartName);
if (pListener)
{
@@ -358,7 +358,7 @@ void ScChartHelper::FillProtectedChartRangesVector( ScRangeListVector& rRangesVe
}
}
-void ScChartHelper::GetChartNames( ::std::vector< ::rtl::OUString >& rChartNames, SdrPage* pPage )
+void ScChartHelper::GetChartNames( ::std::vector< OUString >& rChartNames, SdrPage* pPage )
{
if ( pPage )
{
@@ -380,7 +380,7 @@ void ScChartHelper::GetChartNames( ::std::vector< ::rtl::OUString >& rChartNames
}
void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, SdrPage* pPage, ScModelObj* pModelObj, SCTAB nTab,
- const ScRangeListVector& rRangesVector, const ::std::vector< ::rtl::OUString >& rExcludedChartNames, bool bSameDoc )
+ const ScRangeListVector& rRangesVector, const ::std::vector< OUString >& rExcludedChartNames, bool bSameDoc )
{
if ( pDoc && pPage && pModelObj )
{
@@ -395,9 +395,9 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, Sd
SdrOle2Obj* pSdrOle2Obj = dynamic_cast< SdrOle2Obj* >( pObject );
if ( pSdrOle2Obj && pSdrOle2Obj->IsChart() )
{
- ::rtl::OUString aChartName = pSdrOle2Obj->GetPersistName();
- ::std::vector< ::rtl::OUString >::const_iterator aEnd = rExcludedChartNames.end();
- ::std::vector< ::rtl::OUString >::const_iterator aFound = ::std::find( rExcludedChartNames.begin(), aEnd, aChartName );
+ OUString aChartName = pSdrOle2Obj->GetPersistName();
+ ::std::vector< OUString >::const_iterator aEnd = rExcludedChartNames.end();
+ ::std::vector< OUString >::const_iterator aFound = ::std::find( rExcludedChartNames.begin(), aEnd, aChartName );
if ( aFound == aEnd )
{
uno::Reference< embed::XEmbeddedObject > xEmbeddedObj = pSdrOle2Obj->GetObjRef();
@@ -407,7 +407,7 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, Sd
svt::EmbeddedObjectRef::TryRunningState( xEmbeddedObj );
uno::Reference< beans::XPropertySet > xProps( xEmbeddedObj->getComponent(), uno::UNO_QUERY );
if ( xProps.is() &&
- ( xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ) ) >>= bDisableDataTableDialog ) &&
+ ( xProps->getPropertyValue( OUString( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog ) &&
bDisableDataTableDialog )
{
if ( bSameDoc )
@@ -424,9 +424,9 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, Sd
}
else
{
- xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ),
+ xProps->setPropertyValue( OUString( "DisableDataTableDialog" ),
uno::makeAny( sal_False ) );
- xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableComplexChartTypes" ) ),
+ xProps->setPropertyValue( OUString( "DisableComplexChartTypes" ),
uno::makeAny( sal_False ) );
}
}
@@ -440,10 +440,10 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, Sd
aChangeRanges.Append( aRange );
uno::Sequence< beans::PropertyValue > aProperties( 1 );
- aProperties[ 0 ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) );
+ aProperties[ 0 ].Name = OUString( "Name" );
aProperties[ 0 ].Value <<= aChartName;
- pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert-chart" ) ), aChangeRanges, aProperties );
+ pModelObj->NotifyChanges( OUString( "insert-chart" ), aChangeRanges, aProperties );
}
}
}
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index ef7b7ed079a1..09e61c9fa7b8 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -65,7 +65,7 @@
using namespace formula;
using namespace ::com::sun::star;
-using rtl::OUString;
+using ::rtl::OUString;
using ::std::vector;
@@ -128,8 +128,8 @@ void ScCompiler::fillFromAddInMap( NonConstOpCodeMapPtr xMap,FormulaGrammar::Gra
char const * const * ppSymbol =
reinterpret_cast< char const * const * >(
reinterpret_cast< char const * >(pMap) + nSymbolOffset);
- xMap->putExternal( rtl::OUString::createFromAscii( *ppSymbol),
- rtl::OUString::createFromAscii( pMap->pOriginal));
+ xMap->putExternal( OUString::createFromAscii( *ppSymbol),
+ OUString::createFromAscii( pMap->pOriginal));
}
}
@@ -155,7 +155,7 @@ void ScCompiler::fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap )
const ScUnoAddInFuncData* pFuncData = pColl->GetFuncData(i);
if (pFuncData)
{
- ::rtl::OUString aName;
+ OUString aName;
if (pFuncData->GetExcelName( LANGUAGE_ENGLISH_US, aName))
xMap->putExternalSoftly( aName, pFuncData->GetOriginalName());
else
@@ -177,7 +177,7 @@ void ScCompiler::DeInit()
bool ScCompiler::IsEnglishSymbol( const String& rName )
{
// function names are always case-insensitive
- rtl::OUString aUpper = ScGlobal::pCharClass->uppercase(rName);
+ OUString aUpper = ScGlobal::pCharClass->uppercase(rName);
// 1. built-in function name
OpCode eOp = ScCompiler::GetEnglishOpCode( aUpper );
@@ -192,7 +192,7 @@ bool ScCompiler::IsEnglishSymbol( const String& rName )
}
// 3. new (uno) add in functions
- rtl::OUString aIntName = ScGlobal::GetAddInCollection()->FindFunction(aUpper, false);
+ OUString aIntName = ScGlobal::GetAddInCollection()->FindFunction(aUpper, false);
if (!aIntName.isEmpty())
{
return true;
@@ -635,11 +635,11 @@ static bool lcl_parseExternalName(
static String lcl_makeExternalNameStr( const String& rFile, const String& rName,
const sal_Unicode cSep, bool bODF )
{
- String aFile( rFile), aName( rName), aEscQuote( RTL_CONSTASCII_USTRINGPARAM("''"));
+ String aFile( rFile), aName( rName), aEscQuote( "''");
aFile.SearchAndReplaceAllAscii( "'", aEscQuote);
if (bODF)
aName.SearchAndReplaceAllAscii( "'", aEscQuote);
- rtl::OUStringBuffer aBuf( aFile.Len() + aName.Len() + 9);
+ OUStringBuffer aBuf( aFile.Len() + aName.Len() + 9);
if (bODF)
aBuf.append( sal_Unicode( '['));
aBuf.append( sal_Unicode( '\''));
@@ -687,8 +687,8 @@ static bool lcl_getLastTabName( OUString& rTabName2, const OUString& rTabName1,
struct Convention_A1 : public ScCompiler::Convention
{
Convention_A1( FormulaGrammar::AddressConvention eConv ) : ScCompiler::Convention( eConv ) { }
- static void MakeColStr( rtl::OUStringBuffer& rBuffer, SCCOL nCol );
- static void MakeRowStr( rtl::OUStringBuffer& rBuffer, SCROW nRow );
+ static void MakeColStr( OUStringBuffer& rBuffer, SCCOL nCol );
+ static void MakeRowStr( OUStringBuffer& rBuffer, SCROW nRow );
ParseResult parseAnyToken( const String& rFormula,
xub_StrLen nSrcPos,
@@ -702,7 +702,7 @@ struct Convention_A1 : public ScCompiler::Convention
KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR;
static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT;
// '?' allowed in range names because of Xcl :-/
- static const String aAddAllowed(rtl::OUString("?#"));
+ static const String aAddAllowed(OUString("?#"));
return pCharClass->parseAnyToken( rFormula,
nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
}
@@ -713,7 +713,7 @@ struct Convention_A1 : public ScCompiler::Convention
}
};
-void Convention_A1::MakeColStr( rtl::OUStringBuffer& rBuffer, SCCOL nCol )
+void Convention_A1::MakeColStr( OUStringBuffer& rBuffer, SCCOL nCol )
{
if ( !ValidCol( nCol) )
rBuffer.append(ScGlobal::GetRscString(STR_NO_REF_TABLE));
@@ -721,7 +721,7 @@ void Convention_A1::MakeColStr( rtl::OUStringBuffer& rBuffer, SCCOL nCol )
::ScColToAlpha( rBuffer, nCol);
}
-void Convention_A1::MakeRowStr( rtl::OUStringBuffer& rBuffer, SCROW nRow )
+void Convention_A1::MakeRowStr( OUStringBuffer& rBuffer, SCROW nRow )
{
if ( !ValidRow(nRow) )
rBuffer.append(ScGlobal::GetRscString(STR_NO_REF_TABLE));
@@ -762,7 +762,7 @@ struct ConventionOOO_A1 : public Convention_A1
}
- void MakeOneRefStrImpl( rtl::OUStringBuffer& rBuffer,
+ void MakeOneRefStrImpl( OUStringBuffer& rBuffer,
const ScCompiler& rComp,
const ScSingleRefData& rRef,
bool bForceTab,
@@ -804,7 +804,7 @@ struct ConventionOOO_A1 : public Convention_A1
}
- void MakeRefStrImpl( rtl::OUStringBuffer& rBuffer,
+ void MakeRefStrImpl( OUStringBuffer& rBuffer,
const ScCompiler& rComp,
const ScComplexRefData& rRef,
bool bSingleRef,
@@ -838,7 +838,7 @@ struct ConventionOOO_A1 : public Convention_A1
rBuffer.append(sal_Unicode(']'));
}
- void MakeRefStr( rtl::OUStringBuffer& rBuffer,
+ void MakeRefStr( OUStringBuffer& rBuffer,
const ScCompiler& rComp,
const ScComplexRefData& rRef,
bool bSingleRef ) const
@@ -872,7 +872,7 @@ struct ConventionOOO_A1 : public Convention_A1
return lcl_makeExternalNameStr( rFile, rName, sal_Unicode('#'), false);
}
- bool makeExternalSingleRefStr( ::rtl::OUStringBuffer& rBuffer, sal_uInt16 nFileId,
+ bool makeExternalSingleRefStr( OUStringBuffer& rBuffer, sal_uInt16 nFileId,
const String& rTabName, const ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr, bool bDisplayTabName, bool bEncodeUrl ) const
{
@@ -887,7 +887,7 @@ struct ConventionOOO_A1 : public Convention_A1
else
aFile = INetURLObject::decode(*p, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
}
- aFile.SearchAndReplaceAllAscii("'", rtl::OUString("''"));
+ aFile.SearchAndReplaceAllAscii("'", OUString("''"));
rBuffer.append(sal_Unicode('\''));
rBuffer.append(aFile);
@@ -911,7 +911,7 @@ struct ConventionOOO_A1 : public Convention_A1
return true;
}
- void makeExternalRefStrImpl( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ void makeExternalRefStrImpl( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr, bool bODF ) const
{
@@ -941,14 +941,14 @@ struct ConventionOOO_A1 : public Convention_A1
rBuffer.append( sal_Unicode(']'));
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
makeExternalRefStrImpl( rBuffer, rCompiler, nFileId, rTabName, rRef, pRefMgr, false);
}
- void makeExternalRefStrImpl( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ void makeExternalRefStrImpl( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef,
ScExternalRefManager* pRefMgr, bool bODF ) const
{
@@ -1008,7 +1008,7 @@ struct ConventionOOO_A1 : public Convention_A1
rBuffer.append( sal_Unicode(']'));
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -1025,7 +1025,7 @@ const ScCompiler::Convention * const ScCompiler::pConvOOO_A1 = &ConvOOO_A1;
struct ConventionOOO_A1_ODF : public ConventionOOO_A1
{
ConventionOOO_A1_ODF() : ConventionOOO_A1 (FormulaGrammar::CONV_ODF) { }
- void MakeRefStr( rtl::OUStringBuffer& rBuffer,
+ void MakeRefStr( OUStringBuffer& rBuffer,
const ScCompiler& rComp,
const ScComplexRefData& rRef,
bool bSingleRef ) const
@@ -1038,14 +1038,14 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1
return lcl_makeExternalNameStr( rFile, rName, sal_Unicode('#'), true);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
makeExternalRefStrImpl( rBuffer, rCompiler, nFileId, rTabName, rRef, pRefMgr, true);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -1068,7 +1068,7 @@ struct ConventionXL
bool bHasDoc = false;
rDocName.Erase();
- rtl::OUString aTmp;
+ OUString aTmp;
if (rRef.IsTabDeleted() ||
!rComp.GetDoc()->GetName( rRef.nTab, aTmp ))
{
@@ -1095,7 +1095,7 @@ struct ConventionXL
return bHasDoc;
}
- static void MakeDocStr( rtl::OUStringBuffer& rBuf,
+ static void MakeDocStr( OUStringBuffer& rBuf,
const ScCompiler& rComp,
const ScComplexRefData& rRef,
bool bSingleRef )
@@ -1163,7 +1163,7 @@ struct ConventionXL
return lcl_makeExternalNameStr( rFile, rName, sal_Unicode('!'), false);
}
- static void makeExternalDocStr( ::rtl::OUStringBuffer& rBuffer, const String& rFullName, bool bEncodeUrl )
+ static void makeExternalDocStr( OUStringBuffer& rBuffer, const String& rFullName, bool bEncodeUrl )
{
// Format that is easier to deal with inside OOo, because we use file
// URL, and all characetrs are allowed. Check if it makes sense to do
@@ -1193,7 +1193,7 @@ struct ConventionXL
rBuffer.append(sal_Unicode(']'));
}
- static void makeExternalTabNameRange( ::rtl::OUStringBuffer& rBuf, const OUString& rTabName,
+ static void makeExternalTabNameRange( OUStringBuffer& rBuf, const OUString& rTabName,
const vector<OUString>& rTabNames,
const ScComplexRefData& rRef )
{
@@ -1271,7 +1271,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
ConventionXL_A1() : Convention_A1( FormulaGrammar::CONV_XL_A1 ) { }
ConventionXL_A1( FormulaGrammar::AddressConvention eConv ) : Convention_A1( eConv ) { }
- void makeSingleCellStr( ::rtl::OUStringBuffer& rBuf, const ScSingleRefData& rRef ) const
+ void makeSingleCellStr( OUStringBuffer& rBuf, const ScSingleRefData& rRef ) const
{
if (!rRef.IsColRel())
rBuf.append(sal_Unicode('$'));
@@ -1281,7 +1281,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
MakeRowStr(rBuf, rRef.nRow);
}
- void MakeRefStr( rtl::OUStringBuffer& rBuf,
+ void MakeRefStr( OUStringBuffer& rBuf,
const ScCompiler& rComp,
const ScComplexRefData& rRef,
bool bSingleRef ) const
@@ -1354,7 +1354,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR;
static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT;
// '?' allowed in range names
- const rtl::OUString aAddAllowed("?!");
+ const OUString aAddAllowed("?!");
return pCharClass->parseAnyToken( rFormula,
nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
}
@@ -1377,7 +1377,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
return ConventionXL::makeExternalNameStr(rFile, rName);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -1402,7 +1402,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
makeSingleCellStr(rBuffer, aRef);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -1448,7 +1448,7 @@ const ScCompiler::Convention * const ScCompiler::pConvXL_OOX = &ConvXL_OOX;
//-----------------------------------------------------------------------------
static void
-r1c1_add_col( rtl::OUStringBuffer &rBuf, const ScSingleRefData& rRef )
+r1c1_add_col( OUStringBuffer &rBuf, const ScSingleRefData& rRef )
{
rBuf.append( sal_Unicode( 'C' ) );
if( rRef.IsColRel() )
@@ -1460,7 +1460,7 @@ r1c1_add_col( rtl::OUStringBuffer &rBuf, const ScSingleRefData& rRef )
rBuf.append( OUString::number( rRef.nCol + 1 ) );
}
static void
-r1c1_add_row( rtl::OUStringBuffer &rBuf, const ScSingleRefData& rRef )
+r1c1_add_row( OUStringBuffer &rBuf, const ScSingleRefData& rRef )
{
rBuf.append( sal_Unicode( 'R' ) );
if( rRef.IsRowRel() )
@@ -1477,7 +1477,7 @@ r1c1_add_row( rtl::OUStringBuffer &rBuf, const ScSingleRefData& rRef )
struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
{
ConventionXL_R1C1() : ScCompiler::Convention( FormulaGrammar::CONV_XL_R1C1 ) { }
- void MakeRefStr( rtl::OUStringBuffer& rBuf,
+ void MakeRefStr( OUStringBuffer& rBuf,
const ScCompiler& rComp,
const ScComplexRefData& rRef,
bool bSingleRef ) const
@@ -1553,7 +1553,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
KParseTokens::ASC_UNDERSCORE ;
static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT;
// '?' allowed in range names
- const rtl::OUString aAddAllowed("?-[]!");
+ const OUString aAddAllowed("?-[]!");
return pCharClass->parseAnyToken( rFormula,
nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
@@ -1577,7 +1577,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
return ConventionXL::makeExternalNameStr(rFile, rName);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -1603,7 +1603,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
r1c1_add_col(rBuffer, aRef);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -1726,8 +1726,8 @@ void ScCompiler::CheckTabQuotes( String& rString,
case FormulaGrammar::CONV_XL_OOX :
if( bNeedsQuote )
{
- const rtl::OUString one_quote(static_cast<sal_Unicode>('\''));
- const rtl::OUString two_quote("''");
+ const OUString one_quote(static_cast<sal_Unicode>('\''));
+ const OUString two_quote("''");
// escape embedded quotes
rString.SearchAndReplaceAll( one_quote, two_quote );
}
@@ -2781,7 +2781,7 @@ bool ScCompiler::IsReference( const String& rName )
if ( ch1 == cDecSep )
return false;
// Who was that imbecile introducing '.' as the sheet name separator!?!
- if ( CharClass::isAsciiNumeric( rtl::OUString(ch1) ) )
+ if ( CharClass::isAsciiNumeric( OUString(ch1) ) )
{
// Numerical sheet name is valid.
// But English 1.E2 or 1.E+2 is value 100, 1.E-2 is 0.01
@@ -3484,9 +3484,9 @@ void ScCompiler::AutoCorrectParsedSymbol()
String aOld( aRef[j] );
String aStr2;
const sal_Unicode* p = aRef[j].GetBuffer();
- while ( *p && CharClass::isAsciiNumeric( rtl::OUString(*p) ) )
+ while ( *p && CharClass::isAsciiNumeric( OUString(*p) ) )
aStr2 += *p++;
- aRef[j] = rtl::OUString( p );
+ aRef[j] = OUString( p );
aRef[j] += aStr2;
if ( bColons || aRef[j] != aOld )
{
@@ -3552,7 +3552,7 @@ bool ScCompiler::NextNewToken( bool bInArray )
// Short cut for references when reading ODF to speedup things.
if (mnPredetectedReference)
{
- rtl::OUString aStr( cSymbol);
+ OUString aStr( cSymbol);
if (!IsPredetectedReference( aStr) && !IsExternalNamedRange( aStr))
{
/* TODO: it would be nice to generate a #REF! error here, which
@@ -3595,7 +3595,7 @@ bool ScCompiler::NextNewToken( bool bInArray )
}
else
{
- rtl::OUString aTmpStr( cSymbol[0] );
+ OUString aTmpStr( cSymbol[0] );
bMayBeFuncName = ScGlobal::pCharClass->isLetter( aTmpStr, 0 );
bAsciiNonAlnum = false;
}
@@ -3616,7 +3616,7 @@ bool ScCompiler::NextNewToken( bool bInArray )
do
{
mbRewind = false;
- const rtl::OUString aOrg( cSymbol );
+ const OUString aOrg( cSymbol );
if (bAsciiNonAlnum)
{
@@ -3713,7 +3713,7 @@ bool ScCompiler::NextNewToken( bool bInArray )
return true;
}
-void ScCompiler::CreateStringFromXMLTokenArray( rtl::OUString& rFormula, rtl::OUString& rFormulaNmsp )
+void ScCompiler::CreateStringFromXMLTokenArray( OUString& rFormula, OUString& rFormulaNmsp )
{
bool bExternal = GetGrammar() == FormulaGrammar::GRAM_EXTERNAL;
sal_uInt16 nExpectedCount = bExternal ? 2 : 1;
@@ -5066,7 +5066,7 @@ ScRangeData* ScCompiler::UpdateMoveTab( SCTAB nOldTab, SCTAB nNewTab,
}
-void ScCompiler::CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP)
+void ScCompiler::CreateStringFromExternal(OUStringBuffer& rBuffer, FormulaToken* pTokenP)
{
FormulaToken* t = pTokenP;
ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
@@ -5094,7 +5094,7 @@ void ScCompiler::CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, FormulaT
}
}
-void ScCompiler::CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer,
+void ScCompiler::CreateStringFromMatrix( OUStringBuffer& rBuffer,
FormulaToken* pTokenP)
{
const ScMatrix* pMatrix = static_cast<ScToken*>(pTokenP)->GetMatrix();
@@ -5139,7 +5139,7 @@ void ScCompiler::CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer,
rBuffer.append( mxSymbols->getSymbol(ocArrayClose) );
}
-void ScCompiler::CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* _pTokenP)
+void ScCompiler::CreateStringFromSingleRef(OUStringBuffer& rBuffer,FormulaToken* _pTokenP)
{
const OpCode eOp = _pTokenP->GetOpCode();
ScSingleRefData& rRef = static_cast<ScToken*>(_pTokenP)->GetSingleRef();
@@ -5164,15 +5164,15 @@ void ScCompiler::CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,FormulaT
pConv->MakeRefStr( rBuffer, *this, aRef, true );
}
// -----------------------------------------------------------------------------
-void ScCompiler::CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* _pTokenP)
+void ScCompiler::CreateStringFromDoubleRef(OUStringBuffer& rBuffer,FormulaToken* _pTokenP)
{
pConv->MakeRefStr( rBuffer, *this, static_cast<ScToken*>(_pTokenP)->GetDoubleRef(), false );
}
// -----------------------------------------------------------------------------
-void ScCompiler::CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken* _pTokenP)
+void ScCompiler::CreateStringFromIndex(OUStringBuffer& rBuffer,FormulaToken* _pTokenP)
{
const OpCode eOp = _pTokenP->GetOpCode();
- rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
switch ( eOp )
{
case ocName:
@@ -5205,7 +5205,7 @@ void ScCompiler::CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken
// -----------------------------------------------------------------------------
void ScCompiler::LocalizeString( String& rName )
{
- ::rtl::OUString aName(rName);
+ OUString aName(rName);
ScGlobal::GetAddInCollection()->LocalizeString( aName );
rName = aName;
}
@@ -5251,7 +5251,7 @@ void ScCompiler::fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaO
{
if ( _bIsEnglish )
{
- ::rtl::OUString aName;
+ OUString aName;
if (pFuncData->GetExcelName( LANGUAGE_ENGLISH_US, aName))
aEntry.Name = aName;
else
@@ -5259,7 +5259,7 @@ void ScCompiler::fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaO
}
else
aEntry.Name = pFuncData->GetUpperLocal();
- aEntry.Token.Data <<= ::rtl::OUString( pFuncData->GetOriginalName());
+ aEntry.Token.Data <<= OUString( pFuncData->GetOriginalName());
_rVec.push_back( aEntry);
}
}
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 56cd5a723ec4..c8a6384f0891 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -793,7 +793,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
if (ppTitlePos && ppTitles && ppRowHeaders)
{
- String aDelim( RTL_CONSTASCII_USTRINGPARAM(" / ") );
+ String aDelim( " / " );
for (SCSIZE nPos=0; nPos<nDataCount; nPos++)
{
SCSIZE nTPos = ppTitlePos[nArrY][nPos];
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 6b773c3c86c8..163e6feba151 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -47,7 +47,7 @@ bool ScDBData::less::operator() (const ScDBData& left, const ScDBData& right) co
return ScGlobal::GetpTransliteration()->compareString(left.GetUpperName(), right.GetUpperName()) < 0;
}
-ScDBData::ScDBData( const ::rtl::OUString& rName,
+ScDBData::ScDBData( const OUString& rName,
SCTAB nTab,
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
bool bByR, bool bHasH) :
@@ -103,7 +103,7 @@ ScDBData::ScDBData( const ScDBData& rData ) :
{
}
-ScDBData::ScDBData( const ::rtl::OUString& rName, const ScDBData& rData ) :
+ScDBData::ScDBData( const OUString& rName, const ScDBData& rData ) :
ScRefreshTimer ( rData ),
mpSortParam(new ScSortParam(*rData.mpSortParam)),
mpQueryParam(new ScQueryParam(*rData.mpQueryParam)),
@@ -210,9 +210,9 @@ ScDBData::~ScDBData()
}
-::rtl::OUString ScDBData::GetSourceString() const
+OUString ScDBData::GetSourceString() const
{
- ::rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
if (mpImportParam->bImport)
{
aBuf.append(mpImportParam->aDBName);
@@ -222,9 +222,9 @@ ScDBData::~ScDBData()
return aBuf.makeStringAndClear();
}
-::rtl::OUString ScDBData::GetOperations() const
+OUString ScDBData::GetOperations() const
{
- ::rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
if (mpQueryParam->GetEntryCount())
{
const ScQueryEntry& rEntry = mpQueryParam->GetEntry(0);
@@ -636,9 +636,9 @@ public:
class FindByUpperName : public unary_function<ScDBData, bool>
{
- const ::rtl::OUString& mrName;
+ const OUString& mrName;
public:
- FindByUpperName(const ::rtl::OUString& rName) : mrName(rName) {}
+ FindByUpperName(const OUString& rName) : mrName(rName) {}
bool operator() (const ScDBData& r) const
{
return r.GetUpperName() == mrName;
@@ -680,7 +680,7 @@ ScDBData* ScDBCollection::NamedDBs::findByIndex(sal_uInt16 nIndex)
return itr == maDBs.end() ? NULL : &(*itr);
}
-ScDBData* ScDBCollection::NamedDBs::findByUpperName(const ::rtl::OUString& rName)
+ScDBData* ScDBCollection::NamedDBs::findByUpperName(const OUString& rName)
{
DBsType::iterator itr = find_if(
maDBs.begin(), maDBs.end(), FindByUpperName(rName));
@@ -770,7 +770,7 @@ ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange& rRange)
if (!pData)
{
// Insert a new db data. They all have identical names.
- rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME));
+ OUString aName(STR_DB_GLOBAL_NONAME);
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pNew(new ScDBData(
aName, rRange.aStart.Tab(), rRange.aStart.Col(), rRange.aStart.Row(),
diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx
index 9c3e39d781b2..29084b508392 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -105,7 +105,7 @@ ScTpDefaultsItem::~ScTpDefaultsItem()
String ScTpDefaultsItem::GetValueText() const
{
- return rtl::OUString("ScTpDefaultsItem");
+ return OUString("ScTpDefaultsItem");
}
int ScTpDefaultsItem::operator==( const SfxPoolItem& rItem ) const
@@ -145,7 +145,7 @@ Sequence<OUString> ScDefaultsCfg::GetPropertyNames()
}
ScDefaultsCfg::ScDefaultsCfg() :
- ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_FORMULA )) )
+ ConfigItem( OUString( CFGPATH_FORMULA ) )
{
OUString aPrefix;
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index efbd8b93503e..65ea618e8119 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -145,7 +145,7 @@ ScTpCalcItem::~ScTpCalcItem()
String ScTpCalcItem::GetValueText() const
{
- return rtl::OUString("ScTpCalcItem");
+ return OUString("ScTpCalcItem");
}
//------------------------------------------------------------------------
@@ -229,14 +229,14 @@ Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
- pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString(RTL_CONSTASCII_USTRINGPARAM( "TabStop/Metric") );
+ pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString( "TabStop/Metric" );
return aNames;
}
ScDocCfg::ScDocCfg() :
- aCalcItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_CALC )) ),
- aLayoutItem(OUString(RTL_CONSTASCII_USTRINGPARAM(CFGPATH_DOCLAYOUT)))
+ aCalcItem( OUString( CFGPATH_CALC ) ),
+ aLayoutItem(OUString(CFGPATH_DOCLAYOUT))
{
sal_Int32 nIntVal = 0;
diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx
index 072cec3935a7..a825dda1ffe4 100644
--- a/sc/source/core/tool/filtopt.cxx
+++ b/sc/source/core/tool/filtopt.cxx
@@ -54,7 +54,7 @@ Sequence<OUString> ScFilterOptions::GetPropertyNames()
}
ScFilterOptions::ScFilterOptions() :
- ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_FILTER )) ),
+ ConfigItem( OUString( CFGPATH_FILTER ) ),
bWK3Flag( false ),
fExcelColScale( 0 ),
fExcelRowScale( 0 )
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 3dc99384a631..01ebadaad9a1 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -87,12 +87,12 @@ void ScFormulaOptions::ResetFormulaSeparators()
}
void ScFormulaOptions::GetDefaultFormulaSeparators(
- rtl::OUString& rSepArg, rtl::OUString& rSepArrayCol, rtl::OUString& rSepArrayRow)
+ OUString& rSepArg, OUString& rSepArrayCol, OUString& rSepArrayRow)
{
// Defaults to the old separator values.
- rSepArg = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
- rSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
- rSepArrayRow = OUString(RTL_CONSTASCII_USTRINGPARAM("|"));
+ rSepArg = OUString(";");
+ rSepArrayCol = OUString(";");
+ rSepArrayRow = OUString("|");
const Locale& rLocale = *ScGlobal::GetLocale();
const OUString& rLang = rLocale.Language;
@@ -131,12 +131,12 @@ void ScFormulaOptions::GetDefaultFormulaSeparators(
// if the decimal and list separators are equal, set the
// parameter separator to be ';', unless they are both
// semicolon in which case don't change the decimal separator.
- rSepArg = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+ rSepArg = OUString(";");
- rSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ rSepArrayCol = OUString(",");
if (cDecSep == sal_Unicode(','))
- rSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM("."));
- rSepArrayRow = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+ rSepArrayCol = OUString(".");
+ rSepArrayRow = OUString(";");
}
const LocaleDataWrapper& ScFormulaOptions::GetLocaleDataWrapper()
@@ -195,7 +195,7 @@ ScTpFormulaItem::~ScTpFormulaItem()
String ScTpFormulaItem::GetValueText() const
{
- return rtl::OUString("ScTpFormulaItem");
+ return OUString("ScTpFormulaItem");
}
int ScTpFormulaItem::operator==( const SfxPoolItem& rItem ) const
@@ -249,7 +249,7 @@ Sequence<OUString> ScFormulaCfg::GetPropertyNames()
}
ScFormulaCfg::ScFormulaCfg() :
- ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_FORMULA )) )
+ ConfigItem( OUString( CFGPATH_FORMULA ) )
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx
index 53969bed5ed4..0c0231cdef2d 100644
--- a/sc/source/core/tool/formulaparserpool.cxx
+++ b/sc/source/core/tool/formulaparserpool.cxx
@@ -66,7 +66,7 @@ ScParserFactoryMap::ScParserFactoryMap() :
{
// enumerate all implementations of the FormulaParser service
Reference< XContentEnumerationAccess > xFactoryEA( mxContext->getServiceManager(), UNO_QUERY_THROW );
- Reference< XEnumeration > xEnum( xFactoryEA->createContentEnumeration( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.FilterFormulaParser" ) ) ), UNO_SET_THROW );
+ Reference< XEnumeration > xEnum( xFactoryEA->createContentEnumeration( OUString( "com.sun.star.sheet.FilterFormulaParser" ) ), UNO_SET_THROW );
while( xEnum->hasMoreElements() ) try // single try/catch for every element
{
// create an instance of the formula parser implementation
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index b5e25dd445cf..9e535d25a757 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -138,7 +138,7 @@ Sequence<OUString> ScInputCfg::GetPropertyNames()
}
ScInputCfg::ScInputCfg() :
- ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_INPUT )) )
+ ConfigItem( OUString( CFGPATH_INPUT ) )
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 1f0206c382b6..8398b1bccf3c 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2453,14 +2453,14 @@ void ScInterpreter::ScCell()
else if( aInfoType.EqualsAscii( "ADDRESS" ) )
{ // address formatted as [['FILENAME'#]$TABLE.]$COL$ROW
sal_uInt16 nFlags = (aCellPos.Tab() == aPos.Tab()) ? (SCA_ABS) : (SCA_ABS_3D);
- rtl::OUString aStr;
+ OUString aStr;
aCellPos.Format( aStr, nFlags, pDok, pDok->GetAddressConvention() );
PushString(aStr);
}
else if( aInfoType.EqualsAscii( "FILENAME" ) )
{ // file name and table name: 'FILENAME'#$TABLE
SCTAB nTab = aCellPos.Tab();
- rtl::OUString aFuncResult;
+ OUString aFuncResult;
if( nTab < pDok->GetTableCount() )
{
if( pDok->GetLinkMode( nTab ) == SC_LINK_VALUE )
@@ -2470,12 +2470,12 @@ void ScInterpreter::ScCell()
SfxObjectShell* pShell = pDok->GetDocumentShell();
if( pShell && pShell->GetMedium() )
{
- rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
aBuf.append(sal_Unicode('\''));
const INetURLObject& rURLObj = pShell->GetMedium()->GetURLObject();
aBuf.append(rURLObj.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS));
aBuf.appendAscii("'#$");
- rtl::OUString aTabName;
+ OUString aTabName;
pDok->GetName( nTab, aTabName );
aBuf.append(aTabName);
aFuncResult = aBuf.makeStringAndClear();
@@ -2487,8 +2487,8 @@ void ScInterpreter::ScCell()
else if( aInfoType.EqualsAscii( "COORD" ) )
{ // address, lotus 1-2-3 formatted: $TABLE:$COL$ROW
// Yes, passing tab as col is intentional!
- rtl::OUStringBuffer aFuncResult;
- rtl::OUString aCellStr;
+ OUStringBuffer aFuncResult;
+ OUString aCellStr;
ScAddress( static_cast<SCCOL>(aCellPos.Tab()), 0, 0 ).Format(
aCellStr, (SCA_COL_ABSOLUTE|SCA_VALID_COL), NULL, pDok->GetAddressConvention() );
aFuncResult.append(aCellStr);
@@ -2518,7 +2518,7 @@ void ScInterpreter::ScCell()
c = 'l';
else
c = HasCellValueData( pCell ) ? 'v' : 'b';
- PushString( rtl::OUString(c) );
+ PushString( OUString(c) );
}
else if( aInfoType.EqualsAscii( "WIDTH" ) )
{ // column width (rounded off as count of zero characters in standard font and size)
@@ -2531,7 +2531,7 @@ void ScInterpreter::ScCell()
// font color doesn't matter here
pDok->GetDefPattern()->GetFont( aDefFont, SC_AUTOCOL_BLACK, pPrinter );
pPrinter->SetFont( aDefFont );
- long nZeroWidth = pPrinter->GetTextWidth( rtl::OUString( '0' ) );
+ long nZeroWidth = pPrinter->GetTextWidth( OUString( '0' ) );
pPrinter->SetFont( aOldFont );
pPrinter->SetMapMode( aOldMode );
int nZeroCount = (int)(pDok->GetColWidth( aCellPos.Col(), aCellPos.Tab() ) / nZeroWidth);
@@ -2554,7 +2554,7 @@ void ScInterpreter::ScCell()
case SVX_HOR_JUSTIFY_REPEAT: c = '\\'; break;
}
}
- PushString( rtl::OUString(c) );
+ PushString( OUString(c) );
}
else if( aInfoType.EqualsAscii( "PROTECT" ) )
{ // 1 = cell locked
@@ -2601,7 +2601,7 @@ void ScInterpreter::ScCellExternal()
return;
}
- rtl::OUString aInfoType = GetString();
+ OUString aInfoType = GetString();
if (nGlobalError)
{
PushIllegalParameter();
@@ -2652,7 +2652,7 @@ void ScInterpreter::ScCellExternal()
{
// 'file URI'#$SheetName
- const rtl::OUString* p = pRefMgr->getExternalFileName(nFileId);
+ const OUString* p = pRefMgr->getExternalFileName(nFileId);
if (!p)
{
// In theory this should never happen...
@@ -2660,7 +2660,7 @@ void ScInterpreter::ScCellExternal()
return;
}
- rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
aBuf.append(sal_Unicode('\''));
aBuf.append(*p);
aBuf.appendAscii("'#$");
@@ -2675,7 +2675,7 @@ void ScInterpreter::ScCellExternal()
PushString(pToken->GetString());
break;
case svDouble:
- PushString(rtl::OUString::valueOf(pToken->GetDouble()));
+ PushString(OUString::valueOf(pToken->GetDouble()));
break;
case svError:
PushString(ScGlobal::GetErrorString(pToken->GetError()));
@@ -2698,7 +2698,7 @@ void ScInterpreter::ScCellExternal()
default:
;
}
- PushString(rtl::OUString(c));
+ PushString(OUString(c));
}
else if ( aInfoType == "FORMAT" )
{
@@ -2862,7 +2862,7 @@ void ScInterpreter::ScIsFormula()
void ScInterpreter::ScFormula()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFormula" );
- rtl::OUString aFormula;
+ OUString aFormula;
switch ( GetStackType() )
{
case svDoubleRef :
@@ -3205,7 +3205,7 @@ void ScInterpreter::ScPropper()
xub_StrLen nPos = 1;
while( nPos < nLen )
{
- rtl::OUString aTmpStr( pStr[nPos-1] );
+ OUString aTmpStr( pStr[nPos-1] );
if ( !ScGlobal::pCharClass->isLetter( aTmpStr, 0 ) )
pStr[nPos] = pUpr[nPos];
else
@@ -3508,7 +3508,7 @@ void ScInterpreter::ScCode()
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |
RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE;
- PushInt( (sal_uChar) rtl::OUStringToOString(rtl::OUString(rStr.GetChar(0)), osl_getThreadTextEncoding(), convertFlags).toChar() );
+ PushInt( (sal_uChar) OUStringToOString(OUString(rStr.GetChar(0)), osl_getThreadTextEncoding(), convertFlags).toChar() );
}
@@ -3528,7 +3528,7 @@ void ScInterpreter::ScChar()
RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT;
sal_Char cEncodedChar = static_cast<sal_Char>(fVal);
- rtl::OUString aStr(&cEncodedChar, 1, osl_getThreadTextEncoding(), convertFlags);
+ OUString aStr(&cEncodedChar, 1, osl_getThreadTextEncoding(), convertFlags);
PushString(aStr);
}
}
@@ -3538,14 +3538,14 @@ void ScInterpreter::ScChar()
* Takashi Nakamoto <bluedwarf@ooo>
* erAck: added Excel compatibility conversions as seen in issue's test case. */
-static ::rtl::OUString lcl_convertIntoHalfWidth( const ::rtl::OUString & rStr )
+static OUString lcl_convertIntoHalfWidth( const OUString & rStr )
{
static bool bFirstASCCall = true;
static utl::TransliterationWrapper aTrans( ::comphelper::getProcessComponentContext(), 0 );
if( bFirstASCCall )
{
- aTrans.loadModuleByImplName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FULLWIDTH_HALFWIDTH_LIKE_ASC" )), LANGUAGE_SYSTEM );
+ aTrans.loadModuleByImplName( OUString( "FULLWIDTH_HALFWIDTH_LIKE_ASC" ), LANGUAGE_SYSTEM );
bFirstASCCall = false;
}
@@ -3553,14 +3553,14 @@ static ::rtl::OUString lcl_convertIntoHalfWidth( const ::rtl::OUString & rStr )
}
-static ::rtl::OUString lcl_convertIntoFullWidth( const ::rtl::OUString & rStr )
+static OUString lcl_convertIntoFullWidth( const OUString & rStr )
{
static bool bFirstJISCall = true;
static utl::TransliterationWrapper aTrans( ::comphelper::getProcessComponentContext(), 0 );
if( bFirstJISCall )
{
- aTrans.loadModuleByImplName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HALFWIDTH_FULLWIDTH_LIKE_JIS" )), LANGUAGE_SYSTEM );
+ aTrans.loadModuleByImplName( OUString( "HALFWIDTH_FULLWIDTH_LIKE_JIS" ), LANGUAGE_SYSTEM );
bFirstJISCall = false;
}
@@ -3604,7 +3604,7 @@ void ScInterpreter::ScUnicode()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScUnicode" );
if ( MustHaveParamCount( GetByte(), 1 ) )
{
- const rtl::OUString& rStr = GetString();
+ const OUString& rStr = GetString();
if (rStr.isEmpty())
PushIllegalParameter();
else
@@ -3626,7 +3626,7 @@ void ScInterpreter::ScUnichar()
else
{
sal_uInt32 nCodePoint = static_cast<sal_uInt32>( dVal );
- rtl::OUString aStr( &nCodePoint, 1 );
+ OUString aStr( &nCodePoint, 1 );
PushString( aStr );
}
}
@@ -4911,7 +4911,7 @@ public:
return mbColVec ? mrMat.GetDouble(0, i) : mrMat.GetDouble(i, 0);
}
- rtl::OUString GetString(SCSIZE i) const
+ OUString GetString(SCSIZE i) const
{
return mbColVec ? mrMat.GetString(0, i) : mrMat.GetString(i, 0);
}
@@ -4961,8 +4961,8 @@ static sal_Int32 lcl_CompareMatrix2Query(
if (!bByString)
return 1; // string always greater than numeric
- const rtl::OUString aStr1 = rMat.GetString(i);
- const rtl::OUString& rStr2 = rEntry.GetQueryItem().maString;
+ const OUString aStr1 = rMat.GetString(i);
+ const OUString& rStr2 = rEntry.GetQueryItem().maString;
return ScGlobal::GetCollator()->compareString(aStr1, rStr2); // case-insensitive
}
@@ -5005,7 +5005,7 @@ static void lcl_GetLastMatch( SCSIZE& rIndex, const VectorMatrixAccessor& rMat,
}
else if (rMat.IsString(rIndex))
{
- rtl::OUString aStr( rMat.GetString(rIndex));
+ OUString aStr( rMat.GetString(rIndex));
if (bReverse)
while (rIndex > 0 && rMat.IsString(rIndex-1) &&
aStr == rMat.GetString(rIndex-1))
@@ -7099,7 +7099,7 @@ void ScInterpreter::CalculateLookup(bool HLookup)
//!!!!!!!
//! TODO: enable regex on matrix strings
//!!!!!!!
- const rtl::OUString& rParamStr = rItem.maString;
+ const OUString& rParamStr = rItem.maString;
if ( bSorted )
{
static CollatorWrapper* pCollator = ScGlobal::GetCollator();
@@ -7483,7 +7483,7 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField )
ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
sal_uInt32 nIndex = 0;
- const rtl::OUString& rQueryStr = rItem.maString;
+ const OUString& rQueryStr = rItem.maString;
bool bNumber = pFormatter->IsNumberFormat(
rQueryStr, nIndex, rItem.mfVal);
rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString;
@@ -8811,7 +8811,7 @@ void ScInterpreter::ScRept()
{
const xub_StrLen nLen = aStr.Len();
xub_StrLen n = (xub_StrLen) fAnz;
- rtl::OUStringBuffer aRes(n*nLen);
+ OUStringBuffer aRes(n*nLen);
while( n-- )
aRes.append(aStr);
PushString( aRes.makeStringAndClear() );
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 9279c18aa2e7..85d599c65d15 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2604,7 +2604,7 @@ void ScInterpreter::ScRoman()
sal_Int32 nPad = nDigit % 5;
if (nPad)
{
- rtl::OUStringBuffer aBuf(aRoman);
+ OUStringBuffer aBuf(aRoman);
comphelper::string::padToLength(aBuf, aBuf.getLength() + nPad,
pChars[nIndex]);
aRoman = aBuf.makeStringAndClear();
@@ -2851,7 +2851,7 @@ void ScInterpreter::ScEuroConvert()
double fToRate;
int nFromDec;
int nToDec;
- String aEur( RTL_CONSTASCII_USTRINGPARAM("EUR"));
+ String aEur( "EUR");
if ( lclConvertMoney( aFromUnit, fFromRate, nFromDec )
&& lclConvertMoney( aToUnit, fToRate, nToDec ) )
{
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index e4287493c8b8..30e845fd3797 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -294,7 +294,7 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
SetError( mnStringNoValueError);
return fValue;
}
- ::rtl::OUString aStr( rStr);
+ OUString aStr( rStr);
rtl_math_ConversionStatus eStatus;
sal_Int32 nParseEnd;
// Decimal and group separator 0 => only integer and possibly exponent,
@@ -744,7 +744,7 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
}
if (bOk)
{
- rtl::OString aTmp(rtl::OUStringToOString(aStr,
+ rtl::OString aTmp(OUStringToOString(aStr,
osl_getThreadTextEncoding()));
// In case the xub_StrLen will be longer than USHORT
// one day, and room for pad byte check.
@@ -870,7 +870,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
}
else
{
- rtl::OString aTmp(rtl::OUStringToOString(aStr,
+ rtl::OString aTmp(OUStringToOString(aStr,
osl_getThreadTextEncoding()));
// In case the xub_StrLen will be longer than USHORT
// one day, and room for pad byte check.
@@ -1495,7 +1495,7 @@ void ScInterpreter::PopExternalSingleRef(
return;
ScExternalRefManager* pRefMgr = pDok->GetExternalRefManager();
- const rtl::OUString* pFile = pRefMgr->getExternalFileName(rFileId);
+ const OUString* pFile = pRefMgr->getExternalFileName(rFileId);
if (!pFile)
{
SetError(errNoName);
@@ -1594,7 +1594,7 @@ void ScInterpreter::GetExternalDoubleRef(
sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rData, ScExternalRefCache::TokenArrayRef& rArray)
{
ScExternalRefManager* pRefMgr = pDok->GetExternalRefManager();
- const rtl::OUString* pFile = pRefMgr->getExternalFileName(nFileId);
+ const OUString* pFile = pRefMgr->getExternalFileName(nFileId);
if (!pFile)
{
SetError(errNoName);
@@ -1939,7 +1939,7 @@ void ScInterpreter::PushStringBuffer( const sal_Unicode* pString )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushStringBuffer" );
if ( pString )
- PushString( rtl::OUString(pString) );
+ PushString( OUString(pString) );
else
PushString( EMPTY_STRING );
}
@@ -2578,7 +2578,7 @@ void ScInterpreter::ScExternal()
break;
case PTR_STRING :
{
- rtl::OString aStr(rtl::OUStringToOString(GetString(),
+ rtl::OString aStr(OUStringToOString(GetString(),
osl_getThreadTextEncoding()));
if ( aStr.getLength() >= ADDIN_MAXSTRLEN )
SetError( errStringOverflow );
@@ -2788,7 +2788,7 @@ void ScInterpreter::ScExternal()
break;
case SC_ADDINARG_STRING:
- aParam <<= rtl::OUString( GetString() );
+ aParam <<= OUString( GetString() );
break;
case SC_ADDINARG_INTEGER_ARRAY:
@@ -2868,9 +2868,9 @@ void ScInterpreter::ScExternal()
case svString:
case svSingleRef:
{
- rtl::OUString aString = rtl::OUString( GetString() );
- uno::Sequence<rtl::OUString> aInner( &aString, 1 );
- uno::Sequence< uno::Sequence<rtl::OUString> > aOuter( &aInner, 1 );
+ OUString aString = OUString( GetString() );
+ uno::Sequence<OUString> aInner( &aString, 1 );
+ uno::Sequence< uno::Sequence<OUString> > aOuter( &aInner, 1 );
aParam <<= aOuter;
}
break;
@@ -2903,7 +2903,7 @@ void ScInterpreter::ScExternal()
if ( nStackType == svDouble )
aElem <<= (double) GetDouble();
else if ( nStackType == svString )
- aElem <<= rtl::OUString( GetString() );
+ aElem <<= OUString( GetString() );
else
{
ScAddress aAdr;
@@ -2914,7 +2914,7 @@ void ScInterpreter::ScExternal()
{
String aStr;
GetCellString( aStr, pCell );
- aElem <<= rtl::OUString( aStr );
+ aElem <<= OUString( aStr );
}
else
aElem <<= (double) GetCellValue( aAdr, pCell );
@@ -2952,7 +2952,7 @@ void ScInterpreter::ScExternal()
aParam <<= (double) GetDouble();
break;
case svString:
- aParam <<= rtl::OUString( GetString() );
+ aParam <<= OUString( GetString() );
break;
case svSingleRef:
{
@@ -2964,7 +2964,7 @@ void ScInterpreter::ScExternal()
{
String aStr;
GetCellString( aStr, pCell );
- aParam <<= rtl::OUString( aStr );
+ aParam <<= OUString( aStr );
}
else
aParam <<= (double) GetCellValue( aAdr, pCell );
@@ -3115,8 +3115,8 @@ static uno::Any lcl_getSheetModule( const uno::Reference<table::XCellRange>& xCe
{
uno::Reference< sheet::XSheetCellRange > xSheetRange( xCellRange, uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xProps( xSheetRange->getSpreadsheet(), uno::UNO_QUERY_THROW );
- rtl::OUString sCodeName;
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CodeName") ) ) >>= sCodeName;
+ OUString sCodeName;
+ xProps->getPropertyValue( OUString( "CodeName" ) ) >>= sCodeName;
// #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is possible
// to create a module ( and use 'Option VBASupport 1' ) for a calc document, in this scenario there
// are *NO* special document module objects ( of course being able to switch between vba/non vba mode at
@@ -3127,7 +3127,7 @@ static uno::Any lcl_getSheetModule( const uno::Reference<table::XCellRange>& xCe
uno::Reference< uno::XInterface > xIf;
if ( pBasMgr && !pBasMgr->GetName().isEmpty() )
{
- String sProj = String( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
+ String sProj = String( "Standard" );
if ( !pDok->GetDocumentShell()->GetBasicManager()->GetName().isEmpty() )
{
sProj = pDok->GetDocumentShell()->GetBasicManager()->GetName();
@@ -3158,7 +3158,7 @@ static bool lcl_setVBARange( ScRange& aRange, ScDocument* pDok, SbxVariable* pPa
xVBARange = ooo::vba::createVBAUnoAPIServiceWithArgs( pDok->GetDocumentShell(), "ooo.vba.excel.Range", aArgs );
if ( xVBARange.is() )
{
- String sDummy(RTL_CONSTASCII_USTRINGPARAM("A-Range") );
+ String sDummy("A-Range");
SbxObjectRef aObj = GetSbUnoObject( sDummy, uno::Any( xVBARange ) );
SetSbUnoObjectDfltPropName( aObj );
bOk = pPar->PutObject( aObj );
@@ -3473,13 +3473,13 @@ bool ScInterpreter::SetSbxVariable( SbxVariable* pVar, const ScAddress& rPos )
break;
case CELLTYPE_STRING :
{
- rtl::OUString aVal = ((ScStringCell*)pCell)->GetString();
+ OUString aVal = ((ScStringCell*)pCell)->GetString();
pVar->PutString( aVal );
break;
}
case CELLTYPE_EDIT :
{
- rtl::OUString aVal = ((ScEditCell*) pCell)->GetString();
+ OUString aVal = ((ScEditCell*) pCell)->GetString();
pVar->PutString( aVal );
break;
}
@@ -3494,7 +3494,7 @@ bool ScInterpreter::SetSbxVariable( SbxVariable* pVar, const ScAddress& rPos )
}
else
{
- rtl::OUString aVal = ((ScFormulaCell*)pCell)->GetString();
+ OUString aVal = ((ScFormulaCell*)pCell)->GetString();
pVar->PutString( aVal );
}
}
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index b3f80c949c43..065e7a9ba18d 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -351,7 +351,7 @@ struct CellBucket
SCSIZE mnNumValStart;
SCSIZE mnStrValStart;
std::vector<double> maNumVals;
- std::vector<rtl::OUString> maStrVals;
+ std::vector<OUString> maStrVals;
CellBucket() : mnNumValStart(0), mnStrValStart(0) {}
@@ -365,7 +365,7 @@ struct CellBucket
}
else if (!maStrVals.empty())
{
- const rtl::OUString* p = &maStrVals[0];
+ const OUString* p = &maStrVals[0];
rMat.PutString(p, maStrVals.size(), nCol, mnStrValStart);
reset();
}
@@ -3298,7 +3298,7 @@ void ScInterpreter::ScMatRef()
PushDouble( pCell->GetValue() );
else
{
- rtl::OUString aVal = pCell->GetString();
+ OUString aVal = pCell->GetString();
PushString( aVal );
}
pDok->GetNumberFormatInfo( nCurFmtType, nCurFmtIndex, aAdr, pCell );
@@ -3318,11 +3318,11 @@ void ScInterpreter::ScInfo()
String aStr = GetString();
ScCellKeywordTranslator::transKeyword(aStr, ScGlobal::GetLocale(), ocInfo);
if( aStr.EqualsAscii( "SYSTEM" ) )
- PushString( String( RTL_CONSTASCII_USTRINGPARAM( SC_INFO_OSVERSION ) ) );
+ PushString( String( SC_INFO_OSVERSION ) );
else if( aStr.EqualsAscii( "OSVERSION" ) )
- PushString( String( RTL_CONSTASCII_USTRINGPARAM( "Windows (32-bit) NT 5.01" ) ) );
+ PushString( String( "Windows (32-bit) NT 5.01" ) );
else if( aStr.EqualsAscii( "RELEASE" ) )
- PushString( ::utl::Bootstrap::getBuildIdData( ::rtl::OUString() ) );
+ PushString( ::utl::Bootstrap::getBuildIdData( OUString() ) );
else if( aStr.EqualsAscii( "NUMFILE" ) )
PushDouble( 1 );
else if( aStr.EqualsAscii( "RECALC" ) )
diff --git a/sc/source/core/tool/navicfg.cxx b/sc/source/core/tool/navicfg.cxx
index baf752bad6f3..6ea645aa9cc6 100644
--- a/sc/source/core/tool/navicfg.cxx
+++ b/sc/source/core/tool/navicfg.cxx
@@ -26,7 +26,7 @@
//------------------------------------------------------------------
ScNavipiCfg::ScNavipiCfg() :
-//! ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_NAVIPI )) ),
+//! ConfigItem( OUString( CFGPATH_NAVIPI ) ),
nListMode(0),
nDragMode(0),
nRootType(0)
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index f5d6a2c63124..154ac47868a8 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -94,7 +94,7 @@ ScTpPrintItem::~ScTpPrintItem()
String ScTpPrintItem::GetValueText() const
{
- return rtl::OUString("ScTpPrintItem");
+ return OUString("ScTpPrintItem");
}
int ScTpPrintItem::operator==( const SfxPoolItem& rItem ) const
@@ -134,7 +134,7 @@ Sequence<OUString> ScPrintCfg::GetPropertyNames()
}
ScPrintCfg::ScPrintCfg() :
- ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_PRINT )) )
+ ConfigItem( OUString( CFGPATH_PRINT ) )
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx
index 76457e6732cc..28f342af6473 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -37,7 +37,7 @@ const sal_Unicode cDelim = 0x01; // Delimiter zwischen From und To
// --- ScUnitConverterData --------------------------------------------
ScUnitConverterData::ScUnitConverterData(
- const rtl::OUString& rFromUnit, const rtl::OUString& rToUnit, double fValue ) :
+ const OUString& rFromUnit, const OUString& rToUnit, double fValue ) :
maIndexString(BuildIndexString(rFromUnit, rToUnit)),
mfValue(fValue) {}
@@ -52,15 +52,15 @@ double ScUnitConverterData::GetValue() const
return mfValue;
}
-const rtl::OUString& ScUnitConverterData::GetIndexString() const
+const OUString& ScUnitConverterData::GetIndexString() const
{
return maIndexString;
}
-rtl::OUString ScUnitConverterData::BuildIndexString(
- const rtl::OUString& rFromUnit, const rtl::OUString& rToUnit )
+OUString ScUnitConverterData::BuildIndexString(
+ const OUString& rFromUnit, const OUString& rToUnit )
{
- rtl::OUStringBuffer aBuf(rFromUnit);
+ OUStringBuffer aBuf(rFromUnit);
aBuf.append(cDelim);
aBuf.append(rToUnit);
return aBuf.makeStringAndClear();
@@ -78,7 +78,7 @@ ScUnitConverter::ScUnitConverter()
// read from configuration - "convert.ini" is no longer used
//! config item as member to allow change of values
- ScLinkConfigItem aConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_UNIT )) );
+ ScLinkConfigItem aConfigItem( OUString( CFGPATH_UNIT ) );
// empty node name -> use the config item's path itself
OUString aEmptyString;
@@ -99,11 +99,11 @@ ScUnitConverter::ScUnitConverter()
sPrefix += sSlash;
pValNameArray[nIndex] = sPrefix;
- pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_FROM ));
+ pValNameArray[nIndex++] += OUString( CFGSTR_UNIT_FROM );
pValNameArray[nIndex] = sPrefix;
- pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_TO ));
+ pValNameArray[nIndex++] += OUString( CFGSTR_UNIT_TO );
pValNameArray[nIndex] = sPrefix;
- pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_FACTOR ));
+ pValNameArray[nIndex++] += OUString( CFGSTR_UNIT_FACTOR );
}
Sequence<Any> aProperties = aConfigItem.GetProperties(aValNames);
@@ -124,7 +124,7 @@ ScUnitConverter::ScUnitConverter()
pProperties[nIndex++] >>= fFactor;
ScUnitConverterData* pNew = new ScUnitConverterData( sFromUnit, sToUnit, fFactor );
- rtl::OUString aIndex = pNew->GetIndexString();
+ OUString aIndex = pNew->GetIndexString();
maData.insert(aIndex, pNew);
}
}
@@ -134,9 +134,9 @@ ScUnitConverter::ScUnitConverter()
ScUnitConverter::~ScUnitConverter() {}
bool ScUnitConverter::GetValue(
- double& fValue, const rtl::OUString& rFromUnit, const rtl::OUString& rToUnit ) const
+ double& fValue, const OUString& rFromUnit, const OUString& rToUnit ) const
{
- rtl::OUString aIndex = ScUnitConverterData::BuildIndexString(rFromUnit, rToUnit);
+ OUString aIndex = ScUnitConverterData::BuildIndexString(rFromUnit, rToUnit);
MapType::const_iterator it = maData.find(aIndex);
if (it == maData.end())
{
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 64a4fec8c5ba..69b8cacabd8d 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -253,7 +253,7 @@ ScTpViewItem::~ScTpViewItem()
String ScTpViewItem::GetValueText() const
{
- return rtl::OUString("ScTpViewItem");
+ return OUString("ScTpViewItem");
}
//------------------------------------------------------------------------
@@ -388,10 +388,10 @@ Sequence<OUString> ScViewCfg::GetGridPropertyNames()
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
{
- pNames[SCGRIDOPT_RESOLU_X] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Resolution/XAxis/Metric" ));
- pNames[SCGRIDOPT_RESOLU_Y] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Resolution/YAxis/Metric" ));
- pNames[SCGRIDOPT_OPTION_X] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Option/XAxis/Metric" ));
- pNames[SCGRIDOPT_OPTION_Y] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Option/YAxis/Metric" ));
+ pNames[SCGRIDOPT_RESOLU_X] = OUString( "Resolution/XAxis/Metric" );
+ pNames[SCGRIDOPT_RESOLU_Y] = OUString( "Resolution/YAxis/Metric" );
+ pNames[SCGRIDOPT_OPTION_X] = OUString( "Option/XAxis/Metric" );
+ pNames[SCGRIDOPT_OPTION_Y] = OUString( "Option/YAxis/Metric" );
}
return aNames;
@@ -399,9 +399,9 @@ Sequence<OUString> ScViewCfg::GetGridPropertyNames()
ScViewCfg::ScViewCfg() :
- aLayoutItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_LAYOUT )) ),
- aDisplayItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_DISPLAY )) ),
- aGridItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_GRID )) )
+ aLayoutItem( OUString( CFGPATH_LAYOUT ) ),
+ aDisplayItem( OUString( CFGPATH_DISPLAY ) ),
+ aGridItem( OUString( CFGPATH_GRID ) )
{
sal_Int32 nIntVal = 0;
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index aecdcdd1aaba..2ffc0f661f7a 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -30,7 +30,7 @@ static const sal_Char pStandardName[] = "Standard";
//------------------------------------------------------------------------
ScNumFormatAbbrev::ScNumFormatAbbrev() :
- sFormatstring ( RTL_CONSTASCII_USTRINGPARAM( pStandardName ) ),
+ sFormatstring ( pStandardName ),
eLnge (LANGUAGE_SYSTEM),
eSysLnge (LANGUAGE_GERMAN) // sonst passt "Standard" nicht
{