summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/bastyp/calc.cxx2
-rw-r--r--sw/source/core/doc/DocumentContentOperationsManager.cxx2
-rw-r--r--sw/source/core/doc/DocumentListsManager.cxx2
-rw-r--r--sw/source/core/doc/docfld.cxx4
-rw-r--r--sw/source/core/doc/doctxm.cxx2
-rw-r--r--sw/source/core/docnode/ndsect.cxx2
-rw-r--r--sw/source/core/fields/cellfml.cxx2
-rw-r--r--sw/source/core/fields/chpfld.cxx8
-rw-r--r--sw/source/core/fields/docufld.cxx2
-rw-r--r--sw/source/core/fields/flddropdown.cxx6
-rw-r--r--sw/source/core/fields/reffld.cxx2
-rw-r--r--sw/source/core/frmedt/fetab.cxx2
-rw-r--r--sw/source/core/layout/dbg_lay.cxx2
-rw-r--r--sw/source/core/table/swtable.cxx2
-rw-r--r--sw/source/core/text/porexp.cxx4
-rw-r--r--sw/source/core/txtnode/txtedt.cxx2
-rw-r--r--sw/source/core/undo/docundo.cxx2
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx2
-rw-r--r--sw/source/core/unocore/unosect.cxx8
-rw-r--r--sw/source/core/unocore/unosett.cxx8
-rw-r--r--sw/source/core/unocore/unostyle.cxx2
21 files changed, 34 insertions, 34 deletions
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 290784e627a2..da6a6eb207bd 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1563,7 +1563,7 @@ bool SwCalc::IsValidVarName( const OUString& rStr, OUString* pValidName )
}
}
else if( pValidName )
- *pValidName = OUString();
+ pValidName->clear();
}
return bRet;
}
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 8b53daf4ce72..7cc04eb8b64b 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -977,7 +977,7 @@ namespace
}
}
rRet = rStr;
- rStr = OUString();
+ rStr.clear();
return false;
}
}
diff --git a/sw/source/core/doc/DocumentListsManager.cxx b/sw/source/core/doc/DocumentListsManager.cxx
index 340396fbe2f4..784b38f6043c 100644
--- a/sw/source/core/doc/DocumentListsManager.cxx
+++ b/sw/source/core/doc/DocumentListsManager.cxx
@@ -107,7 +107,7 @@ SwList* DocumentListsManager::createListForListStyle( const OUString& sListStyle
OUString sListId( pNumRule->GetDefaultListId() ); // can be empty String
if ( getListByName( sListId ) )
{
- sListId = OUString();
+ sListId.clear();
}
SwList* pNewList = createList( sListId, sListStyleName );
maListStyleLists[sListStyleName] = pNewList;
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 0faa281a7c8b..0a340bf045e5 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -941,7 +941,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
else
break;
- sFormula = OUString();
+ sFormula.clear();
// trigger formatting
((SwFmtFld*)pFmtFld)->ModifyNotification( 0, 0 );
}
@@ -958,7 +958,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
else
break;
- sFormula = OUString();
+ sFormula.clear();
// evaluate field
((SwHiddenTxtField*)pFld)->Evaluate(&rDoc);
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 67e263c81a2e..929e986979b1 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -769,7 +769,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
if ( !mbKeepExpression )
{
- maMSTOCExpression = OUString();
+ maMSTOCExpression.clear();
}
SwDoc* pDoc = (SwDoc*)pSectNd->GetDoc();
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 530f0ff7d03c..d70d70e577d6 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -694,7 +694,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
if (sSectName != pSection->GetSectionName())
sSectName = GetUniqueSectionName( &sSectName );
else
- sSectName = OUString();
+ sSectName.clear();
/// In SwSection::operator=(..) class member bCondHiddenFlag is always set to sal_True.
/// IMHO this have to be changed, but I can't estimate the consequences:
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index fc7bed25b660..27edc52800f6 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -736,7 +736,7 @@ static sal_Int32 lcl_GetLongBoxNum( OUString& rStr )
if ( nPos<0 )
{
nRet = rStr.toInt32();
- rStr = OUString();
+ rStr.clear();
}
else
{
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index d1552abffb13..273d48c0e41e 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -120,10 +120,10 @@ void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, bool bSrchNum)
{
- sNumber = OUString();
- sTitle = OUString();
- sPost = OUString();
- sPre = OUString();
+ sNumber.clear();
+ sTitle.clear();
+ sPost.clear();
+ sPre.clear();
SwDoc* pDoc = (SwDoc*)rTxtNd.GetDoc();
const SwTxtNode *pTxtNd = rTxtNd.FindOutlineNodeOfLevel( nLevel );
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 23f00f8087ff..4645c0785667 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2239,7 +2239,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
pDoc->GetNodes().GetEndOfExtras().GetIndex() )
return;
- sTxt = OUString();
+ sTxt.clear();
OSL_ENSURE( !pFrm->IsInDocBody(), "Flag incorrect, frame is in DocBody" );
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index c6840191c6a2..013ad4af5762 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -102,7 +102,7 @@ void SwDropDownField::SetPar2(const OUString & rName)
void SwDropDownField::SetItems(const vector<OUString> & rItems)
{
aValues = rItems;
- aSelectedItem = OUString();
+ aSelectedItem.clear();
}
void SwDropDownField::SetItems(const uno::Sequence<OUString> & rItems)
@@ -113,7 +113,7 @@ void SwDropDownField::SetItems(const uno::Sequence<OUString> & rItems)
for (int i = 0; i < aCount; i++)
aValues.push_back(rItems[i]);
- aSelectedItem = OUString();
+ aSelectedItem.clear();
}
uno::Sequence<OUString> SwDropDownField::GetItemSequence() const
@@ -144,7 +144,7 @@ bool SwDropDownField::SetSelectedItem(const OUString & rItem)
if (aIt != aValues.end())
aSelectedItem = *aIt;
else
- aSelectedItem = OUString();
+ aSelectedItem.clear();
return (aIt != aValues.end());
}
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index c7f1a00caaaf..6c9e20223e37 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -272,7 +272,7 @@ OUString SwGetRefField::GetFieldName() const
// #i81002# - parameter <pFldTxtAttr> added
void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
{
- sTxt = OUString();
+ sTxt.clear();
SwDoc* pDoc = ((SwGetRefFieldType*)GetTyp())->GetDoc();
// finding the reference target (the number)
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index f84d21028567..01c707a215bf 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -2294,7 +2294,7 @@ bool SwFEShell::GetAutoSum( OUString& rFml ) const
// redo only for values!
nW = RES_BOXATR_VALUE;
- sFields = OUString();
+ sFields.clear();
// restore previous spaces!
for( size_t i = aCells.size(); n+1 < i; )
{
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 64b70f67139b..e2867c745937 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -405,7 +405,7 @@ void SwImplProtocol::FileInit()
aLine = aLine.trim();
if( !aLine.isEmpty() )
CheckLine( aLine ); // evaluate line
- aLine = OString();
+ aLine.clear();
}
else
aLine = OString(c);
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 79a1c65bc6cf..fe4b25218b49 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1376,7 +1376,7 @@ sal_uInt16 SwTable::_GetBoxNum( OUString& rStr, bool bFirstPart,
{
nRet = static_cast<sal_uInt16>(rStr.toInt32());
}
- rStr = OUString();
+ rStr.clear();
}
else
{
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index f3e59e0c189c..fe90c4d33047 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -27,7 +27,7 @@ sal_Int32 SwExpandPortion::GetCrsrOfst( const sal_uInt16 nOfst ) const
bool SwExpandPortion::GetExpTxt( const SwTxtSizeInfo&, OUString &rTxt ) const
{
- rTxt = OUString();
+ rTxt.clear();
// Nicht etwa: return 0 != rTxt.Len();
// Weil: leere Felder ersetzen CH_TXTATR gegen einen Leerstring
return true;
@@ -234,7 +234,7 @@ bool SwPostItsPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) co
if( rInf.OnWin() && rInf.GetOpt().IsPostIts() )
rTxt = OUString(' ');
else
- rTxt = OUString();
+ rTxt.clear();
return true;
}
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index fbf8b91862db..02deb0dfd605 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1104,7 +1104,7 @@ bool SwTxtNode::Convert( SwConversionArgs &rArgs )
? ::std::min(rArgs.pEndIdx->GetIndex(), m_Text.getLength())
: m_Text.getLength();
- rArgs.aConvText = OUString();
+ rArgs.aConvText.clear();
// modify string according to redline information and hidden text
const OUString aOldTxt( m_Text );
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 757167266649..470abe183a30 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -373,7 +373,7 @@ SwUndoId UndoManager::GetRepeatInfo(OUString *const o_pStr) const
}
if (o_pStr) // not repeatable -> clear comment
{
- *o_pStr = OUString();
+ o_pStr->clear();
}
return UNDO_EMPTY;
}
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index cb2e42ed70de..39e5d2c9a985 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -345,7 +345,7 @@ SwXParagraph::attachToText(SwXText & rParent, SwTxtNode & rTxtNode)
{
try { setString(m_pImpl->m_sText); }
catch(...){}
- m_pImpl->m_sText = OUString();
+ (m_pImpl->m_sText).clear();
}
}
}
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index bd137b174b85..1d2bc1b828f9 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -1489,7 +1489,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
if (m_pImpl->m_bIsDescriptor)
{
- m_pImpl->m_pProps->m_sCondition = OUString();
+ (m_pImpl->m_pProps->m_sCondition).clear();
}
else
{
@@ -1505,9 +1505,9 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
if (m_pImpl->m_bIsDescriptor)
{
m_pImpl->m_pProps->m_bDDE = false;
- m_pImpl->m_pProps->m_sLinkFileName = OUString();
- m_pImpl->m_pProps->m_sSectionRegion = OUString();
- m_pImpl->m_pProps->m_sSectionFilter = OUString();
+ (m_pImpl->m_pProps->m_sLinkFileName).clear();
+ (m_pImpl->m_pProps->m_sSectionRegion).clear();
+ (m_pImpl->m_pProps->m_sSectionFilter).clear();
}
else
{
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index c9b4293b1010..aca2c381df25 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1359,7 +1359,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
{
// if the default for the level is existing, but its
// level is different, then it cannot be the default.
- sValue = OUString();
+ sValue.clear();
}
}
SwStyleNameMapper::FillProgName(sValue, aUString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true);
@@ -1399,7 +1399,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFmt(
//char style name
OUString CharStyleName(rCharFormatName);
- aUString = OUString();
+ aUString.clear();
SwStyleNameMapper::FillProgName( CharStyleName, aUString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
aPropertyValues.push_back(makePropertyValue(aUString, "CharStyleName"));
@@ -1507,7 +1507,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFmt(
aAny >>= aUString;
}
else
- aUString = OUString();
+ aUString.clear();
aPropertyValues.push_back(
makePropertyValue(aUString, UNO_NAME_GRAPHIC_URL));
@@ -1792,7 +1792,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
// #i51842#
// If the character format has been found its name should not be in the
// char style names array
- rCharStyleName = OUString();
+ rCharStyleName.clear();
}
else
rCharStyleName = sCharFmtName;
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 5d6191159dcf..57ab928ac3a1 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3316,7 +3316,7 @@ void SwXStyle::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
void SwXStyle::Invalidate()
{
- m_sStyleName = OUString();
+ m_sStyleName.clear();
pBasePool = 0;
m_pDoc = 0;
mxStyleData.clear();
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 21:36:47 +0000