sb131: merged in re/DEV300_next towards DEV300_m94

14 files changed, 108 insertions, 102 deletions

diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx
index c0579f1ac7..9ecdff4263 100644
--- a/formula/inc/formula/IFunctionDescription.hxx
+++ b/formula/inc/formula/IFunctionDescription.hxx
@@ -92,7 +92,7 @@ namespace formula
         virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const = 0;
         virtual void initArgumentInfo() const = 0;
         virtual ::rtl::OUString getSignature() const = 0;
-        virtual long getHelpId() const = 0;
+        virtual rtl::OString getHelpId() const = 0;
 
         // parameter
         virtual sal_uInt32 getParameterCount() const = 0;
diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx
index 0ae141cc30..e9d9f06b37 100644
--- a/formula/inc/formula/formdata.hxx
+++ b/formula/inc/formula/formdata.hxx
@@ -53,7 +53,7 @@ public:
     inline USHORT			GetEdFocus() const	{ return nEdFocus; }
     inline const String&	GetUndoStr() const	{ return aUndoStr; }
     inline BOOL				GetMatrixFlag()const{ return bMatrix;}
-    inline ULONG			GetUniqueId()const	{ return nUniqueId;}
+    inline rtl::OString     GetUniqueId()const	{ return aUniqueId;}
     inline const Selection&	GetSelection()const	{ return aSelection;}
 
     inline void				SetMode( USHORT nNew )					{ nMode = nNew; }
@@ -64,7 +64,7 @@ public:
     inline void				SetEdFocus( USHORT nNew )				{ nEdFocus = nNew; }
     inline void				SetUndoStr( const String& rNew )		{ aUndoStr = rNew; }
     inline void				SetMatrixFlag(BOOL bNew)				{ bMatrix=bNew;}
-    inline void				SetUniqueId(ULONG nNew)					{ nUniqueId=nNew;}
+    inline void				SetUniqueId(const rtl::OString nNew)	{ aUniqueId=nNew;}
     inline void				SetSelection(const Selection& aSel)		{ aSelection=aSel;}
 protected:
     void				Reset();
@@ -81,7 +81,7 @@ private:
     USHORT				nEdFocus;
     String				aUndoStr;
     BOOL				bMatrix;
-    ULONG				nUniqueId;
+    rtl::OString		aUniqueId;
     Selection			aSelection;
 };
 
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 812c6631d3..2f59807a34 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -80,8 +80,8 @@ protected:
     ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
     void	        RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
     void	        RefInputDoneAfter( BOOL bForced = FALSE );
-    ULONG			FindFocusWin(Window *pWin);
-    void			SetFocusWin(Window *pWin,ULONG nUniqueId);
+    rtl::OString    FindFocusWin(Window *pWin);
+    void			SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
     void			HighlightFunctionParas(const String& aFormula);
 
     void            SetMeText(const String& _sText);
@@ -129,8 +129,8 @@ protected:
     ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
     void	        RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
     void	        RefInputDoneAfter( BOOL bForced = FALSE );
-    ULONG			FindFocusWin(Window *pWin);
-    void			SetFocusWin(Window *pWin,ULONG nUniqueId);
+    rtl::OString    FindFocusWin(Window *pWin);
+    void			SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
     void			HighlightFunctionParas(const String& aFormula);
 
     void            SetMeText(const String& _sText);
diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc
index dfd7403f8d..c2f6903517 100644
--- a/formula/inc/helpids.hrc
+++ b/formula/inc/helpids.hrc
@@ -27,36 +27,26 @@
 #ifndef FORMULA_HELPID_HRC
 #define FORMULA_HELPID_HRC
 
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>	// HID_FORMULA_START
-#endif
-
-#define HID_FORMULADLG_FORMULA                          (HID_FORMULA_START + 0)
-#define HID_FORMULA_FAP_FORMULA                         (HID_FORMULA_START + 1)
-#define HID_FORMULA_FAP_STRUCT                          (HID_FORMULA_START + 2)
-#define HID_FORMULA_FAP_PAGE                            (HID_FORMULA_START + 3)
-#define HID_FORMULA_FAP_EDIT1                           (HID_FORMULA_START + 4)
-#define HID_FORMULA_FAP_EDIT2                           (HID_FORMULA_START + 5)
-#define HID_FORMULA_FAP_EDIT3                           (HID_FORMULA_START + 6)
-#define HID_FORMULA_FAP_EDIT4                           (HID_FORMULA_START + 7)
-#define HID_FORMULA_FAP_BTN_FX1                         (HID_FORMULA_START + 8)
-#define HID_FORMULA_FAP_BTN_FX2                         (HID_FORMULA_START + 9)
-#define HID_FORMULA_FAP_BTN_FX3                         (HID_FORMULA_START +10)
-#define HID_FORMULA_FAP_BTN_FX4                         (HID_FORMULA_START +11)
-#define HID_FORMULA_FAP_BTN_REF1                        (HID_FORMULA_START +12)
-#define HID_FORMULA_FAP_BTN_REF2                        (HID_FORMULA_START +13)
-#define HID_FORMULA_FAP_BTN_REF3                        (HID_FORMULA_START +14)
-#define HID_FORMULA_FAP_BTN_REF4                        (HID_FORMULA_START +15)
-#define HID_FORMULA_LB_CATEGORY                         (HID_FORMULA_START +16)
-#define HID_FORMULA_LB_FUNCTION                         (HID_FORMULA_START +17)
-#define HID_FORMULATAB_FUNCTION                         (HID_FORMULA_START +18)
-#define HID_FORMULATAB_STRUCT                           (HID_FORMULA_START +19)
-
-    
-#if HID_FORMULATAB_STRUCT > HID_FORMULA_END
-#error Help-Id Ueberlauf in #file, #line	   
-#endif											   
-// don't forget to update the file util/hidother.src
+#define HID_FORMULADLG_FORMULA                             "FORMULA_HID_FORMULADLG_FORMULA"
+#define HID_FORMULA_FAP_FORMULA                            "FORMULA_HID_FORMULA_FAP_FORMULA"
+#define HID_FORMULA_FAP_STRUCT                             "FORMULA_HID_FORMULA_FAP_STRUCT"
+#define HID_FORMULA_FAP_PAGE                               "FORMULA_HID_FORMULA_FAP_PAGE"
+#define HID_FORMULA_FAP_EDIT1                              "FORMULA_HID_FORMULA_FAP_EDIT1"
+#define HID_FORMULA_FAP_EDIT2                              "FORMULA_HID_FORMULA_FAP_EDIT2"
+#define HID_FORMULA_FAP_EDIT3                              "FORMULA_HID_FORMULA_FAP_EDIT3"
+#define HID_FORMULA_FAP_EDIT4                              "FORMULA_HID_FORMULA_FAP_EDIT4"
+#define HID_FORMULA_FAP_BTN_FX1                            "FORMULA_HID_FORMULA_FAP_BTN_FX1"
+#define HID_FORMULA_FAP_BTN_FX2                            "FORMULA_HID_FORMULA_FAP_BTN_FX2"
+#define HID_FORMULA_FAP_BTN_FX3                            "FORMULA_HID_FORMULA_FAP_BTN_FX3"
+#define HID_FORMULA_FAP_BTN_FX4                            "FORMULA_HID_FORMULA_FAP_BTN_FX4"
+#define HID_FORMULA_FAP_BTN_REF1                           "FORMULA_HID_FORMULA_FAP_BTN_REF1"
+#define HID_FORMULA_FAP_BTN_REF2                           "FORMULA_HID_FORMULA_FAP_BTN_REF2"
+#define HID_FORMULA_FAP_BTN_REF3                           "FORMULA_HID_FORMULA_FAP_BTN_REF3"
+#define HID_FORMULA_FAP_BTN_REF4                           "FORMULA_HID_FORMULA_FAP_BTN_REF4"
+#define HID_FORMULA_LB_CATEGORY                            "FORMULA_HID_FORMULA_LB_CATEGORY"
+#define HID_FORMULA_LB_FUNCTION                            "FORMULA_HID_FORMULA_LB_FUNCTION"
+#define HID_FORMULATAB_FUNCTION                            "FORMULA_HID_FORMULATAB_FUNCTION"
+#define HID_FORMULATAB_STRUCT                              "FORMULA_HID_FORMULATAB_STRUCT"
 
 #endif //FORMULA_HELPID_HRC
 
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 89d3508bc1..5f5f2b8623 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -50,7 +50,7 @@ namespace formula
             virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& ) const {}
             virtual void initArgumentInfo()  const {}
             virtual ::rtl::OUString getSignature() const { return ::rtl::OUString(); }
