mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log the actual string, not the rtl_uString pointer value

Browse Source 
Change-Id: I51938f4801436aff31b51fd36c89582062f83b9a
This commit is contained in:
Tor Lillqvist
2015-07-15 13:11:45 +03:00
parent 8a60e78769
commit 8474e8260a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sal/osl/w32/file_url.cxx
View File

@@ -26,6 +26,7 @@
#include "file_error.h" #include "file_error.h"
#include "rtl/alloc.h" #include "rtl/alloc.h"
#include <rtl/ustring.hxx>
#include "osl/diagnose.h" #include "osl/diagnose.h"
#include "osl/file.h" #include "osl/file.h"
#include "osl/mutex.h" #include "osl/mutex.h"
@@ -699,7 +700,7 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
strUTF8->length != strURL->length && strUTF8->length != strURL->length &&
0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( strURL->buffer, strURL->length, "file:\\\\", 7 ) 0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( strURL->buffer, strURL->length, "file:\\\\", 7 )
, "sal.osl" , "sal.osl"
,"osl_getSystemPathFromFileURL: \"" << strURL << "\" is not encoded !!!"); ,"osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not encoded !!!");
bValidEncoded = _osl_decodeURL( strUTF8, &strDecodedURL ); bValidEncoded = _osl_decodeURL( strUTF8, &strDecodedURL );
@@ -796,7 +797,7 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
} }
else else
SAL_INFO_IF(nError, "sal.osl", SAL_INFO_IF(nError, "sal.osl",
"osl_getSystemPathFromFileURL: \"" << strURL << "\" is not an absolute FileURL"); "osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not an absolute FileURL");
} }
@@ -810,7 +811,7 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
rtl_uString_release( strTempPath ); rtl_uString_release( strTempPath );
SAL_INFO_IF(nError, "sal.osl", SAL_INFO_IF(nError, "sal.osl",
"osl_getSystemPathFromFileURL: \"" << strURL << "\" is not a FileURL"); "osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not a FileURL");
return nError; return nError;
} }
@@ -916,7 +917,7 @@ oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString**
rtl_uString_release( strTempURL ); rtl_uString_release( strTempURL );
SAL_INFO_IF(nError, "sal.osl", SAL_INFO_IF(nError, "sal.osl",
"osl_getFileURLFromSystemPath: \"" << strPath << "\" is not a systemPath"); "osl_getFileURLFromSystemPath: \"" << rtl::OUString(strPath) << "\" is not a systemPath");
return nError; return nError;
} }