diff options
Diffstat (limited to 'sw')
47 files changed, 101 insertions, 99 deletions
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 63c1d3c1d829..1027651721ad 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -82,7 +82,7 @@ public: void Reset() { - sFont = OUString(); + sFont.clear(); eCRLF_Flag = GetSystemLineEnd(); eCharSet = ::osl_getThreadTextEncoding(); nLanguage = 0; 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(); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 1f6f2a67bbb9..37e61ed54d7d 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -616,7 +616,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken, OUString *pPseudo ) { sal_uInt16 nDeep = 0; - rToken = OString(); + rToken.clear(); rClass = ""; rRefPoolId = 0; if( pPseudo ) diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 826c7cce1d57..b25020687de1 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -642,7 +642,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, { // nur einen Zeilen-Umbruch (ohne Einrueckung) am Absatz-Anfang // ausgeben - rInfo.aToken = OString(); // kein End-Tag ausgeben + rInfo.aToken.clear(); // kein End-Tag ausgeben rWrt.Strm().WriteCharPtr( SAL_NEWLINE_STRING ); return; @@ -962,7 +962,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // wenn kein End-Tag geschrieben werden soll, es loeschen if( bNoEndTag ) - rInfo.aToken = OString(); + rInfo.aToken.clear(); } if( nBulletGrfLvl != 255 ) diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 65c924abc2fc..4f9c9ef670b9 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -234,7 +234,8 @@ void SwHTMLParser::NewDivision( int nToken ) SwNodeIndex aTmpSwNodeIndex = SwNodeIndex(*pCNd); SwPosition aNewPos( aTmpSwNodeIndex, SwIndex( pCNd, 0 ) ); SaveDocContext( pCntxt, CONTEXT_FLAGS_FTN, &aNewPos ); - aId = aPropInfo.aId = OUString(); + aId.clear(); + aPropInfo.aId.clear(); } } } diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 56324f571182..34c57958c911 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -887,7 +887,7 @@ bool SwWW8ImplReader::GetRangeAsDrawingString(OUString& rString, long nStartCp, OSL_ENSURE(nStartCp <= nEndCp, "+Wo ist der Grafik-Text (7) ?"); if (nStartCp == nEndCp) - rString = OUString(); // leerer String: durchaus denkbar! + rString.clear(); // leerer String: durchaus denkbar! else if (nStartCp < nEndCp) { // den Text einlesen: kann sich ueber mehrere Pieces erstrecken!!! @@ -1113,7 +1113,7 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj, MapWrapIntoFlyFmt(pRecord, pFlyFmt); } } - aString = OUString(); + aString.clear(); rbEraseTextObj = (0 != pFlyFmt); } } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index c071cbd1378c..28525bde172c 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1927,7 +1927,7 @@ sal_Int32 WW8ScannerBase::WW8ReadString( SvStream& rStrm, OUString& rStr, WW8_CP nAktStartCp, long nTotalLen, rtl_TextEncoding eEnc ) const { // Read in plain text, which can extend over several pieces - rStr = OUString(); + rStr.clear(); long nTotalRead = 0; WW8_CP nBehindTextCp = nAktStartCp + nTotalLen; @@ -6175,7 +6175,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, OUString* pString, short* pcbStd ) } } else - *pString = OUString(); // Kann keinen Namen liefern + pString->clear(); // Kann keinen Namen liefern } return pStd; } diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 6554cc496256..218422ecf53d 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -105,7 +105,7 @@ SwXMLImportTableItemMapper_Impl::~SwXMLImportTableItemMapper_Impl() void SwXMLImportTableItemMapper_Impl::Reset() { - m_FoMarginValue = OUString(); + m_FoMarginValue.clear(); for (int i = 0; i < 3; ++i) { m_bHaveMargin[i] = false; diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 8fa98e1a8938..7355613e3ad2 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -499,7 +499,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl) if( nPos > 0 ) aAssignment[MM_PART_GENDER] = m_pFemaleColumnLB->GetSelectEntry(); else - aAssignment[MM_PART_GENDER] = OUString(); + aAssignment[MM_PART_GENDER].clear(); rConfigItem.SetColumnAssignment( rDBData, aAssignment ); } if(m_pFemaleFieldCB->IsValueChangedFromSaved()) diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 3581bc3d8b80..830bc1e14fcf 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -706,7 +706,7 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId) if (!bSpecialFmt) { m_pNumFormatLB->SetDefFormat(GetCurField()->GetFormat()); - sOldNumSel = OUString(); + sOldNumSel.clear(); } else if (nTypeId == TYP_GETFLD || nTypeId == TYP_FORMELFLD) { diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 3c57f1d0b839..93424cf6fcc7 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -283,7 +283,7 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton ) { OUString sFldTypeName = m_pCategoryBox->GetText(); if(sFldTypeName == m_sNone) - sFldTypeName = OUString(); + sFldTypeName.clear(); SwSequenceOptionDialog aDlg( pButton, rView, sFldTypeName ); aDlg.SetApplyBorderAndShadow(bCopyAttributes); aDlg.SetCharacterStyle( sCharacterStyle ); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 085ca163820f..1daede431e21 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1177,7 +1177,7 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox*, pBox) if (pBox->GetSelectEntry().isEmpty()) { for(int i = 0; i < AUTH_FIELD_END; i++) - m_sFields[i] = OUString(); + m_sFields[i].clear(); } m_pAuthorFI->SetText(m_sFields[AUTH_FIELD_AUTHOR]); m_pTitleFI->SetText(m_sFields[AUTH_FIELD_TITLE]); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index d669783bb769..2cab3c57fe44 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -601,14 +601,14 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox *, pBox ) pCollNames[i] = aSaveCollNames[i]; if(aCollName == aNoFmtName) - pCollNames[nTmpLevel] = OUString(); + pCollNames[nTmpLevel].clear(); else { pCollNames[nTmpLevel] = aCollName; // template already in use? for( i = 0; i < MAXLEVEL; ++i) if(i != nTmpLevel && pCollNames[i] == aCollName ) - pCollNames[i] = OUString(); + pCollNames[i].clear(); } // search the oldname and put it into the current entries diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx index 5b5fca7be5f3..542302e0ccc0 100644 --- a/sw/source/ui/vba/vbalisthelper.cxx +++ b/sw/source/ui/vba/vbalisthelper.cxx @@ -318,14 +318,14 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce case 1: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } case 2: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } @@ -353,21 +353,21 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce case 6: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 7: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 8: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } @@ -464,14 +464,14 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce case 0: { nNumberingType = style::NumberingType::ROMAN_UPPER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 1: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); sal_Int16 nParentNumbering = 0; setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); @@ -494,35 +494,35 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce case 4: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } case 5: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } case 6: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } case 7: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 8: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } @@ -568,28 +568,28 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce case 0: { nNumberingType = style::NumberingType::ROMAN_UPPER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 1: { nNumberingType = style::NumberingType::CHARS_UPPER_LETTER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 2: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } case 3: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx index 6fe21b8c2148..b0be1ef15f90 100644 --- a/sw/source/uibase/dbui/mailmergechildwindow.cxx +++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx @@ -82,7 +82,7 @@ IMPL_LINK_NOARG(SwMailMergeChildWin, BackHdl) void SwMailMergeChildWin::FillInfo(SfxChildWinInfo& rInfo) const { SfxFloatingWindow::FillInfo(rInfo); - rInfo.aWinState = OString(); + rInfo.aWinState.clear(); rInfo.bVisible = false; } diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 361d1af0b7ad..e7514f7dca0b 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -407,7 +407,7 @@ static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHead //doesn't use ReplaceAll to prevent expansion of numbers inside of the headers OUString sBlock(rBlock.replaceAll("\\n", OUString('\n'))); SwAddressIterator aGreetingIter(sBlock); - sBlock = OUString(); + sBlock.clear(); while(aGreetingIter.HasMore()) { SwMergeAddressItem aNext = aGreetingIter.Next(); @@ -1601,7 +1601,7 @@ void SwMailMergeConfigItem::DocumentReloaded() m_bMergeDone = false; m_bGreetingInserted = false; m_bAddressInserted = false; - m_rAddressBlockFrame = OUString(); + m_rAddressBlockFrame.clear(); } bool SwMailMergeConfigItem::IsMailAvailable() const diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 12d7cfb9282f..4e62f0a17c33 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -170,7 +170,7 @@ OUString SwGlossaryHdl::GetGroupName( size_t nId, OUString* pTitle ) else { delete pGroup; - sRet = OUString(); + sRet.clear(); } } return sRet; diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index bdd6c4aa3b02..917a778cdbb2 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -711,7 +711,7 @@ void SwHHCWrapper::ConvEnd_impl( SwConversionArgs *pConversionArgs ) bool SwHHCWrapper::ConvContinue_impl( SwConversionArgs *pConversionArgs ) { bool bProgress = !m_bIsDrawObj && !m_bIsSelection; - pConversionArgs->aConvText = OUString(); + (pConversionArgs->aConvText).clear(); pConversionArgs->nConvTextLang = LANGUAGE_NONE; m_pView->GetWrtShell().SpellContinue( &m_nPageCount, bProgress ? &m_nPageStart : NULL, pConversionArgs ); return !pConversionArgs->aConvText.isEmpty(); diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 6ef7dfb73ee4..6d64d753dceb 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -575,7 +575,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) rSh.Unchain(*pFlyFmt); } else - sPrevName = OUString(); + sPrevName.clear(); } if (!sPrevName.isEmpty()) @@ -609,7 +609,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) rSh.Unchain(*((SwFlyFrmFmt*) pCurrFlyFmt)); } else - sNextName = OUString(); + sNextName.clear(); } if (!sNextName.isEmpty()) diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index e44215dbf1d9..da77563d6525 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -252,7 +252,7 @@ void PageMarginControl::FillValueSet( } else { - aHelpText = OUString(); + aHelpText.clear(); } mpMarginValueSet->AddItem( Image((bUserCustomValuesAvailable) ? SW_RES(IMG_CUSTOM) : SW_RES(IMG_CUSTOM_DIS)), 0, diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index 3e2bfbe3a09a..1a96ef53906b 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -737,7 +737,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions ) SearchOptions aSearchOpt( m_pSrchItem->GetSearchOptions() ); aSearchOpt.Locale = GetAppLanguageTag().getLocale(); if( !bDoReplace ) - aSearchOpt.replaceString = OUString(); + aSearchOpt.replaceString.clear(); sal_uLong nFound; if( aSrchSet.Count() || ( pReplSet && pReplSet->Count() )) diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 162ec5751e07..8f04c4a4ef15 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -696,8 +696,8 @@ void SwXAutoTextGroup::removeVetoableChangeListener( void SwXAutoTextGroup::Invalidate() { pGlossaries = 0; - sName = OUString(); - m_sGroupName = OUString(); + sName.clear(); + m_sGroupName.clear(); } OUString SwXAutoTextGroup::getImplementationName(void) throw( uno::RuntimeException, std::exception ) diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx index 5984a257cde1..52a04adf4150 100644 --- a/sw/source/uibase/utlui/attrdesc.cxx +++ b/sw/source/uibase/utlui/attrdesc.cxx @@ -69,7 +69,7 @@ void SwAttrSet::GetPresentation( { static sal_Char const sComma[] = ", "; - rText = OUString(); + rText.clear(); OUString aStr; if( Count() ) { @@ -122,7 +122,7 @@ bool SwFmtAutoFmt::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - rText = OUString(); //TODO + rText.clear(); //TODO return true; } @@ -143,7 +143,7 @@ bool SwFmtRuby::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { - rText = OUString(); + rText.clear(); return true; } @@ -156,7 +156,7 @@ bool SwFmtDrop::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - rText = OUString(); + rText.clear(); if ( GetLines() > 1 ) { if ( GetChars() > 1 ) @@ -500,7 +500,7 @@ bool SwFmtCol::GetPresentation } } else - rText = OUString(); + rText.clear(); return true; } @@ -515,7 +515,7 @@ bool SwFmtURL::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - rText = OUString(); + rText.clear(); if ( pMap ) rText += "Client-Map"; if ( !sURL.isEmpty() ) @@ -542,7 +542,7 @@ bool SwFmtEditInReadonly::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - rText = OUString(); + rText.clear(); if ( GetValue() ) rText = SW_RESSTR(STR_EDIT_IN_READONLY); return true; @@ -702,7 +702,7 @@ bool SwRotationGrf::GetPresentation( if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) rText = SW_RESSTR( STR_ROTATION ); else if( rText.getLength() ) - rText = OUString(); + rText.clear(); rText = rText + OUString::number( GetValue() ) + "\xB0"; return true; } @@ -714,7 +714,7 @@ bool SwLuminanceGrf::GetPresentation( if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) rText = SW_RESSTR( STR_LUMINANCE ); else if( rText.getLength() ) - rText = OUString(); + rText.clear(); rText = rText + unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); return true; @@ -727,7 +727,7 @@ bool SwContrastGrf::GetPresentation( if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) rText = SW_RESSTR( STR_CONTRAST ); else if( rText.getLength() ) - rText = OUString(); + rText.clear(); rText = rText + unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); return true; @@ -750,10 +750,10 @@ bool SwChannelGrf::GetPresentation( if( nId ) rText = SW_RESSTR( nId ); else if( rText.getLength() ) - rText = OUString(); + rText.clear(); } else if( rText.getLength() ) - rText = OUString(); + rText.clear(); rText = rText + unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); return true; @@ -776,7 +776,7 @@ bool SwInvertGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { - rText = OUString(); + rText.clear(); if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) { const sal_uInt16 nId = GetValue() ? STR_INVERT : STR_INVERT_NOT; @@ -792,7 +792,7 @@ bool SwTransparencyGrf::GetPresentation( if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) rText = SW_RESSTR( STR_TRANSPARENCY ); else if( rText.getLength() ) - rText = OUString(); + rText.clear(); rText = rText + unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); return true; @@ -802,7 +802,7 @@ bool SwDrawModeGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { - rText = OUString(); + rText.clear(); if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) { sal_uInt16 nId; @@ -825,7 +825,7 @@ bool SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation ePres, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { - rText = OUString(); + rText.clear(); if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) { const sal_uInt16 nId = GetValue() ? STR_FOLLOW_TEXT_FLOW : STR_DONT_FOLLOW_TEXT_FLOW; diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index f1f96e04952d..2402fd3c56c7 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -264,7 +264,7 @@ void SwContentType::Init(bool* pbInvalidateWindow) pMarkAccess->getBookmarksBegin(), pMarkAccess->getBookmarksEnd(), &lcl_IsUiVisibleBookmark)); - sTypeToken = OUString(); + sTypeToken.clear(); bEdit = true; } break; @@ -406,14 +406,14 @@ void SwContentType::Init(bool* pbInvalidateWindow) } } } - sTypeToken = OUString(); + sTypeToken.clear(); bEdit = true; nOldMemberCount = nMemberCount; } break; case CONTENT_TYPE_DRAWOBJECT: { - sTypeToken = OUString(); + sTypeToken.clear(); nMemberCount = 0; SwDrawModel* pModel = pWrtShell->getIDocumentDrawModelAccess()->GetDrawModel(); if(pModel) diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 41449c9b5f8f..ad506f5fcf0b 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -360,7 +360,8 @@ void SwGlossaryList::FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGlossaries) { SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(pGroup->sName); pGroup->nCount = pBlock ? pBlock->GetCount() : 0; - pGroup->sLongNames = pGroup->sShortNames = OUString(); + (pGroup->sLongNames).clear(); + (pGroup->sShortNames).clear(); if(pBlock) pGroup->sTitle = pBlock->GetName(); diff --git a/sw/source/uibase/utlui/zoomctrl.cxx b/sw/source/uibase/utlui/zoomctrl.cxx index 50640d89611c..3faa4a64f29e 100644 --- a/sw/source/uibase/utlui/zoomctrl.cxx +++ b/sw/source/uibase/utlui/zoomctrl.cxx @@ -50,7 +50,7 @@ void SwZoomControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, } else { - sPreviewZoom = OUString(); + sPreviewZoom.clear(); SvxZoomStatusBarControl::StateChanged(nSID, eState, pState); } } diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index fec7e867e12d..786ce997ad29 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -524,7 +524,7 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk, } else { - sURL = OUString(); + sURL.clear(); } } } |