-            virtual long getHelpId() const { return 0; }
+            virtual rtl::OString getHelpId() const { return ""; }
             virtual sal_uInt32 getParameterCount() const { return 0; }
             virtual ::rtl::OUString getParameterName(sal_uInt32 ) const { return ::rtl::OUString(); }
             virtual ::rtl::OUString getParameterDescription(sal_uInt32 ) const { return ::rtl::OUString(); }
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 8ea9545c09..40a87e3b23 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -163,6 +163,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
     Moveable = TRUE ;
     TabControl TC_FUNCTION
     {
+        HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA_MODAL:TC_FUNCTION";
         Pos = MAP_APPFONT ( 6 , 5 ) ;
         Size = MAP_APPFONT ( 102 , 199 ) ;
         PageList =
@@ -249,6 +250,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
     };
     CheckBox BTN_MATRIX
     {
+        HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA_MODAL:BTN_MATRIX";
         Pos = MAP_APPFONT ( 6 , 208 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -256,12 +258,14 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
     };
     Edit ED_REF
     {
+        HelpID = "formula:Edit:RID_FORMULADLG_FORMULA_MODAL:ED_REF";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 76 , 205 ) ;
         Size = MAP_APPFONT ( 66 , 12 ) ;
     };
     ImageButton RB_REF
     {
+        HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA_MODAL:RB_REF";
         Pos = MAP_APPFONT ( 144 , 205 ) ;
         Size = MAP_APPFONT ( 13 , 15 ) ;
         TabStop = FALSE ;
@@ -281,6 +285,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
     };
     PushButton BTN_BACKWARD
     {
+        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_BACKWARD";
         Pos = MAP_APPFONT ( 171 , 208 ) ;
         Size = MAP_APPFONT ( 45 , 14 ) ;
         TabStop = TRUE ;
@@ -288,6 +293,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
     };
     PushButton BTN_FORWARD
     {
+        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_FORWARD";
         Pos = MAP_APPFONT ( 219 , 208 ) ;
         Size = MAP_APPFONT ( 45 , 14 ) ;
         TabStop = TRUE ;
@@ -324,6 +330,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
     Moveable = TRUE ;
     TabControl TC_FUNCTION
     {
+        HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA:TC_FUNCTION";
         Pos = MAP_APPFONT ( 6 , 5 ) ;
         Size = MAP_APPFONT ( 102 , 199 ) ;
         PageList =
@@ -410,6 +417,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
     };
     CheckBox BTN_MATRIX
     {
+        HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA:BTN_MATRIX";
         Pos = MAP_APPFONT ( 6 , 208 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -417,12 +425,14 @@ ModelessDialog RID_FORMULADLG_FORMULA
     };
     Edit ED_REF
     {
+        HelpID = "formula:Edit:RID_FORMULADLG_FORMULA:ED_REF";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 76 , 205 ) ;
         Size = MAP_APPFONT ( 66 , 12 ) ;
     };
     ImageButton RB_REF
     {
+        HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA:RB_REF";
         Pos = MAP_APPFONT ( 144 , 205 ) ;
         Size = MAP_APPFONT ( 13 , 15 ) ;
         TabStop = FALSE ;
@@ -442,6 +452,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
     };
     PushButton BTN_BACKWARD
     {
+        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_BACKWARD";
         Pos = MAP_APPFONT ( 171 , 208 ) ;
         Size = MAP_APPFONT ( 45 , 14 ) ;
         TabStop = TRUE ;
@@ -449,6 +460,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
     };
     PushButton BTN_FORWARD
     {
+        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_FORWARD";
         Pos = MAP_APPFONT ( 219 , 208 ) ;
         Size = MAP_APPFONT ( 45 , 14 ) ;
         TabStop = TRUE ;
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index caa22cd3c0..eaca92a81d 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -143,7 +143,7 @@ namespace formula
         void            PreNotify( NotifyEvent& rNEvt );
 
         RefEdit*        GetCurrRefEdit();
-        ULONG           FindFocusWin(Window *pWin);
+        rtl::OString    FindFocusWin(Window *pWin);
 
         const FormulaHelper& GetFormulaHelper() const;
         uno::Reference< sheet::XFormulaOpCodeMapper > GetFormulaOpCodeMapper() const;
@@ -226,11 +226,11 @@ namespace formula
         FormulaHelper
                         m_aFormulaHelper;
 
-        SmartId         m_aSmartEditHelpId;
+        rtl::OString    m_aEditHelpId;
 
-        ULONG			nOldHelp;
-        ULONG			nOldUnique;
-        ULONG			nActivWinId;
+        rtl::OString	aOldHelp;
+        rtl::OString    aOldUnique;
+        rtl::OString    aActivWinId;
         BOOL			bIsShutDown;
 
 
@@ -300,7 +300,6 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aTxtOk			( aBtnEnd.GetText() ),
     m_aFormulaHelper(_pFunctionMgr),
     //
-    nActivWinId		(0),
     bIsShutDown		(FALSE),
     nEdFocus		(0),
     pFuncDesc		(NULL),
@@ -314,8 +313,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aRefBtn.Hide();
 
     pMEdit = aMEFormula.GetEdit();
-    m_aSmartEditHelpId = pMEdit->GetSmartHelpId();
-    pMEdit->SetSmartUniqueId(m_aSmartEditHelpId);
+    m_aEditHelpId = pMEdit->GetHelpId();
+    pMEdit->SetUniqueId( m_aEditHelpId );
 
     bEditFlag=FALSE;
     bStructUpdate=TRUE;
@@ -331,8 +330,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage);
     aTabCtrl.SetTabPage( TP_STRUCT, pStructPage);
 
-    nOldHelp = pParent->GetHelpId();				// HelpId aus Resource immer fuer "Seite 1"
-    nOldUnique = pParent->GetUniqueId();
+    aOldHelp = pParent->GetHelpId();				// HelpId aus Resource immer fuer "Seite 1"
+    aOldUnique = pParent->GetUniqueId();
 
     aFtResult.Show( _bSupportResult );
     aWndResult.Show( _bSupportResult );
@@ -408,27 +407,27 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
         Window* pWin=rNEvt.GetWindow();
         if(pWin!=NULL)
         {
-            nActivWinId = pWin->GetUniqueId();
-            if(nActivWinId==0)
+            aActivWinId = pWin->GetUniqueId();
+            if(aActivWinId.getLength()==0)
             {
                 Window* pParent=pWin->GetParent();
                 while(pParent!=NULL)
                 {
-                    nActivWinId=pParent->GetUniqueId();
+                    aActivWinId=pParent->GetUniqueId();
 
-                    if(nActivWinId!=0) break;
+                    if(aActivWinId.getLength()!=0) break;
 
                     pParent=pParent->GetParent();
                 }
             }
-            if(nActivWinId!=0)
+            if(aActivWinId.getLength())
             {
 
                 FormEditData* pData = m_pHelper->getFormEditData();
 
                 if (pData && !aTimer.IsActive()) // wird nicht ueber Close zerstoert;
                 {
-                    pData->SetUniqueId(nActivWinId);
+                    pData->SetUniqueId(aActivWinId);
                 }
             }
         }
@@ -825,8 +824,8 @@ void FormulaDlg_Impl::FillListboxes()
     aNewTitle = aTitle1;
 
     //	HelpId fuer 1. Seite ist die aus der Resource
-    m_pParent->SetHelpId( nOldHelp );
-    m_pParent->SetUniqueId( nOldUnique );
+    m_pParent->SetHelpId( aOldHelp );
+    m_pParent->SetUniqueId( aOldUnique );
 }
 // -----------------------------------------------------------------------------
 void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
