[Libreoffice-commits] core.git: vcl/inc vcl/source
Caolán McNamara
caolanm at redhat.com
Fri Jul 19 04:03:07 PDT 2013
vcl/inc/impgraph.hxx | 6 +++---
vcl/source/gdi/impgraph.cxx | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 86b8b3b7e0fd384378f76e21ff170c76ee0ab7f5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 19 12:00:04 2013 +0100
WaE: returning temporary
Change-Id: Ibb401d8df817ca700a806ef28ac359e0b74ec3e2
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 0b09c12..4c879d6 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -60,7 +60,7 @@ private:
ImpSwapFile* mpSwapFile;
GfxLink* mpGfxLink;
GraphicType meType;
- String maDocFileURLStr;
+ OUString maDocFileURLStr;
sal_uLong mnDocFilePos;
mutable sal_uLong mnSizeBytes;
sal_uLong mnRefCount;
@@ -137,8 +137,8 @@ private:
private:
- void ImplSetDocFileName( const String& rName, sal_uLong nFilePos );
- const String& ImplGetDocFileName() const;
+ void ImplSetDocFileName( const OUString& rName, sal_uLong nFilePos );
+ const OUString& ImplGetDocFileName() const;
sal_uLong ImplGetDocFilePos() const;
sal_Bool ImplReadEmbedded( SvStream& rIStream, sal_Bool bSwap = sal_False );
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 7132284..6ef8d63 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -393,7 +393,7 @@ void ImpGraphic::ImplClear()
mbSwapOut = sal_False;
mnDocFilePos = 0UL;
- maDocFileURLStr.Erase();
+ maDocFileURLStr = OUString();
// cleanup
ImplClearGraphics( sal_False );
@@ -961,17 +961,17 @@ void ImpGraphic::ImplSetContext( GraphicReader* pReader )
mpContext = pReader;
}
-void ImpGraphic::ImplSetDocFileName( const String& rName, sal_uLong nFilePos )
+void ImpGraphic::ImplSetDocFileName( const OUString& rName, sal_uLong nFilePos )
{
const INetURLObject aURL( rName );
- DBG_ASSERT( !rName.Len() || ( aURL.GetProtocol() != INET_PROT_NOT_VALID ), "Graphic::SetDocFileName(...): invalid URL" );
+ DBG_ASSERT( rName.isEmpty() || ( aURL.GetProtocol() != INET_PROT_NOT_VALID ), "Graphic::SetDocFileName(...): invalid URL" );
maDocFileURLStr = aURL.GetMainURL( INetURLObject::NO_DECODE );
mnDocFilePos = nFilePos;
}
-const String& ImpGraphic::ImplGetDocFileName() const
+const OUString& ImpGraphic::ImplGetDocFileName() const
{
return maDocFileURLStr;
}
@@ -996,8 +996,8 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap )
if( !mbSwapUnderway )
{
- const String aTempURLStr( maDocFileURLStr );
- const sal_uLong nTempPos = mnDocFilePos;
+ const OUString aTempURLStr( maDocFileURLStr );
+ const sal_uLong nTempPos = mnDocFilePos;
ImplClear();
@@ -1086,7 +1086,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap )
if( bSwap )
{
- if( maDocFileURLStr.Len() )
+ if (!maDocFileURLStr.isEmpty())
{
rIStm.Seek( nStartPos + nHeaderLen + nLen );
bRet = mbSwapOut = sal_True;
@@ -1303,7 +1303,7 @@ sal_Bool ImpGraphic::ImplSwapOut()
if( !ImplIsSwapOut() )
{
- if( !maDocFileURLStr.Len() )
+ if (maDocFileURLStr.isEmpty())
{
::utl::TempFile aTempFile;
const INetURLObject aTmpURL( aTempFile.GetURL() );
More information about the Libreoffice-commits
mailing list