[Libreoffice-commits] core.git: sc/source
Krisztian Pinter
pin.terminator at gmail.com
Mon Mar 4 11:34:10 PST 2013
sc/source/core/data/bcaslot.cxx | 2
sc/source/core/data/documen2.cxx | 22 ++--
sc/source/core/data/documen3.cxx | 78 +++++++--------
sc/source/core/data/documen5.cxx | 74 +++++++-------
sc/source/core/data/document.cxx | 102 +++++++++----------
sc/source/core/data/dpobject.cxx | 140 +++++++++++++--------------
sc/source/core/data/dpsave.cxx | 94 +++++++++---------
sc/source/core/data/dptabsrc.cxx | 154 +++++++++++++++---------------
sc/source/core/data/funcdesc.cxx | 124 ++++++++++++------------
sc/source/core/data/table3.cxx | 40 +++----
sc/source/core/data/tabprotection.cxx | 6 -
sc/source/core/tool/addincfg.cxx | 6 -
sc/source/core/tool/appoptio.cxx | 16 +--
sc/source/core/tool/autoform.cxx | 10 -
sc/source/core/tool/callform.cxx | 40 +++----
sc/source/core/tool/cellform.cxx | 26 ++---
sc/source/core/tool/charthelper.cxx | 30 ++---
sc/source/core/tool/compiler.cxx | 116 +++++++++++-----------
sc/source/core/tool/consoli.cxx | 2
sc/source/core/tool/dbdata.cxx | 20 +--
sc/source/core/tool/defaultsoptions.cxx | 4
sc/source/core/tool/docoptio.cxx | 8 -
sc/source/core/tool/filtopt.cxx | 2
sc/source/core/tool/formulaopt.cxx | 20 +--
sc/source/core/tool/formulaparserpool.cxx | 2
sc/source/core/tool/inputopt.cxx | 2
sc/source/core/tool/interpr1.cxx | 62 ++++++------
sc/source/core/tool/interpr2.cxx | 4
sc/source/core/tool/interpr4.cxx | 44 ++++----
sc/source/core/tool/interpr5.cxx | 12 +-
sc/source/core/tool/navicfg.cxx | 2
sc/source/core/tool/printopt.cxx | 4
sc/source/core/tool/unitconv.cxx | 24 ++--
sc/source/core/tool/viewopti.cxx | 16 +--
sc/source/core/tool/zforauto.cxx | 2
35 files changed, 655 insertions(+), 655 deletions(-)
New commits:
commit 429adbbe0d46716bc128ff8f066aae3cfc793b49
Author: Krisztian Pinter <pin.terminator at gmail.com>
Date: Thu Feb 28 19:11:16 2013 +0100
RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
Change-Id: Ica78f316d481130c28da83f92561206518342eaa
Reviewed-on: https://gerrit.libreoffice.org/2483
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 2a0ca67..0f5b657 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 b034bbf..10428e8 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 9145356..5fa9f7a 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 d2bcac1..b769c4d 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 543096e..8cfc787 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 e75e1d5..c31a414 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 981eace..8680726 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 db21a6b..20ff80b 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 },
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list