@@ -862,9 +861,9 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
             aFtEditName.SetText( pFuncDesc->getFunctionName() );
             aFtEditName.Show();
             pParaWin->Show();
-            const long nHelpId = pFuncDesc->getHelpId();
-            if ( nHelpId )
-                pMEdit->SetSmartHelpId(SmartId(nHelpId));
+            const rtl::OString aHelpId = pFuncDesc->getHelpId();
+            if ( aHelpId.getLength() )
+                pMEdit->SetHelpId(aHelpId);
         }
 
         xub_StrLen nOldStart, nOldEnd;
@@ -920,7 +919,7 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
     else
     {
         aFtEditName.SetText(String());
-        pMEdit->SetSmartHelpId(m_aSmartEditHelpId);
+        pMEdit->SetHelpId( m_aEditHelpId );
     }
         //	Test, ob vorne/hinten noch mehr Funktionen sind
 
@@ -1790,20 +1789,20 @@ BOOL FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
     }
     return pTheRefEdit == NULL;
 }
-ULONG FormulaDlg_Impl::FindFocusWin(Window *pWin)
+rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin)
 {
-    ULONG nUniqueId=0;
+    rtl::OString aUniqueId;
     if(pWin->HasFocus())
     {
-        nUniqueId=pWin->GetUniqueId();
-        if(nUniqueId==0)
+        aUniqueId=pWin->GetUniqueId();
+        if(aUniqueId.getLength()==0)
         {
             Window* pParent=pWin->GetParent();
             while(pParent!=NULL)
             {
-                nUniqueId=pParent->GetUniqueId();
+                aUniqueId=pParent->GetUniqueId();
 
-                if(nUniqueId!=0) break;
+                if(aUniqueId.getLength()!=0) break;
 
                 pParent=pParent->GetParent();
             }
@@ -1816,11 +1815,11 @@ ULONG FormulaDlg_Impl::FindFocusWin(Window *pWin)
         for(USHORT i=0;i<nCount;i++)
         {
             Window* pChild=pWin->GetChild(i);
-            nUniqueId=FindFocusWin(pChild);
-            if(nUniqueId>0) break;
+            aUniqueId=FindFocusWin(pChild);
+            if(aUniqueId.getLength()>0) break;
         }
     }
-    return nUniqueId;
+    return aUniqueId;
 }
 
 void FormulaDlg_Impl::SetEdSelection()
@@ -1925,12 +1924,12 @@ void FormulaModalDialog::RefInputDoneAfter( BOOL bForced )
     m_pImpl->RefInputDoneAfter( bForced );
 }
 
