CWS changehid: #i111874#: change code to support HelpIds as byte strings

6 files changed, 16 insertions, 53 deletions

diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 3adbd95d9fd1..1d71b40919eb 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/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 8255aae371da..0a971e94e5b6 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -226,14 +226,10 @@ namespace formula
         FormulaHelper
                         m_aFormulaHelper;
 
-        // FIXME: HELPID
         rtl::OString    m_aEditHelpId;
 
-        // FIXME: HELPID
         rtl::OString    aOldHelp;
-        // FIXME: HELPID
         rtl::OString    aOldUnique;
-        // FIXME: HELPID
         rtl::OString    aActivWinId;
         BOOL            bIsShutDown;
 
@@ -334,9 +330,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage);
     aTabCtrl.SetTabPage( TP_STRUCT, pStructPage);
 
-    // FIXME: HELPID
     aOldHelp = pParent->GetHelpId();                // HelpId aus Resource immer fuer "Seite 1"
-    // FIXME: HELPID
     aOldUnique = pParent->GetUniqueId();
 
     aFtResult.Show( _bSupportResult );
@@ -414,7 +408,6 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
         if(pWin!=NULL)
         {
             aActivWinId = pWin->GetUniqueId();
-            // FIXME: HELPID
             if(aActivWinId.getLength()==0)
             {
                 Window* pParent=pWin->GetParent();
@@ -422,14 +415,12 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
                 {
                     aActivWinId=pParent->GetUniqueId();
 
-                    // FIXME: HELPID
                     if(aActivWinId.getLength()!=0) break;
 
                     pParent=pParent->GetParent();
                 }
             }
-            // FIXME: HELPID
-            if(aActivWinId!=0)
+            if(aActivWinId.getLength())
             {
 
                 FormEditData* pData = m_pHelper->getFormEditData();
@@ -833,9 +824,7 @@ void FormulaDlg_Impl::FillListboxes()
     aNewTitle = aTitle1;
 
     //  HelpId fuer 1. Seite ist die aus der Resource
-    // FIXME: HELPID
     m_pParent->SetHelpId( aOldHelp );
-    // FIXME: HELPID
     m_pParent->SetUniqueId( aOldUnique );
 }
 // -----------------------------------------------------------------------------
@@ -872,12 +861,9 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
             aFtEditName.SetText( pFuncDesc->getFunctionName() );
             aFtEditName.Show();
             pParaWin->Show();
-            // FIXME: HELPID
-            #if 0
-            const long nHelpId = pFuncDesc->getHelpId();
-            if ( nHelpId )
-                pMEdit->SetSmartHelpId(SmartId(nHelpId));
-            #endif
+            const rtl::OString aHelpId = pFuncDesc->getHelpId();
+            if ( aHelpId.getLength() )
+                pMEdit->SetHelpId(aHelpId);
         }
 
         xub_StrLen nOldStart, nOldEnd;
@@ -933,7 +919,6 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
     else
     {
         aFtEditName.SetText(String());
-        // FIXME: HELPID
         pMEdit->SetHelpId( m_aEditHelpId );
     }
         //  Test, ob vorne/hinten noch mehr Funktionen sind
@@ -1809,7 +1794,6 @@ rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin)
     rtl::OString aUniqueId;
     if(pWin->HasFocus())
     {
-        // FIXME: HELPID
         aUniqueId=pWin->GetUniqueId();
         if(aUniqueId.getLength()==0)
         {
@@ -1942,13 +1926,11 @@ void FormulaModalDialog::RefInputDoneAfter( BOOL bForced )
 
 rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin)
 {
-    // FIXME: HELPID
     return m_pImpl->FindFocusWin( pWin );
 }
 
 void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
 {
-    // FIXME: HELPID
     if(pWin->GetUniqueId()==nUniqueId)
     {
         pWin->GrabFocus();
@@ -2024,13 +2006,10 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
                                             ,_pHelper,_pFunctionMgr,_pDlg))
 {
     FreeResource();
-    // FIXME: HELPID
-    #if 0
-    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.
-    #endif
     SetText(m_pImpl->aTitle1);
 }
 
@@ -2102,13 +2081,11 @@ void FormulaDlg::RefInputDoneAfter( BOOL bForced )
 
 rtl::OString FormulaDlg::FindFocusWin(Window *pWin)
 {
-    // FIXME: HELPID
     return m_pImpl->FindFocusWin( pWin );
 }
 
 void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
 {
-    // FIXME: HELPID
     if(pWin->GetUniqueId()==nUniqueId)
     {
         pWin->GrabFocus();
@@ -2178,7 +2155,6 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG )
     if (pData) // wird nicht ueber Close zerstoert;
     {
         m_pImpl->m_pHelper->setReferenceInput(pData);
-        // FIXME: HELPID
         rtl::OString nUniqueId(pData->GetUniqueId());
         SetFocusWin(this,nUniqueId);
     }
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index a66b4b2137af..1f8b64c7b4ba 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -190,18 +190,14 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb )
         const IFunctionDescription* pDesc = GetFuncDesc( GetFunction() );
         if ( pDesc )
         {
-            // FIXME: HELPID
-            #if 0
-            const long nHelpId = pDesc->getHelpId();
-            if ( nHelpId )
-                aLbFunction.SetSmartHelpId(SmartId(nHelpId));
-            #endif
+            const rtl::OString sHelpId = pDesc->getHelpId();
+            if ( sHelpId.getLength() )
+                aLbFunction.SetHelpId(sHelpId);
         }
         aSelectionLink.Call(this);
     }
     else
     {
-        // FIXME: HELPID
         aLbFunction.SetHelpId(m_aHelpId);
         UpdateFunctionList();
     }
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 4d7dc5739d0f..225114ff00aa 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -82,7 +82,6 @@ private:
                     m_pFunctionManager;
 
     ::std::vector< TFunctionDesc >  aLRUList;
-    // FIXME: HELPID
     rtl::OString    m_aHelpId;
 
 
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index db8a4e136015..c4e28b3da8f1 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -758,9 +758,7 @@ 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.
-    // FIXME: HELPID
     pMEdit->SetHelpId( GetHelpId() );
-    // FIXME: HELPID
     SetHelpId( "" );
 }
 
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 9afa9fb20587..5e656aea0967 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -297,25 +297,19 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc)
         nArgs = pFuncDesc->getSuppressedArgumentCount();
         pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping);
         aSlider.Hide();
-        // FIXME: HELPID
-        #if 0
-        long nHelpId = pFuncDesc->getHelpId();
-        SetHelpId( nHelpId );
-        aEdArg1.SetHelpId( nHelpId );
-        aEdArg2.SetHelpId( nHelpId );
-        aEdArg3.SetHelpId( nHelpId );
-        aEdArg4.SetHelpId( nHelpId );
-        #endif
+        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
-        // FIXME: HELPID
-        #if 0
-        SetUniqueId( ""/*HID_FORMULA_FAP_PAGE*/ );
+        SetUniqueId( HID_FORMULA_FAP_PAGE );
         aEdArg1.SetUniqueId( HID_FORMULA_FAP_EDIT1 );
         aEdArg2.SetUniqueId( HID_FORMULA_FAP_EDIT2 );
         aEdArg3.SetUniqueId( HID_FORMULA_FAP_EDIT3 );
         aEdArg4.SetUniqueId( HID_FORMULA_FAP_EDIT4 );
-        #endif
         SetActiveLine(0);
     }
     else