diff options
Diffstat (limited to 'oox/source/ole')
| -rw-r--r-- | oox/source/ole/axfontdata.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ole/olehelper.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/ole/axfontdata.cxx b/oox/source/ole/axfontdata.cxx index b4846ca00373..dc6a070e4be2 100644 --- a/oox/source/ole/axfontdata.cxx +++ b/oox/source/ole/axfontdata.cxx @@ -117,7 +117,7 @@ bool AxFontData::importGuidAndFont( BinaryInputStream& rInStrm ) OUString aGuid = OleHelper::importGuid( rInStrm ); if( aGuid.equalsAscii( AX_GUID_CFONT ) ) return importBinaryModel( rInStrm ); - if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDFONT) ) ) + if ( aGuid == OLE_GUID_STDFONT ) return importStdFont( rInStrm ); return false; } diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 91953f35aa4b..191c74b024aa 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -404,7 +404,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight, else // hyperlink moniker { OUString aGuid = importGuid( rInStrm ); - if( aGuid.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_FILEMONIKER)) ) + if ( aGuid == OLE_GUID_FILEMONIKER ) { // file name, maybe relative and with directory up-count sal_Int16 nUpLevels; @@ -425,7 +425,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight, for( sal_Int16 nLevel = 0; nLevel < nUpLevels; ++nLevel ) orHlinkInfo.maTarget = CREATE_OUSTRING( "../" ) + orHlinkInfo.maTarget; } - else if( aGuid.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_URLMONIKER)) ) + else if ( aGuid == OLE_GUID_URLMONIKER ) { // URL, maybe relative and with leading '../' sal_Int32 nBytes = rInStrm.readInt32(); |