-ULONG FormulaModalDialog::FindFocusWin(Window *pWin)
+rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin)
 {
     return m_pImpl->FindFocusWin( pWin );
 }
 
-void FormulaModalDialog::SetFocusWin(Window *pWin,ULONG nUniqueId)
+void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
 {
     if(pWin->GetUniqueId()==nUniqueId)
     {
@@ -2007,7 +2006,7 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
                                             ,_pHelper,_pFunctionMgr,_pDlg))
 {
     FreeResource();
-    if(GetHelpId()==0)				//Hack, da im SfxModelessDialog die HelpId
+    if(!GetHelpId().getLength())				//Hack, da im SfxModelessDialog die HelpId
         SetHelpId(GetUniqueId());	//fuer einen ModelessDialog entfernt und
                                     //in eine UniqueId gewandelt wird, machen
                                     //wir das an dieser Stelle rueckgaengig.
@@ -2080,12 +2079,12 @@ void FormulaDlg::RefInputDoneAfter( BOOL bForced )
     m_pImpl->RefInputDoneAfter( bForced );
 }
 
-ULONG FormulaDlg::FindFocusWin(Window *pWin)
+rtl::OString FormulaDlg::FindFocusWin(Window *pWin)
 {
     return m_pImpl->FindFocusWin( pWin );
 }
 
