diff options
73 files changed, 540 insertions, 289 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index a71b5268abd7..781f2b7d290d 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -94,10 +94,12 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, ""/*HID_AVMEDIA_TOOLBOXITEM_OPEN*/ ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, implGetImage( AVMEDIA_IMG_INSERT ), String( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, HID_AVMEDIA_TOOLBOXITEM_INSERT ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, ""/*HID_AVMEDIA_TOOLBOXITEM_INSERT*/ ); maPlayToolBox.InsertSeparator(); } @@ -117,18 +119,22 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : } maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage( AVMEDIA_IMG_PLAY ), String( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), TIB_CHECKABLE ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, HID_AVMEDIA_TOOLBOXITEM_PLAY ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, ""/*HID_AVMEDIA_TOOLBOXITEM_PLAY*/ ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, implGetImage( AVMEDIA_IMG_PAUSE ), String( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ), TIB_CHECKABLE ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, HID_AVMEDIA_TOOLBOXITEM_PAUSE ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, ""/*HID_AVMEDIA_TOOLBOXITEM_PAUSE*/ ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_STOP, implGetImage( AVMEDIA_IMG_STOP ), String( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ), TIB_CHECKABLE ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, HID_AVMEDIA_TOOLBOXITEM_STOP ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, ""/*HID_AVMEDIA_TOOLBOXITEM_STOP*/ ); maPlayToolBox.InsertSeparator(); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, implGetImage( AVMEDIA_IMG_ENDLESS ), String( AVMEDIA_RESID( AVMEDIA_STR_ENDLESS ) ) ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, HID_AVMEDIA_TOOLBOXITEM_LOOP ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, ""/*HID_AVMEDIA_TOOLBOXITEM_LOOP*/ ); if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle ) maPlayToolBox.InsertSeparator(); @@ -141,7 +147,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maTimeSlider.SetSlideHdl( LINK( this, MediaControl, implTimeHdl ) ); maTimeSlider.SetEndSlideHdl( LINK( this, MediaControl, implTimeEndHdl ) ); maTimeSlider.SetRange( Range( 0, AVMEDIA_TIME_RANGE ) ); - maTimeSlider.SetHelpId( HID_AVMEDIA_TIMESLIDER ); + // FIXME: HELPID + maTimeSlider.SetHelpId( ""/*HID_AVMEDIA_TIMESLIDER*/ ); maTimeSlider.SetUpdateMode( true ); maTimeSlider.SetSizePixel( Size( 128, maPlayToolBox.GetSizePixel().Height() ) ); maTimeSlider.Show(); @@ -151,7 +158,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maTimeEdit.SetUpdateMode( true ); maTimeEdit.SetSizePixel( Size( maTimeEdit.GetTextWidth( aTimeText ) + 8, maPlayToolBox.GetSizePixel().Height() ) ); maTimeEdit.SetControlBackground( Application::GetSettings().GetStyleSettings().GetWindowColor() ); - maTimeEdit.SetHelpId( HID_AVMEDIA_TIMEEDIT ); + // FIXME: HELPID + maTimeEdit.SetHelpId( ""/*HID_AVMEDIA_TIMEEDIT*/ ); maTimeEdit.Disable(); maTimeEdit.Show(); maMinSize.Width() += maTimeEdit.GetSizePixel().Width(); @@ -160,7 +168,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maMuteToolBox.InsertSeparator(); maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage( AVMEDIA_IMG_MUTE ), String( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) ); - maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, HID_AVMEDIA_TOOLBOXITEM_MUTE ); + // FIXME: HELPID + maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, ""/*HID_AVMEDIA_TOOLBOXITEM_MUTE*/ ); maMuteToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) ); maMuteToolBox.SetSizePixel( maMuteToolBox.CalcWindowSizePixel() ); @@ -171,7 +180,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maVolumeSlider.SetEndSlideHdl( LINK( this, MediaControl, implVolumeEndHdl ) ); maVolumeSlider.SetRange( Range( AVMEDIA_DB_RANGE, 0 ) ); maVolumeSlider.SetUpdateMode( true ); - maVolumeSlider.SetHelpId( HID_AVMEDIA_VOLUMESLIDER ); + // FIXME: HELPID + maVolumeSlider.SetHelpId( ""/*HID_AVMEDIA_VOLUMESLIDER*/ ); maVolumeSlider.SetSizePixel( Size( 48, maPlayToolBox.GetSizePixel().Height() ) ); maVolumeSlider.Show(); maMinSize.Width() += maVolumeSlider.GetSizePixel().Width(); @@ -182,10 +192,12 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_200 ) ), AVMEDIA_ZOOMLEVEL_200 ); mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_FIT ) ), AVMEDIA_ZOOMLEVEL_FIT ); mpZoomListBox->SetSelectHdl( LINK( this, MediaControl, implZoomSelectHdl ) ); - mpZoomListBox->SetHelpId( HID_AVMEDIA_ZOOMLISTBOX ); + // FIXME: HELPID + mpZoomListBox->SetHelpId( ""/*HID_AVMEDIA_ZOOMLISTBOX*/ ); maZoomToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM ) ) ); - maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, HID_AVMEDIA_ZOOMLISTBOX ); + // FIXME: HELPID + maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, ""/*HID_AVMEDIA_ZOOMLISTBOX*/ ); maZoomToolBox.SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, mpZoomListBox ); maZoomToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) ); diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index caab783c6a7c..c66f88817fe3 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -124,7 +124,8 @@ void MediaFloater::ToggleFloatingMode() Window* pWindow = mpMediaWindow->getWindow(); if( pWindow ) - pWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); + // FIXME: HELPID + pWindow->SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ ); mpMediaWindow->show(); } diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 553eea6196c1..14d174beec80 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -179,7 +179,8 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo mpEmptyBmpEx( NULL ), mpAudioBmpEx( NULL ) { - maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); + // FIXME: HELPID + maChildWindow.SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ ); maChildWindow.Hide(); if( mpMediaWindowControl ) diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 2d0733dfbae3..fa61c437e1ba 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -183,10 +183,14 @@ ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl( ExtMgrDialog* pParent, TheExtensionMan m_pEnableBtn = new PushButton( this, WB_TABSTOP ); m_pRemoveBtn = new PushButton( this, WB_TABSTOP ); - SetHelpId( HID_EXTENSION_MANAGER_LISTBOX ); - m_pOptionsBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_OPTIONS ); - m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); - m_pRemoveBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_REMOVE ); + // FIXME: HELPID + SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX*/ ); + // FIXME: HELPID + m_pOptionsBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_OPTIONS*/ ); + // FIXME: HELPID + m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_DISABLE*/ ); + // FIXME: HELPID + m_pRemoveBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_REMOVE*/ ); m_pOptionsBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, HandleOptionsBtn ) ); m_pEnableBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, HandleEnableBtn ) ); @@ -294,12 +298,14 @@ void ExtBoxWithBtns_Impl::SetButtonStatus( const TEntry_Impl pEntry ) if ( ( pEntry->m_eState == REGISTERED ) || ( pEntry->m_eState == NOT_AVAILABLE ) ) { m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); - m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); + // FIXME: HELPID + m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_DISABLE*/ ); } else { m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); - m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_ENABLE ); + // FIXME: HELPID + m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_ENABLE*/ ); } if ( ( pEntry->m_eState == NOT_AVAILABLE ) || pEntry->m_bMissingDeps ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 2e02a90f59fd..3e5db094d032 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -186,7 +186,8 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan m_pScrollBar( NULL ), m_pManager( pManager ) { - SetHelpId( HID_EXTENSION_MANAGER_LISTBOX ); + // FIXME: HELPID + SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX*/ ); m_pScrollBar = new ScrollBar( this, WB_VERT ); m_pScrollBar->SetScrollHdl( LINK( this, ExtensionBox_Impl, ScrollHdl ) ); diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 50992eb07a97..9e837f235db1 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -221,7 +221,8 @@ LicenseDialogImpl::LicenseDialogImpl( FreeResource(); - m_acceptButton.SetUniqueId(UID_BTN_LICENSE_ACCEPT); + // FIXME: HELPID + m_acceptButton.SetUniqueId(""/*UID_BTN_LICENSE_ACCEPT*/); m_fiArrow1.Show(true); m_fiArrow2.Show(false); m_mlLicense.SetText(sLicenseText); diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx index 48ee2abc71ca..3169386db192 100644 --- a/desktop/source/migration/wizard.cxx +++ b/desktop/source/migration/wizard.cxx @@ -191,10 +191,14 @@ FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAccep SetPageSizePixel(LogicToPixel(aTPSize, MAP_APPFONT)); //set help id - m_pPrevPage->SetHelpId(HID_FIRSTSTART_PREV); - m_pNextPage->SetHelpId(HID_FIRSTSTART_NEXT); - m_pCancel->SetHelpId(HID_FIRSTSTART_CANCEL); - m_pFinish->SetHelpId(HID_FIRSTSTART_FINISH); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_FIRSTSTART_PREV*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_FIRSTSTART_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_FIRSTSTART_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_FIRSTSTART_FINISH*/); // m_pHelp->SetUniqueId(UID_FIRSTSTART_HELP); m_pHelp->Hide(); m_pHelp->Disable(); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 766023a0038c..35c51b82d1fe 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1083,9 +1083,11 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) String aParaStr( EditResId( RID_STR_PARAGRAPH ) ); aParaStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpPara ); aPopupMenu.InsertItem( MN_WORDLANGUAGE, aWordStr ); - aPopupMenu.SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE ); + // FIXME: HELPID + aPopupMenu.SetHelpId( MN_WORDLANGUAGE, ""/*HID_EDITENG_SPELLER_WORDLANGUAGE*/ ); aPopupMenu.InsertItem( MN_PARALANGUAGE, aParaStr ); - aPopupMenu.SetHelpId( MN_PARALANGUAGE, HID_EDITENG_SPELLER_PARALANGUAGE ); + // FIXME: HELPID + aPopupMenu.SetHelpId( MN_PARALANGUAGE, ""/*HID_EDITENG_SPELLER_PARALANGUAGE*/ ); } // ## Create mnemonics here diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 64343517c69f..3e875e0b0fdc 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1416,7 +1416,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, if( nHelpId ) { nHelpId += HID_AUTOCORR_HELP_START - 1; - Application::GetHelp()->OpenHelpAgent( nHelpId ); + // FIXME: HELPID + Application::GetHelp()->OpenHelpAgent( String()/*nHelpId*/ ); } } 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; diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index f1a97171fa11..8255aae371da 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,15 @@ namespace formula FormulaHelper m_aFormulaHelper; - SmartId m_aSmartEditHelpId; + // FIXME: HELPID + rtl::OString m_aEditHelpId; - ULONG nOldHelp; - ULONG nOldUnique; - ULONG nActivWinId; + // FIXME: HELPID + rtl::OString aOldHelp; + // FIXME: HELPID + rtl::OString aOldUnique; + // FIXME: HELPID + rtl::OString aActivWinId; BOOL bIsShutDown; @@ -300,7 +304,6 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aTxtOk ( aBtnEnd.GetText() ), m_aFormulaHelper(_pFunctionMgr), // - nActivWinId (0), bIsShutDown (FALSE), nEdFocus (0), pFuncDesc (NULL), @@ -314,8 +317,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 +334,10 @@ 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(); + // FIXME: HELPID + aOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1" + // FIXME: HELPID + aOldUnique = pParent->GetUniqueId(); aFtResult.Show( _bSupportResult ); aWndResult.Show( _bSupportResult ); @@ -408,27 +413,30 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) Window* pWin=rNEvt.GetWindow(); if(pWin!=NULL) { - nActivWinId = pWin->GetUniqueId(); - if(nActivWinId==0) + aActivWinId = pWin->GetUniqueId(); + // FIXME: HELPID + if(aActivWinId.getLength()==0) { Window* pParent=pWin->GetParent(); while(pParent!=NULL) { - nActivWinId=pParent->GetUniqueId(); + aActivWinId=pParent->GetUniqueId(); - if(nActivWinId!=0) break; + // FIXME: HELPID + if(aActivWinId.getLength()!=0) break; pParent=pParent->GetParent(); } } - if(nActivWinId!=0) + // FIXME: HELPID + if(aActivWinId!=0) { FormEditData* pData = m_pHelper->getFormEditData(); if (pData && !aTimer.IsActive()) // wird nicht ueber Close zerstoert; { - pData->SetUniqueId(nActivWinId); + pData->SetUniqueId(aActivWinId); } } } @@ -825,8 +833,10 @@ void FormulaDlg_Impl::FillListboxes() aNewTitle = aTitle1; // HelpId fuer 1. Seite ist die aus der Resource - m_pParent->SetHelpId( nOldHelp ); - m_pParent->SetUniqueId( nOldUnique ); + // FIXME: HELPID + m_pParent->SetHelpId( aOldHelp ); + // FIXME: HELPID + m_pParent->SetUniqueId( aOldUnique ); } // ----------------------------------------------------------------------------- void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) @@ -862,9 +872,12 @@ 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 } xub_StrLen nOldStart, nOldEnd; @@ -920,7 +933,8 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) else { aFtEditName.SetText(String()); - pMEdit->SetSmartHelpId(m_aSmartEditHelpId); + // FIXME: HELPID + pMEdit->SetHelpId( m_aEditHelpId ); } // Test, ob vorne/hinten noch mehr Funktionen sind @@ -1790,20 +1804,21 @@ 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) + // FIXME: HELPID + 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 +1831,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,13 +1940,15 @@ void FormulaModalDialog::RefInputDoneAfter( BOOL bForced ) m_pImpl->RefInputDoneAfter( bForced ); } -ULONG FormulaModalDialog::FindFocusWin(Window *pWin) +rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin) { + // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } -void FormulaModalDialog::SetFocusWin(Window *pWin,ULONG nUniqueId) +void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { + // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2007,10 +2024,13 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, ,_pHelper,_pFunctionMgr,_pDlg)) { FreeResource(); + // FIXME: HELPID + #if 0 if(GetHelpId()==0) //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); } @@ -2080,13 +2100,15 @@ void FormulaDlg::RefInputDoneAfter( BOOL bForced ) m_pImpl->RefInputDoneAfter( bForced ); } -ULONG FormulaDlg::FindFocusWin(Window *pWin) +rtl::OString FormulaDlg::FindFocusWin(Window *pWin) { + // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } -void FormulaDlg::SetFocusWin(Window *pWin,ULONG nUniqueId) +void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { + // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2156,7 +2178,8 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG ) if (pData) // wird nicht ueber Close zerstoert; { m_pImpl->m_pHelper->setReferenceInput(pData); - ULONG nUniqueId=pData->GetUniqueId(); + // FIXME: HELPID + rtl::OString nUniqueId(pData->GetUniqueId()); SetFocusWin(this,nUniqueId); } return 0; @@ -2182,7 +2205,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 +2234,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 3633afa29316..a66b4b2137af 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,19 @@ 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 } aSelectionLink.Call(this); } else { - aLbFunction.SetSmartHelpId(m_aSmartHelpId); + // FIXME: HELPID + aLbFunction.SetHelpId(m_aHelpId); UpdateFunctionList(); } return 0; diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 09f77cc81019..4d7dc5739d0f 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -82,7 +82,8 @@ private: m_pFunctionManager; ::std::vector< TFunctionDesc > aLRUList; - SmartId m_aSmartHelpId; + // FIXME: HELPID + 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 4ba8d87c139b..db8a4e136015 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -758,8 +758,10 @@ 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() ); + // FIXME: HELPID + pMEdit->SetHelpId( GetHelpId() ); + // FIXME: HELPID + SetHelpId( "" ); } EditBox::~EditBox() diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 3876621a3ec0..9afa9fb20587 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -294,22 +294,28 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc) { SetEditDesc(aDefaultString); } - long nHelpId = pFuncDesc->getHelpId(); 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 // Unique-IDs muessen gleich bleiben fuer Automatisierung - SetUniqueId( HID_FORMULA_FAP_PAGE ); + // FIXME: HELPID + #if 0 + 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 diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index e0b5d259302d..c51a326477fa 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -206,14 +206,13 @@ namespace svt String sHelpURL( _rURL ); if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) ) { - String sID = sHelpURL.Copy( sizeof( "HID:" ) - 1 ); - sal_Int32 nHelpId = sID.ToInt32(); - + // FIXME: HELPID + rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); if ( _bFileView ) // the file view "overloaded" the SetHelpId - static_cast< SvtFileView* >( _pControl )->SetHelpId( nHelpId ); + static_cast< SvtFileView* >( _pControl )->SetHelpId( sID ); else - _pControl->SetHelpId( nHelpId ); + _pControl->SetHelpId( sID ); } else { @@ -224,13 +223,13 @@ namespace svt //--------------------------------------------------------------------- ::rtl::OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView ) { - sal_Int32 nHelpId = _pControl->GetHelpId(); + // FIXME: HELPID + rtl::OString aHelpId = _pControl->GetHelpId(); if ( _bFileView ) // the file view "overloaded" the SetHelpId - nHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( ); + aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( ); - ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - sHelpURL += ::rtl::OUString::valueOf( (sal_Int32)nHelpId ); + rtl::OUString sHelpURL( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) ); return sHelpURL; } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index c7a18050c3ff..87df9e404b6a 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -600,7 +600,8 @@ void SvtFileDialog::Init_Impl bool bSaveMode = ( FILEDLG_MODE_SAVE == _pImp->_eMode ); pURLBox->SetNoURLSelection( bSaveMode ); - _pImp->_pEdFileName->SetHelpId( HID_FILEDLG_AUTOCOMPLETEBOX ); + // FIXME: HELPID + _pImp->_pEdFileName->SetHelpId( ""/*HID_FILEDLG_AUTOCOMPLETEBOX*/ ); _pImp->_pFtFileType = new FixedText( this, SvtResId( FT_EXPLORERFILE_FILETYPE ) ); _pImp->CreateFilterListControl( this, SvtResId( LB_EXPLORERFILE_FILETYPE ) ); @@ -649,7 +650,8 @@ void SvtFileDialog::Init_Impl _pFileView->SetUrlFilter( &m_aURLFilter ); _pFileView->EnableAutoResize(); - _pFileView->SetHelpId( HID_FILEDLG_STANDARD ); + // FIXME: HELPID + _pFileView->SetHelpId( ""/*HID_FILEDLG_STANDARD*/ ); _pFileView->SetStyle( _pFileView->GetStyle() | WB_TABSTOP ); // Positionen und Groessen der Knoepfe bestimmen. @@ -701,7 +703,8 @@ void SvtFileDialog::Init_Impl if ( nStyle & SFXWB_READONLY ) { _pCbReadOnly = new CheckBox( this, SvtResId( CB_EXPLORERFILE_READONLY ) ); - _pCbReadOnly->SetHelpId( HID_FILEOPEN_READONLY ); + // FIXME: HELPID + _pCbReadOnly->SetHelpId( ""/*HID_FILEOPEN_READONLY*/ ); _pCbReadOnly->SetText( SvtResId( STR_SVT_FILEPICKER_READONLY ) ); AddControl( _pCbReadOnly ); ReleaseOwnerShip( _pCbReadOnly ); @@ -810,15 +813,23 @@ void SvtFileDialog::Init_Impl { // different help ids if in save-as mode // 90744 - 09.08.2001 - frank.schoenheit@sun.com - SetHelpId( HID_FILESAVE_DIALOG ); - - _pImp->_pEdFileName->SetHelpId( HID_FILESAVE_FILEURL ); - _pImp->_pBtnFileOpen->SetHelpId( HID_FILESAVE_DOSAVE ); - _pImp->_pBtnNewFolder->SetHelpId( HID_FILESAVE_CREATEDIRECTORY ); - _pImp->_pBtnStandard->SetHelpId( HID_FILESAVE_DEFAULTDIRECTORY ); - _pImp->_pBtnUp->SetHelpId( HID_FILESAVE_LEVELUP ); - _pImp->GetFilterListControl()->SetHelpId( HID_FILESAVE_FILETYPE ); - _pFileView->SetHelpId( HID_FILESAVE_FILEVIEW ); + // FIXME: HELPID + SetHelpId( ""/*HID_FILESAVE_DIALOG*/ ); + + // FIXME: HELPID + _pImp->_pEdFileName->SetHelpId( ""/*HID_FILESAVE_FILEURL*/ ); + // FIXME: HELPID + _pImp->_pBtnFileOpen->SetHelpId( ""/*HID_FILESAVE_DOSAVE*/ ); + // FIXME: HELPID + _pImp->_pBtnNewFolder->SetHelpId( ""/*HID_FILESAVE_CREATEDIRECTORY*/ ); + // FIXME: HELPID + _pImp->_pBtnStandard->SetHelpId( ""/*HID_FILESAVE_DEFAULTDIRECTORY*/ ); + // FIXME: HELPID + _pImp->_pBtnUp->SetHelpId( ""/*HID_FILESAVE_LEVELUP*/ ); + // FIXME: HELPID + _pImp->GetFilterListControl()->SetHelpId( ""/*HID_FILESAVE_FILETYPE*/ ); + // FIXME: HELPID + _pFileView->SetHelpId( ""/*HID_FILESAVE_FILEVIEW*/ ); // formerly, there was only _pLbFileVersion, which was used for 3 different // use cases. For reasons of maintainability, I introduced extra members (_pLbTemplates, _pLbImageTemplates) @@ -827,16 +838,23 @@ void SvtFileDialog::Init_Impl // tests I made lead to a dialog where _no_ of the three list boxes was present. // 96930 - 15.08.2002 - fs@openoffice.org if ( _pImp->_pLbFileVersion ) - _pImp->_pLbFileVersion->SetHelpId( HID_FILESAVE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); if ( _pImp->_pLbTemplates ) - _pImp->_pLbTemplates->SetHelpId( HID_FILESAVE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); if ( _pImp->_pLbImageTemplates ) - _pImp->_pLbImageTemplates->SetHelpId( HID_FILESAVE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); - if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( HID_FILESAVE_SAVEWITHPASSWORD ); - if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( HID_FILESAVE_AUTOEXTENSION ); - if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( HID_FILESAVE_CUSTOMIZEFILTER ); - if ( _pCbSelection ) _pCbSelection->SetHelpId( HID_FILESAVE_SELECTION ); + // FIXME: HELPID + if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( ""/*HID_FILESAVE_SAVEWITHPASSWORD*/ ); + // FIXME: HELPID + if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( ""/*HID_FILESAVE_AUTOEXTENSION*/ ); + // FIXME: HELPID + if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( ""/*HID_FILESAVE_CUSTOMIZEFILTER*/ ); + // FIXME: HELPID + if ( _pCbSelection ) _pCbSelection->SetHelpId( ""/*HID_FILESAVE_SELECTION*/ ); } // correct the z-order of the controls @@ -2981,7 +2999,8 @@ void SvtFileDialog::AddControls_Impl( ) { _pCbLinkBox = new CheckBox( this ); _pCbLinkBox ->SetText( SvtResId( STR_SVT_FILEPICKER_INSERT_AS_LINK ) ); - _pCbLinkBox ->SetHelpId( HID_FILEDLG_LINK_CB ); + // FIXME: HELPID + _pCbLinkBox ->SetHelpId( ""/*HID_FILEDLG_LINK_CB*/ ); AddControl( _pCbLinkBox ); ReleaseOwnerShip( _pCbLinkBox ); _pCbLinkBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) ); @@ -2998,7 +3017,8 @@ void SvtFileDialog::AddControls_Impl( ) // "Vorschau" _pCbPreviewBox = new CheckBox( this ); _pCbPreviewBox->SetText( SvtResId( STR_SVT_FILEPICKER_SHOW_PREVIEW ) ); - _pCbPreviewBox->SetHelpId( HID_FILEDLG_PREVIEW_CB ); + // FIXME: HELPID + _pCbPreviewBox->SetHelpId( ""/*HID_FILEDLG_PREVIEW_CB*/ ); AddControl( _pCbPreviewBox ); ReleaseOwnerShip( _pCbPreviewBox ); _pCbPreviewBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) ); @@ -3046,7 +3066,8 @@ void SvtFileDialog::AddControls_Impl( ) { _pPbPlay = new PushButton( this ); _pPbPlay->SetText( SvtResId( STR_SVT_FILEPICKER_PLAY ) ); - _pPbPlay->SetHelpId( HID_FILESAVE_DOPLAY ); + // FIXME: HELPID + _pPbPlay->SetHelpId( ""/*HID_FILESAVE_DOPLAY*/ ); AddControl( _pPbPlay ); ReleaseOwnerShip( _pPbPlay ); _pPbPlay->SetClickHdl( LINK( this, SvtFileDialog, PlayButtonHdl_Impl ) ); @@ -3058,7 +3079,8 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtFileVersion->SetText( SvtResId( STR_SVT_FILEPICKER_VERSION ) ); _pImp->_pLbFileVersion = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - _pImp->_pLbFileVersion->SetHelpId( HID_FILEOPEN_VERSION ); + // FIXME: HELPID + _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ ); } else if ( _nExtraBits & SFX_EXTRA_TEMPLATES ) { @@ -3066,7 +3088,8 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_TEMPLATES ) ); _pImp->_pLbTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - _pImp->_pLbTemplates->SetHelpId( HID_FILEOPEN_VERSION ); + // FIXME: HELPID + _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ ); // This is strange. During the re-factoring during 96930, I discovered that this help id // is set in the "Templates mode". This was hidden in the previous implementation. // Shouldn't this be a more meaningfull help id. @@ -3078,7 +3101,8 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtImageTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_IMAGE_TEMPLATE ) ); _pImp->_pLbImageTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - _pImp->_pLbImageTemplates->SetHelpId( HID_FILEOPEN_IMAGE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILEOPEN_IMAGE_TEMPLATE*/ ); } } diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 458368bd6581..9541c45689b1 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -4005,7 +4005,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent ) if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { pToolBox = (ToolBox *)pWindow; - aToolbarName = pToolBox->GetSmartHelpId().GetStr(); + aToolbarName = rtl::OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 ); sal_Int32 i = aToolbarName.lastIndexOf( ':' ); if (( aToolbarName.getLength() > 0 ) && ( i > 0 ) && (( i+ 1 ) < aToolbarName.getLength() )) @@ -4066,7 +4066,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent ) if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { pToolBox = (ToolBox *)pWindow; - aToolbarName = pToolBox->GetSmartHelpId().GetStr(); + aToolbarName = rtl::OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 ); if (( aToolbarName.getLength() > 0 ) && ( m_nLockCount == 0 )) m_aAsyncLayoutTimer.Start(); } diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 13c5647341e6..c8cf5249dd9a 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -528,7 +528,8 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f } // set help ID for our canvas - pWindow->SetHelpId(HID_BACKINGWINDOW); + // FIXME: HELPID + pWindow->SetHelpId(""/*HID_BACKINGWINDOW*/); // inform BackingWindow about frame BackingWindow* pBack = dynamic_cast<BackingWindow*>(pWindow ); diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index e4d37d1fe059..6aa5e274b744 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -211,15 +211,15 @@ BackingWindow::BackingWindow( Window* i_pParent ) : if( mxDesktop.is() ) mxDesktopDispatchProvider = Reference< XDispatchProvider >( mxDesktop, UNO_QUERY ); - maWriterButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:WriterButton" ) ) ) ); - maCalcButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:CalcButton" ) ) ) ); - maImpressButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:ImpressButton" ) ) ) ); - maDrawButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:DrawButton" ) ) ) ); - maDBButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:DBButton" ) ) ) ); - maMathButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:MathButton" ) ) ) ); - maTemplateButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:TemplateButton" ) ) ) ); - maOpenButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:OpenButton" ) ) ) ); - maToolbox.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Toolbox" ) ) ) ); + maWriterButton.SetHelpId( ".HelpId:StartCenter:WriterButton" ); + maCalcButton.SetHelpId( ".HelpId:StartCenter:CalcButton" ); + maImpressButton.SetHelpId( ".HelpId:StartCenter:ImpressButton" ); + maDrawButton.SetHelpId( ".HelpId:StartCenter:DrawButton" ); + maDBButton.SetHelpId( ".HelpId:StartCenter:DBButton" ); + maMathButton.SetHelpId( ".HelpId:StartCenter:MathButton" ); + maTemplateButton.SetHelpId( ".HelpId:StartCenter:TemplateButton" ); + maOpenButton.SetHelpId( ".HelpId:StartCenter:OpenButton" ); + maToolbox.SetHelpId( ".HelpId:StartCenter:Toolbox" ); // init background initBackground(); diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index f0f5d52a47d6..7be1516f1331 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -98,7 +98,8 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo pPopupMenu->InsertItem( 2, aDisplayName ); pPopupMenu->SetItemCommand( 2, aCommand ); //pPopupMenu->SetHelpId( 2, HID_SVX_BASIC_MACRO_ORGANIZER ); - pPopupMenu->SetHelpId( 2, 40012 ); + // FIXME: HELPID + pPopupMenu->SetHelpId( 2, ""/*40012*/ ); // insert providers but not basic or java addScriptItems( pPopupMenu, 4); @@ -219,7 +220,8 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt pPopupMenu->InsertItem( itemId, aDisplayName ); pPopupMenu->SetItemCommand( itemId, aCommand ); //pPopupMenu->SetHelpId( itemId, HID_SVX_COMMON_MACRO_ORGANIZER ); - pPopupMenu->SetHelpId( itemId, 40014 ); + // FIXME: HELPID + pPopupMenu->SetHelpId( itemId, ""/*40014*/ ); itemId++; break; } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 9fbdf87336cc..0a3295c1395e 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1797,7 +1797,9 @@ void MenuBarManager::FillMenu( sal_Int32 nHelpId = aHelpURL.toInt32(); if ( nHelpId > 0 ) - pMenu->SetHelpId( nId, (USHORT)nHelpId ); + // FIXME: HELPID + // (should set aHelpURL ? + pMenu->SetHelpId( nId, ""/*(USHORT)nHelpId*/ ); if ( nStyle ) { MenuItemBits nBits = pMenu->GetItemBits( nId ); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index cb9cbb2896f7..d143b717366c 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -537,7 +537,8 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc rtl::OUString aId( aHelpURL.copy( HELPID_PREFIX_LENGTH )); sal_uInt16 nHelpId = (sal_uInt16)(aId.toInt32()); if ( nHelpId > 0 ) - m_pStatusBar->SetHelpId( nId, nHelpId ); + // FIXME: HELPID + m_pStatusBar->SetHelpId( nId, ""/*nHelpId*/ ); } ++nId; diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 030a790b35e3..ed506f5345e3 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -137,7 +137,8 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) pStatusBarManager = new StatusBarManager( m_xServiceFactory, xFrame, m_aResourceURL, pStatusBar ); ((FrameworkStatusBar*)pStatusBar)->SetStatusBarManager( pStatusBarManager ); m_xStatusBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pStatusBarManager ), UNO_QUERY ); - pStatusBar->SetUniqueId( HID_STATUSBAR ); + // FIXME: HELPID + pStatusBar->SetUniqueId( ""/*HID_STATUSBAR*/ ); } } diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index d89b81c0f9b6..19625d5e198b 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -303,10 +303,10 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic // set name for testtool, the useful part is after the last '/' sal_Int32 idx = rResourceName.lastIndexOf('/'); idx++; // will become 0 if '/' not found: use full string - ::rtl::OUString aHelpIdAsString( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX_TESTTOOL )); + ::rtl::OString aHelpIdAsString( HELPID_PREFIX_TESTTOOL ); ::rtl::OUString aToolbarName = rResourceName.copy( idx ); - aHelpIdAsString += aToolbarName; - m_pToolBar->SetSmartHelpId( SmartId( aHelpIdAsString ) ); + aHelpIdAsString += rtl::OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 );; + m_pToolBar->SetHelpId( aHelpIdAsString ); m_aAsyncUpdateControllersTimer.SetTimeout( 50 ); m_aAsyncUpdateControllersTimer.SetTimeoutHdl( LINK( this, ToolBarManager, AsyncUpdateControllersHdl ) ); @@ -883,7 +883,10 @@ void ToolBarManager::CreateControllers() if ( nId == 0 ) continue; - sal_Int16 nWidth( sal_Int16( m_pToolBar->GetHelpId( nId ))); + // FIXME: HELPID + // What ? A width initalized with a help id ? Should we perhaps add two bananas and a coconut to it ? + // sal_Int16 nWidth( sal_Int16( m_pToolBar->GetHelpId( nId ))); + sal_Int16 nWidth( nId ); rtl::OUString aLoadURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:OpenUrl" )); rtl::OUString aCommandURL( m_pToolBar->GetItemCommand( nId )); sal_Bool bInit( sal_True ); @@ -892,7 +895,7 @@ void ToolBarManager::CreateControllers() svt::ToolboxController* pController( 0 ); - m_pToolBar->SetHelpId( nId, 0 ); // reset value again + m_pToolBar->SetHelpId( nId, "" ); // reset value again if ( bHasDisabledEntries ) { aURL.Complete = aCommandURL; @@ -1282,7 +1285,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine } // Add additional information for the controller to the obsolete help id - m_pToolBar->SetHelpId( ULONG( nWidth )); + // FIXME: HELPID + m_pToolBar->SetHelpId( ""/*ULONG( nWidth )*/); if ( !bIsVisible ) m_pToolBar->HideItem( nId ); diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 83f280cb46a7..025ebea06a19 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -701,7 +701,9 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_u pToolbar->SetItemState( nItemId, STATE_NOCHECK ); // Use obsolete help id to transport the width of the item - pToolbar->SetHelpId( nItemId, rItem.nWidth ); + // FIXME: HELPID + // this looks broken + pToolbar->SetHelpId( nItemId, ""/*rItem.nWidth*/ ); // Use the user data to store add-on specific data with the toolbar item AddonsParams* pAddonParams = new AddonsParams; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 02402205bd1c..3d0cda946771 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -216,7 +216,8 @@ void ToolbarsMenuController::addCommand( PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); if ( !!aImage ) pVCLPopupMenu->SetItemImage( nItemId, aImage ); - pVCLPopupMenu->SetHelpId( nItemId, nHelpId ); + // FIXME: HELPID + pVCLPopupMenu->SetHelpId( nItemId, ""/*nHelpId*/ ); } m_aCommandVector.push_back( rCommandURL ); diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx index 4f4a04834257..b0105553cd40 100644 --- a/sfx2/inc/sfx2/passwd.hxx +++ b/sfx2/inc/sfx2/passwd.hxx @@ -78,7 +78,7 @@ public: void SetMinLen( USHORT Len ); void SetMaxLen( USHORT Len ); - void SetEditHelpId( ULONG nId ) { maPasswordED.SetHelpId( nId ); } + void SetEditHelpId( const rtl::OString& rId ) { maPasswordED.SetHelpId( rId ); } void ShowExtras( USHORT nExtras ) { mnExtras = nExtras; } void AllowAsciiOnly( bool i_bAsciiOnly = true ) { mbAsciiOnly = i_bAsciiOnly; } diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx index 60ad04b2e9ab..6a87729e30e3 100644 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfxhelp.hxx @@ -45,12 +45,14 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: - SAL_DLLPRIVATE virtual BOOL Start( ULONG nHelpId, const Window* pWindow ); + // FIXME: HELPID + // SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); SAL_DLLPRIVATE String GetHelpModuleName_Impl(); - SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ); + // FIXME: HELPID + // SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ); SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ); public: @@ -60,10 +62,12 @@ public: inline void SetTicket( const String& rTicket ) { aTicket = rTicket; } inline void SetUser( const String& rUser ) { aUser = rUser; } - virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); + // FIXME: HELPID + //virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); virtual XubString GetHelpText( const String&, const Window* pWindow ); - static String CreateHelpURL( ULONG nHelpId, const String& rModuleName ); + // FIXME: HELPID + // static String CreateHelpURL( ULONG nHelpId, const String& rModuleName ); static String CreateHelpURL( const String& aCommandURL, const String& rModuleName ); static void OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId ); static String GetDefaultHelpModule(); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 14789100bb24..2abcdffe0169 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -354,7 +354,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( 66056 == nHelpId ) { // show Support page with new URL - String sHelpURL = SfxHelp::CreateHelpURL( nHelpId, String() ); + // FIXME: HELPID + String sHelpURL = SfxHelp::CreateHelpURL( String()/*nHelpId*/, String() ); String sParams = sHelpURL.Copy( sHelpURL.Search( '?' ) ); sHelpURL = String::CreateFromAscii("vnd.sun.star.help://shared/text/shared/05/00000001.xhp"); sHelpURL += sParams; @@ -362,7 +363,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) pHelp->Start( sHelpURL, NULL ); } else - pHelp->Start( nHelpId, NULL ); // show start page + // FIXME: HELPID + pHelp->Start( String()/*nHelpId*/, NULL ); // show start page bDone = TRUE; } break; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 597509cf34bd..6b8dfe3a023c 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2105,24 +2105,32 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : xFrame->setName( DEFINE_CONST_UNICODE("OFFICE_HELP") ); lcl_disableLayoutOfFrame(xFrame); - aToolBox.SetHelpId( HID_HELP_TOOLBOX ); + // FIXME: HELPID + aToolBox.SetHelpId( ""/*HID_HELP_TOOLBOX*/ ); aToolBox.InsertItem( TBI_INDEX, aIndexOffText ); - aToolBox.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ ); aToolBox.InsertSeparator(); aToolBox.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ) ); - aToolBox.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ ); aToolBox.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ) ); - aToolBox.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ ); aToolBox.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ) ); - aToolBox.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ ); aToolBox.InsertSeparator(); aToolBox.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ) ); - aToolBox.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ ); aToolBox.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ) ); - aToolBox.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ ); aToolBox.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ) ); - aToolBox.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ ); InitToolBoxImages(); aToolBox.Show(); @@ -2139,7 +2147,8 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) ); if ( aOnStartupCB.GetHelpId() == 0 ) - aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX ); + // FIXME: HELPID + aOnStartupCB.SetHelpId( ""/*HID_HELP_ONSTARTUP_BOX*/ ); } // ----------------------------------------------------------------------- @@ -2595,32 +2604,40 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) else aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ) ); - aMenu.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) ); - aMenu.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ ); aMenu.EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() ); aMenu.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) ); - aMenu.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ ); aMenu.EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() ); aMenu.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) ); - aMenu.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) ); - aMenu.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ ); aMenu.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) ); - aMenu.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ ); aMenu.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) ); - aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) ); - aMenu.SetHelpId( TBI_SELECTIONMODE, HID_HELP_TEXT_SELECTION_MODE ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_SELECTIONMODE, ""/*HID_HELP_TEXT_SELECTION_MODE*/ ); Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY ); URL aURL; aURL.Complete = DEFINE_CONST_UNICODE(".uno:SelectTextMode"); @@ -2640,7 +2657,8 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aMenu.InsertSeparator(); aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) ); - aMenu.SetHelpId( TBI_COPY, SID_COPY ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_COPY, ""/*SID_COPY*/ ); aMenu.EnableItem( TBI_COPY, HasSelection() ); if ( bIsDebug ) @@ -3225,7 +3243,8 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( aWinPos ( 0, 0 ), sTitle ( pParent->GetText() ) { - SetHelpId( HID_HELP_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_HELP_WINDOW*/ ); SetStyle( GetStyle() | WB_DIALOGCONTROL ); pHelpInterceptor->InitWaiter( this ); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index b9ff344a1513..cd2f6b189fd1 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -326,7 +326,8 @@ public: ~SfxHelp_Impl(); SfxHelpOptions_Impl* GetOptions(); - String GetHelpText( ULONG nHelpId, const String& rModule ); // get "Active Help" + // FIXME: HELPID + // String GetHelpText( ULONG nHelpId, const String& rModule ); // get "Active Help" String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ); sal_Bool HasModule( const ::rtl::OUString& rModule ); // module installed sal_Bool IsHelpInstalled(); // module list not empty @@ -370,6 +371,8 @@ void SfxHelp_Impl::Load() } } +#if 0 +// FIXME: HELPID String SfxHelp_Impl::GetHelpText( ULONG nHelpId, const String& rModule ) { // create help url @@ -379,6 +382,7 @@ String SfxHelp_Impl::GetHelpText( ULONG nHelpId, const String& rModule ) // load help string return SfxContentHelper::GetActiveHelpString( aHelpURL ); } +#endif String SfxHelp_Impl::GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ) { @@ -581,6 +585,8 @@ String SfxHelp::GetHelpModuleName_Impl() return sModuleName; } +#if 0 +// FIXME: HELPID String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ) { String aModuleName( rModuleName ); @@ -650,6 +656,7 @@ String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ) return aHelpURL; } +#endif String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ) { @@ -802,7 +809,8 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) } else { - aHelpURL = CreateHelpURL_Impl( 0, GetHelpModuleName_Impl( ) ); + // FIXME: HELPID + aHelpURL = CreateHelpURL_Impl( String()/*0*/, GetHelpModuleName_Impl( ) ); // pb i91715: strings begin with ".HelpId:" are not words of the basic ide // they are helpid-strings used by the testtool -> so we ignore them @@ -851,6 +859,8 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) return TRUE; } +#if 0 +// FIXME: HELPID BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow ) { String aHelpModuleName( GetHelpModuleName_Impl() ); @@ -878,7 +888,10 @@ BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow ) return Start( aHelpURL, pWindow ); } +#endif +#if 0 +// FIXME: HELPID XubString SfxHelp::GetHelpText( ULONG nHelpId, const Window* pWindow ) { String aModuleName = GetHelpModuleName_Impl(); @@ -919,6 +932,7 @@ XubString SfxHelp::GetHelpText( ULONG nHelpId, const Window* pWindow ) return aHelpText; } +#endif XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* ) { @@ -937,6 +951,8 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* ) return sHelpText; } +#if 0 +// FIXME: HELPID String SfxHelp::CreateHelpURL( ULONG nHelpId, const String& rModuleName ) { String aURL; @@ -945,6 +961,7 @@ String SfxHelp::CreateHelpURL( ULONG nHelpId, const String& rModuleName ) aURL = pHelp->CreateHelpURL_Impl( nHelpId, rModuleName ); return aURL; } +#endif String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName ) { @@ -976,7 +993,8 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId ) try { URL aURL; - aURL.Complete = CreateHelpURL_Impl( nHelpId, GetHelpModuleName_Impl() ); + // FIXME: HELPID + aURL.Complete = CreateHelpURL_Impl( String()/*nHelpId*/, GetHelpModuleName_Impl() ); Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ), UNO_QUERY ); xTrans->parseStrict(aURL); diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx index 4635733b934d..1d1ef73ad8cf 100644 --- a/sfx2/source/dialog/about.cxx +++ b/sfx2/source/dialog/about.cxx @@ -298,7 +298,8 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS FreeResource(); // explizite Help-Id - SetHelpId( SID_ABOUT ); + // FIXME: HELPID + SetHelpId( ""/*SID_ABOUT*/ ); //#112429# replace occurences of "StarOffice" in the "StarSuite" version String sCopyright( aCopyrightText.GetText() ); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 2ea5ef5fe4b1..d85a01870074 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -373,9 +373,9 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); @@ -393,9 +393,9 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); @@ -421,7 +421,8 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + nHelpId = 0; // pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } @@ -523,7 +524,8 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + nHelpId = 0; //pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } @@ -561,9 +563,9 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); @@ -582,9 +584,9 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 7b4e4289a49c..8ad551278a27 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -918,11 +918,13 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, */ { - ULONG nId = GetHelpId(); + // FIXME: HELPID + ULONG nId = 0;// GetHelpId(); if ( !nId && pCW ) nId = pCW->GetType(); - SetHelpId( 0 ); - SetUniqueId( nId ); + SetHelpId( "" ); + // FIXME: HELPID + SetUniqueId( ""/*nId*/ ); pImp = new SfxDockingWindow_Impl; pImp->bConstructed = FALSE; @@ -960,9 +962,9 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, */ { - ULONG nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); pImp = new SfxDockingWindow_Impl; pImp->bConstructed = FALSE; @@ -1847,7 +1849,8 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + //nHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 5270eb5d4207..2785a38305cd 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -276,7 +276,8 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve OUString aHelpText; Help* pHelp = Application::GetHelp(); if ( pHelp ) - aHelpText = String( pHelp->GetHelpText( nHelpId, NULL ) ); + // FIXME: HELPID + aHelpText = String( pHelp->GetHelpText( String()/*nHelpId*/, NULL ) ); return aHelpText; } diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index d7f258e7ccb3..b271d1e04dc7 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -51,7 +51,8 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE); eChildAlignment = SFX_ALIGN_NOALIGNMENT; - pWindow->SetHelpId ( HID_NAVIGATOR_WINDOW ); + // FIXME: HELPID + pWindow->SetHelpId ( ""/*HID_NAVIGATOR_WINDOW*/ ); pWindow->SetOutputSizePixel( Size( 270, 240 ) ); ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo ); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 93c2e0e09595..065b407c6769 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -664,7 +664,8 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText ) aCancelBtn.Show(); aHelpBtn.Show(); aResetBtn.Show(); - aResetBtn.SetHelpId( HID_TABDLG_RESET_BTN ); + // FIXME: HELPID + aResetBtn.SetHelpId( ""/*HID_TABDLG_RESET_BTN*/ ); if ( pUserBtn ) { @@ -680,7 +681,8 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText ) String aStd( SfxResId( STR_STANDARD_SHORTCUT ) ); aBaseFmtBtn.SetText( aStd ); aBaseFmtBtn.SetClickHdl( LINK( this, SfxTabDialog, BaseFmtHdl ) ); - aBaseFmtBtn.SetHelpId( HID_TABDLG_STANDARD_BTN ); + // FIXME: HELPID + aBaseFmtBtn.SetHelpId( ""/*HID_TABDLG_STANDARD_BTN*/ ); // bFmt = tempor"ares Flag im Ctor() "ubergeben, // wenn bFmt == 2, dann auch TRUE, @@ -787,7 +789,8 @@ void SfxTabDialog::EnableApplyButton(BOOL bEnable) pImpl->pApplyButton->SetText( String( SfxResId( STR_APPLY ) ) ); pImpl->pApplyButton->Show(); - pImpl->pApplyButton->SetHelpId( HID_TABDLG_APPLY_BTN ); + // FIXME: HELPID + pImpl->pApplyButton->SetHelpId( ""/*HID_TABDLG_APPLY_BTN*/ ); } else { @@ -1783,7 +1786,8 @@ long SfxTabDialog::Notify( NotifyEvent& rNEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + // nHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 9edeb05b43ac..4777798aef2b 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -778,8 +778,10 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Sfx bHierarchical ( FALSE ), bBindingUpdate ( TRUE ) { - aFmtLb.SetHelpId( HID_TEMPLATE_FMT ); - aFilterLb.SetHelpId( HID_TEMPLATE_FILTER ); + // FIXME: HELPID + aFmtLb.SetHelpId( ""/*HID_TEMPLATE_FMT*/ ); + // FIXME: HELPID + aFilterLb.SetHelpId( ""/*HID_TEMPLATE_FILTER*/ ); aFmtLb.SetWindowBits( WB_SORT | WB_HIDESELECTION ); Font aFont = aFmtLb.GetFont(); aFont.SetWeight( WEIGHT_NORMAL ); @@ -2359,7 +2361,8 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( Font aFont=aFilterLb.GetFont(); aFont.SetWeight( WEIGHT_NORMAL ); aFilterLb.SetFont( aFont ); - m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT ); + // FIXME: HELPID + m_aActionTbL.SetHelpId( ""/*HID_TEMPLDLG_TOOLBOX_LEFT*/ ); } // ------------------------------------------------------------------------ @@ -2384,7 +2387,8 @@ void SfxTemplateDialog_Impl::InsertFamilyItem(USHORT nId,const SfxStyleFamilyIte default: DBG_ERROR("unbekannte StyleFamily"); break; } m_aActionTbL.InsertItem( nId, pItem->GetImage(), pItem->GetText(), 0, 0); - m_aActionTbL.SetHelpId( nId, nHelpId ); + // FIXME: HELPID + m_aActionTbL.SetHelpId( nId, ""/*nHelpId*/ ); } // ------------------------------------------------------------------------ @@ -2683,18 +2687,21 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) uno::Any aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleNewByExample")); ::rtl::OUString sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel ); - pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE); + // FIXME: HELPID + pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, ""/*HID_TEMPLDLG_NEWBYEXAMPLE*/); aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleUpdateByExample")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel ); - pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE); + // FIXME: HELPID + pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, ""/*HID_TEMPLDLG_UPDATEBYEXAMPLE*/); aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:LoadStyles")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel ); - pMenu->SetHelpId(SID_TEMPLATE_LOAD, SID_TEMPLATE_LOAD); + // FIXME: HELPID + pMenu->SetHelpId(SID_TEMPLATE_LOAD, ""/*SID_TEMPLATE_LOAD*/); pMenu->SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, MenuSelectHdl)); pMenu->Execute( pBox, diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 719dc5b8d223..1d57e0b9c761 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -245,8 +245,9 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent, // * always work with an own instance, even if we get only NULL in this ctor } - aLeftLb.SetHelpId( HID_CTL_ORGANIZER_LEFT ); - aRightLb.SetHelpId( HID_CTL_ORGANIZER_RIGHT ); + // FIXME: HELPID + aLeftLb.SetHelpId( ""/*HID_CTL_ORGANIZER_LEFT*/ ); + aRightLb.SetHelpId( ""/*HID_CTL_ORGANIZER_RIGHT*/ ); String aWorkPath = SvtPathOptions().GetWorkPath(); if ( aWorkPath.Len() ) diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index d3235b1c7a7f..3b1ebde3f1ae 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -177,7 +177,8 @@ SfxPreviewWin::SfxPreviewWin( Window* pParent, const ResId& rResId, SfxObjectShellLock &rDocSh ) : Window(pParent, rResId), rDocShell( rDocSh ) { - SetHelpId( HID_PREVIEW_FRAME ); + // FIXME: HELPID + SetHelpId( ""/*HID_PREVIEW_FRAME*/ ); // adjust contrast mode initially bool bUseContrast = UseHighContrastSetting(); diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index 8e006721351a..a254deb24c52 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -41,7 +41,8 @@ QueryTemplateBox::QueryTemplateBox( Window* pParent, const String& rMessage ) : MessBox ( pParent, 0, Application::GetDisplayName(), rMessage ) { SetImage( QueryBox::GetStandardImage() ); - SetHelpId( MSG_QUERY_LOAD_TEMPLATE ); + // FIXME: HELPID + SetHelpId( ""/*MSG_QUERY_LOAD_TEMPLATE*/ ); AddButton( String( SfxResId( STR_QRYTEMPL_UPDATE_BTN ) ), RET_YES, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON ); diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index ec803718f457..9137abd04764 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -160,7 +160,8 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen // einf"ugen pMenu->InsertItem( nId, aVerbs[n].VerbName ); - pMenu->SetHelpId( nId, (ULONG) nId ); + // FIXME: HELPID + pMenu->SetHelpId( nId, ""/*(ULONG) nId*/ ); } } } @@ -378,7 +379,8 @@ void SfxPopupMenuManager::InsertSeparator( USHORT nPos ) void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, USHORT nPos ) { pSVMenu->InsertItem( nId, rName, nBits,nPos ); - pSVMenu->SetHelpId( nId, (ULONG) nId ); + // FIXME: HELPID + pSVMenu->SetHelpId( nId, ""/*(ULONG) nId*/ ); } //------------------------------------------------------------------------- diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 13c84bc531e2..e3d694eae747 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -464,7 +464,8 @@ void SfxVirtualMenu::CreateFromSVMenu() pSVMenu->SetPopupMenu( nSlotId, pPopup ); } */ - pSVMenu->SetHelpId( nSlotId, 0L ); + // FIXME: HELPID + pSVMenu->SetHelpId( nSlotId, ""/*0L*/ ); pMnuCtrl = pItems+nPos; // normalerweise jetzt erst im Activate-Handler diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index f5b38d5a8a18..fc26d0077161 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1520,7 +1520,8 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId , bBigImages( FALSE ) , pMenu( 0 ) { - rBox.SetHelpId( nId, HID_TBXCONTROL_FILENEW ); + // FIXME: HELPID + rBox.SetHelpId( nId, ""/*HID_TBXCONTROL_FILENEW*/ ); rBox.SetItemBits( nId, rBox.GetItemBits( nId ) | TIB_DROPDOWN); // Determine the current background color of the menus diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index d99ad8733e03..fea860f6a3ff 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -130,7 +130,8 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + // nHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index 1f5543e9e484..a4718c80f099 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -172,7 +172,8 @@ public: void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; } const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } - void SetHeaderBarHelpId(ULONG nHelpId) {aHeaderBar.SetHelpId(nHelpId);} + // FIXME: HELPID + void SetHeaderBarHelpId(ULONG nHelpId) {aHeaderBar.SetHelpId(""/*nHelpId*/);} }; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 503814823467..124f7fdd2910 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -636,7 +636,8 @@ SvxTPView::SvxTPView( Window * pParent) { FreeResource(); - aViewData.SetHelpId(HID_REDLINING_VIEW_DG_VIEW_TABLE); + // FIXME: HELPID + aViewData.SetHelpId(""/*HID_REDLINING_VIEW_DG_VIEW_TABLE*/); aViewData.SetHeaderBarHelpId(HID_REDLINING_VIEW_DG_VIEW_HEADER); aMinSize=GetSizePixel(); @@ -1177,13 +1178,15 @@ void SvxTPFilter::ShowAction(BOOL bShow) { aCbRange.Hide(); aLbAction.Hide(); - aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_RANGE); + // FIXME: HELPID + aCbRange.SetHelpId(""/*HID_REDLINING_FILTER_CB_RANGE*/); } else { HideRange(); aCbRange.SetText(aActionStr); - aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_ACTION); + // FIXME: HELPID + aCbRange.SetHelpId(""/*HID_REDLINING_FILTER_CB_ACTION*/); aCbRange.Show(); aLbAction.Show(); @@ -1399,7 +1402,8 @@ SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, WinBits nWinStyle) aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName()); aTCAccept.SetTabPage( TP_VIEW, pTPView); aTCAccept.SetTabPage( TP_FILTER, pTPFilter); - aTCAccept.SetHelpId(HID_REDLINING_TABCONTROL); + // FIXME: HELPID + aTCAccept.SetHelpId(""/*HID_REDLINING_TABCONTROL*/); aTCAccept.SetTabPageSizePixel(aMinSize); Size aSize=aTCAccept.GetSizePixel(); @@ -1426,7 +1430,8 @@ SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, const ResId& rResId ) aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName()); aTCAccept.SetTabPage( TP_VIEW, pTPView); aTCAccept.SetTabPage( TP_FILTER, pTPFilter); - aTCAccept.SetHelpId(HID_REDLINING_TABCONTROL); + // FIXME: HELPID + aTCAccept.SetHelpId(""/*HID_REDLINING_TABCONTROL*/); aTCAccept.SetTabPageSizePixel(aMinSize); Size aSize=aTCAccept.GetSizePixel(); diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 95c27a5dcec8..6437b193a793 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1009,9 +1009,12 @@ SvxLightCtl3D::SvxLightCtl3D( Window* pParent, WinBits nStyle ) void SvxLightCtl3D::Init() { // #i58240# set HelpIDs for scrollbars and switcher - maHorScroller.SetHelpId(HID_CTRL3D_HSCROLL); - maVerScroller.SetHelpId(HID_CTRL3D_VSCROLL); - maSwitcher.SetHelpId(HID_CTRL3D_SWITCHER); + // FIXME: HELPID + maHorScroller.SetHelpId(""/*HID_CTRL3D_HSCROLL*/); + // FIXME: HELPID + maVerScroller.SetHelpId(""/*HID_CTRL3D_VSCROLL*/); + // FIXME: HELPID + maSwitcher.SetHelpId(""/*HID_CTRL3D_SWITCHER*/); // Light preview maLightControl.Show(); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 2cc87eb9e648..fe6a2372b7a0 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1978,8 +1978,8 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V sPattern.AssignAscii("HID:"); if (sHelpURL.Equals(sPattern, 0, sPattern.Len())) { - String sID = sHelpURL.Copy(sPattern.Len()); - pGrid->SetHelpId(sID.ToInt32()); + // FIXME: HELPID + pGrid->SetHelpId(rtl::OUStringToOString(sHelpURL, RTL_TEXTENCODING_UTF8)); } } else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) ) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 8cc52e4c0b7d..2c63880afd05 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -366,13 +366,20 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) m_aLastBtn.SetSymbol(SYMBOL_LAST); m_aNewBtn.SetModeImage(((DbGridControl*)pParent)->GetImage(DbGridControl_Base::NEW)); - m_aFirstBtn.SetHelpId(HID_GRID_TRAVEL_FIRST); - m_aPrevBtn.SetHelpId(HID_GRID_TRAVEL_PREV); - m_aNextBtn.SetHelpId(HID_GRID_TRAVEL_NEXT); - m_aLastBtn.SetHelpId(HID_GRID_TRAVEL_LAST); - m_aNewBtn.SetHelpId(HID_GRID_TRAVEL_NEW); - m_aAbsolute.SetHelpId(HID_GRID_TRAVEL_ABSOLUTE); - m_aRecordCount.SetHelpId(HID_GRID_NUMBEROFRECORDS); + // FIXME: HELPID + m_aFirstBtn.SetHelpId(""/*HID_GRID_TRAVEL_FIRST*/); + // FIXME: HELPID + m_aPrevBtn.SetHelpId(""/*HID_GRID_TRAVEL_PREV*/); + // FIXME: HELPID + m_aNextBtn.SetHelpId(""/*HID_GRID_TRAVEL_NEXT*/); + // FIXME: HELPID + m_aLastBtn.SetHelpId(""/*HID_GRID_TRAVEL_LAST*/); + // FIXME: HELPID + m_aNewBtn.SetHelpId(""/*HID_GRID_TRAVEL_NEW*/); + // FIXME: HELPID + m_aAbsolute.SetHelpId(""/*HID_GRID_TRAVEL_ABSOLUTE*/); + // FIXME: HELPID + m_aRecordCount.SetHelpId(""/*HID_GRID_NUMBEROFRECORDS*/); // Handler fuer Buttons einrichten m_aFirstBtn.SetClickHdl(LINK(this,NavigationBar,OnClick)); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index e02e8664c6ac..e3425c00b130 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2388,7 +2388,8 @@ namespace svxform { DBG_CTOR(DataNavigator,NULL); - SetHelpId( HID_DATA_NAVIGATOR_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_DATA_NAVIGATOR_WIN*/ ); SetText( SVX_RES( RID_STR_DATANAVIGATOR ) ); Size aSize = m_aDataWin.GetOutputSizePixel(); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9d1b65208fdf..c985c34f12f1 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1168,7 +1168,8 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent ) ,m_aTimerCounter( 0 ) ,m_aDropActionType( DA_SCROLLUP ) { - SetHelpId( HID_FILTER_NAVIGATOR ); + // FIXME: HELPID + SetHelpId( ""/*HID_FILTER_NAVIGATOR*/ ); { { @@ -1941,7 +1942,8 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) ,SfxControllerItem( SID_FM_FILTER_NAVIGATOR_CONTROL, *_pBindings ) { - SetHelpId( HID_FILTER_NAVIGATOR_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_FILTER_NAVIGATOR_WIN*/ ); m_pNavigator = new FmFilterNavigator( this ); m_pNavigator->Show(); diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index bcc275896410..939253dec5bb 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -223,7 +223,8 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding ::Size aPropWinSize(STD_WIN_SIZE_X,STD_WIN_SIZE_Y); SetMinOutputSizePixel(::Size(STD_MIN_SIZE_X,STD_MIN_SIZE_Y)); SetOutputSizePixel(aPropWinSize); - SetUniqueId(UID_FORMPROPBROWSER_FRAME); + // FIXME: HELPID + SetUniqueId(""/*UID_FORMPROPBROWSER_FRAME*/); try { diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index c27b5b69d075..a2e1469418f0 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -592,7 +592,8 @@ namespace svxform ,SfxControllerItem( SID_FM_FMEXPLORER_CONTROL, *_pBindings ) { DBG_CTOR(NavigatorFrame,NULL); - SetHelpId( HID_FORM_NAVIGATOR_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_FORM_NAVIGATOR_WIN*/ ); m_pNavigatorTree = new NavigatorTree(comphelper::getProcessServiceFactory(), this ); m_pNavigatorTree->Show(); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 0c83655042d2..5e37d88126c3 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -200,7 +200,8 @@ namespace svxform ,m_bKeyboardCut( sal_False ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NavigatorTree" ); - SetHelpId( HID_FORM_NAVIGATOR ); + // FIXME: HELPID + SetHelpId( ""/*HID_FORM_NAVIGATOR*/ ); m_aNavigatorImages = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); m_aNavigatorImagesHC = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 7a51348dfaa3..1a87a06010e1 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -104,7 +104,8 @@ FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent ) ,pTabWin( pParent ) { DBG_CTOR(FmFieldWinListBox,NULL); - SetHelpId( HID_FIELD_SEL ); + // FIXME: HELPID + SetHelpId( ""/*HID_FIELD_SEL*/ ); SetHighlightRange( ); } @@ -192,7 +193,8 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _ ,m_pChangeListener(NULL) { DBG_CTOR(FmFieldWin,NULL); - SetHelpId( HID_FIELD_SEL_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_FIELD_SEL_WIN*/ ); SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) ); pListBox = new FmFieldWinListBox( this ); diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index f275fd9efd72..85babb34a1a7 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -318,7 +318,8 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) { SvxFmAbsRecWin* pWin = new SvxFmAbsRecWin( pParent, this ); - pWin->SetUniqueId( UID_ABSOLUTE_RECORD_WINDOW ); + // FIXME: HELPID + pWin->SetUniqueId( ""/*UID_ABSOLUTE_RECORD_WINDOW*/ ); return pWin; } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index ccbcd40862de..29c38653b4ac 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -152,7 +152,8 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, { StartListening( *mpGallery ); - maNewTheme.SetHelpId( HID_GALLERY_NEWTHEME ); + // FIXME: HELPID + maNewTheme.SetHelpId( ""/*HID_GALLERY_NEWTHEME*/ ); maNewTheme.SetText( String( GAL_RESID( RID_SVXSTR_GALLERY_CREATETHEME ) ) ); maNewTheme.SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) ); @@ -160,7 +161,8 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, if( mpGallery->GetUserURL().GetProtocol() == INET_PROT_NOT_VALID ) maNewTheme.Disable(); - mpThemes->SetHelpId( HID_GALLERY_THEMELIST ); + // FIXME: HELPID + mpThemes->SetHelpId( ""/*HID_GALLERY_THEMELIST*/ ); mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) ); for( ULONG i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ ) diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 0483a1bc1425..ae1fc2f0e086 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -325,12 +325,14 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, maViewBox.InsertItem( TBX_ID_ICON, aDummyImage ); maViewBox.SetItemBits( TBX_ID_ICON, TIB_RADIOCHECK | TIB_AUTOCHECK ); - maViewBox.SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW ); + // FIXME: HELPID + maViewBox.SetHelpId( TBX_ID_ICON, ""/*HID_GALLERY_ICONVIEW*/ ); maViewBox.SetQuickHelpText( TBX_ID_ICON, String( GAL_RESID( RID_SVXSTR_GALLERY_ICONVIEW ) ) ); maViewBox.InsertItem( TBX_ID_LIST, aDummyImage ); maViewBox.SetItemBits( TBX_ID_LIST, TIB_RADIOCHECK | TIB_AUTOCHECK ); - maViewBox.SetHelpId( TBX_ID_LIST, HID_GALLERY_LISTVIEW ); + // FIXME: HELPID + maViewBox.SetHelpId( TBX_ID_LIST, ""/*HID_GALLERY_LISTVIEW*/ ); maViewBox.SetQuickHelpText( TBX_ID_LIST, String( GAL_RESID( RID_SVXSTR_GALLERY_LISTVIEW ) ) ); maViewBox.SetBorder( 0, 1 ); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 8022cecc0fbe..ccfb931f2d29 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -61,7 +61,8 @@ GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme ) DragSourceHelper( this ), mpTheme( pTheme ) { - SetHelpId( HID_GALLERY_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); InitSettings(); } @@ -73,7 +74,8 @@ GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) : DragSourceHelper( this ), mpTheme( NULL ) { - SetHelpId( HID_GALLERY_PREVIEW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_PREVIEW*/ ); InitSettings(); } @@ -309,7 +311,8 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme { EnableFullItemMode( FALSE ); - SetHelpId( HID_GALLERY_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); InitSettings(); SetExtraSpacing( 2 ); SetItemWidth( S_THUMB + 6 ); @@ -475,7 +478,8 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme mnCurRow( 0 ), mbInit( FALSE ) { - SetHelpId( HID_GALLERY_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); InitSettings(); diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 241ffeb8bc36..676c8b0dc842 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -57,7 +57,8 @@ SvxInsertStatusBarControl::SvxInsertStatusBarControl( USHORT _nSlotId, SfxStatusBarControl( _nSlotId, _nId, rStb ), bInsert( TRUE ) { - rStb.SetHelpId( _nId, _nSlotId ); + // FIXME: HELPID + rStb.SetHelpId( _nId, ""/*_nSlotId*/ ); } // ----------------------------------------------------------------------- diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index edb72ab05eac..fbcb925fd579 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -233,7 +233,8 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, // da Kombi-Controller, immer die aktuelle Id als HelpId setzen // gecachten HelpText vorher l"oschen GetStatusBar().SetHelpText( GetId(), String() ); - GetStatusBar().SetHelpId( GetId(), nSID ); + // FIXME: HELPID + GetStatusBar().SetHelpId( GetId(), ""/*nSID*/ ); if ( nSID == SID_PSZ_FUNCTION ) { diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 06d1e9642b9e..130817432e7f 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -111,7 +111,8 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con { GetStatusBar().SetHelpText( GetId(), String() );// necessary ? - GetStatusBar().SetHelpId( GetId(), nSID ); // necessary ? + // FIXME: HELPID + GetStatusBar().SetHelpId( GetId(), ""/*nSID*/ ); // necessary ? if( SFX_ITEM_AVAILABLE != eState ) { diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index a4cab5f3ef16..c9374ab27fb6 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -111,7 +111,8 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( void ExtrusionDirectionWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_DIRECTION ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_DIRECTION*/ ); USHORT i; for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) @@ -124,12 +125,15 @@ void ExtrusionDirectionWindow::implInit() // mpProjectionForewarder = new SfxStatusForwarder( SID_EXTRUSION_PROJECTION, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_DIRECTION*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); mpDirectionSet = new ValueSet( mpMenu, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); - mpDirectionSet->SetHelpId( HID_VALUESET_EXTRUSION_DIRECTION ); + // FIXME: HELPID + mpDirectionSet->SetHelpId( ""/*HID_VALUESET_EXTRUSION_DIRECTION*/ ); - mpDirectionSet->SetHelpId( HID_POPUP_LINEEND_CTRL ); + // FIXME: HELPID + mpDirectionSet->SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); mpDirectionSet->SetColCount( 3 ); mpDirectionSet->EnableFullItemMode( FALSE ); @@ -501,13 +505,15 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( USHORT nId, void ExtrusionDepthWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_DEPTH ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_DEPTH*/ ); // mpDepthForewarder = new SfxStatusForwarder( SID_EXTRUSION_DEPTH, *this ); // mpMetricForewarder = new SfxStatusForwarder( SID_ATTR_METRIC, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_DEPTH ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_DEPTH*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); @@ -848,7 +854,8 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( void ExtrusionLightingWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_LIGHTING ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_LIGHTING*/ ); USHORT i; for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ ) @@ -868,13 +875,16 @@ void ExtrusionLightingWindow::implInit() // mpLightingIntensityForewarder = new SfxStatusForwarder( SID_EXTRUSION_LIGHTING_INTENSITY, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_LIGHTING ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_LIGHTING*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) ); mpLightingSet = new ValueSet( mpMenu, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); - mpLightingSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); + // FIXME: HELPID + mpLightingSet->SetHelpId( ""/*HID_VALUESET_EXTRUSION_LIGHTING*/ ); - mpLightingSet->SetHelpId( HID_POPUP_LINEEND_CTRL ); + // FIXME: HELPID + mpLightingSet->SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) ); mpLightingSet->SetColCount( 3 ); mpLightingSet->EnableFullItemMode( FALSE ); @@ -1226,14 +1236,16 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( void ExtrusionSurfaceWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_SURFACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_SURFACE*/ ); bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); // mpSurfaceForewarder = new SfxStatusForwarder( SID_EXTRUSION_SURFACE, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_SURFACE ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_SURFACE*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), bHighContrast ? maImgSurface1h : maImgSurface1 ); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 31c77e221d62..5a16fc41e90b 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -504,8 +504,10 @@ Window* SvxFillToolBoxControl::CreateItemWindow( Window *pParent ) pFillAttrLB = (SvxFillAttrBox*)pFillControl->pLbFillAttr; pFillTypeLB = (SvxFillTypeBox*)pFillControl->pLbFillType; - pFillAttrLB->SetUniqueId( HID_FILL_ATTR_LISTBOX ); - pFillTypeLB->SetUniqueId( HID_FILL_TYPE_LISTBOX ); + // FIXME: HELPID + pFillAttrLB->SetUniqueId( ""/*HID_FILL_ATTR_LISTBOX*/ ); + // FIXME: HELPID + pFillTypeLB->SetUniqueId( ""/*HID_FILL_TYPE_LISTBOX */); return pFillControl; } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 1b4f89ca1e8c..dbd815ae3d14 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -361,7 +361,8 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_ALIGN ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_ALIGN*/ ); implInit(); } @@ -386,18 +387,21 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_ALIGN ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_ALIGN*/ ); implInit(); } void FontWorkAlignmentWindow::implInit() { - SetHelpId( HID_POPUP_FONTWORK_ALIGN ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_FONTWORK_ALIGN*/ ); bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_POPUP_FONTWORK_ALIGN ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_POPUP_FONTWORK_ALIGN*/ ); mpMenu->SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 ); @@ -610,7 +614,8 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_CHARSPACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_CHARSPACE*/ ); implInit(); } @@ -626,18 +631,21 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_CHARSPACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_CHARSPACE*/ ); implInit(); } void FontWorkCharacterSpacingWindow::implInit() { - SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_FONTWORK_CHARSPACE*/ ); // bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_POPUP_FONTWORK_CHARSPACE*/ ); mpMenu->SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK ); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index fa5ddd579dee..f73e9b756ccf 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -353,8 +353,9 @@ ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OU maImage.Show(); - maField.SetHelpId( nSlotId ); - maField.SetSmartHelpId( SmartId( rCmd )); + // FIXME: HELPID + // maField.SetHelpId( nSlotId ); + maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); maField.Show(); } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 6deab3eca30b..f3e208f3e6ce 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -423,8 +423,10 @@ void SvxLineEndWindow::implInit() SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = NULL; - SetHelpId( HID_POPUP_LINEEND ); - aLineEndSet.SetHelpId( HID_POPUP_LINEEND_CTRL ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_LINEEND*/ ); + // FIXME: HELPID + aLineEndSet.SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); if ( pDocSh ) { diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 5c99e84e6a47..6b5998a3f1b9 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -905,8 +905,10 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, lcl_CalcSizeValueSet( *this, aColorSet, aSize12 ); - SetHelpId( HID_POPUP_COLOR ); - aColorSet.SetHelpId( HID_POPUP_COLOR_CTRL ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_COLOR*/ ); + // FIXME: HELPID + aColorSet.SetHelpId( ""/*HID_POPUP_COLOR_CTRL*/ ); SetText( rWndTitle ); aColorSet.Show(); @@ -1090,7 +1092,8 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& lcl_CalcSizeValueSet( *this, aFrameSet,Size( 20, 20 )); - SetHelpId( HID_POPUP_FRAME ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_FRAME*/ ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME) ); aFrameSet.Show(); } @@ -1350,7 +1353,8 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r lcl_CalcSizeValueSet( *this, aLineSet, aBmpSize ); - SetHelpId( HID_POPUP_LINE ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_LINE*/ ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME_STYLE) ); aLineSet.Show(); } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index dda324cb98d1..97bcf74e6c10 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -485,13 +485,18 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) { FreeResource(); - m_aRB_To_Simplified.SetHelpId( HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED ); - m_aRB_To_Traditional.SetHelpId( HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL ); + // FIXME: HELPID + m_aRB_To_Simplified.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED*/ ); + // FIXME: HELPID + m_aRB_To_Traditional.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL*/ ); - m_aCB_Reverse.SetHelpId( HID_SVX_CHINESE_DICTIONARY_CB_REVERSE ); + // FIXME: HELPID + m_aCB_Reverse.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_CB_REVERSE*/ ); - m_aCT_DictionaryToSimplified.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED ); - m_aCT_DictionaryToTraditional.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL ); + // FIXME: HELPID + m_aCT_DictionaryToSimplified.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED*/ ); + // FIXME: HELPID + m_aCT_DictionaryToTraditional.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL*/ ); SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); @@ -578,7 +583,8 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) m_pHeaderBar = m_aCT_DictionaryToSimplified.createHeaderBar( aColumn1, aColumn2, aColumn3, nWidth1, nWidth2, nWidth3 ); if(m_pHeaderBar) - m_pHeaderBar->SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_HEADER ); + // FIXME: HELPID + m_pHeaderBar->SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_HEADER*/ ); long pTabs[] = { 3, 0, nWidth1, nWidth1 + nWidth2 }; m_aCT_DictionaryToSimplified.SetTabs( &pTabs[0], MAP_PIXEL ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 213ddc22bace..a2f308248224 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -72,9 +72,12 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) { FreeResource(); - m_aRB_To_Simplified.SetHelpId( HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED ); - m_aRB_To_Traditional.SetHelpId( HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL ); - m_aCB_Use_Variants.SetHelpId( HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS ); + // FIXME: HELPID + m_aRB_To_Simplified.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED*/ ); + // FIXME: HELPID + m_aRB_To_Traditional.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL*/ ); + // FIXME: HELPID + m_aCB_Use_Variants.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS*/ ); SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); |