summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2010-06-04 13:46:22 +0200
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2010-06-04 13:46:22 +0200
commit50c6c0aaebeda0f131e35da61729479180184192 (patch)
tree9212d13d24af292cd31daf1179d1ce55d5fccd60 /svx
parent2f4bff8415b28e36346872157104eb71322a743a (diff)
changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svx/simptabl.hxx3
-rw-r--r--svx/source/dialog/ctredlin.cxx15
-rw-r--r--svx/source/dialog/dlgctl3d.cxx9
-rw-r--r--svx/source/fmcomp/fmgridif.cxx4
-rw-r--r--svx/source/fmcomp/gridctrl.cxx21
-rw-r--r--svx/source/form/datanavi.cxx3
-rw-r--r--svx/source/form/filtnav.cxx6
-rw-r--r--svx/source/form/fmPropBrw.cxx3
-rw-r--r--svx/source/form/fmexpl.cxx3
-rw-r--r--svx/source/form/navigatortree.cxx3
-rw-r--r--svx/source/form/tabwin.cxx6
-rw-r--r--svx/source/form/tbxform.cxx3
-rw-r--r--svx/source/gallery2/galbrws1.cxx6
-rw-r--r--svx/source/gallery2/galbrws2.cxx6
-rw-r--r--svx/source/gallery2/galctrl.cxx12
-rw-r--r--svx/source/stbctrls/insctrl.cxx3
-rw-r--r--svx/source/stbctrls/pszctrl.cxx3
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx3
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx36
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx6
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx24
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx5
-rw-r--r--svx/source/tbxctrls/linectrl.cxx6
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx12
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx18
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx9
26 files changed, 151 insertions, 77 deletions
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();