-void FormulaDlg::SetFocusWin(Window *pWin,ULONG nUniqueId)
+void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
 {
     if(pWin->GetUniqueId()==nUniqueId)
     {
@@ -2156,7 +2155,7 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG )
     if (pData) // wird nicht ueber Close zerstoert;
     {
         m_pImpl->m_pHelper->setReferenceInput(pData);
-        ULONG nUniqueId=pData->GetUniqueId();
+        rtl::OString nUniqueId(pData->GetUniqueId());
         SetFocusWin(this,nUniqueId);
     }
     return 0;
@@ -2182,7 +2181,7 @@ void FormEditData::Reset()
     nOffset = 0;
     nEdFocus = 0;
     bMatrix	=FALSE;
-    nUniqueId=0;
+    aUniqueId=rtl::OString();
     aSelection.Min()=0;
     aSelection.Max()=0;
     aUndoStr.Erase();
@@ -2211,7 +2210,7 @@ const FormEditData& FormEditData::operator=( const FormEditData& r )
     nEdFocus		= r.nEdFocus;
     aUndoStr		= r.aUndoStr;
     bMatrix			= r.bMatrix	;
-    nUniqueId		= r.nUniqueId;
+    aUniqueId		= r.aUniqueId;
     aSelection		= r.aSelection;
     return *this;
 }
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 1da4aef269..cd06ea99ce 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -102,8 +102,8 @@ FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager):
     m_pFunctionManager(_pFunctionManager)
 {
     FreeResource();
-    m_aSmartHelpId = aLbFunction.GetSmartHelpId();
-    aLbFunction.SetSmartUniqueId(m_aSmartHelpId);
+    m_aHelpId = aLbFunction.GetHelpId();
+    aLbFunction.SetUniqueId(m_aHelpId);
 
     InitLRUList();
 
@@ -190,15 +190,15 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb )
         const IFunctionDescription* pDesc = GetFuncDesc( GetFunction() );
         if ( pDesc )
         {
-            const long nHelpId = pDesc->getHelpId();
-            if ( nHelpId )
-                aLbFunction.SetSmartHelpId(SmartId(nHelpId));
+            const rtl::OString sHelpId = pDesc->getHelpId();
+            if ( sHelpId.getLength() )
+                aLbFunction.SetHelpId(sHelpId);
         }
         aSelectionLink.Call(this);
     }
     else
     {
-        aLbFunction.SetSmartHelpId(m_aSmartHelpId);
+        aLbFunction.SetHelpId(m_aHelpId);
         UpdateFunctionList();
     }
     return 0;
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 77b32f495c..51e3609351 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -82,7 +82,7 @@ private:
                     m_pFunctionManager;
 
     ::std::vector< TFunctionDesc >	aLRUList;
-    SmartId         m_aSmartHelpId;
+    rtl::OString    m_aHelpId;
 
 
     void impl_addFunctions(const IFunctionCategory* _pCategory);
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 6298e94c4b..d41a051e47 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -758,8 +758,8 @@ EditBox::EditBox( Window* pParent, const ResId& rResId )
 
     //	#105582# the HelpId from the resource must be set for the MultiLineEdit,
     //	not for the control that contains it.
-    pMEdit->SetSmartHelpId( GetSmartHelpId() );
-    SetSmartHelpId( SmartId() );
+    pMEdit->SetHelpId( GetHelpId() );
+    SetHelpId( "" );
 }
 
 EditBox::~EditBox()
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 0de42f971e..adb3681345 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -294,15 +294,15 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc)
         {
             SetEditDesc(aDefaultString);
         }
