diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /sc/source/core | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'sc/source/core')
91 files changed, 649 insertions, 694 deletions
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index d52bcc69a258..fbb74439c89c 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -97,7 +97,7 @@ void ScAttrArray::TestData() const if (nErr) { - rtl::OStringBuffer aMsg; + OStringBuffer aMsg; aMsg.append(static_cast<sal_Int32>(nErr)); aMsg.append(RTL_CONSTASCII_STRINGPARAM( " errors in attribute array, column ")); diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index ef9b490d946b..363c609fdd83 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -127,7 +127,7 @@ ScMergeAttr::~ScMergeAttr() String ScMergeAttr::GetValueText() const { - rtl::OUStringBuffer aString; + OUStringBuffer aString; aString.append('('); aString.append(static_cast<sal_Int32>(nColMerge)); aString.append(','); @@ -716,7 +716,7 @@ bool ScPageHFItem::PutValue( const uno::Any& rVal, sal_uInt8 /* nMemberId */ ) String ScPageHFItem::GetValueText() const { - return rtl::OUString("ScPageHFItem"); + return OUString("ScPageHFItem"); } //------------------------------------------------------------------------ @@ -1067,7 +1067,7 @@ ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem ) String ScDoubleItem::GetValueText() const { - return rtl::OUString("ScDoubleItem"); + return OUString("ScDoubleItem"); } //------------------------------------------------------------------------ diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 3862e8864a5e..0bde4bf2080b 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -183,9 +183,9 @@ bool ScBaseCell::HasStringData() const } } -rtl::OUString ScBaseCell::GetStringData() const +OUString ScBaseCell::GetStringData() const { - rtl::OUString aStr; + OUString aStr; switch ( eCellType ) { case CELLTYPE_STRING: @@ -231,7 +231,7 @@ ScValueCell::~ScValueCell() // ============================================================================ -ScStringCell::ScStringCell( const rtl::OUString& rString ) : +ScStringCell::ScStringCell( const OUString& rString ) : ScBaseCell( CELLTYPE_STRING ), maString( rString.intern() ) { diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx index 9d8b1b9de07d..8345e488f980 100644 --- a/sc/source/core/data/cell2.cxx +++ b/sc/source/core/data/cell2.cxx @@ -109,10 +109,10 @@ OUString ScEditCell::GetString() const // Also Text from URL fields, Doc-Engine is a ScFieldEditEngine EditEngine& rEngine = mpDoc->GetEditEngine(); rEngine.SetText(*mpData); - rtl::OUString sRet = ScEditUtil::GetMultilineString(rEngine); // string with line separators between paragraphs + OUString sRet = ScEditUtil::GetMultilineString(rEngine); // string with line separators between paragraphs // cache short strings for formulas if ( sRet.getLength() < 256 ) - mpString = new rtl::OUString(sRet); //! non-const + mpString = new OUString(sRet); //! non-const return sRet; } diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index c9aa3cbc86ae..d97e6694d023 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -82,7 +82,7 @@ ScColorScaleEntry::~ScColorScaleEntry() mpCell->EndListeningTo(mpCell->GetDocument()); } -void ScColorScaleEntry::SetFormula( const rtl::OUString& rFormula, ScDocument* pDoc, const ScAddress& rAddr, formula::FormulaGrammar::Grammar eGrammar ) +void ScColorScaleEntry::SetFormula( const OUString& rFormula, ScDocument* pDoc, const ScAddress& rAddr, formula::FormulaGrammar::Grammar eGrammar ) { mpCell.reset(new ScFormulaCell( pDoc, rAddr, rFormula, eGrammar )); mpCell->StartListeningTo( pDoc ); @@ -98,9 +98,9 @@ const ScTokenArray* ScColorScaleEntry::GetFormula() const return NULL; } -rtl::OUString ScColorScaleEntry::GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const +OUString ScColorScaleEntry::GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const { - rtl::OUString aFormula; + OUString aFormula; if(mpCell) { mpCell->GetFormula(aFormula, eGrammar); diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 0aa3b175f47e..90b0927d78ec 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1514,7 +1514,7 @@ void ScColumn::CopyToColumn( // empty cell. if (pNew->GetCellType() == CELLTYPE_STRING) { - rtl::OUString aStr = static_cast<ScStringCell*>(pNew)->GetString(); + OUString aStr = static_cast<ScStringCell*>(pNew)->GetString(); if (aStr.isEmpty()) // A string cell with empty string. Delete the cell itself. rColumn.Delete(maItems[i].nRow); diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 47013b74c086..946676ad5e9a 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -244,7 +244,7 @@ long ScColumn::GetNeededSize( if (!bEditEngine) // direct output { Color* pColor; - rtl::OUString aValStr; + OUString aValStr; ScCellFormat::GetString( aCell, nFormat, aValStr, &pColor, *pFormatter, true, rOptions.bFormula, ftCheck); @@ -561,7 +561,7 @@ sal_uInt16 ScColumn::GetOptimalColWidth( // Try to find the row that has the longest string, and measure the width of that string. SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter ); - rtl::OUString aLongStr; + OUString aLongStr; Color* pColor; if (pParam->mnMaxTextRow >= 0) { diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 06472a4accb9..e66f74deecbe 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -54,8 +54,6 @@ #include <cstdio> using ::com::sun::star::i18n::LocaleDataItem; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // Err527 Workaroand extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx @@ -852,10 +850,10 @@ ScBaseCell* ScColumn::CloneCell( if ( bCloneSpecialBoolean ) { ScFormulaCell& rForm = (ScFormulaCell&)rSource; - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; // FIXME: do we have a localisation issue here? rForm.GetFormula( aBuf ); - rtl::OUString aVal( aBuf.makeStringAndClear() ); + OUString aVal( aBuf.makeStringAndClear() ); if ( aVal == "=TRUE()" || aVal == "=FALSE()" ) bForceFormula = true; } @@ -1526,7 +1524,7 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, std::vector<ScTy { bool bHasDates = false; SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); - rtl::OUString aString; + OUString aString; SCSIZE nIndex; Search( nStartRow, nIndex ); @@ -1753,7 +1751,7 @@ void ScColumn::SetValue( SCROW nRow, const double& rVal) } -void ScColumn::GetString( SCROW nRow, rtl::OUString& rString ) const +void ScColumn::GetString( SCROW nRow, OUString& rString ) const { SCSIZE nIndex; Color* pColor; @@ -1799,7 +1797,7 @@ double* ScColumn::GetValueCell( SCROW nRow ) return static_cast<ScValueCell*>(pCell)->GetValuePtr(); } -void ScColumn::GetInputString( SCROW nRow, rtl::OUString& rString ) const +void ScColumn::GetInputString( SCROW nRow, OUString& rString ) const { SCSIZE nIndex; if (Search(nRow, nIndex)) @@ -1812,10 +1810,10 @@ void ScColumn::GetInputString( SCROW nRow, rtl::OUString& rString ) const ScCellFormat::GetInputString(aCell, nFormat, rString, *(pDocument->GetFormatTable())); } else - rString = rtl::OUString(); + rString = OUString(); } else - rString = rtl::OUString(); + rString = OUString(); } @@ -1873,7 +1871,7 @@ void ScColumn::RemoveEditTextCharAttribs( SCROW nRow, const ScPatternAttr& rAttr pEditCell->RemoveCharAttribs(rAttr); } -void ScColumn::GetFormula( SCROW nRow, rtl::OUString& rFormula ) const +void ScColumn::GetFormula( SCROW nRow, OUString& rFormula ) const { SCSIZE nIndex; if (Search(nRow, nIndex)) @@ -1882,10 +1880,10 @@ void ScColumn::GetFormula( SCROW nRow, rtl::OUString& rFormula ) const if (pCell->GetCellType() == CELLTYPE_FORMULA) ((ScFormulaCell*)pCell)->GetFormula( rFormula ); else - rFormula = rtl::OUString(); + rFormula = OUString(); } else - rFormula = rtl::OUString(); + rFormula = OUString(); } const ScTokenArray* ScColumn::GetFormulaTokens( SCROW nRow ) const @@ -1976,8 +1974,8 @@ sal_Int32 ScColumn::GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCh sal_Int32 nStringLen = 0; if ( !maItems.empty() ) { - rtl::OUString aString; - rtl::OString aOString; + OUString aString; + OString aOString; bool bIsOctetTextEncoding = rtl_isOctetTextEncoding( eCharSet); SvNumberFormatter* pNumFmt = pDocument->GetFormatTable(); SCSIZE nIndex; @@ -2030,7 +2028,7 @@ xub_StrLen ScColumn::GetMaxNumberStringLen( if ( !maItems.empty() ) { - rtl::OUString aString; + OUString aString; SvNumberFormatter* pNumFmt = pDocument->GetFormatTable(); SCSIZE nIndex; SCROW nRow; @@ -2202,7 +2200,7 @@ void ScColumn::RebuildFormulaGroups() #if OSL_DEBUG_LEVEL > 0 if ( maDoubles.size() + maFnGroups.size() > 0 ) { - rtl::OUString aStr; + OUString aStr; fprintf( stderr, "column %2d has %2d double span(s): ", (int)nCol, (int)maDoubles.size() ); for (std::vector< ColDoubleEntry *>::iterator it = maDoubles.begin(); it != maDoubles.end(); ++it ) diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index be84d583af81..f898cfef0906 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -210,8 +210,8 @@ ScConditionEntry::ScConditionEntry( ScDocument* pDocument, const ScConditionEntr } ScConditionEntry::ScConditionEntry( ScConditionMode eOper, - const rtl::OUString& rExpr1, const rtl::OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, - const rtl::OUString& rExprNmsp1, const rtl::OUString& rExprNmsp2, + const OUString& rExpr1, const OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2 ) : ScFormatEntry(pDocument), eOp(eOper), @@ -322,8 +322,8 @@ ScConditionEntry::~ScConditionEntry() delete pFormula2; } -void ScConditionEntry::Compile( const rtl::OUString& rExpr1, const rtl::OUString& rExpr2, - const rtl::OUString& rExprNmsp1, const rtl::OUString& rExprNmsp2, +void ScConditionEntry::Compile( const OUString& rExpr1, const OUString& rExpr2, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2, bool bTextToReal ) { if ( !rExpr1.isEmpty() || !rExpr2.isEmpty() ) @@ -455,7 +455,7 @@ void ScConditionEntry::CompileXML() if ( aNew.Parse( aSrcString, mpDoc ) & SCA_VALID ) aSrcPos = aNew; // if the position is invalid, there isn't much we can do at this time - aSrcString = rtl::OUString(); + aSrcString = OUString(); } // Convert the text tokens that were created during XML import into real tokens. @@ -465,7 +465,7 @@ void ScConditionEntry::CompileXML() aStrNmsp1, aStrNmsp2, eTempGrammar1, eTempGrammar2, true ); } -void ScConditionEntry::SetSrcString( const rtl::OUString& rNew ) +void ScConditionEntry::SetSrcString( const OUString& rNew ) { // aSrcString is only evaluated in CompileXML SAL_WARN_IF( !mpDoc->IsImportingXML(), "sc", "SetSrcString is only valid for XML import" ); @@ -681,7 +681,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) { bIsStr1 = false; nVal1 = pEff1->GetValue(); - aStrVal1 = rtl::OUString(); + aStrVal1 = OUString(); } else { @@ -710,7 +710,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) { bIsStr2 = false; nVal2 = pEff2->GetValue(); - aStrVal2 = rtl::OUString(); + aStrVal2 = OUString(); } else { @@ -831,7 +831,7 @@ void ScConditionEntry::FillCache() const } } -bool ScConditionEntry::IsDuplicate( double nArg, const rtl::OUString& rStr ) const +bool ScConditionEntry::IsDuplicate( double nArg, const OUString& rStr ) const { FillCache(); @@ -1069,7 +1069,7 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const case SC_COND_NOTDUPLICATE: if( pCondFormat ) { - bValid = IsDuplicate( nArg, rtl::OUString() ); + bValid = IsDuplicate( nArg, OUString() ); if( eOp == SC_COND_NOTDUPLICATE ) bValid = !bValid; } @@ -1106,26 +1106,26 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const case SC_COND_BEGINS_WITH: if(aStrVal1.isEmpty()) { - rtl::OUString aStr = rtl::OUString::valueOf(nVal1); - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr = OUString::valueOf(nVal1); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStr) == 0; } else { - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStrVal1) == 0; } break; case SC_COND_ENDS_WITH: if(aStrVal1.isEmpty()) { - rtl::OUString aStr = rtl::OUString::valueOf(nVal1); - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr = OUString::valueOf(nVal1); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.endsWith(aStr) == 0; } else { - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.endsWith(aStrVal1) == 0; } break; @@ -1133,13 +1133,13 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const case SC_COND_NOT_CONTAINS_TEXT: if(aStrVal1.isEmpty()) { - rtl::OUString aStr = rtl::OUString::valueOf(nVal1); - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr = OUString::valueOf(nVal1); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStr) != -1; } else { - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStrVal1) != -1; } @@ -1153,7 +1153,7 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const return bValid; } -bool ScConditionEntry::IsValidStr( const rtl::OUString& rArg, const ScAddress& rPos ) const +bool ScConditionEntry::IsValidStr( const OUString& rArg, const ScAddress& rPos ) const { bool bValid = false; // Interpret muss schon gerufen sein @@ -1180,15 +1180,15 @@ bool ScConditionEntry::IsValidStr( const rtl::OUString& rArg, const ScAddress& r if ( !bIsStr2 ) return false; - rtl::OUString aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen) - rtl::OUString aUpVal2( aStrVal2 ); + OUString aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen) + OUString aUpVal2( aStrVal2 ); if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN ) if ( ScGlobal::GetCollator()->compareString( aUpVal1, aUpVal2 ) == COMPARE_GREATER ) { // richtige Reihenfolge fuer Wertebereich - rtl::OUString aTemp( aUpVal1 ); aUpVal1 = aUpVal2; aUpVal2 = aTemp; + OUString aTemp( aUpVal1 ); aUpVal1 = aUpVal2; aUpVal2 = aTemp; } switch ( eOp ) @@ -1269,7 +1269,7 @@ bool ScConditionEntry::IsCellValid( ScRefCellValue& rCell, const ScAddress& rPos ((ScConditionEntry*)this)->Interpret(rPos); // Formeln auswerten double nArg = 0.0; - rtl::OUString aArgStr; + OUString aArgStr; bool bVal = lcl_GetCellContent( rCell, bIsStr1, nArg, aArgStr ); if (bVal) return IsValid( nArg, rPos ); @@ -1277,12 +1277,12 @@ bool ScConditionEntry::IsCellValid( ScRefCellValue& rCell, const ScAddress& rPos return IsValidStr( aArgStr, rPos ); } -rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uInt16 nIndex, +OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uInt16 nIndex, sal_uLong nNumFmt, const FormulaGrammar::Grammar eGrammar ) const { assert( nIndex <= 1); - rtl::OUString aRet; + OUString aRet; if ( FormulaGrammar::isEnglish( eGrammar) && nNumFmt == 0 ) nNumFmt = mpDoc->GetFormatTable()->GetStandardIndex( LANGUAGE_ENGLISH_US ); @@ -1293,7 +1293,7 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn { ScCompiler aComp(mpDoc, rCursor, *pFormula1); aComp.SetGrammar(eGrammar); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aComp.CreateStringFromTokenArray( aBuffer ); aRet = aBuffer.makeStringAndClear(); } @@ -1312,7 +1312,7 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn { ScCompiler aComp(mpDoc, rCursor, *pFormula2); aComp.SetGrammar(eGrammar); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aComp.CreateStringFromTokenArray( aBuffer ); aRet = aBuffer.makeStringAndClear(); } @@ -1579,10 +1579,10 @@ void ScConditionEntry::endRendering() //------------------------------------------------------------------------ ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper, - const rtl::OUString& rExpr1, const rtl::OUString& rExpr2, + const OUString& rExpr1, const OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, - const rtl::OUString& rStyle, - const rtl::OUString& rExprNmsp1, const rtl::OUString& rExprNmsp2, + const OUString& rStyle, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2 ) : ScConditionEntry( eOper, rExpr1, rExpr2, pDocument, rPos, rExprNmsp1, rExprNmsp2, eGrammar1, eGrammar2 ), @@ -1593,7 +1593,7 @@ ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper, ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper, const ScTokenArray* pArr1, const ScTokenArray* pArr2, ScDocument* pDocument, const ScAddress& rPos, - const rtl::OUString& rStyle ) : + const OUString& rStyle ) : ScConditionEntry( eOper, pArr1, pArr2, pDocument, rPos ), aStyleName( rStyle ) { @@ -1783,12 +1783,12 @@ condformat::ScCondFormatDateType ScCondDateFormatEntry::GetDateType() const return meType; } -const rtl::OUString& ScCondDateFormatEntry::GetStyleName() const +const OUString& ScCondDateFormatEntry::GetStyleName() const { return maStyleName; } -void ScCondDateFormatEntry::SetStyleName( const rtl::OUString& rStyleName ) +void ScCondDateFormatEntry::SetStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; } @@ -2005,7 +2005,7 @@ void ScConditionalFormat::DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR maRanges.DeleteArea( nCol1, nRow1, nTab, nCol2, nRow2, nTab ); } -void ScConditionalFormat::RenameCellStyle(const rtl::OUString& rOld, const rtl::OUString& rNew) +void ScConditionalFormat::RenameCellStyle(const OUString& rOld, const OUString& rNew) { for(CondFormatContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) if(itr->GetType() == condformat::CONDITION) @@ -2164,7 +2164,7 @@ void ScConditionalFormatList::UpdateReference( UpdateRefMode eUpdateRefMode, } } -void ScConditionalFormatList::RenameCellStyle( const rtl::OUString& rOld, const rtl::OUString& rNew ) +void ScConditionalFormatList::RenameCellStyle( const OUString& rOld, const OUString& rNew ) { for( iterator itr = begin(); itr != end(); ++itr) itr->RenameCellStyle(rOld,rNew); diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 553c38f2aa5d..5228bc1d45f9 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -1498,7 +1498,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch() if (pCol->Search( nRow, nLo ) && bFirstStringIgnore && pCol->maItems[nLo].pCell->HasStringData()) { - rtl::OUString aCellStr; + OUString aCellStr; sal_uLong nFormat = pCol->GetNumberFormat( pCol->maItems[nLo].nRow); aCell.assign(*pCol->maItems[nLo].pCell); ScCellFormat::GetInputString(aCell, nFormat, aCellStr, rFormatter); @@ -1631,7 +1631,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch() } else if (bStr && bByString) { - rtl::OUString aCellStr; + OUString aCellStr; sal_uLong nFormat = pCol->GetNumberFormat( pCol->maItems[i].nRow); aCell.assign(*pCol->maItems[i].pCell); ScCellFormat::GetInputString(aCell, nFormat, aCellStr, rFormatter); diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index ea867f97e718..00ce7349d062 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -186,7 +186,7 @@ static SfxItemInfo const aItemInfos[] = ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) - : SfxItemPool ( rtl::OUString("ScDocumentPool"), + : SfxItemPool ( OUString("ScDocumentPool"), ATTR_STARTINDEX, ATTR_ENDINDEX, aItemInfos, NULL, bLoadRefCounts ), pSecondary ( pSecPool ) @@ -282,7 +282,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) ppPoolDefaults[ ATTR_SHADOW - ATTR_STARTINDEX ] = new SvxShadowItem( ATTR_SHADOW ); ppPoolDefaults[ ATTR_VALIDDATA - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALIDDATA, 0 ); ppPoolDefaults[ ATTR_CONDITIONAL - ATTR_STARTINDEX ] = new ScCondFormatItem; - ppPoolDefaults[ ATTR_HYPERLINK - ATTR_STARTINDEX ] = new SfxStringItem( ATTR_HYPERLINK, rtl::OUString() ) ; + ppPoolDefaults[ ATTR_HYPERLINK - ATTR_STARTINDEX ] = new SfxStringItem( ATTR_HYPERLINK, OUString() ) ; // GetRscString funktioniert erst nach ScGlobal::Init, zu erkennen am EmptyBrushItem //! zusaetzliche Methode ScGlobal::IsInit() oder so... @@ -291,7 +291,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); else ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, - rtl::OUString(STRING_STANDARD) ); //! without name? + OUString(STRING_STANDARD) ); //! without name? ppPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE ); ppPoolDefaults[ ATTR_ULSPACE - ATTR_STARTINDEX ] = new SvxULSpaceItem( ATTR_ULSPACE ); diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index ea13837ca181..5ce49e205ab0 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -52,7 +52,7 @@ using namespace formula; // Nach der Regula Falsi Methode bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, SCCOL nVCol, SCROW nVRow, SCTAB nVTab, - const rtl::OUString& sValStr, double& nX) + const OUString& sValStr, double& nX) { bool bRet = false; nX = 0.0; @@ -115,7 +115,7 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, - const rtl::OUString& rFormula, + const OUString& rFormula, const ScTokenArray* pArr, const formula::FormulaGrammar::Grammar eGram, bool bDirtyFlag ) @@ -227,7 +227,7 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera } ScRefAddress aRef; - rtl::OUStringBuffer aForString('='); + OUStringBuffer aForString('='); aForString.append(ScCompiler::GetNativeSymbol(ocTableOp)); aForString.append(ScCompiler::GetNativeSymbol( ocOpen)); @@ -636,7 +636,7 @@ const SfxPoolItem* ScDocument::GetEffItem( ScAddress aPos(nCol, nRow, nTab); ScRefCellValue aCell; aCell.assign(const_cast<ScDocument&>(*this), aPos); - rtl::OUString aStyle = pForm->GetCellStyle(aCell, aPos); + OUString aStyle = pForm->GetCellStyle(aCell, aPos); if (!aStyle.isEmpty()) { SfxStyleSheetBase* pStyleSheet = xPoolHelper->GetStylePool()->Find( @@ -964,8 +964,8 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) SCTAB nThisTab; // Tabellen mit gleichen Namen vergleichen - rtl::OUString aThisName; - rtl::OUString aOtherName; + OUString aThisName; + OUString aOtherName; for (nThisTab=0; nThisTab<nThisCount; nThisTab++) { SCTAB nOtherTab = SCTAB_MAX; @@ -1034,11 +1034,11 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) sal_uLong n1,n2; // fuer AppendDeleteRange //! ein Progress ueber alle Tabellen ??? - rtl::OUString aTabName; + OUString aTabName; GetName( nThisTab, aTabName ); - rtl::OUString aTemplate = ScGlobal::GetRscString(STR_PROGRESS_COMPARING); + OUString aTemplate = ScGlobal::GetRscString(STR_PROGRESS_COMPARING); sal_Int32 nIndex = 0; - rtl::OUStringBuffer aProText = aTemplate.getToken( 0, '#', nIndex ); + OUStringBuffer aProText = aTemplate.getToken( 0, '#', nIndex ); aProText.append(aTabName); nIndex = 0; aProText.append(aTemplate.getToken( 1, '#', nIndex )); diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index 055598cfb56f..fbd00bc61869 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -53,7 +53,7 @@ const uno::Reference< i18n::XBreakIterator >& ScDocument::GetBreakIterator() return pScriptTypeData->xBreakIter; } -bool ScDocument::HasStringWeakCharacters( const rtl::OUString& rString ) +bool ScDocument::HasStringWeakCharacters( const OUString& rString ) { if (!rString.isEmpty()) { @@ -78,7 +78,7 @@ bool ScDocument::HasStringWeakCharacters( const rtl::OUString& rString ) return false; // none found } -sal_uInt8 ScDocument::GetStringScriptType( const rtl::OUString& rString ) +sal_uInt8 ScDocument::GetStringScriptType( const OUString& rString ) { sal_uInt8 nRet = 0; diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 5fe23dc5f75a..f8742e0adc0f 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -326,7 +326,7 @@ void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc ) //------------------------------------------------------------------------ -void ScDocument::InvalidateTextWidth( const rtl::OUString& rStyleName ) +void ScDocument::InvalidateTextWidth( const OUString& rStyleName ) { const SCTAB nCount = GetTableCount(); for ( SCTAB i=0; i<nCount && maTabs[i]; i++ ) @@ -345,7 +345,7 @@ void ScDocument::InvalidateTextWidth( SCTAB nTab ) //------------------------------------------------------------------------ -bool ScDocument::IsPageStyleInUse( const rtl::OUString& rStrPageStyle, SCTAB* pInTab ) +bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab ) { bool bInUse = false; const SCTAB nCount = GetTableCount(); @@ -362,7 +362,7 @@ bool ScDocument::IsPageStyleInUse( const rtl::OUString& rStrPageStyle, SCTAB* pI //------------------------------------------------------------------------ -bool ScDocument::RemovePageStyleInUse( const rtl::OUString& rStyle ) +bool ScDocument::RemovePageStyleInUse( const OUString& rStyle ) { bool bWasInUse = false; const SCTAB nCount = GetTableCount(); @@ -377,7 +377,7 @@ bool ScDocument::RemovePageStyleInUse( const rtl::OUString& rStyle ) return bWasInUse; } -bool ScDocument::RenamePageStyleInUse( const rtl::OUString& rOld, const rtl::OUString& rNew ) +bool ScDocument::RenamePageStyleInUse( const OUString& rOld, const OUString& rNew ) { bool bWasInUse = false; const SCTAB nCount = GetTableCount(); @@ -398,7 +398,7 @@ sal_uInt8 ScDocument::GetEditTextDirection(SCTAB nTab) const { EEHorizontalTextDirection eRet = EE_HTEXTDIR_DEFAULT; - rtl::OUString aStyleName = GetPageStyle( nTab ); + OUString aStyleName = GetPageStyle( nTab ); SfxStyleSheetBase* pStyle = xPoolHelper->GetStylePool()->Find( aStyleName, SFX_STYLE_FAMILY_PAGE ); if ( pStyle ) { @@ -1110,13 +1110,13 @@ void ScDocument::UpdateExternalRefLinks(Window* pWin) { // Update failed. Notify the user. - rtl::OUString aFile; + OUString aFile; pLinkManager->GetDisplayNames(pRefLink, NULL, &aFile, NULL, NULL); // Decode encoded URL for display friendliness. INetURLObject aUrl(aFile,INetURLObject::WAS_ENCODED); aFile = aUrl.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(String(ScResId(SCSTR_EXTDOC_NOT_LOADED))); aBuf.appendAscii("\n\n"); aBuf.append(aFile); @@ -1166,11 +1166,11 @@ void ScDocument::UpdateDdeLinks(Window* pWin) else { // Update failed. Notify the user. - rtl::OUString aFile = pDdeLink->GetTopic(); - rtl::OUString aElem = pDdeLink->GetItem(); - rtl::OUString aType = pDdeLink->GetAppl(); + OUString aFile = pDdeLink->GetTopic(); + OUString aElem = pDdeLink->GetItem(); + OUString aType = pDdeLink->GetAppl(); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(String(ScResId(SCSTR_DDEDOC_NOT_LOADED))); aBuf.appendAscii("\n\n"); aBuf.appendAscii("Source : "); @@ -1198,7 +1198,7 @@ void ScDocument::UpdateDdeLinks(Window* pWin) } } -bool ScDocument::UpdateDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem ) +bool ScDocument::UpdateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem ) { // fuer refresh() per StarOne Api // ResetValue() fuer einzelnen Link nicht noetig @@ -1215,9 +1215,9 @@ bool ScDocument::UpdateDdeLink( const rtl::OUString& rAppl, const rtl::OUString& if (pBase->ISA(ScDdeLink)) { ScDdeLink* pDdeLink = (ScDdeLink*)pBase; - if ( rtl::OUString(pDdeLink->GetAppl()) == rAppl && - rtl::OUString(pDdeLink->GetTopic()) == rTopic && - rtl::OUString(pDdeLink->GetItem()) == rItem ) + if ( OUString(pDdeLink->GetAppl()) == rAppl && + OUString(pDdeLink->GetTopic()) == rTopic && + OUString(pDdeLink->GetItem()) == rItem ) { pDdeLink->TryUpdate(); bFound = true; // koennen theoretisch mehrere sein (Mode), darum weitersuchen @@ -1296,7 +1296,7 @@ namespace { @return The DDE link, if it exists, otherwise 0. */ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, - const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem, sal_uInt8 nMode, + const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, sal_uInt16* pnDdePos = NULL ) { if( pLinkManager ) @@ -1309,9 +1309,9 @@ ScDdeLink* lclGetDdeLink( ::sfx2::SvBaseLink* pLink = *rLinks[ nIndex ]; if( ScDdeLink* pDdeLink = PTR_CAST( ScDdeLink, pLink ) ) { - if( (rtl::OUString(pDdeLink->GetAppl()) == rAppl) && - (rtl::OUString(pDdeLink->GetTopic()) == rTopic) && - (rtl::OUString(pDdeLink->GetItem()) == rItem) && + if( (OUString(pDdeLink->GetAppl()) == rAppl) && + (OUString(pDdeLink->GetTopic()) == rTopic) && + (OUString(pDdeLink->GetItem()) == rItem) && ((nMode == SC_DDE_IGNOREMODE) || (nMode == pDdeLink->GetMode())) ) return pDdeLink; if( pnDdePos ) ++*pnDdePos; @@ -1349,12 +1349,12 @@ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, sal_uInt16 nDde // ---------------------------------------------------------------------------- -bool ScDocument::FindDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem, sal_uInt8 nMode, sal_uInt16& rnDdePos ) +bool ScDocument::FindDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, sal_uInt16& rnDdePos ) { return lclGetDdeLink( GetLinkManager(), rAppl, rTopic, rItem, nMode, &rnDdePos ) != NULL; } -bool ScDocument::GetDdeLinkData( sal_uInt16 nDdePos, rtl::OUString& rAppl, rtl::OUString& rTopic, rtl::OUString& rItem ) const +bool ScDocument::GetDdeLinkData( sal_uInt16 nDdePos, OUString& rAppl, OUString& rTopic, OUString& rItem ) const { if( const ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos ) ) { @@ -1382,7 +1382,7 @@ const ScMatrix* ScDocument::GetDdeLinkResultMatrix( sal_uInt16 nDdePos ) const return pDdeLink ? pDdeLink->GetResult() : NULL; } -bool ScDocument::CreateDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem, sal_uInt8 nMode, ScMatrixRef pResults ) +bool ScDocument::CreateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, ScMatrixRef pResults ) { /* Create a DDE link without updating it (i.e. for Excel import), to prevent unwanted connections. First try to find existing link. Set result array @@ -1684,7 +1684,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp } uno::Sequence<sal_Int32> aOffsets; - rtl::OUString aNewStr = aTranslitarationWrapper.transliterate( aOldStr, nLanguage, 0, nOldLen, &aOffsets ); + OUString aNewStr = aTranslitarationWrapper.transliterate( aOldStr, nLanguage, 0, nOldLen, &aOffsets ); if ( aNewStr != aOldStr ) { diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 54e3a08547cd..0177c783522d 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -124,7 +124,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) if (!pDrawLayer) { - rtl::OUString aName; + OUString aName; if ( pShell && !pShell->IsLoading() ) // don't call GetTitle while loading aName = pShell->GetTitle(); pDrawLayer = new ScDrawLayer( this, aName ); @@ -146,7 +146,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) pDrawLayer->ScAddPage( nTab ); // always add page, with or without the table if (maTabs[nTab]) { - rtl::OUString aTabName; + OUString aTabName; maTabs[nTab]->GetName(aTabName); pDrawLayer->ScRenamePage( nTab, aTabName ); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 81ca67618e2d..fe6d921236df 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -101,7 +101,6 @@ namespace WritingMode2 = ::com::sun::star::text::WritingMode2; using ::com::sun::star::uno::Sequence; using ::com::sun::star::sheet::TablePageBreakData; using ::std::set; -using ::rtl::OUString; // The constant parameters to CopyBlockFromClip struct ScCopyBlockFromClipParams diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 358f826d618f..17ab695c4f28 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -103,18 +103,18 @@ private: ScDocument* mpDoc; }; -rtl::OUString createLabelString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab) +OUString createLabelString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab) { - rtl::OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); + OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); if (aDocStr.isEmpty()) { // Replace an empty label string with column name. - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(ScGlobal::GetRscString(STR_COLUMN)); aBuf.append(sal_Unicode(' ')); ScAddress aColAddr(nCol, 0, 0); - rtl::OUString aColStr; + OUString aColStr; aColAddr.Format(aColStr, SCA_VALID_COL, NULL); aBuf.append(aColStr); aDocStr = aBuf.makeStringAndClear(); @@ -126,7 +126,7 @@ void initFromCell( ScDPCache& rCache, ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, ScDPItemData& rData, sal_uLong& rNumFormat) { - rtl::OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); + OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); rNumFormat = 0; ScAddress aPos(nCol, nRow, nTab); @@ -399,7 +399,7 @@ bool ScDPCache::InitFromDataBase(DBConnector& rDB) for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol) { - rtl::OUString aColTitle = rDB.getColumnLabel(nCol); + OUString aColTitle = rDB.getColumnLabel(nCol); AddLabel(aColTitle); } @@ -575,7 +575,7 @@ bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam) const } else { - const rtl::OUString& rQueryStr = rEntry.GetQueryItem().maString; + const OUString& rQueryStr = rEntry.GetQueryItem().maString; ::com::sun::star::uno::Sequence< sal_Int32 > xOff; String aCell = pTransliteration->transliterate( aCellStr, ScGlobal::eLnge, 0, aCellStr.Len(), &xOff); @@ -667,7 +667,7 @@ const ScDPCache::GroupItems* ScDPCache::GetGroupItems(long nDim) const return NULL; } -rtl::OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const +OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const { OSL_ENSURE(nDim < maLabelNames.size()-1 , "ScDPTableDataCache::GetDimensionName"); OSL_ENSURE(maLabelNames.size() == static_cast <sal_uInt16> (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName"); @@ -677,19 +677,19 @@ rtl::OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const return maLabelNames[nDim+1]; } else - return rtl::OUString(); + return OUString(); } namespace { -typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> LabelSet; +typedef boost::unordered_set<OUString, OUStringHash> LabelSet; -class InsertLabel : public std::unary_function<rtl::OUString, void> +class InsertLabel : public std::unary_function<OUString, void> { LabelSet& mrNames; public: InsertLabel(LabelSet& rNames) : mrNames(rNames) {} - void operator() (const rtl::OUString& r) + void operator() (const OUString& r) { mrNames.insert(r); } @@ -727,7 +727,7 @@ void ScDPCache::Clear() maStringPool.clear(); } -void ScDPCache::AddLabel(const rtl::OUString& rLabel) +void ScDPCache::AddLabel(const OUString& rLabel) { if ( maLabelNames.empty() ) @@ -737,7 +737,7 @@ void ScDPCache::AddLabel(const rtl::OUString& rLabel) LabelSet aExistingNames; std::for_each(maLabelNames.begin(), maLabelNames.end(), InsertLabel(aExistingNames)); sal_Int32 nSuffix = 1; - rtl::OUString aNewName = rLabel; + OUString aNewName = rLabel; while (true) { if (!aExistingNames.count(aNewName)) @@ -748,7 +748,7 @@ void ScDPCache::AddLabel(const rtl::OUString& rLabel) } // Name already exists. - rtl::OUStringBuffer aBuf(rLabel); + OUStringBuffer aBuf(rLabel); aBuf.append(++nSuffix); aNewName = aBuf.makeStringAndClear(); } @@ -863,7 +863,7 @@ long ScDPCache::GetDimMemberCount(long nDim) const return maFields[nDim].maItems.size(); } -SCCOL ScDPCache::GetDimensionIndex(const rtl::OUString& sName) const +SCCOL ScDPCache::GetDimensionIndex(const OUString& sName) const { for (size_t i = 1; i < maLabelNames.size(); ++i) { @@ -873,7 +873,7 @@ SCCOL ScDPCache::GetDimensionIndex(const rtl::OUString& sName) const return -1; } -const rtl::OUString* ScDPCache::InternString(const rtl::OUString& rStr) const +const OUString* ScDPCache::InternString(const OUString& rStr) const { StringSetType::iterator it = maStringPool.find(rStr); if (it != maStringPool.end()) @@ -948,7 +948,7 @@ SCROW ScDPCache::GetIdByItemData(long nDim, const ScDPItemData& rItem) const return -1; } -rtl::OUString ScDPCache::GetFormattedString(long nDim, const ScDPItemData& rItem) const +OUString ScDPCache::GetFormattedString(long nDim, const ScDPItemData& rItem) const { if (nDim < 0) return rItem.GetString(); @@ -1156,9 +1156,9 @@ long ScDPCache::GetColumnCount() const namespace { -std::ostream& operator<< (::std::ostream& os, const rtl::OUString& str) +std::ostream& operator<< (::std::ostream& os, const OUString& str) { - return os << ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); + return os << OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); } void dumpItems(const ScDPCache& rCache, long nDim, const ScDPCache::ItemsType& rItems, size_t nOffset) diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index ae36524d2ea1..16f68b841bdb 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -38,12 +38,12 @@ using namespace com::sun::star; // ============================================================================ -ScDPSaveGroupItem::ScDPSaveGroupItem( const rtl::OUString& rName ) : +ScDPSaveGroupItem::ScDPSaveGroupItem( const OUString& rName ) : aGroupName(rName) {} ScDPSaveGroupItem::~ScDPSaveGroupItem() {} -void ScDPSaveGroupItem::AddElement( const rtl::OUString& rName ) +void ScDPSaveGroupItem::AddElement( const OUString& rName ) { aElements.push_back(rName); } @@ -52,14 +52,14 @@ void ScDPSaveGroupItem::AddElementsFromGroup( const ScDPSaveGroupItem& rGroup ) { // add all elements of the other group (used for nested grouping) - for ( std::vector<rtl::OUString>::const_iterator aIter(rGroup.aElements.begin()); + for ( std::vector<OUString>::const_iterator aIter(rGroup.aElements.begin()); aIter != rGroup.aElements.end(); ++aIter ) aElements.push_back( *aIter ); } -bool ScDPSaveGroupItem::RemoveElement( const rtl::OUString& rName ) +bool ScDPSaveGroupItem::RemoveElement( const OUString& rName ) { - for (std::vector<rtl::OUString>::iterator aIter = aElements.begin(); aIter != aElements.end(); ++aIter) + for (std::vector<OUString>::iterator aIter = aElements.begin(); aIter != aElements.end(); ++aIter) if (*aIter == rName) //! ignore case { aElements.erase(aIter); // found -> remove @@ -79,12 +79,12 @@ size_t ScDPSaveGroupItem::GetElementCount() const return aElements.size(); } -const rtl::OUString* ScDPSaveGroupItem::GetElementByIndex(size_t nIndex) const +const OUString* ScDPSaveGroupItem::GetElementByIndex(size_t nIndex) const { return (nIndex < aElements.size()) ? &aElements[ nIndex ] : 0; } -void ScDPSaveGroupItem::Rename( const rtl::OUString& rNewName ) +void ScDPSaveGroupItem::Rename( const OUString& rNewName ) { aGroupName = rNewName; } @@ -94,14 +94,14 @@ void ScDPSaveGroupItem::RemoveElementsFromGroups( ScDPSaveGroupDimension& rDimen // remove this group's elements from their groups in rDimension // (rDimension must be a different dimension from the one which contains this) - for ( std::vector<rtl::OUString>::const_iterator aIter(aElements.begin()); aIter != aElements.end(); ++aIter ) + for ( std::vector<OUString>::const_iterator aIter(aElements.begin()); aIter != aElements.end(); ++aIter ) rDimension.RemoveFromGroups( *aIter ); } void ScDPSaveGroupItem::ConvertElementsToItems(SvNumberFormatter* pFormatter) const { maItems.reserve(aElements.size()); - std::vector<rtl::OUString>::const_iterator it = aElements.begin(), itEnd = aElements.end(); + std::vector<OUString>::const_iterator it = aElements.begin(), itEnd = aElements.end(); for (; it != itEnd; ++it) { sal_uInt32 nFormat = 0; @@ -133,14 +133,14 @@ void ScDPSaveGroupItem::AddToData(ScDPGroupDimension& rDataDim) const // ============================================================================ -ScDPSaveGroupDimension::ScDPSaveGroupDimension( const rtl::OUString& rSource, const rtl::OUString& rName ) : +ScDPSaveGroupDimension::ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName ) : aSourceDim( rSource ), aGroupDimName( rName ), nDatePart( 0 ) { } -ScDPSaveGroupDimension::ScDPSaveGroupDimension( const rtl::OUString& rSource, const rtl::OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : +ScDPSaveGroupDimension::ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : aSourceDim( rSource ), aGroupDimName( rName ), aDateInfo( rDateInfo ), @@ -163,7 +163,7 @@ void ScDPSaveGroupDimension::AddGroupItem( const ScDPSaveGroupItem& rItem ) aGroups.push_back( rItem ); } -rtl::OUString ScDPSaveGroupDimension::CreateGroupName(const rtl::OUString& rPrefix) +OUString ScDPSaveGroupDimension::CreateGroupName(const OUString& rPrefix) { // create a name for a new group, using "Group1", "Group2" etc. (translated prefix in rPrefix) @@ -191,15 +191,15 @@ rtl::OUString ScDPSaveGroupDimension::CreateGroupName(const rtl::OUString& rPref } OSL_FAIL("CreateGroupName: no valid name found"); - return rtl::OUString(); + return OUString(); } -const ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroup( const rtl::OUString& rGroupName ) const +const ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroup( const OUString& rGroupName ) const { return const_cast< ScDPSaveGroupDimension* >( this )->GetNamedGroupAcc( rGroupName ); } -ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroupAcc( const rtl::OUString& rGroupName ) +ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroupAcc( const OUString& rGroupName ) { for (ScDPSaveGroupItemVec::iterator aIter = aGroups.begin(); aIter != aGroups.end(); ++aIter) if (aIter->GetGroupName().equals(rGroupName)) //! ignore case @@ -223,7 +223,7 @@ ScDPSaveGroupItem* ScDPSaveGroupDimension::GetGroupAccByIndex( long nIndex ) return &aGroups[nIndex]; } -void ScDPSaveGroupDimension::RemoveFromGroups( const rtl::OUString& rItemName ) +void ScDPSaveGroupDimension::RemoveFromGroups( const OUString& rItemName ) { // if the item is in any group, remove it from the group, // also remove the group if it is empty afterwards @@ -238,7 +238,7 @@ void ScDPSaveGroupDimension::RemoveFromGroups( const rtl::OUString& rItemName ) } } -void ScDPSaveGroupDimension::RemoveGroup(const rtl::OUString& rGroupName) +void ScDPSaveGroupDimension::RemoveGroup(const OUString& rGroupName) { for (ScDPSaveGroupItemVec::iterator aIter = aGroups.begin(); aIter != aGroups.end(); ++aIter) if (aIter->GetGroupName().equals(rGroupName)) //! ignore case @@ -266,7 +266,7 @@ bool ScDPSaveGroupDimension::HasOnlyHidden(const ScDPUniqueStringSet& rVisible) return bAllHidden; } -void ScDPSaveGroupDimension::Rename( const rtl::OUString& rNewName ) +void ScDPSaveGroupDimension::Rename( const OUString& rNewName ) { aGroupDimName = rNewName; } @@ -429,14 +429,14 @@ void ScDPSaveGroupDimension::AddToCache(ScDPCache& rCache) const // ============================================================================ -ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const rtl::OUString& rName, const ScDPNumGroupInfo& rInfo ) : +ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rInfo ) : aDimensionName( rName ), aGroupInfo( rInfo ), nDatePart( 0 ) { } -ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const rtl::OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : +ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : aDimensionName( rName ), aDateInfo( rDateInfo ), nDatePart( nPart ) @@ -583,15 +583,15 @@ namespace { struct ScDPSaveGroupDimNameFunc { - rtl::OUString maDimName; - inline explicit ScDPSaveGroupDimNameFunc( const rtl::OUString& rDimName ) : maDimName( rDimName ) {} + OUString maDimName; + inline explicit ScDPSaveGroupDimNameFunc( const OUString& rDimName ) : maDimName( rDimName ) {} inline bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetGroupDimName() == maDimName; } }; struct ScDPSaveGroupSourceNameFunc { - rtl::OUString maSrcDimName; - inline explicit ScDPSaveGroupSourceNameFunc( const rtl::OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {} + OUString maSrcDimName; + inline explicit ScDPSaveGroupSourceNameFunc( const OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {} inline bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetSourceDimName() == maSrcDimName; } }; @@ -630,7 +630,7 @@ void ScDPDimensionSaveData::ReplaceGroupDimension( const ScDPSaveGroupDimension& *aIt = rGroupDim; } -void ScDPDimensionSaveData::RemoveGroupDimension( const rtl::OUString& rGroupDimName ) +void ScDPDimensionSaveData::RemoveGroupDimension( const OUString& rGroupDimName ) { ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( maGroupDims.begin(), maGroupDims.end(), ScDPSaveGroupDimNameFunc( rGroupDimName ) ); @@ -655,7 +655,7 @@ void ScDPDimensionSaveData::ReplaceNumGroupDimension( const ScDPSaveNumGroupDime aIt->second = rGroupDim; } -void ScDPDimensionSaveData::RemoveNumGroupDimension( const rtl::OUString& rGroupDimName ) +void ScDPDimensionSaveData::RemoveNumGroupDimension( const OUString& rGroupDimName ) { maNumGroupDims.erase( rGroupDimName ); } @@ -695,52 +695,52 @@ void ScDPDimensionSaveData::WriteToCache(ScDPCache& rCache) const it->second.AddToCache(rCache); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimForBase( const rtl::OUString& rBaseDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimForBase( const OUString& rBaseDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetGroupDimAccForBase( rBaseDimName ); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDim( const rtl::OUString& rGroupDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDim( const OUString& rGroupDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetNamedGroupDimAcc( rGroupDimName ); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDim( const rtl::OUString& rBaseDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDim( const OUString& rBaseDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetFirstNamedGroupDimAcc( rBaseDimName ); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDim( const rtl::OUString& rGroupDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDim( const OUString& rGroupDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetNextNamedGroupDimAcc( rGroupDimName ); } -const ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDim( const rtl::OUString& rGroupDimName ) const +const ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDim( const OUString& rGroupDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetNumGroupDimAcc( rGroupDimName ); } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimAccForBase( const rtl::OUString& rBaseDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimAccForBase( const OUString& rBaseDimName ) { ScDPSaveGroupDimension* pGroupDim = GetFirstNamedGroupDimAcc( rBaseDimName ); return pGroupDim ? pGroupDim : GetNextNamedGroupDimAcc( rBaseDimName ); } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDimAcc( const rtl::OUString& rGroupDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDimAcc( const OUString& rGroupDimName ) { ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( maGroupDims.begin(), maGroupDims.end(), ScDPSaveGroupDimNameFunc( rGroupDimName ) ); return (aIt == maGroupDims.end()) ? 0 : &*aIt; } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDimAcc( const rtl::OUString& rBaseDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDimAcc( const OUString& rBaseDimName ) { ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( maGroupDims.begin(), maGroupDims.end(), ScDPSaveGroupSourceNameFunc( rBaseDimName ) ); return (aIt == maGroupDims.end()) ? 0 : &*aIt; } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDimAcc( const rtl::OUString& rGroupDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDimAcc( const OUString& rGroupDimName ) { // find the group dimension with the passed name ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( @@ -751,7 +751,7 @@ ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDimAcc( const rt return (aIt == maGroupDims.end()) ? 0 : &*aIt; } -ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDimAcc( const rtl::OUString& rGroupDimName ) +ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDimAcc( const OUString& rGroupDimName ) { ScDPSaveNumGroupDimMap::iterator aIt = maNumGroupDims.find( rGroupDimName ); return (aIt == maNumGroupDims.end()) ? 0 : &aIt->second; @@ -762,7 +762,7 @@ bool ScDPDimensionSaveData::HasGroupDimensions() const return !maGroupDims.empty() || !maNumGroupDims.empty(); } -sal_Int32 ScDPDimensionSaveData::CollectDateParts( const rtl::OUString& rBaseDimName ) const +sal_Int32 ScDPDimensionSaveData::CollectDateParts( const OUString& rBaseDimName ) const { sal_Int32 nParts = 0; // start with part of numeric group @@ -775,9 +775,9 @@ sal_Int32 ScDPDimensionSaveData::CollectDateParts( const rtl::OUString& rBaseDim return nParts; } -rtl::OUString ScDPDimensionSaveData::CreateGroupDimName( - const rtl::OUString& rSourceName, const ScDPObject& rObject, bool bAllowSource, - const std::vector<rtl::OUString>* pDeletedNames ) +OUString ScDPDimensionSaveData::CreateGroupDimName( + const OUString& rSourceName, const ScDPObject& rObject, bool bAllowSource, + const std::vector<OUString>* pDeletedNames ) { // create a name for the new dimension by appending a number to the original // dimension's name @@ -788,7 +788,7 @@ rtl::OUString ScDPDimensionSaveData::CreateGroupDimName( const sal_Int32 nMaxAdd = 1000; // limit the loop while ( nAdd <= nMaxAdd ) { - rtl::OUString aDimName( rSourceName ); + OUString aDimName( rSourceName ); if ( !bUseSource ) aDimName += OUString::number(nAdd); bool bExists = false; @@ -819,7 +819,7 @@ rtl::OUString ScDPDimensionSaveData::CreateGroupDimName( ++nAdd; // continue with higher number } OSL_FAIL("CreateGroupDimName: no valid name found"); - return rtl::OUString(); + return OUString(); } namespace @@ -836,12 +836,12 @@ namespace }; } -rtl::OUString ScDPDimensionSaveData::CreateDateGroupDimName( +OUString ScDPDimensionSaveData::CreateDateGroupDimName( sal_Int32 nDatePart, const ScDPObject& rObject, bool bAllowSource, - const std::vector<rtl::OUString>* pDeletedNames ) + const std::vector<OUString>* pDeletedNames ) { using namespace ::com::sun::star::sheet::DataPilotFieldGroupBy; - rtl::OUString aPartName; + OUString aPartName; switch( nDatePart ) { case SECONDS: aPartName = ScGlobal::GetRscString( nDatePartIds[0] ); break; diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 64381e07ea78..47adbbeb9316 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::std::vector; using ::std::pair; using ::std::auto_ptr; @@ -291,7 +290,7 @@ void ScDPFilteredCache::getValue( ScDPValue& rVal, SCCOL nCol, SCROW nRow, bool rVal.Set(0.0, ScDPValue::Empty); } -rtl::OUString ScDPFilteredCache::getFieldName(SCCOL nIndex) const +OUString ScDPFilteredCache::getFieldName(SCCOL nIndex) const { return mrCache.GetDimensionName(nIndex); } diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index a7a216bd622a..bc2e132acb3c 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -44,8 +44,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::rtl::OUString; -using ::rtl::OUStringHash; using ::std::vector; using ::boost::shared_ptr; @@ -492,7 +490,7 @@ void ScDPGroupTableData::SetNumGroupDimension( long nIndex, const ScDPNumGroupDi } } -long ScDPGroupTableData::GetDimensionIndex( const rtl::OUString& rName ) +long ScDPGroupTableData::GetDimensionIndex( const OUString& rName ) { for (long i = 0; i < nSourceCount; ++i) // nSourceCount excludes data layout if (pSourceData->getDimensionName(i).equals(rName)) //! ignore case? @@ -548,7 +546,7 @@ const ScDPItemData* ScDPGroupTableData::GetMemberById( long nDim, long nId ) return pSourceData->GetMemberById( nDim, nId ); } -rtl::OUString ScDPGroupTableData::getDimensionName(long nColumn) +OUString ScDPGroupTableData::getDimensionName(long nColumn) { if ( nColumn >= nSourceCount ) { diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx index a2d7bb74fb1e..a91476522699 100644 --- a/sc/source/core/data/dpitemdata.cxx +++ b/sc/source/core/data/dpitemdata.cxx @@ -83,7 +83,7 @@ ScDPItemData::ScDPItemData(const ScDPItemData& r) : { case String: case Error: - mpString = mbStringInterned ? r.mpString : new rtl::OUString(*r.mpString); + mpString = mbStringInterned ? r.mpString : new OUString(*r.mpString); break; case Value: case RangeStart: @@ -110,8 +110,8 @@ void ScDPItemData::DisposeString() mbStringInterned = false; } -ScDPItemData::ScDPItemData(const rtl::OUString& rStr) : - mpString(new rtl::OUString(rStr)), meType(String), mbStringInterned(false) {} +ScDPItemData::ScDPItemData(const OUString& rStr) : + mpString(new OUString(rStr)), meType(String), mbStringInterned(false) {} ScDPItemData::ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue) : meType(GroupValue), mbStringInterned(false) @@ -136,14 +136,14 @@ void ScDPItemData::SetEmpty() meType = Empty; } -void ScDPItemData::SetString(const rtl::OUString& rS) +void ScDPItemData::SetString(const OUString& rS) { DisposeString(); - mpString = new rtl::OUString(rS); + mpString = new OUString(rS); meType = String; } -void ScDPItemData::SetString(const rtl::OUString* pS) +void ScDPItemData::SetString(const OUString* pS) { DisposeString(); mpString = pS; @@ -179,7 +179,7 @@ void ScDPItemData::SetRangeLast() meType = RangeStart; } -void ScDPItemData::SetErrorString(const rtl::OUString* pS) +void ScDPItemData::SetErrorString(const OUString* pS) { SetString(pS); meType = Error; @@ -249,7 +249,7 @@ ScDPItemData& ScDPItemData::operator= (const ScDPItemData& r) { case String: case Error: - mpString = r.mbStringInterned ? r.mpString : new rtl::OUString(*r.mpString); + mpString = r.mbStringInterned ? r.mpString : new OUString(*r.mpString); mbStringInterned = r.mbStringInterned; break; case Value: @@ -296,7 +296,7 @@ void ScDPItemData::Dump(const char* msg) const break; case Error: printf("error: %s\n", - rtl::OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); break; case GroupValue: printf("group value: group type = %d value = %d\n", @@ -304,7 +304,7 @@ void ScDPItemData::Dump(const char* msg) const break; case String: printf("string: %s\n", - rtl::OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); break; case Value: printf("value: %g\n", mfValue); @@ -329,7 +329,7 @@ bool ScDPItemData::IsValue() const return meType == Value; } -rtl::OUString ScDPItemData::GetString() const +OUString ScDPItemData::GetString() const { switch (meType) { @@ -337,16 +337,16 @@ rtl::OUString ScDPItemData::GetString() const case Error: return *mpString; case Value: - return rtl::OUString::valueOf(mfValue); + return OUString::valueOf(mfValue); case GroupValue: case RangeStart: - return rtl::OUString::createFromAscii("fail"); + return OUString::createFromAscii("fail"); case Empty: default: ; } - return rtl::OUString(); + return OUString(); } double ScDPItemData::GetValue() const diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index c31a4149c97f..c8f3fffbe923 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -91,7 +91,6 @@ using ::com::sun::star::sheet::DataPilotTableHeaderData; using ::com::sun::star::sheet::DataPilotTablePositionData; using ::com::sun::star::sheet::XDimensionsSupplier; using ::com::sun::star::beans::XPropertySet; -using ::rtl::OUString; #define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 645e7b52e7bd..3cd83694a7f7 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -66,7 +66,6 @@ using ::com::sun::star::sheet::DataPilotTablePositionData; using ::com::sun::star::sheet::DataPilotTableResultData; using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Any; -using ::rtl::OUString; #define SC_DP_FRAME_INNER_BOLD 20 #define SC_DP_FRAME_OUTER_BOLD 40 @@ -83,8 +82,8 @@ struct ScDPOutLevelData long nDimPos; sal_uInt32 mnSrcNumFmt; /// Prevailing number format used in the source data. uno::Sequence<sheet::MemberResult> aResult; - rtl::OUString maName; /// Name is the internal field name. - rtl::OUString maCaption; /// Caption is the name visible in the output table. + OUString maName; /// Name is the internal field name. + OUString maCaption; /// Caption is the name visible in the output table. bool mbHasHiddenMember:1; bool mbDataLayout:1; bool mbPageDim:1; @@ -287,7 +286,7 @@ void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab, return; } - rtl::OUString aStyleName = ScGlobal::GetRscString( nStrId ); + OUString aStyleName = ScGlobal::GetRscString( nStrId ); ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool(); ScStyleSheet* pStyle = (ScStyleSheet*) pStlPool->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); if (!pStyle) @@ -346,7 +345,7 @@ void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount, // get names/formats for all data dimensions //! merge this with the loop to collect ScDPOutLevelData? - rtl::OUString aDataNames[SC_DPOUT_MAXLEVELS]; + OUString aDataNames[SC_DPOUT_MAXLEVELS]; sal_uInt32 nDataFormats[SC_DPOUT_MAXLEVELS]; long nDataCount = 0; long nDimCount = xDims->getCount(); @@ -360,14 +359,14 @@ void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount, { sheet::DataPilotFieldOrientation eDimOrient = (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION), + xDimProp, OUString(SC_UNO_DP_ORIENTATION), sheet::DataPilotFieldOrientation_HIDDEN ); if ( eDimOrient == sheet::DataPilotFieldOrientation_DATA ) { aDataNames[nDataCount] = xDimName->getName(); long nFormat = ScUnoHelpFunctions::GetLongProperty( xDimProp, - rtl::OUString(SC_UNONAME_NUMFMT) ); + OUString(SC_UNONAME_NUMFMT) ); nDataFormats[nDataCount] = nFormat; ++nDataCount; } @@ -379,7 +378,7 @@ void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount, const sheet::MemberResult* pArray = aResult.getConstArray(); - rtl::OUString aName; + OUString aName; sal_uInt32* pNumFmt = new sal_uInt32[nSize]; if (nDataCount == 1) { @@ -424,13 +423,13 @@ sal_uInt32 lcl_GetFirstNumberFormat( const uno::Reference<container::XIndexAcces { sheet::DataPilotFieldOrientation eDimOrient = (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION), + xDimProp, OUString(SC_UNO_DP_ORIENTATION), sheet::DataPilotFieldOrientation_HIDDEN ); if ( eDimOrient == sheet::DataPilotFieldOrientation_DATA ) { long nFormat = ScUnoHelpFunctions::GetLongProperty( xDimProp, - rtl::OUString(SC_UNONAME_NUMFMT) ); + OUString(SC_UNONAME_NUMFMT) ); return nFormat; // use format from first found data dimension } @@ -555,12 +554,12 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS { sheet::DataPilotFieldOrientation eDimOrient = (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION), + xDimProp, OUString(SC_UNO_DP_ORIENTATION), sheet::DataPilotFieldOrientation_HIDDEN ); long nDimPos = ScUnoHelpFunctions::GetLongProperty( xDimProp, - rtl::OUString(SC_UNO_DP_POSITION) ); + OUString(SC_UNO_DP_POSITION) ); bool bIsDataLayout = ScUnoHelpFunctions::GetBoolProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ISDATALAYOUT)); + xDimProp, OUString(SC_UNO_DP_ISDATALAYOUT)); bool bHasHiddenMember = ScUnoHelpFunctions::GetBoolProperty( xDimProp, OUString(SC_UNO_DP_HAS_HIDDEN_MEMBER)); sal_Int32 nNumFmt = ScUnoHelpFunctions::GetLongProperty( @@ -572,7 +571,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS new ScNameToIndexAccess( xDimSupp->getHierarchies() ); long nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp, - rtl::OUString(SC_UNO_DP_USEDHIERARCHY) ); + OUString(SC_UNO_DP_USEDHIERARCHY) ); if ( nHierarchy >= xHiers->getCount() ) nHierarchy = 0; @@ -595,7 +594,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS xLevel, uno::UNO_QUERY ); if ( xLevNam.is() && xLevRes.is() ) { - rtl::OUString aName = xLevNam->getName(); + OUString aName = xLevNam->getName(); Reference<XPropertySet> xPropSet(xLevel, UNO_QUERY); // Caption equals the field name by default. // #i108948# use ScUnoHelpFunctions::GetStringProperty, because @@ -706,8 +705,8 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS try { uno::Any aAny = xSrcProp->getPropertyValue( - rtl::OUString(SC_UNO_DP_DATADESC) ); - rtl::OUString aUStr; + OUString(SC_UNO_DP_DATADESC) ); + OUString aUStr; aAny >>= aUStr; aDataDescription = aUStr; } @@ -1235,7 +1234,7 @@ bool ScDPOutput::GetHeaderLayout() const namespace { void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, sal_Int32& rDataLayoutIndex, - std::vector<rtl::OUString>& rDataNames, std::vector<rtl::OUString>& rGivenNames, + std::vector<OUString>& rDataNames, std::vector<OUString>& rGivenNames, sheet::DataPilotFieldOrientation& rDataOrient, const uno::Reference<sheet::XDimensionsSupplier>& xSource ) { @@ -1246,12 +1245,12 @@ void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, s uno::Reference<beans::XPropertySet> xSrcProp( xSource, uno::UNO_QUERY ); bool bColGrand = ScUnoHelpFunctions::GetBoolProperty( - xSrcProp, rtl::OUString(SC_UNO_DP_COLGRAND)); + xSrcProp, OUString(SC_UNO_DP_COLGRAND)); if ( bColGrand ) rGrandTotalCols = 1; // default if data layout not in columns bool bRowGrand = ScUnoHelpFunctions::GetBoolProperty( - xSrcProp, rtl::OUString(SC_UNO_DP_ROWGRAND)); + xSrcProp, OUString(SC_UNO_DP_ROWGRAND)); if ( bRowGrand ) rGrandTotalRows = 1; // default if data layout not in rows @@ -1272,18 +1271,18 @@ void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, s { sheet::DataPilotFieldOrientation eDimOrient = (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION), + xDimProp, OUString(SC_UNO_DP_ORIENTATION), sheet::DataPilotFieldOrientation_HIDDEN ); if ( ScUnoHelpFunctions::GetBoolProperty( xDimProp, - rtl::OUString(SC_UNO_DP_ISDATALAYOUT) ) ) + OUString(SC_UNO_DP_ISDATALAYOUT) ) ) { rDataLayoutIndex = nDim; rDataOrient = eDimOrient; } if ( eDimOrient == sheet::DataPilotFieldOrientation_DATA ) { - rtl::OUString aSourceName; - rtl::OUString aGivenName; + OUString aSourceName; + OUString aGivenName; ScDPOutput::GetDataDimensionNames( aSourceName, aGivenName, xDim ); try { @@ -1350,7 +1349,7 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa if (xPropSet.is()) { sal_Int32 nDataFieldCount = ScUnoHelpFunctions::GetLongProperty( xPropSet, - rtl::OUString(SC_UNO_DP_DATAFIELDCOUNT) ); + OUString(SC_UNO_DP_DATAFIELDCOUNT) ); if (nDataFieldCount > 0) aResData.DataFieldIndex = (nRow - nDataStartRow) % nDataFieldCount; } @@ -1432,7 +1431,7 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>& return false; sal_Int32 nDataFieldCount = ScUnoHelpFunctions::GetLongProperty( xPropSet, - rtl::OUString(SC_UNO_DP_DATAFIELDCOUNT) ); + OUString(SC_UNO_DP_DATAFIELDCOUNT) ); if (nDataFieldCount == 0) // No data field is present in this datapilot table. return false; @@ -1441,8 +1440,8 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>& sal_Int32 nGrandTotalCols; sal_Int32 nGrandTotalRows; sal_Int32 nDataLayoutIndex; - std::vector<rtl::OUString> aDataNames; - std::vector<rtl::OUString> aGivenNames; + std::vector<OUString> aDataNames; + std::vector<OUString> aGivenNames; sheet::DataPilotFieldOrientation eDataOrient; lcl_GetTableVars( nGrandTotalCols, nGrandTotalRows, nDataLayoutIndex, aDataNames, aGivenNames, eDataOrient, xSource ); @@ -1521,7 +1520,7 @@ namespace { // helper functions for ScDPOutput::GetPivotData // -bool lcl_IsNamedDataField( const ScDPGetPivotDataField& rTarget, const rtl::OUString& rSourceName, const rtl::OUString& rGivenName ) +bool lcl_IsNamedDataField( const ScDPGetPivotDataField& rTarget, const OUString& rSourceName, const OUString& rGivenName ) { // match one of the names, ignoring case return ScGlobal::GetpTransliteration()->isEqual( rTarget.maFieldName, rSourceName ) || @@ -1614,7 +1613,7 @@ uno::Sequence<sheet::GeneralFunction> lcl_GetSubTotals( { try { - uno::Any aValue = xLevelProp->getPropertyValue( rtl::OUString(SC_UNO_DP_SUBTOTAL) ); + uno::Any aValue = xLevelProp->getPropertyValue( OUString(SC_UNO_DP_SUBTOTAL) ); aValue >>= aSubTotals; } catch(const uno::Exception&) @@ -1631,7 +1630,7 @@ void lcl_FilterInclude( std::vector<bool>& rResult, std::vector< sal_Int32 >& rS std::vector<bool>& rFilterUsed, bool& rBeforeDataLayout, sal_Int32 nGrandTotals, sal_Int32 nDataLayoutIndex, - const std::vector<rtl::OUString>& rDataNames, const std::vector<rtl::OUString>& rGivenNames, + const std::vector<OUString>& rDataNames, const std::vector<OUString>& rGivenNames, const ScDPGetPivotDataField& rTarget, const uno::Reference<sheet::XDimensionsSupplier>& xSource ) { // returns true if a filter was given for the field @@ -1699,8 +1698,8 @@ void lcl_FilterInclude( std::vector<bool>& rResult, std::vector< sal_Int32 >& rS // grand total is always automatic sal_Int32 nDataPos = j - ( nSize - nGrandTotals ); OSL_ENSURE( nDataPos < (sal_Int32)rDataNames.size(), "wrong data count" ); - rtl::OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names - rtl::OUString aGivenName( rGivenNames[nDataPos] ); + OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names + OUString aGivenName( rGivenNames[nDataPos] ); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aGivenName ); } @@ -1735,8 +1734,8 @@ void lcl_FilterInclude( std::vector<bool>& rResult, std::vector< sal_Int32 >& rS sal_Int32 nFuncPos = nSubTotalCount / nDataCount; // outer order: subtotal functions sal_Int32 nDataPos = nSubTotalCount % nDataCount; // inner order: data fields - rtl::OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names - rtl::OUString aGivenName( rGivenNames[nDataPos] ); + OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names + OUString aGivenName( rGivenNames[nDataPos] ); OSL_ENSURE( nFuncPos < aSubTotals.getLength(), "wrong subtotal count" ); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aGivenName ) && @@ -1755,8 +1754,8 @@ void lcl_FilterInclude( std::vector<bool>& rResult, std::vector< sal_Int32 >& rS if ( rBeforeDataLayout ) { OSL_ENSURE( nSubTotalCount < (sal_Int32)rDataNames.size(), "wrong data count" ); - rtl::OUString aSourceName( rDataNames[nSubTotalCount] ); // vector contains source names - rtl::OUString aGivenName( rGivenNames[nSubTotalCount] ); + OUString aSourceName( rDataNames[nSubTotalCount] ); // vector contains source names + OUString aGivenName( rGivenNames[nSubTotalCount] ); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aGivenName ); } @@ -1780,7 +1779,7 @@ void lcl_FilterInclude( std::vector<bool>& rResult, std::vector< sal_Int32 >& rS { // Asterisks are added in ScDPSaveData::WriteToSource to create unique names. //! preserve original name there? - rtl::OUString aSourceName = ScDPUtil::getSourceDimensionName(aResultEntry.Name); + OUString aSourceName = ScDPUtil::getSourceDimensionName(aResultEntry.Name); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aResultEntry.Caption); @@ -1819,7 +1818,7 @@ void lcl_StripSubTotals( std::vector<bool>& rResult, const std::vector<sal_Int32 } } -rtl::OUString lcl_GetDataFieldName( const rtl::OUString& rSourceName, sheet::GeneralFunction eFunc ) +OUString lcl_GetDataFieldName( const OUString& rSourceName, sheet::GeneralFunction eFunc ) { sal_uInt16 nStrId = 0; switch ( eFunc ) @@ -1843,9 +1842,9 @@ rtl::OUString lcl_GetDataFieldName( const rtl::OUString& rSourceName, sheet::Gen } } if ( !nStrId ) - return rtl::OUString(); + return OUString(); - rtl::OUStringBuffer aRet( ScGlobal::GetRscString( nStrId ) ); + OUStringBuffer aRet( ScGlobal::GetRscString( nStrId ) ); aRet.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - ")); aRet.append(rSourceName); return aRet.makeStringAndClear(); @@ -1854,7 +1853,7 @@ rtl::OUString lcl_GetDataFieldName( const rtl::OUString& rSourceName, sheet::Gen } void ScDPOutput::GetDataDimensionNames( - rtl::OUString& rSourceName, rtl::OUString& rGivenName, const uno::Reference<uno::XInterface>& xDim ) + OUString& rSourceName, OUString& rGivenName, const uno::Reference<uno::XInterface>& xDim ) { uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY ); uno::Reference<container::XNamed> xDimName( xDim, uno::UNO_QUERY ); @@ -1868,7 +1867,7 @@ void ScDPOutput::GetDataDimensionNames( //! Should use a stored name when available sheet::GeneralFunction eFunc = (sheet::GeneralFunction)ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_FUNCTION), + xDimProp, OUString(SC_UNO_DP_FUNCTION), sheet::GeneralFunction_NONE ); rGivenName = lcl_GetDataFieldName( rSourceName, eFunc ); } @@ -1883,8 +1882,8 @@ bool ScDPOutput::GetPivotData( ScDPGetPivotDataField& rTarget, sal_Int32 nGrandTotalCols; sal_Int32 nGrandTotalRows; sal_Int32 nDataLayoutIndex; - std::vector<rtl::OUString> aDataNames; - std::vector<rtl::OUString> aGivenNames; + std::vector<OUString> aDataNames; + std::vector<OUString> aGivenNames; sheet::DataPilotFieldOrientation eDataOrient; lcl_GetTableVars( nGrandTotalCols, nGrandTotalRows, nDataLayoutIndex, aDataNames, aGivenNames, eDataOrient, xSource ); diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index bef099b008c7..28d609b5d16c 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -53,9 +53,6 @@ using namespace com::sun::star; using namespace com::sun::star::sheet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringHash; using ::std::auto_ptr; #define SC_DPSAVEMODE_DONTKNOW 2 diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index bb0e9b541e85..9f50a68e4f29 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -86,7 +86,7 @@ long ScDatabaseDPData::GetColumnCount() } -rtl::OUString ScDatabaseDPData::getDimensionName(long nColumn) +OUString ScDatabaseDPData::getDimensionName(long nColumn) { if (getIsDataLayoutDimension(nColumn)) { diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index f1cf22735dcd..f4a80b2f3941 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::std::vector; // ----------------------------------------------------------------------- @@ -82,7 +81,7 @@ long ScSheetDPData::GetColumnCount() return aCacheTable.getColSize(); } -rtl::OUString ScSheetDPData::getDimensionName(long nColumn) +OUString ScSheetDPData::getDimensionName(long nColumn) { CreateCacheTable(); if (getIsDataLayoutDimension(nColumn)) @@ -94,7 +93,7 @@ rtl::OUString ScSheetDPData::getDimensionName(long nColumn) else if (nColumn >= aCacheTable.getColSize()) { OSL_FAIL("getDimensionName: invalid dimension"); - return rtl::OUString(); + return OUString(); } else { diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index c92c23f964fb..fdd5b5ab7de8 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -59,7 +59,7 @@ ScDPTableData::~ScDPTableData() { } -rtl::OUString ScDPTableData::GetFormattedString(long nDim, const ScDPItemData& rItem) const +OUString ScDPTableData::GetFormattedString(long nDim, const ScDPItemData& rItem) const { const ScDPCache* pCache = GetCacheTable().getCache(); return pCache->GetFormattedString(nDim, rItem); diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 0f693105f85b..322dc5ff450d 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -52,7 +52,6 @@ using namespace com::sun::star; using ::std::vector; using ::std::pair; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // ----------------------------------------------------------------------- @@ -810,7 +809,7 @@ sal_uInt16 ScDPResultData::GetMeasureRefOrient(long nMeasure) const return maMeasureRefOrients[nMeasure]; } -rtl::OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const +OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const { // with bForce==true, return function instead of "result" for single measure // with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc @@ -835,7 +834,7 @@ rtl::OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSub if (pLayoutName) return *pLayoutName; } - rtl::OUStringBuffer aRet; + OUStringBuffer aRet; ScSubTotalFunc eFunc = ( eForceFunc == SUBTOTAL_FUNC_NONE ) ? GetMeasureFunction(nMeasure) : eForceFunc; sal_uInt16 nId = nFuncStrIds[eFunc]; @@ -850,12 +849,12 @@ rtl::OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSub } } -rtl::OUString ScDPResultData::GetMeasureDimensionName(long nMeasure) const +OUString ScDPResultData::GetMeasureDimensionName(long nMeasure) const { if ( nMeasure < 0 ) { OSL_FAIL("GetMeasureDimensionName: negative"); - return rtl::OUString::createFromAscii("***"); + return OUString::createFromAscii("***"); } return mrSource.GetDataDimName(nMeasure); @@ -1742,7 +1741,7 @@ void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, #if DEBUG_PIVOT_TABLE void ScDPResultMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - lcl_DumpRow( rtl::OUString("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); + lcl_DumpRow( OUString("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); if (pDataRoot) @@ -2599,7 +2598,7 @@ void ScDPDataMember::UpdateRunningTotals( #if DEBUG_PIVOT_TABLE void ScDPDataMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - lcl_DumpRow( rtl::OUString("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); + lcl_DumpRow( OUString("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); SCROW nStartRow = rPos.Row(); const ScDPDataDimension* pDataChild = GetChildDimension(); @@ -2964,9 +2963,9 @@ bool ScDPResultDimension::IsValidEntry( const vector< SCROW >& aMembers ) const if ( NULL != pMember ) return pMember->IsValidEntry( aMembers ); #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer strTemp(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer strTemp(RTL_CONSTASCII_STRINGPARAM( "IsValidEntry: Member not found, DimName = ")); - strTemp.append(rtl::OUStringToOString(GetName(), RTL_TEXTENCODING_UTF8)); + strTemp.append(OUStringToOString(GetName(), RTL_TEXTENCODING_UTF8)); OSL_TRACE("%s", strTemp.getStr()); #endif return false; @@ -3424,8 +3423,8 @@ ScDPDataMember* ScDPResultDimension::GetColReferenceMember( #if DEBUG_PIVOT_TABLE void ScDPResultDimension::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - rtl::OUString aDimName = bIsDataLayout ? rtl::OUString("(data layout)") : rtl::OUString(GetName()); - lcl_DumpRow( rtl::OUString("ScDPResultDimension"), aDimName, NULL, pDoc, rPos ); + OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString(GetName()); + lcl_DumpRow( OUString("ScDPResultDimension"), aDimName, NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); @@ -3798,8 +3797,8 @@ void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim, #if DEBUG_PIVOT_TABLE void ScDPDataDimension::DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const { - rtl::OUString aDimName = bIsDataLayout ? rtl::OUString("(data layout)") : rtl::OUString("(unknown)"); - lcl_DumpRow( rtl::OUString("ScDPDataDimension"), aDimName, NULL, pDoc, rPos ); + OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString("(unknown)"); + lcl_DumpRow( OUString("ScDPDataDimension"), aDimName, NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 91dcacc363e2..dddbeabf6663 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -66,7 +66,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx index dc78e3b687ca..a842d7de20b1 100644 --- a/sc/source/core/data/dputil.cxx +++ b/sc/source/core/data/dputil.cxx @@ -48,7 +48,7 @@ namespace { const sal_uInt16 SC_DP_LEAPYEAR = 1648; // arbitrary leap year for date calculations -rtl::OUString getTwoDigitString(sal_Int32 nValue) +OUString getTwoDigitString(sal_Int32 nValue) { OUString aRet = OUString::number( nValue ); if ( aRet.getLength() < 2 ) @@ -56,17 +56,17 @@ rtl::OUString getTwoDigitString(sal_Int32 nValue) return aRet; } -void appendDateStr(rtl::OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter) +void appendDateStr(OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter) { sal_uLong nFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATE, ScGlobal::eLnge ); - rtl::OUString aString; + OUString aString; pFormatter->GetInputLineString(fValue, nFormat, aString); rBuffer.append(aString); } -rtl::OUString getSpecialDateName(double fValue, bool bFirst, SvNumberFormatter* pFormatter) +OUString getSpecialDateName(double fValue, bool bFirst, SvNumberFormatter* pFormatter) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append(sal_Unicode(bFirst ? '<' : '>')); appendDateStr(aBuffer, fValue, pFormatter); return aBuffer.makeStringAndClear(); @@ -74,7 +74,7 @@ rtl::OUString getSpecialDateName(double fValue, bool bFirst, SvNumberFormatter* } -bool ScDPUtil::isDuplicateDimension(const rtl::OUString& rName) +bool ScDPUtil::isDuplicateDimension(const OUString& rName) { if (rName.isEmpty()) return false; @@ -83,24 +83,24 @@ bool ScDPUtil::isDuplicateDimension(const rtl::OUString& rName) return cLast == sal_Unicode('*'); } -rtl::OUString ScDPUtil::getSourceDimensionName(const rtl::OUString& rName) +OUString ScDPUtil::getSourceDimensionName(const OUString& rName) { return comphelper::string::stripEnd(rName, '*'); } -rtl::OUString ScDPUtil::createDuplicateDimensionName(const rtl::OUString& rOriginal, size_t nDupCount) +OUString ScDPUtil::createDuplicateDimensionName(const OUString& rOriginal, size_t nDupCount) { if (!nDupCount) return rOriginal; - rtl::OUStringBuffer aBuf(rOriginal); + OUStringBuffer aBuf(rOriginal); for (size_t i = 0; i < nDupCount; ++i) aBuf.append(sal_Unicode('*')); return aBuf.makeStringAndClear(); } -rtl::OUString ScDPUtil::getDateGroupName( +OUString ScDPUtil::getDateGroupName( sal_Int32 nDatePart, sal_Int32 nValue, SvNumberFormatter* pFormatter, double fStart, double fEnd) { @@ -112,7 +112,7 @@ rtl::OUString ScDPUtil::getDateGroupName( switch ( nDatePart ) { case sheet::DataPilotFieldGroupBy::YEARS: - return rtl::OUString::valueOf(nValue); + return OUString::valueOf(nValue); case sheet::DataPilotFieldGroupBy::QUARTERS: return ScGlobal::pLocaleData->getQuarterAbbreviation(sal_Int16(nValue-1)); // nValue is 1-based case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS: @@ -140,7 +140,7 @@ rtl::OUString ScDPUtil::getDateGroupName( case sheet::DataPilotFieldGroupBy::MINUTES: case sheet::DataPilotFieldGroupBy::SECONDS: { - rtl::OUStringBuffer aBuf(ScGlobal::pLocaleData->getTimeSep()); + OUStringBuffer aBuf(ScGlobal::pLocaleData->getTimeSep()); aBuf.append(getTwoDigitString(nValue)); return aBuf.makeStringAndClear(); } @@ -149,7 +149,7 @@ rtl::OUString ScDPUtil::getDateGroupName( OSL_FAIL("invalid date part"); } - return rtl::OUString::createFromAscii("FIXME: unhandled value"); + return OUString::createFromAscii("FIXME: unhandled value"); } double ScDPUtil::getNumGroupStartValue(double fValue, const ScDPNumGroupInfo& rInfo) @@ -195,20 +195,20 @@ double ScDPUtil::getNumGroupStartValue(double fValue, const ScDPNumGroupInfo& rI namespace { -void lcl_AppendDateStr( rtl::OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter ) +void lcl_AppendDateStr( OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter ) { sal_uLong nFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATE, ScGlobal::eLnge ); - rtl::OUString aString; + OUString aString; pFormatter->GetInputLineString( fValue, nFormat, aString ); rBuffer.append( aString ); } -rtl::OUString lcl_GetSpecialNumGroupName( double fValue, bool bFirst, sal_Unicode cDecSeparator, +OUString lcl_GetSpecialNumGroupName( double fValue, bool bFirst, sal_Unicode cDecSeparator, bool bDateValues, SvNumberFormatter* pFormatter ) { OSL_ENSURE( cDecSeparator != 0, "cDecSeparator not initialized" ); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append((sal_Unicode)( bFirst ? '<' : '>' )); if ( bDateValues ) lcl_AppendDateStr( aBuffer, fValue, pFormatter ); @@ -218,7 +218,7 @@ rtl::OUString lcl_GetSpecialNumGroupName( double fValue, bool bFirst, sal_Unicod return aBuffer.makeStringAndClear(); } -rtl::OUString lcl_GetNumGroupName( +OUString lcl_GetNumGroupName( double fStartValue, const ScDPNumGroupInfo& rInfo, sal_Unicode cDecSep, SvNumberFormatter* pFormatter) { @@ -244,7 +244,7 @@ rtl::OUString lcl_GetNumGroupName( fEndValue = rInfo.mfEnd; } - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if ( rInfo.mbDateValues ) { lcl_AppendDateStr( aBuffer, fStartValue, pFormatter ); @@ -265,7 +265,7 @@ rtl::OUString lcl_GetNumGroupName( } -rtl::OUString ScDPUtil::getNumGroupName( +OUString ScDPUtil::getNumGroupName( double fValue, const ScDPNumGroupInfo& rInfo, sal_Unicode cDecSep, SvNumberFormatter* pFormatter) { if ( fValue < rInfo.mfStart && !rtl::math::approxEqual( fValue, rInfo.mfStart ) ) diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 897e93a601f5..97dea58f6725 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -242,11 +242,11 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : rPool.FreezeIdRanges(); // the pool is also used directly SdrLayerAdmin& rAdmin = GetLayerAdmin(); - rAdmin.NewLayer(rtl::OUString("vorne"), SC_LAYER_FRONT); - rAdmin.NewLayer(rtl::OUString("hinten"), SC_LAYER_BACK); - rAdmin.NewLayer(rtl::OUString("intern"), SC_LAYER_INTERN); - rAdmin.NewLayer(rtl::OUString("Controls"), SC_LAYER_CONTROLS); - rAdmin.NewLayer(rtl::OUString("hidden"), SC_LAYER_HIDDEN); + rAdmin.NewLayer(OUString("vorne"), SC_LAYER_FRONT); + rAdmin.NewLayer(OUString("hinten"), SC_LAYER_BACK); + rAdmin.NewLayer(OUString("intern"), SC_LAYER_INTERN); + rAdmin.NewLayer(OUString("Controls"), SC_LAYER_CONTROLS); + rAdmin.NewLayer(OUString("hidden"), SC_LAYER_HIDDEN); // "Controls" is new - must also be created when loading // Link fuer URL-Fields setzen @@ -1407,13 +1407,13 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const //#i110034# charts need correct sheet names for xml range conversion during load //so the target sheet name is temporarily renamed (if we have any SdrObjects) - rtl::OUString aDestTabName; + OUString aDestTabName; sal_Bool bRestoreDestTabName = false; if( pOldObject && !bSameDoc && !bDestClip ) { if( pDoc && pClipDoc ) { - rtl::OUString aSourceTabName; + OUString aSourceTabName; if( pClipDoc->GetName( nSourceTab, aSourceTabName ) && pDoc->GetName( nDestTab, aDestTabName ) ) { diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index f6bf3a1c69d8..7bd078575775 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -275,7 +275,7 @@ void adjustRangeName(ScToken* pToken, ScDocument& rNewDoc, const ScDocument* pOl { bool bOldGlobal = pToken->IsGlobal(); SCTAB aOldTab = aOldPos.Tab(); - rtl::OUString aRangeName; + OUString aRangeName; int nOldIndex = pToken->GetIndex(); ScRangeData* pOldRangeData = NULL; @@ -354,7 +354,7 @@ void adjustDBRange(ScToken* pToken, ScDocument& rNewDoc, const ScDocument* pOldD ScDBData* pDBData = aOldNamedDBs.findByIndex(pToken->GetIndex()); if (!pDBData) return; //invalid index - rtl::OUString aDBName = pDBData->GetUpperName(); + OUString aDBName = pDBData->GetUpperName(); //search in new document ScDBCollection* pNewDBCollection = rNewDoc.GetDBCollection(); @@ -386,7 +386,7 @@ ScFormulaCellGroup::~ScFormulaCellGroup() // ============================================================================ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, - const rtl::OUString& rFormula, + const OUString& rFormula, const FormulaGrammar::Grammar eGrammar, sal_uInt8 cMatInd ) : ScBaseCell( CELLTYPE_FORMULA ), @@ -615,12 +615,12 @@ ScFormulaVectorState ScFormulaCell::GetVectorState() const return pCode->GetVectorState(); } -void ScFormulaCell::GetFormula( rtl::OUStringBuffer& rBuffer, +void ScFormulaCell::GetFormula( OUStringBuffer& rBuffer, const FormulaGrammar::Grammar eGrammar ) const { if( pCode->GetCodeError() && !pCode->GetLen() ) { - rBuffer = rtl::OUStringBuffer( ScGlobal::GetErrorString( pCode->GetCodeError())); + rBuffer = OUStringBuffer( ScGlobal::GetErrorString( pCode->GetCodeError())); return; } else if( cMatrixFlag == MM_REFERENCE ) @@ -675,9 +675,9 @@ void ScFormulaCell::GetFormula( rtl::OUStringBuffer& rBuffer, } } -void ScFormulaCell::GetFormula( rtl::OUString& rFormula, const FormulaGrammar::Grammar eGrammar ) const +void ScFormulaCell::GetFormula( OUString& rFormula, const FormulaGrammar::Grammar eGrammar ) const { - rtl::OUStringBuffer rBuffer( rFormula ); + OUStringBuffer rBuffer( rFormula ); GetFormula( rBuffer, eGrammar ); rFormula = rBuffer.makeStringAndClear(); } @@ -697,7 +697,7 @@ void ScFormulaCell::GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ) } } -void ScFormulaCell::Compile( const rtl::OUString& rFormula, bool bNoListening, +void ScFormulaCell::Compile( const OUString& rFormula, bool bNoListening, const FormulaGrammar::Grammar eGrammar ) { if ( pDocument->IsClipOrUndo() ) @@ -788,7 +788,7 @@ void ScFormulaCell::CompileXML( ScProgress& rProgress ) ScCompiler aComp( pDocument, aPos, *pCode); aComp.SetGrammar(eTempGrammar); - rtl::OUString aFormula, aFormulaNmsp; + OUString aFormula, aFormulaNmsp; aComp.CreateStringFromXMLTokenArray( aFormula, aFormulaNmsp ); pDocument->DecXMLImportedFormulaCount( aFormula.getLength() ); rProgress.SetStateCountDownOnPercent( pDocument->GetXMLImportedFormulaCount() ); @@ -1633,9 +1633,9 @@ void ScFormulaCell::AddRecalcMode( ScRecalcMode nBits ) } // Dynamically create the URLField on a mouse-over action on a hyperlink() cell. -void ScFormulaCell::GetURLResult( rtl::OUString& rURL, rtl::OUString& rCellText ) +void ScFormulaCell::GetURLResult( OUString& rURL, OUString& rCellText ) { - rtl::OUString aCellString; + OUString aCellString; Color* pColor; @@ -1702,8 +1702,8 @@ bool ScFormulaCell::IsHyperLinkCell() const EditTextObject* ScFormulaCell::CreateURLObject() { - rtl::OUString aCellText; - rtl::OUString aURL; + OUString aCellText; + OUString aURL; GetURLResult( aURL, aCellText ); return ScEditUtil::CreateURLObjectFromURL( *pDocument, aURL, aCellText ); @@ -1748,13 +1748,13 @@ double ScFormulaCell::GetValueAlways() return aResult.GetDouble(); } -rtl::OUString ScFormulaCell::GetString() +OUString ScFormulaCell::GetString() { MaybeInterpret(); if ((!pCode->GetCodeError() || pCode->GetCodeError() == errDoubleRef) && !aResult.GetResultError()) return aResult.GetString(); - return rtl::OUString(); + return OUString(); } const ScMatrix* ScFormulaCell::GetMatrix() @@ -1877,14 +1877,14 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) else { #if OSL_DEBUG_LEVEL > 0 - rtl::OUString aTmp; - rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM( + OUString aTmp; + OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM( "broken Matrix, no MatFormula at origin, Pos: ")); aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatOrg: ")); aOrg.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aMsg.getStr()); #endif return 0; // bad luck ... @@ -1910,13 +1910,13 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) #if OSL_DEBUG_LEVEL > 0 else { - rtl::OUString aTmp; - rtl::OStringBuffer aMsg( "broken Matrix, Pos: " ); + OUString aTmp; + OStringBuffer aMsg( "broken Matrix, Pos: " ); aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatOrg: ")); aOrg.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatCols: ")); aMsg.append(static_cast<sal_Int32>( nC )); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatRows: ")); @@ -2771,7 +2771,7 @@ void ScFormulaCell::CompileDBFormula( bool bCreateFormulaString ) } if ( bRecompile ) { - rtl::OUString aFormula; + OUString aFormula; GetFormula( aFormula, formula::FormulaGrammar::GRAM_NATIVE); if ( GetMatrixFlag() != MM_NONE && !aFormula.isEmpty() ) { @@ -2818,7 +2818,7 @@ void ScFormulaCell::CompileNameFormula( bool bCreateFormulaString ) } if ( bRecompile ) { - rtl::OUString aFormula; + OUString aFormula; GetFormula( aFormula, formula::FormulaGrammar::GRAM_NATIVE); if ( GetMatrixFlag() != MM_NONE && !aFormula.isEmpty() ) { diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 5facf9f16b70..44f9e65bb06e 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -112,7 +112,7 @@ void ScFuncDesc::Clear() nFIndex = 0; nCategory = 0; - sHelpId = rtl::OString(); + sHelpId = OString(); bIncomplete = false; bHasSuppressedArgs = false; } @@ -367,7 +367,7 @@ void ScFuncDesc::initArgumentInfo() const } } -::rtl::OString ScFuncDesc::getHelpId() const +OString ScFuncDesc::getHelpId() const { return sHelpId; } diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index bc665d6d099e..7d31f6f8d9ba 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -80,8 +80,6 @@ // ----------------------------------------------------------------------- -using ::rtl::OUString; -using ::rtl::OUStringBuffer; ScDocShellRef* ScGlobal::pDrawClipDocShellRef = NULL; SvxSearchItem* ScGlobal::pSearchItem = NULL; @@ -104,7 +102,7 @@ CollatorWrapper* ScGlobal::pCaseCollator = NULL; IntlWrapper* ScGlobal::pScIntlWrapper = NULL; sal_Unicode ScGlobal::cListDelimiter = ','; String* ScGlobal::pEmptyString = NULL; -::rtl::OUString* ScGlobal::pEmptyOUString = NULL; +OUString* ScGlobal::pEmptyOUString = NULL; String* ScGlobal::pStrClipDocName = NULL; SvxBrushItem* ScGlobal::pEmptyBrushItem = NULL; @@ -514,7 +512,7 @@ const String& ScGlobal::GetEmptyString() return *pEmptyString; } -const ::rtl::OUString& ScGlobal::GetEmptyOUString() +const OUString& ScGlobal::GetEmptyOUString() { return *pEmptyOUString; } @@ -530,7 +528,7 @@ ImageList* ScGlobal::GetOutlineSymbols() void ScGlobal::Init() { pEmptyString = new String; - pEmptyOUString = new ::rtl::OUString; + pEmptyOUString = new OUString; // Die Default-Sprache fuer Zahlenformate (ScGlobal::eLnge) // muss immer LANGUAGE_SYSTEM sein @@ -735,7 +733,7 @@ String ScGlobal::GetCharsetString( CharSet eVal ) default: return OUString::number( eVal ); } - return rtl::OUString::createFromAscii(pChar); + return OUString::createFromAscii(pChar); } //------------------------------------------------------------------------ @@ -803,7 +801,7 @@ const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr, OUString ScGlobal::addToken(const OUString& rTokenList, const OUString& rToken, sal_Unicode cSep, sal_Int32 nSepCount, bool bForceSep) { - rtl::OUStringBuffer aBuf(rTokenList); + OUStringBuffer aBuf(rTokenList); if( bForceSep || (!rToken.isEmpty() && !rTokenList.isEmpty()) ) comphelper::string::padToLength(aBuf, aBuf.getLength() + nSepCount, cSep); aBuf.append(rToken); @@ -822,7 +820,7 @@ void ScGlobal::AddQuotes( OUString& rString, sal_Unicode cQuote, bool bEscapeEmb sal_Unicode pQ[3]; pQ[0] = pQ[1] = cQuote; pQ[2] = 0; - rtl::OUString aQuotes( pQ ); + OUString aQuotes( pQ ); rString = rString.replaceAll( OUString(cQuote), aQuotes); } rString = OUString( cQuote ) + OUString( cQuote ); @@ -838,7 +836,7 @@ void ScGlobal::EraseQuotes( OUString& rString, sal_Unicode cQuote, bool bUnescap sal_Unicode pQ[3]; pQ[0] = pQ[1] = cQuote; pQ[2] = 0; - rtl::OUString aQuotes( pQ ); + OUString aQuotes( pQ ); rString = rString.replaceAll( aQuotes, OUString(cQuote)); } } @@ -943,7 +941,7 @@ void ScGlobal::OpenURL( const String& rURL, const String& rTarget ) SfxStringItem aUrl( SID_FILE_NAME, rURL ); SfxStringItem aTarget( SID_TARGETNAME, rTarget ); - aTarget.SetValue(rtl::OUString("_blank")); + aTarget.SetValue(OUString("_blank")); SfxViewFrame* pFrame = NULL; String aReferName; if ( pScActiveViewShell ) diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index a9c2c07045f8..64c362236b94 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -377,7 +377,7 @@ String ScGlobal::GetAbsDocName( const String& rFileName, String ScGlobal::GetDocTabName( const String& rFileName, const String& rTabName ) { - String aDocTab(rtl::OUString('\'')); + String aDocTab(OUString('\'')); aDocTab += rFileName; xub_StrLen nPos = 1; while( (nPos = aDocTab.Search( '\'', nPos )) diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx index aa8734e69367..47a0c3158cd1 100644 --- a/sc/source/core/data/globalx.cxx +++ b/sc/source/core/data/globalx.cxx @@ -46,20 +46,20 @@ void ScGlobal::InitAddIns() { // multi paths separated by semicolons SvtPathOptions aPathOpt; - rtl::OUString aMultiPath = aPathOpt.GetAddinPath(); + OUString aMultiPath = aPathOpt.GetAddinPath(); if (aMultiPath.isEmpty()) return; sal_Int32 nTokens = comphelper::string::getTokenCount(aMultiPath, ';'); for (sal_Int32 j = 0; j < nTokens; ++j) { - rtl::OUString aPath = comphelper::string::getToken(aMultiPath, j, ';'); + OUString aPath = comphelper::string::getToken(aMultiPath, j, ';'); if (aPath.isEmpty()) continue; // use LocalFileHelper to convert the path to a URL that always points // to the file on the server - rtl::OUString aUrl; + OUString aUrl; if ( utl::LocalFileHelper::ConvertPhysicalNameToURL( aPath, aUrl ) ) aPath = aUrl; @@ -72,7 +72,7 @@ void ScGlobal::InitAddIns() Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext() ); Reference< sdbc::XResultSet > xResultSet; - Sequence< rtl::OUString > aProps; + Sequence< OUString > aProps; try { xResultSet = aCnt.createCursor( @@ -95,7 +95,7 @@ void ScGlobal::InitAddIns() { do { - rtl::OUString aId = xContentAccess->queryContentIdentifierString(); + OUString aId = xContentAccess->queryContentIdentifierString(); InitExternalFunc( aId ); } while ( xResultSet->next() ); @@ -127,7 +127,7 @@ String ScGlobal::GetOrdinalSuffix( sal_Int32 nNumber) { xOrdinalSuffix = i18n::OrdinalSuffix::create( ::comphelper::getProcessComponentContext() ); } - uno::Sequence< rtl::OUString > aSuffixes = xOrdinalSuffix->getOrdinalSuffix( nNumber, + uno::Sequence< OUString > aSuffixes = xOrdinalSuffix->getOrdinalSuffix( nNumber, ScGlobal::pLocaleData->getLanguageTag().getLocale()); if ( aSuffixes.getLength() > 0 ) return aSuffixes[0]; diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx index d4156bb8a054..e8aed7776d99 100644 --- a/sc/source/core/data/pivot2.cxx +++ b/sc/source/core/data/pivot2.cxx @@ -44,7 +44,6 @@ using std::endl; #endif using ::com::sun::star::sheet::DataPilotFieldReference; -using ::rtl::OUString; using ::std::vector; namespace { diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index ea885b31dd26..cff5084ddf0a 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -48,8 +48,6 @@ #include <utility> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -468,7 +466,7 @@ struct ScCaptionInitData SfxItemSetPtr mxItemSet; /// Caption object formatting. OutlinerParaObjPtr mxOutlinerObj; /// Text object with all text portion formatting. - ::rtl::OUString maSimpleText; /// Simple text without formatting. + OUString maSimpleText; /// Simple text without formatting. Point maCaptionOffset; /// Caption position relative to cell corner. Size maCaptionSize; /// Size of the caption object. bool mbDefaultPosSize; /// True = use default position and size for caption. diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx index 55b4c63b2838..231f3a2cf9a7 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -21,12 +21,12 @@ #include <com/sun/star/script/vba/VBAEventId.hpp> // ----------------------------------------------------------------------- -rtl::OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) +OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) { if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT) { OSL_FAIL("invalid event number"); - return rtl::OUString(); + return OUString(); } static const sal_Char* aEventNames[] = @@ -39,7 +39,7 @@ rtl::OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) "OnChange", // SC_SHEETEVENT_CHANGE "OnCalculate" // SC_SHEETEVENT_CALCULATE }; - return rtl::OUString::createFromAscii(aEventNames[nEvent]); + return OUString::createFromAscii(aEventNames[nEvent]); } sal_Int32 ScSheetEvents::GetVbaSheetEventId(sal_Int32 nEvent) @@ -105,17 +105,17 @@ const ScSheetEvents& ScSheetEvents::operator=(const ScSheetEvents& rOther) Clear(); if (rOther.mpScriptNames) { - mpScriptNames = new rtl::OUString*[SC_SHEETEVENT_COUNT]; + mpScriptNames = new OUString*[SC_SHEETEVENT_COUNT]; for (sal_Int32 nEvent=0; nEvent<SC_SHEETEVENT_COUNT; ++nEvent) if (rOther.mpScriptNames[nEvent]) - mpScriptNames[nEvent] = new rtl::OUString(*rOther.mpScriptNames[nEvent]); + mpScriptNames[nEvent] = new OUString(*rOther.mpScriptNames[nEvent]); else mpScriptNames[nEvent] = NULL; } return *this; } -const rtl::OUString* ScSheetEvents::GetScript(sal_Int32 nEvent) const +const OUString* ScSheetEvents::GetScript(sal_Int32 nEvent) const { if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT) { @@ -128,7 +128,7 @@ const rtl::OUString* ScSheetEvents::GetScript(sal_Int32 nEvent) const return NULL; } -void ScSheetEvents::SetScript(sal_Int32 nEvent, const rtl::OUString* pNew) +void ScSheetEvents::SetScript(sal_Int32 nEvent, const OUString* pNew) { if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT) { @@ -138,13 +138,13 @@ void ScSheetEvents::SetScript(sal_Int32 nEvent, const rtl::OUString* pNew) if (!mpScriptNames) { - mpScriptNames = new rtl::OUString*[SC_SHEETEVENT_COUNT]; + mpScriptNames = new OUString*[SC_SHEETEVENT_COUNT]; for (sal_Int32 nEventIdx=0; nEventIdx<SC_SHEETEVENT_COUNT; ++nEventIdx) mpScriptNames[nEventIdx] = NULL; } delete mpScriptNames[nEvent]; if (pNew) - mpScriptNames[nEvent] = new rtl::OUString(*pNew); + mpScriptNames[nEvent] = new OUString(*pNew); else mpScriptNames[nEvent] = NULL; } diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index e7aa9fc18273..99c1774878d0 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -59,7 +59,7 @@ void ScSortParam::Clear() bHasHeader=bCaseSens=bUserDef=bNaturalSort = false; bByRow=bIncludePattern=bInplace = true; aCollatorLocale = ::com::sun::star::lang::Locale(); - aCollatorAlgorithm = ::rtl::OUString(); + aCollatorAlgorithm = OUString(); aKeyState.bDoSort = false; aKeyState.nField = 0; diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 546e5b9c0490..99f14d65ba08 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -437,7 +437,7 @@ void ScStyleSheetPool::CreateStandardStyles() // Kopfzeile: // [\TABELLE\ (\DATEI\)][leer][\DATUM\, \ZEIT\] //---------------------------------------- - aStr = rtl::OUString(" ()"); + aStr = OUString(" ()"); pEdEngine->SetText( aStr ); pEdEngine->QuickInsertField( SvxFieldItem(SvxFileField(), EE_FEATURE_FIELD), ESelection(0,2,0,2) ); pEdEngine->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection() ); @@ -445,7 +445,7 @@ void ScStyleSheetPool::CreateStandardStyles() pHeaderItem->SetLeftArea( *pTxtObj ); pHeaderItem->SetCenterArea( *pEmptyTxtObj ); DELETEZ( pTxtObj ); - aStr = rtl::OUString(", "); + aStr = OUString(", "); pEdEngine->SetText( aStr ); pEdEngine->QuickInsertField( SvxFieldItem(SvxTimeField(), EE_FEATURE_FIELD), ESelection(0,2,0,2) ); pEdEngine->QuickInsertField( SvxFieldItem(SvxDateField(Date( Date::SYSTEM ),SVXDATETYPE_VAR), EE_FEATURE_FIELD), diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 1415acd05089..3ef1b42b9c76 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -325,7 +325,7 @@ const String& ScStyleSheet::GetFollow() const bool ScStyleSheet::SetName( const String& rNew ) { - String aFileStdName = rtl::OUString(STRING_STANDARD); + String aFileStdName = OUString(STRING_STANDARD); if ( rNew == aFileStdName && aFileStdName != ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) return false; else diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 1004a7c52819..06a3e3969ac2 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -220,7 +220,7 @@ bool SetOptimalHeightsToRows(OptimalHeightsFuncObjBase& rFuncObj, // ----------------------------------------------------------------------- -ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const rtl::OUString& rNewName, +ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName, bool bColInfo, bool bRowInfo ) : aName( rNewName ), aCodeName( rNewName ), @@ -339,20 +339,20 @@ ScTable::~ScTable() DestroySortCollator(); } -void ScTable::GetName( rtl::OUString& rName ) const +void ScTable::GetName( OUString& rName ) const { rName = aName; } -void ScTable::SetName( const rtl::OUString& rNewName ) +void ScTable::SetName( const OUString& rNewName ) { aName = rNewName; - aUpperName = rtl::OUString(); // invalidated if the name is changed + aUpperName = OUString(); // invalidated if the name is changed // SetStreamValid is handled in ScDocument::RenameTab } -const rtl::OUString& ScTable::GetUpperName() const +const OUString& ScTable::GetUpperName() const { if (aUpperName.isEmpty() && !aName.isEmpty()) aUpperName = ScGlobal::pCharClass->uppercase(aName); diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index f7521c2f6077..fd0db12f4d72 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1397,12 +1397,12 @@ void ScTable::SetValue( SCCOL nCol, SCROW nRow, const double& rVal ) } -void ScTable::GetString( SCCOL nCol, SCROW nRow, rtl::OUString& rString ) const +void ScTable::GetString( SCCOL nCol, SCROW nRow, OUString& rString ) const { if (ValidColRow(nCol,nRow)) aCol[nCol].GetString( nRow, rString ); else - rString = rtl::OUString(); + rString = OUString(); } const OUString* ScTable::GetStringCell( SCCOL nCol, SCROW nRow ) const @@ -1421,12 +1421,12 @@ double* ScTable::GetValueCell( SCCOL nCol, SCROW nRow ) return aCol[nCol].GetValueCell(nRow); } -void ScTable::GetInputString( SCCOL nCol, SCROW nRow, rtl::OUString& rString ) const +void ScTable::GetInputString( SCCOL nCol, SCROW nRow, OUString& rString ) const { if (ValidColRow(nCol,nRow)) aCol[nCol].GetInputString( nRow, rString ); else - rString = rtl::OUString(); + rString = OUString(); } @@ -1453,12 +1453,12 @@ void ScTable::RemoveEditTextCharAttribs( SCCOL nCol, SCROW nRow, const ScPattern return aCol[nCol].RemoveEditTextCharAttribs(nRow, rAttr); } -void ScTable::GetFormula( SCCOL nCol, SCROW nRow, rtl::OUString& rFormula ) const +void ScTable::GetFormula( SCCOL nCol, SCROW nRow, OUString& rFormula ) const { if (ValidColRow(nCol,nRow)) aCol[nCol].GetFormula( nRow, rFormula ); else - rFormula = rtl::OUString(); + rFormula = OUString(); } const ScTokenArray* ScTable::GetFormulaTokens( SCCOL nCol, SCROW nRow ) const @@ -3466,7 +3466,7 @@ bool ScTable::RefVisible(ScFormulaCell* pCell) } -void ScTable::GetUpperCellString(SCCOL nCol, SCROW nRow, rtl::OUString& rStr) +void ScTable::GetUpperCellString(SCCOL nCol, SCROW nRow, OUString& rStr) { GetInputString(nCol, nRow, rStr); rStr = ScGlobal::pCharClass->uppercase(rStr.trim()); diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index ea82e75f9bd3..e4d89f04e90e 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -83,7 +83,7 @@ static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* xub_StrLen nNum = 0; if ( p[nNum] == '-' ) nNum = nNeg = 1; - while ( p[nNum] && CharClass::isAsciiNumeric( rtl::OUString(p[nNum]) ) ) + while ( p[nNum] && CharClass::isAsciiNumeric( OUString(p[nNum]) ) ) nNum++; sal_Unicode cNext = p[nNum]; // 0 if at the end @@ -92,7 +92,7 @@ static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* // #i5550# If there are numbers at the beginning and the end, // prefer the one at the beginning only if it's followed by a space. // Otherwise, use the number at the end, to enable things like IP addresses. - if ( nNum > nNeg && ( cNext == 0 || cNext == ' ' || !CharClass::isAsciiNumeric(rtl::OUString(cLast)) ) ) + if ( nNum > nNeg && ( cNext == 0 || cNext == ' ' || !CharClass::isAsciiNumeric(OUString(cLast)) ) ) { // number at the beginning nVal = aValue.Copy( 0, nNum ).ToInt32(); // any number with a leading zero sets the minimum number of digits @@ -105,7 +105,7 @@ static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* { nNeg = 0; xub_StrLen nEnd = nNum = aValue.Len() - 1; - while ( nNum && CharClass::isAsciiNumeric( rtl::OUString(p[nNum]) ) ) + while ( nNum && CharClass::isAsciiNumeric( OUString(p[nNum]) ) ) nNum--; if ( p[nNum] == '-' ) { @@ -326,14 +326,14 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } else if (eCellType == CELLTYPE_STRING || eCellType == CELLTYPE_EDIT) { - rtl::OUString aStr; + OUString aStr; GetString(nCol, nRow, aStr); // fdo#39500 don't deduce increment from multiple equal list entries bool bAllSame = true; for (sal_uInt16 i = 0; i < nCount; ++i) { - rtl::OUString aTestStr; + OUString aTestStr; GetString(static_cast<SCCOL>(nCol + i* nAddX), static_cast<SCROW>(nRow + i * nAddY), aTestStr); if(aStr != aTestStr) { diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index 7e3fd7f57214..cbffff1560b4 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -1097,11 +1097,11 @@ void ScTable::EndListening( const ScAddress& rAddress, SvtListener* pListener ) aCol[rAddress.Col()].EndListening( *pListener, rAddress.Row() ); } -void ScTable::SetPageStyle( const rtl::OUString& rName ) +void ScTable::SetPageStyle( const OUString& rName ) { if ( aPageStyle != rName ) { - rtl::OUString aStrNew = rName; + OUString aStrNew = rName; SfxStyleSheetBasePool* pStylePool = pDocument->GetStyleSheetPool(); SfxStyleSheetBase* pNewStyle = pStylePool->Find( aStrNew, SFX_STYLE_FAMILY_PAGE ); diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 0354e09d8264..788c1509ac77 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -40,7 +40,7 @@ using ::com::sun::star::util::SearchOptions; namespace { -bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, rtl::OUString& rVal ) +bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, OUString& rVal ) { // true = more than 1 paragraph @@ -54,13 +54,13 @@ bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, rtl::OUSt } bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; bool bDoSearch = true; bool bDoBack = rSearchItem.GetBackward(); - rtl::OUString aString; + OUString aString; ScBaseCell* pCell; if (rSearchItem.GetSelection()) bDoSearch = rMark.IsCellMarked(nCol, nRow); @@ -157,14 +157,14 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo if (rSearchItem.GetRegExp()) { pSearchText->ReplaceBackReferences( sReplStr, aString, aSearchResult ); - rtl::OUStringBuffer aStrBuffer(aString); + OUStringBuffer aStrBuffer(aString); aStrBuffer.remove(nStart, nEnd-nStart+1); aStrBuffer.insert(nStart, sReplStr); aString = aStrBuffer.makeStringAndClear(); } else { - rtl::OUStringBuffer aStrBuffer(aString); + OUStringBuffer aStrBuffer(aString); aStrBuffer.remove(nStart, nEnd-nStart+1); aStrBuffer.insert(nStart, rSearchItem.GetReplaceString()); aString = aStrBuffer.makeStringAndClear(); @@ -273,7 +273,7 @@ void ScTable::SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bFo } bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; bool bAll = (rSearchItem.GetCommand() == SVX_SEARCHCMD_FIND_ALL) @@ -421,7 +421,7 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, } bool ScTable::SearchAll(const SvxSearchItem& rSearchItem, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = true; SCCOL nCol = 0; @@ -443,7 +443,7 @@ bool ScTable::SearchAll(const SvxSearchItem& rSearchItem, const ScMarkData& rMar } bool ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; SCCOL nCol = rCol; @@ -473,7 +473,7 @@ bool ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow bool ScTable::ReplaceAll( const SvxSearchItem& rSearchItem, const ScMarkData& rMark, ScRangeList& rMatchedRanges, - rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + OUString& rUndoStr, ScDocument* pUndoDoc) { SCCOL nCol = 0; SCROW nRow = -1; @@ -664,7 +664,7 @@ bool ScTable::ReplaceAllStyle( bool ScTable::SearchAndReplace( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { sal_uInt16 nCommand = rSearchItem.GetCommand(); bool bFound = false; @@ -728,7 +728,7 @@ bool ScTable::SearchAndReplace( bool ScTable::SearchAndReplaceEmptyCells( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { SCCOL nColStart, nColEnd; SCROW nRowStart, nRowEnd; @@ -808,7 +808,7 @@ bool ScTable::SearchAndReplaceEmptyCells( namespace { bool lcl_maybeReplaceCellString( - ScColumn& rColObj, SCCOL& rCol, SCROW& rRow, rtl::OUString& rUndoStr, SCCOL nCol, SCROW nRow, const SvxSearchItem& rSearchItem) + ScColumn& rColObj, SCCOL& rCol, SCROW& rRow, OUString& rUndoStr, SCCOL nCol, SCROW nRow, const SvxSearchItem& rSearchItem) { ScBaseCell* pCell = rColObj.GetCell(nRow); if (!pCell || pCell->GetCellType() == CELLTYPE_NOTE) @@ -820,7 +820,7 @@ bool lcl_maybeReplaceCellString( rSearchItem.GetReplaceString().Len()) { rColObj.Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString())); - rUndoStr = rtl::OUString(); + rUndoStr = OUString(); } return true; } @@ -831,7 +831,7 @@ bool lcl_maybeReplaceCellString( bool ScTable::SearchRangeForEmptyCell( const ScRange& rRange, const SvxSearchItem& rSearchItem, - SCCOL& rCol, SCROW& rRow, rtl::OUString& rUndoStr) + SCCOL& rCol, SCROW& rRow, OUString& rUndoStr) { sal_uInt16 nCmd = rSearchItem.GetCommand(); bool bSkipFiltered = rSearchItem.IsSearchFiltered(); @@ -941,7 +941,7 @@ bool ScTable::SearchRangeForEmptyCell( bool ScTable::SearchRangeForAllEmptyCells( const ScRange& rRange, const SvxSearchItem& rSearchItem, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; bool bReplace = (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL) && diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 750aa10cfa8e..979454027f0c 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -31,8 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::vector; // ============================================================================ diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 588e05b4abf8..258e7e02b074 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -201,12 +201,12 @@ sal_Bool ScValidationData::DoScript( const ScAddress& rPos, const String& rInput if ( bIsValue ) aParams[0] = ::com::sun::star::uno::makeAny( nValue ); else - aParams[0] = ::com::sun::star::uno::makeAny( ::rtl::OUString( aValStr ) ); + aParams[0] = ::com::sun::star::uno::makeAny( OUString( aValStr ) ); // 2) Position der Zelle String aPosStr; rPos.Format( aPosStr, SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention() ); - aParams[1] = ::com::sun::star::uno::makeAny( ::rtl::OUString( aPosStr ) ); + aParams[1] = ::com::sun::star::uno::makeAny( OUString( aPosStr ) ); // use link-update flag to prevent closing the document // while the macro is running diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx index 871578041841..6b484dea6ac8 100644 --- a/sc/source/core/inc/addinhelpid.hxx +++ b/sc/source/core/inc/addinhelpid.hxx @@ -36,13 +36,13 @@ private: ScUnoAddInHelpIdGenerator(); // disabled public: - ScUnoAddInHelpIdGenerator( const ::rtl::OUString& rServiceName ); + ScUnoAddInHelpIdGenerator( const OUString& rServiceName ); /** Sets service name of the AddIn. Has to be done before requesting help IDs. */ - void SetServiceName( const ::rtl::OUString& rServiceName ); + void SetServiceName( const OUString& rServiceName ); /** @return The help ID of the function with given built-in name or 0 if not found. */ - rtl::OString GetHelpId( const ::rtl::OUString& rFuncName ) const; + OString GetHelpId( const OUString& rFuncName ) const; }; diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx index 3269f85d4169..05eddd11fd39 100644 --- a/sc/source/core/inc/addinlis.hxx +++ b/sc/source/core/inc/addinlis.hxx @@ -75,13 +75,13 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx index d7b6f37dd459..9802196ef5d3 100644 --- a/sc/source/core/inc/cellkeytranslator.hxx +++ b/sc/source/core/inc/cellkeytranslator.hxx @@ -64,7 +64,7 @@ class ScCellKeywordTranslator { public: static void transKeyword(String& rName, const ::com::sun::star::lang::Locale* pLocale = NULL, OpCode eOpCode = ocNone); - static void transKeyword(rtl::OUString& rName, const ::com::sun::star::lang::Locale* pLocale = NULL, OpCode eOpCode = ocNone); + static void transKeyword(OUString& rName, const ::com::sun::star::lang::Locale* pLocale = NULL, OpCode eOpCode = ocNone); ~ScCellKeywordTranslator(); private: diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 33e48c371054..1782f443d3cb 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -53,7 +53,7 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const = 0; + virtual OUString getString(SCCOL nCol, SCROW nRow) const = 0; virtual SCCOL getFirstFieldColumn() const = 0; @@ -67,7 +67,7 @@ public: * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const = 0; - virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const = 0; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const = 0; virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const = 0; virtual bool isRangeEqual(const ScRange& rRange) const = 0; @@ -110,7 +110,7 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const; + virtual OUString getString(SCCOL nCol, SCROW nRow) const; virtual SCCOL getFirstFieldColumn() const; /** @@ -123,7 +123,7 @@ public: * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const; - virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const; virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const; virtual bool isRangeEqual(const ScRange& rRange) const; @@ -151,7 +151,7 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const; + virtual OUString getString(SCCOL nCol, SCROW nRow) const; virtual SCCOL getFirstFieldColumn() const; @@ -165,7 +165,7 @@ public: * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const; - virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const; virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const; virtual bool isRangeEqual(const ScRange& rRange) const; diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index e3eeb4a2b9c8..fd4c27e40b8d 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -54,9 +54,9 @@ using namespace com::sun::star; #define SC_CALLERPOS_NONE (-1) -ScUnoAddInFuncData::ScUnoAddInFuncData( const ::rtl::OUString& rNam, const ::rtl::OUString& rLoc, - const ::rtl::OUString& rDesc, - sal_uInt16 nCat, const rtl::OString& sHelp, +ScUnoAddInFuncData::ScUnoAddInFuncData( const OUString& rNam, const OUString& rLoc, + const OUString& rDesc, + sal_uInt16 nCat, const OString& sHelp, const uno::Reference<reflection::XIdlMethod>& rFunc, const uno::Any& rO, long nAC, const ScAddInArgDesc* pAD, @@ -104,7 +104,7 @@ const uno::Sequence<sheet::LocalizedName>& ScUnoAddInFuncData::GetCompNames() co uno::Reference<sheet::XCompatibilityNames> xComp( xAddIn, uno::UNO_QUERY ); if ( xComp.is() && xFunction.is() ) { - rtl::OUString aMethodName = xFunction->getName(); + OUString aMethodName = xFunction->getName(); aCompNames = xComp->getCompatibilityNames( aMethodName ); // change all locale entries to default case @@ -155,7 +155,7 @@ void ScUnoAddInFuncData::SetCompNames( const uno::Sequence< sheet::LocalizedName bCompInitialized = sal_True; } -sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, ::rtl::OUString& rRetExcelName ) const +sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, OUString& rRetExcelName ) const { const uno::Sequence<sheet::LocalizedName>& rSequence = GetCompNames(); long nSeqLen = rSequence.getLength(); @@ -165,10 +165,10 @@ sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, ::rtl::OUStri long i; /* FIXME-BCP47: we may want to handle language tags here as well. */ - rtl::OUString aLangStr, aCountryStr; + OUString aLangStr, aCountryStr; LanguageTag( eDestLang ).getIsoLanguageCountry( aLangStr, aCountryStr ); - rtl::OUString aUserLang = aLangStr.toAsciiLowerCase(); - rtl::OUString aUserCountry = aCountryStr.toAsciiUpperCase(); + OUString aUserLang = aLangStr.toAsciiLowerCase(); + OUString aUserCountry = aCountryStr.toAsciiUpperCase(); // first check for match of both language and country @@ -326,7 +326,7 @@ void ScUnoAddInCollection::Initialize() } // ----------------------------------------------------------------------------- -static sal_uInt16 lcl_GetCategory( const ::rtl::OUString& rName ) +static sal_uInt16 lcl_GetCategory( const OUString& rName ) { static const sal_Char* aFuncNames[SC_FUNCGROUP_COUNT] = { @@ -375,26 +375,26 @@ void ScUnoAddInCollection::ReadConfiguration() ScAddInCfg& rAddInConfig = SC_MOD()->GetAddInCfg(); // additional, temporary config item for the compatibility names - ScLinkConfigItem aAllLocalesConfig( rtl::OUString(CFGPATH_ADDINS), CONFIG_MODE_ALL_LOCALES ); + ScLinkConfigItem aAllLocalesConfig( OUString(CFGPATH_ADDINS), CONFIG_MODE_ALL_LOCALES ); // CommitLink is not used (only reading values) - const rtl::OUString sSlash('/'); + const OUString sSlash('/'); // get the list of add-ins (services) - rtl::OUString aEmptyString; - uno::Sequence<rtl::OUString> aServiceNames = rAddInConfig.GetNodeNames( aEmptyString ); + OUString aEmptyString; + uno::Sequence<OUString> aServiceNames = rAddInConfig.GetNodeNames( aEmptyString ); sal_Int32 nServiceCount = aServiceNames.getLength(); for ( sal_Int32 nService = 0; nService < nServiceCount; nService++ ) { - rtl::OUString aServiceName = aServiceNames[nService]; + OUString aServiceName = aServiceNames[nService]; ScUnoAddInHelpIdGenerator aHelpIdGenerator( aServiceName ); - rtl::OUString aFunctionsPath = aServiceName; + OUString aFunctionsPath = aServiceName; aFunctionsPath += sSlash; - aFunctionsPath += rtl::OUString(CFGSTR_ADDINFUNCTIONS); + aFunctionsPath += OUString(CFGSTR_ADDINFUNCTIONS); - uno::Sequence<rtl::OUString> aFunctionNames = rAddInConfig.GetNodeNames( aFunctionsPath ); + uno::Sequence<OUString> aFunctionNames = rAddInConfig.GetNodeNames( aFunctionsPath ); sal_Int32 nNewCount = aFunctionNames.getLength(); // allocate pointers @@ -422,41 +422,41 @@ void ScUnoAddInCollection::ReadConfiguration() //! get the function information in a single call for all functions? - const rtl::OUString* pFuncNameArray = aFunctionNames.getConstArray(); + const OUString* pFuncNameArray = aFunctionNames.getConstArray(); for ( sal_Int32 nFuncPos = 0; nFuncPos < nNewCount; nFuncPos++ ) { ppFuncData[nFuncPos+nOld] = NULL; // stored function name: (service name).(function) - rtl::OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+pFuncNameArray[nFuncPos].getLength()); + OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+pFuncNameArray[nFuncPos].getLength()); aFuncNameBuffer.append(aServiceName); aFuncNameBuffer.append('.'); aFuncNameBuffer.append(pFuncNameArray[nFuncPos]); - rtl::OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); + OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); // skip the function if already known (read from old AddIn service) if ( pExactHashMap->find( aFuncName ) == pExactHashMap->end() ) { - rtl::OUString aLocalName; - rtl::OUString aDescription; + OUString aLocalName; + OUString aDescription; sal_uInt16 nCategory = ID_FUNCTION_GRP_ADDINS; // get direct information on the function - rtl::OUString aFuncPropPath = aFunctionsPath; + OUString aFuncPropPath = aFunctionsPath; aFuncPropPath += sSlash; aFuncPropPath += pFuncNameArray[nFuncPos]; aFuncPropPath += sSlash; - uno::Sequence<rtl::OUString> aFuncPropNames(CFG_FUNCPROP_COUNT); - rtl::OUString* pNameArray = aFuncPropNames.getArray(); + uno::Sequence<OUString> aFuncPropNames(CFG_FUNCPROP_COUNT); + OUString* pNameArray = aFuncPropNames.getArray(); pNameArray[CFG_FUNCPROP_DISPLAYNAME] = aFuncPropPath; - pNameArray[CFG_FUNCPROP_DISPLAYNAME] += rtl::OUString(CFGSTR_DISPLAYNAME); + pNameArray[CFG_FUNCPROP_DISPLAYNAME] += OUString(CFGSTR_DISPLAYNAME); pNameArray[CFG_FUNCPROP_DESCRIPTION] = aFuncPropPath; - pNameArray[CFG_FUNCPROP_DESCRIPTION] += rtl::OUString(CFGSTR_DESCRIPTION); + pNameArray[CFG_FUNCPROP_DESCRIPTION] += OUString(CFGSTR_DESCRIPTION); pNameArray[CFG_FUNCPROP_CATEGORY] = aFuncPropPath; - pNameArray[CFG_FUNCPROP_CATEGORY] += rtl::OUString(CFGSTR_CATEGORY); + pNameArray[CFG_FUNCPROP_CATEGORY] += OUString(CFGSTR_CATEGORY); uno::Sequence<uno::Any> aFuncProperties = rAddInConfig.GetProperties( aFuncPropNames ); if ( aFuncProperties.getLength() == CFG_FUNCPROP_COUNT ) @@ -464,7 +464,7 @@ void ScUnoAddInCollection::ReadConfiguration() aFuncProperties[CFG_FUNCPROP_DISPLAYNAME] >>= aLocalName; aFuncProperties[CFG_FUNCPROP_DESCRIPTION] >>= aDescription; - rtl::OUString aCategoryName; + OUString aCategoryName; aFuncProperties[CFG_FUNCPROP_CATEGORY] >>= aCategoryName; nCategory = lcl_GetCategory( aCategoryName ); } @@ -473,9 +473,9 @@ void ScUnoAddInCollection::ReadConfiguration() uno::Sequence<sheet::LocalizedName> aCompNames; - rtl::OUString aCompPath = aFuncPropPath; - aCompPath += rtl::OUString(CFGSTR_COMPATIBILITYNAME); - uno::Sequence<rtl::OUString> aCompPropNames( &aCompPath, 1 ); + OUString aCompPath = aFuncPropPath; + aCompPath += OUString(CFGSTR_COMPATIBILITYNAME); + uno::Sequence<OUString> aCompPropNames( &aCompPath, 1 ); uno::Sequence<uno::Any> aCompProperties = aAllLocalesConfig.GetProperties( aCompPropNames ); if ( aCompProperties.getLength() == 1 ) @@ -494,7 +494,7 @@ void ScUnoAddInCollection::ReadConfiguration() // PropertyValue name is the locale (convert from string to Locale struct) - const rtl::OUString& rLocaleStr = pConfigArray[nLocale].Name; + const OUString& rLocaleStr = pConfigArray[nLocale].Name; lang::Locale& rLocale = pCompArray[nLocale].Locale; sal_Int32 nSepPos = rLocaleStr.indexOf( cLocaleSep ); if ( nSepPos >= 0 ) @@ -518,39 +518,39 @@ void ScUnoAddInCollection::ReadConfiguration() long nVisibleCount = 0; long nCallerPos = SC_CALLERPOS_NONE; - rtl::OUString aArgumentsPath = aFuncPropPath; - aArgumentsPath += rtl::OUString(CFGSTR_PARAMETERS); + OUString aArgumentsPath = aFuncPropPath; + aArgumentsPath += OUString(CFGSTR_PARAMETERS); - uno::Sequence<rtl::OUString> aArgumentNames = rAddInConfig.GetNodeNames( aArgumentsPath ); + uno::Sequence<OUString> aArgumentNames = rAddInConfig.GetNodeNames( aArgumentsPath ); sal_Int32 nArgumentCount = aArgumentNames.getLength(); if ( nArgumentCount ) { // get DisplayName and Description for each argument - uno::Sequence<rtl::OUString> aArgPropNames( nArgumentCount * 2 ); - rtl::OUString* pPropNameArray = aArgPropNames.getArray(); + uno::Sequence<OUString> aArgPropNames( nArgumentCount * 2 ); + OUString* pPropNameArray = aArgPropNames.getArray(); sal_Int32 nArgument; sal_Int32 nIndex = 0; - const rtl::OUString* pArgNameArray = aArgumentNames.getConstArray(); + const OUString* pArgNameArray = aArgumentNames.getConstArray(); for ( nArgument = 0; nArgument < nArgumentCount; nArgument++ ) { - rtl::OUString aOneArgPath = aArgumentsPath; + OUString aOneArgPath = aArgumentsPath; aOneArgPath += sSlash; aOneArgPath += pArgNameArray[nArgument]; aOneArgPath += sSlash; pPropNameArray[nIndex] = aOneArgPath; - pPropNameArray[nIndex++] += rtl::OUString(CFGSTR_DISPLAYNAME); + pPropNameArray[nIndex++] += OUString(CFGSTR_DISPLAYNAME); pPropNameArray[nIndex] = aOneArgPath; - pPropNameArray[nIndex++] += rtl::OUString(CFGSTR_DESCRIPTION); + pPropNameArray[nIndex++] += OUString(CFGSTR_DESCRIPTION); } uno::Sequence<uno::Any> aArgProperties = rAddInConfig.GetProperties( aArgPropNames ); if ( aArgProperties.getLength() == aArgPropNames.getLength() ) { const uno::Any* pPropArray = aArgProperties.getConstArray(); - rtl::OUString sDisplayName; - rtl::OUString sDescription; + OUString sDisplayName; + OUString sDescription; ScAddInArgDesc aDesc; aDesc.eType = SC_ADDINARG_NONE; // arg type is not in configuration @@ -574,7 +574,7 @@ void ScUnoAddInCollection::ReadConfiguration() } } - rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); + OString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); uno::Reference<reflection::XIdlMethod> xFunc; // remains empty uno::Any aObject; // also empty @@ -612,11 +612,11 @@ void ScUnoAddInCollection::ReadConfiguration() void ScUnoAddInCollection::LoadComponent( const ScUnoAddInFuncData& rFuncData ) { - ::rtl::OUString aFullName = rFuncData.GetOriginalName(); + OUString aFullName = rFuncData.GetOriginalName(); sal_Int32 nPos = aFullName.lastIndexOf( (sal_Unicode) '.' ); if ( nPos > 0 ) { - ::rtl::OUString aServiceName = aFullName.copy( 0, nPos ); + OUString aServiceName = aFullName.copy( 0, nPos ); uno::Reference<lang::XMultiServiceFactory> xServiceFactory = comphelper::getProcessServiceFactory(); uno::Reference<uno::XInterface> xInterface( xServiceFactory->createInstance( aServiceName ) ); @@ -626,8 +626,8 @@ void ScUnoAddInCollection::LoadComponent( const ScUnoAddInFuncData& rFuncData ) } } -sal_Bool ScUnoAddInCollection::GetExcelName( const ::rtl::OUString& rCalcName, - LanguageType eDestLang, ::rtl::OUString& rRetExcelName ) +sal_Bool ScUnoAddInCollection::GetExcelName( const OUString& rCalcName, + LanguageType eDestLang, OUString& rRetExcelName ) { const ScUnoAddInFuncData* pFuncData = GetFuncData( rCalcName ); if ( pFuncData ) @@ -635,12 +635,12 @@ sal_Bool ScUnoAddInCollection::GetExcelName( const ::rtl::OUString& rCalcName, return false; } -sal_Bool ScUnoAddInCollection::GetCalcName( const ::rtl::OUString& rExcelName, ::rtl::OUString& rRetCalcName ) +sal_Bool ScUnoAddInCollection::GetCalcName( const OUString& rExcelName, OUString& rRetCalcName ) { if (!bInitialized) Initialize(); - rtl::OUString aUpperCmp = ScGlobal::pCharClass->uppercase(rExcelName); + OUString aUpperCmp = ScGlobal::pCharClass->uppercase(rExcelName); for (long i=0; i<nFuncCount; i++) { @@ -667,7 +667,7 @@ sal_Bool ScUnoAddInCollection::GetCalcName( const ::rtl::OUString& rExcelName, : return false; } -inline sal_Bool IsTypeName( const rtl::OUString& rName, const uno::Type& rType ) +inline sal_Bool IsTypeName( const OUString& rName, const uno::Type& rType ) { return rName == rType.getTypeName(); } @@ -699,7 +699,7 @@ static sal_Bool lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass> // return type XInterface may contain a XVolatileResult //! XIdlClass needs getType() method! - rtl::OUString sName = xClass->getName(); + OUString sName = xClass->getName(); return ( IsTypeName( sName, getCppuType((uno::Reference<sheet::XVolatileResult>*)0) ) || IsTypeName( sName, getCppuType((uno::Reference<uno::XInterface>*)0) ) ); @@ -710,11 +710,11 @@ static sal_Bool lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass> // nested sequences for arrays //! XIdlClass needs getType() method! - rtl::OUString sName = xClass->getName(); + OUString sName = xClass->getName(); return ( IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<sal_Int32> >*)0) ) || IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<double> >*)0) ) || - IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<rtl::OUString> >*)0) ) || + IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<OUString> >*)0) ) || IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<uno::Any> >*)0) ) ); } } @@ -737,7 +737,7 @@ static ScAddInArgumentType lcl_GetArgType( const uno::Reference<reflection::XIdl return SC_ADDINARG_STRING; //! XIdlClass needs getType() method! - rtl::OUString sName = xClass->getName(); + OUString sName = xClass->getName(); if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<sal_Int32> >*)0) )) return SC_ADDINARG_INTEGER_ARRAY; @@ -745,7 +745,7 @@ static ScAddInArgumentType lcl_GetArgType( const uno::Reference<reflection::XIdl if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<double> >*)0) )) return SC_ADDINARG_DOUBLE_ARRAY; - if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<rtl::OUString> >*)0) )) + if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<OUString> >*)0) )) return SC_ADDINARG_STRING_ARRAY; if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<uno::Any> >*)0) )) @@ -776,7 +776,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& lang::Locale aLocale( Application::GetSettings().GetUILanguageTag().getLocale()); xAddIn->setLocale( aLocale ); - ::rtl::OUString aServiceName( xName->getServiceName() ); + OUString aServiceName( xName->getServiceName() ); ScUnoAddInHelpIdGenerator aHelpIdGenerator( xName->getServiceName() ); //! pass XIntrospection to ReadFromAddIn @@ -830,7 +830,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& if ( xClass.is() ) { //! XIdlClass needs getType() method! - rtl::OUString sName = xClass->getName(); + OUString sName = xClass->getName(); bSkip = ( IsTypeName( sName, getCppuType((uno::Reference<uno::XInterface>*)0) ) || @@ -850,14 +850,14 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& } if (!bSkip) { - rtl::OUString aFuncU = xFunc->getName(); + OUString aFuncU = xFunc->getName(); // stored function name: (service name).(function) - rtl::OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+aFuncU.getLength()); + OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+aFuncU.getLength()); aFuncNameBuffer.append(aServiceName); aFuncNameBuffer.append('.'); aFuncNameBuffer.append(aFuncU); - rtl::OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); + OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); sal_Bool bValid = sal_True; long nVisibleCount = 0; @@ -887,9 +887,9 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& sal_uInt16 nCategory = lcl_GetCategory( xAddIn->getProgrammaticCategoryName( aFuncU ) ); - rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); + OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); - ::rtl::OUString aLocalName; + OUString aLocalName; try { aLocalName = xAddIn-> @@ -900,7 +900,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& aLocalName = "###"; } - ::rtl::OUString aDescription; + OUString aDescription; try { aDescription = xAddIn-> @@ -924,7 +924,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& ScAddInArgumentType eArgType = lcl_GetArgType( xParClass ); if ( eArgType != SC_ADDINARG_CALLER ) { - rtl::OUString aArgName; + OUString aArgName; try { aArgName = xAddIn-> @@ -934,7 +934,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& { aArgName = "###"; } - rtl::OUString aArgDesc; + OUString aArgDesc; try { aArgDesc = xAddIn-> @@ -995,7 +995,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& static void lcl_UpdateFunctionList( ScFunctionList& rFunctionList, const ScUnoAddInFuncData& rFuncData ) { - ::rtl::OUString aCompare = rFuncData.GetUpperLocal(); // as used in FillFunctionDescFromData + OUString aCompare = rFuncData.GetUpperLocal(); // as used in FillFunctionDescFromData sal_uLong nCount = rFunctionList.GetCount(); for (sal_uLong nPos=0; nPos<nCount; nPos++) @@ -1009,7 +1009,7 @@ static void lcl_UpdateFunctionList( ScFunctionList& rFunctionList, const ScUnoAd } } -static const ScAddInArgDesc* lcl_FindArgDesc( const ScUnoAddInFuncData& rFuncData, const ::rtl::OUString& rArgIntName ) +static const ScAddInArgDesc* lcl_FindArgDesc( const ScUnoAddInFuncData& rFuncData, const OUString& rArgIntName ) { long nArgCount = rFuncData.GetArgumentCount(); const ScAddInArgDesc* pArguments = rFuncData.GetArguments(); @@ -1022,7 +1022,7 @@ static const ScAddInArgDesc* lcl_FindArgDesc( const ScUnoAddInFuncData& rFuncDat } void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface>& xInterface, - const ::rtl::OUString& rServiceName ) + const OUString& rServiceName ) { uno::Reference<lang::XLocalizable> xLoc( xInterface, uno::UNO_QUERY ); if ( xLoc.is() ) // optional in new add-ins @@ -1056,14 +1056,14 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface uno::Reference<reflection::XIdlMethod> xFunc = pArray[nFuncPos]; if (xFunc.is()) { - rtl::OUString aFuncU = xFunc->getName(); + OUString aFuncU = xFunc->getName(); // stored function name: (service name).(function) - rtl::OUStringBuffer aFuncNameBuffer( rServiceName.getLength()+1+aFuncU.getLength()); + OUStringBuffer aFuncNameBuffer( rServiceName.getLength()+1+aFuncU.getLength()); aFuncNameBuffer.append(rServiceName); aFuncNameBuffer.append('.'); aFuncNameBuffer.append(aFuncU); - rtl::OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); + OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); // internal names are skipped because no FuncData exists ScUnoAddInFuncData* pOldData = const_cast<ScUnoAddInFuncData*>( GetFuncData( aFuncName ) ); @@ -1152,7 +1152,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface } } -::rtl::OUString ScUnoAddInCollection::FindFunction( const ::rtl::OUString& rUpperName, sal_Bool bLocalFirst ) +OUString ScUnoAddInCollection::FindFunction( const OUString& rUpperName, sal_Bool bLocalFirst ) { if (!bInitialized) Initialize(); @@ -1187,7 +1187,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface return EMPTY_OUSTRING; } -const ScUnoAddInFuncData* ScUnoAddInCollection::GetFuncData( const ::rtl::OUString& rName, bool bComplete ) +const ScUnoAddInFuncData* ScUnoAddInCollection::GetFuncData( const OUString& rName, bool bComplete ) { if (!bInitialized) Initialize(); @@ -1218,7 +1218,7 @@ const ScUnoAddInFuncData* ScUnoAddInCollection::GetFuncData( long nIndex ) return NULL; } -void ScUnoAddInCollection::LocalizeString( ::rtl::OUString& rName ) +void ScUnoAddInCollection::LocalizeString( OUString& rName ) { if (!bInitialized) Initialize(); @@ -1267,14 +1267,14 @@ sal_Bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncDat // nFIndex is set from outside - rDesc.pFuncName = new ::rtl::OUString( rFuncData.GetUpperLocal() ); //! upper? + rDesc.pFuncName = new OUString( rFuncData.GetUpperLocal() ); //! upper? rDesc.nCategory = rFuncData.GetCategory(); rDesc.sHelpId = rFuncData.GetHelpId(); - ::rtl::OUString aDesc = rFuncData.GetDescription(); + OUString aDesc = rFuncData.GetDescription(); if (aDesc.isEmpty()) aDesc = rFuncData.GetLocalName(); // use name if no description is available - rDesc.pFuncDesc = new ::rtl::OUString( aDesc ); + rDesc.pFuncDesc = new OUString( aDesc ); // AddInArgumentType_CALLER is already left out in FuncData @@ -1284,21 +1284,21 @@ sal_Bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncDat sal_Bool bMultiple = false; const ScAddInArgDesc* pArgs = rFuncData.GetArguments(); - rDesc.ppDefArgNames = new ::rtl::OUString*[nArgCount]; - rDesc.ppDefArgDescs = new ::rtl::OUString*[nArgCount]; + rDesc.ppDefArgNames = new OUString*[nArgCount]; + rDesc.ppDefArgDescs = new OUString*[nArgCount]; rDesc.pDefArgFlags = new ScFuncDesc::ParameterFlags[nArgCount]; for ( long nArg=0; nArg<nArgCount; nArg++ ) { - rDesc.ppDefArgNames[nArg] = new ::rtl::OUString( pArgs[nArg].aName ); - rDesc.ppDefArgDescs[nArg] = new ::rtl::OUString( pArgs[nArg].aDescription ); + rDesc.ppDefArgNames[nArg] = new OUString( pArgs[nArg].aName ); + rDesc.ppDefArgDescs[nArg] = new OUString( pArgs[nArg].aDescription ); rDesc.pDefArgFlags[nArg].bOptional = pArgs[nArg].bOptional; rDesc.pDefArgFlags[nArg].bSuppress = false; // no empty names... if ( rDesc.ppDefArgNames[nArg]->isEmpty() ) { - ::rtl::OUString aDefName("arg"); - aDefName += ::rtl::OUString::valueOf( nArg+1 ); + OUString aDefName("arg"); + aDefName += OUString::valueOf( nArg+1 ); *rDesc.ppDefArgNames[nArg] = aDefName; } @@ -1319,7 +1319,7 @@ sal_Bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncDat //------------------------------------------------------------------------ -ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const ::rtl::OUString& rName, +ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const OUString& rName, long nParamCount ) : bValidCount( false ), nErrCode( errNoCode ), // before function was called @@ -1663,19 +1663,19 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes ) } } } - else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<rtl::OUString> > *)0 ) ) ) + else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<OUString> > *)0 ) ) ) { - const uno::Sequence< uno::Sequence<rtl::OUString> >* pRowSeq = NULL; + const uno::Sequence< uno::Sequence<OUString> >* pRowSeq = NULL; //! use pointer from any! - uno::Sequence< uno::Sequence<rtl::OUString> > aSequence; + uno::Sequence< uno::Sequence<OUString> > aSequence; if ( rNewRes >>= aSequence ) pRowSeq = &aSequence; if ( pRowSeq ) { long nRowCount = pRowSeq->getLength(); - const uno::Sequence<rtl::OUString>* pRowArr = pRowSeq->getConstArray(); + const uno::Sequence<OUString>* pRowArr = pRowSeq->getConstArray(); long nMaxColCount = 0; long nCol, nRow; for (nRow=0; nRow<nRowCount; nRow++) @@ -1692,7 +1692,7 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes ) for (nRow=0; nRow<nRowCount; nRow++) { long nColCount = pRowArr[nRow].getLength(); - const rtl::OUString* pColArr = pRowArr[nRow].getConstArray(); + const OUString* pColArr = pRowArr[nRow].getConstArray(); for (nCol=0; nCol<nColCount; nCol++) xMatrix->PutString( pColArr[nCol], static_cast<SCSIZE>(nCol), diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx index ff36337ac7b1..5b41833ba445 100644 --- a/sc/source/core/tool/addinhelpid.cxx +++ b/sc/source/core/tool/addinhelpid.cxx @@ -158,12 +158,12 @@ const ScUnoAddInHelpId pDateFuncHelpIds[] = // ============================================================================ -ScUnoAddInHelpIdGenerator::ScUnoAddInHelpIdGenerator( const ::rtl::OUString& rServiceName ) +ScUnoAddInHelpIdGenerator::ScUnoAddInHelpIdGenerator( const OUString& rServiceName ) { SetServiceName( rServiceName ); } -void ScUnoAddInHelpIdGenerator::SetServiceName( const ::rtl::OUString& rServiceName ) +void ScUnoAddInHelpIdGenerator::SetServiceName( const OUString& rServiceName ) { pCurrHelpIds = NULL; sal_uInt32 nSize = 0; @@ -182,10 +182,10 @@ void ScUnoAddInHelpIdGenerator::SetServiceName( const ::rtl::OUString& rServiceN nArrayCount = nSize / sizeof( ScUnoAddInHelpId ); } -rtl::OString ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncName ) const +OString ScUnoAddInHelpIdGenerator::GetHelpId( const OUString& rFuncName ) const { if( !pCurrHelpIds || !nArrayCount ) - return rtl::OString(); + return OString(); const ScUnoAddInHelpId* pFirst = pCurrHelpIds; const ScUnoAddInHelpId* pLast = pCurrHelpIds + nArrayCount - 1; @@ -202,7 +202,7 @@ rtl::OString ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncN pFirst = pMiddle + 1; } - return rtl::OString(); + return OString(); } diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 9a8fe8f5e22a..cdc13803a4cf 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -35,7 +35,6 @@ #include <tools/urlobj.hxx> using namespace ::com::sun::star; -using ::rtl::OUString; const ScAddress::Details ScAddress::detailsOOOa1( formula::FormulaGrammar::CONV_OOO, 0, 0 ); @@ -363,7 +362,7 @@ static bool lcl_XL_getExternalDoc( const sal_Unicode** ppErrRet, String& rExtern { case sheet::ExternalLinkType::DOCUMENT : { - rtl::OUString aStr; + OUString aStr; if (!(rInfo.Data >>= aStr)) { OSL_TRACE( "ScRange::Parse_XL_Header: Data type mismatch for ExternalLinkInfo %d", i); @@ -1119,7 +1118,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd } else { - rtl::OUString aTmp( p ); + OUString aTmp( p ); long n = aTmp.toInt32() - 1; while (CharClass::isAsciiDigit( *p )) p++; @@ -1698,7 +1697,7 @@ void ScAddress::Format( String& r, sal_uInt16 nFlags, const ScDocument* pDoc, if( nFlags & SCA_TAB_3D ) { String aTabName, aDocName; - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); aTabName = aTmp; // TODO: remove use of String here. // External Reference, same as in ScCompiler::MakeTabStr() @@ -1775,7 +1774,7 @@ lcl_Split_DocTab( const ScDocument* pDoc, SCTAB nTab, sal_uInt16 nFlags, String& rTabName, String& rDocName ) { - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); rTabName = aTmp; rDocName.Erase(); @@ -2033,7 +2032,7 @@ String ScRefAddress::GetRefString( ScDocument* pDoc, SCTAB nActTab, //------------------------------------------------------------------------ -void ScColToAlpha( rtl::OUStringBuffer& rBuf, SCCOL nCol ) +void ScColToAlpha( OUStringBuffer& rBuf, SCCOL nCol ) { if (nCol < 26*26) { diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index b333155fb1b4..45a256e6daa2 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -33,7 +33,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //======================================================================== // ScAppOptions - Applikations-Optionen diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx index dc07cda3b5f7..ec010497a1ba 100644 --- a/sc/source/core/tool/cellkeytranslator.cxx +++ b/sc/source/core/tool/cellkeytranslator.cxx @@ -30,7 +30,6 @@ using ::com::sun::star::lang::Locale; using ::com::sun::star::uno::Sequence; using ::std::list; using ::boost::unordered_map; -using ::rtl::OUString; using namespace ::com::sun::star; @@ -84,7 +83,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, { // Since no locale nor opcode matching is needed, simply return // the first item on the list. - rName = rtl::OUString::createFromAscii( itr->second.front().mpName ); + rName = OUString::createFromAscii( itr->second.front().mpName ); return; } @@ -104,7 +103,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( eLevel == LOCALE_MATCH_ALL ) { // Name with matching opcode and locale found. - rName = rtl::OUString::createFromAscii( itrList->mpName ); + rName = OUString::createFromAscii( itrList->mpName ); return; } else if ( eLevel > eLocaleMatchLevel ) @@ -125,7 +124,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( itrList->meOpCode == eOpCode ) { // Name with a matching opcode preferred. - rName = rtl::OUString::createFromAscii( itrList->mpName ); + rName = OUString::createFromAscii( itrList->mpName ); return; } } @@ -135,7 +134,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( eLevel == LOCALE_MATCH_ALL ) { // Name with matching locale preferred. - rName = rtl::OUString::createFromAscii( itrList->mpName ); + rName = OUString::createFromAscii( itrList->mpName ); return; } else if ( eLevel > eLocaleMatchLevel ) @@ -148,7 +147,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, } // No preferred strings found. Return the best matching name. - rName = rtl::OUString::createFromAscii(aBestMatchName); + rName = OUString::createFromAscii(aBestMatchName); } void ScCellKeywordTranslator::transKeyword(String& rName, const Locale* pLocale, OpCode eOpCode) @@ -162,7 +161,7 @@ void ScCellKeywordTranslator::transKeyword(String& rName, const Locale* pLocale, lclMatchKeyword(rName, spInstance->maStringNameMap, eOpCode, pLocale); } -void ScCellKeywordTranslator::transKeyword(rtl::OUString& rName, const Locale* pLocale, OpCode eOpCode) +void ScCellKeywordTranslator::transKeyword(OUString& rName, const Locale* pLocale, OpCode eOpCode) { String aName = rName; transKeyword(aName, pLocale, eOpCode); @@ -225,7 +224,7 @@ void ScCellKeywordTranslator::addToMap(const String& rKey, const sal_Char* pName void ScCellKeywordTranslator::addToMap(const TransItem* pItems, const Locale& rLocale) { for (sal_uInt16 i = 0; pItems[i].from != NULL; ++i) - addToMap(rtl::OUString(pItems[i].from), pItems[i].to, rLocale, pItems[i].func); + addToMap(OUString(pItems[i].from), pItems[i].to, rLocale, pItems[i].func); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index 26716c1a8e65..7abb78751816 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -32,8 +32,6 @@ #include <vector> using ::std::vector; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 67da7473c54d..0b0f7a1197ee 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -107,7 +107,7 @@ boost::unordered_set<sal_uInt16>& ScChartListener::ExternalRefListener::getAllFi // ---------------------------------------------------------------------------- -ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* pDocP, +ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, const ScRangeListRef& rRangeList ) : SvtListener(), mpExtRefListener(NULL), @@ -122,7 +122,7 @@ ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* pDocP, ScRefTokenHelper::getTokensFromRangeList(*mpTokens, *rRangeList); } -ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* pDocP, vector<ScTokenRef>* pTokens ) : +ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, vector<ScTokenRef>* pTokens ) : SvtListener(), mpExtRefListener(NULL), mpTokens(pTokens), @@ -183,7 +183,7 @@ ScChartListener::~ScChartListener() } } -const rtl::OUString& ScChartListener::GetName() const +const OUString& ScChartListener::GetName() const { return maName; } @@ -465,17 +465,17 @@ void ScChartListenerCollection::StartAllListeners() void ScChartListenerCollection::insert(ScChartListener* pListener) { - rtl::OUString aName = pListener->GetName(); + OUString aName = pListener->GetName(); maListeners.insert(aName, pListener); } -ScChartListener* ScChartListenerCollection::findByName(const rtl::OUString& rName) +ScChartListener* ScChartListenerCollection::findByName(const OUString& rName) { ListenersType::iterator it = maListeners.find(rName); return it == maListeners.end() ? NULL : it->second; } -const ScChartListener* ScChartListenerCollection::findByName(const rtl::OUString& rName) const +const ScChartListener* ScChartListenerCollection::findByName(const OUString& rName) const { ListenersType::const_iterator it = maListeners.find(rName); return it == maListeners.end() ? NULL : it->second; @@ -501,17 +501,17 @@ ScChartListenerCollection::StringSetType& ScChartListenerCollection::getNonOleOb return maNonOleObjectNames; } -rtl::OUString ScChartListenerCollection::getUniqueName(const rtl::OUString& rPrefix) const +OUString ScChartListenerCollection::getUniqueName(const OUString& rPrefix) const { for (sal_Int32 nNum = 1; nNum < 10000; ++nNum) // arbitrary limit to prevent infinite loop. { - rtl::OUStringBuffer aBuf(rPrefix); + OUStringBuffer aBuf(rPrefix); aBuf.append(nNum); - rtl::OUString aTestName = aBuf.makeStringAndClear(); + OUString aTestName = aBuf.makeStringAndClear(); if (maListeners.find(aTestName) == maListeners.end()) return aTestName; } - return rtl::OUString(); + return OUString(); } void ScChartListenerCollection::ChangeListening( const String& rName, @@ -544,7 +544,7 @@ public: void operator() (ScChartListener* p) { - rtl::OUString aName = p->GetName(); + OUString aName = p->GetName(); mrListeners.insert(aName, p); } }; diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index cf0212851878..5425056769e0 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -68,7 +68,7 @@ ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScBigRange& rRange, const sal_uLong nTempAction, const sal_uLong nTempRejectAction, const ScChangeActionState eTempState, const DateTime& aTempDateTime, - const rtl::OUString& aTempUser, const rtl::OUString& aTempComment) : + const OUString& aTempUser, const OUString& aTempComment) : aBigRange( rRange ), aDateTime( aTempDateTime ), aUser( aTempUser ), @@ -431,7 +431,7 @@ void ScChangeAction::UpdateReference( const ScChangeTrack* /* pTrack */, void ScChangeAction::GetDescription( - rtl::OUString& rStr, ScDocument* /* pDoc */, bool /* bSplitRange */, bool bWarning ) const + OUString& rStr, ScDocument* /* pDoc */, bool /* bSplitRange */, bool bWarning ) const { if (!IsRejecting() || !bWarning) return; @@ -440,7 +440,7 @@ void ScChangeAction::GetDescription( // not properly restored in formulas. See specification at // http://specs.openoffice.org/calc/ease-of-use/redlining_comment.sxw - rtl::OUStringBuffer aBuf(rStr); // Take the original string. + OUStringBuffer aBuf(rStr); // Take the original string. if (GetType() == SC_CAT_MOVE) { aBuf.append( @@ -515,10 +515,10 @@ void ScChangeAction::GetDescription( } -rtl::OUString ScChangeAction::GetRefString( +OUString ScChangeAction::GetRefString( const ScBigRange& rRange, ScDocument* pDoc, bool bFlag3D ) const { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_uInt16 nFlags = ( rRange.IsValid( pDoc ) ? SCA_VALID : 0 ); if ( !nFlags ) aBuf.append(ScGlobal::GetRscString(STR_NOREF_STR)); @@ -531,7 +531,7 @@ rtl::OUString ScChangeAction::GetRefString( case SC_CAT_DELETE_COLS : if ( bFlag3D ) { - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName( aTmpRange.aStart.Tab(), aTmp ); aBuf.append(aTmp); aBuf.append(sal_Unicode('.')); @@ -544,7 +544,7 @@ rtl::OUString ScChangeAction::GetRefString( case SC_CAT_DELETE_ROWS : if ( bFlag3D ) { - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName( aTmpRange.aStart.Tab(), aTmp ); aBuf.append(aTmp); aBuf.append(sal_Unicode('.')); @@ -558,7 +558,7 @@ rtl::OUString ScChangeAction::GetRefString( if ( bFlag3D || GetType() == SC_CAT_INSERT_TABS ) nFlags |= SCA_TAB_3D; - rtl::OUString aTmp; + OUString aTmp; aTmpRange.Format(aTmp, nFlags, pDoc, pDoc->GetAddressConvention()); aBuf.append(aTmp); } @@ -572,28 +572,28 @@ rtl::OUString ScChangeAction::GetRefString( return aBuf.makeStringAndClear(); } -const rtl::OUString& ScChangeAction::GetUser() const +const OUString& ScChangeAction::GetUser() const { return aUser; } -void ScChangeAction::SetUser( const rtl::OUString& r ) +void ScChangeAction::SetUser( const OUString& r ) { aUser = r; } -const rtl::OUString& ScChangeAction::GetComment() const +const OUString& ScChangeAction::GetComment() const { return aComment; } -void ScChangeAction::SetComment( const rtl::OUString& rStr ) +void ScChangeAction::SetComment( const OUString& rStr ) { aComment = rStr; } void ScChangeAction::GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const + OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const { rStr = GetRefString( GetBigRange(), pDoc, bFlag3D ); } @@ -717,8 +717,8 @@ ScChangeActionIns::ScChangeActionIns( const ScRange& rRange ) ScChangeActionIns::ScChangeActionIns( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aBigRangeP, - const rtl::OUString& aUserP, const DateTime& aDateTimeP, - const rtl::OUString& sComment, const ScChangeActionType eTypeP) : + const OUString& aUserP, const DateTime& aDateTimeP, + const OUString& sComment, const ScChangeActionType eTypeP) : ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment) { } @@ -728,7 +728,7 @@ ScChangeActionIns::~ScChangeActionIns() } void ScChangeActionIns::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); @@ -745,15 +745,15 @@ void ScChangeActionIns::GetDescription( nWhatId = STR_AREA; } - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_INSERT); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_INSERT); sal_Int32 nPos = aRsc.indexOfAsciiL("#1", 2); if (nPos >= 0) { // Construct a range string to replace '#1' first. - rtl::OUStringBuffer aBuf(ScGlobal::GetRscString(nWhatId)); + OUStringBuffer aBuf(ScGlobal::GetRscString(nWhatId)); aBuf.append(sal_Unicode(' ')); aBuf.append(GetRefString(GetBigRange(), pDoc)); - rtl::OUString aRangeStr = aBuf.makeStringAndClear(); + OUString aRangeStr = aBuf.makeStringAndClear(); aRsc = aRsc.replaceAt(nPos, 2, aRangeStr); // replace '#1' with the range string. @@ -837,7 +837,7 @@ ScChangeActionDel::ScChangeActionDel( const ScRange& rRange, ScChangeActionDel::ScChangeActionDel( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aBigRangeP, - const rtl::OUString& aUserP, const DateTime& aDateTimeP, const rtl::OUString &sComment, + const OUString& aUserP, const DateTime& aDateTimeP, const OUString &sComment, const ScChangeActionType eTypeP, const SCsCOLROW nD, ScChangeTrack* pTrackP) : // wich of nDx and nDy is set is depend on the type ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment), pTrack( pTrackP ), @@ -973,7 +973,7 @@ ScBigRange ScChangeActionDel::GetOverAllRange() const void ScChangeActionDel::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); @@ -1002,16 +1002,16 @@ void ScChangeActionDel::GetDescription( aTmpRange.aEnd.SetRow( aTmpRange.aEnd.Row() + GetDy() ); } - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_DELETE); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_DELETE); sal_Int32 nPos = aRsc.indexOfAsciiL("#1", 2); if (nPos >= 0) { // Build a string to replace with. - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(ScGlobal::GetRscString(nWhatId)); aBuf.append(sal_Unicode(' ')); aBuf.append(GetRefString(aTmpRange, pDoc)); - rtl::OUString aRangeStr = aBuf.makeStringAndClear(); + OUString aRangeStr = aBuf.makeStringAndClear(); aRsc = aRsc.replaceAt(nPos, 2, aRangeStr); // replace '#1' with the string. aBuf.append(rStr).append(aRsc); @@ -1064,7 +1064,7 @@ bool ScChangeActionDel::Reject( ScDocument* pDoc ) case SC_CAT_DELETE_TABS : { //2do: Tabellennamen merken? - rtl::OUString aName; + OUString aName; pDoc->CreateValidTabName( aName ); if ( ( bOk = pDoc->ValidNewTabName( aName ) ) != false ) bOk = pDoc->InsertTab( aRange.aStart.Tab(), aName ); @@ -1182,8 +1182,8 @@ void ScChangeActionDel::UndoCutOffInsert() ScChangeActionMove::ScChangeActionMove( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aToBigRange, - const rtl::OUString& aUserP, const DateTime& aDateTimeP, - const rtl::OUString &sComment, const ScBigRange& aFromBigRange, + const OUString& aUserP, const DateTime& aDateTimeP, + const OUString &sComment, const ScBigRange& aFromBigRange, ScChangeTrack* pTrackP) : // wich of nDx and nDy is set is depend on the type ScChangeAction(SC_CAT_MOVE, aToBigRange, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment), aFromRange(aFromBigRange), @@ -1234,15 +1234,15 @@ void ScChangeActionMove::GetDelta( sal_Int32& nDx, sal_Int32& nDy, sal_Int32& nD void ScChangeActionMove::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); bool bFlag3D = GetFromRange().aStart.Tab() != GetBigRange().aStart.Tab(); - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_MOVE); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_MOVE); - rtl::OUString aTmpStr = ScChangeAction::GetRefString(GetFromRange(), pDoc, bFlag3D); + OUString aTmpStr = ScChangeAction::GetRefString(GetFromRange(), pDoc, bFlag3D); sal_Int32 nPos = aRsc.indexOfAsciiL("#1", 2); if (nPos >= 0) { @@ -1258,19 +1258,19 @@ void ScChangeActionMove::GetDescription( nPos += aTmpStr.getLength(); } - rtl::OUStringBuffer aBuf(rStr); // append to the original string. + OUStringBuffer aBuf(rStr); // append to the original string. aBuf.append(aRsc); rStr = aBuf.makeStringAndClear(); } void ScChangeActionMove::GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const + OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const { if ( !bFlag3D ) bFlag3D = ( GetFromRange().aStart.Tab() != GetBigRange().aStart.Tab() ); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(ScChangeAction::GetRefString(GetFromRange(), pDoc, bFlag3D)); aBuf.append(sal_Unicode(',')); aBuf.append(sal_Unicode(' ')); @@ -1501,13 +1501,13 @@ void ScChangeActionContent::SetOldValue( const OUString& rOld, ScDocument* pDoc } -void ScChangeActionContent::GetOldString( rtl::OUString& rStr ) const +void ScChangeActionContent::GetOldString( OUString& rStr ) const { GetValueString(rStr, maOldValue, maOldCell); } -void ScChangeActionContent::GetNewString( rtl::OUString& rStr ) const +void ScChangeActionContent::GetNewString( OUString& rStr ) const { GetValueString(rStr, maNewValue, maNewCell); } @@ -1523,13 +1523,13 @@ const ScCellValue& ScChangeActionContent::GetNewCell() const } void ScChangeActionContent::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_CELL); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_CELL); - rtl::OUString aTmpStr; + OUString aTmpStr; GetRefString(aTmpStr, pDoc); sal_Int32 nPos = 0; @@ -1562,14 +1562,14 @@ void ScChangeActionContent::GetDescription( nPos += aTmpStr.getLength(); } - rtl::OUStringBuffer aBuf(rStr); // append to the original string. + OUStringBuffer aBuf(rStr); // append to the original string. aBuf.append(aRsc); rStr = aBuf.makeStringAndClear(); } void ScChangeActionContent::GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const + OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const { sal_uInt16 nFlags = ( GetBigRange().IsValid( pDoc ) ? SCA_VALID : 0 ); if ( nFlags ) @@ -1595,7 +1595,7 @@ void ScChangeActionContent::GetRefString( if ( IsDeletedIn() ) { // Insert the parentheses. - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(sal_Unicode('(')); aBuf.append(rStr); aBuf.append(sal_Unicode(')')); @@ -1882,7 +1882,7 @@ void ScChangeActionContent::GetValueString( void ScChangeActionContent::GetFormulaString( - rtl::OUString& rStr, const ScFormulaCell* pCell ) const + OUString& rStr, const ScFormulaCell* pCell ) const { ScAddress aPos( aBigRange.aStart.MakeAddress() ); if ( aPos == pCell->aPos || IsDeletedIn() ) @@ -2148,8 +2148,8 @@ bool ScChangeActionContent::IsOldMatrixReference() const ScChangeActionReject::ScChangeActionReject( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, - const ScBigRange& aBigRangeP, const rtl::OUString& aUserP, - const DateTime& aDateTimeP, const rtl::OUString& sComment) : + const ScBigRange& aBigRangeP, const OUString& aUserP, + const DateTime& aDateTimeP, const OUString& sComment) : ScChangeAction(SC_CAT_CONTENT, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment) { } @@ -2189,7 +2189,7 @@ ScChangeTrack::ScChangeTrack( ScDocument* pDocP ) : memset( ppContentSlots, 0, nContentSlots * sizeof( ScChangeActionContent* ) ); } -ScChangeTrack::ScChangeTrack( ScDocument* pDocP, const std::set<rtl::OUString>& aTempUserCollection) : +ScChangeTrack::ScChangeTrack( ScDocument* pDocP, const std::set<OUString>& aTempUserCollection) : maUserCollection(aTempUserCollection), aFixDateTime( DateTime::SYSTEM ), pDoc( pDocP ) @@ -2235,7 +2235,7 @@ void ScChangeTrack::Init() bTime100thSeconds = true; const SvtUserOptions& rUserOpt = SC_MOD()->GetUserOptions(); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(rUserOpt.GetFirstName()); aBuf.append(sal_Unicode(' ')); aBuf.append(rUserOpt.GetLastName()); @@ -2301,11 +2301,11 @@ void ScChangeTrack::Clear() aGeneratedMap.clear(); aPasteCutMap.clear(); maUserCollection.clear(); - maUser = rtl::OUString(); + maUser = OUString(); Init(); } -const std::set<rtl::OUString>& ScChangeTrack::GetUserCollection() const +const std::set<OUString>& ScChangeTrack::GetUserCollection() const { return maUserCollection; } @@ -2317,7 +2317,7 @@ void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uI const SvtUserOptions& rUserOptions = SC_MOD()->GetUserOptions(); size_t nOldCount = maUserCollection.size(); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(rUserOptions.GetFirstName()); aBuf.append(sal_Unicode(' ')); aBuf.append(rUserOptions.GetLastName()); @@ -2338,7 +2338,7 @@ void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uI } -void ScChangeTrack::SetUser( const rtl::OUString& rUser ) +void ScChangeTrack::SetUser( const OUString& rUser ) { if ( IsLoadSave() ) return ; // nicht die Collection zerschiessen @@ -2347,7 +2347,7 @@ void ScChangeTrack::SetUser( const rtl::OUString& rUser ) maUserCollection.insert(maUser); } -const rtl::OUString& ScChangeTrack::GetUser() const +const OUString& ScChangeTrack::GetUser() const { return maUser; } @@ -4520,7 +4520,7 @@ bool ScChangeTrack::Reject( sal_uLong ScChangeTrack::AddLoadedGenerated( - const ScCellValue& rNewCell, const ScBigRange& aBigRange, const rtl::OUString& sNewValue ) + const ScCellValue& rNewCell, const ScBigRange& aBigRange, const OUString& sNewValue ) { ScChangeActionContent* pAct = new ScChangeActionContent( --nGeneratedMin, rNewCell, aBigRange, pDoc, sNewValue ); if ( pAct ) diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx index 2a63d4c1de00..06f1f292f9c0 100644 --- a/sc/source/core/tool/chgviset.cxx +++ b/sc/source/core/tool/chgviset.cxx @@ -81,7 +81,7 @@ ScChangeViewSettings& ScChangeViewSettings::operator=( const ScChangeViewSetting return *this; } -sal_Bool ScChangeViewSettings::IsValidComment(const ::rtl::OUString* pCommentStr) const +sal_Bool ScChangeViewSettings::IsValidComment(const OUString* pCommentStr) const { sal_Bool nTheFlag=sal_True; @@ -94,7 +94,7 @@ sal_Bool ScChangeViewSettings::IsValidComment(const ::rtl::OUString* pCommentStr return nTheFlag; } -void ScChangeViewSettings::SetTheComment(const ::rtl::OUString& rString) +void ScChangeViewSettings::SetTheComment(const OUString& rString) { aComment=rString; if(pCommentSearcher!=NULL) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index e17500d48f8a..1e099602e1a7 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -66,7 +66,6 @@ using namespace formula; using namespace ::com::sun::star; -using ::rtl::OUString; using ::std::vector; diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 29084b508392..82330711840a 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -36,7 +36,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index 24a7b6b4016f..849cf7853acb 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -34,7 +34,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //------------------------------------------------------------------------ diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index aa07053f52b9..f7d873cb61a8 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -28,7 +28,6 @@ #include <memory> #include <vector> -using ::rtl::OUString; using ::std::auto_ptr; using ::std::vector; @@ -186,7 +185,7 @@ bool lcl_createExcelQuery( if (nIndex < nNewEntries) { pParam->GetEntry(nIndex).nField = aFields[nCol]; - pParam->FillInExcelSyntax(rtl::OUString(aCellStr), nIndex); + pParam->FillInExcelSyntax(OUString(aCellStr), nIndex); nIndex++; if (nIndex < nNewEntries) pParam->GetEntry(nIndex).eConnect = SC_AND; diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 4e1955ce7494..790fc7de0f68 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -685,7 +685,7 @@ String ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, { const SvxFieldData* pFieldData = rField.GetField(); if (!pFieldData) - return rtl::OUString("?"); + return OUString("?"); OUString aRet; sal_Int32 nClsId = pFieldData->GetClassId(); @@ -753,11 +753,11 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 /* nPara */, sal_uInt16 /* nPos */, Color*& rTxtColor, Color*& /* rFldColor */ ) { - rtl::OUString aRet; + OUString aRet; const SvxFieldData* pFieldData = rField.GetField(); if (!pFieldData) - return rtl::OUString(" "); + return OUString(" "); sal_uInt16 nClsId = pFieldData->GetClassId(); switch (nClsId) @@ -765,7 +765,7 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, case text::textfield::Type::URL: { const SvxURLField* pField = static_cast<const SvxURLField*>(pFieldData); - rtl::OUString aURL = pField->GetURL(); + OUString aURL = pField->GetURL(); switch (pField->GetFormat()) { @@ -810,7 +810,7 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, { const SvxTableField* pField = static_cast<const SvxTableField*>(pFieldData); SCTAB nTab = pField->GetTab(); - rtl::OUString aName; + OUString aName; if (mpDoc->GetName(nTab, aName)) aRet = aName; else diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx index a825dda1ffe4..ca4f27cfa0fb 100644 --- a/sc/source/core/tool/filtopt.cxx +++ b/sc/source/core/tool/filtopt.cxx @@ -26,7 +26,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //------------------------------------------------------------------ diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 01ebadaad9a1..4a57c07134c0 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -39,7 +39,6 @@ using namespace utl; using namespace com::sun::star::uno; using ::com::sun::star::lang::Locale; using ::com::sun::star::i18n::LocaleDataItem; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx index 0c0231cdef2d..91c066c0bc96 100644 --- a/sc/source/core/tool/formulaparserpool.cxx +++ b/sc/source/core/tool/formulaparserpool.cxx @@ -29,8 +29,6 @@ #include <sfx2/objsh.hxx> #include "document.hxx" -using ::rtl::OUString; -using ::rtl::OUStringHash; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx index 791dbadcea86..ed1dc772d660 100644 --- a/sc/source/core/tool/formularesult.cxx +++ b/sc/source/core/tool/formularesult.cxx @@ -420,7 +420,7 @@ void ScFormulaResult::SetHybridDouble( double f ) } } -void ScFormulaResult::SetHybridString( const rtl::OUString & rStr ) +void ScFormulaResult::SetHybridString( const OUString & rStr ) { // Obtain values before changing anything. double f = GetDouble(); diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index eb12f797abda..6f056d6036fe 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.cxx @@ -31,7 +31,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //======================================================================== // ScInputOptions - input options diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 0bbeab951802..d35eebd9f1c8 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -79,7 +79,6 @@ bool ScInterpreter::bGlobalStackInUse = false; using namespace formula; using ::std::auto_ptr; -using ::rtl::OUString; struct ScCompare { diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index cdb1535d6518..883a2e91df12 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2919,7 +2919,7 @@ inline void lclSplitBlock( double& rfInt, sal_Int32& rnBlock, double fValue, dou } /** Appends a digit (0 to 9) to the passed string. */ -void lclAppendDigit( rtl::OStringBuffer& rText, sal_Int32 nDigit ) +void lclAppendDigit( OStringBuffer& rText, sal_Int32 nDigit ) { switch( nDigit ) { @@ -2941,7 +2941,7 @@ void lclAppendDigit( rtl::OStringBuffer& rText, sal_Int32 nDigit ) @param nDigit A digit in the range from 1 to 9. @param nPow10 A value in the range from 2 to 5. */ -void lclAppendPow10( rtl::OStringBuffer& rText, sal_Int32 nDigit, sal_Int32 nPow10 ) +void lclAppendPow10( OStringBuffer& rText, sal_Int32 nDigit, sal_Int32 nPow10 ) { OSL_ENSURE( (1 <= nDigit) && (nDigit <= 9), "lclAppendPow10 - illegal digit" ); lclAppendDigit( rText, nDigit ); @@ -2956,7 +2956,7 @@ void lclAppendPow10( rtl::OStringBuffer& rText, sal_Int32 nDigit, sal_Int32 nPow } /** Appends a block of 6 digits (value from 1 to 999,999) to the passed string. */ -void lclAppendBlock( rtl::OStringBuffer& rText, sal_Int32 nValue ) +void lclAppendBlock( OStringBuffer& rText, sal_Int32 nValue ) { OSL_ENSURE( (1 <= nValue) && (nValue <= 999999), "lclAppendBlock - illegal value" ); if( nValue >= 100000 ) @@ -3027,7 +3027,7 @@ void ScInterpreter::ScBahtText() sal_Int32 nSatang = 0; lclSplitBlock( fBaht, nSatang, fValue, 100.0 ); - rtl::OStringBuffer aText; + OStringBuffer aText; // generate text for Baht value if( fBaht == 0.0 ) @@ -3037,7 +3037,7 @@ void ScInterpreter::ScBahtText() } else while( fBaht > 0.0 ) { - rtl::OStringBuffer aBlock; + OStringBuffer aBlock; sal_Int32 nBlock = 0; lclSplitBlock( fBaht, nBlock, fBaht, 1.0e6 ); if( nBlock > 0 ) @@ -3045,7 +3045,7 @@ void ScInterpreter::ScBahtText() // add leading "million", if there will come more blocks if( fBaht > 0.0 ) aBlock.insert( - 0, rtl::OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_1E6))); + 0, OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_1E6))); aText.insert(0, aBlock.makeStringAndClear()); } @@ -3066,9 +3066,9 @@ void ScInterpreter::ScBahtText() // add the minus sign if( bMinus ) aText.insert( - 0, rtl::OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_MINUS))); + 0, OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_MINUS))); - PushString( rtl::OStringToOUString(aText.makeStringAndClear(), RTL_TEXTENCODING_UTF8) ); + PushString( OStringToOUString(aText.makeStringAndClear(), RTL_TEXTENCODING_UTF8) ); } } diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index e24fc6644d3c..40d5d83444ae 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -703,7 +703,7 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } if (bOk) { - rtl::OString aTmp(OUStringToOString(aStr, + OString aTmp(OUStringToOString(aStr, osl_getThreadTextEncoding())); // In case the xub_StrLen will be longer than USHORT // one day, and room for pad byte check. @@ -827,7 +827,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } else { - rtl::OString aTmp(OUStringToOString(aStr, + OString aTmp(OUStringToOString(aStr, osl_getThreadTextEncoding())); // In case the xub_StrLen will be longer than USHORT // one day, and room for pad byte check. @@ -2548,7 +2548,7 @@ void ScInterpreter::ScExternal() break; case PTR_STRING : { - rtl::OString aStr(OUStringToOString(GetString(), + OString aStr(OUStringToOString(GetString(), osl_getThreadTextEncoding())); if ( aStr.getLength() >= ADDIN_MAXSTRLEN ) SetError( errStringOverflow ); diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx index 3836940012ee..3a7417e92f55 100644 --- a/sc/source/core/tool/optutil.cxx +++ b/sc/source/core/tool/optutil.cxx @@ -36,12 +36,12 @@ sal_Bool ScOptionsUtil::IsMetricSystem() //------------------------------------------------------------------ -ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString& rSubTree ) : +ScLinkConfigItem::ScLinkConfigItem( const OUString& rSubTree ) : ConfigItem( rSubTree ) { } -ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString& rSubTree, sal_Int16 nMode ) : +ScLinkConfigItem::ScLinkConfigItem( const OUString& rSubTree, sal_Int16 nMode ) : ConfigItem( rSubTree, nMode ) { } @@ -51,7 +51,7 @@ void ScLinkConfigItem::SetCommitLink( const Link& rLink ) aCommitLink = rLink; } -void ScLinkConfigItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& /* aPropertyNames */ ) +void ScLinkConfigItem::Notify( const com::sun::star::uno::Sequence<OUString>& /* aPropertyNames */ ) { //! not implemented yet... } diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index b4187c593d8f..02a697d133d3 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.cxx @@ -336,7 +336,7 @@ ScParameterClassification::GetExternalParameterType( const formula::FormulaToken { Type eRet = Unknown; // similar to ScInterpreter::ScExternal() - rtl::OUString aFuncName = ScGlobal::pCharClass->uppercase( pToken->GetExternal()); + OUString aFuncName = ScGlobal::pCharClass->uppercase( pToken->GetExternal()); { const FuncData* pFuncData = ScGlobal::GetFuncCollection()->findByName(aFuncName); if (pFuncData) @@ -360,7 +360,7 @@ ScParameterClassification::GetExternalParameterType( const formula::FormulaToken } } - rtl::OUString aUnoName = + OUString aUnoName = ScGlobal::GetAddInCollection()->FindFunction(aFuncName, false); if (!aUnoName.isEmpty()) @@ -434,9 +434,9 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource() } if ( nArgs > CommonData::nMaxParams ) { - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; aBuf.append("ScParameterClassification::Init: too many arguments in listed function: "); - aBuf.append(rtl::OUStringToOString(*(pDesc->pFuncName), RTL_TEXTENCODING_UTF8)); + aBuf.append(OUStringToOString(*(pDesc->pFuncName), RTL_TEXTENCODING_UTF8)); aBuf.append(": "); aBuf.append(sal_Int32(nArgs)); OSL_FAIL( aBuf.getStr()); @@ -485,7 +485,7 @@ void ScParameterClassification::GenerateDocumentation() if ( xMap->getSymbol(eOp).Len() ) { fprintf( stdout, "%s: ", aEnvVarName); - rtl::OStringBuffer aStr(rtl::OUStringToOString(xMap->getSymbol(eOp), RTL_TEXTENCODING_UTF8)); + OStringBuffer aStr(OUStringToOString(xMap->getSymbol(eOp), RTL_TEXTENCODING_UTF8)); aStr.append('('); formula::FormulaByteToken aToken( eOp); sal_uInt8 nParams = GetMinimumParameters( eOp); diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 154ac47868a8..1ec3ea36d73d 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -26,7 +26,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index c87cf8fe14be..1ac1a899327b 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -95,7 +95,7 @@ void ScQueryEntry::SetQueryByEmpty() maQueryItems.resize(1); Item& rItem = maQueryItems[0]; rItem.meType = ByEmpty; - rItem.maString = rtl::OUString(); + rItem.maString = OUString(); rItem.mfVal = SC_EMPTYFIELDS; } @@ -117,7 +117,7 @@ void ScQueryEntry::SetQueryByNonEmpty() maQueryItems.resize(1); Item& rItem = maQueryItems[0]; rItem.meType = ByEmpty; - rItem.maString = rtl::OUString(); + rItem.maString = OUString(); rItem.mfVal = SC_NONEMPTYFIELDS; } @@ -178,7 +178,7 @@ utl::TextSearch* ScQueryEntry::GetSearchTextPtr( bool bCaseSens ) const { if ( !pSearchParam ) { - const rtl::OUString& rStr = maQueryItems[0].maString; + const OUString& rStr = maQueryItems[0].maString; pSearchParam = new utl::SearchParam( rStr, utl::SearchParam::SRCH_REGEXP, bCaseSens, false, false); pSearchText = new utl::TextSearch( *pSearchParam, *ScGlobal::pCharClass ); diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index d0f637bd5660..826ea3e3981e 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -165,7 +165,7 @@ void ScQueryParamBase::Resize(size_t nNew) } } -void ScQueryParamBase::FillInExcelSyntax(const rtl::OUString& rStr, SCSIZE nIndex) +void ScQueryParamBase::FillInExcelSyntax(const OUString& rStr, SCSIZE nIndex) { const String aCellStr = rStr; if (aCellStr.Len() > 0) diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index af2fb6e1fdee..8f37c136af74 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -240,7 +240,7 @@ void ScRangeList::Format( String& rStr, sal_uInt16 nFlags, ScDocument* pDoc, } -void ScRangeList::Format( rtl::OUString& rStr, sal_uInt16 nFlags, ScDocument* pDoc, +void ScRangeList::Format( OUString& rStr, sal_uInt16 nFlags, ScDocument* pDoc, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cDelimiter ) const { @@ -1356,7 +1356,7 @@ int SAL_CALL ScRangePairList_QsortNameCompare( const void* p1, const void* p2 ) const ScRangePairNameSort* ps2 = (const ScRangePairNameSort*)p2; const ScAddress& rStartPos1 = ps1->pPair->GetRange(0).aStart; const ScAddress& rStartPos2 = ps2->pPair->GetRange(0).aStart; - rtl::OUString aStr1, aStr2; + OUString aStr1, aStr2; sal_Int32 nComp; if ( rStartPos1.Tab() == rStartPos2.Tab() ) nComp = COMPARE_EQUAL; diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index ecd4a8ea6f3a..b833fecb889c 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -37,14 +37,13 @@ using namespace formula; using ::std::pair; using ::std::unary_function; -using ::rtl::OUString; //======================================================================== // ScRangeData //======================================================================== ScRangeData::ScRangeData( ScDocument* pDok, - const rtl::OUString& rName, + const OUString& rName, const String& rSymbol, const ScAddress& rAddress, RangeType nType, @@ -76,7 +75,7 @@ ScRangeData::ScRangeData( ScDocument* pDok, } ScRangeData::ScRangeData( ScDocument* pDok, - const rtl::OUString& rName, + const OUString& rName, const ScTokenArray& rArr, const ScAddress& rAddress, RangeType nType ) : @@ -96,7 +95,7 @@ ScRangeData::ScRangeData( ScDocument* pDok, } ScRangeData::ScRangeData( ScDocument* pDok, - const rtl::OUString& rName, + const OUString& rName, const ScAddress& rTarget ) : aName ( rName ), aUpperName ( ScGlobal::pCharClass->uppercase( rName ) ), @@ -257,7 +256,7 @@ void ScRangeData::GetSymbol( OUString& rSymbol, const ScAddress& rPos, const For rSymbol = aStr; } -void ScRangeData::UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress& rPos, +void ScRangeData::UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress& rPos, const FormulaGrammar::Grammar eGrammar ) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -833,7 +832,7 @@ bool ScRangeName::insert(ScRangeData* p) p->SetIndex(maIndexToData.size() + 1); } - rtl::OUString aName(p->GetUpperName()); + OUString aName(p->GetUpperName()); erase(aName); // ptr_map won't insert it if a duplicate name exists. pair<DataType::iterator, bool> r = maData.insert(aName, p); if (r.second) @@ -852,7 +851,7 @@ void ScRangeName::erase(const ScRangeData& r) erase(r.GetUpperName()); } -void ScRangeName::erase(const rtl::OUString& rName) +void ScRangeName::erase(const OUString& rName) { DataType::iterator itr = maData.find(rName); if (itr != maData.end()) diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index 957548121f43..a892eb408373 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.cxx @@ -181,12 +181,12 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, ScDocument* pDoc, c bool bHasErrors = false; - uno::Sequence< uno::Sequence<rtl::OUString> > aRowSeq( nRowCount ); - uno::Sequence<rtl::OUString>* pRowAry = aRowSeq.getArray(); + uno::Sequence< uno::Sequence<OUString> > aRowSeq( nRowCount ); + uno::Sequence<OUString>* pRowAry = aRowSeq.getArray(); for (long nRow = 0; nRow < nRowCount; nRow++) { - uno::Sequence<rtl::OUString> aColSeq( nColCount ); - rtl::OUString* pColAry = aColSeq.getArray(); + uno::Sequence<OUString> aColSeq( nColCount ); + OUString* pColAry = aColSeq.getArray(); for (long nCol = 0; nCol < nColCount; nCol++) { sal_uInt16 nErrCode = pDoc->GetStringForFormula( @@ -213,12 +213,12 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMa SCSIZE nRowCount; pMatrix->GetDimensions( nColCount, nRowCount ); - uno::Sequence< uno::Sequence<rtl::OUString> > aRowSeq( static_cast<sal_Int32>(nRowCount) ); - uno::Sequence<rtl::OUString>* pRowAry = aRowSeq.getArray(); + uno::Sequence< uno::Sequence<OUString> > aRowSeq( static_cast<sal_Int32>(nRowCount) ); + uno::Sequence<OUString>* pRowAry = aRowSeq.getArray(); for (SCSIZE nRow = 0; nRow < nRowCount; nRow++) { - uno::Sequence<rtl::OUString> aColSeq( static_cast<sal_Int32>(nColCount) ); - rtl::OUString* pColAry = aColSeq.getArray(); + uno::Sequence<OUString> aColSeq( static_cast<sal_Int32>(nColCount) ); + OUString* pColAry = aColSeq.getArray(); for (SCSIZE nCol = 0; nCol < nColCount; nCol++) { String aStr; @@ -233,7 +233,7 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMa Color* pColor; pFormatter->GetOutputString( fVal, 0, aStr, &pColor ); } - pColAry[nCol] = rtl::OUString( aStr ); + pColAry[nCol] = OUString( aStr ); } pRowAry[nRow] = aColSeq; @@ -314,7 +314,7 @@ sal_Bool ScRangeToSequence::FillMixedArray( uno::Any& rAny, const ScMatrix* pMat String aStr; if ( !pMatrix->IsEmpty( nCol, nRow ) ) aStr = pMatrix->GetString( nCol, nRow ); - pColAry[nCol] <<= rtl::OUString( aStr ); + pColAry[nCol] <<= OUString( aStr ); } else { @@ -385,7 +385,7 @@ ScMatrixRef ScSequenceToMatrix::CreateMixedMatrix( const com::sun::star::uno::An } if ( nMaxColCount && nRowCount ) { - rtl::OUString aUStr; + OUString aUStr; xMatrix = new ScMatrix( static_cast<SCSIZE>(nMaxColCount), static_cast<SCSIZE>(nRowCount), 0.0); diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 2f3f43972a48..e318466319b4 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -28,8 +28,6 @@ #include "externalrefmgr.hxx" #include "compiler.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::formula::FormulaGrammar; using namespace ::com::sun::star; @@ -267,13 +265,13 @@ sal_Bool ScRangeUtil::MakeRangeFromName ( if( eScope==RUTL_NAMES ) { //first handle ui names like local1 (Sheet1), which point to a local range name - rtl::OUString aName(rName); + OUString aName(rName); sal_Int32 nEndPos = aName.lastIndexOf(')'); sal_Int32 nStartPos = aName.lastIndexOfAsciiL(" (",2); SCTAB nTable = nCurTab; if (nEndPos != -1 && nStartPos != -1) { - rtl::OUString aSheetName = aName.copy(nStartPos+2, nEndPos-nStartPos-2); + OUString aSheetName = aName.copy(nStartPos+2, nEndPos-nStartPos-2); if (pDoc->GetTable(aSheetName, nTable)) { aName = aName.copy(0, nStartPos); @@ -357,7 +355,7 @@ void ScRangeStringConverter::AssignString( if( !rNewStr.isEmpty() ) { if( !rString.isEmpty() ) - rString += rtl::OUString(cSeperator); + rString += OUString(cSeperator); rString += rNewStr; } } @@ -794,7 +792,7 @@ void ScRangeStringConverter::GetStringFromRangeList( } static void lcl_appendCellAddress( - rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell, + OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell, const ScAddress::ExternalInfo& rExtInfo) { if (rExtInfo.mbExternal) @@ -826,7 +824,7 @@ static void lcl_appendCellAddress( } static void lcl_appendCellRangeAddress( - rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell1, const ScAddress& rCell2, + OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell1, const ScAddress& rCell2, const ScAddress::ExternalInfo& rExtInfo1, const ScAddress::ExternalInfo& rExtInfo2) { if (rExtInfo1.mbExternal) @@ -994,11 +992,11 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con rString = aRetStr.makeStringAndClear(); } -ScRangeData* ScRangeStringConverter::GetRangeDataFromString(const rtl::OUString& rString, const SCTAB nTab, const ScDocument* pDoc) +ScRangeData* ScRangeStringConverter::GetRangeDataFromString(const OUString& rString, const SCTAB nTab, const ScDocument* pDoc) { ScRangeName* pLocalRangeName = pDoc->GetRangeName(nTab); ScRangeData* pData = NULL; - rtl::OUString aUpperName = ScGlobal::pCharClass->uppercase(rString); + OUString aUpperName = ScGlobal::pCharClass->uppercase(rString); if(pLocalRangeName) { pData = pLocalRangeName->findByUpperName(aUpperName); @@ -1071,9 +1069,9 @@ ScAreaNameIterator::ScAreaNameIterator( ScDocument* pDoc ) : } } -bool ScAreaNameIterator::Next( rtl::OUString& rName, ScRange& rRange ) +bool ScAreaNameIterator::Next( OUString& rName, ScRange& rRange ) { - // Just a wrapper for rtl::OUString for now. It should replace the method + // Just a wrapper for OUString for now. It should replace the method // below eventually. String aTmp; bool bRet = Next(aTmp, rRange); diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx index 09d0712479bd..dbacb4493487 100644 --- a/sc/source/core/tool/reftokenhelper.cxx +++ b/sc/source/core/tool/reftokenhelper.cxx @@ -31,7 +31,6 @@ using namespace formula; using ::std::vector; using ::std::auto_ptr; -using ::rtl::OUString; void ScRefTokenHelper::compileRangeRepresentation( vector<ScTokenRef>& rRefTokens, const OUString& rRangeStr, ScDocument* pDoc, diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 0a92ffc2721a..37aa03a7472c 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -42,11 +42,11 @@ using ::std::advance; using ::std::unary_function; const mdds::mtv::element_t element_type_custom_string = mdds::mtv::element_type_user_start; -typedef mdds::mtv::default_element_block<element_type_custom_string, rtl::OUString> custom_string_block; +typedef mdds::mtv::default_element_block<element_type_custom_string, OUString> custom_string_block; namespace rtl { -// Callback functions required for supporting rtl::OUString in +// Callback functions required for supporting OUString in // mdds::multi_type_vector. They must be in the rtl namespace to satisfy // argument dependent lookup that mdds::multi_type_vector requires. MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(OUString, element_type_custom_string, OUString(), custom_string_block) @@ -342,9 +342,9 @@ public: void PutDouble( double fVal, SCSIZE nIndex); void PutDouble(const double* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); - void PutString(const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR); - void PutString(const ::rtl::OUString& rStr, SCSIZE nIndex); - void PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); + void PutString(const OUString& rStr, SCSIZE nC, SCSIZE nR); + void PutString(const OUString& rStr, SCSIZE nIndex); + void PutString(const OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); void PutEmpty(SCSIZE nC, SCSIZE nR); void PutEmptyPath(SCSIZE nC, SCSIZE nR); @@ -353,9 +353,9 @@ public: sal_uInt16 GetError( SCSIZE nC, SCSIZE nR) const; double GetDouble(SCSIZE nC, SCSIZE nR) const; double GetDouble( SCSIZE nIndex) const; - rtl::OUString GetString(SCSIZE nC, SCSIZE nR) const; - rtl::OUString GetString( SCSIZE nIndex) const; - rtl::OUString GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const; + OUString GetString(SCSIZE nC, SCSIZE nR) const; + OUString GetString( SCSIZE nIndex) const; + OUString GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const; ScMatrixValue Get(SCSIZE nC, SCSIZE nR) const; bool IsString( SCSIZE nIndex ) const; bool IsString( SCSIZE nC, SCSIZE nR ) const; @@ -513,7 +513,7 @@ void ScMatrixImpl::PutDouble( double fVal, SCSIZE nIndex) PutDouble(fVal, nC, nR); } -void ScMatrixImpl::PutString(const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR) +void ScMatrixImpl::PutString(const OUString& rStr, SCSIZE nC, SCSIZE nR) { if (ValidColRow( nC, nR)) maMat.set(nR, nC, rStr); @@ -523,7 +523,7 @@ void ScMatrixImpl::PutString(const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR) } } -void ScMatrixImpl::PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) +void ScMatrixImpl::PutString(const OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) { if (ValidColRow( nC, nR)) maMat.set(nR, nC, pArray, pArray + nLen); @@ -533,7 +533,7 @@ void ScMatrixImpl::PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC } } -void ScMatrixImpl::PutString(const ::rtl::OUString& rStr, SCSIZE nIndex) +void ScMatrixImpl::PutString(const OUString& rStr, SCSIZE nIndex) { SCSIZE nC, nR; CalcPosition(nIndex, nC, nR); @@ -622,7 +622,7 @@ double ScMatrixImpl::GetDouble( SCSIZE nIndex) const return GetDouble(nC, nR); } -rtl::OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const +OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const { if (ValidColRowOrReplicated( nC, nR )) { @@ -630,7 +630,7 @@ rtl::OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const switch (maMat.get_type(nR, nC)) { case mdds::mtm::element_string: - return maMat.get<rtl::OUString>(nR, nC); + return maMat.get<OUString>(nR, nC); case mdds::mtm::element_empty: return EMPTY_OUSTRING; case mdds::mtm::element_numeric: @@ -653,26 +653,26 @@ rtl::OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const return EMPTY_OUSTRING; } -rtl::OUString ScMatrixImpl::GetString( SCSIZE nIndex) const +OUString ScMatrixImpl::GetString( SCSIZE nIndex) const { SCSIZE nC, nR; CalcPosition(nIndex, nC, nR); return GetString(nC, nR); } -rtl::OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const +OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const { if (!ValidColRowOrReplicated( nC, nR )) { OSL_FAIL("ScMatrixImpl::GetString: dimension error"); - return ::rtl::OUString(); + return OUString(); } double fVal = 0.0; switch (maMat.get_type(nR, nC)) { case mdds::mtm::element_string: - return maMat.get<rtl::OUString>(nR, nC); + return maMat.get<OUString>(nR, nC); case mdds::mtm::element_empty: { if (!maMatFlag.get<bool>(nR, nC)) @@ -682,7 +682,7 @@ rtl::OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, // result of empty FALSE jump path sal_uLong nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_LOGICAL, ScGlobal::eLnge); - ::rtl::OUString aStr; + OUString aStr; Color* pColor = NULL; rFormatter.GetOutputString( 0.0, nKey, aStr, &pColor); return aStr; @@ -706,7 +706,7 @@ rtl::OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, sal_uLong nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_NUMBER, ScGlobal::eLnge); - ::rtl::OUString aStr; + OUString aStr; rFormatter.GetInputLineString( fVal, nKey, aStr); return aStr; } @@ -1228,17 +1228,17 @@ void ScMatrix::PutDouble(const double* pArray, size_t nLen, SCSIZE nC, SCSIZE nR pImpl->PutDouble(pArray, nLen, nC, nR); } -void ScMatrix::PutString(const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR) +void ScMatrix::PutString(const OUString& rStr, SCSIZE nC, SCSIZE nR) { pImpl->PutString(rStr, nC, nR); } -void ScMatrix::PutString(const ::rtl::OUString& rStr, SCSIZE nIndex) +void ScMatrix::PutString(const OUString& rStr, SCSIZE nIndex) { pImpl->PutString(rStr, nIndex); } -void ScMatrix::PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) +void ScMatrix::PutString(const OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) { pImpl->PutString(pArray, nLen, nC, nR); } @@ -1278,17 +1278,17 @@ double ScMatrix::GetDouble( SCSIZE nIndex) const return pImpl->GetDouble(nIndex); } -rtl::OUString ScMatrix::GetString(SCSIZE nC, SCSIZE nR) const +OUString ScMatrix::GetString(SCSIZE nC, SCSIZE nR) const { return pImpl->GetString(nC, nR); } -rtl::OUString ScMatrix::GetString( SCSIZE nIndex) const +OUString ScMatrix::GetString( SCSIZE nIndex) const { return pImpl->GetString(nIndex); } -::rtl::OUString ScMatrix::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const +OUString ScMatrix::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const { return pImpl->GetString(rFormatter, nC, nR); } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 85d6e9a6e0ab..acadb7f1505d 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -366,9 +366,9 @@ FormulaToken* ScRawToken::CreateToken() const return new FormulaDoubleToken( nValue ); case svString : if (eOp == ocPush) - return new FormulaStringToken( rtl::OUString( cStr ) ); + return new FormulaStringToken( OUString( cStr ) ); else - return new FormulaStringOpToken( eOp, rtl::OUString( cStr ) ); + return new FormulaStringOpToken( eOp, OUString( cStr ) ); case svSingleRef : if (eOp == ocPush) return new ScSingleRefToken( aRef.Ref1 ); @@ -386,23 +386,23 @@ FormulaToken* ScRawToken::CreateToken() const return new FormulaIndexToken( eOp, name.nIndex, name.bGlobal); case svExternalSingleRef: { - rtl::OUString aTabName(extref.cTabName); + OUString aTabName(extref.cTabName); return new ScExternalSingleRefToken(extref.nFileId, aTabName, extref.aRef.Ref1); } case svExternalDoubleRef: { - rtl::OUString aTabName(extref.cTabName); + OUString aTabName(extref.cTabName); return new ScExternalDoubleRefToken(extref.nFileId, aTabName, extref.aRef); } case svExternalName: { - rtl::OUString aName(extname.cName); + OUString aName(extname.cName); return new ScExternalNameToken( extname.nFileId, aName ); } case svJump : return new FormulaJumpToken( eOp, (short*) nJump ); case svExternal : - return new FormulaExternalToken( eOp, sbyte.cByte, rtl::OUString( cStr+1 ) ); + return new FormulaExternalToken( eOp, sbyte.cByte, OUString( cStr+1 ) ); case svFAP : return new FormulaFAPToken( eOp, sbyte.cByte, NULL ); case svMissing : @@ -1172,7 +1172,7 @@ bool ScTokenArray::AddFormulaToken(const com::sun::star::sheet::FormulaToken& _a sal_uInt16 nFileId = static_cast< sal_uInt16 >( aApiExtRef.Index ); sheet::SingleReference aApiSRef; sheet::ComplexReference aApiCRef; - ::rtl::OUString aName; + OUString aName; if( aApiExtRef.Reference >>= aApiSRef ) { // try to resolve cache index to sheet name @@ -1995,9 +1995,9 @@ void ScTokenArray::ReadjustRelative3DReferences( const ScAddress& rOldPos, namespace { -void GetExternalTableData(const ScDocument* pOldDoc, const ScDocument* pNewDoc, const SCTAB nTab, rtl::OUString& rTabName, sal_uInt16& rFileId) +void GetExternalTableData(const ScDocument* pOldDoc, const ScDocument* pNewDoc, const SCTAB nTab, OUString& rTabName, sal_uInt16& rFileId) { - rtl::OUString aFileName = pOldDoc->GetFileURL();; + OUString aFileName = pOldDoc->GetFileURL();; rFileId = pNewDoc->GetExternalRefManager()->getExternalFileId(aFileName); rTabName = pOldDoc->GetCopyTabName(nTab); if (rTabName.isEmpty()) @@ -2081,7 +2081,7 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons if ( (rRef2.IsFlag3D() && !rRef2.IsTabRel()) || (rRef1.IsFlag3D() && !rRef1.IsTabRel()) ) { - rtl::OUString aTabName; + OUString aTabName; sal_uInt16 nFileId; GetExternalTableData(pOldDoc, pNewDoc, rRef1.nTab, aTabName, nFileId); pCode[j]->DecRef(); @@ -2100,7 +2100,7 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons if ( rRef.IsFlag3D() && !rRef.IsTabRel() ) { - rtl::OUString aTabName; + OUString aTabName; sal_uInt16 nFileId; GetExternalTableData(pOldDoc, pNewDoc, rRef.nTab, aTabName, nFileId); //replace with ScExternalSingleRefToken and adjust references diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx index 71cf0faee1e9..2a8a851e2698 100644 --- a/sc/source/core/tool/typedstrdata.cxx +++ b/sc/source/core/tool/typedstrdata.cxx @@ -94,7 +94,7 @@ bool ScTypedStrData::operator< (const ScTypedStrData& r) const } ScTypedStrData::ScTypedStrData( - const rtl::OUString& rStr, double nVal, StringType nType ) : + const OUString& rStr, double nVal, StringType nType ) : maStrValue(rStr), mfValue(nVal), meStrType(nType) {} @@ -109,7 +109,7 @@ bool ScTypedStrData::IsStrData() const return meStrType != Value; } -const rtl::OUString& ScTypedStrData::GetString() const +const OUString& ScTypedStrData::GetString() const { return maStrValue; } diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index 28f342af6473..17fe72f5fdfe 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -27,7 +27,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; // -------------------------------------------------------------------- diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx index 07a3fcfe9215..5d8c7691c9ae 100644 --- a/sc/source/core/tool/userlist.cxx +++ b/sc/source/core/tool/userlist.cxx @@ -27,8 +27,6 @@ #include <boost/bind.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace { diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 114b7ab18563..488b59782f58 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -34,7 +34,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //------------------------------------------------------------------ |