diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-12 13:40:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-13 11:20:23 +0100 |
| commit | 6191fa0847ac5b27083efe1a8c6cd84d080a638c (patch) | |
| tree | b107ce00125d0d204e5c32f6c472e70c73182bb2 /sw | |
| parent | 2e16eaf31c7a4849110020aebd5fbc97a1ab3e99 (diff) | |
reduce use of UniString ctor from null-terminated unicodearray
Change-Id: I98361309ada084d8f78517ce88f210d785f59cc0
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ascii/parasc.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlimpit.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/docvw/extedit.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 40ff5d7663de..ce04e49a3417 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -315,7 +315,7 @@ sal_uLong SwASCIIParser::ReadChars() if( pStt >= pEnd ) { if( pLastStt != pStt ) - InsertText( String( pLastStt )); + InsertText( rtl::OUString( pLastStt )); // Read a new block sal_uLong lGCount; @@ -438,7 +438,7 @@ sal_uLong SwASCIIParser::ReadChars() *pStt++ = 0; if( nLineLen ) { - InsertText( String( pLastStt )); + InsertText( rtl::OUString( pLastStt )); } pDoc->SplitNode( *pPam->GetPoint(), false ); pDoc->InsertPoolItem( *pPam, SvxFmtBreakItem( @@ -472,7 +472,7 @@ sal_uLong SwASCIIParser::ReadChars() { sal_Unicode c = *pStt; *pStt = 0; - InsertText( String( pLastStt )); + InsertText( rtl::OUString( pLastStt )); pDoc->SplitNode( *pPam->GetPoint(), false ); pLastStt = pStt; nLineLen = 0; @@ -484,7 +484,7 @@ sal_uLong SwASCIIParser::ReadChars() else if( bSplitNode ) { // We found a CR/LF, thus save the text - InsertText( String( pLastStt )); + InsertText( rtl::OUString( pLastStt )); pDoc->SplitNode( *pPam->GetPoint(), false ); pLastStt = pStt; nLineLen = 0; diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 18672182ed51..1d400a877ca3 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -773,7 +773,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( break; case MID_GRAPHIC_FILTER: - pBrush->SetGraphicFilter( rValue.getStr() ); + pBrush->SetGraphicFilter( rValue ); bOk = sal_True; break; } diff --git a/sw/source/ui/docvw/extedit.cxx b/sw/source/ui/docvw/extedit.cxx index 98dc6aa495d6..8b70262e2568 100644 --- a/sw/source/ui/docvw/extedit.cxx +++ b/sw/source/ui/docvw/extedit.cxx @@ -122,7 +122,7 @@ void EditWithExternalTool(GraphicObject *pGraphicObject, SwWrtShell *rSh) GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); sal_uInt16 nFilter(rGF.GetExportFormatNumber(fExt)); String aFilter(rGF.GetExportFormatShortName(nFilter)); - String sPath(tempFileName.getStr()); + String sPath(tempFileName); // Write the Graphic to the file now XOutBitmap::WriteGraphic(pGraphic, sPath, aFilter, |