diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-09 15:19:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-11 09:45:34 +0200 |
| commit | cfb4463d2afd36ca6d0fbb9e374bf5387fee84df (patch) | |
| tree | 4411584498dcf21eff5e71c284e7af1ed6b5489a /sc | |
| parent | b044a9535e0fb573fe5d28b0d44c96a3b5db66c2 (diff) | |
convert include/editeng/brushitem.hxx from String to OUString
and convert String* to OUString, no need to hold a pointer
to a ref-counted value type.
Change-Id: I79c62979ee8ec0d5e6d2efc50609ad5595571a7d
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index b140c03ebf63..e0a7185c6ec2 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -566,11 +566,11 @@ void ScHTMLExport::WriteBody() if ( bAll && GPOS_NONE != pBrushItem->GetGraphicPos() ) { - const String* pLink = pBrushItem->GetGraphicLink(); + OUString aLink = pBrushItem->GetGraphicLink(); String aGrfNm; // Embedded graphic -> write using WriteGraphic - if( !pLink ) + if( aLink.isEmpty() ) { const Graphic* pGrf = pBrushItem->GetGraphic(); if( pGrf ) @@ -588,13 +588,13 @@ void ScHTMLExport::WriteBody() aGrfNm, URIHelper::GetMaybeFileHdl(), true, false); if ( HasCId() ) MakeCIdURL( aGrfNm ); - pLink = &aGrfNm; + aLink = aGrfNm; } } } else { - aGrfNm = *pLink; + aGrfNm = aLink; if( bCopyLocalFileToINet || HasCId() ) { CopyLocalFileToINet( aGrfNm, aStreamPath ); @@ -605,14 +605,14 @@ void ScHTMLExport::WriteBody() aGrfNm = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aGrfNm, URIHelper::GetMaybeFileHdl(), true, false); - pLink = &aGrfNm; + aLink = aGrfNm; } - if( pLink ) + if( !aLink.isEmpty() ) { rStrm << ' ' << OOO_STRING_SVTOOLS_HTML_O_background << "=\""; OUT_STR( URIHelper::simpleNormalizedMakeRelative( aBaseURL, - *pLink ) ) << '\"'; + aLink ) ) << '\"'; } } if ( !aHTMLStyle.aBackgroundColor.GetTransparency() ) |