summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-12-18 04:55:34 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-12-18 07:27:47 +0100
commitd8037ae18a297229d1b79f8f76331abfd548350d (patch)
tree7eaa9f4cb012be19d2eca340236eebbc8e784f92 /sw/source/filter
parentc2a91dc53431b5658f54ca4fd32ca79165e865af (diff)
Get rid of aEmptyOUStr
Commit 8051bb7e18ccae0f639e65dfa86bcc18a5fb9108 had removed its "String" counterpart. Change-Id: Id873a259e7f4b2794e94dec83d08ed6b57298beb Reviewed-on: https://gerrit.libreoffice.org/65299 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/html/css1atr.cxx2
-rw-r--r--sw/source/filter/html/htmlbas.cxx2
-rw-r--r--sw/source/filter/html/htmlcss1.cxx16
-rw-r--r--sw/source/filter/html/htmldrawreader.cxx4
-rw-r--r--sw/source/filter/html/htmldrawwriter.cxx2
-rw-r--r--sw/source/filter/html/htmlfld.cxx2
-rw-r--r--sw/source/filter/html/htmlflywriter.cxx6
-rw-r--r--sw/source/filter/html/htmlform.cxx4
-rw-r--r--sw/source/filter/html/htmlforw.cxx4
-rw-r--r--sw/source/filter/html/htmlftn.cxx8
-rw-r--r--sw/source/filter/html/htmlgrin.cxx6
-rw-r--r--sw/source/filter/html/htmlsect.cxx2
-rw-r--r--sw/source/filter/html/htmltab.cxx4
-rw-r--r--sw/source/filter/html/swhtml.cxx28
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx2
15 files changed, 47 insertions, 45 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 7dc44e6d23f0..331f0014c718 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1091,7 +1091,7 @@ void SwHTMLWriter::PrepareFontList( const SvxFontItem& rFontItem,
OUString& rNames,
sal_Unicode cQuote, bool bGeneric )
{
- rNames = aEmptyOUStr;
+ rNames.clear();
const OUString& rName = rFontItem.GetFamilyName();
bool bContainsKeyword = false;
if( !rName.isEmpty() )
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 158884433ab1..47e26cbcb7fd 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -292,7 +292,7 @@ void SwHTMLWriter::OutBasic()
const OUString& rModName = pModule->GetName();
Strm().WriteCharPtr( SAL_NEWLINE_STRING ); // don't indent!
HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), pModule->GetSource(),
- sLang, STARBASIC, aEmptyOUStr,
+ sLang, STARBASIC, OUString(),
&rLibName, &rModName,
m_eDestEnc, &m_aNonConvertableCharacters );
}
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index cd94832ce815..1c885c108132 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -353,7 +353,7 @@ void SwCSS1Parser::SetTableTextColl( bool bHeader )
SvxCSS1MapEntry *pStyleEntry = GetTag( sTag );
if( pStyleEntry )
{
- pColl = GetTextFormatColl( nPoolId, aEmptyOUStr );
+ pColl = GetTextFormatColl(nPoolId, OUString());
SetTextCollAttrs( pColl, pStyleEntry->GetItemSet(),
pStyleEntry->GetPropertyInfo(), this );
}
@@ -363,7 +363,7 @@ void SwCSS1Parser::SetTableTextColl( bool bHeader )
if( pStyleEntry )
{
if( !pColl )
- pColl = GetTextFormatColl( nPoolId, aEmptyOUStr );
+ pColl = GetTextFormatColl(nPoolId, OUString());
SetTextCollAttrs( pColl, pStyleEntry->GetItemSet(),
pStyleEntry->GetPropertyInfo(), this );
}
@@ -893,7 +893,7 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
nPoolCollId = RES_POOLCOLL_FOOTNOTE;
if( nPoolCollId )
- aClass = aEmptyOUStr;
+ aClass.clear();
else
nPoolCollId = RES_POOLCOLL_TEXT;
}
@@ -978,7 +978,7 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
// either not a composed selector or a X:first-line { float: left; ... }
// search resp. create the style
- SwTextFormatColl *pColl = GetTextFormatColl( nPoolCollId, aEmptyOUStr );
+ SwTextFormatColl* pColl = GetTextFormatColl(nPoolCollId, OUString());
SwTextFormatColl* pParentColl = nullptr;
if( !aClass.isEmpty() )
{
@@ -1072,7 +1072,7 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
if( pNext )
return;
- SwCharFormat *pCFormat = GetChrFormat( nToken2, aEmptyOUStr );
+ SwCharFormat* pCFormat = GetChrFormat(nToken2, OUString());
if( pCFormat )
{
SwCharFormat *pParentCFormat = nullptr;
@@ -1252,12 +1252,12 @@ SwTextFormatColl *SwCSS1Parser::GetTextFormatColl( sal_uInt16 nTextColl,
if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdendnote) )
{
nTextColl = RES_POOLCOLL_ENDNOTE;
- aClass = aEmptyOUStr;
+ aClass.clear();
}
else if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdfootnote) )
{
nTextColl = RES_POOLCOLL_FOOTNOTE;
- aClass = aEmptyOUStr;
+ aClass.clear();
}
}
@@ -1798,7 +1798,7 @@ bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn )
SwPageDesc *pMasterPageDesc =
m_pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool( RES_POOLPAGE_HTML, false );
- SvxCSS1MapEntry *pPageEntry = GetPage( aEmptyOUStr, false );
+ SvxCSS1MapEntry* pPageEntry = GetPage(OUString(), false);
if( pPageEntry )
{
// @page (affects all already existing pages)
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index 9843075560ea..0b1bde84b298 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -231,7 +231,7 @@ static void PutEEPoolItem( SfxItemSet &rEEItemSet,
{
const SvxBrushItem& rBrushItem = static_cast<const SvxBrushItem&>(rSwItem);
rEEItemSet.Put( XFillStyleItem(drawing::FillStyle_SOLID) );
- rEEItemSet.Put( XFillColorItem(aEmptyOUStr,
+ rEEItemSet.Put(XFillColorItem(OUString(),
rBrushItem.GetColor()) );
}
break;
@@ -438,7 +438,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
if( bBGColor )
{
aItemSet.Put( XFillStyleItem(drawing::FillStyle_SOLID) );
- aItemSet.Put( XFillColorItem(aEmptyOUStr, aBGColor) );
+ aItemSet.Put(XFillColorItem(OUString(), aBGColor));
}
// parse styles (is here only possible for attributes, which also
diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx
index b6f071c869c4..9b4f06e029e5 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -273,7 +273,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt,
HtmlFrmOpts nFrameFlags = HTML_FRMOPTS_MARQUEE;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
nFrameFlags |= HTML_FRMOPTS_MARQUEE_CSS1;
- OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrameFlags );
+ OString aEndTags = rHTMLWrt.OutFrameFormatOptions(rFormat, OUString(), nFrameFlags);
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrameFlags, &rSdrObject );
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index da9211de08dc..db7edb38a868 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -636,7 +636,7 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
SwPostItField aPostItField(
static_cast<SwPostItFieldType*>(m_xDoc->getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::Postit )),
- aEmptyOUStr, aComment, aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) );
+ OUString(), aComment, OUString(), OUString(), DateTime(DateTime::SYSTEM));
InsertAttr( SwFormatField( aPostItField ), false );
if( bMoveFwd )
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index 3d74a9e7976e..589aa2510cc1 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -1614,7 +1614,7 @@ static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt,
HtmlFrmOpts nFrameFlags = HTML_FRMOPTS_MULTICOL;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
nFrameFlags |= HTML_FRMOPTS_MULTICOL_CSS1;
- rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrameFlags );
+ rHTMLWrt.OutFrameFormatOptions(rFrameFormat, OUString(), nFrameFlags);
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameFlags );
@@ -1662,7 +1662,7 @@ static Writer& OutHTML_FrameFormatAsSpacer( Writer& rWrt, const SwFrameFormat& r
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// ALIGN, WIDTH, HEIGHT
- OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, HTML_FRMOPTS_SPACER );
+ OString aEndTags = rHTMLWrt.OutFrameFormatOptions(rFrameFormat, OUString(), HTML_FRMOPTS_SPACER);
rWrt.Strm().WriteChar( '>' );
if( !aEndTags.isEmpty() )
@@ -1699,7 +1699,7 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
HtmlFrmOpts nFrameFlags = HTML_FRMOPTS_DIV;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) )
nFrameFlags |= HtmlFrmOpts::SNoBorder;
- OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrameFlags );
+ OString aEndTags = rHTMLWrt.OutFrameFormatOptions(rFrameFormat, OUString(), nFrameFlags);
rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameFlags );
rWrt.Strm().WriteChar( '>' );
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 08989acfa370..c4bd7f94afaf 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -243,7 +243,7 @@ public:
void SetShape( const uno::Reference< drawing::XShape >& r ) { m_xShape = r; }
OUString& GetText() { return m_sText; }
- void EraseText() { m_sText = aEmptyOUStr; }
+ void EraseText() { m_sText.clear(); }
std::vector<OUString>& GetStringList() { return m_aStringList; }
void EraseStringList()
@@ -2449,7 +2449,7 @@ void SwHTMLParser::InsertSelectOption()
}
sal_uInt16 nEntryCnt = m_pFormImpl->GetStringList().size();
- m_pFormImpl->GetStringList().push_back(aEmptyOUStr);
+ m_pFormImpl->GetStringList().push_back(OUString());
m_pFormImpl->GetValueList().push_back(aValue);
if( m_bLBEntrySelected )
{
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index b3f2d6088c00..573663220d3a 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -1045,7 +1045,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
}
OString aEndTags;
if( nFrameOpts != HtmlFrmOpts::NONE )
- aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrameOpts );
+ aEndTags = rHTMLWrt.OutFrameFormatOptions(rFormat, OUString(), nFrameOpts);
if( rHTMLWrt.m_bCfgOutStyles )
{
@@ -1101,7 +1101,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
if( auto n = o3tl::tryAccess<sal_Int16>(aTmp2) )
eFamily = static_cast<FontFamily>(*n);
}
- SvxFontItem aItem( eFamily, *aFName, aEmptyOUStr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT );
+ SvxFontItem aItem(eFamily, *aFName, OUString(), PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT);
aItemSet.Put( aItem );
}
}
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index cfab31225bc6..f7c35ed61272 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -35,7 +35,7 @@
static sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent,
sal_Int32 nPos )
{
- rPart = aEmptyOUStr;
+ rPart.clear();
sal_Int32 nLen = rContent.getLength();
if( nPos >= nLen )
{
@@ -182,7 +182,7 @@ void SwHTMLParser::InsertFootEndNote( const OUString& rName, bool bEndNote,
m_pFootEndNoteImpl->sName = m_pFootEndNoteImpl->sName.toAsciiUpperCase();
m_pFootEndNoteImpl->bEndNote = bEndNote;
m_pFootEndNoteImpl->bFixed = bFixed;
- m_pFootEndNoteImpl->sContent = aEmptyOUStr;
+ m_pFootEndNoteImpl->sContent.clear();
}
void SwHTMLParser::FinishFootEndNote()
@@ -201,8 +201,8 @@ void SwHTMLParser::FinishFootEndNote()
// In header and footer no footnotes can be inserted.
if (pTextFootnote)
m_pFootEndNoteImpl->aTextFootnotes.push_back(SwHTMLTextFootnote(m_pFootEndNoteImpl->sName,pTextFootnote));
- m_pFootEndNoteImpl->sName = aEmptyOUStr;
- m_pFootEndNoteImpl->sContent = aEmptyOUStr;
+ m_pFootEndNoteImpl->sName.clear();
+ m_pFootEndNoteImpl->sContent.clear();
m_pFootEndNoteImpl->bFixed = false;
}
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 04ad57da0013..ba1d99f99456 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -788,7 +788,7 @@ IMAGE_SETEVENT:
// passing empty sGrfNm here, means we don't want the graphic to be linked
SwFrameFormat *const pFlyFormat =
m_xDoc->getIDocumentContentOperations().InsertGraphic(
- *m_pPam, sGrfNm, aEmptyOUStr, &aGraphic,
+ *m_pPam, sGrfNm, OUString(), &aGraphic,
&aFrameSet, nullptr, nullptr);
SwGrfNode *pGrfNd = m_xDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
->GetIndex()+1 ]->GetGrfNode();
@@ -1264,7 +1264,9 @@ ANCHOR_SETEVENT:
if( bEnAnchor || bFootnoteAnchor || bFootnoteEnSymbol )
{
aFootnoteName = sHRef.copy( 1 );
- aClass = aStrippedClass = aName = aEmptyOUStr;
+ aClass.clear();
+ aStrippedClass.clear();
+ aName.clear();
bHasHRef = false;
}
}
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index f33b7d1bf75c..8ebd982fd635 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -642,7 +642,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
// Insert fly frame. If the are columns, the fly frame's name is not
// the sections name but a generated one.
- OUString aFlyName( aEmptyOUStr );
+ OUString aFlyName;
if( nCols < 2 )
{
aFlyName = aId;
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 28f1e5d3cac1..384932beb194 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1007,7 +1007,7 @@ void HTMLTable::InitCtor(const HTMLTableOptions& rOptions)
m_xBackgroundBrush.reset(m_pParser->CreateBrushItem(
rOptions.bBGColor ? &(rOptions.aBGColor) : nullptr,
- rOptions.aBGImage, aEmptyOUStr, aEmptyOUStr, aEmptyOUStr));
+ rOptions.aBGImage, OUString(), OUString(), OUString()));
m_pContext = nullptr;
m_xParentContents.reset();
@@ -2998,7 +2998,7 @@ CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTabl
nToken = HtmlTokenId::TABLEDATA_ON;
nColl = RES_POOLCOLL_TABLE;
}
- std::unique_ptr<HTMLAttrContext> xCntxt(new HTMLAttrContext(nToken, nColl, aEmptyOUStr, true));
+ std::unique_ptr<HTMLAttrContext> xCntxt(new HTMLAttrContext(nToken, nColl, OUString(), true));
if( SvxAdjust::End != eAdjust )
rParser.InsertAttr(&rParser.m_xAttrTab->pAdjust, SvxAdjustItem(eAdjust, RES_PARATR_ADJUST),
xCntxt.get());
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 4d7905a203f3..aa453421f05b 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -3923,12 +3923,12 @@ void SwHTMLParser::NewPara()
// parse styles (Don't consider class. This is only possible as long as none of
// the CSS1 properties of the class must be formatted hard!!!)
- if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
+ if (HasStyleOptions(aStyle, aId, OUString(), &aLang, &aDir))
{
SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
- if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
+ if (ParseStyleOptions(aStyle, aId, OUString(), aItemSet, aPropInfo, &aLang, &aDir))
{
OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ),
"Class is not considered" );
@@ -4057,12 +4057,12 @@ void SwHTMLParser::NewHeading( HtmlTokenId nToken )
std::unique_ptr<HTMLAttrContext> xCntxt(new HTMLAttrContext(nToken, nTextColl, aClass));
// parse styles (regarding class see also NewPara)
- if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
+ if (HasStyleOptions(aStyle, aId, OUString(), &aLang, &aDir))
{
SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
- if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
+ if (ParseStyleOptions(aStyle, aId, OUString(), aItemSet, aPropInfo, &aLang, &aDir))
{
OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ),
"Class is not considered" );
@@ -4166,7 +4166,7 @@ void SwHTMLParser::NewTextFormatColl( HtmlTokenId nToken, sal_uInt16 nColl )
// These both tags will be mapped to the PRE style. For the case that a
// a CLASS exists we will delete it so that we don't get the CLASS of
// the PRE style.
- aClass = aEmptyOUStr;
+ aClass.clear();
[[fallthrough]];
case HtmlTokenId::BLOCKQUOTE_ON:
case HtmlTokenId::BLOCKQUOTE30_ON:
@@ -4193,12 +4193,12 @@ void SwHTMLParser::NewTextFormatColl( HtmlTokenId nToken, sal_uInt16 nColl )
std::unique_ptr<HTMLAttrContext> xCntxt(new HTMLAttrContext(nToken, nColl, aClass));
// parse styles (regarding class see also NewPara)
- if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
+ if (HasStyleOptions(aStyle, aId, OUString(), &aLang, &aDir))
{
SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
- if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
+ if (ParseStyleOptions(aStyle, aId, OUString(), aItemSet, aPropInfo, &aLang, &aDir))
{
OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ),
"Class is not considered" );
@@ -4333,7 +4333,7 @@ void SwHTMLParser::NewDefList()
// and the one of the DT-style of the current level
SvxLRSpaceItem rLRSpace =
- m_pCSS1Parser->GetTextFormatColl( RES_POOLCOLL_HTML_DD, aEmptyOUStr )
+ m_pCSS1Parser->GetTextFormatColl(RES_POOLCOLL_HTML_DD, OUString())
->GetLRSpace();
nLeft = nLeft + static_cast< sal_uInt16 >(rLRSpace.GetTextLeft());
}
@@ -4553,7 +4553,7 @@ void SwHTMLParser::SetTextCollAttrs( HTMLAttrContext *pContext )
SwTextFormatColl *pCollToSet = nullptr; // the style to set
SfxItemSet *pItemSet = nullptr; // set of hard attributes
sal_uInt16 nTopColl = pContext ? pContext->GetTextFormatColl() : 0;
- const OUString& rTopClass = pContext ? pContext->GetClass() : aEmptyOUStr;
+ const OUString rTopClass = pContext ? pContext->GetClass() : OUString();
sal_uInt16 nDfltColl = RES_POOLCOLL_TEXT;
bool bInPRE=false; // some context info
@@ -4681,7 +4681,7 @@ void SwHTMLParser::SetTextCollAttrs( HTMLAttrContext *pContext )
if( RES_POOLCOLL_HTML_DD == nTopColl )
{
const SvxLRSpaceItem& rDTLRSpace = m_pCSS1Parser
- ->GetTextFormatColl( RES_POOLCOLL_HTML_DT, aEmptyOUStr )
+ ->GetTextFormatColl(RES_POOLCOLL_HTML_DT, OUString())
->GetLRSpace();
nLeft -= rDTLRSpace.GetTextLeft();
nRight -= rDTLRSpace.GetRight();
@@ -4799,12 +4799,12 @@ void SwHTMLParser::NewCharFormat( HtmlTokenId nToken )
OSL_ENSURE( pCFormat, "No character format found for token" );
// parse styles (regarding class see also NewPara)
- if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
+ if (HasStyleOptions(aStyle, aId, OUString(), &aLang, &aDir))
{
SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
- if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
+ if (ParseStyleOptions(aStyle, aId, OUString(), aItemSet, aPropInfo, &aLang, &aDir))
{
OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ),
"Class is not considered" );
@@ -5259,7 +5259,7 @@ void SwHTMLParser::InsertHorzRule()
// ...and save in a context
std::unique_ptr<HTMLAttrContext> xCntxt(
- new HTMLAttrContext(HtmlTokenId::HORZRULE, RES_POOLCOLL_HTML_HR, aEmptyOUStr));
+ new HTMLAttrContext(HtmlTokenId::HORZRULE, RES_POOLCOLL_HTML_HR, OUString()));
PushContext(xCntxt);
@@ -5427,7 +5427,7 @@ void SwHTMLParser::ParseMoreMetaOptions()
SwPostItField aPostItField(
static_cast<SwPostItFieldType*>(m_xDoc->getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::Postit )),
- aEmptyOUStr, sText.makeStringAndClear(), aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) );
+ OUString(), sText.makeStringAndClear(), OUString(), OUString(), DateTime(DateTime::SYSTEM));
SwFormatField aFormatField( aPostItField );
InsertAttr( aFormatField, false );
}
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 012755119be2..9777bba56ff1 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2003,7 +2003,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
// here a paragraph is being directly formatted
// empty the numbering/list style applied to the current paragraph
- SwNumRuleItem aEmptyRule( aEmptyOUStr );
+ SwNumRuleItem aEmptyRule;
pTextNode->SetAttr( aEmptyRule );
// create an empty SvxLRSpaceItem