diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-07-10 18:21:24 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-07-10 18:21:24 +0200 |
| commit | 75f7d31fe224ab156058f131cfb0730faeaf7416 (patch) | |
| tree | 3f05d017867c58bdfef6ac9caeddd8f28c1d7b21 /extensions/source/propctrlr/pcrcommon.cxx | |
| parent | 76890aea2c521cef54592aacf5b8f37ef2d8c714 (diff) | |
CWS changehid: #i111874#: change code to support HelpIds as byte strings
Diffstat (limited to 'extensions/source/propctrlr/pcrcommon.cxx')
| -rw-r--r-- | extensions/source/propctrlr/pcrcommon.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index e6c90c083..349146f98 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -53,23 +53,19 @@ namespace pcr //------------------------------------------------------------------------ rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) { - // FIXME: HELPID - #if 0 - SmartId aSmartHelpId( _rHelpURL ); + rtl::OString aHelpId( _rHelpURL, _rHelpURL.getLength(), RTL_TEXTENCODING_UTF8 ); if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) ) - aSmartHelpId = SmartId( _rHelpURL.copy( sizeof( "HID:" ) - 1 ).toInt32() ); - return aSmartHelpId; - #else - return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); - #endif + aHelpId = aHelpId.copy( sizeof( "HID:" ) - 1 ); + return aHelpId; } //------------------------------------------------------------------------ - ::rtl::OUString HelpIdUrl::getHelpURL( sal_uInt32 _nHelpId ) + ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) { ::rtl::OUStringBuffer aBuffer; + ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); aBuffer.appendAscii( "HID:" ); - aBuffer.append( (sal_Int32)_nHelpId ); + aBuffer.append( aTmp.getStr() ); return aBuffer.makeStringAndClear(); } //............................................................................ |