summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog/taskpane.cxx
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-07-20 14:50:49 +0200
committerMathias Bauer <mba@openoffice.org>2010-07-20 14:50:49 +0200
commitdb369db99b2f897b1a304a4c010dfd1998e2fa40 (patch)
tree0c32af84efb0334e2fdea5157c896b25325a2342 /sfx2/source/dialog/taskpane.cxx
parent6b7cfcf20984092bb9907083bcf089709d005da5 (diff)
CWS changehid: #i111784#: consolidate usage of HID schema; remove unused SetDialogHelpId methods
Diffstat (limited to 'sfx2/source/dialog/taskpane.cxx')
-rw-r--r--sfx2/source/dialog/taskpane.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index d684e3cf124a..3ef6a96bdaf4 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -60,7 +60,7 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-
+#include <tools/urlobj.hxx>
#include <boost/noncopyable.hpp>
//......................................................................................................................
@@ -410,10 +410,11 @@ namespace sfx2
static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL )
{
- rtl::OString aHelpId( _rHelpURL, _rHelpURL.getLength(), RTL_TEXTENCODING_UTF8 );
- if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) )
- aHelpId = aHelpId.copy( sizeof( "HID:" ) - 1 );
- return aHelpId;
+ INetURLObject aHID( _rHelpURL );
+ if ( aHID.GetProtocol() == INET_PROT_HID )
+ return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 );
+ else
+ return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 );
}
//------------------------------------------------------------------------------------------------------------------