-        long nHelpId = pFuncDesc->getHelpId();
         nArgs = pFuncDesc->getSuppressedArgumentCount();
         pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping);
         aSlider.Hide();
-        SetHelpId( nHelpId );
-        aEdArg1.SetHelpId( nHelpId );
-        aEdArg2.SetHelpId( nHelpId );
-        aEdArg3.SetHelpId( nHelpId );
-        aEdArg4.SetHelpId( nHelpId );
+        rtl::OString sHelpId = pFuncDesc->getHelpId();
+        SetHelpId( sHelpId );
+        aEdArg1.SetHelpId( sHelpId );
+        aEdArg2.SetHelpId( sHelpId );
+        aEdArg3.SetHelpId( sHelpId );
+        aEdArg4.SetHelpId( sHelpId );
 
         //	Unique-IDs muessen gleich bleiben fuer Automatisierung
         SetUniqueId( HID_FORMULA_FAP_PAGE );
diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src
index 78be77040b..eec5237ced 100644
--- a/formula/source/ui/dlg/parawin.src
+++ b/formula/source/ui/dlg/parawin.src
@@ -68,6 +68,7 @@
 
 TabPage RID_FORMULATAB_PARAMETER
 {
+    HelpID = "formula:TabPage:RID_FORMULATAB_PARAMETER";
     Border	= FALSE;
     Size	= MAP_APPFONT( 203, 128 );
     DialogControl        = TRUE;
@@ -119,10 +120,18 @@ TabPage RID_FORMULATAB_PARAMETER
         HelpId=HID_FORMULA_FAP_BTN_FX4;
         FXBUTTONBLOCK ( 109 )
     };
-    Edit ED_ARG1 { ED_ARGBLOCK (  64 ) };
-    Edit ED_ARG2 { ED_ARGBLOCK (  79 ) };
-    Edit ED_ARG3 { ED_ARGBLOCK (  94 ) };
-    Edit ED_ARG4 { ED_ARGBLOCK ( 109 ) };
+    Edit ED_ARG1 { ED_ARGBLOCK (  64 ) 
+        HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG1";
+    };
+    Edit ED_ARG2 { ED_ARGBLOCK (  79 ) 
+        HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG2";
+    };
+    Edit ED_ARG3 { ED_ARGBLOCK (  94 ) 
+        HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG3";
+    };
+    Edit ED_ARG4 { ED_ARGBLOCK ( 109 ) 
+        HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG4";
+    };
 
     ImageButton RB_ARG1
     {
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index c32d3dfa3b..95b8b59442 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -112,7 +112,7 @@ StructPage::StructPage(Window* pParent):
     maImgErrorHC    ( ModuleRes( BMP_STR_ERROR_H ) ),
     pSelectedToken	( NULL )
 {
-    aTlbStruct.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|
+    aTlbStruct.SetStyle(aTlbStruct.GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|
                         WB_HASBUTTONS|WB_HSCROLL|WB_NOINITIALSELECTION);
 
     aTlbStruct.SetNodeDefaultImages();
diff --git a/formula/util/hidother.src b/formula/util/hidother.src
index 8f56afa1cd..a6d3111b5b 100644
--- a/formula/util/hidother.src
+++ b/formula/util/hidother.src
@@ -27,10 +27,6 @@
 
 #include "../inc/helpids.hrc"
 
-#ifndef _SBASLTID_HRC
-#include <svx/svxids.hrc>
-#endif
-
 hidspecial HID_FORMULADLG_FORMULA   { HelpId = HID_FORMULADLG_FORMULA; };
 hidspecial HID_FORMULA_FAP_FORMULA  { HelpId = HID_FORMULA_FAP_FORMULA; };
 hidspecial HID_FORMULA_FAP_STRUCT   { HelpId = HID_FORMULA_FAP_STRUCT; };