diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-18 04:55:34 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-18 07:27:47 +0100 |
| commit | d8037ae18a297229d1b79f8f76331abfd548350d (patch) | |
| tree | 7eaa9f4cb012be19d2eca340236eebbc8e784f92 /sw/source/filter/html/htmlcss1.cxx | |
| parent | c2a91dc53431b5658f54ca4fd32ca79165e865af (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/html/htmlcss1.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
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) |