From ce504d4c2ac4e2b1e0335f0a738f1940c1a7192a Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Wed, 5 Mar 2008 16:13:20 +0000
Subject: INTEGRATION: CWS dba30a (1.6.104); FILE MERGED 2008/01/23 14:45:57 fs
 1.6.104.1: support for non-numeric HelpURLs

---
 extensions/source/propctrlr/pcrcommon.hxx | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'extensions')

diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index 985193d35d3b..65814cce5967 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pcrcommon.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-06 08:51:14 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 17:13:20 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -40,26 +40,15 @@
 #define EDITOR_LIST_REPLACE_EXISTING    (sal_uInt16)-1
 
 /** === begin UNO includes === **/
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
 #include <com/sun/star/uno/Sequence.hxx>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYCHANGEEVENT_HPP_
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#endif
 /** === end UNO includes === **/
 
-#ifndef _STRING_HXX
+#include <vcl/smartid.hxx>
 #include <tools/string.hxx>
-#endif
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/helper/vclunohelper.hxx>
-#endif
-#ifndef COMPHELPER_INC_COMPHELPER_LISTENERNOTIFICATION_HXX
 #include <comphelper/listenernotification.hxx>
-#endif
 
 //............................................................................
 namespace pcr
@@ -97,7 +86,7 @@ namespace pcr
     class HelpIdUrl
     {
     public:
-        static sal_uInt32 getHelpId( const ::rtl::OUString& _rHelpURL );
+        static SmartId getHelpId( const ::rtl::OUString& _rHelpURL );
         static ::rtl::OUString getHelpURL( sal_uInt32 _nHelpId );
     };
 
-- 
cgit