summaryrefslogtreecommitdiffstats
path: root/sc/source/core
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/core')
-rw-r--r--sc/source/core/data/attrib.cxx8
-rw-r--r--sc/source/core/data/conditio.cxx6
-rw-r--r--sc/source/core/data/documen2.cxx2
-rw-r--r--sc/source/core/data/documen3.cxx2
-rw-r--r--sc/source/core/data/documen5.cxx2
-rw-r--r--sc/source/core/data/document.cxx8
-rw-r--r--sc/source/core/data/dpshttab.cxx2
-rw-r--r--sc/source/core/data/funcdesc.cxx2
-rw-r--r--sc/source/core/data/sortparam.cxx2
-rw-r--r--sc/source/core/data/table1.cxx2
-rw-r--r--sc/source/core/data/table2.cxx6
-rw-r--r--sc/source/core/data/table6.cxx4
-rw-r--r--sc/source/core/tool/callform.cxx4
-rw-r--r--sc/source/core/tool/chgtrack.cxx8
-rw-r--r--sc/source/core/tool/editutil.cxx4
-rw-r--r--sc/source/core/tool/rangeutl.cxx2
16 files changed, 32 insertions, 32 deletions
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 6adef02ddcbb..3af6849b9573 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -412,7 +412,7 @@ bool ScRangeItem::GetPresentation
const IntlWrapper* /* pIntl */
) const
{
- rText = OUString();
+ rText.clear();
switch ( ePres )
{
@@ -530,7 +530,7 @@ bool ScTableListItem::GetPresentation
return true;
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = OUString();
+ rText.clear();
return false;
default:
@@ -847,7 +847,7 @@ bool ScViewObjectModeItem::GetPresentation
) const
{
OUString aDel(": ");
- rText = OUString();
+ rText.clear();
switch ( ePres )
{
@@ -1019,7 +1019,7 @@ void lclAppendScalePageCount( OUString& rText, sal_uInt16 nPages )
bool ScPageScaleToItem::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit, SfxMapUnit, OUString& rText, const IntlWrapper* ) const
{
- rText = OUString();
+ rText.clear();
if( !IsValid())
return false;
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 0cfbaa12edc7..794fb5695add 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -460,7 +460,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 = OUString();
+ aSrcString.clear();
}
// Convert the text tokens that were created during XML import into real tokens.
@@ -667,7 +667,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
{
bIsStr1 = false;
nVal1 = pEff1->GetValue();
- aStrVal1 = OUString();
+ aStrVal1.clear();
}
else
{
@@ -696,7 +696,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
{
bIsStr2 = false;
nVal2 = pEff2->GetValue();
- aStrVal2 = OUString();
+ aStrVal2.clear();
}
else
{
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 5a6af4ba40e2..1693ad7e54d3 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1278,7 +1278,7 @@ bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder)
void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos, OUString &aTrackText,bool &bLeftEdge)
{
- aTrackText = OUString();
+ aTrackText.clear();
// Change-Tracking
ScChangeTrack* pTrack = GetChangeTrack();
ScChangeViewSettings* pSettings = GetChangeViewSettings();
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index c5602d99d5df..b0b0d82361fd 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1380,7 +1380,7 @@ void ScDocument::GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, OUString
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
maTabs[nTab]->GetUpperCellString( nCol, nRow, rStr );
else
- rStr = OUString();
+ rStr.clear();
}
bool ScDocument::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScQueryParam& rQueryParam)
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index d064c0dcf950..b01d9558eb7b 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -211,7 +211,7 @@ bool ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, OUString& rName
}
}
- rName = OUString();
+ rName.clear();
return false; // nothing found
}
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index c8c8af7fc87a..6c37a5a190a9 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -197,7 +197,7 @@ bool ScDocument::GetName( SCTAB nTab, OUString& rName ) const
maTabs[nTab]->GetName( rName );
return true;
}
- rName = OUString();
+ rName.clear();
return false;
}
@@ -231,7 +231,7 @@ bool ScDocument::GetCodeName( SCTAB nTab, OUString& rName ) const
maTabs[nTab]->GetCodeName( rName );
return true;
}
- rName = OUString();
+ rName.clear();
return false;
}
@@ -3256,7 +3256,7 @@ void ScDocument::GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& r
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
maTabs[nTab]->GetInputString( nCol, nRow, rString );
else
- rString = OUString();
+ rString.clear();
}
sal_uInt16 ScDocument::GetStringForFormula( const ScAddress& rPos, OUString& rString )
@@ -3429,7 +3429,7 @@ void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rForm
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
maTabs[nTab]->GetFormula( nCol, nRow, rFormula );
else
- rFormula = OUString();
+ rFormula.clear();
}
const ScFormulaCell* ScDocument::GetFormulaCell( const ScAddress& rPos ) const
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 679fbae307c5..c5f46df808dc 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -214,7 +214,7 @@ ScSheetSourceDesc::ScSheetSourceDesc(ScDocument* pDoc) :
void ScSheetSourceDesc::SetSourceRange(const ScRange& rRange)
{
maSourceRange = rRange;
- maRangeName = OUString(); // overwrite existing range name if any.
+ maRangeName.clear(); // overwrite existing range name if any.
}
const ScRange& ScSheetSourceDesc::GetSourceRange() const
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index ded0bf590840..14b504e1f64b 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -100,7 +100,7 @@ void ScFuncDesc::Clear()
nFIndex = 0;
nCategory = 0;
- sHelpId = OString();
+ sHelpId.clear();
bIncomplete = false;
bHasSuppressedArgs = false;
}
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index 1e265b3e9a7f..15e423f8ae29 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -54,7 +54,7 @@ void ScSortParam::Clear()
bHasHeader=bCaseSens=bUserDef=bNaturalSort = false;
bByRow=bIncludePattern=bInplace = true;
aCollatorLocale = ::com::sun::star::lang::Locale();
- aCollatorAlgorithm = OUString();
+ aCollatorAlgorithm.clear();
aKeyState.bDoSort = false;
aKeyState.nField = 0;
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index f6871f6767e6..97d894f91b1a 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -356,7 +356,7 @@ void ScTable::GetName( OUString& rName ) const
void ScTable::SetName( const OUString& rNewName )
{
aName = rNewName;
- aUpperName = OUString(); // invalidated if the name is changed
+ aUpperName.clear(); // invalidated if the name is changed
// SetStreamValid is handled in ScDocument::RenameTab
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 381d32bcfbb5..fd3c045b9f4e 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1448,7 +1448,7 @@ void ScTable::GetString( SCCOL nCol, SCROW nRow, OUString& rString ) const
if (ValidColRow(nCol,nRow))
aCol[nCol].GetString( nRow, rString );
else
- rString = OUString();
+ rString.clear();
}
double* ScTable::GetValueCell( SCCOL nCol, SCROW nRow )
@@ -1464,7 +1464,7 @@ void ScTable::GetInputString( SCCOL nCol, SCROW nRow, OUString& rString ) const
if (ValidColRow(nCol,nRow))
aCol[nCol].GetInputString( nRow, rString );
else
- rString = OUString();
+ rString.clear();
}
double ScTable::GetValue( SCCOL nCol, SCROW nRow ) const
@@ -1495,7 +1495,7 @@ void ScTable::GetFormula( SCCOL nCol, SCROW nRow, OUString& rFormula ) const
if (ValidColRow(nCol,nRow))
aCol[nCol].GetFormula( nRow, rFormula );
else
- rFormula = OUString();
+ rFormula.clear();
}
const ScFormulaCell* ScTable::GetFormulaCell( SCCOL nCol, SCROW nRow ) const
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index cf02241ec117..835cbfed8062 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -847,7 +847,7 @@ bool lcl_maybeReplaceCellString(
!rSearchItem.GetReplaceString().isEmpty())
{
rColObj.SetRawString(nRow, rSearchItem.GetReplaceString());
- rUndoStr = OUString();
+ rUndoStr.clear();
}
return true;
}
@@ -1003,7 +1003,7 @@ bool ScTable::SearchRangeForAllEmptyCells(
pUndoDoc->SetString(ScAddress(nCol, i, nTab), EMPTY_OUSTRING);
}
}
- rUndoStr = OUString();
+ rUndoStr.clear();
}
}
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 479e0d98ccd9..a17cc88161ce 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -398,8 +398,8 @@ bool FuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam
}
if ( !bRet )
{
- aName = OUString();
- aDesc = OUString();
+ aName.clear();
+ aDesc.clear();
}
return bRet;
#endif
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 3f5d5c9b2c11..a2d080cf6e43 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1720,7 +1720,7 @@ void ScChangeActionContent::SetValue(
OUString& rStr, ScCellValue& rCell, sal_uLong nFormat, const ScCellValue& rOrgCell,
const ScDocument* pFromDoc, ScDocument* pToDoc )
{
- rStr = OUString();
+ rStr.clear();
if (GetContentCellType(rOrgCell))
{
@@ -1748,7 +1748,7 @@ void ScChangeActionContent::SetValue(
void ScChangeActionContent::SetCell( OUString& rStr, ScCellValue& rCell, sal_uLong nFormat, const ScDocument* pDoc )
{
- rStr = OUString();
+ rStr.clear();
if (rCell.isEmpty())
return;
@@ -1794,7 +1794,7 @@ void ScChangeActionContent::GetValueString(
break;
case CELLTYPE_NONE:
default:
- rStr = OUString();
+ rStr.clear();
}
}
@@ -2199,7 +2199,7 @@ void ScChangeTrack::Clear()
aGeneratedMap.clear();
aPasteCutMap.clear();
maUserCollection.clear();
- maUser = OUString();
+ maUser.clear();
Init();
}
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 7cca6e8aa009..26e8d60683e4 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -755,11 +755,11 @@ static OUString lcl_GetNumStr(sal_Int32 nNo, SvxNumType eType)
if( nNo < 4000 )
aTmpStr = SvxNumberFormat::CreateRomanString( nNo, ( eType == SVX_ROMAN_UPPER ) );
else
- aTmpStr = OUString();
+ aTmpStr.clear();
break;
case SVX_NUMBER_NONE:
- aTmpStr = OUString();
+ aTmpStr.clear();
break;
// CHAR_SPECIAL:
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 31ea9a2ab6aa..4598bdf5a275 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -398,7 +398,7 @@ void ScRangeStringConverter::GetTokenByOffset(
sal_Int32 nLength = rString.getLength();
if( nOffset == -1 || nOffset >= nLength )
{
- rToken = OUString();
+ rToken.clear();
nOffset = -1;
}
else