changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids

2 files changed, 13 insertions, 8 deletions

diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx
index da211d4f7449..780f95f8fdb5 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,8 @@ private:
     USHORT              nEdFocus;
     String              aUndoStr;
     BOOL                bMatrix;
-    ULONG               nUniqueId;
+    // FIXME: HELPID
+    rtl::OString        aUniqueId;
     Selection           aSelection;
 };
 
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index d88d1fe62057..0039b66b4ae2 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -80,8 +80,10 @@ 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);
+    // FIXME: HELPID
+    rtl::OString    FindFocusWin(Window *pWin);
+    // FIXME: HELPID
+    void            SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
     void            HighlightFunctionParas(const String& aFormula);
 
     void            SetMeText(const String& _sText);
@@ -129,12 +131,14 @@ 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);
+    // FIXME: HELPID
+    rtl::OString    FindFocusWin(Window *pWin);
+    // FIXME: HELPID
+    void            SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
     void            HighlightFunctionParas(const String& aFormula);
 
     void            SetMeText(const String& _sText);
-    FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
+    FormulaDlgMode  SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
     void            Update();
     BOOL            CheckMatrix(String& aFormula /*IN/OUT*/);
     String          GetMeText() const;