From 4e9a9f3b7fdc3e0245ed51238cec4e034778670b Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 13:46:22 +0200 Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids --- editeng/source/editeng/editview.cxx | 6 ++++-- editeng/source/misc/svxacorr.cxx | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'editeng') diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index d9f60c5f64..e2d90deb07 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 78edae142d..fda7fe4da4 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*/ ); } } -- cgit v1.2.3 From f27d5c53f3143596f7dcd0c2e9177fb8232d86c1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- avmedia/inc/helpids.hrc | 24 +- avmedia/source/framework/mediacontrol.cxx | 36 +- avmedia/source/framework/mediaplayer.cxx | 3 +- avmedia/source/viewer/mediawindow_impl.cxx | 3 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 18 +- .../source/deployment/gui/dp_gui_extlistbox.cxx | 3 +- desktop/source/deployment/gui/license_dialog.cxx | 3 +- desktop/source/inc/helpid.hrc | 69 +- desktop/source/migration/wizard.cxx | 12 +- editeng/inc/helpid.hrc | 64 +- editeng/source/editeng/editview.cxx | 6 +- editeng/source/misc/svxacorr.cxx | 31 +- formula/inc/formula/IFunctionDescription.hxx | 2 +- formula/inc/formula/formdata.hxx | 1 - formula/inc/formula/formula.hxx | 6 +- formula/inc/helpids.hrc | 46 +- formula/source/ui/dlg/FormulaHelper.cxx | 2 +- formula/source/ui/dlg/formula.cxx | 34 +- formula/source/ui/dlg/funcpage.cxx | 10 +- formula/source/ui/dlg/funcpage.hxx | 1 - formula/source/ui/dlg/funcutl.cxx | 2 - formula/source/ui/dlg/parawin.cxx | 20 +- fpicker/source/office/OfficeControlAccess.cxx | 22 +- fpicker/source/office/iodlg.cxx | 74 +- fpicker/source/office/iodlg.hrc | 32 +- framework/inc/helpid.hrc | 16 +- framework/inc/uielement/commandinfo.hxx | 2 + framework/inc/uielement/toolbarmerger.hxx | 1 + framework/inc/uielement/toolbarsmenucontroller.hxx | 2 +- framework/source/services/backingcomp.cxx | 3 +- framework/source/services/menudocumenthandler.cxx | 903 --------------------- .../source/uielement/macrosmenucontroller.cxx | 9 +- framework/source/uielement/menubarmanager.cxx | 5 - framework/source/uielement/statusbarmanager.cxx | 11 - framework/source/uielement/statusbarwrapper.cxx | 3 +- framework/source/uielement/toolbarmanager.cxx | 13 +- framework/source/uielement/toolbarmerger.cxx | 12 +- .../source/uielement/toolbarsmenucontroller.cxx | 18 +- idl/source/prj/command.cxx | 2 + sfx2/inc/sfx2/basedlgs.hxx | 3 - sfx2/inc/sfx2/dispatch.hxx | 4 +- sfx2/inc/sfx2/filedlghelper.hxx | 2 +- sfx2/inc/sfx2/mnumgr.hxx | 2 +- sfx2/inc/sfx2/msg.hxx | 5 + sfx2/inc/sfx2/opengrf.hxx | 2 +- sfx2/inc/sfx2/sfxcommands.h | 345 ++++++++ sfx2/inc/sfx2/sfxdlg.hxx | 4 +- sfx2/inc/sfxhelp.hxx | 13 +- sfx2/sdi/sfx.sdi | 2 +- sfx2/source/appl/app.src | 163 ---- sfx2/source/appl/appserv.cxx | 9 +- sfx2/source/appl/newhelp.cxx | 59 +- sfx2/source/appl/opengrf.cxx | 2 +- sfx2/source/appl/sfxhelp.cxx | 367 +++------ sfx2/source/control/dispatch.cxx | 25 +- sfx2/source/control/msg.cxx | 15 +- sfx2/source/dialog/about.cxx | 4 +- sfx2/source/dialog/basedlgs.cxx | 45 +- sfx2/source/dialog/dialog.hrc | 1 - sfx2/source/dialog/dialog.src | 17 +- sfx2/source/dialog/dockwin.cxx | 56 +- sfx2/source/dialog/filedlghelper.cxx | 37 +- sfx2/source/dialog/filedlgimpl.hxx | 4 +- sfx2/source/dialog/navigat.cxx | 3 +- sfx2/source/dialog/newstyle.src | 3 +- sfx2/source/dialog/tabdlg.cxx | 20 +- sfx2/source/dialog/templdlg.cxx | 61 +- sfx2/source/dialog/templdlg.src | 4 +- sfx2/source/doc/doc.hrc | 1 - sfx2/source/doc/doc.src | 8 - sfx2/source/doc/doctdlg.src | 3 +- sfx2/source/doc/docvor.cxx | 5 +- sfx2/source/doc/docvor.src | 2 +- sfx2/source/doc/iframe.cxx | 2 +- sfx2/source/doc/new.cxx | 3 +- sfx2/source/doc/new.src | 4 +- sfx2/source/doc/objcont.cxx | 11 - sfx2/source/doc/querytemplate.cxx | 5 +- sfx2/source/inc/helpid.hrc | 623 +++++++------- sfx2/source/menu/menu.src | 7 +- sfx2/source/menu/mnumgr.cxx | 7 +- sfx2/source/menu/virtmenu.cxx | 26 +- sfx2/source/statbar/stbitem.cxx | 5 + sfx2/source/toolbox/tbxitem.cxx | 3 +- sfx2/source/view/frame2.cxx | 11 +- svx/inc/fmhelp.hrc | 142 ++-- svx/inc/globlmn_tmpl.hrc | 187 +---- svx/inc/helpid.hrc | 495 ++++++----- svx/inc/svx/dialogs.hrc | 4 - svx/inc/svx/exthelpid.hrc | 13 +- svx/inc/svx/simptabl.hxx | 3 +- svx/inc/svx/svxcommands.h | 604 ++++++++++++++ svx/inc/svx/svxdlg.hxx | 8 +- svx/prj/d.lst | 1 + svx/source/dialog/bmpmask.src | 2 +- svx/source/dialog/ctredlin.cxx | 15 +- svx/source/dialog/dlgctl3d.cxx | 9 +- svx/source/dialog/fontwork.src | 2 +- svx/source/dialog/hyprlink.src | 4 +- svx/source/dialog/srchdlg.cxx | 2 +- svx/source/dialog/srchdlg.src | 3 +- svx/source/engine3d/float3d.src | 4 +- svx/source/fmcomp/fmgridif.cxx | 5 +- svx/source/fmcomp/gridctrl.cxx | 21 +- svx/source/fmcomp/gridctrl.src | 44 +- svx/source/form/datanavi.cxx | 3 +- svx/source/form/filtnav.cxx | 6 +- svx/source/form/filtnav.src | 4 - svx/source/form/fmPropBrw.cxx | 3 +- svx/source/form/fmexpl.cxx | 3 +- svx/source/form/fmexpl.src | 62 +- svx/source/form/formshell.src | 6 +- svx/source/form/navigatortree.cxx | 3 +- svx/source/form/tabwin.cxx | 6 +- svx/source/form/tbxform.cxx | 3 +- svx/source/gallery2/galbrws1.cxx | 6 +- svx/source/gallery2/galbrws2.cxx | 6 +- svx/source/gallery2/galctrl.cxx | 12 +- svx/source/gallery2/gallery.src | 2 +- svx/source/stbctrls/insctrl.cxx | 2 - svx/source/stbctrls/pszctrl.cxx | 20 +- svx/source/stbctrls/xmlsecctrl.cxx | 8 +- svx/source/tbxctrls/extrusioncontrols.cxx | 36 +- svx/source/tbxctrls/fillctrl.cxx | 6 +- svx/source/tbxctrls/fontworkgallery.cxx | 24 +- svx/source/tbxctrls/grafctrl.cxx | 5 +- svx/source/tbxctrls/linectrl.cxx | 6 +- svx/source/tbxctrls/makefile.mk | 1 - svx/source/tbxctrls/tbcontrl.cxx | 12 +- svx/source/tbxctrls/tbxdraw.src | 265 ------ svx/source/toolbars/extrusionbar.src | 59 -- svx/source/toolbars/fontworkbar.src | 34 - .../chinese_dictionarydialog.cxx | 18 +- .../chinese_translationdialog.cxx | 9 +- uui/source/ids.hrc | 25 +- 135 files changed, 2282 insertions(+), 3468 deletions(-) delete mode 100644 framework/source/services/menudocumenthandler.cxx create mode 100644 sfx2/inc/sfx2/sfxcommands.h create mode 100644 svx/inc/svx/svxcommands.h delete mode 100644 svx/source/tbxctrls/tbxdraw.src (limited to 'editeng') diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc index 1f7ffb6172..753852047b 100644 --- a/avmedia/inc/helpids.hrc +++ b/avmedia/inc/helpids.hrc @@ -30,17 +30,17 @@ #include -#define HID_AVMEDIA_TOOLBOXITEM_PLAY (HID_AVMEDIA_START+0) -#define HID_AVMEDIA_TOOLBOXITEM_PAUSE (HID_AVMEDIA_START+1) -#define HID_AVMEDIA_TOOLBOXITEM_STOP (HID_AVMEDIA_START+2) -#define HID_AVMEDIA_TOOLBOXITEM_MUTE (HID_AVMEDIA_START+3) -#define HID_AVMEDIA_TOOLBOXITEM_LOOP (HID_AVMEDIA_START+4) -#define HID_AVMEDIA_TOOLBOXITEM_OPEN (HID_AVMEDIA_START+5) -#define HID_AVMEDIA_TOOLBOXITEM_INSERT (HID_AVMEDIA_START+6) -#define HID_AVMEDIA_ZOOMLISTBOX (HID_AVMEDIA_START+7) -#define HID_AVMEDIA_TIMESLIDER (HID_AVMEDIA_START+8) -#define HID_AVMEDIA_TIMEEDIT (HID_AVMEDIA_START+9) -#define HID_AVMEDIA_VOLUMESLIDER (HID_AVMEDIA_START+10) -#define HID_AVMEDIA_PLAYERWINDOW (HID_AVMEDIA_START+11) +#define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY" +#define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE" +#define HID_AVMEDIA_TOOLBOXITEM_STOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP" +#define HID_AVMEDIA_TOOLBOXITEM_MUTE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE" +#define HID_AVMEDIA_TOOLBOXITEM_LOOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP" +#define HID_AVMEDIA_TOOLBOXITEM_OPEN "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN" +#define HID_AVMEDIA_TOOLBOXITEM_INSERT "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT" +#define HID_AVMEDIA_ZOOMLISTBOX "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX" +#define HID_AVMEDIA_TIMESLIDER "AVMEDIA_HID_AVMEDIA_TIMESLIDER" +#define HID_AVMEDIA_TIMEEDIT "AVMEDIA_HID_AVMEDIA_TIMEEDIT" +#define HID_AVMEDIA_VOLUMESLIDER "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER" +#define HID_AVMEDIA_PLAYERWINDOW "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW" #endif // _AVMEDIA_HELPIDS_HRC diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index f6d1409ad3..178ee237ee 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -94,12 +94,10 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, ""/*HID_AVMEDIA_TOOLBOXITEM_OPEN*/ ); + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, implGetImage( AVMEDIA_IMG_INSERT ), String( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, ""/*HID_AVMEDIA_TOOLBOXITEM_INSERT*/ ); + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, HID_AVMEDIA_TOOLBOXITEM_INSERT ); maPlayToolBox.InsertSeparator(); } @@ -119,22 +117,18 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : } maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage( AVMEDIA_IMG_PLAY ), String( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), TIB_CHECKABLE ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, ""/*HID_AVMEDIA_TOOLBOXITEM_PLAY*/ ); + 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 ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, ""/*HID_AVMEDIA_TOOLBOXITEM_PAUSE*/ ); + 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 ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, ""/*HID_AVMEDIA_TOOLBOXITEM_STOP*/ ); + 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 ) ) ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, ""/*HID_AVMEDIA_TOOLBOXITEM_LOOP*/ ); + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, HID_AVMEDIA_TOOLBOXITEM_LOOP ); if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle ) maPlayToolBox.InsertSeparator(); @@ -147,8 +141,7 @@ 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 ) ); - // FIXME: HELPID - maTimeSlider.SetHelpId( ""/*HID_AVMEDIA_TIMESLIDER*/ ); + maTimeSlider.SetHelpId( HID_AVMEDIA_TIMESLIDER ); maTimeSlider.SetUpdateMode( true ); maTimeSlider.SetSizePixel( Size( 128, maPlayToolBox.GetSizePixel().Height() ) ); maTimeSlider.Show(); @@ -158,8 +151,7 @@ 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() ); - // FIXME: HELPID - maTimeEdit.SetHelpId( ""/*HID_AVMEDIA_TIMEEDIT*/ ); + maTimeEdit.SetHelpId( HID_AVMEDIA_TIMEEDIT ); maTimeEdit.Disable(); maTimeEdit.Show(); maMinSize.Width() += maTimeEdit.GetSizePixel().Width(); @@ -168,8 +160,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maMuteToolBox.InsertSeparator(); maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage( AVMEDIA_IMG_MUTE ), String( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) ); - // FIXME: HELPID - maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, ""/*HID_AVMEDIA_TOOLBOXITEM_MUTE*/ ); + maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, HID_AVMEDIA_TOOLBOXITEM_MUTE ); maMuteToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) ); maMuteToolBox.SetSizePixel( maMuteToolBox.CalcWindowSizePixel() ); @@ -180,8 +171,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maVolumeSlider.SetEndSlideHdl( LINK( this, MediaControl, implVolumeEndHdl ) ); maVolumeSlider.SetRange( Range( AVMEDIA_DB_RANGE, 0 ) ); maVolumeSlider.SetUpdateMode( true ); - // FIXME: HELPID - maVolumeSlider.SetHelpId( ""/*HID_AVMEDIA_VOLUMESLIDER*/ ); + maVolumeSlider.SetHelpId( HID_AVMEDIA_VOLUMESLIDER ); maVolumeSlider.SetSizePixel( Size( 48, maPlayToolBox.GetSizePixel().Height() ) ); maVolumeSlider.Show(); maMinSize.Width() += maVolumeSlider.GetSizePixel().Width(); @@ -192,12 +182,10 @@ 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 ) ); - // FIXME: HELPID - mpZoomListBox->SetHelpId( ""/*HID_AVMEDIA_ZOOMLISTBOX*/ ); + mpZoomListBox->SetHelpId( HID_AVMEDIA_ZOOMLISTBOX ); maZoomToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM ) ) ); - // FIXME: HELPID - maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, ""/*HID_AVMEDIA_ZOOMLISTBOX*/ ); + 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 bacf6acb81..669f8616af 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -124,8 +124,7 @@ void MediaFloater::ToggleFloatingMode() Window* pWindow = mpMediaWindow->getWindow(); if( pWindow ) - // FIXME: HELPID - pWindow->SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ ); + pWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); mpMediaWindow->show(); } diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 5d77100cfe..24d17abe4d 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -179,8 +179,7 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo mpEmptyBmpEx( NULL ), mpAudioBmpEx( NULL ) { - // FIXME: HELPID - maChildWindow.SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ ); + 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 c3898df023..2a0cef61b8 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -183,14 +183,10 @@ ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl( ExtMgrDialog* pParent, TheExtensionMan m_pEnableBtn = new PushButton( this, WB_TABSTOP ); m_pRemoveBtn = new PushButton( this, WB_TABSTOP ); - // 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*/ ); + 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 ); m_pOptionsBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, HandleOptionsBtn ) ); m_pEnableBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, HandleEnableBtn ) ); @@ -298,14 +294,12 @@ 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 ) ); - // FIXME: HELPID - m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_DISABLE*/ ); + m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); } else { m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); - // FIXME: HELPID - m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_ENABLE*/ ); + 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 0043ef8d90..e974d7ab21 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -186,8 +186,7 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan m_pScrollBar( NULL ), m_pManager( pManager ) { - // FIXME: HELPID - SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX*/ ); + 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 d5376954c7..d4eec29b49 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -221,8 +221,7 @@ LicenseDialogImpl::LicenseDialogImpl( FreeResource(); - // FIXME: HELPID - m_acceptButton.SetUniqueId(""/*UID_BTN_LICENSE_ACCEPT*/); + m_acceptButton.SetUniqueId(UID_BTN_LICENSE_ACCEPT); m_fiArrow1.Show(true); m_fiArrow2.Show(false); m_mlLicense.SetText(sLicenseText); diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 2435467f76..30439b5362 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -30,49 +30,40 @@ #include "svl/solar.hrc" -#define HID_GLOBAL_FALLBACK 0xFFFFFFFF +#define HID_PACKAGE_MANAGER "DESKTOP_HID_PACKAGE_MANAGER" +#define HID_PACKAGE_MANAGER_TREELISTBOX "DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX" +#define HID_PACKAGE_MANAGER_PROGRESS "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS" +#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL" +#define HID_PACKAGE_MANAGER_MENU_ITEM "DESKTOP_HID_PACKAGE_MANAGER_MENU_ITEM" -#define HID_PACKAGE_MANAGER (HID_DESKTOP_START + 0) -#define HID_PACKAGE_MANAGER_TREELISTBOX (HID_DESKTOP_START + 1) -#define HID_PACKAGE_MANAGER_PROGRESS (HID_DESKTOP_START + 2) -#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL (HID_DESKTOP_START + 3) -#define HID_PACKAGE_MANAGER_MENU_ITEM (HID_DESKTOP_START + 4) +#define HID_FIRSTSTART_DIALOG "DESKTOP_HID_FIRSTSTART_DIALOG" +#define HID_FIRSTSTART_WELCOME "DESKTOP_HID_FIRSTSTART_WELCOME" +#define HID_FIRSTSTART_LICENSE "DESKTOP_HID_FIRSTSTART_LICENSE" +#define HID_FIRSTSTART_MIGRATION "DESKTOP_HID_FIRSTSTART_MIGRATION" +#define HID_FIRSTSTART_REGISTRATION "DESKTOP_HID_FIRSTSTART_REGISTRATION" +#define HID_FIRSTSTART_USER "DESKTOP_HID_FIRSTSTART_USER" +#define HID_FIRSTSTART_PREV "DESKTOP_HID_FIRSTSTART_PREV" +#define HID_FIRSTSTART_NEXT "DESKTOP_HID_FIRSTSTART_NEXT" +#define HID_FIRSTSTART_CANCEL "DESKTOP_HID_FIRSTSTART_CANCEL" +#define HID_FIRSTSTART_FINISH "DESKTOP_HID_FIRSTSTART_FINISH" +#define UID_FIRSTSTART_HELP "DESKTOP_UID_FIRSTSTART_HELP" +#define UID_BTN_LICENSE_ACCEPT "DESKTOP_UID_BTN_LICENSE_ACCEPT" +#define HID_FIRSTSTART_UPDATE_CHECK "DESKTOP_HID_FIRSTSTART_UPDATE_CHECK" +#define HID_DEPLOYMENT_GUI_UPDATE "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE" +#define HID_DEPLOYMENT_GUI_UPDATEINSTALL "DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL" +#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER" +#define HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES" +#define HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES" -#define HID_FIRSTSTART_DIALOG (HID_DESKTOP_START + 5) -#define HID_FIRSTSTART_WELCOME (HID_DESKTOP_START + 6) -#define HID_FIRSTSTART_LICENSE (HID_DESKTOP_START + 7) -#define HID_FIRSTSTART_MIGRATION (HID_DESKTOP_START + 8) -#define HID_FIRSTSTART_REGISTRATION (HID_DESKTOP_START + 9) -#define HID_FIRSTSTART_USER (HID_DESKTOP_START + 10) -#define HID_FIRSTSTART_PREV (HID_DESKTOP_START + 11) -#define HID_FIRSTSTART_NEXT (HID_DESKTOP_START + 12) -#define HID_FIRSTSTART_CANCEL (HID_DESKTOP_START + 13) -#define HID_FIRSTSTART_FINISH (HID_DESKTOP_START + 14) -#define UID_FIRSTSTART_HELP (HID_DESKTOP_START + 15) -#define UID_BTN_LICENSE_ACCEPT (HID_DESKTOP_START + 16) -#define HID_FIRSTSTART_UPDATE_CHECK (HID_DESKTOP_START + 17) -#define HID_DEPLOYMENT_GUI_UPDATE (HID_DESKTOP_START + 18) -#define HID_DEPLOYMENT_GUI_UPDATEINSTALL (HID_DESKTOP_START + 19) -#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER (HID_DESKTOP_START + 20) -#define HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES (HID_DESKTOP_START + 21) -#define HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES (HID_DESKTOP_START + 22) +#define HID_EXTENSION_MANAGER_LISTBOX "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX" +#define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS" +#define HID_EXTENSION_MANAGER_LISTBOX_ENABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE" +#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE" +#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE" -#define HID_EXTENSION_MANAGER_LISTBOX (HID_DESKTOP_START + 23) -#define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS (HID_DESKTOP_START + 24) -#define HID_EXTENSION_MANAGER_LISTBOX_ENABLE (HID_DESKTOP_START + 25) -#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE (HID_DESKTOP_START + 26) -#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE (HID_DESKTOP_START + 27) +#define HID_EXTENSION_DEPENDENCIES "DESKTOP_HID_EXTENSION_DEPENDENCIES" -#define HID_EXTENSION_DEPENDENCIES (HID_DESKTOP_START + 28) - -#define HID_PACKAGE_MANAGER_UPD_REQ (HID_DESKTOP_START + 29) - -#define ACT_DESKTOP_HID_END HID_PACKAGE_MANAGER_UPD_REQ - -// check bounds: -#if ACT_DESKTOP_HID_END > HID_DESKTOP_END -#error Resource overflow in #line, #file -#endif +#define HID_PACKAGE_MANAGER_UPD_REQ "DESKTOP_HID_PACKAGE_MANAGER_UPD_REQ" #endif diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx index 55e8142e85..64b135d87f 100644 --- a/desktop/source/migration/wizard.cxx +++ b/desktop/source/migration/wizard.cxx @@ -191,14 +191,10 @@ FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAccep SetPageSizePixel(LogicToPixel(aTPSize, MAP_APPFONT)); //set help id - // 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_pPrevPage->SetHelpId(HID_FIRSTSTART_PREV); + m_pNextPage->SetHelpId(HID_FIRSTSTART_NEXT); + m_pCancel->SetHelpId(HID_FIRSTSTART_CANCEL); + m_pFinish->SetHelpId(HID_FIRSTSTART_FINISH); // m_pHelp->SetUniqueId(UID_FIRSTSTART_HELP); m_pHelp->Hide(); m_pHelp->Disable(); diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc index 32c109aad2..2bce731ad2 100644 --- a/editeng/inc/helpid.hrc +++ b/editeng/inc/helpid.hrc @@ -35,47 +35,31 @@ #include // Help-Ids -------------------------------------------------------------- -#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_EDIT_START) -#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_EDIT_START + 1) -#define HID_EDITENG_SPELLER_ADDWORD (HID_EDIT_START + 2) -#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_EDIT_START + 3) -#define HID_EDITENG_SPELLER_IGNORE (HID_EDIT_START + 4) -#define HID_EDITENG_SPELLER_START (HID_EDIT_START + 5) -#define HID_AUTOCORR_HELP_END (HID_EDIT_START + 6) -#define HID_AUTOCORR_HELP_START (HID_EDIT_START + 7) -#define HID_AUTOCORR_HELP_WORD HID_AUTOCORR_HELP_START +#define HID_EDITENG_SPELLER_WORDLANGUAGE "EDITENG_HID_EDITENG_SPELLER_WORDLANGUAGE" +#define HID_EDITENG_SPELLER_PARALANGUAGE "EDITENG_HID_EDITENG_SPELLER_PARALANGUAGE" +#define HID_EDITENG_SPELLER_ADDWORD "EDITENG_HID_EDITENG_SPELLER_ADDWORD" +#define HID_EDITENG_SPELLER_AUTOCORRECT "EDITENG_HID_EDITENG_SPELLER_AUTOCORRECT" +#define HID_EDITENG_SPELLER_IGNORE "EDITENG_HID_EDITENG_SPELLER_IGNORE" +#define HID_EDITENG_SPELLER_START "EDITENG_HID_EDITENG_SPELLER_START" -#define HID_AUTOCORR_HELP_SENT (HID_AUTOCORR_HELP_START+1) -#define HID_AUTOCORR_HELP_SENTWORD (HID_AUTOCORR_HELP_START+2) -#define HID_AUTOCORR_HELP_ACORWORD (HID_AUTOCORR_HELP_START+3) - -#define HID_AUTOCORR_HELP_ACORSENTWORD (HID_AUTOCORR_HELP_START+5) - -#define HID_AUTOCORR_HELP_CHGTOENEMDASH (HID_AUTOCORR_HELP_START+7) -#define HID_AUTOCORR_HELP_WORDENEMDASH (HID_AUTOCORR_HELP_START+8) -#define HID_AUTOCORR_HELP_SENTENEMDASH (HID_AUTOCORR_HELP_START+9) -#define HID_AUTOCORR_HELP_SENTWORDENEMDASH (HID_AUTOCORR_HELP_START+10) -#define HID_AUTOCORR_HELP_ACORWORDENEMDASH (HID_AUTOCORR_HELP_START+11) - -#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH (HID_AUTOCORR_HELP_START+13) -#define HID_AUTOCORR_HELP_CHGQUOTES (HID_AUTOCORR_HELP_START+15) -#define HID_AUTOCORR_HELP_CHGSGLQUOTES (HID_AUTOCORR_HELP_START+16) -#define HID_AUTOCORR_HELP_SETINETATTR (HID_AUTOCORR_HELP_START+17) -#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE (HID_AUTOCORR_HELP_START+18) -#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL (HID_AUTOCORR_HELP_START+19) -#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL (HID_AUTOCORR_HELP_START+20) -#define HID_AUTOCORR_HELP_CHGORDINALNUMBER (HID_AUTOCORR_HELP_START+21) // HID_EDIT_START + 28 - -// please adjust ACT_SVX_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_SVX_HID_END (HID_EDIT_START+28) -#if ACT_SVX_HID_END > HID_EDIT_END -#error Resource-Ueberlauf in #line, #file -#endif +#define HID_AUTOCORR_HELP_WORD "EDITENG_HID_AUTOCORR_HELP_START" +#define HID_AUTOCORR_HELP_SENT "EDITENG_HID_AUTOCORR_HELP_SENT" +#define HID_AUTOCORR_HELP_SENTWORD "EDITENG_HID_AUTOCORR_HELP_SENTWORD" +#define HID_AUTOCORR_HELP_ACORWORD "EDITENG_HID_AUTOCORR_HELP_ACORWORD" +#define HID_AUTOCORR_HELP_ACORSENTWORD "EDITENG_HID_AUTOCORR_HELP_ACORSENTWORD" +#define HID_AUTOCORR_HELP_CHGTOENEMDASH "EDITENG_HID_AUTOCORR_HELP_CHGTOENEMDASH" +#define HID_AUTOCORR_HELP_WORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_WORDENEMDASH" +#define HID_AUTOCORR_HELP_SENTENEMDASH "EDITENG_HID_AUTOCORR_HELP_SENTENEMDASH" +#define HID_AUTOCORR_HELP_SENTWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_SENTWORDENEMDASH" +#define HID_AUTOCORR_HELP_ACORWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_ACORWORDENEMDASH" +#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH" +#define HID_AUTOCORR_HELP_CHGQUOTES "EDITENG_HID_AUTOCORR_HELP_CHGQUOTES" +#define HID_AUTOCORR_HELP_CHGSGLQUOTES "EDITENG_HID_AUTOCORR_HELP_CHGSGLQUOTES" +#define HID_AUTOCORR_HELP_SETINETATTR "EDITENG_HID_AUTOCORR_HELP_SETINETATTR" +#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE "EDITENG_HID_AUTOCORR_HELP_INGNOREDOUBLESPACE" +#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL "EDITENG_HID_AUTOCORR_HELP_CHGWEIGHTUNDERL" +#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL "EDITENG_HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL" +#define HID_AUTOCORR_HELP_CHGORDINALNUMBER "EDITENG_HID_AUTOCORR_HELP_CHGORDINALNUMBER" #endif diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index e2d90deb07..d9f60c5f64 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1083,11 +1083,9 @@ 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 ); - // FIXME: HELPID - aPopupMenu.SetHelpId( MN_WORDLANGUAGE, ""/*HID_EDITENG_SPELLER_WORDLANGUAGE*/ ); + aPopupMenu.SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE ); aPopupMenu.InsertItem( MN_PARALANGUAGE, aParaStr ); - // FIXME: HELPID - aPopupMenu.SetHelpId( MN_PARALANGUAGE, ""/*HID_EDITENG_SPELLER_PARALANGUAGE*/ ); + 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 fda7fe4da4..eaadcb202d 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1389,6 +1389,32 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, if( nRet ) { + const char* aHelpIds[] = + { + HID_AUTOCORR_HELP_WORD, + HID_AUTOCORR_HELP_SENT, + HID_AUTOCORR_HELP_SENTWORD, + HID_AUTOCORR_HELP_ACORWORD, + "", + HID_AUTOCORR_HELP_ACORSENTWORD, + "", + HID_AUTOCORR_HELP_CHGTOENEMDASH, + HID_AUTOCORR_HELP_WORDENEMDASH, + HID_AUTOCORR_HELP_SENTENEMDASH, + HID_AUTOCORR_HELP_SENTWORDENEMDASH, + HID_AUTOCORR_HELP_ACORWORDENEMDASH, + "", + HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH, + "", + HID_AUTOCORR_HELP_CHGQUOTES, + HID_AUTOCORR_HELP_CHGSGLQUOTES, + HID_AUTOCORR_HELP_SETINETATTR, + HID_AUTOCORR_HELP_INGNOREDOUBLESPACE, + HID_AUTOCORR_HELP_CHGWEIGHTUNDERL, + HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL, + HID_AUTOCORR_HELP_CHGORDINALNUMBER + }; + ULONG nHelpId = 0; if( nRet & ( Autocorrect|CptlSttSntnc|CptlSttWrd|ChgToEnEmDash ) ) { @@ -1415,9 +1441,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, if( nHelpId ) { - nHelpId += HID_AUTOCORR_HELP_START - 1; - // FIXME: HELPID - Application::GetHelp()->OpenHelpAgent( String()/*nHelpId*/ ); + nHelpId -= 1; + Application::GetHelp()->OpenHelpAgent( aHelpIds[nHelpId] ); } } diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx index c0579f1ac7..9ecdff4263 100644 --- a/formula/inc/formula/IFunctionDescription.hxx +++ b/formula/inc/formula/IFunctionDescription.hxx @@ -92,7 +92,7 @@ namespace formula virtual void fillVisibleArgumentMapping(::std::vector& _rArguments) const = 0; virtual void initArgumentInfo() const = 0; virtual ::rtl::OUString getSignature() const = 0; - virtual long getHelpId() const = 0; + virtual rtl::OString getHelpId() const = 0; // parameter virtual sal_uInt32 getParameterCount() const = 0; diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx index 095bc60df7..e9d9f06b37 100644 --- a/formula/inc/formula/formdata.hxx +++ b/formula/inc/formula/formdata.hxx @@ -81,7 +81,6 @@ private: USHORT nEdFocus; String aUndoStr; BOOL bMatrix; - // FIXME: HELPID rtl::OString aUniqueId; Selection aSelection; }; diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx index 5986e64f13..2f59807a34 100644 --- a/formula/inc/formula/formula.hxx +++ b/formula/inc/formula/formula.hxx @@ -80,9 +80,7 @@ protected: ::std::pair RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( BOOL bForced = FALSE ); - // FIXME: HELPID rtl::OString FindFocusWin(Window *pWin); - // FIXME: HELPID void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId); void HighlightFunctionParas(const String& aFormula); @@ -131,14 +129,12 @@ protected: ::std::pair RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( BOOL bForced = FALSE ); - // 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/inc/helpids.hrc b/formula/inc/helpids.hrc index dfd7403f8d..dcb1f7d1be 100644 --- a/formula/inc/helpids.hrc +++ b/formula/inc/helpids.hrc @@ -31,32 +31,26 @@ #include // HID_FORMULA_START #endif -#define HID_FORMULADLG_FORMULA (HID_FORMULA_START + 0) -#define HID_FORMULA_FAP_FORMULA (HID_FORMULA_START + 1) -#define HID_FORMULA_FAP_STRUCT (HID_FORMULA_START + 2) -#define HID_FORMULA_FAP_PAGE (HID_FORMULA_START + 3) -#define HID_FORMULA_FAP_EDIT1 (HID_FORMULA_START + 4) -#define HID_FORMULA_FAP_EDIT2 (HID_FORMULA_START + 5) -#define HID_FORMULA_FAP_EDIT3 (HID_FORMULA_START + 6) -#define HID_FORMULA_FAP_EDIT4 (HID_FORMULA_START + 7) -#define HID_FORMULA_FAP_BTN_FX1 (HID_FORMULA_START + 8) -#define HID_FORMULA_FAP_BTN_FX2 (HID_FORMULA_START + 9) -#define HID_FORMULA_FAP_BTN_FX3 (HID_FORMULA_START +10) -#define HID_FORMULA_FAP_BTN_FX4 (HID_FORMULA_START +11) -#define HID_FORMULA_FAP_BTN_REF1 (HID_FORMULA_START +12) -#define HID_FORMULA_FAP_BTN_REF2 (HID_FORMULA_START +13) -#define HID_FORMULA_FAP_BTN_REF3 (HID_FORMULA_START +14) -#define HID_FORMULA_FAP_BTN_REF4 (HID_FORMULA_START +15) -#define HID_FORMULA_LB_CATEGORY (HID_FORMULA_START +16) -#define HID_FORMULA_LB_FUNCTION (HID_FORMULA_START +17) -#define HID_FORMULATAB_FUNCTION (HID_FORMULA_START +18) -#define HID_FORMULATAB_STRUCT (HID_FORMULA_START +19) - - -#if HID_FORMULATAB_STRUCT > HID_FORMULA_END -#error Help-Id Ueberlauf in #file, #line -#endif -// don't forget to update the file util/hidother.src +#define HID_FORMULADLG_FORMULA "FORMULA_HID_FORMULADLG_FORMULA" +#define HID_FORMULA_FAP_FORMULA "FORMULA_HID_FORMULA_FAP_FORMULA" +#define HID_FORMULA_FAP_STRUCT "FORMULA_HID_FORMULA_FAP_STRUCT" +#define HID_FORMULA_FAP_PAGE "FORMULA_HID_FORMULA_FAP_PAGE" +#define HID_FORMULA_FAP_EDIT1 "FORMULA_HID_FORMULA_FAP_EDIT1" +#define HID_FORMULA_FAP_EDIT2 "FORMULA_HID_FORMULA_FAP_EDIT2" +#define HID_FORMULA_FAP_EDIT3 "FORMULA_HID_FORMULA_FAP_EDIT3" +#define HID_FORMULA_FAP_EDIT4 "FORMULA_HID_FORMULA_FAP_EDIT4" +#define HID_FORMULA_FAP_BTN_FX1 "FORMULA_HID_FORMULA_FAP_BTN_FX1" +#define HID_FORMULA_FAP_BTN_FX2 "FORMULA_HID_FORMULA_FAP_BTN_FX2" +#define HID_FORMULA_FAP_BTN_FX3 "FORMULA_HID_FORMULA_FAP_BTN_FX3" +#define HID_FORMULA_FAP_BTN_FX4 "FORMULA_HID_FORMULA_FAP_BTN_FX4" +#define HID_FORMULA_FAP_BTN_REF1 "FORMULA_HID_FORMULA_FAP_BTN_REF1" +#define HID_FORMULA_FAP_BTN_REF2 "FORMULA_HID_FORMULA_FAP_BTN_REF2" +#define HID_FORMULA_FAP_BTN_REF3 "FORMULA_HID_FORMULA_FAP_BTN_REF3" +#define HID_FORMULA_FAP_BTN_REF4 "FORMULA_HID_FORMULA_FAP_BTN_REF4" +#define HID_FORMULA_LB_CATEGORY "FORMULA_HID_FORMULA_LB_CATEGORY" +#define HID_FORMULA_LB_FUNCTION "FORMULA_HID_FORMULA_LB_FUNCTION" +#define HID_FORMULATAB_FUNCTION "FORMULA_HID_FORMULATAB_FUNCTION" +#define HID_FORMULATAB_STRUCT "FORMULA_HID_FORMULATAB_STRUCT" #endif //FORMULA_HELPID_HRC diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 89d3508bc1..5f5f2b8623 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -50,7 +50,7 @@ namespace formula virtual void fillVisibleArgumentMapping(::std::vector& ) const {} virtual void initArgumentInfo() const {} virtual ::rtl::OUString getSignature() const { return ::rtl::OUString(); } - virtual long getHelpId() const { return 0; } + virtual rtl::OString getHelpId() const { return ""; } virtual sal_uInt32 getParameterCount() const { return 0; } virtual ::rtl::OUString getParameterName(sal_uInt32 ) const { return ::rtl::OUString(); } virtual ::rtl::OUString getParameterDescription(sal_uInt32 ) const { return ::rtl::OUString(); } diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index e4c43b1f74..eaca92a81d 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -226,14 +226,10 @@ namespace formula FormulaHelper m_aFormulaHelper; - // FIXME: HELPID rtl::OString m_aEditHelpId; - // FIXME: HELPID rtl::OString aOldHelp; - // FIXME: HELPID rtl::OString aOldUnique; - // FIXME: HELPID rtl::OString aActivWinId; BOOL bIsShutDown; @@ -334,9 +330,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage); aTabCtrl.SetTabPage( TP_STRUCT, pStructPage); - // FIXME: HELPID aOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1" - // FIXME: HELPID aOldUnique = pParent->GetUniqueId(); aFtResult.Show( _bSupportResult ); @@ -414,7 +408,6 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) if(pWin!=NULL) { aActivWinId = pWin->GetUniqueId(); - // FIXME: HELPID if(aActivWinId.getLength()==0) { Window* pParent=pWin->GetParent(); @@ -422,14 +415,12 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) { aActivWinId=pParent->GetUniqueId(); - // FIXME: HELPID if(aActivWinId.getLength()!=0) break; pParent=pParent->GetParent(); } } - // FIXME: HELPID - if(aActivWinId!=0) + if(aActivWinId.getLength()) { FormEditData* pData = m_pHelper->getFormEditData(); @@ -833,9 +824,7 @@ void FormulaDlg_Impl::FillListboxes() aNewTitle = aTitle1; // HelpId fuer 1. Seite ist die aus der Resource - // FIXME: HELPID m_pParent->SetHelpId( aOldHelp ); - // FIXME: HELPID m_pParent->SetUniqueId( aOldUnique ); } // ----------------------------------------------------------------------------- @@ -872,12 +861,9 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) aFtEditName.SetText( pFuncDesc->getFunctionName() ); aFtEditName.Show(); pParaWin->Show(); - // FIXME: HELPID - #if 0 - const long nHelpId = pFuncDesc->getHelpId(); - if ( nHelpId ) - pMEdit->SetSmartHelpId(SmartId(nHelpId)); - #endif + const rtl::OString aHelpId = pFuncDesc->getHelpId(); + if ( aHelpId.getLength() ) + pMEdit->SetHelpId(aHelpId); } xub_StrLen nOldStart, nOldEnd; @@ -933,7 +919,6 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) else { aFtEditName.SetText(String()); - // FIXME: HELPID pMEdit->SetHelpId( m_aEditHelpId ); } // Test, ob vorne/hinten noch mehr Funktionen sind @@ -1809,7 +1794,6 @@ rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin) rtl::OString aUniqueId; if(pWin->HasFocus()) { - // FIXME: HELPID aUniqueId=pWin->GetUniqueId(); if(aUniqueId.getLength()==0) { @@ -1942,13 +1926,11 @@ void FormulaModalDialog::RefInputDoneAfter( BOOL bForced ) rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin) { - // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { - // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2024,13 +2006,10 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, ,_pHelper,_pFunctionMgr,_pDlg)) { FreeResource(); - // FIXME: HELPID - #if 0 - if(GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId + if(!GetHelpId().getLength()) //Hack, da im SfxModelessDialog die HelpId SetHelpId(GetUniqueId()); //fuer einen ModelessDialog entfernt und //in eine UniqueId gewandelt wird, machen //wir das an dieser Stelle rueckgaengig. - #endif SetText(m_pImpl->aTitle1); } @@ -2102,13 +2081,11 @@ void FormulaDlg::RefInputDoneAfter( BOOL bForced ) rtl::OString FormulaDlg::FindFocusWin(Window *pWin) { - // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { - // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2178,7 +2155,6 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG ) if (pData) // wird nicht ueber Close zerstoert; { m_pImpl->m_pHelper->setReferenceInput(pData); - // FIXME: HELPID rtl::OString nUniqueId(pData->GetUniqueId()); SetFocusWin(this,nUniqueId); } diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 1f743be785..cd06ea99ce 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -190,18 +190,14 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb ) const IFunctionDescription* pDesc = GetFuncDesc( GetFunction() ); if ( pDesc ) { - // FIXME: HELPID - #if 0 - const long nHelpId = pDesc->getHelpId(); - if ( nHelpId ) - aLbFunction.SetSmartHelpId(SmartId(nHelpId)); - #endif + const rtl::OString sHelpId = pDesc->getHelpId(); + if ( sHelpId.getLength() ) + aLbFunction.SetHelpId(sHelpId); } aSelectionLink.Call(this); } else { - // FIXME: HELPID aLbFunction.SetHelpId(m_aHelpId); UpdateFunctionList(); } diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index d468832092..51e3609351 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -82,7 +82,6 @@ private: m_pFunctionManager; ::std::vector< TFunctionDesc > aLRUList; - // FIXME: HELPID rtl::OString m_aHelpId; diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 237e593204..d41a051e47 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -758,9 +758,7 @@ EditBox::EditBox( Window* pParent, const ResId& rResId ) // #105582# the HelpId from the resource must be set for the MultiLineEdit, // not for the control that contains it. - // FIXME: HELPID pMEdit->SetHelpId( GetHelpId() ); - // FIXME: HELPID SetHelpId( "" ); } diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index ac3552dfa3..adb3681345 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -297,25 +297,19 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc) nArgs = pFuncDesc->getSuppressedArgumentCount(); pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping); aSlider.Hide(); - // FIXME: HELPID - #if 0 - long nHelpId = pFuncDesc->getHelpId(); - SetHelpId( nHelpId ); - aEdArg1.SetHelpId( nHelpId ); - aEdArg2.SetHelpId( nHelpId ); - aEdArg3.SetHelpId( nHelpId ); - aEdArg4.SetHelpId( nHelpId ); - #endif + rtl::OString sHelpId = pFuncDesc->getHelpId(); + SetHelpId( sHelpId ); + aEdArg1.SetHelpId( sHelpId ); + aEdArg2.SetHelpId( sHelpId ); + aEdArg3.SetHelpId( sHelpId ); + aEdArg4.SetHelpId( sHelpId ); // Unique-IDs muessen gleich bleiben fuer Automatisierung - // FIXME: HELPID - #if 0 - SetUniqueId( ""/*HID_FORMULA_FAP_PAGE*/ ); + SetUniqueId( HID_FORMULA_FAP_PAGE ); aEdArg1.SetUniqueId( HID_FORMULA_FAP_EDIT1 ); aEdArg2.SetUniqueId( HID_FORMULA_FAP_EDIT2 ); aEdArg3.SetUniqueId( HID_FORMULA_FAP_EDIT3 ); aEdArg4.SetUniqueId( HID_FORMULA_FAP_EDIT4 ); - #endif SetActiveLine(0); } else diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 0e32b00724..5d218c992a 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -205,32 +205,26 @@ namespace svt { String sHelpURL( _rURL ); if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) ) - { - // FIXME: HELPID - rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); - if ( _bFileView ) - // the file view "overloaded" the SetHelpId - static_cast< SvtFileView* >( _pControl )->SetHelpId( sID ); - else - _pControl->SetHelpId( sID ); - } + sHelpURL = sHelpURL.Copy( sizeof( "HID:" ) - 1 ); + + // URLs should always be UTF8 encoded and escaped + rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); + if ( _bFileView ) + // the file view "overloaded" the SetHelpId + static_cast< SvtFileView* >( _pControl )->SetHelpId( sID ); else - { - DBG_ERRORFILE( "OControlAccess::setHelpURL: unsupported help URL type!" ); - } + _pControl->SetHelpId( sID ); } //--------------------------------------------------------------------- ::rtl::OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView ) { - // FIXME: HELPID rtl::OString aHelpId = _pControl->GetHelpId(); if ( _bFileView ) // the file view "overloaded" the SetHelpId aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( ); 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 526dd255c8..429676d8b7 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -600,8 +600,7 @@ void SvtFileDialog::Init_Impl bool bSaveMode = ( FILEDLG_MODE_SAVE == _pImp->_eMode ); pURLBox->SetNoURLSelection( bSaveMode ); - // FIXME: HELPID - _pImp->_pEdFileName->SetHelpId( ""/*HID_FILEDLG_AUTOCOMPLETEBOX*/ ); + _pImp->_pEdFileName->SetHelpId( HID_FILEDLG_AUTOCOMPLETEBOX ); _pImp->_pFtFileType = new FixedText( this, SvtResId( FT_EXPLORERFILE_FILETYPE ) ); _pImp->CreateFilterListControl( this, SvtResId( LB_EXPLORERFILE_FILETYPE ) ); @@ -650,8 +649,7 @@ void SvtFileDialog::Init_Impl _pFileView->SetUrlFilter( &m_aURLFilter ); _pFileView->EnableAutoResize(); - // FIXME: HELPID - _pFileView->SetHelpId( ""/*HID_FILEDLG_STANDARD*/ ); + _pFileView->SetHelpId( HID_FILEDLG_STANDARD ); _pFileView->SetStyle( _pFileView->GetStyle() | WB_TABSTOP ); // Positionen und Groessen der Knoepfe bestimmen. @@ -703,8 +701,7 @@ void SvtFileDialog::Init_Impl if ( nStyle & SFXWB_READONLY ) { _pCbReadOnly = new CheckBox( this, SvtResId( CB_EXPLORERFILE_READONLY ) ); - // FIXME: HELPID - _pCbReadOnly->SetHelpId( ""/*HID_FILEOPEN_READONLY*/ ); + _pCbReadOnly->SetHelpId( HID_FILEOPEN_READONLY ); _pCbReadOnly->SetText( SvtResId( STR_SVT_FILEPICKER_READONLY ) ); AddControl( _pCbReadOnly ); ReleaseOwnerShip( _pCbReadOnly ); @@ -813,23 +810,15 @@ void SvtFileDialog::Init_Impl { // different help ids if in save-as mode // 90744 - 09.08.2001 - frank.schoenheit@sun.com - // 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*/ ); + 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 ); // formerly, there was only _pLbFileVersion, which was used for 3 different // use cases. For reasons of maintainability, I introduced extra members (_pLbTemplates, _pLbImageTemplates) @@ -838,23 +827,16 @@ 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 ) - // FIXME: HELPID - _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); + _pImp->_pLbFileVersion->SetHelpId( HID_FILESAVE_TEMPLATE ); if ( _pImp->_pLbTemplates ) - // FIXME: HELPID - _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); + _pImp->_pLbTemplates->SetHelpId( HID_FILESAVE_TEMPLATE ); if ( _pImp->_pLbImageTemplates ) - // FIXME: HELPID - _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); + _pImp->_pLbImageTemplates->SetHelpId( HID_FILESAVE_TEMPLATE ); - // 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*/ ); + 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 ); } // correct the z-order of the controls @@ -2999,8 +2981,7 @@ void SvtFileDialog::AddControls_Impl( ) { _pCbLinkBox = new CheckBox( this ); _pCbLinkBox ->SetText( SvtResId( STR_SVT_FILEPICKER_INSERT_AS_LINK ) ); - // FIXME: HELPID - _pCbLinkBox ->SetHelpId( ""/*HID_FILEDLG_LINK_CB*/ ); + _pCbLinkBox ->SetHelpId( HID_FILEDLG_LINK_CB ); AddControl( _pCbLinkBox ); ReleaseOwnerShip( _pCbLinkBox ); _pCbLinkBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) ); @@ -3017,8 +2998,7 @@ void SvtFileDialog::AddControls_Impl( ) // "Vorschau" _pCbPreviewBox = new CheckBox( this ); _pCbPreviewBox->SetText( SvtResId( STR_SVT_FILEPICKER_SHOW_PREVIEW ) ); - // FIXME: HELPID - _pCbPreviewBox->SetHelpId( ""/*HID_FILEDLG_PREVIEW_CB*/ ); + _pCbPreviewBox->SetHelpId( HID_FILEDLG_PREVIEW_CB ); AddControl( _pCbPreviewBox ); ReleaseOwnerShip( _pCbPreviewBox ); _pCbPreviewBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) ); @@ -3066,8 +3046,7 @@ void SvtFileDialog::AddControls_Impl( ) { _pPbPlay = new PushButton( this ); _pPbPlay->SetText( SvtResId( STR_SVT_FILEPICKER_PLAY ) ); - // FIXME: HELPID - _pPbPlay->SetHelpId( ""/*HID_FILESAVE_DOPLAY*/ ); + _pPbPlay->SetHelpId( HID_FILESAVE_DOPLAY ); AddControl( _pPbPlay ); ReleaseOwnerShip( _pPbPlay ); _pPbPlay->SetClickHdl( LINK( this, SvtFileDialog, PlayButtonHdl_Impl ) ); @@ -3079,8 +3058,7 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtFileVersion->SetText( SvtResId( STR_SVT_FILEPICKER_VERSION ) ); _pImp->_pLbFileVersion = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - // FIXME: HELPID - _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ ); + _pImp->_pLbFileVersion->SetHelpId( HID_FILEOPEN_VERSION ); } else if ( _nExtraBits & SFX_EXTRA_TEMPLATES ) { @@ -3088,8 +3066,7 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_TEMPLATES ) ); _pImp->_pLbTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - // FIXME: HELPID - _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ ); + _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. @@ -3101,8 +3078,7 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtImageTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_IMAGE_TEMPLATE ) ); _pImp->_pLbImageTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - // FIXME: HELPID - _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILEOPEN_IMAGE_TEMPLATE*/ ); + _pImp->_pLbImageTemplates->SetHelpId( HID_FILEOPEN_IMAGE_TEMPLATE ); } } diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc index 365c1ec7bb..03d6fdb623 100644 --- a/fpicker/source/office/iodlg.hrc +++ b/fpicker/source/office/iodlg.hrc @@ -86,22 +86,22 @@ #define SID_SFX_START 5000 #define SID_OPENURL (SID_SFX_START + 596) -#define HID_FILEDLG_STANDARD (HID_SFX_START + 27) -#define HID_FILEDLG_MANAGER (HID_SFX_START + 28) -#define HID_FILEDLG_URL (HID_SFX_START + 29) -#define HID_FILEDLG_USE_PASSWD (HID_SFX_START + 31) -#define HID_FILEDLG_READ_ONLY (HID_SFX_START + 32) - -#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218) -#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219) -#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220) -#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221) -#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222) -#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223) -#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224) -#define HID_FILEDLG_FOLDER_BTN (HID_SFX_START + 225) -#define HID_FILEDLG_FOLDER_FILENAME (HID_SFX_START + 226) -#define HID_FILEDLG_SRCHFOLDER_BTN (HID_SFX_START + 227) +#define HID_FILEDLG_STANDARD "FPICKER_HID_FILEDLG_STANDARD" +#define HID_FILEDLG_MANAGER "FPICKER_HID_FILEDLG_MANAGER" +#define HID_FILEDLG_URL "FPICKER_HID_FILEDLG_URL" +#define HID_FILEDLG_USE_PASSWD "FPICKER_HID_FILEDLG_USE_PASSWD" +#define HID_FILEDLG_READ_ONLY "FPICKER_HID_FILEDLG_READ_ONLY" + +#define HID_FILEDLG_AUTOCOMPLETEBOX "FPICKER_HID_FILEDLG_AUTOCOMPLETEBOX" +#define HID_FILEDLG_SAVE_BTN "FPICKER_HID_FILEDLG_SAVE_BTN" +#define HID_FILEDLG_SAVE_FILENAME "FPICKER_HID_FILEDLG_SAVE_FILENAME" +#define HID_FILEDLG_SAVE_FILETYPE "FPICKER_HID_FILEDLG_SAVE_FILETYPE" +#define HID_FILEDLG_INSERT_BTN "FPICKER_HID_FILEDLG_INSERT_BTN" +#define HID_FILEDLG_PATH_BTN "FPICKER_HID_FILEDLG_PATH_BTN" +#define HID_FILEDLG_PATH_FILENAME "FPICKER_HID_FILEDLG_PATH_FILENAME" +#define HID_FILEDLG_FOLDER_BTN "FPICKER_HID_FILEDLG_FOLDER_BTN" +#define HID_FILEDLG_FOLDER_FILENAME "FPICKER_HID_FILEDLG_FOLDER_FILENAME" +#define HID_FILEDLG_SRCHFOLDER_BTN "FPICKER_HID_FILEDLG_SRCHFOLDER_BTN" #endif diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc index 4fd3bdfbfd..42476b240a 100644 --- a/framework/inc/helpid.hrc +++ b/framework/inc/helpid.hrc @@ -33,17 +33,11 @@ // Help-Ids ----------------------------------------------------------------- -#define HID_BACKINGWINDOW (HID_FRAMEWORK_START + 0) -#define HID_LICENSEDIALOG (HID_FRAMEWORK_START + 1) -#define HID_STATUSBAR (HID_FRAMEWORK_START + 2) - -#define ACT_FRAMEWORK_HID_END HID_BACKINGWINDOW - -// "Uberlaufpr"ufung -------------------------------------------------------- - -#if ACT_FRAMEWORK_HID_END > HID_FRAMEWORK_END -#error Resource-Ueberlauf in #line, #file -#endif +#define HID_BACKINGWINDOW "FWK_HID_BACKINGWINDOW" +#define HID_LICENSEDIALOG "FWK_HID_LICENSEDIALOG" +#define HID_STATUSBAR "FWK_HID_STATUSBAR" +#define HID_SVX_COMMON_MACRO_ORGANIZER "FWK_HID_SVX_COMMON_MACRO_ORGANIZER" +#define HID_SVX_BASIC_MACRO_ORGANIZER "FWK_HID_SVX_BASIC_MACRO_ORGANIZER" #endif // #ifndef _FRAMEWORK_HELPID_HRC diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx index dc4f24891f..1ef7d43baf 100644 --- a/framework/inc/uielement/commandinfo.hxx +++ b/framework/inc/uielement/commandinfo.hxx @@ -47,11 +47,13 @@ namespace framework struct CommandInfo { CommandInfo() : nId( 0 ), + nWidth( 0 ), nImageInfo( 0 ), bMirrored( false ), bRotated( false ) {} USHORT nId; + sal_uInt32 nWidth; ::std::vector< USHORT > aIds; sal_Int16 nImageInfo; sal_Bool bMirrored : 1, diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index 2fe68b6d41..bf29b6475a 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -145,6 +145,7 @@ class ToolBarMerger const ::rtl::OUString& rControlType ); static void CreateToolbarItem( ToolBox* pToolbox, + CommandToInfoMap& rCommandMap, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rAddonToolbarItem ); diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 97c70eae07..c1a57d6ec3 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -102,7 +102,7 @@ namespace framework ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager ); rtl::OUString getUINameFromCommand( const rtl::OUString& rCommandURL ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const rtl::OUString& rCommandURL ); - void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId, const rtl::OUString& aLabel ); + void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OString& sHelpId, const rtl::OUString& aLabel ); sal_Bool isContextSensitiveToolbarNonVisible(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 4a542f5b26..f59ea721ec 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -528,8 +528,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f } // set help ID for our canvas - // FIXME: HELPID - pWindow->SetHelpId(""/*HID_BACKINGWINDOW*/); + pWindow->SetHelpId(HID_BACKINGWINDOW); // inform BackingWindow about frame BackingWindow* pBack = dynamic_cast(pWindow ); diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx deleted file mode 100644 index 0fb110c3a3..0000000000 --- a/framework/source/services/menudocumenthandler.cxx +++ /dev/null @@ -1,903 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_framework.hxx" - -#include -#include -#include -#include - -#ifndef __FRAMEWORK_SERVICES_ATTRIBUTELIST_HXX_ -#include -#endif - -#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ -#include -#endif - - -using namespace ::rtl; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::xml::sax; - -const int ITEMID_START_VALUE = 1000; - -#define XMLNS_MENU "http://openoffice.org/2001/menu" -#define XMLNS_PREFIX "menu:" - -#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" -#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu" -#define ELEMENT_MENUPOPUP "http://openoffice.org/2001/menu^menupopup" -#define ELEMENT_MENUITEM "http://openoffice.org/2001/menu^menuitem" -#define ELEMENT_MENUSEPARATOR "http://openoffice.org/2001/menu^menuseparator" - -#define ELEMENT_NS_MENUBAR "menu:menubar" -#define ELEMENT_NS_MENU "menu:menu" -#define ELEMENT_NS_MENUPOPUP "menu:menupopup" -#define ELEMENT_NS_MENUITEM "menu:menuitem" -#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator" - -#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id" -#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label" -#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid" -#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak" - -#define ATTRIBUTE_NS_ID "menu:id" -#define ATTRIBUTE_NS_LABEL "menu:label" -#define ATTRIBUTE_NS_HELPID "menu:helpid" -#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak" - -#define ATTRIBUTE_XMLNS_MENU "xmlns:menu" - -#define ATTRIBUTE_TYPE_CDATA "CDATA" - -#define MENUBAR_DOCTYPE "" - - -// special popup menus (filled during runtime) must be saved as a menuitem!!! -// same as in menumanager.cxx - you have to change both files!!! -#define SID_SFX_START 5000 -#define SID_NEWDOCDIRECT (SID_SFX_START + 537) -#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) -#define SID_FORMATMENU (SID_SFX_START + 780) - -const ::rtl::OUString aSlotProtocol( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); -const ::rtl::OUString aSlotNewDocDirect( RTL_CONSTASCII_USTRINGPARAM( "slot:5537" )); -const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" )); - -const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" )); -const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" )); - -const ULONG MENU_SAVE_LABEL = 0x00000001; - -namespace framework -{ - -// ----------------------------------------------------------------------------- -// Base class implementation - -ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() : - m_xLocator( 0 ), - m_xReader( 0 ) -{ -} - -ReadMenuDocumentHandlerBase::~ReadMenuDocumentHandlerBase() -{ -} - -Any SAL_CALL ReadMenuDocumentHandlerBase::queryInterface( - const Type & rType ) -throw( RuntimeException ) -{ - Any a = ::cppu::queryInterface( - rType , - SAL_STATIC_CAST( XDocumentHandler*, this )); - if ( a.hasValue() ) - return a; - - return OWeakObject::queryInterface( rType ); -} - -void SAL_CALL ReadMenuDocumentHandlerBase::ignorableWhitespace( - const OUString& aWhitespaces ) -throw( SAXException, RuntimeException ) -{ -} - -void SAL_CALL ReadMenuDocumentHandlerBase::processingInstruction( - const OUString& aTarget, const OUString& aData ) -throw( SAXException, RuntimeException ) -{ -} - -void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator( - const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) -{ - m_xLocator = xLocator; -} - -::rtl::OUString ReadMenuDocumentHandlerBase::getErrorLineString() -{ - char buffer[32]; - - if ( m_xLocator.is() ) - { - snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast( m_xLocator->getLineNumber() )); - return OUString::createFromAscii( buffer ); - } - else - return OUString(); -} - -// ----------------------------------------------------------------------------- - -// #110897# -OReadMenuDocumentHandler::OReadMenuDocumentHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - MenuBar* pMenuBar ) -: // #110897# - mxServiceFactory(xServiceFactory), - m_pMenuBar( pMenuBar ), - m_nElementDepth( 0 ), - m_bMenuBarMode( sal_False ), - m_nItemId( ITEMID_START_VALUE ) -{ -} - -// #110897# -const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuDocumentHandler::getServiceFactory() -{ - // #110897# - return mxServiceFactory; -} - -OReadMenuDocumentHandler::~OReadMenuDocumentHandler() -{ -} - - -void SAL_CALL OReadMenuDocumentHandler::startDocument(void) - throw ( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuDocumentHandler::endDocument(void) - throw( SAXException, RuntimeException ) -{ - if ( m_nElementDepth > 0 ) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "A closing element is missing!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } -} - - -void SAL_CALL OReadMenuDocumentHandler::startElement( - const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) -{ - if ( m_bMenuBarMode ) - { - ++m_nElementDepth; - m_xReader->startElement( aName, xAttrList ); - } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUBAR ))) - { - ++m_nElementDepth; - m_bMenuBarMode = sal_True; - - // #110897# m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( m_pMenuBar, &m_nItemId )); - m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( getServiceFactory(), m_pMenuBar, &m_nItemId )); - - m_xReader->startDocument(); - } -} - - -void SAL_CALL OReadMenuDocumentHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) -{ - if ( m_bMenuBarMode ) - { - --m_nElementDepth; - m_xReader->endElement( aName ); - if ( 0 == m_nElementDepth ) - { - m_xReader->endDocument(); - m_xReader = Reference< XDocumentHandler >(); - m_bMenuBarMode = sal_False; - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUBAR ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menubar expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - } -} - - -// ----------------------------------------------------------------------------- - - -// #110897# -OReadMenuBarHandler::OReadMenuBarHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - MenuBar* pMenuBar, USHORT* pItemId ) -: // #110897# - mxServiceFactory( xServiceFactory ), - m_pMenuBar( pMenuBar ), - m_nElementDepth( 0 ), - m_bMenuMode( sal_False ), - m_pItemId( pItemId ) -{ -} - -// #110897# -const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuBarHandler::getServiceFactory() -{ - // #110897# - return mxServiceFactory; -} - -OReadMenuBarHandler::~OReadMenuBarHandler() -{ -} - - -void SAL_CALL OReadMenuBarHandler::startDocument(void) - throw ( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuBarHandler::endDocument(void) - throw( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuBarHandler::startElement( - const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) -{ - if ( m_bMenuMode ) - { - ++m_nElementDepth; - m_xReader->startElement( aName, xAttrList ); - } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) - { - ++m_nElementDepth; - - ULONG nHelpId = 0; - OUString aCommandId; - OUString aLabel; - - m_bMenuMode = sal_True; - PopupMenu* pMenu = new PopupMenu(); - - // read attributes for menu - for ( int i=0; i< xAttrList->getLength(); i++ ) - { - OUString aName = xAttrList->getNameByIndex( i ); - OUString aValue = xAttrList->getValueByIndex( i ); - if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID ))) - aCommandId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL ))) - aLabel = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID ))) - nHelpId = aValue.toInt32(); - } - - if ( aCommandId.getLength() > 0 ) - { - USHORT nItemId; - if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 ) - nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); - else - nItemId = ++(*m_pItemId); - - m_pMenuBar->InsertItem( nItemId, String() ); - m_pMenuBar->SetPopupMenu( nItemId, pMenu ); - m_pMenuBar->SetItemCommand( nItemId, aCommandId ); - if ( nHelpId > 0 ) - m_pMenuBar->SetHelpId( nItemId, nHelpId ); - if ( aLabel.getLength() > 0 ) - { - m_pMenuBar->SetItemText( nItemId, aLabel ); - m_pMenuBar->SetUserValue( nItemId, MENU_SAVE_LABEL ); - } - else - { - m_pMenuBar->SetUserValue( nItemId, 0 ); - } - } - else - { - delete pMenu; - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - - m_xReader = Reference< XDocumentHandler >( new OReadMenuHandler( pMenu, m_pItemId )); - m_xReader->startDocument(); - } - else - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "element menu expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } -} - - -void SAL_CALL OReadMenuBarHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) -{ -} - - -void OReadMenuBarHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) -{ - if ( m_bMenuMode ) - { - --m_nElementDepth; - if ( 0 == m_nElementDepth ) - { - m_xReader->endDocument(); - m_xReader = Reference< XDocumentHandler >(); - m_bMenuMode = sal_False; - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menu expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - else - m_xReader->endElement( aName ); - } -} - - -// ----------------------------------------------------------------------------- - - -OReadMenuHandler::OReadMenuHandler( Menu* pMenu, USHORT* pItemId ) : - m_pMenu( pMenu ), - m_nElementDepth( 0 ), - m_bMenuPopupMode( sal_False ), - m_pItemId( pItemId ) -{ -} - - -OReadMenuHandler::~OReadMenuHandler() -{ -} - - -void SAL_CALL OReadMenuHandler::startDocument(void) - throw ( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuHandler::endDocument(void) - throw( SAXException, RuntimeException) -{ -} - - -void SAL_CALL OReadMenuHandler::startElement( - const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) -{ - if ( m_bMenuPopupMode ) - { - ++m_nElementDepth; - m_xReader->startElement( aName, xAttrList ); - } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUPOPUP ))) - { - ++m_nElementDepth; - m_bMenuPopupMode = sal_True; - m_xReader = Reference< XDocumentHandler >( new OReadMenuPopupHandler( m_pMenu, m_pItemId )); - m_xReader->startDocument(); - } - else - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown element found!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } -} - - -void SAL_CALL OReadMenuHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) -{ - if ( m_bMenuPopupMode ) - { - --m_nElementDepth; - if ( 0 == m_nElementDepth ) - { - m_xReader->endDocument(); - m_xReader = Reference< XDocumentHandler >(); - m_bMenuPopupMode = sal_False; - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUPOPUP ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menupopup expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - else - m_xReader->endElement( aName ); - } -} - - -// ----------------------------------------------------------------------------- - - -OReadMenuPopupHandler::OReadMenuPopupHandler( Menu* pMenu, USHORT* pItemId ) : - m_pMenu( pMenu ), - m_nElementDepth( 0 ), - m_bMenuMode( sal_False ), - m_pItemId( pItemId ), - m_nNextElementExpected( ELEM_CLOSE_NONE ) -{ -} - - -OReadMenuPopupHandler::~OReadMenuPopupHandler() -{ -} - - -void SAL_CALL OReadMenuPopupHandler::startDocument(void) - throw ( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuPopupHandler::endDocument(void) - throw( SAXException, RuntimeException) -{ -} - - -void SAL_CALL OReadMenuPopupHandler::startElement( - const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) -{ - ++m_nElementDepth; - - if ( m_bMenuMode ) - m_xReader->startElement( aName, xAttrList ); - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) - { - ULONG nHelpId = 0; - OUString aCommandId; - OUString aLabel; - - m_bMenuMode = sal_True; - PopupMenu* pMenu = new PopupMenu(); - - // read attributes for menu - for ( int i=0; i< xAttrList->getLength(); i++ ) - { - OUString aName = xAttrList->getNameByIndex( i ); - OUString aValue = xAttrList->getValueByIndex( i ); - if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID ))) - aCommandId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL ))) - aLabel = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID ))) - nHelpId = aValue.toInt32(); - } - - if ( aCommandId.getLength() > 0 ) - { - USHORT nItemId; - if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 ) - nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); - else - nItemId = ++(*m_pItemId); - - m_pMenu->InsertItem( nItemId, String() ); - m_pMenu->SetPopupMenu( nItemId, pMenu ); - m_pMenu->SetItemCommand( nItemId, aCommandId ); - if ( nHelpId > 0 ) - m_pMenu->SetHelpId( nItemId, nHelpId ); - if ( aLabel.getLength() > 0 ) - { - m_pMenu->SetItemText( nItemId, aLabel ); - m_pMenu->SetUserValue( nItemId, MENU_SAVE_LABEL ); - } - else - { - m_pMenu->SetUserValue( nItemId, 0 ); - } - } - else - { - delete pMenu; - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - - m_xReader = Reference< XDocumentHandler >( new OReadMenuHandler( pMenu, m_pItemId )); - m_xReader->startDocument(); - } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM ))) - { - ULONG nHelpId = 0; - OUString aCommandId; - OUString aLabel; - - // read attributes for menu item - for ( int i=0; i< xAttrList->getLength(); i++ ) - { - OUString aName = xAttrList->getNameByIndex( i ); - OUString aValue = xAttrList->getValueByIndex( i ); - if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID ))) - aCommandId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL ))) - aLabel = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID ))) - nHelpId = aValue.toInt32(); - } - - if ( aCommandId.getLength() > 0 ) - { - USHORT nItemId; - if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 ) - nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); - else - nItemId = ++(*m_pItemId); - - m_pMenu->InsertItem( nItemId, String() ); - m_pMenu->SetItemCommand( nItemId, aCommandId ); - if ( nHelpId > 0 ) - m_pMenu->SetHelpId( nItemId, nHelpId ); - if ( aLabel.getLength() > 0 ) - { - m_pMenu->SetItemText( nItemId, aLabel ); - m_pMenu->SetUserValue( nItemId, MENU_SAVE_LABEL ); - } - else - { - m_pMenu->SetUserValue( nItemId, 0 ); - } - } - - m_nNextElementExpected = ELEM_CLOSE_MENUITEM; - } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUSEPARATOR ))) - { - m_pMenu->InsertSeparator(); - m_nNextElementExpected = ELEM_CLOSE_MENUSEPARATOR; - } - else - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown element found!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } -} - - -void SAL_CALL OReadMenuPopupHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) -{ - --m_nElementDepth; - if ( m_bMenuMode ) - { - if ( 0 == m_nElementDepth ) - { - m_xReader->endDocument(); - m_xReader = Reference< XDocumentHandler >(); - m_bMenuMode = sal_False; - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menu expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - else - m_xReader->endElement( aName ); - } - else - { - if ( m_nNextElementExpected == ELEM_CLOSE_MENUITEM ) - { - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menuitem expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - else if ( m_nNextElementExpected == ELEM_CLOSE_MENUSEPARATOR ) - { - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUSEPARATOR ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menuseparator expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - - m_nNextElementExpected = ELEM_CLOSE_NONE; - } -} - - -// --------------------------------- Write XML --------------------------------- - - -OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( MenuBar* pMenu, Reference< XDocumentHandler > rxWriteDocumentHandler ) : - m_pMenuBar( pMenu ), - m_xWriteDocumentHandler( rxWriteDocumentHandler ) -{ - m_xEmptyList = Reference< XAttributeList >( (XAttributeList *)new AttributeListImpl, UNO_QUERY ); - m_aAttributeType = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); -} - - -OWriteMenuDocumentHandler::~OWriteMenuDocumentHandler() -{ -} - - -void OWriteMenuDocumentHandler::WriteMenuDocument() -throw ( SAXException, RuntimeException ) -{ - AttributeListImpl* pList = new AttributeListImpl; - Reference< XAttributeList > rList( (XAttributeList *) pList , UNO_QUERY ); - - m_xWriteDocumentHandler->startDocument(); - - // write DOCTYPE line! - Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY ); - if ( xExtendedDocHandler.is() ) - { - xExtendedDocHandler->unknown( OUString( RTL_CONSTASCII_USTRINGPARAM( MENUBAR_DOCTYPE )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - } - - pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_MENU )), - m_aAttributeType, - OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_MENU )) ); - - pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), - m_aAttributeType, - OUString( RTL_CONSTASCII_USTRINGPARAM( "menubar" )) ); - - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUBAR )), pList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - - WriteMenu( m_pMenuBar ); - - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUBAR )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endDocument(); -} - - -void OWriteMenuDocumentHandler::WriteMenu( Menu* pMenu ) -throw ( SAXException, RuntimeException ) -{ - USHORT nItemCount = pMenu->GetItemCount(); - BOOL bSeparator = FALSE; - - for ( USHORT nItemPos = 0; nItemPos < nItemCount; nItemPos++ ) - { - USHORT nItemId = pMenu->GetItemId( nItemPos ); - - PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nItemId ); - if ( pPopupMenu ) - { - OUString aItemCommand = pMenu->GetItemCommand( nItemId ); - - if ( nItemId == SID_NEWDOCDIRECT || - nItemId == SID_AUTOPILOTMENU ) - { - // special popup menus (filled during runtime) must be saved as a menuitem!!! - WriteMenuItem( pMenu, nItemId ); - bSeparator = FALSE; - } - else if ( nItemId == SID_FORMATMENU ) - { - // special popup menu - must be written as empty popup! - AttributeListImpl* pListMenu = new AttributeListImpl; - Reference< XAttributeList > xListMenu( (XAttributeList *)pListMenu , UNO_QUERY ); - - String aCommand( pMenu->GetItemCommand( nItemId ) ); - if ( !aCommand.Len() ) - { - aCommand = String::CreateFromAscii("slot:"); - aCommand += String::CreateFromInt32( nItemId ); - } - - pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), - m_aAttributeType, - aCommand ); - -// if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL ) - pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )), - m_aAttributeType, - pMenu->GetItemText( nItemId ) ); - - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - bSeparator = FALSE; - } - else if ( !AddonPopupMenu::IsCommandURLPrefix ( aItemCommand )) - { - AttributeListImpl* pListMenu = new AttributeListImpl; - Reference< XAttributeList > xListMenu( (XAttributeList *)pListMenu , UNO_QUERY ); - - String aCommand( pMenu->GetItemCommand( nItemId ) ); - if ( !aCommand.Len() ) - { - aCommand = String::CreateFromAscii("slot:"); - aCommand += String::CreateFromInt32( nItemId ); - } - - pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), - m_aAttributeType, - aCommand ); - -// if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL ) - pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )), - m_aAttributeType, - pMenu->GetItemText( nItemId ) ); - - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - - WriteMenu( pPopupMenu ); - - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - bSeparator = FALSE; - } - } - else - { - if ( pMenu->GetItemType( nItemPos ) != MENUITEM_SEPARATOR ) - { - // don't save special menu items for (window list and pickup list, add-ons ) - if ( !MenuConfiguration::IsPickListItemId( nItemId ) && - !MenuConfiguration::IsWindowListItemId( nItemId ) && - !AddonMenuManager::IsAddonMenuId( nItemId )) - { - bSeparator = FALSE; - WriteMenuItem( pMenu, nItemId ); - } - } - else if ( !bSeparator ) - { - // Don't write two separators together - WriteMenuSeparator(); - bSeparator = TRUE; - } - } - } -} - - -void OWriteMenuDocumentHandler::WriteMenuItem( Menu* pMenu, USHORT nItemId ) -{ - AttributeListImpl* pList = new AttributeListImpl; - Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY ); - - String aCommand( pMenu->GetItemCommand( nItemId ) ); - if ( !aCommand.Len() ) - { - aCommand = String::CreateFromAscii("slot:"); - aCommand += String::CreateFromInt32( nItemId ); - } - - pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), - m_aAttributeType, - aCommand ); - - ULONG nHelpId = pMenu->GetHelpId( nItemId ); - if ( nHelpId > 0 ) - { - pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_HELPID )), - m_aAttributeType, - OUString::valueOf( sal_Int64( nHelpId )) ); - } - -// if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL ) - pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )), - m_aAttributeType, - pMenu->GetItemText( nItemId )); - - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )), xList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )) ); -} - - -void OWriteMenuDocumentHandler::WriteMenuSeparator() -{ - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUSEPARATOR )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUSEPARATOR )) ); -} - -} // namespace framework diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 33b8fa89f6..cb061a0de3 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -48,6 +48,7 @@ #include #include #include "helper/mischelper.hxx" +#include "helpid.hrc" using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -97,9 +98,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo String aDisplayName = RetrieveLabelFromCommand( aCommand ); pPopupMenu->InsertItem( 2, aDisplayName ); pPopupMenu->SetItemCommand( 2, aCommand ); - //pPopupMenu->SetHelpId( 2, HID_SVX_BASIC_MACRO_ORGANIZER ); - // FIXME: HELPID - pPopupMenu->SetHelpId( 2, ""/*40012*/ ); + pPopupMenu->SetHelpId( 2, ".uno:MacroDialog" ); // insert providers but not basic or java addScriptItems( pPopupMenu, 4); @@ -219,9 +218,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt aDisplayName.Append( ellipsis ); pPopupMenu->InsertItem( itemId, aDisplayName ); pPopupMenu->SetItemCommand( itemId, aCommand ); - //pPopupMenu->SetHelpId( itemId, HID_SVX_COMMON_MACRO_ORGANIZER ); - // FIXME: HELPID - pPopupMenu->SetHelpId( itemId, ""/*40014*/ ); + pPopupMenu->SetHelpId( itemId, rtl::OString( aCommand.GetBuffer(), aCommand.Len(), RTL_TEXTENCODING_UTF8 ) ); itemId++; break; } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index af045e4175..4d8f2ef482 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1795,11 +1795,6 @@ void MenuBarManager::FillMenu( pMenu->InsertItem( nId, aLabel ); pMenu->SetItemCommand( nId, aCommandURL ); - sal_Int32 nHelpId = aHelpURL.toInt32(); - if ( nHelpId > 0 ) - // 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 b2289939db..128b611641 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -530,17 +530,6 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc m_pStatusBar->InsertItem( nId, nWidth, nItemBits, nOffset ); m_pStatusBar->SetItemCommand( nId, aCommandURL ); m_pStatusBar->SetAccessibleName( nId, aString ); -// m_pStatusBar->SetHelpText( nId, aString ); - - if ( aHelpURL.indexOf( aHelpIdPrefix ) == 0 ) - { - rtl::OUString aId( aHelpURL.copy( HELPID_PREFIX_LENGTH )); - sal_uInt16 nHelpId = (sal_uInt16)(aId.toInt32()); - if ( nHelpId > 0 ) - // FIXME: HELPID - m_pStatusBar->SetHelpId( nId, ""/*nHelpId*/ ); - } - ++nId; } } diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 06e0efa036..18bef609fa 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -137,8 +137,7 @@ 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 ); - // FIXME: HELPID - pStatusBar->SetUniqueId( ""/*HID_STATUSBAR*/ ); + pStatusBar->SetUniqueId( HID_STATUSBAR ); } } diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index d8391bebcb..9ac594e5e8 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -883,15 +883,13 @@ void ToolBarManager::CreateControllers() if ( nId == 0 ) continue; - // 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 ); sal_Bool bCreate( sal_True ); Reference< XStatusListener > xController; + CommandToInfoMap::iterator pCommandIter = m_aCommandMap.find( aCommandURL ); + sal_Int32 nWidth = ( pCommandIter != m_aCommandMap.end() ? pCommandIter->second.nWidth : 0 ); svt::ToolboxController* pController( 0 ); @@ -1188,7 +1186,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine rtl::OUString aHelpURL; rtl::OUString aTooltip; sal_uInt16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); - sal_uInt16 nWidth( 0 ); + sal_uInt32 nWidth( 0 ); sal_Bool bIsVisible( sal_True ); sal_uInt32 nStyle( 0 ); @@ -1277,6 +1275,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine if ( pIter == m_aCommandMap.end()) { aCmdInfo.nId = nId; + aCmdInfo.nWidth = nWidth; m_aCommandMap.insert( CommandToInfoMap::value_type( aCommandURL, aCmdInfo )); } else @@ -1284,10 +1283,6 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine pIter->second.aIds.push_back( nId ); } - // Add additional information for the controller to the obsolete help id - // 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 2dd227428c..d6e7349cbf 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -512,7 +512,6 @@ bool ToolBarMerger::MergeItems( pToolbar->InsertSeparator( sal_uInt16( nInsPos )); else { - ToolBarMerger::CreateToolbarItem( pToolbar, sal_uInt16( nInsPos ), rItemId, rItem ); CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL ); if ( pIter == rCommandMap.end()) { @@ -524,6 +523,8 @@ bool ToolBarMerger::MergeItems( { pIter->second.aIds.push_back( rItemId ); } + + ToolBarMerger::CreateToolbarItem( pToolbar, rCommandMap, sal_uInt16( nInsPos ), rItemId, rItem ); } ++nIndex; @@ -691,7 +692,7 @@ bool ToolBarMerger::RemoveItems( return pResult; } -void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem ) +void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, CommandToInfoMap& rCommandMap, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem ) { pToolbar->InsertItem( nItemId, rItem.aLabel, 0, nPos ); pToolbar->SetItemCommand( nItemId, rItem.aCommandURL ); @@ -700,10 +701,9 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_u pToolbar->EnableItem( nItemId, sal_True ); pToolbar->SetItemState( nItemId, STATE_NOCHECK ); - // Use obsolete help id to transport the width of the item - // FIXME: HELPID - // this looks broken - pToolbar->SetHelpId( nItemId, ""/*rItem.nWidth*/ ); + CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL ); + if ( pIter != rCommandMap.end() ) + pIter->second.nWidth = 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 4ee694daf6..4cda4f4983 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -181,7 +181,7 @@ ToolbarsMenuController::~ToolbarsMenuController() } void ToolbarsMenuController::addCommand( - Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId, const rtl::OUString& rLabel ) + Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OString& sHelpId, const rtl::OUString& rLabel ) { USHORT nItemId = m_xPopupMenu->getItemCount()+1; @@ -216,9 +216,7 @@ void ToolbarsMenuController::addCommand( PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); if ( !!aImage ) pVCLPopupMenu->SetItemImage( nItemId, aImage ); - // FIXME: HELPID - pVCLPopupMenu->SetHelpId( nItemId, ""/*nHelpId*/ ); - (void)nHelpId; + pVCLPopupMenu->SetHelpId( nItemId, sHelpId ); } m_aCommandVector.push_back( rCommandURL ); @@ -510,14 +508,14 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) || m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" )) { - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR )), 10360, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR )), CMD_HYPERLINKBAR, aEmptyString ); if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) || m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" )) - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), 10417, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), CMD_COLORBAR, aEmptyString ); else if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" )) - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), 26241, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), CMD_INPUTLINEBAR, aEmptyString ); else - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), 20128, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), CMD_FORMULABAR, aEmptyString ); } sal_Bool bAddCommand( sal_True ); @@ -540,7 +538,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r m_xPopupMenu->insertSeparator( nItemCount+1 ); } - addCommand( m_xPopupMenu, aConfigureToolbar, 5904, aEmptyString ); + addCommand( m_xPopupMenu, aConfigureToolbar, CONFIGURE_TOOLBARS, aEmptyString ); } // Add separator if no configure has been added @@ -556,7 +554,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r String aLabelStr = String( FwkResId( STR_RESTORE_TOOLBARS )); rtl::OUString aRestoreCmd( RTL_CONSTASCII_USTRINGPARAM( CMD_RESTOREVISIBILITY )); - addCommand( m_xPopupMenu, aRestoreCmd, 9999, aLabelStr ); + addCommand( m_xPopupMenu, aRestoreCmd, CMD_RESTOREVISIBILITY, aLabelStr ); } } diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index bb73a14642..ae284ca505 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -276,6 +276,8 @@ SvCommand::SvCommand( int argc, char ** argv ) if( 's' == aFirstChar ) { // Name der Slot-Ausgabe aSlotMapFile = aName; + aName += String::CreateFromAscii(".csv"); + aCSVFile = aName; } else if( 'l' == aFirstChar ) { // Name der Listing diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index e8f7feaacf..953c8df5e1 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -69,7 +69,6 @@ class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog { sal_uInt32 nUniqId; String aExtraData; - Timer aTimer; const SfxItemSet* pInputSet; SfxItemSet* pOutputSet; @@ -77,8 +76,6 @@ private: SAL_DLLPRIVATE SfxModalDialog(SfxModalDialog &); // not defined SAL_DLLPRIVATE void operator =(SfxModalDialog &); // not defined - DECL_DLLPRIVATE_LINK( TimerHdl_Impl, Timer* ); - SAL_DLLPRIVATE void SetDialogData_Impl(); SAL_DLLPRIVATE void GetDialogData_Impl(); SAL_DLLPRIVATE void init(); diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index 97027bf3c5..265c123e9c 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -122,7 +122,7 @@ friend class SfxViewFrame; DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * ); SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, BOOL bRecord ); - SAL_DLLPRIVATE sal_uInt32 _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*); + SAL_DLLPRIVATE void _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*); SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*); protected: @@ -237,7 +237,7 @@ public: //#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT ); SAL_DLLPRIVATE void SetMenu_Impl(); - SAL_DLLPRIVATE long Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc. + SAL_DLLPRIVATE void Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc. SAL_DLLPRIVATE BOOL IsUpdated_Impl() const; SAL_DLLPRIVATE void DebugOutput_Impl() const; SAL_DLLPRIVATE void ResetObjectBars_Impl(); diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index aff1ff8d49..13acc5f88d 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -305,7 +305,7 @@ public: Pointer to an array of help ids. For each element in _pControlId, there must be a corresponding element herein. */ - void SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId ); + void SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); void SetDialogHelpId( const sal_Int32 _nHelpId ); void CreateMatcher( const String& rName ); diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index b54047b3d5..0a55dfa8ac 100644 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -122,7 +122,7 @@ public: void EndInsert(); void CheckItem( USHORT, BOOL ); void RemoveItem( USHORT ); - void InsertItem( USHORT, const String&, MenuItemBits, + void InsertItem( USHORT, const String&, MenuItemBits, const rtl::OString& rHelpId, USHORT nPos = MENU_APPEND ); void InsertSeparator( USHORT nPos = MENU_APPEND ); void RemoveDisabledEntries(); diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx index 453231f075..cb206ff5f5 100644 --- a/sfx2/inc/sfx2/msg.hxx +++ b/sfx2/inc/sfx2/msg.hxx @@ -29,6 +29,9 @@ #include #include +#include +#include +#include //-------------------------------------------------------------------- @@ -287,6 +290,8 @@ public: USHORT GetValue() const { return nValue; } const SfxType* GetType() const { return pType; } const char* GetUnoName() const { return pUnoName; } + SFX2_DLLPUBLIC rtl::OString GetCommand() const; + SFX2_DLLPUBLIC rtl::OUString GetCommandString() const; USHORT GetFormalArgumentCount() const { return nArgDefCount; } const SfxFormalArgument& GetFormalArgument( USHORT nNo ) const diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx index bfa3015d97..931233bf1d 100644 --- a/sfx2/inc/sfx2/opengrf.hxx +++ b/sfx2/inc/sfx2/opengrf.hxx @@ -55,7 +55,7 @@ public: void SetCurrentFilter(const String&); /// Set dialog help id at FileDlgHelper - void SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId ); + void SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId ); /// Set control help ids at FileDlgHelper void SetDialogHelpId( const INT32 _nHelpId ); private: diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h new file mode 100644 index 0000000000..bdf27baac7 --- /dev/null +++ b/sfx2/inc/sfx2/sfxcommands.h @@ -0,0 +1,345 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SFX2_SFXCOMMANDS_HRC +#define SFX2_SFXCOMMANDS_HRC + +#define CMD_SID_VIEWSHELL0 ".uno:_SwitchViewShell0" +#define CMD_SID_VIEWSHELL1 ".uno:_SwitchViewShell1" +#define CMD_SID_VIEWSHELL2 ".uno:_SwitchViewShell2" +#define CMD_SID_VIEWSHELL3 ".uno:_SwitchViewShell3" +#define CMD_SID_VIEWSHELL4 ".uno:_SwitchViewShell4" +#define CMD_SID_ABOUT ".uno:About" +#define CMD_SID_ACTIVATE ".uno:Activate" +#define CMD_SID_HELPBALLOONS ".uno:ActiveHelp" +#define CMD_SID_STYLE_FAMILY ".uno:ActualStyleFamily" +#define CMD_SID_NEWDOC ".uno:NewDoc" +#define CMD_SID_CREATELINK ".uno:AddBookmark" +#define CMD_SID_NEWDOCDIRECT ".uno:AddDirect" +#define CMD_SID_TEMPLATE_ADDRESSBOKSOURCE ".uno:AddressBookSource" +#define CMD_SID_BASICIDE_ADDWATCH ".uno:AddWatch" +#define CMD_SID_DOCINFO_AUTHOR ".uno:Author" +#define CMD_SID_AUTOHIDE ".uno:AutoHide" +#define CMD_SID_AUTOPILOTMENU ".uno:AutoPilotMenu" +#define CMD_SID_GALLERY_BG_BRUSH ".uno:BackgroundImage" +#define CMD_SID_BACKSPACE ".uno:Backspace" +#define CMD_SID_BASICBREAK ".uno:BasicBreak" +#define CMD_SID_BASICIDE_APPEAR ".uno:BasicIDEAppear" +#define CMD_SID_BASICSTEPINTO ".uno:BasicStepInto" +#define CMD_SID_BASICSTEPOUT ".uno:BasicStepOut" +#define CMD_SID_BASICSTEPOVER ".uno:BasicStepOver" +#define CMD_SID_BASICSTOP ".uno:BasicStop" +#define CMD_SID_BROWSER ".uno:Beamer" +#define CMD_SID_BASICIDE_BRKPNTSCHANGED ".uno:BreakPointsChanged" +#define CMD_SID_BROWSE_BACKWARD ".uno:BrowseBackward" +#define CMD_SID_BROWSE_FORWARD ".uno:BrowseForward" +#define CMD_SID_BROWSER_MODE ".uno:BrowseView" +#define CMD_SID_BUILD_VERSION ".uno:BuildVersion" +#define CMD_SID_CAPTION ".uno:Caption" +#define CMD_SID_STYLE_FAMILY1 ".uno:CharStyle" +#define CMD_SID_CHECK_KEY ".uno:CheckKey" +#define CMD_SID_BASICIDE_CHOOSEMACRO ".uno:ChooseMacro" +#define CMD_SID_CLEARHISTORY ".uno:ClearHistory" +#define CMD_SID_CLOSEWINS ".uno:CloseWins" +#define CMD_SID_CLOSEDOCS ".uno:CloseDocs" +#define CMD_SID_CLOSEDOC ".uno:CloseDoc" +#define CMD_SID_CLOSEWIN ".uno:CloseWin" +#define CMD_SID_CLOSING ".uno:Closing" +#define CMD_SID_DOCINFO_COMMENTS ".uno:Comments" +#define CMD_SID_OFFICE_COMMERCIAL_USE ".uno:CommercialUse" +#define CMD_SID_DOCUMENT_COMPARE ".uno:CompareDocuments" +#define CMD_SID_BASICCOMPILE ".uno:CompileBasic" +#define CMD_SID_CONFIG ".uno:ConfigureDialog" +#define CMD_SID_CONTEXT ".uno:Context" +#define CMD_SID_COPY ".uno:Copy" +#define CMD_SID_CRASH ".uno:Crash" +#define CMD_SID_BASICIDE_CREATEMACRO ".uno:CreateMacro" +#define CMD_SID_CURRENT_URL ".uno:CurrentURL" +#define CMD_SID_CURSORENDOFSCREEN ".uno:CursorEndOfScreen" +#define CMD_SID_CURSORTOPOFSCREEN ".uno:CursorTopOfScreen" +#define CMD_SID_OFFICE_CUSTOMERNUMBER ".uno:CustomerNumber" +#define CMD_SID_CUT ".uno:Cut" +#define CMD_SID_DEFAULTFILEPATH ".uno:DefaultFilePath" +#define CMD_SID_DEFAULTFILENAME ".uno:DefaultFileName" +#define CMD_SID_DELETE ".uno:Delete" +#define CMD_SID_BASICIDE_DELETECURRENT ".uno:DeleteCurrent" +#define CMD_SID_STYLE_DELETE ".uno:DeleteStyle" +#define CMD_SID_STYLE_DESIGNER ".uno:DesignerDialog" +#define CMD_SID_STYLE_DRAGHIERARCHIE ".uno:DragHierarchy" +#define CMD_SID_EDITDOC ".uno:EditDoc" +#define CMD_SID_BASICIDE_EDITMACRO ".uno:EditMacro" +#define CMD_SID_STYLE_EDIT ".uno:EditStyle" +#define CMD_FID_SEARCH_NOW ".uno:ExecuteSearch" +#define CMD_SID_EXTENDEDHELP ".uno:ExtendedHelp" +#define CMD_SID_FILE_NAME ".uno:FileName" +#define CMD_SID_FOCUSURLBOX ".uno:FocusUrlBox" +#define CMD_SID_FORMATMENU ".uno:FormatMenu" +#define CMD_SID_STYLE_FAMILY3 ".uno:FrameStyle" +#define CMD_SID_FRAMETITLE ".uno:FrameTitle" +#define CMD_SID_PROGFILENAME ".uno:FullName" +#define CMD_SID_DOCFULLNAME ".uno:FullName" +#define CMD_SID_WIN_FULLSCREEN ".uno:FullScreen" +#define CMD_SID_FILLFRAME ".uno:GetFrameWindow" +#define CMD_SID_CURSORDOWN ".uno:GoDown" +#define CMD_SID_CURSORPAGEDOWN ".uno:GoDownBlock" +#define CMD_SID_CURSORPAGEDOWN_SEL ".uno:GoDownBlockSel" +#define CMD_SID_CURSORDOWN_SEL ".uno:GoDownSel" +#define CMD_SID_CURSORLEFT ".uno:GoLeft" +#define CMD_SID_CURSORPAGELEFT ".uno:GoLeftBlock" +#define CMD_SID_CURSORPAGELEFT_SEL ".uno:GoLeftBlockSel" +#define CMD_SID_CURSORLEFT_SEL ".uno:GoLeftSel" +#define CMD_SID_CURSORRIGHT ".uno:GoRight" +#define CMD_SID_CURSORRIGHT_SEL ".uno:GoRightSel" +#define CMD_SID_CURSORENDOFFILE ".uno:GoToEndOfData" +#define CMD_SID_CURSORENDOFFILE_SEL ".uno:GoToEndOfDataSel" +#define CMD_SID_CURSOREND ".uno:GoToEndOfRow" +#define CMD_SID_CURSOREND_SEL ".uno:GoToEndOfRowSel" +#define CMD_SID_CURSORTOPOFFILE ".uno:GoToStart" +#define CMD_SID_CURSORHOME ".uno:GoToStartOfRow" +#define CMD_SID_CURSORHOME_SEL ".uno:GoToStartOfRowSel" +#define CMD_SID_CURSORTOPOFFILE_SEL ".uno:GoToStartSel" +#define CMD_SID_CURSORUP ".uno:GoUp" +#define CMD_SID_CURSORPAGEUP ".uno:GoUpBlock" +#define CMD_SID_CURSORPAGEUP_SEL ".uno:GoUpBlockSel" +#define CMD_SID_CURSORUP_SEL ".uno:GoUpSel" +#define CMD_SID_HELP_ANNOTATE ".uno:HelpAnnotate" +#define CMD_SID_HELP_BOOKMARK ".uno:HelpBookmark" +#define CMD_SID_HELP_HELPFILEBOX ".uno:HelpChooseFile" +#define CMD_SID_HELP_DOWNLOAD ".uno:HelpDownload" +#define CMD_SID_HELP_PI ".uno:HelperDialog" +#define CMD_SID_HELPINDEX ".uno:HelpIndex" +#define CMD_SID_HELPMENU ".uno:HelpMenu" +#define CMD_SID_HELPONHELP ".uno:HelpOnHelp" +#define CMD_SID_HELP_SEARCH ".uno:HelpSearch" +#define CMD_SID_HELPTIPS ".uno:HelpTip" +#define CMD_SID_HELP_ZOOMIN ".uno:HelpZoomIn" +#define CMD_SID_HELP_ZOOMOUT ".uno:HelpZoomOut" +#define CMD_SID_BASICIDE_HIDECURPAGE ".uno:HideCurPage" +#define CMD_SID_HYPERLINK_DIALOG ".uno:HyperlinkDialog" +#define CMD_SID_INSERTDOC ".uno:InsertDoc" +#define CMD_SID_HYPERLINK_INSERT ".uno:InsertHyperlink" +#define CMD_SID_INSERT_FLOATINGFRAME ".uno:InsertObjectFloatingFrame" +#define CMD_SID_INTERNET_ONLINE ".uno:InternetOnline" +#define CMD_SID_INTERNET_SEARCH ".uno:InternetSearch" +#define CMD_SID_DOC_LOADING ".uno:IsLoading" +#define CMD_SID_IMG_LOADING ".uno:IsLoadingImages" +#define CMD_SID_PRINTOUT ".uno:IsPrinting" +#define CMD_SID_JUMPTOMARK ".uno:JumpToMark" +#define CMD_SID_DOCINFO_KEYWORDS ".uno:Keywords" +#define CMD_SID_BASICIDE_LIBLOADED ".uno:LibLoaded" +#define CMD_SID_BASICIDE_LIBREMOVED ".uno:LibRemoved" +#define CMD_SID_BASICIDE_LIBSELECTED ".uno:LibSelect" +#define CMD_SID_BASICIDE_LIBSELECTOR ".uno:LibSelector" +#define CMD_SID_OFFICE_PLK ".uno:LicenceKey" +#define CMD_SID_CONFIGACCEL ".uno:LoadAccel" +#define CMD_SID_BASICLOAD ".uno:LoadBasic" +#define CMD_SID_LOADCONFIG ".uno:LoadConfiguration" +#define CMD_SID_CONFIGEVENT ".uno:LoadEvents" +#define CMD_SID_CONFIGMENU ".uno:LoadMenu" +#define CMD_SID_CONFIGSTATUSBAR ".uno:LoadStatusBar" +#define CMD_SID_TOOLBOXOPTIONS ".uno:LoadToolBox" +#define CMD_SID_LOGOUT ".uno:Logout" +#define CMD_SID_SCRIPTORGANIZER ".uno:ScriptOrganizer" +#define CMD_SID_MACROORGANIZER ".uno:MacroOrganizer" +#define CMD_SID_RUNMACRO ".uno:RunMacro" +#define CMD_SID_BASICCHOOSER ".uno:MacroDialog" +#define CMD_SID_MAIL_NOTIFY ".uno:MailReceipt" +#define CMD_SID_MAIL_CHILDWIN ".uno:MailWindow" +#define CMD_SID_BASICIDE_MATCHGROUP ".uno:MatchGroup" +#define CMD_SID_TOGGLE_MENUBAR ".uno:MenuBarVisible" +#define CMD_SID_DOCUMENT_MERGE ".uno:MergeDocuments" +#define CMD_SID_ATTR_METRIC ".uno:MetricUnit" +#define CMD_SID_MODIFIED ".uno:Modified" +#define CMD_SID_DOC_MODIFIED ".uno:ModifiedStatus" +#define CMD_SID_BASICIDE_MODULEDLG ".uno:ModuleDialog" +#define CMD_SID_BASICIDE_NAMECHANGEDONTAB ".uno:NameChangedOnTab" +#define CMD_SID_NAVIGATOR ".uno:Navigator" +#define CMD_SID_RESTORE_EDITING_VIEW ".uno:RestoreEditingView" +#define CMD_SID_BASICIDE_NEWDIALOG ".uno:NewDialog" +#define CMD_SID_BASICIDE_NEWMODULE ".uno:NewModule" +#define CMD_SID_CREATE_BASICOBJECT ".uno:NewObject" +#define CMD_SID_STYLE_NEW ".uno:NewStyle" +#define CMD_SID_NEWWINDOW ".uno:NewWindow" +#define CMD_SID_BASICIDE_OBJCAT ".uno:ObjectCatalog" +#define CMD_SID_OBJECT ".uno:ObjectMenue" +#define CMD_SID_OLD_PALK ".uno:OldPALK" +#define CMD_SID_OPENDOC ".uno:Open" +#define CMD_SID_WEBHTML ".uno:WebHtml" +#define CMD_SID_OPENHYPERLINK ".uno:OpenHyperlink" +#define CMD_SID_DOCINFO_TITLE ".uno:DocInfoTitle" +#define CMD_SID_OPENTEMPLATE ".uno:OpenTemplate" +#define CMD_SID_OPENURL ".uno:OpenUrl" +#define CMD_SID_OPTIONS ".uno:Options" +#define CMD_SID_ORGANIZER ".uno:Organizer" +#define CMD_SID_STYLE_FAMILY4 ".uno:PageStyle" +#define CMD_SID_STYLE_FAMILY2 ".uno:ParaStyle" +#define CMD_SID_PARTWIN ".uno:PartWindow" +#define CMD_SID_PASTE ".uno:Paste" +#define CMD_SID_CLIPBOARD_FORMAT_ITEMS ".uno:ClipboardFormatItems" +#define CMD_SID_PASTE_SPECIAL ".uno:PasteSpecial" +#define CMD_SID_DOCPATH ".uno:DocPath" +#define CMD_SID_PICKLIST ".uno:PickList" +#define CMD_SID_PLAYMACRO ".uno:PlayMacro" +#define CMD_SID_PLUGINS_ACTIVE ".uno:PlugInsActive" +#define CMD_SID_PRINTDOC ".uno:Print" +#define CMD_SID_PRINTDOCDIRECT ".uno:PrintDefault" +#define CMD_SID_PRINTER_NAME ".uno:Printer" +#define CMD_SID_SETUPPRINTER ".uno:PrinterSetup" +#define CMD_SID_PRINTPREVIEW ".uno:PrintPreview" +#define CMD_SID_OFFICE_PRIVATE_USE ".uno:PrivateUse" +#define CMD_SID_DOCINFO ".uno:SetDocumentProperties" +#define CMD_SID_QUITAPP ".uno:Quit" +#define CMD_SID_DOC_READONLY ".uno:ReadOnly" +#define CMD_SID_RECORDMACRO ".uno:MacroRecorder" +#define CMD_SID_STOP_RECORDING ".uno:StopRecording" +#define CMD_SID_RECORDING_FLOATWINDOW ".uno:MacroRecordingFloat" +#define CMD_SID_REDO ".uno:Redo" +#define CMD_SID_DELETE_BASICOBJECT ".uno:ReleaseObject" +#define CMD_SID_RELOAD ".uno:Reload" +#define CMD_SID_BASICIDE_REMOVEWATCH ".uno:RemoveWatch" +#define CMD_SID_BASICIDE_RENAMECURRENT ".uno:RenameCurrent" +#define CMD_SID_REPAINT ".uno:Repaint" +#define CMD_SID_REPEAT ".uno:RepeatAction" +#define CMD_SID_RUBY_DIALOG ".uno:RubyDialog" +#define CMD_SID_BASICRUN ".uno:RunBasic" +#define CMD_SID_STARTSW ".uno:RunStarWriter" +#define CMD_SID_SAVEDOC ".uno:Save" +#define CMD_SID_SAVEDOCS ".uno:SaveAll" +#define CMD_SID_SAVEASDOC ".uno:SaveAs" +#define CMD_SID_DOCTEMPLATE ".uno:SaveAsTemplate" +#define CMD_SID_BASICSAVEAS ".uno:SaveBasicAs" +#define CMD_SID_EXPORT_DIALOG ".uno:ExportDialog" +#define CMD_SID_IMPORT_DIALOG ".uno:ImportDialog" +#define CMD_SID_SAVECONFIG ".uno:SaveConfiguration" +#define CMD_SID_DOC_SAVED ".uno:Saved" +#define CMD_SID_BASICIDE_SBXDELETED ".uno:SbxDeleted" +#define CMD_SID_BASICIDE_SBXINSERTED ".uno:SbxInserted" +#define CMD_SID_BASICIDE_SBXRENAMED ".uno:SbxRenamed" +#define CMD_SID_MAIL_SCROLLBODY_PAGEDOWN ".uno:ScrollBodyPageDown" +#define CMD_SID_SEARCH_DLG ".uno:SearchDialog" +#define CMD_SID_SEARCH_OPTIONS ".uno:SearchOptions" +#define CMD_SID_SEARCH_ITEM ".uno:SearchProperties" +#define CMD_SID_SELECTALL ".uno:SelectAll" +#define CMD_FN_FAX ".uno:SendFax" +#define CMD_SID_MAIL_SENDDOC ".uno:SendMail" +#define CMD_SID_MAIL_SENDDOCASPDF ".uno:SendMailDocAsPDF" +#define CMD_SID_MAIL_SENDDOCASFORMAT ".uno:SendMailDocAsFormat" +#define CMD_SID_MAIL_SENDDOCASMS ".uno:SendMailDocAsMS" +#define CMD_SID_MAIL_SENDDOCASOOO ".uno:SendMailDocAsOOo" +#define CMD_SID_SETOPTIONS ".uno:SetOptions" +#define CMD_SID_OFFICE_PALK ".uno:SetPALK" +#define CMD_SID_SHOW_BROWSER ".uno:ShowBrowser" +#define CMD_SID_SHOWPOPUPS ".uno:ShowPopups" +#define CMD_SID_BASICIDE_SHOWSBX ".uno:ShowSbx" +#define CMD_SID_SOURCEVIEW ".uno:SourceView" +#define CMD_SID_ONLINE_REGISTRATION_DLG ".uno:StartRegistrationDialog" +#define CMD_SID_STATUSBARTEXT ".uno:StatusBar" +#define CMD_SID_TOGGLESTATUSBAR ".uno:StatusBarVisible" +#define CMD_SID_BASICIDE_STAT_DATE ".uno:StatusGetDate" +#define CMD_SID_BASICIDE_STAT_POS ".uno:StatusGetPosition" +#define CMD_SID_BASICIDE_STAT_TITLE ".uno:StatusGetTitle" +#define CMD_SID_BASICIDE_STOREALLMODULESOURCES ".uno:StoreAllModuleSources" +#define CMD_SID_BASICIDE_STOREMODULESOURCE ".uno:StoreModuleSource" +#define CMD_SID_STYLE_APPLY ".uno:StyleApplyState" +#define CMD_SID_STYLE_CATALOG ".uno:StyleCatalog" +#define CMD_SID_STYLE_NEW_BY_EXAMPLE ".uno:StyleNewByExample" +#define CMD_SID_STYLE_UPDATE_BY_EXAMPLE ".uno:StyleUpdateByExample" +#define CMD_SID_STYLE_WATERCAN ".uno:StyleWatercanMode" +#define CMD_SID_VIEWSHELL ".uno:SwitchViewShell" +#define CMD_SID_TASKBAR ".uno:TaskBarVisible" +#define CMD_SID_STYLE_FAMILY5 ".uno:ListStyle" +#define CMD_SID_TIPWINDOW ".uno:TipsDialog" +#define CMD_SID_DOCTITLE ".uno:Title" +#define CMD_SID_TITLE ".uno:Title" +#define CMD_SID_BASICIDE_TOGGLEBRKPNT ".uno:ToggleBreakPoint" +#define CMD_SID_BASICIDE_SHOWWINDOW ".uno:BasicIDEShowWindow" +#define CMD_SID_EDITMACRO ".uno:ToolsMacroEdit" +#define CMD_SID_UNDO ".uno:Undo" +#define CMD_SID_FORMATPAINTBRUSH ".uno:FormatPaintbrush" +#define CMD_SID_ATTR_UNDO_COUNT ".uno:UndoCount" +#define CMD_SID_BASICIDE_UPDATEALLMODULESOURCES ".uno:UpdateAllModuleSources" +#define CMD_SID_BASICIDE_UPDATEMODULESOURCE ".uno:UpdateModuleSource" +#define CMD_SID_BASICIDE_MANAGEBRKPNTS ".uno:ManageBreakPoints" +#define CMD_SID_BASICIDE_TOGGLEBRKPNTENABLED ".uno:ToggleBreakPointEnabled" +#define CMD_SID_UPDATE_VERSION ".uno:UpdateVersion" +#define CMD_SID_VERSION ".uno:VersionDialog" +#define CMD_SID_SIGNATURE ".uno:Signature" +#define CMD_SID_MACRO_SIGNATURE ".uno:MacroSignature" +#define CMD_SID_VERSION_VISIBLE ".uno:VersionVisible" +#define CMD_SID_VIEW_DATA_SOURCE_BROWSER ".uno:ViewDataSourceBrowser" +#define CMD_SID_WIN_VISIBLE ".uno:WinVisible" +#define CMD_SID_MDIWINDOWLIST ".uno:WindowList" +#define CMD_SID_ZOOM_IN ".uno:ZoomMinus" +#define CMD_SID_ZOOM ".uno:Zooming" +#define CMD_SID_ZOOM_NEXT ".uno:ZoomNext" +#define CMD_SID_ZOOM_OUT ".uno:ZoomPlus" +#define CMD_SID_ZOOM_PREV ".uno:ZoomPrevious" +#define CMD_SID_ZOOM_TOOLBOX ".uno:ZoomToolBox" +#define CMD_SID_EXPORTDOC ".uno:ExportTo" +#define CMD_SID_EXPORTDOCASPDF ".uno:ExportToPDF" +#define CMD_SID_DIRECTEXPORTDOCASPDF ".uno:ExportDirectToPDF" +#define CMD_SID_IMAGE_ORIENTATION ".uno:ImageOrientation" +#define CMD_SID_SAVE_VERSION_ON_CLOSE ".uno:SaveVersionOnClose" +#define CMD_SID_ADDONS ".uno:Addons" +#define CMD_SID_SHOW_IME_STATUS_WINDOW ".uno:ShowImeStatusWindow" +#define CMD_SID_UPDATE_CONFIG ".uno:UpdateConfiguration" +#define CMD_SID_HELP_SUPPORTPAGE ".uno:HelpSupport" +#define CMD_SID_HELP_TUTORIALS ".uno:HelpTutorials" +#define CMD_SID_ADDONHELP ".uno:AddonHelp" +#define CMD_SID_FORMATMENUSTATE ".uno:FormatMenuState" +#define CMD_SID_INET_DLG ".uno:InternetDialog" +#define CMD_SID_ONLINE_REGISTRATION ".uno:OnlineRegistrationDlg" +#define CMD_SID_OFFICE_CHECK_PLZ ".uno:CheckPLZ" +#define CMD_SID_ADDRESS_DATA_SOURCE ".uno:AutoPilotAddressDataSource" +#define CMD_FN_BUSINESS_CARD ".uno:InsertBusinessCard" +#define CMD_FN_LABEL ".uno:InsertLabels" +#define CMD_FN_XFORMS_INIT ".uno:NewXForms" +#define CMD_SID_SD_AUTOPILOT ".uno:AutoPilotPresentations" +#define CMD_SID_NEWSD ".uno:NewPresentation" +#define CMD_SID_COMP_BIBLIOGRAPHY ".uno:BibliographyComponent" +#define CMD_SID_MINIMIZED ".uno:Minimized" +#define CMD_SID_AUTO_CORRECT_DLG ".uno:AutoCorrectDlg" +#define CMD_SID_OPTIONS_TREEDIALOG ".uno:OptionsTreeDialog" +#define CMD_SID_TERMINATE_INPLACEACTIVATION ".uno:TerminateInplaceActivation" +#define CMD_SID_RECENTFILELIST ".uno:RecentFileList" +#define CMD_SID_AVAILABLE_TOOLBARS ".uno:AvailableToolbars" +#define CMD_SID_AVMEDIA_PLAYER ".uno:AVMediaPlayer" +#define CMD_SID_INSERT_AVMEDIA ".uno:InsertAVMedia" +#define CMD_SID_MORE_DICTIONARIES ".uno:MoreDictionaries" +#define CMD_SID_ACTIVATE_STYLE_APPLY ".uno:ActivateStyleApply" +#define CMD_SID_DOCKWIN_0 ".uno:DockingWindow0" +#define CMD_SID_DOCKWIN_1 ".uno:DockingWindow1" +#define CMD_SID_DOCKWIN_2 ".uno:DockingWindow2" +#define CMD_SID_DOCKWIN_3 ".uno:DockingWindow3" +#define CMD_SID_DOCKWIN_4 ".uno:DockingWindow4" +#define CMD_SID_DOCKWIN_5 ".uno:DockingWindow5" +#define CMD_SID_DOCKWIN_6 ".uno:DockingWindow6" +#define CMD_SID_DOCKWIN_7 ".uno:DockingWindow7" +#define CMD_SID_DOCKWIN_8 ".uno:DockingWindow8" +#define CMD_SID_DOCKWIN_9 ".uno:DockingWindow9" +#define CMD_SID_PASTE_UNFORMATTED ".uno:PasteUnformatted" + +#endif diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx index b6eaeb9c0d..cab0c677ca 100644 --- a/sfx2/inc/sfx2/sfxdlg.hxx +++ b/sfx2/inc/sfx2/sfxdlg.hxx @@ -133,10 +133,10 @@ public: const String *pUserButtonText=0 ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0; virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0; - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 )=0; - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, USHORT nSlotId, + virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0; virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0; virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML=FALSE, sfx2::SvBaseLink* p=0 )=0; diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx index 8eb412d078..b66a893c28 100644 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfxhelp.hxx @@ -45,15 +45,10 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: - // FIXME: HELPID - // SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); - // FIXME: HELPID - // SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); + SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId ); SAL_DLLPRIVATE String GetHelpModuleName_Impl(); - // FIXME: HELPID - // SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ); SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ); public: @@ -63,15 +58,11 @@ public: inline void SetTicket( const String& rTicket ) { aTicket = rTicket; } inline void SetUser( const String& rUser ) { aUser = rUser; } - // FIXME: HELPID - //virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); virtual XubString GetHelpText( const String&, const Window* pWindow ); - // FIXME: HELPID - // static String CreateHelpURL( ULONG nHelpId, const String& rModuleName ); static String CreateHelpURL( const String& aCommandURL, const String& rModuleName ); using Help::OpenHelpAgent; - static void OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId ); + static void OpenHelpAgent( SfxFrame* pFrame, const rtl::OString& sHelpId ); static String GetDefaultHelpModule(); static ::rtl::OUString GetCurrentModuleIdentifier(); }; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 7bc57471c9..fe46a2902b 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -6356,7 +6356,7 @@ SfxBoolItem TaskBarVisible SID_TASKBAR ] //-------------------------------------------------------------------------- -SfxTemplateItem TemplateFamily5 SID_STYLE_FAMILY5 +SfxTemplateItem ListStyle SID_STYLE_FAMILY5 [ /* flags: */ diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index e1c43c072e..0883e30f30 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -626,169 +626,6 @@ String RID_ENVTOOLBOX Text [ en-US ] = "Function Bar" ; }; -ToolBox RID_ENVTOOLBOX -{ - HelpId = RID_ENVTOOLBOX ; - ButtonType = BUTTON_SYMBOL ; - LineSpacing = TRUE ; - Border = TRUE ; - Scroll = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Customize = TRUE ; - FloatingMode = FALSE ; - Hide = TRUE ; - HideWhenDeactivate = TRUE ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_OPENURL ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_NEWDOCDIRECT ; - DropDown = TRUE; - }; - ToolBoxItem - { - Identifier = SID_NEWDOC ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_OPENDOC ; - }; - ToolBoxItem - { - Identifier = SID_SAVEDOC ; - }; - ToolBoxItem - { - Identifier = SID_SAVEASDOC ; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_EDITDOC ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_DIRECTEXPORTDOCASPDF ; - }; - ToolBoxItem - { - Identifier = SID_PRINTDOCDIRECT ; - }; - ToolBoxItem - { - Identifier = FN_FAX ; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_CUT ; - }; - ToolBoxItem - { - Identifier = SID_COPY ; - }; - ToolBoxItem - { - Identifier = SID_PASTE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_UNDO ; - }; - ToolBoxItem - { - Identifier = SID_REDO ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_NAVIGATOR ; - }; - ToolBoxItem - { - Identifier = SID_STYLE_DESIGNER ; - }; - ToolBoxItem - { - Identifier = SID_HYPERLINK_DIALOG ; - }; - ToolBoxItem - { - Identifier = SID_HYPERLINK_INSERT ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_WIN_FULLSCREEN ; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_RECORDMACRO; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_GALLERY ; - }; - ToolBoxItem - { - Identifier = SID_AVMEDIA_PLAYER ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_CLOSEDOC; - Hide = TRUE; - }; - }; -}; - String RID_SPECIALCONFIG_ERROR { Text [ en-US ] = "An error has occurred in the special configuration.\nPlease contact your administrator." ; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 662d2cc272..b5b1e40dca 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -350,12 +350,10 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) Help* pHelp = Application::GetHelp(); if ( pHelp ) { - ULONG nHelpId = ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE ) ? 66056 : 0; - if ( 66056 == nHelpId ) + if ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE ) { // show Support page with new URL - // FIXME: HELPID - String sHelpURL = SfxHelp::CreateHelpURL( String()/*nHelpId*/, String() ); + String sHelpURL = SfxHelp::CreateHelpURL( String::CreateFromAscii(".uno:HelpSupport"), String() ); String sParams = sHelpURL.Copy( sHelpURL.Search( '?' ) ); sHelpURL = String::CreateFromAscii("vnd.sun.star.help://shared/text/shared/05/00000001.xhp"); sHelpURL += sParams; @@ -363,8 +361,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) pHelp->Start( sHelpURL, NULL ); } else - // FIXME: HELPID - pHelp->Start( String()/*nHelpId*/, NULL ); // show start page + pHelp->Start( String::CreateFromAscii(".uno:HelpIndex"), NULL ); // show start page bDone = TRUE; } break; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index a70a45be02..ba7d7d9035 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2105,32 +2105,24 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : xFrame->setName( DEFINE_CONST_UNICODE("OFFICE_HELP") ); lcl_disableLayoutOfFrame(xFrame); - // FIXME: HELPID - aToolBox.SetHelpId( ""/*HID_HELP_TOOLBOX*/ ); + aToolBox.SetHelpId( HID_HELP_TOOLBOX ); aToolBox.InsertItem( TBI_INDEX, aIndexOffText ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ ); + aToolBox.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX ); aToolBox.InsertSeparator(); aToolBox.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ ); + aToolBox.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD ); aToolBox.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ ); + aToolBox.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD ); aToolBox.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ ); + aToolBox.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START ); aToolBox.InsertSeparator(); aToolBox.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ ); + aToolBox.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT ); aToolBox.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ ); + aToolBox.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS ); aToolBox.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ ); + aToolBox.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); InitToolBoxImages(); aToolBox.Show(); @@ -2146,9 +2138,8 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) ); - if ( aOnStartupCB.GetHelpId() == 0 ) - // FIXME: HELPID - aOnStartupCB.SetHelpId( ""/*HID_HELP_ONSTARTUP_BOX*/ ); + if ( !aOnStartupCB.GetHelpId().getLength() ) + aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX ); } // ----------------------------------------------------------------------- @@ -2604,40 +2595,32 @@ 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 ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ ); + 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 ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ ); + 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 ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ ); + 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 ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ ); + 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 ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ ); + 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 ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ ); + 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 ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ ); + aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_SELECTIONMODE, ""/*HID_HELP_TEXT_SELECTION_MODE*/ ); + aMenu.SetHelpId( TBI_SELECTIONMODE, HID_HELP_TEXT_SELECTION_MODE ); Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY ); URL aURL; aURL.Complete = DEFINE_CONST_UNICODE(".uno:SelectTextMode"); @@ -2657,8 +2640,7 @@ 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 ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_COPY, ""/*SID_COPY*/ ); + aMenu.SetHelpId( TBI_COPY, ".uno:Copy" ); aMenu.EnableItem( TBI_COPY, HasSelection() ); if ( bIsDebug ) @@ -3243,8 +3225,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( aWinPos ( 0, 0 ), sTitle ( pParent->GetText() ) { - // FIXME: HELPID - SetHelpId( ""/*HID_HELP_WINDOW*/ ); + SetHelpId( HID_HELP_WINDOW ); SetStyle( GetStyle() | WB_DIALOGCONTROL ); pHelpInterceptor->InitWaiter( this ); diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 5e05ff45aa..26f37a7465 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -284,7 +284,7 @@ void SvxOpenGraphicDialog::SetCurrentFilter(const String& rStr) mpImpl->aFileDlg.SetCurrentFilter(rStr); } -void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId ) +void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId ) { mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId ); } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index de63e348a4..f6b2cdc4c7 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -29,7 +29,7 @@ #include "precompiled_sfx2.hxx" #include "sfxhelp.hxx" - +#include #include #include #include @@ -76,6 +76,7 @@ #include #include #include +#include using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; @@ -221,13 +222,13 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor ) class SfxHelpOptions_Impl : public utl::ConfigItem { private: - SvULongsSort* m_pIds; + std::set < rtl::OString > m_aIds; public: SfxHelpOptions_Impl(); ~SfxHelpOptions_Impl(); - BOOL HasId( ULONG nId ) { USHORT nDummy; return m_pIds ? m_pIds->Seek_Entry( nId, &nDummy ) : FALSE; } + bool HasId( const rtl::OString& rId ) { return m_aIds.size() ? m_aIds.find( rId ) != m_aIds.end() : false; } virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); virtual void Commit(); }; @@ -254,7 +255,6 @@ static Sequence< ::rtl::OUString > GetPropertyNames() SfxHelpOptions_Impl::SfxHelpOptions_Impl() : ConfigItem( ::rtl::OUString::createFromAscii("Office.SFX/Help") ) - , m_pIds( NULL ) { Sequence< ::rtl::OUString > aNames = GetPropertyNames(); Sequence< Any > aValues = GetProperties( aNames ); @@ -275,11 +275,15 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl() ::rtl::OUString aCodedList; if ( pValues[nProp] >>= aCodedList ) { - String aTmp( aCodedList ); - USHORT nCount = aTmp.GetTokenCount( ',' ); - m_pIds = new SvULongsSort(); - for ( USHORT n=0; nInsert( (ULONG) aTmp.GetToken( n, ',' ).ToInt64() ); + rtl::OString aTmp( aCodedList, aCodedList.getLength(), RTL_TEXTENCODING_UTF8 ); + sal_Int32 nIndex = 0; + do + { + rtl::OString aToken = aTmp.getToken( 0, ',', nIndex ); + if ( aToken.getLength() ) + m_aIds.insert( aToken ); + } + while ( nIndex >= 0 ); } else { DBG_ERRORFILE( "Wrong property type!" ); @@ -299,7 +303,6 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl() SfxHelpOptions_Impl::~SfxHelpOptions_Impl() { - delete m_pIds; } @@ -326,8 +329,6 @@ public: ~SfxHelp_Impl(); SfxHelpOptions_Impl* GetOptions(); - // 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 @@ -371,19 +372,6 @@ void SfxHelp_Impl::Load() } } -#if 0 -// FIXME: HELPID -String SfxHelp_Impl::GetHelpText( ULONG nHelpId, const String& rModule ) -{ - // create help url - String aHelpURL = SfxHelp::CreateHelpURL( nHelpId, rModule ); - // added 'active' parameter - aHelpURL.Insert( String( DEFINE_CONST_UNICODE("&Active=true") ), aHelpURL.SearchBackward( '#' ) ); - // load help string - return SfxContentHelper::GetActiveHelpString( aHelpURL ); -} -#endif - String SfxHelp_Impl::GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ) { // create help url @@ -585,79 +573,6 @@ String SfxHelp::GetHelpModuleName_Impl() return sModuleName; } -#if 0 -// FIXME: HELPID -String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ) -{ - String aModuleName( rModuleName ); - if ( aModuleName.Len() == 0 ) - aModuleName = getDefaultModule_Impl(); - - // build up the help URL - String aHelpURL; - if ( aTicket.Len() ) - { - // if there is a ticket, we are inside a plugin, so a special Help URL must be sent - aHelpURL = DEFINE_CONST_UNICODE("vnd.sun.star.cmd:help?"); - aHelpURL += DEFINE_CONST_UNICODE("HELP_Request_Mode=contextIndex&HELP_Session_Mode=context&HELP_CallMode=portal&HELP_Device=html"); - - if ( !nHelpId ) - { - // no help id -> start page - aHelpURL += DEFINE_CONST_UNICODE("&HELP_ContextID=start"); - } - else - { - aHelpURL += DEFINE_CONST_UNICODE("&HELP_ContextID="); - aHelpURL += String::CreateFromInt64( nHelpId ); - } - - aHelpURL += DEFINE_CONST_UNICODE("&HELP_ProgramID="); - aHelpURL += aModuleName; - aHelpURL += DEFINE_CONST_UNICODE("&HELP_User="); - aHelpURL += aUser; - aHelpURL += DEFINE_CONST_UNICODE("&HELP_Ticket="); - aHelpURL += aTicket; - aHelpURL += DEFINE_CONST_UNICODE("&HELP_Language="); - aHelpURL += aLanguageStr; - if ( aCountryStr.Len() ) - { - aHelpURL += DEFINE_CONST_UNICODE("&HELP_Country="); - aHelpURL += aCountryStr; - } - } - else - { - sal_Bool bHasAnchor = sal_False; - String aAnchor; - aHelpURL = String::CreateFromAscii("vnd.sun.star.help://"); - aHelpURL += aModuleName; - - if ( !nHelpId ) - aHelpURL += String::CreateFromAscii("/start"); - else - { - aHelpURL += '/'; - aHelpURL += String::CreateFromInt64( nHelpId ); - - String aTempURL = aHelpURL; - AppendConfigToken_Impl( aTempURL, sal_True ); - bHasAnchor = GetHelpAnchor_Impl( aTempURL, aAnchor ); - } - - AppendConfigToken_Impl( aHelpURL, sal_True ); - - if ( bHasAnchor ) - { - aHelpURL += '#'; - aHelpURL += aAnchor; - } - } - - return aHelpURL; -} -#endif - String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ) { // build up the help URL @@ -667,28 +582,7 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rMo String aModuleName( rModuleName ); if ( aModuleName.Len() == 0 ) - { - // no active module (quicklaunch?) -> detect default module - SvtModuleOptions aModOpt; - if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) - aModuleName = DEFINE_CONST_UNICODE("swriter"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) - aModuleName = DEFINE_CONST_UNICODE("scalc"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) - aModuleName = DEFINE_CONST_UNICODE("simpress"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) - aModuleName = DEFINE_CONST_UNICODE("sdraw"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) - aModuleName = DEFINE_CONST_UNICODE("smath"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCHART ) ) - aModuleName = DEFINE_CONST_UNICODE("schart"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SBASIC ) ) - aModuleName = DEFINE_CONST_UNICODE("sbasic"); - else - { - DBG_ERRORFILE( "no installed module found" ); - } - } + aModuleName = getDefaultModule_Impl(); aHelpURL = String::CreateFromAscii("vnd.sun.star.help://"); aHelpURL += aModuleName; @@ -701,7 +595,7 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rMo aHelpURL += String( rtl::Uri::encode( aCommandURL, rtl_UriCharClassRelSegment, rtl_UriEncodeKeepEscapes, - RTL_TEXTENCODING_ASCII_US )); + RTL_TEXTENCODING_UTF8 )); String aTempURL = aHelpURL; AppendConfigToken_Impl( aTempURL, sal_True ); @@ -769,6 +663,49 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask , return pHelpWindow; } +XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow ) +{ + String sModuleName = GetHelpModuleName_Impl(); + String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName ); + + ByteString aNewHelpId; + + if ( pWindow && !sHelpText.Len() ) + { + // no help text found -> try with parent help id. + Window* pParent = pWindow->GetParent(); + while ( pParent ) + { + aNewHelpId = pParent->GetHelpId(); + sHelpText = pImp->GetHelpText( String( aNewHelpId, RTL_TEXTENCODING_UTF8 ), sModuleName ); + if ( sHelpText.Len() > 0 ) + pParent = NULL; + else + pParent = pParent->GetParent(); + } + + if ( bIsDebug && !sHelpText.Len() ) + aNewHelpId.Erase(); + } + + // add some debug information? + if ( bIsDebug ) + { + sHelpText += DEFINE_CONST_UNICODE("\n-------------\n"); + sHelpText += String( sModuleName ); + sHelpText += DEFINE_CONST_UNICODE(": "); + sHelpText += aCommandURL; + if ( aNewHelpId.Len() ) + { + sHelpText += DEFINE_CONST_UNICODE(" - "); + sHelpText += String( aNewHelpId, RTL_TEXTENCODING_UTF8 ); + } + } + + return sHelpText; +} + + BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) { // check if help is available @@ -790,34 +727,33 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) INetProtocol nProtocol = aParser.GetProtocol(); if ( nProtocol != INET_PROT_VND_SUN_STAR_HELP ) { - // #i90162 Accept anything that is not invalid as help id, as both - // uno: URLs used as commands/help ids in the Office and the scheme - // used in extension help ids (e.g. com.foocorp.foo-ext:FooDialogButton) - // are accepted as INET_PROT_UNO respectively INET_PROT_GENERIC - bool bAcceptAsURL = ( nProtocol != INET_PROT_NOT_VALID ); - - // #i94891 As in some extensions help ids like foo.bar.dummy without - // any : have been used that worked before the fix of #i90162 (see - // above) strings containing . will be also accepted to avoid brea- - // king the help of existing extensions. - if( !bAcceptAsURL ) - bAcceptAsURL = ( rURL.Search( '.' ) != STRING_NOTFOUND ); - - if ( bAcceptAsURL ) + String aHelpModuleName( GetHelpModuleName_Impl() ); + aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName ); + if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) { - aHelpURL = CreateHelpURL_Impl( rURL, GetHelpModuleName_Impl( ) ); - } - else - { - // 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 - static const String sHelpIdScheme( DEFINE_CONST_OUSTRING(".HelpId:") ); - if ( rURL.Search( sHelpIdScheme ) != 0 ) - sKeyword = ::rtl::OUString( rURL ); + // no help found -> try with parent help id. + Window* pParent = pWindow->GetParent(); + while ( pParent ) + { + ByteString aHelpId = pParent->GetHelpId(); + aHelpURL = CreateHelpURL( String( aHelpId, RTL_TEXTENCODING_UTF8 ), aHelpModuleName ); + if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) + break; + else + { + pParent = pParent->GetParent(); + if ( !pParent ) + // create help url of start page ( helpid == 0 -> start page) + aHelpURL = CreateHelpURL( String(), aHelpModuleName ); + } + } } + + // 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 + static const String sHelpIdScheme( DEFINE_CONST_OUSTRING(".HelpId:") ); + if ( rURL.Search( sHelpIdScheme ) != 0 ) + sKeyword = ::rtl::OUString( rURL ); } Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( @@ -847,6 +783,12 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow) return FALSE; +#ifdef DBG_UTIL + ByteString aTmp("SfxHelp: HelpId = "); + aTmp += ByteString( aHelpURL, RTL_TEXTENCODING_UTF8 ); + DBG_TRACE( aTmp.GetBuffer() ); +#endif + pHelpWindow->SetHelpURL( aHelpURL ); pHelpWindow->loadHelpContent(aHelpURL); if ( sKeyword.getLength() > 0 ) @@ -859,110 +801,6 @@ 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() ); - String aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName ); - if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) - { - // no help found -> try with parent help id. - Window* pParent = pWindow->GetParent(); - while ( pParent ) - { - nHelpId = pParent->GetSmartUniqueOrHelpId().GetNum(); - aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName ); - - if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) - break; - else - { - pParent = pParent->GetParent(); - if ( !pParent ) - // create help url of start page ( helpid == 0 -> start page) - aHelpURL = CreateHelpURL( 0, aHelpModuleName ); - } - } - } - - return Start( aHelpURL, pWindow ); -} -#endif - -#if 0 -// FIXME: HELPID -XubString SfxHelp::GetHelpText( ULONG nHelpId, const Window* pWindow ) -{ - String aModuleName = GetHelpModuleName_Impl(); - String aHelpText = pImp->GetHelpText( nHelpId, aModuleName ); - ULONG nNewHelpId = 0; - - if ( pWindow && aHelpText.Len() == 0 ) - { - // no help text found -> try with parent help id. - Window* pParent = pWindow->GetParent(); - while ( pParent ) - { - nNewHelpId = pParent->GetHelpId(); - aHelpText = pImp->GetHelpText( nNewHelpId, aModuleName ); - - if ( aHelpText.Len() > 0 ) - pParent = NULL; - else - pParent = pParent->GetParent(); - } - - if ( bIsDebug && aHelpText.Len() == 0 ) - nNewHelpId = 0; - } - - if ( bIsDebug ) - { - aHelpText += DEFINE_CONST_UNICODE("\n\n"); - aHelpText += aModuleName; - aHelpText += DEFINE_CONST_UNICODE(" - "); - aHelpText += String::CreateFromInt64( nHelpId ); - if ( nNewHelpId ) - { - aHelpText += DEFINE_CONST_UNICODE(" - "); - aHelpText += String::CreateFromInt64( nNewHelpId ); - } - } - - return aHelpText; -} -#endif - -XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* ) -{ - String sModuleName = GetHelpModuleName_Impl(); - String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName ); - - // add some debug information? - if ( bIsDebug ) - { - sHelpText += DEFINE_CONST_UNICODE("\n-------------\n"); - sHelpText += String( sModuleName ); - sHelpText += DEFINE_CONST_UNICODE(": "); - sHelpText += aCommandURL; - } - - return sHelpText; -} - -#if 0 -// FIXME: HELPID -String SfxHelp::CreateHelpURL( ULONG nHelpId, const String& rModuleName ) -{ - String aURL; - SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); - if ( pHelp ) - aURL = pHelp->CreateHelpURL_Impl( nHelpId, rModuleName ); - return aURL; -} -#endif - String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName ) { String aURL; @@ -972,36 +810,25 @@ String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleN return aURL; } -void SfxHelp::OpenHelpAgent( SfxFrame*, ULONG nHelpId ) +void SfxHelp::OpenHelpAgent( SfxFrame*, const rtl::OString& sHelpId ) { -// FIXME HELPID -#if 0 - SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); - if ( pHelp ) - pHelp->OpenHelpAgent( nHelpId ); -#else -(void)nHelpId; -#endif + SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); + if ( pHelp ) + pHelp->OpenHelpAgent( sHelpId ); } -// FIXME: HELPID -#if 0 -void SfxHelp::OpenHelpAgent( ULONG nHelpId ) +void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId ) { if ( SvtHelpOptions().IsHelpAgentAutoStartMode() ) { -// SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); -// if ( pHelp ) -// { SfxHelpOptions_Impl *pOpt = pImp->GetOptions(); - if ( !pOpt->HasId( nHelpId ) ) + if ( !pOpt->HasId( sHelpId ) ) return; try { URL aURL; - // FIXME: HELPID - aURL.Complete = CreateHelpURL_Impl( String()/*nHelpId*/, GetHelpModuleName_Impl() ); + aURL.Complete = CreateHelpURL_Impl( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8 ), GetHelpModuleName_Impl() ); Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ), UNO_QUERY ); xTrans->parseStrict(aURL); @@ -1027,10 +854,8 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId ) { DBG_ERRORFILE( "OpenHelpAgent: caught an exception while executing the dispatch!" ); } -// } } } -#endif String SfxHelp::GetDefaultHelpModule() { diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 2549af2a6a..fa3025acab 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -281,7 +281,11 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest if ( !pView ) pView = SfxViewFrame::Current(); if ( pView ) - SfxHelp::OpenHelpAgent( &pView->GetFrame(), rReq.GetSlot() ); + { + rtl::OString aCmd(".uno:"); + aCmd += rSlot.GetUnoName(); + SfxHelp::OpenHelpAgent( &pView->GetFrame(), aCmd ); + } SfxExecFunc pFunc = rSlot.GetExecFnc(); rShell.CallExec( pFunc, rReq ); @@ -1675,14 +1679,14 @@ void SfxDispatcher::SetMenu_Impl() } //-------------------------------------------------------------------- -long SfxDispatcher::Update_Impl( sal_Bool bForce ) +void SfxDispatcher::Update_Impl( sal_Bool bForce ) { SFX_STACK(SfxDispatcher::Update_Impl); Flush(); if ( !pImp->pFrame || pImp->bUILocked ) - return 0; + return; SFX_APP(); // -Wall is this required??? SfxDispatcher *pDisp = this; @@ -1704,7 +1708,7 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce ) } if ( !bUpdate || pImp->pFrame->GetFrame().IsClosing_Impl() ) - return 0; + return; SfxViewFrame* pTop = pImp->pFrame ? pImp->pFrame->GetTopViewFrame() : NULL; sal_Bool bUIActive = pTop && pTop->GetBindings().GetDispatcher() == this; @@ -1778,12 +1782,11 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce ) if ( xLayoutManager.is() ) xLayoutManager->unlock(); - return 1; + return; } -sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin ) +void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin ) { - sal_uInt32 nHelpId = 0; SFX_APP(); SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl(); sal_Bool bIsActive = sal_False; @@ -1798,7 +1801,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, } if ( pImp->pParent && !pImp->bQuiet /* && bUIActive */ ) - nHelpId = pImp->pParent->_Update_Impl( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin ); + pImp->pParent->_Update_Impl( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin ); for (sal_uInt16 n=0; naObjBars[n].nResId = 0; @@ -1807,7 +1810,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, // bQuiet : own shells aren't considered for UI and SlotServer // bNoUI: own Shells aren't considered fors UI if ( pImp->bQuiet || pImp->bNoUI || (pImp->pFrame && pImp->pFrame->GetObjectShell()->IsPreview()) ) - return nHelpId; + return; sal_uInt32 nStatBarId=0; SfxShell *pStatusBarShell = NULL; @@ -1818,8 +1821,6 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, { SfxShell *pShell = GetShell( nShell-1 ); SfxInterface *pIFace = pShell->GetInterface(); - if (pShell->GetHelpId()) - nHelpId = pShell->GetHelpId(); // don't consider shells if "Hidden" oder "Quiet" sal_Bool bReadOnlyShell = IsReadOnlyShell_Impl( nShell-1 ); @@ -1950,8 +1951,6 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, pImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl( nStatBarId, pStatusBarShell, rBindings ); } } - - return nHelpId; } //-------------------------------------------------------------------- diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 95ab30d49e..5f26113b4b 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -29,9 +29,6 @@ #include "precompiled_sfx2.hxx" #include #include -#ifndef GCC -#endif - #include //==================================================================== @@ -63,4 +60,16 @@ USHORT SfxSlot::GetWhich( const SfxItemPool &rPool ) const return nMasterSlotId; } +::rtl::OString SfxSlot::GetCommand() const +{ + rtl::OString sRet(".uno:"); + sRet += pUnoName; + return sRet; +} + +::rtl::OUString SfxSlot::GetCommandString() const +{ + rtl::OString aCmd(GetCommand()); + return rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 ); +} diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx index 4f855ca6b3..3d9079aa92 100644 --- a/sfx2/source/dialog/about.cxx +++ b/sfx2/source/dialog/about.cxx @@ -297,9 +297,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS FreeResource(); - // explizite Help-Id - // FIXME: HELPID - SetHelpId( ""/*SID_ABOUT*/ ); + SetHelpId( ".uno: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 355319595a..7aa488baec 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -160,9 +160,6 @@ void SfxModalDialog::GetDialogData_Impl() void SfxModalDialog::init() { GetDialogData_Impl(); - aTimer.SetTimeout( 100 ); - aTimer.SetTimeoutHdl( LINK( this, SfxModalDialog, TimerHdl_Impl ) ); - aTimer.Start(); } // ----------------------------------------------------------------------- @@ -214,13 +211,7 @@ SfxModalDialog::~SfxModalDialog() */ { -/* - SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI(); - if ( pHelpPI ) - pHelpPI->ResetTopic(); -*/ SetDialogData_Impl(); - aTimer.Stop(); delete pOutputSet; } @@ -233,16 +224,6 @@ void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool ) // ----------------------------------------------------------------------- -IMPL_LINK( SfxModalDialog, TimerHdl_Impl, Timer*, EMPTYARG ) -{ -/* - SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI(); - if ( pHelpPI ) - pHelpPI->LoadTopic( GetHelpId() ); - */ - return 0L; -} - void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet ) { DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" ); @@ -373,7 +354,6 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - // FIXME: HELPID SetUniqueId( GetHelpId() ); SetHelpId(""); if ( pBindinx ) @@ -393,7 +373,6 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - // FIXME: HELPID SetUniqueId( GetHelpId() ); SetHelpId(""); if ( pBindinx ) @@ -418,16 +397,15 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt ) pBindings->SetActiveFrame( pImp->pMgr->GetFrame() ); pImp->pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - ULONG nHelpId = 0; - while ( !nHelpId && pWindow ) + rtl::OString sHelpId; + while ( !sHelpId.getLength() && pWindow ) { - // FIXME: HELPID - nHelpId = 0; // pWindow->GetHelpId(); + sHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } - if ( nHelpId ) - SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId ); + if ( sHelpId.getLength() ) + SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId ); } else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() ) { @@ -521,16 +499,15 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt ) pBindings->SetActiveFrame( pImp->pMgr->GetFrame() ); pImp->pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - ULONG nHelpId = 0; - while ( !nHelpId && pWindow ) + rtl::OString sHelpId; + while ( !sHelpId.getLength() && pWindow ) { - // FIXME: HELPID - nHelpId = 0; //pWindow->GetHelpId(); + sHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } - if ( nHelpId ) - SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId ); + if ( sHelpId.getLength() ) + SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId ); } else if ( rEvt.GetType() == EVENT_LOSEFOCUS ) { @@ -563,7 +540,6 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - // FIXME: HELPID SetUniqueId( GetHelpId() ); SetHelpId(""); if ( pBindinx ) @@ -584,7 +560,6 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - // FIXME: HELPID SetUniqueId( GetHelpId() ); SetHelpId(""); if ( pBindinx ) diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc index 9bf64ae1e7..8738d376db 100644 --- a/sfx2/source/dialog/dialog.hrc +++ b/sfx2/source/dialog/dialog.hrc @@ -76,7 +76,6 @@ #define CB_URL ( RC_DIALOG_BEGIN + 64 ) #define STR_INTERNET ( RC_DIALOG_BEGIN + 65 ) -#define RID_AUTOHIDE ( RC_DIALOG_BEGIN + 66 ) #define DLG_ONLINE_REGISTER ( RC_DIALOG_BEGIN + 68 ) #define DLG_VERSIONS ( RC_DIALOG_BEGIN + 69 ) diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src index 7f0aec0106..18a4be26be 100644 --- a/sfx2/source/dialog/dialog.src +++ b/sfx2/source/dialog/dialog.src @@ -231,22 +231,7 @@ ModalDialog RID_URLOPEN Left = TRUE ; }; }; -Menu RID_AUTOHIDE -{ - ItemList = - { - MenuItem - { - Identifier = SID_AUTOHIDE ; - HelpID = SID_AUTOHIDE ; - Text [ en-US ] = "Hide" ; - }; - }; -}; -String RID_AUTOHIDE -{ - Text [ en-US ] = "Don't Hide" ; -}; + String SID_NAVIGATOR { Text [ en-US ] = "Navigator"; diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 792a60db5c..6d73b9daf7 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -46,6 +46,7 @@ #include #include "sfxhelp.hxx" #include +#include #include #include @@ -918,13 +919,23 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, */ { - // FIXME: HELPID - ULONG nId = 0;// GetHelpId(); - if ( !nId && pCW ) - nId = pCW->GetType(); - SetHelpId( "" ); - // FIXME: HELPID - SetUniqueId( ""/*nId*/ ); + if ( GetHelpId().getLength() ) + { + SetUniqueId( GetHelpId() ); + SetHelpId(""); + } + else + { + SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); + SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); + const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); + if ( pSlot ) + { + rtl::OString aCmd(".uno:"); + aCmd += pSlot->GetUnoName(); + SetUniqueId( aCmd ); + } + } pImp = new SfxDockingWindow_Impl; pImp->bConstructed = FALSE; @@ -962,9 +973,23 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, */ { - // FIXME: HELPID - SetUniqueId( GetHelpId() ); - SetHelpId(""); + if ( GetHelpId().getLength() ) + { + SetUniqueId( GetHelpId() ); + SetHelpId(""); + } + else + { + SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); + SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); + const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); + if ( pSlot ) + { + rtl::OString aCmd(".uno:"); + aCmd += pSlot->GetUnoName(); + SetUniqueId( aCmd ); + } + } pImp = new SfxDockingWindow_Impl; pImp->bConstructed = FALSE; @@ -1846,16 +1871,15 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt ) pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - ULONG nHelpId = 0; - while ( !nHelpId && pWindow ) + rtl::OString sHelpId; + while ( !sHelpId.getLength() && pWindow ) { - // FIXME: HELPID - //nHelpId = pWindow->GetHelpId(); + sHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } - if ( nHelpId ) - SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId ); + if ( sHelpId.getLength() ) + SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId ); // In VCL geht Notify zun"achst an das Fenster selbst, // also base class rufen, sonst erf"ahrt der parent nichts diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 13e3668303..ee5d827ed2 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -218,55 +218,55 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve { //!!! todo: cache the help strings (here or TRA) - ULONG nHelpId = 0; + rtl::OString sHelpId; // mapping from element id -> help id switch ( aEvent.ElementId ) { case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION : - nHelpId = HID_FILESAVE_AUTOEXTENSION; + sHelpId = HID_FILESAVE_AUTOEXTENSION; break; case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD : - nHelpId = HID_FILESAVE_SAVEWITHPASSWORD; + sHelpId = HID_FILESAVE_SAVEWITHPASSWORD; break; case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS : - nHelpId = HID_FILESAVE_CUSTOMIZEFILTER; + sHelpId = HID_FILESAVE_CUSTOMIZEFILTER; break; case ExtendedFilePickerElementIds::CHECKBOX_READONLY : - nHelpId = HID_FILEOPEN_READONLY; + sHelpId = HID_FILEOPEN_READONLY; break; case ExtendedFilePickerElementIds::CHECKBOX_LINK : - nHelpId = HID_FILEDLG_LINK_CB; + sHelpId = HID_FILEDLG_LINK_CB; break; case ExtendedFilePickerElementIds::CHECKBOX_PREVIEW : - nHelpId = HID_FILEDLG_PREVIEW_CB; + sHelpId = HID_FILEDLG_PREVIEW_CB; break; case ExtendedFilePickerElementIds::PUSHBUTTON_PLAY : - nHelpId = HID_FILESAVE_DOPLAY; + sHelpId = HID_FILESAVE_DOPLAY; break; case ExtendedFilePickerElementIds::LISTBOX_VERSION_LABEL : case ExtendedFilePickerElementIds::LISTBOX_VERSION : - nHelpId = HID_FILEOPEN_VERSION; + sHelpId = HID_FILEOPEN_VERSION; break; case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE_LABEL : case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE : - nHelpId = HID_FILESAVE_TEMPLATE; + sHelpId = HID_FILESAVE_TEMPLATE; break; case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE_LABEL : case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE : - nHelpId = HID_FILEOPEN_IMAGE_TEMPLATE; + sHelpId = HID_FILEOPEN_IMAGE_TEMPLATE; break; case ExtendedFilePickerElementIds::CHECKBOX_SELECTION : - nHelpId = HID_FILESAVE_SELECTION; + sHelpId = HID_FILESAVE_SELECTION; break; default: @@ -276,8 +276,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve OUString aHelpText; Help* pHelp = Application::GetHelp(); if ( pHelp ) - // FIXME: HELPID - aHelpText = String( pHelp->GetHelpText( String()/*nHelpId*/, NULL ) ); + aHelpText = String( pHelp->GetHelpText( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8), NULL ) ); return aHelpText; } @@ -1223,7 +1222,7 @@ void SAL_CALL PickerThread_Impl::run() } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId ) +void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ) { DBG_ASSERT( _pControlId && _pHelpId, "FileDialogHelper_Impl::setControlHelpIds: invalid array pointers!" ); if ( !_pControlId || !_pHelpId ) @@ -1239,10 +1238,8 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con { while ( *_pControlId ) { - // calc the help id of the element ::rtl::OUString sId( sHelpIdPrefix ); - sId += ::rtl::OUString::valueOf( *_pHelpId ); - // set the help id + sId += ::rtl::OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 ); xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, makeAny( sId ) ); ++_pControlId; ++_pHelpId; @@ -1256,7 +1253,7 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::setDialogHelpId( const sal_Int32 _nHelpId ) +void FileDialogHelper_Impl::setDialogHelpId( sal_Int32 _nHelpId ) { svt::SetDialogHelpId( mxFileDlg, _nHelpId ); } @@ -2458,7 +2455,7 @@ void FileDialogHelper::CreateMatcher( const String& rFactory ) } // ------------------------------------------------------------------------ -void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId ) +void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ) { mpImp->setControlHelpIds( _pControlId, _pHelpId ); } diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 2d20b2eca6..c5923d12aa 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -140,8 +140,8 @@ namespace sfx2 void correctVirtualDialogType(); - void setControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId ); - void setDialogHelpId( const sal_Int32 _nHelpId ); + void setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); + void setDialogHelpId( sal_Int32 nId ); sal_Bool CheckFilterOptionsCapability( const SfxFilter* _pFilter ); diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index c2ec418eb4..4335893e30 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -51,8 +51,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE); eChildAlignment = SFX_ALIGN_NOALIGNMENT; - // FIXME: HELPID - pWindow->SetHelpId ( ""/*HID_NAVIGATOR_WINDOW*/ ); + pWindow->SetHelpId ( HID_NAVIGATOR_WINDOW ); pWindow->SetOutputSizePixel( Size( 270, 240 ) ); ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo ); diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src index b691c64fa7..7ce3a1aaf6 100644 --- a/sfx2/source/dialog/newstyle.src +++ b/sfx2/source/dialog/newstyle.src @@ -28,10 +28,11 @@ #include #include "dialog.hrc" #include "newstyle.hrc" +#include "sfx2/sfxcommands.h" ModalDialog DLG_NEW_STYLE_BY_EXAMPLE { - HelpId = SID_STYLE_NEW_BY_EXAMPLE ; + HelpId = CMD_SID_STYLE_NEW_BY_EXAMPLE ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 177 , 112 ) ; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index df40838ff4..a9cc9b9d2b 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -664,8 +664,7 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText ) aCancelBtn.Show(); aHelpBtn.Show(); aResetBtn.Show(); - // FIXME: HELPID - aResetBtn.SetHelpId( ""/*HID_TABDLG_RESET_BTN*/ ); + aResetBtn.SetHelpId( HID_TABDLG_RESET_BTN ); if ( pUserBtn ) { @@ -681,8 +680,7 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText ) String aStd( SfxResId( STR_STANDARD_SHORTCUT ) ); aBaseFmtBtn.SetText( aStd ); aBaseFmtBtn.SetClickHdl( LINK( this, SfxTabDialog, BaseFmtHdl ) ); - // FIXME: HELPID - aBaseFmtBtn.SetHelpId( ""/*HID_TABDLG_STANDARD_BTN*/ ); + aBaseFmtBtn.SetHelpId( HID_TABDLG_STANDARD_BTN ); // bFmt = tempor"ares Flag im Ctor() "ubergeben, // wenn bFmt == 2, dann auch TRUE, @@ -789,8 +787,7 @@ void SfxTabDialog::EnableApplyButton(BOOL bEnable) pImpl->pApplyButton->SetText( String( SfxResId( STR_APPLY ) ) ); pImpl->pApplyButton->Show(); - // FIXME: HELPID - pImpl->pApplyButton->SetHelpId( ""/*HID_TABDLG_APPLY_BTN*/ ); + pImpl->pApplyButton->SetHelpId( HID_TABDLG_APPLY_BTN ); } else { @@ -1783,16 +1780,15 @@ long SfxTabDialog::Notify( NotifyEvent& rNEvt ) if ( pViewFrame ) { Window* pWindow = rNEvt.GetWindow(); - ULONG nHelpId = 0; - while ( !nHelpId && pWindow ) + rtl::OString sHelpId; + while ( !sHelpId.getLength() && pWindow ) { - // FIXME: HELPID - // nHelpId = pWindow->GetHelpId(); + sHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } - if ( nHelpId ) - SfxHelp::OpenHelpAgent( &pViewFrame->GetFrame(), nHelpId ); + if ( sHelpId.getLength() ) + SfxHelp::OpenHelpAgent( &pViewFrame->GetFrame(), sHelpId ); } } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 70adc1e612..8aba652021 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -778,10 +778,8 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Sfx bHierarchical ( FALSE ), bBindingUpdate ( TRUE ) { - // FIXME: HELPID - aFmtLb.SetHelpId( ""/*HID_TEMPLATE_FMT*/ ); - // FIXME: HELPID - aFilterLb.SetHelpId( ""/*HID_TEMPLATE_FILTER*/ ); + aFmtLb.SetHelpId( HID_TEMPLATE_FMT ); + aFilterLb.SetHelpId( HID_TEMPLATE_FILTER ); aFmtLb.SetWindowBits( WB_SORT | WB_HIDESELECTION ); Font aFont = aFmtLb.GetFont(); aFont.SetWeight( WEIGHT_NORMAL ); @@ -2210,32 +2208,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox // HilfePI antriggern, wenn von Call als Handler und Bereich erlaubt ist if( !pListBox || pListBox->IsSelected( pListBox->GetHdlEntry() ) ) { -#ifdef WIR_KOENNEN_WIEDER_HILFE_FUER_STYLESHEETS - SfxHelpPI* pHelpPI = SFX_APP()->GetHelpPI(); - if ( pHelpPI && pListBox && IsInitialized() && - GetSelectedEntry().Len() ) - { - const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl(); - const SfxStyleFamily eFam = pItem->GetFamily(); - DBG_ASSERT(pStyleSheetPool, "Kein Pool"); - // SfxStyleSheetBase* pStyle = pStyleSheetPool - // ? pStyleSheetPool->Find( GetSelectedEntry(), eFam ) : 0; - SfxStyleSheetBase *pStyle; - if ( pStyleSheetPool ) - pStyle = pStyleSheetPool->Find ( GetSelectedEntry(), eFam ); - else - pStyle = 0; - - if ( pStyle ) - { - String aHelpFile; - ULONG nHelpId=pStyle->GetHelpId(aHelpFile); - if ( nHelpId ) - pHelpPI->LoadTopic( nHelpId ); - } - } -#endif - // nur, wenn Giesskanne an ist if ( IsInitialized() && IsCheckedItem(SID_STYLE_WATERCAN) && @@ -2361,8 +2333,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( Font aFont=aFilterLb.GetFont(); aFont.SetWeight( WEIGHT_NORMAL ); aFilterLb.SetFont( aFont ); - // FIXME: HELPID - m_aActionTbL.SetHelpId( ""/*HID_TEMPLDLG_TOOLBOX_LEFT*/ ); + m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT ); } // ------------------------------------------------------------------------ @@ -2376,19 +2347,18 @@ void SfxTemplateDialog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable ) void SfxTemplateDialog_Impl::InsertFamilyItem(USHORT nId,const SfxStyleFamilyItem *pItem) { - USHORT nHelpId = 0; + rtl::OString sHelpId; switch( (USHORT) pItem->GetFamily() ) { - case SFX_STYLE_FAMILY_CHAR: nHelpId = SID_STYLE_FAMILY1; break; - case SFX_STYLE_FAMILY_PARA: nHelpId = SID_STYLE_FAMILY2; break; - case SFX_STYLE_FAMILY_FRAME:nHelpId = SID_STYLE_FAMILY3; break; - case SFX_STYLE_FAMILY_PAGE: nHelpId = SID_STYLE_FAMILY4; break; - case SFX_STYLE_FAMILY_PSEUDO: nHelpId = SID_STYLE_FAMILY5; break; - default: DBG_ERROR("unbekannte StyleFamily"); break; + case SFX_STYLE_FAMILY_CHAR: sHelpId = ".uno:CharStyle"; break; + case SFX_STYLE_FAMILY_PARA: sHelpId = ".uno:ParaStyle"; break; + case SFX_STYLE_FAMILY_FRAME: sHelpId = ".uno:FrameStyle"; break; + case SFX_STYLE_FAMILY_PAGE: sHelpId = ".uno:PageStyle"; break; + case SFX_STYLE_FAMILY_PSEUDO: sHelpId = ".uno:ListStyle"; break; + default: DBG_ERROR("unknown StyleFamily"); break; } m_aActionTbL.InsertItem( nId, pItem->GetImage(), pItem->GetText(), 0, 0); - // FIXME: HELPID - m_aActionTbL.SetHelpId( nId, ""/*nHelpId*/ ); + m_aActionTbL.SetHelpId( nId, sHelpId ); } // ------------------------------------------------------------------------ @@ -2687,21 +2657,18 @@ 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 ); - // FIXME: HELPID - pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, ""/*HID_TEMPLDLG_NEWBYEXAMPLE*/); + 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 ); - // FIXME: HELPID - pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, ""/*HID_TEMPLDLG_UPDATEBYEXAMPLE*/); + 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 ); - // FIXME: HELPID - pMenu->SetHelpId(SID_TEMPLATE_LOAD, ""/*SID_TEMPLATE_LOAD*/); + pMenu->SetHelpId(SID_TEMPLATE_LOAD, ".uno:LoadStyles"); pMenu->SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, MenuSelectHdl)); pMenu->Execute( pBox, diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src index 6bb33ca207..c6c7bc8fbb 100644 --- a/sfx2/source/dialog/templdlg.src +++ b/sfx2/source/dialog/templdlg.src @@ -57,7 +57,7 @@ ImageList IMG_LST_STYLE_DESIGNER_HC // RID_STYLECATALOG ------------------------------------------------------ ModalDialog RID_STYLECATALOG { - HelpId = SID_STYLE_CATALOG ; + HelpId = CMD_SID_STYLE_CATALOG ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 181 , 134 ) ; @@ -146,7 +146,7 @@ DockingWindow DLG_STYLE_DESIGNER { Text [ en-US ] = "Styles and Formatting" ; - HelpId = SID_STYLE_DESIGNER ; + HelpId = CMD_SID_STYLE_DESIGNER ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc index 0f6dd6b94a..09e7c58476 100644 --- a/sfx2/source/doc/doc.hrc +++ b/sfx2/source/doc/doc.hrc @@ -44,7 +44,6 @@ #define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 8) #define MSG_CONFIRM_FILTER (RID_SFX_DOC_START+11) #define MSG_CONFIRM_OVERWRITE_TEMPLATE (RID_SFX_DOC_START+12) -#define MSG_QUERY_LOAD_TEMPLATE (RID_SFX_DOC_START+13) #define STR_DELETE_REGION (RID_SFX_DOC_START+14) #define STR_DELETE_TEMPLATE (RID_SFX_DOC_START+15) diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src index 8386febfae..3081374941 100644 --- a/sfx2/source/doc/doc.src +++ b/sfx2/source/doc/doc.src @@ -43,14 +43,6 @@ QueryBox MSG_CONFIRM_OVERWRITE_TEMPLATE DefButton = WB_DEF_NO ; Message [ en-US ] = "Name already in use.\nDo you want to overwrite document template?" ; }; -QueryBox MSG_QUERY_LOAD_TEMPLATE -{ - BUTTONS = WB_YES_NO ; - DEFBUTTON = WB_DEF_NO ; - HelpId = MSG_QUERY_LOAD_TEMPLATE; - - Message [ en-US ] = "The Styles in this document do not match your current Styles. Should your current Styles be applied to this document?"; -}; String STR_DELETE_REGION { Text [ en-US ] = "Are you sure you want to delete the region \"$1\"?" ; diff --git a/sfx2/source/doc/doctdlg.src b/sfx2/source/doc/doctdlg.src index ee878a85ca..7c80797844 100644 --- a/sfx2/source/doc/doctdlg.src +++ b/sfx2/source/doc/doctdlg.src @@ -28,10 +28,11 @@ #include #include "doc.hrc" #include "doctdlg.hrc" +#include ModalDialog DLG_DOC_TEMPLATE { - HelpId = SID_DOCTEMPLATE ; + HelpId = CMD_SID_DOCTEMPLATE ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 280 , 128 ) ; diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index acf2a7bc6a..7f93fdd43b 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -245,9 +245,8 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent, // * always work with an own instance, even if we get only NULL in this ctor } - // FIXME: HELPID - aLeftLb.SetHelpId( ""/*HID_CTL_ORGANIZER_LEFT*/ ); - aRightLb.SetHelpId( ""/*HID_CTL_ORGANIZER_RIGHT*/ ); + 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/docvor.src b/sfx2/source/doc/docvor.src index a471a42e89..5249b0ce80 100644 --- a/sfx2/source/doc/docvor.src +++ b/sfx2/source/doc/docvor.src @@ -37,7 +37,7 @@ ModalDialog DLG_ORGANIZE { - HelpId = SID_ORGANIZER ; + HelpId = CMD_SID_ORGANIZER ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 271 , 162 ) ; diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index f8db2447cd..1e4ebbb977 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -384,7 +384,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const ::rtl::OUString&, ::sal_Int16 SAL_CALL IFrameObject::execute() throw (::com::sun::star::uno::RuntimeException) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, SID_INSERT_FLOATINGFRAME, mxObj ); + VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, rtl::OUString::createFromAscii(".uno:InsertObjectFloatingFrame"), mxObj ); if ( pDlg ) pDlg->Execute(); return 0; diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 9ef6b35593..c5343a0b42 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -177,8 +177,7 @@ SfxPreviewWin::SfxPreviewWin( Window* pParent, const ResId& rResId, SfxObjectShellLock &rDocSh ) : Window(pParent, rResId), rDocShell( rDocSh ) { - // FIXME: HELPID - SetHelpId( ""/*HID_PREVIEW_FRAME*/ ); + SetHelpId( HID_PREVIEW_FRAME ); // adjust contrast mode initially bool bUseContrast = UseHighContrastSetting(); diff --git a/sfx2/source/doc/new.src b/sfx2/source/doc/new.src index dc7bcac962..aa3e5968ed 100644 --- a/sfx2/source/doc/new.src +++ b/sfx2/source/doc/new.src @@ -28,12 +28,14 @@ #include #include "doc.hrc" #include "new.hrc" +#include + // pragma ---------------------------------------------------------------- // DLG_NEW_FILE ---------------------------------------------------------- ModalDialog DLG_NEW_FILE { - HelpId = SID_NEWDOC ; + HelpId = CMD_SID_NEWDOC ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 336 , 96 ) ; diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 301a2546c2..e9df2a2b2f 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -365,17 +365,6 @@ void SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2, USHORT) { SfxStyleSheetBasePool *pStylePool = GetStyleSheetPool(); SetOrganizerSearchMask(pStylePool); -#ifdef WIR_KOENNEN_WIEDER_HILFE_FUER_STYLESHEETS - SfxStyleSheetBase *pStyle = (*pStylePool)[nIdx2]; - if(pStyle) - { - String aHelpFile; - ULONG nHelpId=pStyle->GetHelpId(aHelpFile); - SfxHelpPI* pHelpPI = SFX_APP()->GetHelpPI(); - if ( pHelpPI && nHelpId ) - pHelpPI->LoadTopic( nHelpId ); - } -#endif } } diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index 789e1efcd9..5a8c6f5e90 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -31,7 +31,7 @@ #include "querytemplate.hxx" #include "sfxresid.hxx" #include "doc.hrc" - +#include "helpid.hrc" #include namespace sfx2 @@ -41,8 +41,7 @@ QueryTemplateBox::QueryTemplateBox( Window* pParent, const String& rMessage ) : MessBox ( pParent, 0, Application::GetDisplayName(), rMessage ) { SetImage( QueryBox::GetStandardImage() ); - // FIXME: HELPID - SetHelpId( ""/*MSG_QUERY_LOAD_TEMPLATE*/ ); + SetHelpId( HID_QUERY_LOAD_TEMPLATE ); AddButton( String( SfxResId( STR_QRYTEMPL_UPDATE_BTN ) ), RET_YES, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON ); diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index 618b61b54c..3bb8da613f 100644 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -30,330 +30,323 @@ // include ------------------------------------------------------------------ #include +#include // Help-Ids ----------------------------------------------------------------- -#define HID_GLOBAL_FALLBACK 0xFFFFFFFF +#define HID_FILTER_SELECT "SFX2_HID_FILTER_SELECT" +#define HID_USERDEFBMP "SFX2_HID_USERDEFBMP" +#define HID_DOCINFO_EDT "SFX2_HID_DOCINFO_EDT" +#define HID_PASSWD "SFX2_HID_PASSWD" +#define HID_PRINTMONITOR "SFX2_HID_PRINTMONITOR" +#define HID_CONFIG_OBJECTBAR "SFX2_HID_CONFIG_OBJECTBAR" +#define HID_MANAGE_STYLES "SFX2_HID_MANAGE_STYLES" +#define HID_CONFIG_EVENT "SFX2_HID_CONFIG_EVENT" +#define HID_DOCINFODESC "SFX2_HID_DOCINFODESC" +#define HID_DOCINFODOC "SFX2_HID_DOCINFODOC" +#define HID_DOCINFOUSER "SFX2_HID_DOCINFOUSER" +#define HID_BOOKMARKPROPS "SFX2_HID_BOOKMARKPROPS" +#define HID_BOOKGROUPPROPS "SFX2_HID_BOOKGROUPPROPS" +#define HID_BOOKFILEPROPS "SFX2_HID_BOOKFILEPROPS" +#define HID_NEWS_SERVERPROPS "SFX2_HID_NEWS_SERVERPROPS" +#define HID_NEWS_RULEPAGE "SFX2_HID_NEWS_RULEPAGE" +#define HID_MAILINTRAYPROPS "SFX2_HID_MAILINTRAYPROPS" +#define HID_DOCINFORELOAD "SFX2_HID_DOCINFORELOAD" +#define HID_NEWS_GROUPPAGE "SFX2_HID_NEWS_GROUPPAGE" +#define HID_NEWS_SERVERPAGE "SFX2_HID_NEWS_SERVERPAGE" +#define HID_FILEDLG_STANDARD "SFX2_HID_FILEDLG_STANDARD" +#define HID_FILEDLG_MANAGER "SFX2_HID_FILEDLG_MANAGER" +#define HID_FILEDLG_URL "SFX2_HID_FILEDLG_URL" +#define HID_FILEDLG_FILE "SFX2_HID_FILEDLG_FILE" +#define HID_FILEDLG_USE_PASSWD "SFX2_HID_FILEDLG_USE_PASSWD" +#define HID_FILEDLG_READ_ONLY "SFX2_HID_FILEDLG_READ_ONLY" +#define HID_EXPLORERCONTROL "SFX2_HID_EXPLORERCONTROL" +#define HID_BROWSERCONTROL "SFX2_HID_BROWSERCONTROL" +#define HID_CTL_ORGANIZER_LEFT "SFX2_HID_CTL_ORGANIZER_LEFT" +#define HID_CTL_ORGANIZER_RIGHT "SFX2_HID_CTL_ORGANIZER_RIGHT" +#define HID_EXPLMAILSRV_GENERAL_PAGE "SFX2_HID_EXPLMAILSRV_GENERAL_PAGE" +#define HID_EXPLMAILSRV_PROTOCOL_PAGE "SFX2_HID_EXPLMAILSRV_PROTOCOL_PAGE" +#define HID_EXPLMAILSRV_DATAMATCH_PAGE "SFX2_HID_EXPLMAILSRV_DATAMATCH_PAGE" +#define HID_EXPLMAILSRV_SENDJOURNAL_PAGE "SFX2_HID_EXPLMAILSRV_SENDJOURNAL_PAGE" +#define HID_EXPLMAIL_GENERAL_PAGE "SFX2_HID_EXPLMAIL_GENERAL_PAGE" +#define HID_NEWS_CTL_RULES "SFX2_HID_NEWS_CTL_RULES" +#define HID_NEWS_CTL_GROUPS "SFX2_HID_NEWS_CTL_GROUPS" +#define HID_CONFIG_OBJECTBAR_CTL "SFX2_HID_CONFIG_OBJECTBAR_CTL" +#define HID_NEWS_QUICKSEARCH "SFX2_HID_NEWS_QUICKSEARCH" +#define HID_NEWS_SERVERVIEWPROPS "SFX2_HID_NEWS_SERVERVIEWPROPS" +#define HID_NEWS_SHOWARTICLEPROPS "SFX2_HID_NEWS_SHOWARTICLEPROPS" +#define HID_NEWS_SHOWGROUPPROPS "SFX2_HID_NEWS_SHOWGROUPPROPS" +#define HID_NEWS_USER "SFX2_HID_NEWS_USER" +#define HID_MULTISELECTION_GENERAL_PAGE "SFX2_HID_MULTISELECTION_GENERAL_PAGE" +#define HID_LINK_GENERAL_PAGE "SFX2_HID_LINK_GENERAL_PAGE" +#define HID_LINK_ADDRESS_PAGE "SFX2_HID_LINK_ADDRESS_PAGE" +#define HID_FOLDER_GENERAL_PAGE "SFX2_HID_FOLDER_GENERAL_PAGE" +#define HID_FILE_GENERAL_PAGE "SFX2_HID_FILE_GENERAL_PAGE" +#define HID_FTP_GENERAL_PAGE "SFX2_HID_FTP_GENERAL_PAGE" +#define HID_PRINT_OPTIONS "SFX2_HID_PRINT_OPTIONS" +#define HID_PREVIEW_FRAME "SFX2_HID_PREVIEW_FRAME" +#define HID_DOCINFO_FRAME "SFX2_HID_DOCINFO_FRAME" +#define HID_EXPLORER_FRAME "SFX2_HID_EXPLORER_FRAME" +#define HID_APP_WIN "SFX2_HID_APP_WIN" +#define HID_TEMPLATE_FMT "SFX2_HID_TEMPLATE_FMT" +#define HID_TEMPLATE_FILTER "SFX2_HID_TEMPLATE_FILTER" +#define HID_FTPSERVER_PAGE "SFX2_HID_FTPSERVER_PAGE" +#define HID_DLG_SFX_EXP_SEARCH "SFX2_HID_DLG_SFX_EXP_SEARCH" +#define HID_TP_SFX_EXP_SEARCH_CRITERIA "SFX2_HID_TP_SFX_EXP_SEARCH_CRITERIA" +#define HID_TP_SFX_EXP_SEARCH_PLACE "SFX2_HID_TP_SFX_EXP_SEARCH_PLACE" +#define HID_SEARCH_DLG_TABLB "SFX2_HID_SEARCH_DLG_TABLB" +#define HID_TEMPLDLG_NEWBYEXAMPLE "SFX2_HID_TEMPLDLG_NEWBYEXAMPLE" +#define HID_TEMPLDLG_UPDATEBYEXAMPLE "SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE" +#define HID_TEMPLDLG_WATERCAN "SFX2_HID_TEMPLDLG_WATERCAN" +#define HID_DESKTOP "SFX2_HID_DESKTOP" +#define HID_EXPLORERTOOLSTOOLBOX "SFX2_HID_EXPLORERTOOLSTOOLBOX" +#define HID_EXPLOREROBJECTTOOLBOX "SFX2_HID_EXPLOREROBJECTTOOLBOX" +#define HID_RECORDINGTOOLBOX "SFX2_HID_RECORDINGTOOLBOX" +#define HID_FULLSCREENTOOLBOX "SFX2_HID_FULLSCREENTOOLBOX" +#define HID_HELPBAR "SFX2_HID_HELPBAR" +#define HID_ENVTOOLBOX "SFX2_HID_ENVTOOLBOX" +#define HID_FRAMESETEDIT_TOOLBOX "SFX2_HID_FRAMESETEDIT_TOOLBOX" +#define HID_NAVIGATOR_WINDOW "SFX2_HID_NAVIGATOR_WINDOW" +#define HID_TABDLG_RESET_BTN "SFX2_HID_TABDLG_RESET_BTN" +#define HID_TABDLG_STANDARD_BTN "SFX2_HID_TABDLG_STANDARD_BTN" +#define HID_HELPAGENT_TIP_BOX "SFX2_HID_HELPAGENT_TIP_BOX" +#define HID_TEMPLDLG_TOOLBOX_LEFT "SFX2_HID_TEMPLDLG_TOOLBOX_LEFT" +#define HID_TEMPLDLG_TOOLBOX_RIGHT "SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT" +#define HID_EXPLORER_SRCH_COUNT "SFX2_HID_EXPLORER_SRCH_COUNT" +#define HID_BEAMER_SORT_ASCENDING "SFX2_HID_BEAMER_SORT_ASCENDING" +#define HID_BEAMER_SORT_DESCENDING "SFX2_HID_BEAMER_SORT_DESCENDING" +#define HID_EXPLORER_SRCH_LATEST_COUNT "SFX2_HID_EXPLORER_SRCH_LATEST_COUNT" +#define HID_CONFIG_EVENT_OFFICE_BASED "SFX2_HID_CONFIG_EVENT_OFFICE_BASED" +#define HID_CONFIG_EVENT_DOCUMENT_BASED "SFX2_HID_CONFIG_EVENT_DOCUMENT_BASED" +#define HID_ORGANIZE_NEW "SFX2_HID_ORGANIZE_NEW" +#define HID_ORGANIZE_DELETE "SFX2_HID_ORGANIZE_DELETE" +#define HID_ORGANIZE_EDIT "SFX2_HID_ORGANIZE_EDIT" +#define HID_ORGANIZE_COPY_FROM "SFX2_HID_ORGANIZE_COPY_FROM" +#define HID_ORGANIZE_COPY_TO "SFX2_HID_ORGANIZE_COPY_TO" +#define HID_ORGANIZE_PRINT "SFX2_HID_ORGANIZE_PRINT" +#define HID_ORGANIZE_PRINTER_SETUP "SFX2_HID_ORGANIZE_PRINTER_SETUP" +#define HID_ORGANIZE_RESCAN "SFX2_HID_ORGANIZE_RESCAN" +#define HID_STYLIST_NEW "SFX2_HID_STYLIST_NEW" +#define HID_STYLIST_EDIT "SFX2_HID_STYLIST_EDIT" +#define HID_STYLIST_DELETE "SFX2_HID_STYLIST_DELETE" +#define HID_EXPLORERMENU_ARRANGEICONS "SFX2_HID_EXPLORERMENU_ARRANGEICONS" +#define HID_EXPLORERMENU_ARRANGEICONS_ONGRID "SFX2_HID_EXPLORERMENU_ARRANGEICONS_ONGRID" +#define HID_EXPLORERMENU_FIXEDICONPOS "SFX2_HID_EXPLORERMENU_FIXEDICONPOS" +#define HID_EXPLORERMENU_OPEN "SFX2_HID_EXPLORERMENU_OPEN" +#define HID_EXPLORERMENU_PRINT "SFX2_HID_EXPLORERMENU_PRINT" +#define HID_EXPLORERMENU_SEARCH "SFX2_HID_EXPLORERMENU_SEARCH" +#define HID_EXPLORERMENU_COPY "SFX2_HID_EXPLORERMENU_COPY" +#define HID_EXPLORERMENU_DELETE "SFX2_HID_EXPLORERMENU_DELETE" +#define HID_EXPLORERMENU_CREATELINK "SFX2_HID_EXPLORERMENU_CREATELINK" +#define HID_EXPLORERMENU_EDITPROPERTIES "SFX2_HID_EXPLORERMENU_EDITPROPERTIES" +#define HID_EXPLORERMENU_DOWNLOAD "SFX2_HID_EXPLORERMENU_DOWNLOAD" +#define HID_EXPLORERMENU_STDTEMPLATE "SFX2_HID_EXPLORERMENU_STDTEMPLATE" +#define HID_EXPLORERDLG_FILELIST "SFX2_HID_EXPLORERDLG_FILELIST" +#define HID_PDFOLDERS_WORKPLACE "SFX2_HID_PDFOLDERS_WORKPLACE" +#define HID_PDFOLDERS_EXPLORER "SFX2_HID_PDFOLDERS_EXPLORER" +#define HID_PDFOLDERS_STANDARD "SFX2_HID_PDFOLDERS_STANDARD" +#define HID_PDFOLDERS_ROOT "SFX2_HID_PDFOLDERS_ROOT" +#define HID_PDFOLDERS_DESKTOP "SFX2_HID_PDFOLDERS_DESKTOP" +#define HID_CNTMENU_REMOVE_GROUP "SFX2_HID_CNTMENU_REMOVE_GROUP" +#define HID_CNTMENU_CLEAR_CACHE "SFX2_HID_CNTMENU_CLEAR_CACHE" +#define HID_CNT_SYNC_INFO_DLG "SFX2_HID_CNT_SYNC_INFO_DLG" +#define HID_CNT_REMOVE_REMOVEDLIST "SFX2_HID_CNT_REMOVE_REMOVEDLIST" +#define HID_CNT_ABORT_DIALOG "SFX2_HID_CNT_ABORT_DIALOG" +#define HID_CNT_PAGE_PRJ_DATAEXCHANGE "SFX2_HID_CNT_PAGE_PRJ_DATAEXCHANGE" +#define HID_CHAOSDOC_OBJECTBAR_FILE "SFX2_HID_CHAOSDOC_OBJECTBAR_FILE" +#define HID_CHAOSDOC_OBJECTBAR_MESSAGE "SFX2_HID_CHAOSDOC_OBJECTBAR_MESSAGE" +#define HID_CHAOSDOC_MN_PART_OPEN "SFX2_HID_CHAOSDOC_MN_PART_OPEN" +#define HID_CHAOSDOC_MN_PART_DELETE "SFX2_HID_CHAOSDOC_MN_PART_DELETE" +#define HID_CHAOSDOC_MN_PART_RENAME "SFX2_HID_CHAOSDOC_MN_PART_RENAME" +#define HID_CHAOSDOC_MN_PART_SAVEAS "SFX2_HID_CHAOSDOC_MN_PART_SAVEAS" +#define HID_EXPLORER_DOCVIEW_ICON "SFX2_HID_EXPLORER_DOCVIEW_ICON" +#define HID_EXPLORER_DOCVIEW_DETAILS "SFX2_HID_EXPLORER_DOCVIEW_DETAILS" +#define HID_CHAOSDOC_WIN "SFX2_HID_CHAOSDOC_WIN" +#define HID_CHAOSDOC_WIN_HEADER "SFX2_HID_CHAOSDOC_WIN_HEADER" +#define HID_CHAOSDOC_WIN_PARTS "SFX2_HID_CHAOSDOC_WIN_PARTS" +#define HID_CHAOSDOC_WIN_BODY "SFX2_HID_CHAOSDOC_WIN_BODY" +#define HID_CNT_INSERT_COLUMN "SFX2_HID_CNT_INSERT_COLUMN" +#define HID_CNT_REMOVE_COLUMN "SFX2_HID_CNT_REMOVE_COLUMN" +#define HID_CNT_OPT_WIDTH "SFX2_HID_CNT_OPT_WIDTH" +#define HID_CNT_SORT_ASC "SFX2_HID_CNT_SORT_ASC" +#define HID_CNT_SORT_DESC "SFX2_HID_CNT_SORT_DESC" +#define HID_CNT_RULEPG_OPEN_DIR "SFX2_HID_CNT_RULEPG_OPEN_DIR" +#define HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK "SFX2_HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK" +#define HID_CHAOSDOC_MN_HEADER_COPYLINK "SFX2_HID_CHAOSDOC_MN_HEADER_COPYLINK" +#define HID_CLEAN_CACHE "SFX2_HID_CLEAN_CACHE" +#define HID_SBOX_LOCATION "SFX2_HID_SBOX_LOCATION" +#define HID_SBOX_SUBSCRIBTION "SFX2_HID_SBOX_SUBSCRIBTION" +#define HID_SBOX_CDF_SUBSCRIBTION "SFX2_HID_SBOX_CDF_SUBSCRIBTION" +#define HID_SBOX_SCHEDULE "SFX2_HID_SBOX_SCHEDULE" +#define HID_SBOX_NOTIFICATION "SFX2_HID_SBOX_NOTIFICATION" +#define HID_SBOX_SDC_GENERAL "SFX2_HID_SBOX_SDC_GENERAL" +#define HID_BRWBOX_HEADERBAR "SFX2_HID_BRWBOX_HEADERBAR" +#define HID_CANNOT_CREATE_BMK_HERE "SFX2_HID_CANNOT_CREATE_BMK_HERE" +#define HID_CREATE_BOOKMARK "SFX2_HID_CREATE_BOOKMARK" +#define HID_TASKBAR "SFX2_HID_TASKBAR" +#define HID_TASKBUTTONBAR "SFX2_HID_TASKBUTTONBAR" +#define HID_TASKTOOLBAR "SFX2_HID_TASKTOOLBAR" +#define HID_CHAOSDOC_SHOW_FSYS_EXTENSION "SFX2_HID_CHAOSDOC_SHOW_FSYS_EXTENSION" +#define HID_CNT_FILE "SFX2_HID_CNT_FILE" +#define HID_CHAOSDOC_MN_BODY_OPENLINK "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK" +#define HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK" +#define HID_CHAOSDOC_MN_BODY_DOWNLOAD "SFX2_HID_CHAOSDOC_MN_BODY_DOWNLOAD" +#define HID_CHAOSDOC_MN_BODY_ADDBOOKMARK "SFX2_HID_CHAOSDOC_MN_BODY_ADDBOOKMARK" +#define HID_OPEN_MENU_CNT "SFX2_HID_OPEN_MENU_CNT" +#define HID_CNT_OPEN_AS_TEMPLATE "SFX2_HID_CNT_OPEN_AS_TEMPLATE" +#define HID_CNT_OPEN_AS_DOC "SFX2_HID_CNT_OPEN_AS_DOC" +#define HID_PDFOLDERS_TEMPLATE "SFX2_HID_PDFOLDERS_TEMPLATE" +#define HID_EXPLORER_ROOT "SFX2_HID_EXPLORER_ROOT" +#define HID_RESET_URL "SFX2_HID_RESET_URL" +#define HID_PHONE_DIALOG "SFX2_HID_PHONE_DIALOG" +#define HID_QB_RESOLVE_LINK "SFX2_HID_QB_RESOLVE_LINK" +#define HID_CHAOSDOC_MN_HEADER_FLAG_BOLD "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_BOLD" +#define HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC" +#define HID_CHAOSDOC_MN_HEADER_BIG_HEADER "SFX2_HID_CHAOSDOC_MN_HEADER_BIG_HEADER" +#define HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER "SFX2_HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER" +#define HID_CNT_MARK_THREAD_MARKED "SFX2_HID_CNT_MARK_THREAD_MARKED" +#define HID_CNT_MARK_THREAD_UNMARKED "SFX2_HID_CNT_MARK_THREAD_UNMARKED" +#define HID_CNT_DLG_SEARCH_BT_SHOW "SFX2_HID_CNT_DLG_SEARCH_BT_SHOW" +#define HID_CNT_DLG_SEARCH_BT_UPDATE "SFX2_HID_CNT_DLG_SEARCH_BT_UPDATE" +#define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE "SFX2_HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE" +#define HID_CNT_DLG_SEARCH_BT_STOP "SFX2_HID_CNT_DLG_SEARCH_BT_STOP" +#define HID_CNT_PAGE_HEADER "SFX2_HID_CNT_PAGE_HEADER" +#define HID_CNT_DLG_ADDRESS "SFX2_HID_CNT_DLG_ADDRESS" +#define HID_EXPLORERMENU_AUTO_ARRANGEICONS "SFX2_HID_EXPLORERMENU_AUTO_ARRANGEICONS" +#define HID_EXPLORERMENU_AUTO_ADJUSTICONS "SFX2_HID_EXPLORERMENU_AUTO_ADJUSTICONS" +#define HID_EXPLORERMENU_FREE_POSITIONING "SFX2_HID_EXPLORERMENU_FREE_POSITIONING" +#define HID_CNT_TARGET_MENU "SFX2_HID_CNT_TARGET_MENU" +#define HID_CNT_PAGE_DESCRIPTION "SFX2_HID_CNT_PAGE_DESCRIPTION" +#define HID_CNT_LB_HEADER "SFX2_HID_CNT_LB_HEADER" +#define HID_CNT_LB_DESCRIPTION "SFX2_HID_CNT_LB_DESCRIPTION" +#define HID_GROUPVIEW_BIG_SYMBOLS "SFX2_HID_GROUPVIEW_BIG_SYMBOLS" +#define HID_GROUPVIEW_SMALL_SYMBOLS "SFX2_HID_GROUPVIEW_SMALL_SYMBOLS" +#define HID_GROUPVIEW_ADD_GROUP "SFX2_HID_GROUPVIEW_ADD_GROUP" +#define HID_GROUPVIEW_REMOVE_GROUP "SFX2_HID_GROUPVIEW_REMOVE_GROUP" +#define HID_GROUPVIEW_RENAME_GROUP "SFX2_HID_GROUPVIEW_RENAME_GROUP" +#define HID_GROUPVIEW_ADD_BOOKMARK "SFX2_HID_GROUPVIEW_ADD_BOOKMARK" +#define HID_GROUPVIEW_TREE "SFX2_HID_GROUPVIEW_TREE" +#define HID_GROUPVIEW_ADD_AS_FOLDER "SFX2_HID_GROUPVIEW_ADD_AS_FOLDER" +#define HID_GROUPVIEW_ADD_AS_BMK "SFX2_HID_GROUPVIEW_ADD_AS_BMK" +#define HID_GROUPVIEW_REMOVE_BMK "SFX2_HID_GROUPVIEW_REMOVE_BMK" +#define HID_GROUPVIEW_CONTENT_BIG "SFX2_HID_GROUPVIEW_CONTENT_BIG" +#define HID_GROUPVIEW_CONTENT_SMALL "SFX2_HID_GROUPVIEW_CONTENT_SMALL" +#define HID_GROUPVIEW_CONTENT_TREE "SFX2_HID_GROUPVIEW_CONTENT_TREE" +#define HID_GROUPVIEW_SHOW_DOCS "SFX2_HID_GROUPVIEW_SHOW_DOCS" +#define HID_EDIT_TEMPLATE "SFX2_HID_EDIT_TEMPLATE" +#define HID_PDFOLDERS_GRAPHICS "SFX2_HID_PDFOLDERS_GRAPHICS" +#define HID_FILEDLG_AUTOCOMPLETEBOX "SFX2_HID_FILEDLG_AUTOCOMPLETEBOX" +#define HID_FILEDLG_SAVE_BTN "SFX2_HID_FILEDLG_SAVE_BTN" +#define HID_FILEDLG_SAVE_FILENAME "SFX2_HID_FILEDLG_SAVE_FILENAME" +#define HID_FILEDLG_SAVE_FILETYPE "SFX2_HID_FILEDLG_SAVE_FILETYPE" +#define HID_FILEDLG_INSERT_BTN "SFX2_HID_FILEDLG_INSERT_BTN" +#define HID_FILEDLG_PATH_BTN "SFX2_HID_FILEDLG_PATH_BTN" +#define HID_FILEDLG_PATH_FILENAME "SFX2_HID_FILEDLG_PATH_FILENAME" +#define HID_FILEDLG_FOLDER_BTN "SFX2_HID_FILEDLG_FOLDER_BTN" +#define HID_FILEDLG_FOLDER_FILENAME "SFX2_HID_FILEDLG_FOLDER_FILENAME" +#define HID_FILEDLG_SRCHFOLDER_BTN "SFX2_HID_FILEDLG_SRCHFOLDER_BTN" +#define HID_PDFOLDERS_GROUPS "SFX2_HID_PDFOLDERS_GROUPS" +#define HID_OPEN_CHOOSE_FILTER "SFX2_HID_OPEN_CHOOSE_FILTER" +#define HID_PDFOLDERS_BOOKMARKS "SFX2_HID_PDFOLDERS_BOOKMARKS" +#define HID_PDFOLDERS_FAVORITES_ADD "SFX2_HID_PDFOLDERS_FAVORITES_ADD" +#define HID_PDFOLDERS_FAVORITES_REMOVE "SFX2_HID_PDFOLDERS_FAVORITES_REMOVE" +#define HID_PDFOLDERS_HISTORY "SFX2_HID_PDFOLDERS_HISTORY" +#define HID_FILEDLG_EDIT_FAVORITES "SFX2_HID_FILEDLG_EDIT_FAVORITES" +#define HID_FILEDLG_NEW_FAVORITE "SFX2_HID_FILEDLG_NEW_FAVORITE" +#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX "SFX2_HID_FILEDLG_EDIT_FAVORITES_LISTBOX" +#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR "SFX2_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR" +#define HID_CNT_CB_FORCE_BODY_EXPORT "SFX2_HID_CNT_CB_FORCE_BODY_EXPORT" +#define HID_CNT_PAGE_REPSTATE_CONTROL "SFX2_HID_CNT_PAGE_REPSTATE_CONTROL" +#define HID_TASKSTATUSBAR "SFX2_HID_TASKSTATUSBAR" +#define HID_CNT_PAGE_HEADER_TABBAR "SFX2_HID_CNT_PAGE_HEADER_TABBAR" +#define HID_CNT_PAGE_SUBSCR_TABBAR "SFX2_HID_CNT_PAGE_SUBSCR_TABBAR" +#define HID_CHAOSDOC_MN_PART_PRINT "SFX2_HID_CHAOSDOC_MN_PART_PRINT" +#define HID_STATUSINDICATOR_TEXT "SFX2_HID_STATUSINDICATOR_TEXT" +#define HID_STATUSINDICATOR_PROGRESS "SFX2_HID_STATUSINDICATOR_PROGRESS" +#define HID_CNT_VALUE_ADDED_NONE "SFX2_HID_CNT_VALUE_ADDED_NONE" +#define HID_CNT_VALUE_ADDED_DOCINFO "SFX2_HID_CNT_VALUE_ADDED_DOCINFO" +#define HID_CNT_VALUE_ADDED_FULL "SFX2_HID_CNT_VALUE_ADDED_FULL" +#define HID_CNT_MESSAGE_STOREMODE_REMOTE "SFX2_HID_CNT_MESSAGE_STOREMODE_REMOTE" +#define HID_CNT_MESSAGE_STOREMODE_LOCAL "SFX2_HID_CNT_MESSAGE_STOREMODE_LOCAL" +#define HID_CNT_VIEW_ALL_ARTICLES "SFX2_HID_CNT_VIEW_ALL_ARTICLES" +#define HID_CNT_VIEW_UNREAD_ARTICLES "SFX2_HID_CNT_VIEW_UNREAD_ARTICLES" +#define HID_CNT_VIEW_READ_ARTICLES "SFX2_HID_CNT_VIEW_READ_ARTICLES" +#define HID_CNT_VIEW_MARKED_ARTICLES "SFX2_HID_CNT_VIEW_MARKED_ARTICLES" +#define HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES "SFX2_HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES" +#define HID_CNT_VIEW_ALL_FOLDERS "SFX2_HID_CNT_VIEW_ALL_FOLDERS" +#define HID_CNT_VIEW_SUBSCRIBED_FOLDERS "SFX2_HID_CNT_VIEW_SUBSCRIBED_FOLDERS" +#define HID_CNT_VIEW_ACTIVE_FOLDERS "SFX2_HID_CNT_VIEW_ACTIVE_FOLDERS" +#define HID_CNT_SENT_VIEW_ALL_ARTICLES "SFX2_HID_CNT_SENT_VIEW_ALL_ARTICLES" +#define HID_CNT_SENT_VIEW_SENT_ARTICLES "SFX2_HID_CNT_SENT_VIEW_SENT_ARTICLES" +#define HID_CNT_SENT_VIEW_UNSENT_ARTICLES "SFX2_HID_CNT_SENT_VIEW_UNSENT_ARTICLES" +#define HID_CNT_SENT_VIEW_MARKED_ARTICLES "SFX2_HID_CNT_SENT_VIEW_MARKED_ARTICLES" +#define HID_MAILWIN_SEND_BUTTON "SFX2_HID_MAILWIN_SEND_BUTTON" +#define HID_MAILWIN_CLOSE_BUTTON "SFX2_HID_MAILWIN_CLOSE_BUTTON" +#define HID_MAILWIN_ROLE_BOX "SFX2_HID_MAILWIN_ROLE_BOX" +#define HID_MAILWIN_ADDRESS_EDIT "SFX2_HID_MAILWIN_ADDRESS_EDIT" +#define HID_MAILWIN_ADDRESS_BOX "SFX2_HID_MAILWIN_ADDRESS_BOX" +#define HID_MAILWIN_SUBJECT_EDIT "SFX2_HID_MAILWIN_SUBJECT_EDIT" +#define HID_MAILWIN_FROM_EDIT "SFX2_HID_MAILWIN_FROM_EDIT" +#define HID_MAILWIN_PRIO_BOX "SFX2_HID_MAILWIN_PRIO_BOX" +#define HID_TABDLG_APPLY_BTN "SFX2_HID_TABDLG_APPLY_BTN" +#define HID_TP_COMMONPRINTOPTIONS "SFX2_HID_TP_COMMONPRINTOPTIONS" +#define HID_FILEDLG_LINK_CB "SFX2_HID_FILEDLG_LINK_CB" +#define HID_FILEDLG_PREVIEW_CB "SFX2_HID_FILEDLG_PREVIEW_CB" +#define HID_HELP_WINDOW "SFX2_HID_HELP_WINDOW" +#define HID_HELP_LISTBOX "SFX2_HID_HELP_LISTBOX" +#define HID_HELP_TABCONTROL "SFX2_HID_HELP_TABCONTROL" +#define HID_HELP_TOOLBOX "SFX2_HID_HELP_TOOLBOX" +#define HID_HELP_TOOLBOXITEM_INDEX "SFX2_HID_HELP_TOOLBOXITEM_INDEX" +#define HID_HELP_TOOLBOXITEM_START "SFX2_HID_HELP_TOOLBOXITEM_START" +#define HID_HELP_TOOLBOXITEM_BACKWARD "SFX2_HID_HELP_TOOLBOXITEM_BACKWARD" +#define HID_HELP_TOOLBOXITEM_FORWARD "SFX2_HID_HELP_TOOLBOXITEM_FORWARD" +#define HID_HELP_TOOLBOXITEM_PRINT "SFX2_HID_HELP_TOOLBOXITEM_PRINT" +#define HID_HELP_TOOLBOXITEM_BOOKMARKS "SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS" +#define HID_HELP_TABPAGE_CONTENTS "SFX2_HID_HELP_TABPAGE_CONTENTS" +#define HID_HELP_TABPAGE_INDEX "SFX2_HID_HELP_TABPAGE_INDEX" +#define HID_HELP_TABPAGE_SEARCH "SFX2_HID_HELP_TABPAGE_SEARCH" +#define HID_HELP_TABPAGE_BOOKMARKS "SFX2_HID_HELP_TABPAGE_BOOKMARKS" +#define HID_TBXCONTROL_FILENEW "SFX2_HID_TBXCONTROL_FILENEW" +#define HID_ORGANIZE_STDTEMPLATE_ADD "SFX2_HID_ORGANIZE_STDTEMPLATE_ADD" +#define HID_ORGANIZE_STDTEMPLATE_DEL "SFX2_HID_ORGANIZE_STDTEMPLATE_DEL" +#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG "SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG" +#define HID_HELP_BOOKMARKS_OPEN "SFX2_HID_HELP_BOOKMARKS_OPEN" +#define HID_HELP_BOOKMARKS_RENAME "SFX2_HID_HELP_BOOKMARKS_RENAME" +#define HID_HELP_BOOKMARKS_DELETE "SFX2_HID_HELP_BOOKMARKS_DELETE" +#define HID_CLOSE_WARNING "SFX2_HID_CLOSE_WARNING" +#define HID_DID_SAVE_PACKED_XML "SFX2_HID_DID_SAVE_PACKED_XML" +#define HID_HELP_TREELISTBOX_CONTENTS "SFX2_HID_HELP_TREELISTBOX_CONTENTS" +#define HID_CUSTOMIZETOOLBOX "SFX2_HID_CUSTOMIZETOOLBOX" +#define HID_CUSTOMIZETOOLBOX_FUNCTIONS "SFX2_HID_CUSTOMIZETOOLBOX_FUNCTIONS" +#define HID_CUSTOMIZETOOLBOX_TOOLBOX "SFX2_HID_CUSTOMIZETOOLBOX_TOOLBOX" +#define HID_HELP_TEXT_SELECTION_MODE "SFX2_HID_HELP_TEXT_SELECTION_MODE" -#define HID_FILTER_SELECT (HID_SFX_START + 0) -#define HID_USERDEFBMP (HID_SFX_START + 1) -#define HID_DOCINFO_EDT (HID_SFX_START + 2) -#define HID_PASSWD (HID_SFX_START + 3) -#define HID_PRINTMONITOR (HID_SFX_START + 4) -#define HID_CONFIG_OBJECTBAR (HID_SFX_START + 5) -#define HID_MANAGE_STYLES (HID_SFX_START + 6) -#define HID_CONFIG_EVENT (HID_SFX_START + 7) -#define HID_DOCINFODESC (HID_SFX_START + 8) -#define HID_DOCINFODOC (HID_SFX_START + 9) -#define HID_DOCINFOUSER (HID_SFX_START + 10) -#define HID_BOOKMARKPROPS (HID_SFX_START + 14) -#define HID_BOOKGROUPPROPS (HID_SFX_START + 15) -#define HID_BOOKFILEPROPS (HID_SFX_START + 16) -#define HID_NEWS_SERVERPROPS (HID_SFX_START + 20) -#define HID_NEWS_RULEPAGE (HID_SFX_START + 21) -#define HID_MAILINTRAYPROPS (HID_SFX_START + 23) -#define HID_DOCINFORELOAD (HID_SFX_START + 24) -#define HID_NEWS_GROUPPAGE (HID_SFX_START + 25) -#define HID_NEWS_SERVERPAGE (HID_SFX_START + 26) -#define HID_FILEDLG_STANDARD (HID_SFX_START + 27) -#define HID_FILEDLG_MANAGER (HID_SFX_START + 28) -#define HID_FILEDLG_URL (HID_SFX_START + 29) -#define HID_FILEDLG_FILE (HID_SFX_START + 30) -#define HID_FILEDLG_USE_PASSWD (HID_SFX_START + 31) -#define HID_FILEDLG_READ_ONLY (HID_SFX_START + 32) -#define HID_EXPLORERCONTROL (HID_SFX_START + 33) -#define HID_BROWSERCONTROL (HID_SFX_START + 34) -#define HID_CTL_ORGANIZER_LEFT (HID_SFX_START + 35) -#define HID_CTL_ORGANIZER_RIGHT (HID_SFX_START + 36) -#define HID_EXPLMAILSRV_GENERAL_PAGE (HID_SFX_START + 37) -#define HID_EXPLMAILSRV_PROTOCOL_PAGE (HID_SFX_START + 38) -#define HID_EXPLMAILSRV_DATAMATCH_PAGE (HID_SFX_START + 39) -#define HID_EXPLMAILSRV_SENDJOURNAL_PAGE (HID_SFX_START + 40) -#define HID_EXPLMAIL_GENERAL_PAGE (HID_SFX_START + 41) -#define HID_NEWS_CTL_RULES (HID_SFX_START + 42) -#define HID_NEWS_CTL_GROUPS (HID_SFX_START + 43) -#define HID_CONFIG_OBJECTBAR_CTL (HID_SFX_START + 44) -#define HID_NEWS_QUICKSEARCH (HID_SFX_START + 45) -#define HID_NEWS_SERVERVIEWPROPS (HID_SFX_START + 46) -#define HID_NEWS_SHOWARTICLEPROPS (HID_SFX_START + 47) -#define HID_NEWS_SHOWGROUPPROPS (HID_SFX_START + 48) -#define HID_NEWS_USER (HID_SFX_START + 49) -#define HID_MULTISELECTION_GENERAL_PAGE (HID_SFX_START + 50) -#define HID_LINK_GENERAL_PAGE (HID_SFX_START + 51) -#define HID_LINK_ADDRESS_PAGE (HID_SFX_START + 52) -#define HID_FOLDER_GENERAL_PAGE (HID_SFX_START + 53) -#define HID_FILE_GENERAL_PAGE (HID_SFX_START + 54) -#define HID_FTP_GENERAL_PAGE (HID_SFX_START + 55) -#define HID_PRINT_OPTIONS (HID_SFX_START + 56) -#define HID_PREVIEW_FRAME (HID_SFX_START + 57) -#define HID_DOCINFO_FRAME (HID_SFX_START + 58) -#define HID_EXPLORER_FRAME (HID_SFX_START + 59) -#define HID_APP_WIN (HID_SFX_START + 60) -#define HID_TEMPLATE_FMT (HID_SFX_START + 61) -#define HID_TEMPLATE_FILTER (HID_SFX_START + 62) -#define HID_FTPSERVER_PAGE (HID_SFX_START + 63) -#define HID_DLG_SFX_EXP_SEARCH (HID_SFX_START + 65) -#define HID_TP_SFX_EXP_SEARCH_CRITERIA (HID_SFX_START + 66) -#define HID_TP_SFX_EXP_SEARCH_PLACE (HID_SFX_START + 67) -#define HID_SEARCH_DLG_TABLB (HID_SFX_START + 68) -#define HID_TEMPLDLG_NEWBYEXAMPLE (HID_SFX_START + 69) -#define HID_TEMPLDLG_UPDATEBYEXAMPLE (HID_SFX_START + 70) -#define HID_TEMPLDLG_WATERCAN (HID_SFX_START + 71) -#define HID_DESKTOP (HID_SFX_START + 78) -#define HID_EXPLORERTOOLSTOOLBOX (HID_SFX_START + 79) -#define HID_EXPLOREROBJECTTOOLBOX (HID_SFX_START + 80) -#define HID_RECORDINGTOOLBOX (HID_SFX_START + 81) -#define HID_FULLSCREENTOOLBOX (HID_SFX_START + 82) -#define HID_HELPBAR (HID_SFX_START + 83) -#define HID_ENVTOOLBOX (HID_SFX_START + 84) -#define HID_FRAMESETEDIT_TOOLBOX (HID_SFX_START + 85) -#define HID_NAVIGATOR_WINDOW (HID_SFX_START + 86) -#define HID_TABDLG_RESET_BTN (HID_SFX_START + 89) -#define HID_TABDLG_STANDARD_BTN (HID_SFX_START + 90) -#define HID_HELPAGENT_TIP_BOX (HID_SFX_START + 91) -#define HID_TEMPLDLG_TOOLBOX_LEFT (HID_SFX_START + 92) -#define HID_TEMPLDLG_TOOLBOX_RIGHT (HID_SFX_START + 93) -#define HID_EXPLORER_SRCH_COUNT (HID_SFX_START + 94) -#define HID_BEAMER_SORT_ASCENDING (HID_SFX_START + 95) -#define HID_BEAMER_SORT_DESCENDING (HID_SFX_START + 96) -#define HID_EXPLORER_SRCH_LATEST_COUNT (HID_SFX_START + 97) -#define HID_CONFIG_EVENT_OFFICE_BASED (HID_SFX_START + 98) -#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_SFX_START + 99) -#define HID_ORGANIZE_NEW (HID_SFX_START + 100) -#define HID_ORGANIZE_DELETE (HID_SFX_START + 101) -#define HID_ORGANIZE_EDIT (HID_SFX_START + 102) -#define HID_ORGANIZE_COPY_FROM (HID_SFX_START + 103) -#define HID_ORGANIZE_COPY_TO (HID_SFX_START + 104) -#define HID_ORGANIZE_PRINT (HID_SFX_START + 105) -#define HID_ORGANIZE_PRINTER_SETUP (HID_SFX_START + 106) -#define HID_ORGANIZE_RESCAN (HID_SFX_START + 107) -#define HID_STYLIST_NEW (HID_SFX_START + 108) -#define HID_STYLIST_EDIT (HID_SFX_START + 109) -#define HID_STYLIST_DELETE (HID_SFX_START + 110) -#define HID_EXPLORERMENU_ARRANGEICONS (HID_SFX_START + 111) -#define HID_EXPLORERMENU_ARRANGEICONS_ONGRID (HID_SFX_START + 112) -#define HID_EXPLORERMENU_FIXEDICONPOS (HID_SFX_START + 113) -#define HID_EXPLORERMENU_OPEN (HID_SFX_START + 114) -#define HID_EXPLORERMENU_PRINT (HID_SFX_START + 115) -#define HID_EXPLORERMENU_SEARCH (HID_SFX_START + 116) -#define HID_EXPLORERMENU_COPY (HID_SFX_START + 117) -#define HID_EXPLORERMENU_DELETE (HID_SFX_START + 118) -#define HID_EXPLORERMENU_CREATELINK (HID_SFX_START + 119) -#define HID_EXPLORERMENU_EDITPROPERTIES (HID_SFX_START + 120) -#define HID_EXPLORERMENU_DOWNLOAD (HID_SFX_START + 121) -#define HID_EXPLORERMENU_STDTEMPLATE (HID_SFX_START + 122) -#define HID_EXPLORERDLG_FILELIST (HID_SFX_START + 124) -#define HID_PDFOLDERS_WORKPLACE (HID_SFX_START + 125) -#define HID_PDFOLDERS_EXPLORER (HID_SFX_START + 126) -#define HID_PDFOLDERS_STANDARD (HID_SFX_START + 127) -#define HID_PDFOLDERS_ROOT (HID_SFX_START + 128) -#define HID_PDFOLDERS_DESKTOP (HID_SFX_START + 129) -#define HID_CNTMENU_REMOVE_GROUP (HID_SFX_START + 130) -#define HID_CNTMENU_CLEAR_CACHE (HID_SFX_START + 131) -#define HID_CNT_SYNC_INFO_DLG (HID_SFX_START + 132) -#define HID_CNT_REMOVE_REMOVEDLIST (HID_SFX_START + 133) -#define HID_CNT_ABORT_DIALOG (HID_SFX_START + 134) -#define HID_CNT_PAGE_PRJ_DATAEXCHANGE (HID_SFX_START + 135) -#define HID_CHAOSDOC_OBJECTBAR_FILE (HID_SFX_START + 136) -#define HID_CHAOSDOC_OBJECTBAR_MESSAGE (HID_SFX_START + 137) -#define HID_CHAOSDOC_MN_PART_OPEN (HID_SFX_START + 138) -#define HID_CHAOSDOC_MN_PART_DELETE (HID_SFX_START + 139) -#define HID_CHAOSDOC_MN_PART_RENAME (HID_SFX_START + 140) -#define HID_CHAOSDOC_MN_PART_SAVEAS (HID_SFX_START + 141) -#define HID_EXPLORER_DOCVIEW_ICON (HID_SFX_START + 142) -#define HID_EXPLORER_DOCVIEW_DETAILS (HID_SFX_START + 143) -#define HID_CHAOSDOC_WIN (HID_SFX_START + 144) -#define HID_CHAOSDOC_WIN_HEADER (HID_SFX_START + 145) -#define HID_CHAOSDOC_WIN_PARTS (HID_SFX_START + 146) -#define HID_CHAOSDOC_WIN_BODY (HID_SFX_START + 147) -#define HID_CNT_INSERT_COLUMN (HID_SFX_START + 148) -#define HID_CNT_REMOVE_COLUMN (HID_SFX_START + 149) -#define HID_CNT_OPT_WIDTH (HID_SFX_START + 150) -#define HID_CNT_SORT_ASC (HID_SFX_START + 151) -#define HID_CNT_SORT_DESC (HID_SFX_START + 152) -#define HID_CNT_RULEPG_OPEN_DIR (HID_SFX_START + 153) -#define HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK (HID_SFX_START + 154) -#define HID_CHAOSDOC_MN_HEADER_COPYLINK (HID_SFX_START + 155) -#define HID_CLEAN_CACHE (HID_SFX_START + 156) -#define HID_SBOX_LOCATION (HID_SFX_START + 157) -#define HID_SBOX_SUBSCRIBTION (HID_SFX_START + 158) -#define HID_SBOX_CDF_SUBSCRIBTION (HID_SFX_START + 159) -#define HID_SBOX_SCHEDULE (HID_SFX_START + 160) -#define HID_SBOX_NOTIFICATION (HID_SFX_START + 161) -#define HID_SBOX_SDC_GENERAL (HID_SFX_START + 162) -#define HID_BRWBOX_HEADERBAR (HID_SFX_START + 163) -#define HID_CANNOT_CREATE_BMK_HERE (HID_SFX_START + 164) -#define HID_CREATE_BOOKMARK (HID_SFX_START + 165) -#define HID_TASKBAR (HID_SFX_START + 166) -#define HID_TASKBUTTONBAR (HID_SFX_START + 167) -#define HID_TASKTOOLBAR (HID_SFX_START + 168) -#define HID_CHAOSDOC_SHOW_FSYS_EXTENSION (HID_SFX_START + 169) -#define HID_CNT_FILE (HID_SFX_START + 170) -#define HID_CHAOSDOC_MN_BODY_OPENLINK (HID_SFX_START + 171) -#define HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK (HID_SFX_START + 172) -#define HID_CHAOSDOC_MN_BODY_DOWNLOAD (HID_SFX_START + 173) -#define HID_CHAOSDOC_MN_BODY_ADDBOOKMARK (HID_SFX_START + 174) -#define HID_OPEN_MENU_CNT (HID_SFX_START + 175) -#define HID_CNT_OPEN_AS_TEMPLATE (HID_SFX_START + 176) -#define HID_CNT_OPEN_AS_DOC (HID_SFX_START + 177) -#define HID_PDFOLDERS_TEMPLATE (HID_SFX_START + 178) -#define HID_EXPLORER_ROOT (HID_SFX_START + 179) -#define HID_RESET_URL (HID_SFX_START + 180) -#define HID_PHONE_DIALOG (HID_SFX_START + 181) -#define HID_QB_RESOLVE_LINK (HID_SFX_START + 182) -#define HID_CHAOSDOC_MN_HEADER_FLAG_BOLD (HID_SFX_START + 183) -#define HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC (HID_SFX_START + 184) -#define HID_CHAOSDOC_MN_HEADER_BIG_HEADER (HID_SFX_START + 185) -#define HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER (HID_SFX_START + 186) -#define HID_CNT_MARK_THREAD_MARKED (HID_SFX_START + 187) -#define HID_CNT_MARK_THREAD_UNMARKED (HID_SFX_START + 188) -#define HID_CNT_DLG_SEARCH_BT_SHOW (HID_SFX_START + 189) -#define HID_CNT_DLG_SEARCH_BT_UPDATE (HID_SFX_START + 190) -#define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE (HID_SFX_START + 191) -#define HID_CNT_DLG_SEARCH_BT_STOP (HID_SFX_START + 192) -#define HID_CNT_PAGE_HEADER (HID_SFX_START + 193) -#define HID_CNT_DLG_ADDRESS (HID_SFX_START + 194) -#define HID_EXPLORERMENU_AUTO_ARRANGEICONS (HID_SFX_START + 195) -#define HID_EXPLORERMENU_AUTO_ADJUSTICONS (HID_SFX_START + 196) -#define HID_EXPLORERMENU_FREE_POSITIONING (HID_SFX_START + 197) -#define HID_CNT_TARGET_MENU (HID_SFX_START + 198) -#define HID_CNT_PAGE_DESCRIPTION (HID_SFX_START + 199) -#define HID_CNT_LB_HEADER (HID_SFX_START + 200) -#define HID_CNT_LB_DESCRIPTION (HID_SFX_START + 201) -#define HID_GROUPVIEW_BIG_SYMBOLS (HID_SFX_START + 202) -#define HID_GROUPVIEW_SMALL_SYMBOLS (HID_SFX_START + 203) -#define HID_GROUPVIEW_ADD_GROUP (HID_SFX_START + 204) -#define HID_GROUPVIEW_REMOVE_GROUP (HID_SFX_START + 205) -#define HID_GROUPVIEW_RENAME_GROUP (HID_SFX_START + 206) -#define HID_GROUPVIEW_ADD_BOOKMARK (HID_SFX_START + 207) -#define HID_GROUPVIEW_TREE (HID_SFX_START + 208) -#define HID_GROUPVIEW_ADD_AS_FOLDER (HID_SFX_START + 209) -#define HID_GROUPVIEW_ADD_AS_BMK (HID_SFX_START + 210) -#define HID_GROUPVIEW_REMOVE_BMK (HID_SFX_START + 211) -#define HID_GROUPVIEW_CONTENT_BIG (HID_SFX_START + 212) -#define HID_GROUPVIEW_CONTENT_SMALL (HID_SFX_START + 213) -#define HID_GROUPVIEW_CONTENT_TREE (HID_SFX_START + 214) -#define HID_GROUPVIEW_SHOW_DOCS (HID_SFX_START + 215) -#define HID_EDIT_TEMPLATE (HID_SFX_START + 216) -#define HID_PDFOLDERS_GRAPHICS (HID_SFX_START + 217) -#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218) -#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219) -#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220) -#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221) -#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222) -#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223) -#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224) -#define HID_FILEDLG_FOLDER_BTN (HID_SFX_START + 225) -#define HID_FILEDLG_FOLDER_FILENAME (HID_SFX_START + 226) -#define HID_FILEDLG_SRCHFOLDER_BTN (HID_SFX_START + 227) -#define HID_PDFOLDERS_GROUPS (HID_SFX_START + 228) -#define HID_OPEN_CHOOSE_FILTER (HID_SFX_START + 229) -#define HID_PDFOLDERS_BOOKMARKS (HID_SFX_START + 230) -#define HID_PDFOLDERS_FAVORITES_ADD (HID_SFX_START + 231) -#define HID_PDFOLDERS_FAVORITES_REMOVE (HID_SFX_START + 232) -#define HID_PDFOLDERS_HISTORY (HID_SFX_START + 233) -#define HID_FILEDLG_EDIT_FAVORITES (HID_SFX_START + 234) -#define HID_FILEDLG_NEW_FAVORITE (HID_SFX_START + 235) -#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX (HID_SFX_START + 236) -#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR (HID_SFX_START + 237) -#define HID_CNT_CB_FORCE_BODY_EXPORT (HID_SFX_START + 240) -#define HID_CNT_PAGE_REPSTATE_CONTROL (HID_SFX_START + 241) -#define HID_TASKSTATUSBAR (HID_SFX_START + 242) -#define HID_CNT_PAGE_HEADER_TABBAR (HID_SFX_START + 244) -#define HID_CNT_PAGE_SUBSCR_TABBAR (HID_SFX_START + 245) -#define HID_CHAOSDOC_MN_PART_PRINT (HID_SFX_START + 246) -#define HID_STATUSINDICATOR_TEXT (HID_SFX_START + 247) -#define HID_STATUSINDICATOR_PROGRESS (HID_SFX_START + 248) -#define HID_CNT_VALUE_ADDED_NONE (HID_SFX_START + 249) -#define HID_CNT_VALUE_ADDED_DOCINFO (HID_SFX_START + 250) -#define HID_CNT_VALUE_ADDED_FULL (HID_SFX_START + 251) -#define HID_CNT_MESSAGE_STOREMODE_REMOTE (HID_SFX_START + 252) -#define HID_CNT_MESSAGE_STOREMODE_LOCAL (HID_SFX_START + 253) -#define HID_CNT_VIEW_ALL_ARTICLES (HID_SFX_START + 254) -#define HID_CNT_VIEW_UNREAD_ARTICLES (HID_SFX_START + 255) -#define HID_CNT_VIEW_READ_ARTICLES (HID_SFX_START + 256) -#define HID_CNT_VIEW_MARKED_ARTICLES (HID_SFX_START + 257) -#define HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES (HID_SFX_START + 258) -#define HID_CNT_VIEW_ALL_FOLDERS (HID_SFX_START + 259) -#define HID_CNT_VIEW_SUBSCRIBED_FOLDERS (HID_SFX_START + 260) -#define HID_CNT_VIEW_ACTIVE_FOLDERS (HID_SFX_START + 261) -#define HID_CNT_SENT_VIEW_ALL_ARTICLES (HID_SFX_START + 262) -#define HID_CNT_SENT_VIEW_SENT_ARTICLES (HID_SFX_START + 263) -#define HID_CNT_SENT_VIEW_UNSENT_ARTICLES (HID_SFX_START + 264) -#define HID_CNT_SENT_VIEW_MARKED_ARTICLES (HID_SFX_START + 265) -#define HID_MAILWIN_SEND_BUTTON (HID_SFX_START + 266) -#define HID_MAILWIN_CLOSE_BUTTON (HID_SFX_START + 267) -#define HID_MAILWIN_ROLE_BOX (HID_SFX_START + 268) -#define HID_MAILWIN_ADDRESS_EDIT (HID_SFX_START + 269) -#define HID_MAILWIN_ADDRESS_BOX (HID_SFX_START + 270) -#define HID_MAILWIN_SUBJECT_EDIT (HID_SFX_START + 271) -#define HID_MAILWIN_FROM_EDIT (HID_SFX_START + 272) -#define HID_MAILWIN_PRIO_BOX (HID_SFX_START + 273) -#define HID_TABDLG_APPLY_BTN (HID_SFX_START + 274) -#define HID_TP_COMMONPRINTOPTIONS (HID_SFX_START + 275) -#define HID_FILEDLG_LINK_CB (HID_SFX_START + 276) -#define HID_FILEDLG_PREVIEW_CB (HID_SFX_START + 277) -#define HID_HELP_WINDOW (HID_SFX_START + 278) -#define HID_HELP_LISTBOX (HID_SFX_START + 279) -#define HID_HELP_TABCONTROL (HID_SFX_START + 280) -#define HID_HELP_TOOLBOX (HID_SFX_START + 281) -#define HID_HELP_TOOLBOXITEM_INDEX (HID_SFX_START + 282) -#define HID_HELP_TOOLBOXITEM_START (HID_SFX_START + 283) -#define HID_HELP_TOOLBOXITEM_BACKWARD (HID_SFX_START + 284) -#define HID_HELP_TOOLBOXITEM_FORWARD (HID_SFX_START + 285) -#define HID_HELP_TOOLBOXITEM_PRINT (HID_SFX_START + 286) -#define HID_HELP_TOOLBOXITEM_BOOKMARKS (HID_SFX_START + 287) -#define HID_HELP_TABPAGE_CONTENTS (HID_SFX_START + 288) -#define HID_HELP_TABPAGE_INDEX (HID_SFX_START + 289) -#define HID_HELP_TABPAGE_SEARCH (HID_SFX_START + 290) -#define HID_HELP_TABPAGE_BOOKMARKS (HID_SFX_START + 291) -#define HID_TBXCONTROL_FILENEW (HID_SFX_START + 292) -#define HID_ORGANIZE_STDTEMPLATE_ADD (HID_SFX_START + 293) -#define HID_ORGANIZE_STDTEMPLATE_DEL (HID_SFX_START + 294) -#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG (HID_SFX_START + 295) -#define HID_HELP_BOOKMARKS_OPEN (HID_SFX_START + 296) -#define HID_HELP_BOOKMARKS_RENAME (HID_SFX_START + 297) -#define HID_HELP_BOOKMARKS_DELETE (HID_SFX_START + 298) -#define HID_CLOSE_WARNING (HID_SFX_START + 299) -#define HID_DID_SAVE_PACKED_XML (HID_SFX_START + 300) -#define HID_HELP_TREELISTBOX_CONTENTS (HID_SFX_START + 301) -#define HID_CUSTOMIZETOOLBOX (HID_SFX_START + 302) -#define HID_CUSTOMIZETOOLBOX_FUNCTIONS (HID_SFX_START + 303) -#define HID_CUSTOMIZETOOLBOX_TOOLBOX (HID_SFX_START + 304) -#define HID_HELP_TEXT_SELECTION_MODE (HID_SFX_START + 305) +#define HID_WARNING_SECURITY_HYPERLINK "SFX2_HID_WARNING_SECURITY_HYPERLINK" +#define HID_FILEDLG_EXPORTASPDF "SFX2_HID_FILEDLG_EXPORTASPDF" +#define HID_USERDEFBMP_TOOLBOX "SFX2_HID_USERDEFBMP_TOOLBOX" -#define HID_WARNING_SECURITY_HYPERLINK (HID_SFX_START + 306) -#define HID_FILEDLG_EXPORTASPDF (HID_SFX_START + 307) -#define HID_USERDEFBMP_TOOLBOX (HID_SFX_START + 308) +#define HID_CONFIG_LOAD "SFX2_HID_CONFIG_LOAD" +#define HID_CONFIG_SAVE "SFX2_HID_CONFIG_SAVE" -#define HID_CONFIG_LOAD (HID_SFX_START + 309) -#define HID_CONFIG_SAVE (HID_SFX_START + 310) +#define HID_SEARCHDIALOG "SFX2_HID_SEARCHDIALOG" -#define HID_SEARCHDIALOG (HID_SFX_START + 311) +#define HID_XMLSEC_WARNING_BROKENSIGNATURE "SFX2_HID_XMLSEC_WARNING_BROKENSIGNATURE" +#define HID_XMLSEC_QUERY_LOSINGSIGNATURE "SFX2_HID_XMLSEC_QUERY_LOSINGSIGNATURE" +#define HID_XMLSEC_QUERY_SAVEBEFORESIGN "SFX2_HID_XMLSEC_QUERY_SAVEBEFORESIGN" +#define HID_XMLSECDLG_MACROWARN "SFX2_HID_XMLSECDLG_MACROWARN" +#define HID_XMLSEC_INFO_WRONGDOCFORMAT "SFX2_HID_XMLSEC_INFO_WRONGDOCFORMAT" +#define HID_WARNING_MACROSDISABLED "SFX2_HID_WARNING_MACROSDISABLED" +#define HID_WARNING_ALIENFORMAT "SFX2_HID_WARNING_ALIENFORMAT" +#define HID_HELP_ONSTARTUP_BOX "SFX2_HID_HELP_ONSTARTUP_BOX" +#define HID_DLG_CHECKFORONLINEUPDATE "SFX2_HID_DLG_CHECKFORONLINEUPDATE" +#define HID_TP_CUSTOMPROPERTIES "SFX2_HID_TP_CUSTOMPROPERTIES" +#define HID_CTRL_CUSTOMPROPERTIES "SFX2_HID_CTRL_CUSTOMPROPERTIES" +#define HID_CTRL_CUSTOMPROPS_YES_NO "SFX2_HID_CTRL_CUSTOMPROPS_YES_NO" +#define HID_DLG_CUSTOMPROPS_DURATION "SFX2_HID_DLG_CUSTOMPROPS_DURATION" -#define HID_XMLSEC_WARNING_BROKENSIGNATURE (HID_SFX_START + 314) -#define HID_XMLSEC_QUERY_LOSINGSIGNATURE (HID_SFX_START + 315) -#define HID_XMLSEC_QUERY_SAVEBEFORESIGN (HID_SFX_START + 316) -#define HID_XMLSECDLG_MACROWARN (HID_SFX_START + 317) -#define HID_XMLSEC_INFO_WRONGDOCFORMAT (HID_SFX_START + 318) -#define HID_WARNING_MACROSDISABLED (HID_SFX_START + 319) -#define HID_WARNING_ALIENFORMAT (HID_SFX_START + 320) -#define HID_HELP_ONSTARTUP_BOX (HID_SFX_START + 321) -#define HID_DLG_CHECKFORONLINEUPDATE (HID_SFX_START + 322) -#define HID_TP_CUSTOMPROPERTIES (HID_SFX_START + 324) -#define HID_CTRL_CUSTOMPROPERTIES (HID_SFX_START + 325) -#define HID_CTRL_CUSTOMPROPS_YES_NO (HID_SFX_START + 326) -#define HID_DLG_CUSTOMPROPS_DURATION (HID_SFX_START + 327) +#define HID_HELP_ONHELP "SFX2_HID_HELP_ONHELP" -#define ACT_SFX_HID_END HID_DLG_CUSTOMPROPS_DURATION - -// "Uberlaufpr"ufung -------------------------------------------------------- - -#if ACT_SFX_HID_END > HID_SFX_END -#error Resource-Ueberlauf in #line, #file -#endif - -#define HID_HELP_ONHELP 68245 +#define HID_QUERY_LOAD_TEMPLATE "SFX2_HID_QUERY_LOAD_TEMPLATE" #endif // #ifndef _SFX_HELPID_HRC diff --git a/sfx2/source/menu/menu.src b/sfx2/source/menu/menu.src index a84198917d..82465bbd15 100644 --- a/sfx2/source/menu/menu.src +++ b/sfx2/source/menu/menu.src @@ -26,6 +26,7 @@ ************************************************************************/ #include "menu.hrc" +#include String STR_MENU_CFGITEM { @@ -44,19 +45,19 @@ Menu MN_CLIPBOARDFUNCS MenuItem { Identifier = SID_CUT ; - HelpID = SID_CUT ; + HelpID = CMD_SID_CUT ; Text [ en-US ] = "Cu~t" ; }; MenuItem { Identifier = SID_COPY ; - HelpID = SID_COPY ; + HelpID = CMD_SID_COPY ; Text [ en-US ] = "~Copy" ; }; MenuItem { Identifier = SID_PASTE ; - HelpID = SID_PASTE ; + HelpID = CMD_SID_PASTE ; Text [ en-US ] = "~Paste" ; }; }; diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 9ab633384d..b7363f781a 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -160,8 +160,6 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen // einf"ugen pMenu->InsertItem( nId, aVerbs[n].VerbName ); - // FIXME: HELPID - pMenu->SetHelpId( nId, ""/*(ULONG) nId*/ ); } } } @@ -376,11 +374,10 @@ void SfxPopupMenuManager::InsertSeparator( USHORT nPos ) //------------------------------------------------------------------------- -void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, USHORT nPos ) +void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, USHORT nPos ) { pSVMenu->InsertItem( nId, rName, nBits,nPos ); - // FIXME: HELPID - pSVMenu->SetHelpId( nId, ""/*(ULONG) nId*/ ); + pSVMenu->SetHelpId( nId, rHelpId ); } //------------------------------------------------------------------------- diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 87e7188617..20f758da0c 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -345,7 +345,9 @@ void SfxVirtualMenu::CreateFromSVMenu() DBG_CHKTHIS(SfxVirtualMenu, 0); // Merge Addon popup menus into the SV Menu - Reference< com::sun::star::frame::XFrame > xFrame( pBindings->GetDispatcher()->GetFrame()->GetFrame().GetFrameInterface() ); + SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); + SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); + Reference< com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() ); if ( pSVMenu->IsMenuBar() ) { @@ -448,24 +450,14 @@ void SfxVirtualMenu::CreateFromSVMenu() } else { -/* - if ( nSlotId >= SID_SFX_START && !SfxMenuManager::IsPopupFunction(nSlotId) ) + const SfxSlot* pSlot = pSlotPool->GetSlot( nSlotId ); + if ( pSlot ) { - // Echte Popups sollen keine SlotIds haben; leider sind - // da noch Altlasten mit herumzuschleppen ... - String aTitle = pSVMenu->GetItemText( nSlotId ); - pSVMenu->SetPopupMenu( nSlotId, NULL ); - USHORT nPos = pSVMenu->GetItemPos( nSlotId ); - pSVMenu->RemoveItem( nPos ); - nSlotId = 1; - while ( pSVMenu->GetItemPos(nSlotId) != MENU_ITEM_NOTFOUND ) - nSlotId++; - pSVMenu->InsertItem( nSlotId, aTitle, 0, nPos ); - pSVMenu->SetPopupMenu( nSlotId, pPopup ); + rtl::OString aCmd(".uno:"); + aCmd += pSlot->GetUnoName(); + pSVMenu->SetHelpId( nSlotId, pSlot->GetUnoName() ); } -*/ - // FIXME: HELPID - pSVMenu->SetHelpId( nSlotId, ""/*0L*/ ); + pMnuCtrl = pItems+nPos; // normalerweise jetzt erst im Activate-Handler diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 0dc0a63a1e..5bbe0c029a 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -132,7 +132,12 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( { USHORT nSlotId = pSlot->GetSlotId(); if ( nSlotId > 0 ) + { + rtl::OString aCmd(".uno:"); + aCmd += pSlot->GetUnoName(); return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule ); + pStatusBar->SetHelpId( nSlotId, aCmd ); + } } return NULL; diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 21df72cb62..4e095eff9d 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1520,8 +1520,7 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId , bBigImages( FALSE ) , pMenu( 0 ) { - // FIXME: HELPID - rBox.SetHelpId( nId, ""/*HID_TBXCONTROL_FILENEW*/ ); + 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 4eea6fccd4..5d19581183 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -127,16 +127,15 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) // TODO/LATER: do we still need this code? Window* pWindow = rNEvt.GetWindow(); - ULONG nHelpId = 0; - while ( !nHelpId && pWindow ) + rtl::OString sHelpId; + while ( !sHelpId.getLength() && pWindow ) { - // FIXME: HELPID - // nHelpId = pWindow->GetHelpId(); + sHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } - if ( nHelpId ) - SfxHelp::OpenHelpAgent( pFrame, nHelpId ); + if ( sHelpId.getLength() ) + SfxHelp::OpenHelpAgent( pFrame, sHelpId ); // if focus was on an external window, the clipboard content might have been changed pView->GetBindings().Invalidate( SID_PASTE ); diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 6745d7047e..75a24b0f33 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -30,88 +30,68 @@ // include ----------------------------------------------------------- #include -// in solar.hrc -//#define HID_FORMS_START (HID_LIB_START+4000) -//#define HID_FORMS_END (HID_LIB_START+4999) - // Help-Ids -------------------------------------------------------------- -#define HID_DLG_DBMSG ( HID_FORMS_START + 1) -#define HID_FORM_NAVIGATOR ( HID_FORMS_START + 2) -#define HID_FORM_NAVIGATOR_WIN ( HID_FORMS_START + 3) -#define HID_FIELD_SEL ( HID_FORMS_START + 4) -#define HID_FIELD_SEL_WIN ( HID_FORMS_START + 5) -#define HID_FILTER_NAVIGATOR ( HID_FORMS_START + 6) -#define HID_FILTER_NAVIGATOR_WIN ( HID_FORMS_START + 7) -#define HID_FM_DLG_SEARCH ( HID_FORMS_START + 8) -#define HID_SEARCH_TEXT ( HID_FORMS_START + 9) -#define HID_SEARCH_ALLFIELDS ( HID_FORMS_START + 10) -//#define HID_SEARCH_SINGLEFIELD ( HID_FORMS_START + 11) -#define HID_SEARCH_FIELDSELECTION ( HID_FORMS_START + 12) -#define HID_SEARCH_POSITION ( HID_FORMS_START + 13) -#define HID_SEARCH_FORMATTER ( HID_FORMS_START + 14) -#define HID_SEARCH_CASE ( HID_FORMS_START + 15) -#define HID_SEARCH_BACKWARD ( HID_FORMS_START + 16) -#define HID_SEARCH_STARTOVER ( HID_FORMS_START + 17) -#define HID_SEARCH_WILDCARD ( HID_FORMS_START + 18) -#define HID_SEARCH_REGULAR ( HID_FORMS_START + 19) -#define HID_SEARCH_APPROX ( HID_FORMS_START + 20) -#define HID_SEARCH_APPROXSETTINGS ( HID_FORMS_START + 21) -#define HID_SEARCH_BTN_SEARCH ( HID_FORMS_START + 22) -#define HID_SEARCH_BTN_CLOSE ( HID_FORMS_START + 23) -#define HID_CONTROLS_DATE_N_TIME ( HID_FORMS_START + 24) -#define HID_GRID_TRAVEL_FIRST ( HID_FORMS_START + 25) -#define HID_GRID_TRAVEL_PREV ( HID_FORMS_START + 26) -#define HID_GRID_TRAVEL_NEXT ( HID_FORMS_START + 27) -#define HID_GRID_TRAVEL_LAST ( HID_FORMS_START + 28) -#define HID_GRID_TRAVEL_NEW ( HID_FORMS_START + 29) -#define HID_GRID_TRAVEL_ABSOLUTE ( HID_FORMS_START + 30) -#define HID_GRID_NUMBEROFRECORDS ( HID_FORMS_START + 31) -#define UID_SEARCH_RECORDSTATUS ( HID_FORMS_START + 32) -#define UID_FORMPROPBROWSER_FRAME ( HID_FORMS_START + 33) -#define UID_ABSOLUTE_RECORD_WINDOW ( HID_FORMS_START + 34) -#define HID_DATA_NAVIGATOR_WIN ( HID_FORMS_START + 35) -#define HID_XFORMS_ADDDATAITEM_DLG ( HID_FORMS_START + 36) -#define HID_XFORMS_ADDCONDITION_DLG ( HID_FORMS_START + 37) -#define HID_XFORMS_NAMESPACEITEM_DLG ( HID_FORMS_START + 38) -#define HID_XFORMS_NAMESPACEITEM_LIST ( HID_FORMS_START + 39) -#define HID_XFORMS_MANAGENAMESPACE_DLG ( HID_FORMS_START + 40) -//#define HID_TP_XFORMS_INSTANCE ( HID_FORMS_START + 41) -//#define HID_TP_XFORMS_SUBMISSION ( HID_FORMS_START + 42) -//#define HID_TP_XFORMS_BINDING ( HID_FORMS_START + 43) -#define HID_MN_XFORMS_MODELS_ADD ( HID_FORMS_START + 44) -#define HID_MN_XFORMS_MODELS_EDIT ( HID_FORMS_START + 45) -#define HID_MN_XFORMS_MODELS_REMOVE ( HID_FORMS_START + 46) -#define HID_MN_XFORMS_INSTANCES_ADD ( HID_FORMS_START + 47) -#define HID_MN_XFORMS_INSTANCES_EDIT ( HID_FORMS_START + 48) -#define HID_MN_XFORMS_INSTANCES_REMOVE ( HID_FORMS_START + 49) -#define HID_MN_XFORMS_SHOW_DETAILS ( HID_FORMS_START + 50) -#define HID_XFORMS_TOOLBOX ( HID_FORMS_START + 51) -#define HID_XFORMS_TOOLBOX_ITEM_ADD ( HID_FORMS_START + 52) -#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT ( HID_FORMS_START + 53) -#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE ( HID_FORMS_START + 54) -#define HID_XFORMS_TOOLBOX_ITEM_EDIT ( HID_FORMS_START + 55) -#define HID_XFORMS_TOOLBOX_ITEM_REMOVE ( HID_FORMS_START + 56) -#define HID_XFORMS_ITEMS_LIST ( HID_FORMS_START + 57) -#define HID_XFORMS_MODELS_LIST ( HID_FORMS_START + 58) -#define HID_XFORMS_MODELS_MENUBTN ( HID_FORMS_START + 59) -#define HID_XFORMS_INSTANCES_MENUBTN ( HID_FORMS_START + 60) -#define HID_XFORMS_ADDSUBMISSION_DLG ( HID_FORMS_START + 61) -#define HID_XFORMS_ADDMODEL_DLG ( HID_FORMS_START + 62) -#define HID_XFORMS_ADDINSTANCE_DLG ( HID_FORMS_START + 63) -#define HID_XFORMS_MID_INSERT_CONTROL ( HID_FORMS_START + 64) -#define HID_XFORMS_TAB_CONTROL ( HID_FORMS_START + 65) - // if you add a new define here, please adjust the overflow check - // at the end of the file!! - -// ----------------------------------------------------------------------- -// "Uberlaufpr"ufung ----------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_FM_HID_END HID_XFORMS_TAB_CONTROL - -#if ACT_FM_HID_END > HID_FORMS_END -#error Resource-Ueberlauf in #line, #file -#endif +#define HID_DLG_DBMSG "SVX_HID_DLG_DBMSG" +#define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR" +#define HID_FORM_NAVIGATOR_WIN "SVX_HID_FORM_NAVIGATOR_WIN" +#define HID_FIELD_SEL "SVX_HID_FIELD_SEL" +#define HID_FIELD_SEL_WIN "SVX_HID_FIELD_SEL_WIN" +#define HID_FILTER_NAVIGATOR "SVX_HID_FILTER_NAVIGATOR" +#define HID_FILTER_NAVIGATOR_WIN "SVX_HID_FILTER_NAVIGATOR_WIN" +#define HID_FM_DLG_SEARCH "SVX_HID_FM_DLG_SEARCH" +#define HID_SEARCH_TEXT "SVX_HID_SEARCH_TEXT" +#define HID_SEARCH_ALLFIELDS "SVX_HID_SEARCH_ALLFIELDS" +#define HID_SEARCH_FIELDSELECTION "SVX_HID_SEARCH_FIELDSELECTION" +#define HID_SEARCH_POSITION "SVX_HID_SEARCH_POSITION" +#define HID_SEARCH_FORMATTER "SVX_HID_SEARCH_FORMATTER" +#define HID_SEARCH_CASE "SVX_HID_SEARCH_CASE" +#define HID_SEARCH_BACKWARD "SVX_HID_SEARCH_BACKWARD" +#define HID_SEARCH_STARTOVER "SVX_HID_SEARCH_STARTOVER" +#define HID_SEARCH_WILDCARD "SVX_HID_SEARCH_WILDCARD" +#define HID_SEARCH_REGULAR "SVX_HID_SEARCH_REGULAR" +#define HID_SEARCH_APPROX "SVX_HID_SEARCH_APPROX" +#define HID_SEARCH_APPROXSETTINGS "SVX_HID_SEARCH_APPROXSETTINGS" +#define HID_SEARCH_BTN_SEARCH "SVX_HID_SEARCH_BTN_SEARCH" +#define HID_SEARCH_BTN_CLOSE "SVX_HID_SEARCH_BTN_CLOSE" +#define HID_CONTROLS_DATE_N_TIME "SVX_HID_CONTROLS_DATE_N_TIME" +#define HID_GRID_TRAVEL_FIRST "SVX_HID_GRID_TRAVEL_FIRST" +#define HID_GRID_TRAVEL_PREV "SVX_HID_GRID_TRAVEL_PREV" +#define HID_GRID_TRAVEL_NEXT "SVX_HID_GRID_TRAVEL_NEXT" +#define HID_GRID_TRAVEL_LAST "SVX_HID_GRID_TRAVEL_LAST" +#define HID_GRID_TRAVEL_NEW "SVX_HID_GRID_TRAVEL_NEW" +#define HID_GRID_TRAVEL_ABSOLUTE "SVX_HID_GRID_TRAVEL_ABSOLUTE" +#define HID_GRID_NUMBEROFRECORDS "SVX_HID_GRID_NUMBEROFRECORDS" +#define UID_SEARCH_RECORDSTATUS "SVX_UID_SEARCH_RECORDSTATUS" +#define UID_FORMPROPBROWSER_FRAME "SVX_UID_FORMPROPBROWSER_FRAME" +#define UID_ABSOLUTE_RECORD_WINDOW "SVX_UID_ABSOLUTE_RECORD_WINDOW" +#define HID_DATA_NAVIGATOR_WIN "SVX_HID_DATA_NAVIGATOR_WIN" +#define HID_XFORMS_ADDDATAITEM_DLG "SVX_HID_XFORMS_ADDDATAITEM_DLG" +#define HID_XFORMS_ADDCONDITION_DLG "SVX_HID_XFORMS_ADDCONDITION_DLG" +#define HID_XFORMS_NAMESPACEITEM_DLG "SVX_HID_XFORMS_NAMESPACEITEM_DLG" +#define HID_XFORMS_NAMESPACEITEM_LIST "SVX_HID_XFORMS_NAMESPACEITEM_LIST" +#define HID_XFORMS_MANAGENAMESPACE_DLG "SVX_HID_XFORMS_MANAGENAMESPACE_DLG" +#define HID_MN_XFORMS_MODELS_ADD "SVX_HID_MN_XFORMS_MODELS_ADD" +#define HID_MN_XFORMS_MODELS_EDIT "SVX_HID_MN_XFORMS_MODELS_EDIT" +#define HID_MN_XFORMS_MODELS_REMOVE "SVX_HID_MN_XFORMS_MODELS_REMOVE" +#define HID_MN_XFORMS_INSTANCES_ADD "SVX_HID_MN_XFORMS_INSTANCES_ADD" +#define HID_MN_XFORMS_INSTANCES_EDIT "SVX_HID_MN_XFORMS_INSTANCES_EDIT" +#define HID_MN_XFORMS_INSTANCES_REMOVE "SVX_HID_MN_XFORMS_INSTANCES_REMOVE" +#define HID_MN_XFORMS_SHOW_DETAILS "SVX_HID_MN_XFORMS_SHOW_DETAILS" +#define HID_XFORMS_TOOLBOX "SVX_HID_XFORMS_TOOLBOX" +#define HID_XFORMS_TOOLBOX_ITEM_ADD "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD" +#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT" +#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE" +#define HID_XFORMS_TOOLBOX_ITEM_EDIT "SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT" +#define HID_XFORMS_TOOLBOX_ITEM_REMOVE "SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE" +#define HID_XFORMS_ITEMS_LIST "SVX_HID_XFORMS_ITEMS_LIST" +#define HID_XFORMS_MODELS_LIST "SVX_HID_XFORMS_MODELS_LIST" +#define HID_XFORMS_MODELS_MENUBTN "SVX_HID_XFORMS_MODELS_MENUBTN" +#define HID_XFORMS_INSTANCES_MENUBTN "SVX_HID_XFORMS_INSTANCES_MENUBTN" +#define HID_XFORMS_ADDSUBMISSION_DLG "SVX_HID_XFORMS_ADDSUBMISSION_DLG" +#define HID_XFORMS_ADDMODEL_DLG "SVX_HID_XFORMS_ADDMODEL_DLG" +#define HID_XFORMS_ADDINSTANCE_DLG "SVX_HID_XFORMS_ADDINSTANCE_DLG" +#define HID_XFORMS_MID_INSERT_CONTROL "SVX_HID_XFORMS_MID_INSERT_CONTROL" +#define HID_XFORMS_TAB_CONTROL "SVX_HID_XFORMS_TAB_CONTROL" #endif diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index 41d0d42bdf..a6e00572b0 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -38,288 +38,242 @@ #define ITEM_FORM_CONTROL_PROPERTIES\ Identifier = SID_FM_CTL_PROPERTIES ; \ Command = ".uno:ControlProperties" ; \ - HelpID = SID_FM_CTL_PROPERTIES ; \ Text [ en-US ] = "Con~trol..." ; \ #define ITEM_FORM_PROPERTIES\ Identifier = SID_FM_PROPERTIES ; \ Command = ".uno:FormProperties" ; \ - HelpID = SID_FM_PROPERTIES ; \ Text [ en-US ] = "For~m..." ; \ #define ITEM_REPLACE_CONTROL\ Identifier = SID_FM_CHANGECONTROLTYPE ;\ Command = ".uno:ChangeControlType" ; \ - HelpID = SID_FM_CHANGECONTROLTYPE ; \ Text [ en-US ] = "~Replace with"; \ #define ITEM_FORMAT_TEMPLATECATALOG \ Identifier = SID_STYLE_CATALOG ; \ Command = ".uno:StyleCatalog" ; \ - HelpID = SID_STYLE_CATALOG ; \ Text [ en-US ] = "~Catalog..." ; \ #define ITEM_FORMAT_TEMPLATE \ Identifier = SID_STYLE_DESIGNER ; \ Command = ".uno:DesignerDialog" ; \ - HelpID = SID_STYLE_DESIGNER ; \ Text [ en-US ] = "St~ylist" ; \ #define ITEM_FORMAT_AUTOFORMAT \ Identifier = SID_AUTOFORMAT ; \ Command = ".uno:AutoFormat" ; \ - HelpID = SID_AUTOFORMAT ; \ Text [ en-US ] = "Auto~Format..." ;\ #define ITEM_FORMAT_CHAR_DLG \ Identifier = SID_CHAR_DLG ; \ Command = ".uno:FontDialog" ; \ - HelpID = SID_CHAR_DLG ; \ Text [ en-US ] = "C~haracter..." ;\ #define ITEM_FORMAT_PARA_DLG \ Identifier = SID_PARA_DLG ; \ Command = ".uno:ParagraphDialog" ; \ - HelpID = SID_PARA_DLG ; \ Text [ en-US ] = "P~aragraph..." ;\ #define ITEM_FORMAT_FONTWORK \ Identifier = SID_FONTWORK ; \ Command = ".uno:FontWork" ; \ - HelpID = SID_FONTWORK ; \ Text [ en-US ] = "F~ontwork" ;\ #define ITEM_EDIT_CUT \ Identifier = SID_CUT ; \ Command = ".uno:Cut" ; \ - HelpID = SID_CUT ; \ Text [ en-US ] = "Cu~t" ;\ #define ITEM_EDIT_COPY \ Identifier = SID_COPY ; \ Command = ".uno:Copy" ; \ - HelpID = SID_COPY ; \ Text [ en-US ] = "~Copy" ;\ #define ITEM_EDIT_DELETE \ Identifier = SID_DELETE ; \ Command = ".uno:Delete" ; \ - HelpID = SID_DELETE ; \ Text [ en-US ] = "~Delete" ;\ #define ITEM_FORMAT_ATTR_CHAR_FONT \ Identifier = SID_ATTR_CHAR_FONT ; \ Command = ".uno:CharFontName" ; \ - HelpID = SID_ATTR_CHAR_FONT ; \ Text [ en-US ] = "Font" ;\ #define ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT \ Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \ Command = ".uno:FontHeight" ; \ - HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \ Text [ en-US ] = "Size" ;\ #define ITEM_FORMAT_ATTR_CHAR_WEIGHT \ Identifier = SID_ATTR_CHAR_WEIGHT ; \ Command = ".uno:Bold" ; \ - HelpID = SID_ATTR_CHAR_WEIGHT ; \ Text [ en-US ] = "Bold" ; \ #define ITEM_FORMAT_ATTR_CHAR_POSTURE \ Identifier = SID_ATTR_CHAR_POSTURE ; \ Command = ".uno:Italic" ; \ - HelpID = SID_ATTR_CHAR_POSTURE ; \ Text [ en-US ] = "Italic" ;\ #define ITEM_FORMAT_ATTR_CHAR_UNDERLINE \ Identifier = SID_ATTR_CHAR_UNDERLINE ; \ Command = ".uno:Underline" ; \ - HelpID = SID_ATTR_CHAR_UNDERLINE ; \ Text [ en-US ] = "Underline" ;\ #define ITEM_FORMAT_ATTR_CHAR_OVERLINE \ Identifier = SID_ATTR_CHAR_OVERLINE ; \ Command = ".uno:Overline" ; \ - HelpID = SID_ATTR_CHAR_OVERLINE ; \ Text [ en-US ] = "Overline" ;\ #define ITEM_FORMAT_ATTR_CHAR_STRIKEOUT \ Identifier = SID_ATTR_CHAR_STRIKEOUT ; \ Command = ".uno:Strikeout" ; \ - HelpID = SID_ATTR_CHAR_STRIKEOUT ; \ Text [ en-US ] = "Strikethrough" ;\ #define ITEM_FORMAT_ATTR_CHAR_SHADOWED \ Identifier = SID_ATTR_CHAR_SHADOWED ; \ Command = ".uno:Shadowed" ; \ - HelpID = SID_ATTR_CHAR_SHADOWED ; \ Text [ en-US ] = "Shadow" ;\ #define ITEM_FORMAT_ATTR_CHAR_CONTOUR \ Identifier = SID_ATTR_CHAR_CONTOUR ; \ Command = ".uno:OutlineFont" ; \ - HelpID = SID_ATTR_CHAR_CONTOUR ; \ Text [ en-US ] = "Outline" ;\ #define ITEM_FORMAT_SET_SUPER_SCRIPT \ Identifier = SID_SET_SUPER_SCRIPT; \ - HelpID = SID_SET_SUPER_SCRIPT; \ + Command = CMD_SID_SET_SUPER_SCRIPT; \ Text [ en-US ] = "Su~perscript"; \ #define ITEM_FORMAT_SET_SUB_SCRIPT \ Identifier = SID_SET_SUB_SCRIPT; \ - HelpID = SID_SET_SUB_SCRIPT; \ + Command = CMD_SID_SET_SUB_SCRIPT; \ Text [ en-US ] = "Su~bscript"; \ #define ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT \ Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ Command = ".uno:LeftPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ Text [ en-US ] = "~Left" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT \ Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ Command = ".uno:RightPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ Text [ en-US ] = "~Right" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER \ Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ Command = ".uno:CenterPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ Text [ en-US ] = "~Centered" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_BLOCK \ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ Command = ".uno:JustifyPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ Text [ en-US ] = "Justified" ;\ #define ITEM_FORMAT_PARA_LINESPACE_10 \ Identifier = SID_ATTR_PARA_LINESPACE_10 ; \ Command = ".uno:SpacePara1" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_10 ; \ Text [ en-US ] = "Single" ;\ #define ITEM_FORMAT_PARA_LINESPACE_15 \ Identifier = SID_ATTR_PARA_LINESPACE_15 ; \ Command = ".uno:SpacePara15" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_15 ; \ Text [ en-US ] = "1.5 lines" ;\ #define ITEM_FORMAT_PARA_LINESPACE_20 \ Identifier = SID_ATTR_PARA_LINESPACE_20 ; \ Command = ".uno:SpacePara2" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_20 ; \ Text [ en-US ] = "~Double" ;\ #define ITEM_FORMAT_FRAME_TO_TOP \ Identifier = SID_FRAME_TO_TOP ; \ Command = ".uno:BringToFront" ; \ - HelpID = SID_FRAME_TO_TOP ; \ Text [ en-US ] = "~Bring to Front" ;\ #define ITEM_FORMAT_FRAME_TO_BOTTOM \ Identifier = SID_FRAME_TO_BOTTOM ; \ Command = ".uno:SendToBack" ; \ - HelpID = SID_FRAME_TO_BOTTOM ; \ Text [ en-US ] = "~Send to Back" ;\ #define ITEM_FORMAT_OBJECT_ALIGN \ Identifier = SID_OBJECT_ALIGN ; \ Command = ".uno:ObjectAlign" ; \ - HelpID = SID_OBJECT_ALIGN ; \ Text [ en-US ] = "A~lignment" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_LEFT \ Identifier = SID_OBJECT_ALIGN_LEFT ; \ Command = ".uno:ObjectAlignLeft" ; \ - HelpID = SID_OBJECT_ALIGN_LEFT ; \ Text [ en-US ] = "~Left" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_CENTER \ Identifier = SID_OBJECT_ALIGN_CENTER ; \ Command = ".uno:AlignCenter" ; \ - HelpID = SID_OBJECT_ALIGN_CENTER ; \ Text [ en-US ] = "~Centered" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_RIGHT \ Identifier = SID_OBJECT_ALIGN_RIGHT ; \ Command = ".uno:ObjectAlignRight" ; \ - HelpID = SID_OBJECT_ALIGN_RIGHT ; \ Text [ en-US ] = "~Right" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_UP \ Identifier = SID_OBJECT_ALIGN_UP ; \ Command = ".uno:AlignUp" ; \ - HelpID = SID_OBJECT_ALIGN_UP ; \ Text [ en-US ] = "~Top" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_MIDDLE \ Identifier = SID_OBJECT_ALIGN_MIDDLE ; \ Command = ".uno:AlignMiddle" ; \ - HelpID = SID_OBJECT_ALIGN_MIDDLE ; \ Text [ en-US ] = "C~enter" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_DOWN \ Identifier = SID_OBJECT_ALIGN_DOWN ; \ Command = ".uno:AlignDown" ; \ - HelpID = SID_OBJECT_ALIGN_DOWN ; \ Text [ en-US ] = "~Bottom" ;\ #define ITEM_FORMAT_ATTRIBUTES_LINE \ Identifier = SID_ATTRIBUTES_LINE ; \ Command = ".uno:FormatLine" ; \ - HelpID = SID_ATTRIBUTES_LINE ; \ Text [ en-US ] = "L~ine..." ;\ #define ITEM_FORMAT_ATTRIBUTES_AREA \ Identifier = SID_ATTRIBUTES_AREA ; \ Command = ".uno:FormatArea" ; \ - HelpID = SID_ATTRIBUTES_AREA ; \ Text [ en-US ] = "A~rea..." ;\ #define ITEM_FORMAT_ATTR_TRANSFORM \ Identifier = SID_ATTR_TRANSFORM ; \ Command = ".uno:TransformDialog" ; \ - HelpID = SID_ATTR_TRANSFORM ; \ Text [ en-US ] = "Position and Si~ze..." ;\ #define ITEM_FORMAT_OBJECT_HEAVEN \ Identifier = SID_OBJECT_HEAVEN ; \ Command = ".uno:SetObjectToForeground" ; \ - HelpID = SID_OBJECT_HEAVEN ; \ Text [ en-US ] = "~To Foreground" ;\ #define ITEM_FORMAT_OBJECT_HELL \ Identifier = SID_OBJECT_HELL ; \ Command = ".uno:SetObjectToBackground" ; \ - HelpID = SID_OBJECT_HELL ; \ Text [ en-US ] = "T~o Background" ;\ #define ITEM_FORMAT_BEZIER_EDIT \ Identifier = SID_BEZIER_EDIT ; \ Command = ".uno:ToggleObjectBezierMode" ; \ - HelpID = SID_BEZIER_EDIT ; \ Text [ en-US ] = "Edit ~Points" ;\ #define ITEM_FILE_PICKLIST \ Identifier = SID_PICKLIST ; \ Command = ".uno:PickList" ; \ - HelpID = SID_PICKLIST ; \ Text [ en-US ] = "~File" ; \ #define ITEM_FILE_NEWDOC \ Identifier = SID_NEWDOCDIRECT ; \ Command = ".uno:AddDirect" ; \ - HelpID = SID_NEWDOCDIRECT ; \ Text [ en-US ] = "~New" ;\ #define ITEM_FILE_OPENDOC \ Identifier = SID_OPENDOC ; \ Command = ".uno:Open" ; \ - HelpID = SID_OPENDOC ; \ Text [ en-US ] = "~Open..." ;\ @@ -328,62 +282,52 @@ {\ Identifier = SID_AUTOPILOTMENU ; \ Command = ".uno:AutoPilotMenu" ; \ - HelpID = SID_AUTOPILOTMENU ; \ Text [ en-US ] = "A~utoPilot" ; \ }; #define ITEM_FILE_CLOSEDOC \ Identifier = SID_CLOSEDOC ; \ Command = ".uno:CloseDoc" ; \ - HelpID = SID_CLOSEDOC ; \ Text [ en-US ] = "~Close" ;\ #define ITEM_FILE_SAVEDOC \ Identifier = SID_SAVEDOC ; \ Command = ".uno:Save" ; \ - HelpID = SID_SAVEDOC ; \ Text [ en-US ] = "~Save" ; \ #define ITEM_FILE_SAVEDOCS \ Identifier = SID_SAVEDOCS ; \ Command = ".uno:SaveAll" ; \ - HelpID = SID_SAVEDOCS ; \ Text [ en-US ] = "Sa~ve All" ; \ #define ITEM_FILE_SAVEASDOC \ Identifier = SID_SAVEASDOC ; \ Command = ".uno:SaveAs" ; \ - HelpID = SID_SAVEASDOC ; \ Text [ en-US ] = "Save ~As..." ; \ #define ITEM_FILE_EXPORTDOC \ Identifier = SID_EXPORTDOC ; \ Command = ".uno:ExportTo" ; \ - HelpID = SID_EXPORTDOC ; \ Text [ en-US ] = "Expor~t..." ; \ #define ITEM_FILE_EXPORTDOCASPDF \ Identifier = SID_EXPORTDOCASPDF ; \ Command = ".uno:ExportToPDF" ; \ - HelpID = SID_EXPORTDOCASPDF ; \ Text [ en-US ] = "Export as P~DF..." ; \ #define ITEM_FILE_VERSIONDIALOG \ Identifier = SID_VERSION ; \ Command = ".uno:VersionDialog" ; \ - HelpID = SID_VERSION ; \ Text [ en-US ] = "Versions..." ; \ #define ITEM_FILE_LASTVERSIONDOC \ Identifier = SID_RELOAD ; \ Command = ".uno:Reload" ; \ - HelpID = SID_RELOAD ; \ Text [ en-US ] = "Reload" ;\ #define ITEM_FILE_DOCINFO \ Identifier = SID_DOCINFO ; \ Command = ".uno:SetDocumentProperties" ; \ - HelpID = SID_DOCINFO ; \ Text [ en-US ] = "Propert~ies..." ;\ #define ITEM_FILE_DOCTEMPLATE \ @@ -398,28 +342,24 @@ { \ Identifier = SID_ORGANIZER ; \ Command = ".uno:Organizer" ; \ - HelpId = SID_ORGANIZER ; \ Text [ en-US ] = "~Organize...";\ }; \ MenuItem \ { \ Identifier = SID_TEMPLATE_ADDRESSBOKSOURCE; \ Command = ".uno:AddressBookSource" ; \ - HelpId = SID_TEMPLATE_ADDRESSBOKSOURCE; \ Text [ en-US ] = "~Address Book Source..."; \ }; \ MenuItem \ { \ Identifier = SID_DOCTEMPLATE ; \ Command = ".uno:SaveAsTemplate" ; \ - HelpId = SID_DOCTEMPLATE ; \ Text [ en-US ] = "~Save...";\ }; \ MenuItem \ { \ Identifier = SID_OPENTEMPLATE ; \ Command = ".uno:OpenTemplate" ; \ - HelpId = SID_OPENTEMPLATE ; \ Text [ en-US ] = "~Edit...";\ }; \ }; \ @@ -428,164 +368,138 @@ #define ITEM_FILE_PRINTPREVIEW \ Identifier = SID_PRINTPREVIEW ; \ Command = ".uno:PrintPreview" ; \ - HelpID = SID_PRINTPREVIEW ; \ Text [ en-US ] = "Pa~ge Preview" ;\ #define ITEM_FILE_SETUPPRINTER \ Identifier = SID_SETUPPRINTER ; \ Command = ".uno:PrinterSetup" ; \ - HelpID = SID_SETUPPRINTER ; \ Text [ en-US ] = "P~rinter Settings..." ; \ #define ITEM_FILE_PRINTDOC \ Identifier = SID_PRINTDOC ; \ Command = ".uno:Print" ; \ - HelpID = SID_PRINTDOC ; \ Text [ en-US ] = "~Print..." ; \ #define ITEM_FILE_MAIL_SENDDOC \ Identifier = SID_MAIL_SENDDOC ; \ Command = ".uno:SendMail" ; \ - HelpID = SID_MAIL_SENDDOC ; \ Text [ en-US ] = "Document as ~E-mail..." ; \ #define ITEM_FILE_MAIL_SENDDOCASPDF \ Identifier = SID_MAIL_SENDDOCASPDF ; \ Command = ".uno:SendMailDocAsPDF" ; \ - HelpID = SID_MAIL_SENDDOCASPDF ; \ Text [ en-US ] = "Document as P~DF Attachment..." ; \ #define ITEM_FILE_QUITAPP \ Identifier = SID_QUITAPP ; \ Command = ".uno:Quit" ; \ - HelpID = SID_QUITAPP ; \ Text [ en-US ] = "E~xit" ; \ #define ITEM_FILE_LOGOUT \ Identifier = SID_LOGOUT ; \ Command = ".uno:Logout" ; \ - HelpID = SID_LOGOUT ; \ Text [ en-US ] = "Logout" ; \ #define ITEM_EDIT_UNDO \ Identifier = SID_UNDO ; \ Command = ".uno:UndoAction" ; \ - HelpID = SID_UNDO ; \ Text [ en-US ] = "Can't Undo" ; \ #define ITEM_EDIT_REDO \ Identifier = SID_REDO ; \ Command = ".uno:Redo" ; \ - HelpID = SID_REDO ; \ Text [ en-US ] = "Can't Restore" ; \ #define ITEM_EDIT_REPEAT \ Identifier = SID_REPEAT ; \ Command = ".uno:Repeat" ; \ - HelpID = SID_REPEAT ; \ Text [ en-US ] = "~Repeat" ; \ #define ITEM_EDIT_PASTE \ Identifier = SID_PASTE ; \ Command = ".uno:Paste" ; \ - HelpID = SID_PASTE ; \ Text [ en-US ] = "~Paste" ; \ #define ITEM_EDIT_SELECTALL \ Identifier = SID_SELECTALL ; \ Command = ".uno:SelectAll" ; \ - HelpID = SID_SELECTALL ; \ Text [ en-US ] = "Select ~All" ; \ #define ITEM_EDIT_SEARCH_DLG \ Identifier = SID_SEARCH_DLG ; \ Command = ".uno:SearchDialog" ; \ - HelpID = SID_SEARCH_DLG ; \ Text [ en-US ] = "~Find & Replace..." ; \ #define ITEM_EDIT_NAVIGATOR \ Identifier = SID_NAVIGATOR ; \ Command = ".uno:Navigator" ; \ - HelpID = SID_NAVIGATOR ; \ Text [ en-US ] = "~Navigator" ; \ #define ITEM_EDIT_BIBLIOGRAPHY \ Identifier = SID_COMP_BIBLIOGRAPHY ; \ Command = ".uno:BibliographyComponent" ; \ - HelpID = SID_COMP_BIBLIOGRAPHY ; \ Text [ en-US ] = "~Bibliography Database"; \ #define ITEM_EDIT_PLUGINS_ACTIVE \ Identifier = SID_PLUGINS_ACTIVE ; \ Command = ".uno:PlugInsActive" ; \ - HelpID = SID_PLUGINS_ACTIVE ; \ Text [ en-US ] = "P~lug-in" ; \ #define ITEM_EDIT_IMAP \ Identifier = SID_IMAP ; \ Command = ".uno:ImageMapDialog" ; \ - HelpID = SID_IMAP ; \ Text [ en-US ] = "ImageMap" ; \ #define ITEM_EDIT_OBJECT \ Identifier = SID_OBJECT ; \ Command = ".uno:ObjectMenue" ; \ - HelpID = SID_OBJECT ; \ Text [ en-US ] = "~Object" ; \ #define ITEM_VIEW_ATTR_ZOOM \ Identifier = SID_ATTR_ZOOM ; \ Command = ".uno:Zoom" ; \ - HelpID = SID_ATTR_ZOOM ; \ Text [ en-US ] = "~Zoom..." ; \ #define ITEM_VIEW_TOGGLEFUNCTIONBAR \ Identifier = SID_TOGGLEFUNCTIONBAR ; \ Command = ".uno:FunctionBarVisible" ; \ - HelpID = SID_TOGGLEFUNCTIONBAR ; \ Text [ en-US ] = "~Function Bar" ; \ #define ITEM_VIEW_TOGGLEOBJECTBAR \ Identifier = SID_TOGGLEOBJECTBAR ; \ Command = ".uno:ObjectBarVisible" ; \ - HelpID = SID_TOGGLEOBJECTBAR ; \ Text [ en-US ] = "~Object Bar" ; \ #define ITEM_VIEW_TOGGLEINETBAR \ Identifier = SID_TOGGLEINETBAR ; \ - HelpID = SID_TOGGLEINETBAR ; \ + Command = CMD_SID_TOGGLEINETBAR; \ Text [ en-US ] = "Internet Bar" ; \ #define ITEM_VIEW_TOGGLESTATUSBAR \ Identifier = SID_TOGGLESTATUSBAR ; \ Command = ".uno:StatusBarVisible" ; \ - HelpID = SID_TOGGLESTATUSBAR ; \ Text [ en-US ] = "~Status Bar" ; \ #define ITEM_VIEW_TOGGLEIMESTATUSWINDOW \ Identifier = SID_SHOW_IME_STATUS_WINDOW ; \ Command = ".uno:ShowImeStatusWindow" ; \ - HelpID = SID_SHOW_IME_STATUS_WINDOW ; \ Text [ en-US ] = "~Input Method Status"; \ #define ITEM_VIEW_TASKBAR \ Identifier = SID_TASKBAR ; \ Command = ".uno:TaskBarVisible" ; \ - HelpID = SID_TASKBAR ; \ Text [ en-US ] = "~Status Bar" ; \ #define ITEM_VIEW_COLORBAR \ Identifier = SID_COLOR_CONTROL ; \ Command = ".uno:ColorControl" ; \ - HelpID = SID_COLOR_CONTROL ; \ Text [ en-US ] = "~Color Bar" ; \ #define ITEM_VIEW_FULLSCREEN \ Identifier = SID_WIN_FULLSCREEN ; \ Command = ".uno:FullScreen" ; \ - HelpID = SID_WIN_FULLSCREEN ; \ Text [ en-US ] = "F~ull Screen" ; \ @@ -598,26 +512,22 @@ #define ITEM_VIEW_BROWSER_MODE \ Identifier = SID_BROWSER_MODE ; \ Command = ".uno:BrowseView" ; \ - HelpID = SID_BROWSER_MODE ; \ Text [ en-US ] = "~Online Layout" ; \ #define ITEM_VIEW_BROWSER \ Identifier = SID_BROWSER ; \ Command = ".uno:Beamer" ; \ - HelpID = SID_BROWSER ; \ Text [ en-US ] = "~Beamer" ; \ #define ITEM_INSERT_HYPERLINK_INSERT \ Identifier = SID_HYPERLINK_INSERT ; \ Command = ".uno:InsertHyperlink" ; \ - HelpID = SID_HYPERLINK_INSERT ; \ Text [ en-US ] = "~Hyperlink Bar" ; \ #define ITEM_INSERT_INSERT_GRAPHIC \ Identifier = SID_INSERT_GRAPHIC ; \ Command = ".uno:InsertGraphic" ; \ - HelpID = SID_INSERT_GRAPHIC ; \ Text [ en-US ] = "~Graphics..." ; \ #define ITEM_INSERT_TWAIN_SELECT \ @@ -625,7 +535,6 @@ {\ Identifier = SID_TWAIN_SELECT ; \ Command = ".uno:TwainSelect" ; \ - HelpID = SID_TWAIN_SELECT ; \ Text [ en-US ] = "~Select Source..." ; \ }; @@ -634,7 +543,6 @@ {\ Identifier = SID_TWAIN_TRANSFER ; \ Command = ".uno:TwainTransfer" ; \ - HelpID = SID_TWAIN_TRANSFER ; \ Text [ en-US ] = "~Request..." ; \ }; @@ -643,7 +551,6 @@ {\ Identifier = SID_SCAN ; \ Command = ".uno:Scan" ; \ - HelpID = SID_SCAN ; \ Text [ en-US ] = "Scan" ; \ SubMenu = Menu\ {\ @@ -658,19 +565,16 @@ #define ITEM_INSERT_INSERT_DIAGRAM \ Identifier = SID_INSERT_DIAGRAM ; \ Command = ".uno:InsertObjectChart" ; \ - HelpID = SID_INSERT_DIAGRAM ; \ Text [ en-US ] = "~Chart..." ; \ #define ITEM_INSERT_GALLERY \ Identifier = SID_GALLERY ; \ Command = ".uno:Gallery" ; \ - HelpID = SID_GALLERY ; \ Text [ en-US ] = "~Gallery" ; \ #define ITEM_INSERT_INSERTDOC \ Identifier = SID_INSERTDOC ; \ Command = ".uno:InsertDoc" ; \ - HelpID = SID_INSERTDOC ; \ Text [ en-US ] = "~File..." ; \ #define TMP_SID_INSERT_PLUGIN \ @@ -678,7 +582,6 @@ {\ Identifier = SID_INSERT_PLUGIN ; \ Command = ".uno:InsertPlugin" ; \ - HelpID = SID_INSERT_PLUGIN ; \ Text [ en-US ] = "~Plug-in..." ; \ }; @@ -687,7 +590,6 @@ {\ Identifier = SID_INSERT_SOUND ; \ Command = ".uno:InsertSound" ; \ - HelpID = SID_INSERT_SOUND ; \ Text [ en-US ] = "~Sound..." ; \ }; @@ -696,7 +598,6 @@ {\ Identifier = SID_INSERT_VIDEO ; \ Command = ".uno:InsertVideo" ; \ - HelpID = SID_INSERT_VIDEO ; \ Text [ en-US ] = "~Video..." ; \ }; @@ -706,7 +607,6 @@ {\ Identifier = SID_INSERT_APPLET ; \ Command = ".uno:InsertApplet" ; \ - HelpID = SID_INSERT_APPLET ; \ Text [ en-US ] = "~Applet..." ; \ }; #else @@ -716,7 +616,6 @@ MenuItem\ {\ Identifier = SID_MN_INSERT_OBJECT_DLGS ; \ - HelpID = SID_MN_INSERT_OBJECT_DLGS ; \ Command = ".uno:ObjectMenu" ; \ Text [ en-US ] = "~Object" ; \ SubMenu = Menu\ @@ -727,7 +626,6 @@ {\ Identifier = SID_INSERT_OBJECT ; \ Command = ".uno:InsertObject" ; \ - HelpID = SID_INSERT_OBJECT ; \ Text [ en-US ] = "~OLE Object..." ; \ };\ TMP_SID_INSERT_PLUGIN\ @@ -738,7 +636,6 @@ {\ Identifier = SID_INSERT_MATH ; \ Command = ".uno:InsertMath" ; \ - HelpID = SID_INSERT_MATH ; \ Text [ en-US ] = "~Formula..." ; \ };\ };\ @@ -749,7 +646,6 @@ MenuItem\ {\ Identifier = SID_MN_INSERT_OBJECT_DLGS ; \ - HelpID = SID_MN_INSERT_OBJECT_DLGS ; \ Command = ".uno:ObjectMenu" ; \ Text [ en-US ] = "~Object" ; \ SubMenu = Menu\ @@ -760,14 +656,12 @@ {\ Identifier = SID_INSERT_OBJECT ; \ Command = ".uno:InsertObject" ; \ - HelpID = SID_INSERT_OBJECT ; \ Text [ en-US ] = "~OLE Object..." ; \ };\ MenuItem\ {\ Identifier = SID_INSERT_MATH ; \ Command = ".uno:InsertMath" ; \ - HelpID = SID_INSERT_MATH ; \ Text [ en-US ] = "~Formula" ; \ };\ };\ @@ -778,7 +672,6 @@ MenuItem\ {\ Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ - HelpID = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ Text [ en-US ] = "~Numbering/Bullets..." ; \ }; @@ -786,7 +679,6 @@ #define ITEM_FORMAT \ Identifier = SID_OBJECTMENU0 ; \ - HelpID = SID_OBJECTMENU0 ; \ Command = ".uno:FormatMenu" ; \ Text [ en-US ] = "F~ormat" ; \ @@ -794,7 +686,6 @@ #define ITEM_TOOLS_MACROS \ Identifier = SID_SCRIPTORGANIZER ; \ - HelpId = SID_SCRIPTORGANIZER ; \ Command = ".uno:ScriptOrganizer" ; \ Text [ en-US ] = "Scripts/Macros" ; \ @@ -810,13 +701,11 @@ { \ Identifier = SID_RECORDMACRO ; \ Command = ".uno:MacroRecorder" ; \ - HelpId = SID_RECORDMACRO ; \ Text [ en-US ] = "Record Macro"; }; \ MenuItem \ { \ Identifier = SID_BASICCHOOSER ; \ Command = ".uno:MacroDialog" ; \ - HelpID = SID_BASICCHOOSER ; \ Text [ en-US ] = "~Macro..." ; \ }; \ }; \ @@ -829,7 +718,6 @@ #define ITEM_TOOLS_CONFIG \ Identifier = SID_CONFIG ; \ Command = ".uno:ConfigureDialog"; \ - HelpID = SID_CONFIG ; \ Text [ en-US ] = "~Configure..." ; \ @@ -838,7 +726,6 @@ {\ Identifier = SID_AUTO_CORRECT_DLG ; \ Command = ".uno:AutoCorrectDlg" ; \ - HelpID = SID_AUTO_CORRECT_DLG ; \ Text [ en-US ] = "~AutoCorrect..." ; \ }; @@ -847,7 +734,6 @@ {\ Identifier = SID_SD_GRAPHIC_OPTIONS ; \ Command = ".uno:SdGraphicOptions" ; \ - HelpID = SID_SD_GRAPHIC_OPTIONS ; \ Text [ en-US ] = "~Drawing..." ; \ }; @@ -856,7 +742,6 @@ {\ Identifier = SID_OPTIONS_TREEDIALOG ; \ Command = ".uno:OptionsTreeDialog" ; \ - HelpID = SID_OPTIONS_TREEDIALOG ; \ Text [ en-US ] = "~Options..." ; \ }; @@ -867,13 +752,11 @@ #define ITEM_WINDOW_MDIWINDOWLIST \ Identifier = SID_MDIWINDOWLIST ; \ Command = ".uno:WindowList" ; \ - HelpID = SID_MDIWINDOWLIST ; \ Text [ en-US ] = "~Window" ; \ #define ITEM_WINDOW_CLONEWIN \ Identifier = SID_NEWWINDOW ; \ Command = ".uno:NewWindow" ; \ - HelpID = SID_NEWWINDOW ; \ Text [ en-US ] = "~New Window" ; \ #define ITEM_WINDOW_CASCADEWINS \ @@ -881,7 +764,6 @@ {\ Identifier = SID_CASCADEWINS ; \ Command = ".uno:Cascade" ; \ - HelpID = SID_CASCADEWINS ; \ Text [ en-US ] = "~Cascade" ; \ }; @@ -890,7 +772,6 @@ {\ Identifier = SID_TILEWINS ; \ Command = ".uno:Tile" ; \ - HelpID = SID_TILEWINS ; \ Text [ en-US ] = "~Tile" ; \ }; @@ -899,7 +780,6 @@ {\ Identifier = SID_HORIZONTALWINS ; \ Command = ".uno:ArrangeHorizontal" ; \ - HelpID = SID_HORIZONTALWINS ; \ Text [ en-US ] = "~Horizontally" ; \ }; @@ -908,14 +788,12 @@ {\ Identifier = SID_VERTICALWINS ; \ Command = ".uno:ArrangeVertical" ; \ - HelpID = SID_VERTICALWINS ; \ Text [ en-US ] = "~Vertically" ; \ }; #define ITEM_WINDOW_CLOSEWIN \ Identifier = SID_CLOSEWIN ; \ Command = ".uno:CloseWin" ; \ - HelpID = SID_CLOSEWIN ; \ Text [ en-US ] = "Close Window" ; \ #define ITEM_HYPERLINK_DIALOG \ @@ -923,7 +801,6 @@ {\ Identifier = SID_HYPERLINK_DIALOG ; \ Command = ".uno:HyperlinkDialog" ; \ - HelpID = SID_HYPERLINK_DIALOG ; \ Text [ en-US ] = "~Hyperlink" ; \ } ; @@ -932,7 +809,6 @@ {\ Identifier = SID_POLY_MERGE ; \ Command = ".uno:Merge" ; \ - HelpID = SID_POLY_MERGE ; \ Text [ en-US ] = "~Merge" ; \ }; #define ITEM_POLY_SUBSTRACT \ @@ -940,7 +816,6 @@ {\ Identifier = SID_POLY_SUBSTRACT ; \ Command = ".uno:Substract" ; \ - HelpID = SID_POLY_SUBSTRACT ; \ Text [ en-US ] = "~Subtract" ; \ }; #define ITEM_POLY_INTERSECT \ @@ -948,7 +823,6 @@ {\ Identifier = SID_POLY_INTERSECT ; \ Command = ".uno:Intersect" ; \ - HelpID = SID_POLY_INTERSECT ; \ Text [ en-US ] = "I~ntersect" ; \ }; @@ -957,7 +831,6 @@ { \ Identifier = SID_POLY_FORMEN ; \ Command = ".uno:PolyFormen" ; \ - HelpID = SID_POLY_FORMEN ; \ Text [ en-US ] = "~Shapes" ; \ SubMenu = Menu \ {\ @@ -1016,56 +889,47 @@ #define ITEM_HELP_HELPMENU \ Identifier = SID_HELPMENU ; \ Command = ".uno:HelpMenu" ; \ - HelpID = SID_HELPMENU ; \ Text [ en-US ] = "~Help" ; \ #define ITEM_HELP_HELPINDEX \ Identifier = SID_HELPINDEX ; \ Command = ".uno:HelpIndex" ; \ - HelpID = SID_HELPINDEX ; \ Text [ en-US ] = "~Contents" ; \ #define ITEM_HELP_HELPONHELP \ Identifier = SID_HELPONHELP ; \ Command = ".uno:HelpOnHelp" ; \ - HelpID = SID_HELPONHELP ; \ Text [ en-US ] = "Using Help" ; \ #define ITEM_HELP_HELP_PI \ Identifier = SID_HELP_PI ; \ Command = ".uno:HelperDialog" ; \ - HelpID = SID_HELP_PI ; \ Text [ en-US ] = "Help ~Agent" ; \ #define ITEM_HELP_HELPTIPS \ Identifier = SID_HELPTIPS ; \ Command = ".uno:HelpTip" ; \ - HelpID = SID_HELPTIPS ; \ Text [ en-US ] = "~Tips" ; \ #define ITEM_HELP_BALLOONHELP \ Identifier = SID_HELPBALLOONS ; \ Command = ".uno:ActiveHelp" ; \ - HelpID = SID_HELPBALLOONS ; \ Text [ en-US ] = "~Extended Tips" ; \ #define ITEM_HELP_SUPPORTPAGE \ Identifier = SID_HELP_SUPPORTPAGE ; \ Command = ".uno:HelpSupport" ; \ - HelpID = SID_HELP_SUPPORTPAGE ; \ Text [ en-US ] = "~Support" ; \ #define ITEM_HELP_ONLINE_REGISTRATION \ Identifier = SID_ONLINE_REGISTRATION ; \ Command = ".uno:OnlineRegistrationDlg" ; \ - HelpID = SID_ONLINE_REGISTRATION ; \ Text [ en-US ] = "~Registration..." ; \ #define ITEM_HELP_ABOUT \ Identifier = SID_ABOUT ; \ Command = ".uno:About" ; \ - HelpID = SID_ABOUT ; \ Text [ en-US ] = "A~bout %PRODUCTNAME..." ; \ /*------------------------------------------------------------------------ @@ -1131,39 +995,33 @@ #define ITEM_POPUP_TEMPLATE_EDIT \ Identifier = SID_STYLE_EDIT ; \ Command = ".uno:EditStyle" ; \ - HelpID = SID_STYLE_EDIT ; \ Text [ en-US ] = "Edit Paragraph Style..." ; \ // Gruppen-/Kombination-Funktionen #define ITEM_POPUP_GROUP \ Identifier = SID_GROUP ; \ Command = ".uno:FormatGroup" ; \ - HelpID = SID_GROUP ; \ Text [ en-US ] = "~Group" ; \ #define ITEM_POPUP_UNGROUP \ Identifier = SID_UNGROUP ; \ Command = ".uno:FormatUngroup" ; \ - HelpID = SID_UNGROUP ; \ Text [ en-US ] = "~Ungroup" ; \ #define ITEM_POPUP_ENTER_GROUP \ Identifier = SID_ENTER_GROUP ; \ Command = ".uno:EnterGroup" ; \ - HelpID = SID_ENTER_GROUP ; \ Text [ en-US ] = "~Edit Group" ; \ #define ITEM_POPUP_LEAVE_GROUP \ Identifier = SID_LEAVE_GROUP ; \ Command = ".uno:LeaveGroup" ; \ - HelpID = SID_LEAVE_GROUP ; \ Text [ en-US ] = "E~xit Group" ; \ #define ITEM_GROUP_MENU \ MenuItem\ {\ Identifier = SID_MN_GROUP ; \ - HelpID = SID_MN_GROUP ; \ Command = ".uno:GroupMenu" ; \ SubMenu = Menu\ {\ @@ -1195,14 +1053,12 @@ { \ Identifier = SID_DATASOURCE_ADMINISTRATION ; \ Command = ".uno:DatasourceAdministration" ; \ - HelpID = SID_DATASOURCE_ADMINISTRATION ; \ Text [ en-US ] = "~Data Sources..." ; \ }; #define ITEM_VIEW_DATA_SOURCE_BROWSER \ Identifier = SID_VIEW_DATA_SOURCE_BROWSER; \ Command = ".uno:ViewDataSourceBrowser" ; \ - HelpID = SID_VIEW_DATA_SOURCE_BROWSER; \ Text [ en-US ] = "~Data Sources" ; \ /*------------------------------------------------------------------------ @@ -1211,112 +1067,92 @@ #define ITEM_TOOLBAR_SET_JUSTIFY_PARA \ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ Command = ".uno:JustifyPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; #define ITEM_TOOLBAR_NEWDOCDIRECT \ Identifier = SID_NEWDOCDIRECT ; \ Command = ".uno:AddDirect" ; \ - HelpID = SID_NEWDOCDIRECT ; #define ITEM_TOOLBAR_PRINTDOCDIRECT \ Identifier = SID_PRINTDOCDIRECT ; \ Command = ".uno:PrintDefault" ; \ - HelpID = SID_PRINTDOCDIRECT ; #define ITEM_TOOLBAR_INSERT_DRAW \ Identifier = SID_INSERT_DRAW ; \ Command = ".uno:InsertDraw" ; \ - HelpID = SID_INSERT_DRAW ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_CHOOSE_CONTROLS \ Identifier = SID_CHOOSE_CONTROLS ; \ Command = ".uno:ChooseControls" ; \ - HelpID = SID_CHOOSE_CONTROLS ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_AUTOSPELL_CHECK \ Identifier = SID_AUTOSPELL_CHECK ; \ Command = ".uno:SpellOnline" ; \ - HelpID = SID_AUTOSPELL_CHECK ; #define ITEM_TOOLBAR_TEMPLATE_APPLY \ Identifier = SID_STYLE_APPLY ; \ Command = ".uno:StyleApply" ; \ - HelpID = SID_STYLE_APPLY ; #define ITEM_TOOLBAR_ATTR_CHAR_COLOR \ Identifier = SID_ATTR_CHAR_COLOR ; \ Command = ".uno:Color" ; \ - HelpID = SID_ATTR_CHAR_COLOR ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_BACKGROUND_PATTERN \ Identifier = SID_BACKGROUND_PATTERN ; \ Command = ".uno:BackgroundPatternController" ; \ - HelpID = SID_BACKGROUND_PATTERN ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_BACKGROUND_COLOR \ Identifier = SID_BACKGROUND_COLOR ; \ Command = ".uno:BackgroundColor" ; \ - HelpID = SID_BACKGROUND_COLOR ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_ATTR_BORDER \ Identifier = SID_ATTR_BORDER ; \ Command = ".uno:BorderStyle" ; \ - HelpID = SID_ATTR_BORDER ; #define ITEM_TOOLBAR_FRAME_LINESTYLE \ Identifier = SID_FRAME_LINESTYLE ; \ Command = ".uno:LineStyle" ; \ - HelpID = SID_FRAME_LINESTYLE ; #define ITEM_TOOLBAR_FRAME_LINECOLOR \ Identifier = SID_FRAME_LINECOLOR ; \ Command = ".uno:FrameLineColor" ; \ - HelpID = SID_FRAME_LINECOLOR ; #define ITEM_TOOLBAR_SIM_START \ Identifier = SID_SIM_START ; \ Command = ".uno:LaunchStarImage" ; \ - HelpID = SID_SIM_START ; #define ITEM_TOOLBAR_ATTR_LINEEND_STYLE \ Identifier = SID_ATTR_LINEEND_STYLE ; \ Command = ".uno:LineEndStyle" ; \ - HelpID = SID_ATTR_LINEEND_STYLE ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_ATTR_LINE_STYLE \ Identifier = SID_ATTR_LINE_STYLE ; \ Command = ".uno:XLineStyle" ; \ - HelpID = SID_ATTR_LINE_STYLE ; #define ITEM_TOOLBAR_ATTR_LINE_WIDTH \ Identifier = SID_ATTR_LINE_WIDTH ; \ Command = ".uno:LineWidth" ; \ - HelpID = SID_ATTR_LINE_WIDTH ; #define ITEM_TOOLBAR_ATTR_LINE_COLOR \ Identifier = SID_ATTR_LINE_COLOR ; \ Command = ".uno:XLineColor" ; \ - HelpID = SID_ATTR_LINE_COLOR ; #define ITEM_TOOLBAR_ATTR_FILL_STYLE \ Identifier = SID_ATTR_FILL_STYLE ; \ Command = ".uno:FillStyle" ; \ - HelpID = SID_ATTR_FILL_STYLE ; #define ITEM_TOOLBAR_OBJECT_ROTATE \ Identifier = SID_OBJECT_ROTATE ; \ Command = ".uno:ToggleObjectRotateMode" ; \ - HelpID = SID_OBJECT_ROTATE ; #define ITEM_VIEW_OFFICEBAR \ Identifier = SID_GROUPVIEW; \ - HelpID = SID_GROUPVIEW; \ + Command = CMD_SID_GROUPVIEW; \ Text [ en-US ] = "~Office Bar" ; \ @@ -1324,7 +1160,6 @@ MenuItem\ {\ Identifier = SID_MN_SUB_TRANSLITERATE ; \ - HelpID = SID_MN_SUB_TRANSLITERATE ; \ Command = ".uno:TransliterateMenu" ; \ SubMenu = Menu\ {\ @@ -1334,42 +1169,36 @@ {\ Identifier = SID_TRANSLITERATE_UPPER ; \ Command = ".uno:ChangeCaseToUpper" ; \ - HelpID = SID_TRANSLITERATE_UPPER ; \ Text [ en-US ] = "~Uppercase";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_LOWER; \ Command = ".uno:ChangeCaseToLower" ; \ - HelpID = SID_TRANSLITERATE_LOWER; \ Text [ en-US ] = "~Lowercase";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_HALFWIDTH; \ Command = ".uno:ChangeCaseToHalfWidth" ; \ - HelpID = SID_TRANSLITERATE_HALFWIDTH; \ Text [ en-US ] = "H~alf-width";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_FULLWIDTH; \ Command = ".uno:ChangeCaseToFullWidth" ; \ - HelpID = SID_TRANSLITERATE_FULLWIDTH; \ Text [ en-US ] = "Full-width";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_HIRAGANA; \ Command = ".uno:ChangeCaseToHiragana" ; \ - HelpID = SID_TRANSLITERATE_HIRAGANA; \ Text [ en-US ] = "~Hiragana";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_KATAGANA; \ Command = ".uno:ChangeCaseToKatakana" ; \ - HelpID = SID_TRANSLITERATE_KATAGANA; \ Text [ en-US ] = "~Katakana";\ };\ };\ @@ -1379,23 +1208,23 @@ #define ITEM_OPEN_HYPERLINK \ Identifier = SID_OPEN_HYPERLINK ; \ - HelpID = SID_OPEN_HYPERLINK ; \ + Command = CMD_SID_OPEN_HYPERLINK; \ Text [ en-US ] = "~Open Hyperlink" ; \ #define ITEM_OPEN_SMARTTAGMENU \ Identifier = SID_OPEN_SMARTTAGMENU ; \ - HelpID = SID_OPEN_SMARTTAGMENU ; \ + Command = CMD_SID_OPEN_SMARTTAGMENU; \ Text [ en-US ] = "Open ~Smart Tag Menu" ; \ #define ITEM_OPEN_XML_FILTERSETTINGS \ Identifier = SID_OPEN_XML_FILTERSETTINGS ; \ - HelpID = SID_OPEN_XML_FILTERSETTINGS ; \ + Command = CMD_SID_OPEN_XML_FILTERSETTINGS; \ Text [ en-US ] = "~XML Filter Settings..."; \ #define ITEM_HANGUL_HANJA_CONVERSION \ Identifier = SID_HANGUL_HANJA_CONVERSION; \ - HelpId = SID_HANGUL_HANJA_CONVERSION; \ + Command = CMD_SID_HANGUL_HANJA_CONVERSION; \ Text [ en-US ] = "Hangul/Hanja Conversion..."; \ #endif // #ifndef _GLOBLMN_HRC diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index a183735b6c..6b1fb48b94 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -31,264 +31,255 @@ #include #include +#include +#include // Help-Ids -------------------------------------------------------------- -#define HID_ALIGN_TBX (HID_SVX_START + 1) -#define HID_BMPMASK_CTL_PIPETTE (HID_SVX_START + 4) -#define HID_BMPMASK_CTL_QCOL_1 (HID_SVX_START + 5) -#define HID_BMPMASK_TBI_PIPETTE (HID_SVX_START + 6) -#define HID_COLOR_CTL_COLORS (HID_SVX_START + 7) -#define HID_CONTDLG_APPLY (HID_SVX_START + 8) -#define HID_CONTDLG_AUTOCONTOUR (HID_SVX_START + 9) -#define HID_CONTDLG_CIRCLE (HID_SVX_START + 10) -#define HID_CONTDLG_FREEPOLY (HID_SVX_START + 11) -#define HID_CONTDLG_GRAPHWND (HID_SVX_START + 12) -#define HID_CONTDLG_PIPETTE (HID_SVX_START + 13) -#define HID_CONTDLG_POLY (HID_SVX_START + 14) -#define HID_CONTDLG_POLYDELETE (HID_SVX_START + 15) -#define HID_CONTDLG_POLYEDIT (HID_SVX_START + 16) -#define HID_CONTDLG_POLYINSERT (HID_SVX_START + 17) -#define HID_CONTDLG_POLYMOVE (HID_SVX_START + 18) -#define HID_CONTDLG_RECT (HID_SVX_START + 19) -#define HID_CONTDLG_REDO (HID_SVX_START + 20) -#define HID_CONTDLG_SELECT (HID_SVX_START + 21) -#define HID_CONTDLG_TOOLBOX (HID_SVX_START + 22) -#define HID_CONTDLG_UNDO (HID_SVX_START + 23) -#define HID_CONTDLG_WORKPLACE (HID_SVX_START + 24) -#define HID_CTL_FONTWORK_FAVORITES (HID_SVX_START + 25) -#define HID_CTRL3D_HSCROLL (HID_SVX_START + 26) -#define HID_CTRL3D_SWITCHER (HID_SVX_START + 27) -#define HID_CTRL3D_VSCROLL (HID_SVX_START + 28) -#define HID_CTRL_COLOR (HID_SVX_START + 29) -#define HID_DRAWTOOL_TBX (HID_SVX_START + 30) -#define HID_EDITENG_SPELLER_ADDWORD (HID_SVX_START + 31) -#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_SVX_START + 32) -#define HID_EDITENG_SPELLER_IGNORE (HID_SVX_START + 33) -#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_SVX_START + 34) -#define HID_EDITENG_SPELLER_START (HID_SVX_START + 35) -#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_SVX_START + 36) -#define HID_FILL_ATTR_LISTBOX (HID_SVX_START + 37) -#define HID_FILL_TYPE_LISTBOX (HID_SVX_START + 38) -#define HID_FONTWORK_CTL_FORMS (HID_SVX_START + 39) -#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE (HID_SVX_START + 40) -#define HID_FONTWORK_TBI_ADJUST_CENTER (HID_SVX_START + 41) -#define HID_FONTWORK_TBI_ADJUST_LEFT (HID_SVX_START + 42) -#define HID_FONTWORK_TBI_ADJUST_MIRROR (HID_SVX_START + 43) -#define HID_FONTWORK_TBI_ADJUST_RIGHT (HID_SVX_START + 44) -#define HID_FONTWORK_TBI_OUTLINE (HID_SVX_START + 45) -#define HID_FONTWORK_TBI_SHADOW_NORMAL (HID_SVX_START + 46) -#define HID_FONTWORK_TBI_SHADOW_OFF (HID_SVX_START + 47) -#define HID_FONTWORK_TBI_SHADOW_SLANT (HID_SVX_START + 48) -#define HID_FONTWORK_TBI_SHOWFORM (HID_SVX_START + 49) -#define HID_FONTWORK_TBI_STYLE_OFF (HID_SVX_START + 50) -#define HID_FONTWORK_TBI_STYLE_ROTATE (HID_SVX_START + 51) -#define HID_FONTWORK_TBI_STYLE_SLANTX (HID_SVX_START + 52) -#define HID_FONTWORK_TBI_STYLE_SLANTY (HID_SVX_START + 53) -#define HID_FONTWORK_TBI_STYLE_UPRIGHT (HID_SVX_START + 54) -#define HID_FORMAT_FOOTER (HID_SVX_START + 55) -#define HID_FORMAT_HEADER (HID_SVX_START + 56) +#define HID_ALIGN_TBX "SVX_HID_ALIGN_TBX" +#define HID_BMPMASK_CTL_PIPETTE "SVX_HID_BMPMASK_CTL_PIPETTE" +#define HID_BMPMASK_CTL_QCOL_1 "SVX_HID_BMPMASK_CTL_QCOL_1" +#define HID_BMPMASK_TBI_PIPETTE "SVX_HID_BMPMASK_TBI_PIPETTE" +#define HID_COLOR_CTL_COLORS "SVX_HID_COLOR_CTL_COLORS" +#define HID_CONTDLG_APPLY "SVX_HID_CONTDLG_APPLY" +#define HID_CONTDLG_AUTOCONTOUR "SVX_HID_CONTDLG_AUTOCONTOUR" +#define HID_CONTDLG_CIRCLE "SVX_HID_CONTDLG_CIRCLE" +#define HID_CONTDLG_FREEPOLY "SVX_HID_CONTDLG_FREEPOLY" +#define HID_CONTDLG_GRAPHWND "SVX_HID_CONTDLG_GRAPHWND" +#define HID_CONTDLG_PIPETTE "SVX_HID_CONTDLG_PIPETTE" +#define HID_CONTDLG_POLY "SVX_HID_CONTDLG_POLY" +#define HID_CONTDLG_POLYDELETE "SVX_HID_CONTDLG_POLYDELETE" +#define HID_CONTDLG_POLYEDIT "SVX_HID_CONTDLG_POLYEDIT" +#define HID_CONTDLG_POLYINSERT "SVX_HID_CONTDLG_POLYINSERT" +#define HID_CONTDLG_POLYMOVE "SVX_HID_CONTDLG_POLYMOVE" +#define HID_CONTDLG_RECT "SVX_HID_CONTDLG_RECT" +#define HID_CONTDLG_REDO "SVX_HID_CONTDLG_REDO" +#define HID_CONTDLG_SELECT "SVX_HID_CONTDLG_SELECT" +#define HID_CONTDLG_TOOLBOX "SVX_HID_CONTDLG_TOOLBOX" +#define HID_CONTDLG_UNDO "SVX_HID_CONTDLG_UNDO" +#define HID_CONTDLG_WORKPLACE "SVX_HID_CONTDLG_WORKPLACE" +#define HID_CTL_FONTWORK_FAVORITES "SVX_HID_CTL_FONTWORK_FAVORITES" +#define HID_CTRL3D_HSCROLL "SVX_HID_CTRL3D_HSCROLL" +#define HID_CTRL3D_SWITCHER "SVX_HID_CTRL3D_SWITCHER" +#define HID_CTRL3D_VSCROLL "SVX_HID_CTRL3D_VSCROLL" +#define HID_CTRL_COLOR "SVX_HID_CTRL_COLOR" +#define HID_DRAWTOOL_TBX "SVX_HID_DRAWTOOL_TBX" +#define HID_EDITENG_SPELLER_ADDWORD "SVX_HID_EDITENG_SPELLER_ADDWORD" +#define HID_EDITENG_SPELLER_AUTOCORRECT "SVX_HID_EDITENG_SPELLER_AUTOCORRECT" +#define HID_EDITENG_SPELLER_IGNORE "SVX_HID_EDITENG_SPELLER_IGNORE" +#define HID_EDITENG_SPELLER_PARALANGUAGE "SVX_HID_EDITENG_SPELLER_PARALANGUAGE" +#define HID_EDITENG_SPELLER_START "SVX_HID_EDITENG_SPELLER_START" +#define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE" +#define HID_FILL_ATTR_LISTBOX "SVX_HID_FILL_ATTR_LISTBOX" +#define HID_FILL_TYPE_LISTBOX "SVX_HID_FILL_TYPE_LISTBOX" +#define HID_FONTWORK_CTL_FORMS "SVX_HID_FONTWORK_CTL_FORMS" +#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE "SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE" +#define HID_FONTWORK_TBI_ADJUST_CENTER "SVX_HID_FONTWORK_TBI_ADJUST_CENTER" +#define HID_FONTWORK_TBI_ADJUST_LEFT "SVX_HID_FONTWORK_TBI_ADJUST_LEFT" +#define HID_FONTWORK_TBI_ADJUST_MIRROR "SVX_HID_FONTWORK_TBI_ADJUST_MIRROR" +#define HID_FONTWORK_TBI_ADJUST_RIGHT "SVX_HID_FONTWORK_TBI_ADJUST_RIGHT" +#define HID_FONTWORK_TBI_OUTLINE "SVX_HID_FONTWORK_TBI_OUTLINE" +#define HID_FONTWORK_TBI_SHADOW_NORMAL "SVX_HID_FONTWORK_TBI_SHADOW_NORMAL" +#define HID_FONTWORK_TBI_SHADOW_OFF "SVX_HID_FONTWORK_TBI_SHADOW_OFF" +#define HID_FONTWORK_TBI_SHADOW_SLANT "SVX_HID_FONTWORK_TBI_SHADOW_SLANT" +#define HID_FONTWORK_TBI_SHOWFORM "SVX_HID_FONTWORK_TBI_SHOWFORM" +#define HID_FONTWORK_TBI_STYLE_OFF "SVX_HID_FONTWORK_TBI_STYLE_OFF" +#define HID_FONTWORK_TBI_STYLE_ROTATE "SVX_HID_FONTWORK_TBI_STYLE_ROTATE" +#define HID_FONTWORK_TBI_STYLE_SLANTX "SVX_HID_FONTWORK_TBI_STYLE_SLANTX" +#define HID_FONTWORK_TBI_STYLE_SLANTY "SVX_HID_FONTWORK_TBI_STYLE_SLANTY" +#define HID_FONTWORK_TBI_STYLE_UPRIGHT "SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT" +#define HID_FORMAT_FOOTER "SVX_HID_FORMAT_FOOTER" +#define HID_FORMAT_HEADER "SVX_HID_FORMAT_HEADER" // free -#define HID_GALLERY_ICONVIEW (HID_SVX_START + 58) -#define HID_GALLERY_LISTVIEW (HID_SVX_START + 59) -#define HID_GALLERY_MN_ADD (HID_SVX_START + 60) -#define HID_GALLERY_MN_ADDMENU (HID_SVX_START + 61) -#define HID_GALLERY_MN_ADD_LINK (HID_SVX_START + 62) -#define HID_GALLERY_MN_BACKGROUND (HID_SVX_START + 63) -#define HID_GALLERY_MN_COPYCLIPBOARD (HID_SVX_START + 64) -#define HID_GALLERY_MN_DELETE (HID_SVX_START + 65) -#define HID_GALLERY_MN_PASTECLIPBOARD (HID_SVX_START + 66) -#define HID_GALLERY_MN_PREVIEW (HID_SVX_START + 67) -#define HID_GALLERY_NEWTHEME (HID_SVX_START + 68) -#define HID_GALLERY_PREVIEW (HID_SVX_START + 69) -#define HID_GALLERY_PROPERTIES (HID_SVX_START + 70) -#define HID_GALLERY_RENAME (HID_SVX_START + 71) -#define HID_GALLERY_THEMELIST (HID_SVX_START + 72) +#define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW" +#define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW" +#define HID_GALLERY_MN_ADD "SVX_HID_GALLERY_MN_ADD" +#define HID_GALLERY_MN_ADDMENU "SVX_HID_GALLERY_MN_ADDMENU" +#define HID_GALLERY_MN_ADD_LINK "SVX_HID_GALLERY_MN_ADD_LINK" +#define HID_GALLERY_MN_BACKGROUND "SVX_HID_GALLERY_MN_BACKGROUND" +#define HID_GALLERY_MN_COPYCLIPBOARD "SVX_HID_GALLERY_MN_COPYCLIPBOARD" +#define HID_GALLERY_MN_DELETE "SVX_HID_GALLERY_MN_DELETE" +#define HID_GALLERY_MN_PASTECLIPBOARD "SVX_HID_GALLERY_MN_PASTECLIPBOARD" +#define HID_GALLERY_MN_PREVIEW "SVX_HID_GALLERY_MN_PREVIEW" +#define HID_GALLERY_NEWTHEME "SVX_HID_GALLERY_NEWTHEME" +#define HID_GALLERY_PREVIEW "SVX_HID_GALLERY_PREVIEW" +#define HID_GALLERY_PROPERTIES "SVX_HID_GALLERY_PROPERTIES" +#define HID_GALLERY_RENAME "SVX_HID_GALLERY_RENAME" +#define HID_GALLERY_THEMELIST "SVX_HID_GALLERY_THEMELIST" // free -#define HID_GALLERY_WINDOW (HID_SVX_START + 74) -#define HID_GRFFILTER (HID_SVX_START + 75) -#define HID_GRFFILTER_EMBOSS (HID_SVX_START + 76) -#define HID_GRFFILTER_INVERT (HID_SVX_START + 77) -#define HID_GRFFILTER_MOSAIC (HID_SVX_START + 78) -#define HID_GRFFILTER_POPART (HID_SVX_START + 79) -#define HID_GRFFILTER_POSTER (HID_SVX_START + 80) -#define HID_GRFFILTER_REMOVENOISE (HID_SVX_START + 81) -#define HID_GRFFILTER_SEPIA (HID_SVX_START + 82) -#define HID_GRFFILTER_SHARPEN (HID_SVX_START + 83) -#define HID_GRFFILTER_SMOOTH (HID_SVX_START + 84) -#define HID_GRFFILTER_SOBEL (HID_SVX_START + 85) -#define HID_GRFFILTER_SOLARIZE (HID_SVX_START + 86) +#define HID_GALLERY_WINDOW "SVX_HID_GALLERY_WINDOW" +#define HID_GRFFILTER "SVX_HID_GRFFILTER" +#define HID_GRFFILTER_EMBOSS "SVX_HID_GRFFILTER_EMBOSS" +#define HID_GRFFILTER_INVERT "SVX_HID_GRFFILTER_INVERT" +#define HID_GRFFILTER_MOSAIC "SVX_HID_GRFFILTER_MOSAIC" +#define HID_GRFFILTER_POPART "SVX_HID_GRFFILTER_POPART" +#define HID_GRFFILTER_POSTER "SVX_HID_GRFFILTER_POSTER" +#define HID_GRFFILTER_REMOVENOISE "SVX_HID_GRFFILTER_REMOVENOISE" +#define HID_GRFFILTER_SEPIA "SVX_HID_GRFFILTER_SEPIA" +#define HID_GRFFILTER_SHARPEN "SVX_HID_GRFFILTER_SHARPEN" +#define HID_GRFFILTER_SMOOTH "SVX_HID_GRFFILTER_SMOOTH" +#define HID_GRFFILTER_SOBEL "SVX_HID_GRFFILTER_SOBEL" +#define HID_GRFFILTER_SOLARIZE "SVX_HID_GRFFILTER_SOLARIZE" -#define HID_IMAPDLG_ACTIVE (HID_SVX_START + 88) -#define HID_IMAPDLG_APPLY (HID_SVX_START + 89) -#define HID_IMAPDLG_CIRCLE (HID_SVX_START + 90) -#define HID_IMAPDLG_FREEPOLY (HID_SVX_START + 91) -#define HID_IMAPDLG_GRAPHWND (HID_SVX_START + 92) -#define HID_IMAPDLG_MACRO (HID_SVX_START + 93) -#define HID_IMAPDLG_OPEN (HID_SVX_START + 94) -#define HID_IMAPDLG_POLY (HID_SVX_START + 95) -#define HID_IMAPDLG_POLYDELETE (HID_SVX_START + 96) -#define HID_IMAPDLG_POLYEDIT (HID_SVX_START + 97) -#define HID_IMAPDLG_POLYINSERT (HID_SVX_START + 98) -#define HID_IMAPDLG_POLYMOVE (HID_SVX_START + 99) -#define HID_IMAPDLG_PROPERTY (HID_SVX_START + 100) -#define HID_IMAPDLG_RECT (HID_SVX_START + 101) -#define HID_IMAPDLG_REDO (HID_SVX_START + 102) -#define HID_IMAPDLG_SAVEAS (HID_SVX_START + 103) -#define HID_IMAPDLG_SELECT (HID_SVX_START + 104) -#define HID_IMAPDLG_TOOLBOX (HID_SVX_START + 105) -#define HID_IMAPDLG_UNDO (HID_SVX_START + 106) -#define HID_MENU_EXTRUSION_DEPTH (HID_SVX_START + 107) -#define HID_MENU_EXTRUSION_DIRECTION (HID_SVX_START + 108) -#define HID_MENU_EXTRUSION_LIGHTING (HID_SVX_START + 109) -#define HID_MENU_EXTRUSION_SURFACE (HID_SVX_START + 110) -#define HID_MNU_FUNC_AVG (HID_SVX_START + 111) -#define HID_MNU_FUNC_COUNT (HID_SVX_START + 112) -#define HID_MNU_FUNC_COUNT2 (HID_SVX_START + 113) -#define HID_MNU_FUNC_MAX (HID_SVX_START + 114) -#define HID_MNU_FUNC_MIN (HID_SVX_START + 115) -#define HID_MNU_FUNC_NONE (HID_SVX_START + 116) -#define HID_MNU_FUNC_SUM (HID_SVX_START + 117) -#define HID_MNU_ZOOM_100 (HID_SVX_START + 118) -#define HID_MNU_ZOOM_150 (HID_SVX_START + 119) -#define HID_MNU_ZOOM_200 (HID_SVX_START + 120) -#define HID_MNU_ZOOM_50 (HID_SVX_START + 121) -#define HID_MNU_ZOOM_75 (HID_SVX_START + 122) -#define HID_MNU_ZOOM_OPTIMAL (HID_SVX_START + 123) -#define HID_MNU_ZOOM_PAGE_WIDTH (HID_SVX_START + 124) -#define HID_MNU_ZOOM_WHOLE_PAGE (HID_SVX_START + 125) -#define HID_OPTIONS_GRID (HID_SVX_START + 126) -#define HID_PASSWORD (HID_SVX_START + 127) -#define HID_POPUP_COLOR (HID_SVX_START + 128) -#define HID_POPUP_COLOR_CTRL (HID_SVX_START + 129) -#define HID_POPUP_EXTRUSION_DEPTH (HID_SVX_START + 130) -#define HID_POPUP_EXTRUSION_DIRECTION (HID_SVX_START + 131) -#define HID_POPUP_EXTRUSION_LIGHTING (HID_SVX_START + 132) -#define HID_POPUP_EXTRUSION_SURFACE (HID_SVX_START + 133) -#define HID_POPUP_FONTWORK_ALIGN (HID_SVX_START + 134) -#define HID_POPUP_FONTWORK_CHARSPACE (HID_SVX_START + 135) -#define HID_POPUP_FRAME (HID_SVX_START + 136) -#define HID_POPUP_LINE (HID_SVX_START + 137) -#define HID_POPUP_LINEEND (HID_SVX_START + 138) -#define HID_POPUP_LINEEND_CTRL (HID_SVX_START + 139) -#define HID_REDLINING_FILTER_BTN_REF (HID_SVX_START + 140) -#define HID_REDLINING_FILTER_CB_ACTION (HID_SVX_START + 141) -#define HID_REDLINING_FILTER_CB_AUTOR (HID_SVX_START + 142) -#define HID_REDLINING_FILTER_CB_COMMENT (HID_SVX_START + 143) -#define HID_REDLINING_FILTER_CB_DATE (HID_SVX_START + 144) -#define HID_REDLINING_FILTER_CB_RANGE (HID_SVX_START + 145) -#define HID_REDLINING_FILTER_DF_DATE (HID_SVX_START + 146) -#define HID_REDLINING_FILTER_DF_DATE2 (HID_SVX_START + 147) -#define HID_REDLINING_FILTER_ED_COMMENT (HID_SVX_START + 148) -#define HID_REDLINING_FILTER_ED_RANGE (HID_SVX_START + 149) -#define HID_REDLINING_FILTER_IB_CLOCK (HID_SVX_START + 150) -#define HID_REDLINING_FILTER_IB_CLOCK2 (HID_SVX_START + 151) -#define HID_REDLINING_FILTER_LB_ACTION (HID_SVX_START + 152) -#define HID_REDLINING_FILTER_LB_AUTOR (HID_SVX_START + 153) -#define HID_REDLINING_FILTER_LB_DATE (HID_SVX_START + 154) -#define HID_REDLINING_FILTER_PAGE (HID_SVX_START + 155) -#define HID_REDLINING_FILTER_TF_DATE (HID_SVX_START + 156) -#define HID_REDLINING_FILTER_TF_DATE2 (HID_SVX_START + 157) -#define HID_REDLINING_TABCONTROL (HID_SVX_START + 158) -#define HID_REDLINING_VIEW_DG_VIEW (HID_SVX_START + 159) -#define HID_REDLINING_VIEW_DG_VIEW_HEADER (HID_SVX_START + 160) -#define HID_REDLINING_VIEW_DG_VIEW_TABLE (HID_SVX_START + 161) -#define HID_REDLINING_VIEW_PAGE (HID_SVX_START + 162) -#define HID_REDLINING_VIEW_PB_ACCEPT (HID_SVX_START + 163) -#define HID_REDLINING_VIEW_PB_ACCEPTALL (HID_SVX_START + 164) -#define HID_REDLINING_VIEW_PB_REJECT (HID_SVX_START + 165) -#define HID_REDLINING_VIEW_PB_REJECTALL (HID_SVX_START + 166) -#define HID_REDLINING_VIEW_PB_UNDO (HID_SVX_START + 167) -#define HID_RUBY_DIALOG (HID_SVX_START + 168) -#define HID_STYLE_LISTBOX (HID_SVX_START + 169) -#define HID_SVXTBX_ALIGNMENT (HID_SVX_START + 170) -#define HID_SVXTBX_DRAW (HID_SVX_START + 171) -#define HID_SVXTBX_UNDO_REDO_CTRL (HID_SVX_START + 172) -#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE (HID_SVX_START + 173) -#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER (HID_SVX_START + 174) -#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED (HID_SVX_START + 175) -#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL (HID_SVX_START + 176) -#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 177) -#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 178) -#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS (HID_SVX_START + 179) -#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 180) -#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 181) -#define HID_SVX_MDLG_DOCRECOVERY_BROKEN (HID_SVX_START + 182) -#define HID_SVX_MDLG_DOCRECOVERY_PROGR (HID_SVX_START + 183) -#define HID_SVX_MDLG_ERR_REP_OPTIONS (HID_SVX_START + 184) -#define HID_SVX_MDLG_ERR_REP_PREVIEW (HID_SVX_START + 185) -#define HID_SVX_TABDLG_DOCRECOVERY (HID_SVX_START + 186) -#define HID_SVX_TP_DOCRECOVERY_RECOVER (HID_SVX_START + 187) -#define HID_SVX_TP_DOCRECOVERY_SAVE (HID_SVX_START + 188) -#define HID_SVX_TP_ERR_REP_SEND (HID_SVX_START + 189) -#define HID_SVX_TP_ERR_REP_WELCOME (HID_SVX_START + 190) +#define HID_IMAPDLG_ACTIVE "SVX_HID_IMAPDLG_ACTIVE" +#define HID_IMAPDLG_APPLY "SVX_HID_IMAPDLG_APPLY" +#define HID_IMAPDLG_CIRCLE "SVX_HID_IMAPDLG_CIRCLE" +#define HID_IMAPDLG_FREEPOLY "SVX_HID_IMAPDLG_FREEPOLY" +#define HID_IMAPDLG_GRAPHWND "SVX_HID_IMAPDLG_GRAPHWND" +#define HID_IMAPDLG_MACRO "SVX_HID_IMAPDLG_MACRO" +#define HID_IMAPDLG_OPEN "SVX_HID_IMAPDLG_OPEN" +#define HID_IMAPDLG_POLY "SVX_HID_IMAPDLG_POLY" +#define HID_IMAPDLG_POLYDELETE "SVX_HID_IMAPDLG_POLYDELETE" +#define HID_IMAPDLG_POLYEDIT "SVX_HID_IMAPDLG_POLYEDIT" +#define HID_IMAPDLG_POLYINSERT "SVX_HID_IMAPDLG_POLYINSERT" +#define HID_IMAPDLG_POLYMOVE "SVX_HID_IMAPDLG_POLYMOVE" +#define HID_IMAPDLG_PROPERTY "SVX_HID_IMAPDLG_PROPERTY" +#define HID_IMAPDLG_RECT "SVX_HID_IMAPDLG_RECT" +#define HID_IMAPDLG_REDO "SVX_HID_IMAPDLG_REDO" +#define HID_IMAPDLG_SAVEAS "SVX_HID_IMAPDLG_SAVEAS" +#define HID_IMAPDLG_SELECT "SVX_HID_IMAPDLG_SELECT" +#define HID_IMAPDLG_TOOLBOX "SVX_HID_IMAPDLG_TOOLBOX" +#define HID_IMAPDLG_UNDO "SVX_HID_IMAPDLG_UNDO" +#define HID_MENU_EXTRUSION_DEPTH "SVX_HID_MENU_EXTRUSION_DEPTH" +#define HID_MENU_EXTRUSION_DIRECTION "SVX_HID_MENU_EXTRUSION_DIRECTION" +#define HID_MENU_EXTRUSION_LIGHTING "SVX_HID_MENU_EXTRUSION_LIGHTING" +#define HID_MENU_EXTRUSION_SURFACE "SVX_HID_MENU_EXTRUSION_SURFACE" +#define HID_MNU_FUNC_AVG "SVX_HID_MNU_FUNC_AVG" +#define HID_MNU_FUNC_COUNT "SVX_HID_MNU_FUNC_COUNT" +#define HID_MNU_FUNC_COUNT2 "SVX_HID_MNU_FUNC_COUNT2" +#define HID_MNU_FUNC_MAX "SVX_HID_MNU_FUNC_MAX" +#define HID_MNU_FUNC_MIN "SVX_HID_MNU_FUNC_MIN" +#define HID_MNU_FUNC_NONE "SVX_HID_MNU_FUNC_NONE" +#define HID_MNU_FUNC_SUM "SVX_HID_MNU_FUNC_SUM" +#define HID_MNU_ZOOM_100 "SVX_HID_MNU_ZOOM_100" +#define HID_MNU_ZOOM_150 "SVX_HID_MNU_ZOOM_150" +#define HID_MNU_ZOOM_200 "SVX_HID_MNU_ZOOM_200" +#define HID_MNU_ZOOM_50 "SVX_HID_MNU_ZOOM_50" +#define HID_MNU_ZOOM_75 "SVX_HID_MNU_ZOOM_75" +#define HID_MNU_ZOOM_OPTIMAL "SVX_HID_MNU_ZOOM_OPTIMAL" +#define HID_MNU_ZOOM_PAGE_WIDTH "SVX_HID_MNU_ZOOM_PAGE_WIDTH" +#define HID_MNU_ZOOM_WHOLE_PAGE "SVX_HID_MNU_ZOOM_WHOLE_PAGE" +#define HID_OPTIONS_GRID "SVX_HID_OPTIONS_GRID" +#define HID_PASSWORD "SVX_HID_PASSWORD" +#define HID_POPUP_COLOR "SVX_HID_POPUP_COLOR" +#define HID_POPUP_COLOR_CTRL "SVX_HID_POPUP_COLOR_CTRL" +#define HID_POPUP_EXTRUSION_DEPTH "SVX_HID_POPUP_EXTRUSION_DEPTH" +#define HID_POPUP_EXTRUSION_DIRECTION "SVX_HID_POPUP_EXTRUSION_DIRECTION" +#define HID_POPUP_EXTRUSION_LIGHTING "SVX_HID_POPUP_EXTRUSION_LIGHTING" +#define HID_POPUP_EXTRUSION_SURFACE "SVX_HID_POPUP_EXTRUSION_SURFACE" +#define HID_POPUP_FONTWORK_ALIGN "SVX_HID_POPUP_FONTWORK_ALIGN" +#define HID_POPUP_FONTWORK_CHARSPACE "SVX_HID_POPUP_FONTWORK_CHARSPACE" +#define HID_POPUP_FRAME "SVX_HID_POPUP_FRAME" +#define HID_POPUP_LINE "SVX_HID_POPUP_LINE" +#define HID_POPUP_LINEEND "SVX_HID_POPUP_LINEEND" +#define HID_POPUP_LINEEND_CTRL "SVX_HID_POPUP_LINEEND_CTRL" +#define HID_REDLINING_FILTER_BTN_REF "SVX_HID_REDLINING_FILTER_BTN_REF" +#define HID_REDLINING_FILTER_CB_ACTION "SVX_HID_REDLINING_FILTER_CB_ACTION" +#define HID_REDLINING_FILTER_CB_AUTOR "SVX_HID_REDLINING_FILTER_CB_AUTOR" +#define HID_REDLINING_FILTER_CB_COMMENT "SVX_HID_REDLINING_FILTER_CB_COMMENT" +#define HID_REDLINING_FILTER_CB_DATE "SVX_HID_REDLINING_FILTER_CB_DATE" +#define HID_REDLINING_FILTER_CB_RANGE "SVX_HID_REDLINING_FILTER_CB_RANGE" +#define HID_REDLINING_FILTER_DF_DATE "SVX_HID_REDLINING_FILTER_DF_DATE" +#define HID_REDLINING_FILTER_DF_DATE2 "SVX_HID_REDLINING_FILTER_DF_DATE2" +#define HID_REDLINING_FILTER_ED_COMMENT "SVX_HID_REDLINING_FILTER_ED_COMMENT" +#define HID_REDLINING_FILTER_ED_RANGE "SVX_HID_REDLINING_FILTER_ED_RANGE" +#define HID_REDLINING_FILTER_IB_CLOCK "SVX_HID_REDLINING_FILTER_IB_CLOCK" +#define HID_REDLINING_FILTER_IB_CLOCK2 "SVX_HID_REDLINING_FILTER_IB_CLOCK2" +#define HID_REDLINING_FILTER_LB_ACTION "SVX_HID_REDLINING_FILTER_LB_ACTION" +#define HID_REDLINING_FILTER_LB_AUTOR "SVX_HID_REDLINING_FILTER_LB_AUTOR" +#define HID_REDLINING_FILTER_LB_DATE "SVX_HID_REDLINING_FILTER_LB_DATE" +#define HID_REDLINING_FILTER_PAGE "SVX_HID_REDLINING_FILTER_PAGE" +#define HID_REDLINING_FILTER_TF_DATE "SVX_HID_REDLINING_FILTER_TF_DATE" +#define HID_REDLINING_FILTER_TF_DATE2 "SVX_HID_REDLINING_FILTER_TF_DATE2" +#define HID_REDLINING_TABCONTROL "SVX_HID_REDLINING_TABCONTROL" +#define HID_REDLINING_VIEW_DG_VIEW "SVX_HID_REDLINING_VIEW_DG_VIEW" +#define HID_REDLINING_VIEW_DG_VIEW_HEADER "SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER" +#define HID_REDLINING_VIEW_DG_VIEW_TABLE "SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE" +#define HID_REDLINING_VIEW_PAGE "SVX_HID_REDLINING_VIEW_PAGE" +#define HID_REDLINING_VIEW_PB_ACCEPT "SVX_HID_REDLINING_VIEW_PB_ACCEPT" +#define HID_REDLINING_VIEW_PB_ACCEPTALL "SVX_HID_REDLINING_VIEW_PB_ACCEPTALL" +#define HID_REDLINING_VIEW_PB_REJECT "SVX_HID_REDLINING_VIEW_PB_REJECT" +#define HID_REDLINING_VIEW_PB_REJECTALL "SVX_HID_REDLINING_VIEW_PB_REJECTALL" +#define HID_REDLINING_VIEW_PB_UNDO "SVX_HID_REDLINING_VIEW_PB_UNDO" +#define HID_RUBY_DIALOG "SVX_HID_RUBY_DIALOG" +#define HID_STYLE_LISTBOX "SVX_HID_STYLE_LISTBOX" +#define HID_SVXTBX_ALIGNMENT "SVX_HID_SVXTBX_ALIGNMENT" +#define HID_SVXTBX_DRAW "SVX_HID_SVXTBX_DRAW" +#define HID_SVXTBX_UNDO_REDO_CTRL "SVX_HID_SVXTBX_UNDO_REDO_CTRL" +#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE "SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE" +#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER "SVX_HID_SVX_CHINESE_DICTIONARY_LB_HEADER" +#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL" +#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL" +#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS "SVX_HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS" +#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL" +#define HID_SVX_MDLG_DOCRECOVERY_BROKEN "SVX_HID_SVX_MDLG_DOCRECOVERY_BROKEN" +#define HID_SVX_MDLG_DOCRECOVERY_PROGR "SVX_HID_SVX_MDLG_DOCRECOVERY_PROGR" +#define HID_SVX_MDLG_ERR_REP_OPTIONS "SVX_HID_SVX_MDLG_ERR_REP_OPTIONS" +#define HID_SVX_MDLG_ERR_REP_PREVIEW "SVX_HID_SVX_MDLG_ERR_REP_PREVIEW" +#define HID_SVX_TABDLG_DOCRECOVERY "SVX_HID_SVX_TABDLG_DOCRECOVERY" +#define HID_SVX_TP_DOCRECOVERY_RECOVER "SVX_HID_SVX_TP_DOCRECOVERY_RECOVER" +#define HID_SVX_TP_DOCRECOVERY_SAVE "SVX_HID_SVX_TP_DOCRECOVERY_SAVE" +#define HID_SVX_TP_ERR_REP_SEND "SVX_HID_SVX_TP_ERR_REP_SEND" +#define HID_SVX_TP_ERR_REP_WELCOME "SVX_HID_SVX_TP_ERR_REP_WELCOME" -#define HID_VALUESET_EXTRUSION_DIRECTION (HID_SVX_START + 192) -#define HID_VALUESET_EXTRUSION_LIGHTING (HID_SVX_START + 193) -#define HID_WIN_FONTWORK_ALIGN (HID_SVX_START + 194) -#define HID_WIN_FONTWORK_CHARSPACE (HID_SVX_START + 195) -#define HID_XMLSEC_CALL (HID_SVX_START + 196) -#define HID_OFA_HYPERLINK_DLG (HID_SVX_START + 197) -#define HID_OFA_HYPERLINK_NAME (HID_SVX_START + 198) -#define HID_OFA_HYPERLINK_SEARCH (HID_SVX_START + 199) -#define HID_OFA_HYPERLINK_TARGET (HID_SVX_START + 200) -#define HID_OFA_HYPERLINK_URL (HID_SVX_START + 201) -#define HID_OFA_HYPERLINK_URL_TXT (HID_SVX_START + 202) -#define HID_AUTOCORR_DLG (HID_SVX_START + 203) -#define HID_SVXCTL_MAIL_ATTACH (HID_SVX_START + 204) -#define HID_SVXDLG_REGISTRATION (HID_SVX_START + 205) -#define HID_SVXDLG_TREE_BASE (HID_SVX_START + 206) -#define HID_SVXDLG_TREE_CHART (HID_SVX_START + 207) -#define HID_SVXDLG_TREE_FILTER (HID_SVX_START + 208) -#define HID_SVXDLG_TREE_LANGUAGE (HID_SVX_START + 209) -#define HID_SVXWIN_MAIL_ATTACH (HID_SVX_START + 210) -#define HID_SVXWIN_MAIL_HEADER (HID_SVX_START + 211) -#define HID_SVX_DLGFORMNEW (HID_SVX_START + 212) -#define HID_SVX_DLGTABNEW (HID_SVX_START + 213) -#define HID_SVX_HYPERLINK (HID_SVX_START + 214) -#define HID_SVX_MAILATTACH_ASCII_CB (HID_SVX_START + 215) -#define HID_SVX_MAILATTACH_HTML_CB (HID_SVX_START + 216) -#define HID_SVX_MAILATTACH_OFFICE_CB (HID_SVX_START + 217) -#define HID_SVX_MAILATTACH_PRIORITY_LB (HID_SVX_START + 218) -#define HID_SVX_MAILATTACH_RECEIPT_CB (HID_SVX_START + 219) -#define HID_SVX_MAILATTACH_RTF_CB (HID_SVX_START + 220) -#define HID_SVX_MAILHEAD_HEAD_WIN (HID_SVX_START + 221) -#define HID_SVX_MAILHEAD_PRIORITY_LB (HID_SVX_START + 222) -#define HID_SVX_MAILHEAD_PROTOCOL_LB (HID_SVX_START + 223) -#define HID_SVX_MAILHEAD_RCPT_CB (HID_SVX_START + 224) -#define HID_SVX_MAILHEAD_RCPT_ED (HID_SVX_START + 225) -#define HID_SVX_MAILHEAD_RCPT_LB (HID_SVX_START + 226) -#define HID_SVX_MAILHEAD_RECEIPT_CB (HID_SVX_START + 227) -#define HID_SVX_MAILHEAD_ROLE_LB (HID_SVX_START + 228) -#define HID_SVX_MAILHEAD_SUBJECT_ED (HID_SVX_START + 229) -#define HID_SVX_MAILMENU_ADDADDRESS (HID_SVX_START + 230) -#define HID_SVX_MAILMENU_COPYLINK (HID_SVX_START + 231) -#define HID_SVX_MAILMENU_DELETE (HID_SVX_START + 232) -#define HID_SVX_MAILMENU_FILE (HID_SVX_START + 233) -#define HID_SVX_MAILMENU_OPEN (HID_SVX_START + 234) -#define HID_SVX_MAILMENU_RENAME (HID_SVX_START + 235) -#define HID_SVX_MAILMENU_SAVEAS (HID_SVX_START + 236) -#define HID_SVX_MAILMENU_SIG1 (HID_SVX_START + 237) -#define HID_SVX_MAILMENU_SIG2 (HID_SVX_START + 238) -#define HID_SVX_MAILMENU_SIG3 (HID_SVX_START + 239) -#define HID_SVX_MAILMENU_SIG4 (HID_SVX_START + 240) -#define HID_SVX_MAILTOOLBOX (HID_SVX_START + 241) -#define HID_SVX_SENDMENU_ENCRYPT (HID_SVX_START + 242) -#define HID_SVX_SENDMENU_PLAIN (HID_SVX_START + 243) -#define HID_SVX_SENDMENU_SIGN (HID_SVX_START + 244) -#define HID_SVX_SENDMENU_SIGNANDENCRYPT (HID_SVX_START + 245) -#define HID_SVX_TP_APPEARANCE (HID_SVX_START + 246) -#define HID_SVX_TP_DESKTOP (HID_SVX_START + 247) - -// please adjust ACT_SVX_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_SVX_HID_END (HID_SVX_START+247) -#if ACT_SVX_HID_END > HID_SVX_END -#error Resource-Ueberlauf in #line, #file -#endif +#define HID_VALUESET_EXTRUSION_DIRECTION "SVX_HID_VALUESET_EXTRUSION_DIRECTION" +#define HID_VALUESET_EXTRUSION_LIGHTING "SVX_HID_VALUESET_EXTRUSION_LIGHTING" +#define HID_WIN_FONTWORK_ALIGN "SVX_HID_WIN_FONTWORK_ALIGN" +#define HID_WIN_FONTWORK_CHARSPACE "SVX_HID_WIN_FONTWORK_CHARSPACE" +#define HID_XMLSEC_CALL "SVX_HID_XMLSEC_CALL" +#define HID_OFA_HYPERLINK_DLG "SVX_HID_OFA_HYPERLINK_DLG" +#define HID_OFA_HYPERLINK_NAME "SVX_HID_OFA_HYPERLINK_NAME" +#define HID_OFA_HYPERLINK_SEARCH "SVX_HID_OFA_HYPERLINK_SEARCH" +#define HID_OFA_HYPERLINK_TARGET "SVX_HID_OFA_HYPERLINK_TARGET" +#define HID_OFA_HYPERLINK_URL "SVX_HID_OFA_HYPERLINK_URL" +#define HID_OFA_HYPERLINK_URL_TXT "SVX_HID_OFA_HYPERLINK_URL_TXT" +#define HID_AUTOCORR_DLG "SVX_HID_AUTOCORR_DLG" +#define HID_SVXCTL_MAIL_ATTACH "SVX_HID_SVXCTL_MAIL_ATTACH" +#define HID_SVXDLG_REGISTRATION "SVX_HID_SVXDLG_REGISTRATION" +#define HID_SVXDLG_TREE_BASE "SVX_HID_SVXDLG_TREE_BASE" +#define HID_SVXDLG_TREE_CHART "SVX_HID_SVXDLG_TREE_CHART" +#define HID_SVXDLG_TREE_FILTER "SVX_HID_SVXDLG_TREE_FILTER" +#define HID_SVXDLG_TREE_LANGUAGE "SVX_HID_SVXDLG_TREE_LANGUAGE" +#define HID_SVXWIN_MAIL_ATTACH "SVX_HID_SVXWIN_MAIL_ATTACH" +#define HID_SVXWIN_MAIL_HEADER "SVX_HID_SVXWIN_MAIL_HEADER" +#define HID_SVX_DLGFORMNEW "SVX_HID_SVX_DLGFORMNEW" +#define HID_SVX_DLGTABNEW "SVX_HID_SVX_DLGTABNEW" +#define HID_SVX_HYPERLINK "SVX_HID_SVX_HYPERLINK" +#define HID_SVX_MAILATTACH_ASCII_CB "SVX_HID_SVX_MAILATTACH_ASCII_CB" +#define HID_SVX_MAILATTACH_HTML_CB "SVX_HID_SVX_MAILATTACH_HTML_CB" +#define HID_SVX_MAILATTACH_OFFICE_CB "SVX_HID_SVX_MAILATTACH_OFFICE_CB" +#define HID_SVX_MAILATTACH_PRIORITY_LB "SVX_HID_SVX_MAILATTACH_PRIORITY_LB" +#define HID_SVX_MAILATTACH_RECEIPT_CB "SVX_HID_SVX_MAILATTACH_RECEIPT_CB" +#define HID_SVX_MAILATTACH_RTF_CB "SVX_HID_SVX_MAILATTACH_RTF_CB" +#define HID_SVX_MAILHEAD_HEAD_WIN "SVX_HID_SVX_MAILHEAD_HEAD_WIN" +#define HID_SVX_MAILHEAD_PRIORITY_LB "SVX_HID_SVX_MAILHEAD_PRIORITY_LB" +#define HID_SVX_MAILHEAD_PROTOCOL_LB "SVX_HID_SVX_MAILHEAD_PROTOCOL_LB" +#define HID_SVX_MAILHEAD_RCPT_CB "SVX_HID_SVX_MAILHEAD_RCPT_CB" +#define HID_SVX_MAILHEAD_RCPT_ED "SVX_HID_SVX_MAILHEAD_RCPT_ED" +#define HID_SVX_MAILHEAD_RCPT_LB "SVX_HID_SVX_MAILHEAD_RCPT_LB" +#define HID_SVX_MAILHEAD_RECEIPT_CB "SVX_HID_SVX_MAILHEAD_RECEIPT_CB" +#define HID_SVX_MAILHEAD_ROLE_LB "SVX_HID_SVX_MAILHEAD_ROLE_LB" +#define HID_SVX_MAILHEAD_SUBJECT_ED "SVX_HID_SVX_MAILHEAD_SUBJECT_ED" +#define HID_SVX_MAILMENU_ADDADDRESS "SVX_HID_SVX_MAILMENU_ADDADDRESS" +#define HID_SVX_MAILMENU_COPYLINK "SVX_HID_SVX_MAILMENU_COPYLINK" +#define HID_SVX_MAILMENU_DELETE "SVX_HID_SVX_MAILMENU_DELETE" +#define HID_SVX_MAILMENU_FILE "SVX_HID_SVX_MAILMENU_FILE" +#define HID_SVX_MAILMENU_OPEN "SVX_HID_SVX_MAILMENU_OPEN" +#define HID_SVX_MAILMENU_RENAME "SVX_HID_SVX_MAILMENU_RENAME" +#define HID_SVX_MAILMENU_SAVEAS "SVX_HID_SVX_MAILMENU_SAVEAS" +#define HID_SVX_MAILMENU_SIG1 "SVX_HID_SVX_MAILMENU_SIG1" +#define HID_SVX_MAILMENU_SIG2 "SVX_HID_SVX_MAILMENU_SIG2" +#define HID_SVX_MAILMENU_SIG3 "SVX_HID_SVX_MAILMENU_SIG3" +#define HID_SVX_MAILMENU_SIG4 "SVX_HID_SVX_MAILMENU_SIG4" +#define HID_SVX_MAILTOOLBOX "SVX_HID_SVX_MAILTOOLBOX" +#define HID_SVX_SENDMENU_ENCRYPT "SVX_HID_SVX_SENDMENU_ENCRYPT" +#define HID_SVX_SENDMENU_PLAIN "SVX_HID_SVX_SENDMENU_PLAIN" +#define HID_SVX_SENDMENU_SIGN "SVX_HID_SVX_SENDMENU_SIGN" +#define HID_SVX_SENDMENU_SIGNANDENCRYPT "SVX_HID_SVX_SENDMENU_SIGNANDENCRYPT" +#define HID_SVX_TP_APPEARANCE "SVX_HID_SVX_TP_APPEARANCE" +#define HID_SVX_TP_DESKTOP "SVX_HID_SVX_TP_DESKTOP" #endif diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index eb304d09f3..d2c7698dc7 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -317,10 +317,6 @@ #define RID_SVXBMP_3D_FOCAL_LENGTH_09 (RID_SVX_START + 180) #define RID_SVXBMP_3D_FOCAL_LENGTH_10 (RID_SVX_START + 181) -// fuer ToolboxControls Alignment und Drawobjekte -#define RID_SVXTBX_DRAW (RID_SVX_START + 189) -#define RID_SVXTBX_ALIGNMENT (RID_SVX_START + 190) - // Ids fuer Autokorrektur #define RID_SVX_AUTOCORR (RID_SVX_START + 192) diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc index 2008375dde..42a303dba4 100644 --- a/svx/inc/svx/exthelpid.hrc +++ b/svx/inc/svx/exthelpid.hrc @@ -37,19 +37,10 @@ // are moved to this exported (delivered) hrc file // Help-Ids -------------------------------------------------------------- -#define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0) -#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1) +#define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE" +#define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE" // please adjust ACT_SVX_EXT_HID_END2 below if you add entries here! -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_SVX_EXT_HID_END (HID_SVX_EXT0_START + 1) -#if ACT_SVX_EXT_HID_END > HID_SVX_EXT0_END -#error Resource-Ueberlauf in #line, #file -#endif - #endif diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index 653612c367..19cf26d3dc 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -172,8 +172,7 @@ public: void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; } const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } - // FIXME: HELPID - void SetHeaderBarHelpId(ULONG /*nHelpId*/) {aHeaderBar.SetHelpId(""/*nHelpId*/);} + void SetHeaderBarHelpId(const rtl::OString& rHelpId) {aHeaderBar.SetHelpId(rHelpId);} }; diff --git a/svx/inc/svx/svxcommands.h b/svx/inc/svx/svxcommands.h new file mode 100644 index 0000000000..54376da62e --- /dev/null +++ b/svx/inc/svx/svxcommands.h @@ -0,0 +1,604 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SVX_SVXCOMMANDS_HRC +#define SVX_SVXCOMMANDS_HRC + +#define CMD_SID_INET_DLG ".uno:InternetDialog" +#define CMD_SID_FM_RECORD_ABSOLUTE ".uno:AbsoluteRecord" +#define CMD_SID_FM_ADD_FIELD ".uno:AddField" +#define CMD_SID_FM_ADDTABLE ".uno:AddTable" +#define CMD_SID_OBJECT_ALIGN_CENTER ".uno:AlignCenter" +#define CMD_SID_OBJECT_ALIGN_DOWN ".uno:AlignDown" +#define CMD_SID_OBJECT_ALIGN_LEFT ".uno:ObjectAlignLeft" +#define CMD_SID_ATTR_PARA_ADJUST ".uno:Alignment" +#define CMD_SID_OBJECT_ALIGN_MIDDLE ".uno:AlignMiddle" +#define CMD_SID_OBJECT_ALIGN_RIGHT ".uno:ObjectAlignRight" +#define CMD_SID_OBJECT_ALIGN_UP ".uno:AlignUp" +#define CMD_SID_DRAW_ARC ".uno:Arc" +#define CMD_SID_3D_ASSIGN ".uno:Assign3D" +#define CMD_SID_FM_AUTOCONTROLFOCUS ".uno:AutoControlFocus" +#define CMD_SID_FM_AUTOFILTER ".uno:AutoFilter" +#define CMD_SID_AUTOFORMAT ".uno:AutoFormat" +#define CMD_SID_TABLE_STYLE ".uno:TableStyle" +#define CMD_SID_TABLE_STYLE_SETTINGS ".uno:TableStyleSettings" +#define CMD_SID_TABLEDESIGN ".uno:TableDesign" +#define CMD_SID_BACKGROUND_COLOR ".uno:BackgroundColor" +#define CMD_SID_ATTR_BRUSH ".uno:BackgroundPattern" +#define CMD_SID_BACKGROUND_PATTERN ".uno:BackgroundPatternController" +#define CMD_SID_DRAW_BEZIER_NOFILL ".uno:Bezier_Unfilled" +#define CMD_SID_BEZIER_APPEND ".uno:BezierAppend" +#define CMD_SID_BEZIER_CLOSE ".uno:BezierClose" +#define CMD_SID_BEZIER_CONVERT ".uno:BezierConvert" +#define CMD_SID_BEZIER_CUTLINE ".uno:BezierCutLine" +#define CMD_SID_BEZIER_DELETE ".uno:BezierDelete" +#define CMD_SID_BEZIER_EDGE ".uno:BezierEdge" +#define CMD_SID_BEZIER_ELIMINATE_POINTS ".uno:BezierEliminatePoints" +#define CMD_SID_DRAW_BEZIER_FILL ".uno:BezierFill" +#define CMD_SID_BEZIER_INSERT ".uno:BezierInsert" +#define CMD_SID_BEZIER_MOVE ".uno:BezierMove" +#define CMD_SID_BEZIER_SMOOTH ".uno:BezierSmooth" +#define CMD_SID_BEZIER_SYMMTR ".uno:BezierSymmetric" +#define CMD_SID_BEZIERTO ".uno:BezierTo" +#define CMD_SID_BMPMASK ".uno:BmpMask" +#define CMD_SID_BMPMASK_EXEC ".uno:BmpMaskExec" +#define CMD_SID_BMPMASK_PIPETTE ".uno:BmpMaskPipette" +#define CMD_SID_ATTR_CHAR_WEIGHT ".uno:Bold" +#define CMD_SID_ATTR_CHAR_LATIN_WEIGHT ".uno:BoldLatin" +#define CMD_SID_ATTR_CHAR_CJK_WEIGHT ".uno:BoldCJK" +#define CMD_SID_ATTR_CHAR_CTL_WEIGHT ".uno:BoldCTL" +#define CMD_SID_BORDER_OBJECT ".uno:Border" +#define CMD_SID_ATTR_BORDER_INNER ".uno:BorderInner" +#define CMD_SID_ATTR_BORDER_OUTER ".uno:BorderOuter" +#define CMD_SID_ATTR_BORDER ".uno:SetBorderStyle" +#define CMD_SID_FRAME_TO_TOP ".uno:BringToFront" +#define CMD_SID_DRAW_CAPTION ".uno:DrawCaption" +#define CMD_SID_ATTR_CHAR_CASEMAP ".uno:CaseMap" +#define CMD_SID_ATTR_PARA_ADJUST_CENTER ".uno:CenterPara" +#define CMD_SID_TRANSLITERATE_FULLWIDTH ".uno:ChangeCaseToFullWidth" +#define CMD_SID_TRANSLITERATE_HALFWIDTH ".uno:ChangeCaseToHalfWidth" +#define CMD_SID_TRANSLITERATE_HIRAGANA ".uno:ChangeCaseToHiragana" +#define CMD_SID_TRANSLITERATE_KATAGANA ".uno:ChangeCaseToKatakana" +#define CMD_SID_TRANSLITERATE_LOWER ".uno:ChangeCaseToLower" +#define CMD_SID_TRANSLITERATE_UPPER ".uno:ChangeCaseToUpper" +#define CMD_SID_FM_CHANGECONTROLTYPE ".uno:ChangeControlType" +#define CMD_SID_ATTR_CHAR_FONT ".uno:CharFontName" +#define CMD_SID_ATTR_CHAR_LATIN_FONT ".uno:CharFontNameLatin" +#define CMD_SID_ATTR_CHAR_CJK_FONT ".uno:CharFontNameCJK" +#define CMD_SID_ATTR_CHAR_CTL_FONT ".uno:CharFontNameCTL" +#define CMD_SID_INSERT_CHECKBOX ".uno:Checkbox" +#define CMD_SID_FM_CHECKBOX ".uno:CheckBox" +#define CMD_SID_CHOOSE_CONTROLS ".uno:ChooseControls" +#define CMD_SID_CHOOSE_POLYGON ".uno:ChoosePolygon" +#define CMD_SID_DRAW_CIRCLE ".uno:Circle" +#define CMD_SID_DRAW_CIRCLE_NOFILL ".uno:Circle_Unfilled" +#define CMD_SID_DRAW_CIRCLEARC ".uno:CircleArc" +#define CMD_SID_DRAW_CIRCLECUT ".uno:CircleCut" +#define CMD_SID_DRAW_CIRCLECUT_NOFILL ".uno:CircleCut_Unfilled" +#define CMD_SID_DRAW_CIRCLEPIE ".uno:CirclePie" +#define CMD_SID_DRAW_CIRCLEPIE_NOFILL ".uno:CirclePie_Unfilled" +#define CMD_SID_OUTLINE_DELETEALL ".uno:ClearOutline" +#define CMD_SID_ATTR_CHAR_COLOR ".uno:Color" +#define CMD_SID_COLOR_CONTROL ".uno:ColorControl" +#define CMD_SID_FM_COMBOBOX ".uno:ComboBox" +#define CMD_SID_FM_NAVIGATIONBAR ".uno:NavigationBar" +#define CMD_SID_INSERT_COMBOBOX ".uno:Combobox" +#define CMD_SID_FM_CONFIG ".uno:Config" +#define CMD_SID_FM_MORE_CONTROLS ".uno:MoreControls" +#define CMD_SID_FM_FORM_DESIGN_TOOLS ".uno:FormDesignTools" +#define CMD_SID_CONTOUR_DLG ".uno:ContourDialog" +#define CMD_SID_CONTOUR_EXEC ".uno:ContourExecute" +#define CMD_SID_FM_CTL_PROPERTIES ".uno:ControlProperties" +#define CMD_SID_FM_CONVERTTO_BUTTON ".uno:ConvertToButton" +#define CMD_SID_FM_CONVERTTO_CHECKBOX ".uno:ConvertToCheckBox" +#define CMD_SID_FM_CONVERTTO_COMBOBOX ".uno:ConvertToCombo" +#define CMD_SID_FM_CONVERTTO_CURRENCY ".uno:ConvertToCurrency" +#define CMD_SID_FM_CONVERTTO_DATE ".uno:ConvertToDate" +#define CMD_SID_FM_CONVERTTO_EDIT ".uno:ConvertToEdit" +#define CMD_SID_FM_CONVERTTO_FILECONTROL ".uno:ConvertToFileControl" +#define CMD_SID_FM_CONVERTTO_FIXEDTEXT ".uno:ConvertToFixed" +#define CMD_SID_FM_CONVERTTO_FORMATTED ".uno:ConvertToFormatted" +#define CMD_SID_FM_CONVERTTO_SCROLLBAR ".uno:ConvertToScrollBar" +#define CMD_SID_FM_CONVERTTO_SPINBUTTON ".uno:ConvertToSpinButton" +#define CMD_SID_FM_CONVERTTO_GROUPBOX ".uno:ConvertToGroup" +#define CMD_SID_FM_CONVERTTO_IMAGEBUTTON ".uno:ConvertToImageBtn" +#define CMD_SID_FM_CONVERTTO_IMAGECONTROL ".uno:ConvertToImageControl" +#define CMD_SID_FM_CONVERTTO_LISTBOX ".uno:ConvertToList" +#define CMD_SID_FM_CONVERTTO_NUMERIC ".uno:ConvertToNumeric" +#define CMD_SID_FM_CONVERTTO_PATTERN ".uno:ConvertToPattern" +#define CMD_SID_FM_CONVERTTO_RADIOBUTTON ".uno:ConvertToRadio" +#define CMD_SID_FM_CONVERTTO_TIME ".uno:ConvertToTime" +#define CMD_SID_FM_CONVERTTO_NAVIGATIONBAR ".uno:ConvertToNavigationBar" +#define CMD_SID_FM_COUNTALL ".uno:CountAll" +#define CMD_SID_FM_CREATE_CONTROL ".uno:CreateControl" +#define CMD_SID_INSERT_CURRENCYFIELD ".uno:InsertCurrencyField" +#define CMD_SID_FM_CURRENCYFIELD ".uno:CurrencyField" +#define CMD_SID_DASH ".uno:Dash" +#define CMD_SID_INSERT_DATEFIELD ".uno:AddDateField" +#define CMD_SID_FM_DATEFIELD ".uno:DateField" +#define CMD_FN_NUM_BULLET_ON ".uno:DefaultBullet" +#define CMD_SID_FM_RECORD_DELETE ".uno:DeleteRecord" +#define CMD_SID_FM_DESIGN_MODE ".uno:SwitchControlDesignMode" +#define CMD_SID_DISTRIBUTE_DLG ".uno:DistributeSelection" +#define CMD_SID_DRAW_SELECT ".uno:DrawSelect" +#define CMD_SID_INSERT_DRAW ".uno:InsertDraw" +#define CMD_SID_DSBROWSER_EXPLORER ".uno:DSBrowserExplorer" +#define CMD_SID_FM_EDIT ".uno:Edit" +#define CMD_SID_INSERT_EDIT ".uno:InsertEdit" +#define CMD_SID_DRAW_ELLIPSE ".uno:Ellipse" +#define CMD_SID_DRAW_ELLIPSE_NOFILL ".uno:Ellipse_Unfilled" +#define CMD_SID_DRAW_ELLIPSECUT ".uno:EllipseCut" +#define CMD_SID_DRAW_ELLIPSECUT_NOFILL ".uno:EllipseCut_Unfilled" +#define CMD_SID_ENTER_GROUP ".uno:EnterGroup" +#define CMD_SID_ATTR_CHAR_ESCAPEMENT ".uno:Escapement" +#define CMD_SID_FM_FIELDS_CONTROL ".uno:FieldController" +#define CMD_SID_FM_FILECONTROL ".uno:FileControl" +#define CMD_SID_INSERT_FILECONTROL ".uno:InsertFileControl" +#define CMD_SID_INSERT_TREECONTROL ".uno:InsertTreeControl" +#define CMD_SID_ATTR_FILL_BITMAP ".uno:FillBitmap" +#define CMD_SID_ATTR_FILL_COLOR ".uno:FillColor" +#define CMD_SID_ATTR_FILL_GRADIENT ".uno:FillGradient" +#define CMD_SID_ATTR_FILL_HATCH ".uno:FillHatch" +#define CMD_SID_ATTR_FILL_STYLE ".uno:FillStyle" +#define CMD_SID_FM_FILTERCRIT ".uno:FilterCrit" +#define CMD_SID_FM_RECORD_FIRST ".uno:FirstRecord" +#define CMD_SID_ATTR_FLASH ".uno:Flash" +#define CMD_SID_FM_FMEXPLORER_CONTROL ".uno:FmExplorerController" +#define CMD_SID_FM_FILTER_NAVIGATOR_CONTROL ".uno:FmFilterNavigatorController" +#define CMD_SID_CHAR_DLG ".uno:FontDialog" +#define CMD_SID_ATTR_CHAR_FONTHEIGHT ".uno:FontHeight" +#define CMD_SID_ATTR_CHAR_LATIN_FONTHEIGHT ".uno:FontHeighLatin" +#define CMD_SID_ATTR_CHAR_CJK_FONTHEIGHT ".uno:FontHeightCJK" +#define CMD_SID_ATTR_CHAR_CTL_FONTHEIGHT ".uno:FontHeightCTL" +#define CMD_SID_FONTWORK ".uno:FontWork" +#define CMD_SID_FORMTEXT_ADJUST ".uno:FontWorkTextAdjust" +#define CMD_SID_FORMTEXT_STDFORM ".uno:FontWorkTextClearAttributes" +#define CMD_SID_FORMTEXT_DISTANCE ".uno:FontWorkTextDistance" +#define CMD_SID_FORMTEXT_MIRROR ".uno:FontWorkTextMirror" +#define CMD_SID_FORMTEXT_OUTLINE ".uno:FontWorkTextOutline" +#define CMD_SID_FORMTEXT_SHADOW ".uno:FontWorkTextShadow" +#define CMD_SID_FORMTEXT_SHDWCOLOR ".uno:FontWorkTextShadowColor" +#define CMD_SID_FORMTEXT_SHDWXVAL ".uno:FontWorkTextShadowXVal" +#define CMD_SID_FORMTEXT_SHDWYVAL ".uno:FontWorkTextShadowYVal" +#define CMD_SID_FORMTEXT_START ".uno:FontWorkTextStart" +#define CMD_SID_FORMTEXT_STYLE ".uno:FontWorkTextStyle" +#define CMD_SID_ATTRIBUTES_AREA ".uno:FormatArea" +#define CMD_SID_FORMTEXT_HIDEFORM ".uno:FormatFontWorkClose" +#define CMD_SID_GROUP ".uno:FormatGroup" +#define CMD_SID_ATTRIBUTES_LINE ".uno:FormatLine" +#define CMD_SID_FM_FORMATTEDFIELD ".uno:FormattedField" +#define CMD_SID_FM_SCROLLBAR ".uno:ScrollBar" +#define CMD_SID_FM_SPINBUTTON ".uno:SpinButton" +#define CMD_SID_INSERT_FORMATTEDFIELD ".uno:InsertFormattedField" +#define CMD_SID_UNGROUP ".uno:FormatUngroup" +#define CMD_SID_FM_FILTER_START ".uno:FormFilter" +#define CMD_SID_FM_FORM_FILTERED ".uno:FormFiltered" +#define CMD_SID_FM_FILTER_EXECUTE ".uno:FormFilterExecute" +#define CMD_SID_FM_FILTER_EXIT ".uno:FormFilterExit" +#define CMD_SID_FM_FILTER_NAVIGATOR ".uno:FormFilterNavigator" +#define CMD_SID_FM_PROPERTIES ".uno:FormProperties" +#define CMD_SID_DRAW_FREELINE ".uno:Freeline" +#define CMD_SID_DRAW_FREELINE_NOFILL ".uno:Freeline_Unfilled" +#define CMD_SID_ATTR_AUTO_COLOR_INVALID ".uno:AutoColorInvalid" +#define CMD_SID_GALLERY ".uno:Gallery" +#define CMD_SID_GALLERY_ENABLE_ADDCOPY ".uno:GalleryEnableAddCopy" +#define CMD_SID_GETREDOSTRINGS ".uno:GetRedoStrings" +#define CMD_SID_GETUNDOSTRINGS ".uno:GetUndoStrings" +#define CMD_SID_ATTR_GRAF_CROP ".uno:GrafAttrCrop" +#define CMD_SID_ATTR_GRAF_BLUE ".uno:GrafBlue" +#define CMD_SID_ATTR_GRAF_CONTRAST ".uno:GrafContrast" +#define CMD_SID_ATTR_GRAF_GAMMA ".uno:GrafGamma" +#define CMD_SID_ATTR_GRAF_GREEN ".uno:GrafGreen" +#define CMD_SID_ATTR_GRAF_INVERT ".uno:GrafInvert" +#define CMD_SID_ATTR_GRAF_LUMINANCE ".uno:GrafLuminance" +#define CMD_SID_ATTR_GRAF_MODE ".uno:GrafMode" +#define CMD_SID_ATTR_GRAF_RED ".uno:GrafRed" +#define CMD_SID_ATTR_GRAF_TRANSPARENCE ".uno:GrafTransparence" +#define CMD_SID_GRFFILTER_INVERT ".uno:GraphicFilterInvert" +#define CMD_SID_GRFFILTER_MOSAIC ".uno:GraphicFilterMosaic" +#define CMD_SID_GRFFILTER_POPART ".uno:GraphicFilterPopart" +#define CMD_SID_GRFFILTER_POSTER ".uno:GraphicFilterPoster" +#define CMD_SID_GRFFILTER_EMBOSS ".uno:GraphicFilterRelief" +#define CMD_SID_GRFFILTER_REMOVENOISE ".uno:GraphicFilterRemoveNoise" +#define CMD_SID_GRFFILTER_SEPIA ".uno:GraphicFilterSepia" +#define CMD_SID_GRFFILTER_SHARPEN ".uno:GraphicFilterSharpen" +#define CMD_SID_GRFFILTER_SMOOTH ".uno:GraphicFilterSmooth" +#define CMD_SID_GRFFILTER_SOBEL ".uno:GraphicFilterSobel" +#define CMD_SID_GRFFILTER_SOLARIZE ".uno:GraphicFilterSolarize" +#define CMD_SID_GRFFILTER ".uno:GraphicFilterToolbox" +#define CMD_SID_FM_DBGRID ".uno:Grid" +#define CMD_SID_GRID_USE ".uno:GridUse" +#define CMD_SID_GRID_VISIBLE ".uno:GridVisible" +#define CMD_SID_OUTLINE_MAKE ".uno:Group" +#define CMD_SID_FM_GROUPBOX ".uno:GroupBox" +#define CMD_SID_INSERT_GROUPBOX ".uno:Groupbox" +#define CMD_SID_RULER_LR_MIN_MAX ".uno:HeaderFooterBorder" +#define CMD_SID_HELPLINES_MOVE ".uno:HelplinesMove" +#define CMD_SID_INSERT_HFIXEDLINE ".uno:HFixedLine" +#define CMD_SID_OUTLINE_HIDE ".uno:HideDetail" +#define CMD_SID_INSERT_HSCROLLBAR ".uno:HScrollbar" +#define CMD_SID_HYPERLINK_GETLINK ".uno:Hyperlink" +#define CMD_SID_FM_IMAGEBUTTON ".uno:Imagebutton" +#define CMD_SID_FM_IMAGECONTROL ".uno:ImageControl" +#define CMD_SID_INSERT_IMAGECONTROL ".uno:InsertImageControl" +#define CMD_SID_IMAP ".uno:ImageMapDialog" +#define CMD_SID_IMAP_EXEC ".uno:ImageMapExecute" +#define CMD_SID_3D_INIT ".uno:Init3D" +#define CMD_SID_OBJECTRESIZE ".uno:InPlaceObjectResize" +#define CMD_SID_ENTER_STRING ".uno:EnterString" +#define CMD_SID_INSERT_POSTIT ".uno:InsertAnnotation" +#define CMD_SID_SHOW_POSTIT ".uno:ShowAnnotations" +#define CMD_SID_REPLYTO_POSTIT ".uno:ReplyToAnnotation" +#define CMD_SID_DELETE_POSTIT ".uno:DeleteAnnotation" +#define CMD_SID_DELETEALL_POSTIT ".uno:DeleteAllAnnotation" +#define CMD_SID_DELETEALLBYAUTHOR_POSTIT ".uno:DeleteAllAnnotationByAuthor" +#define CMD_SID_NEXT_POSTIT ".uno:NextAnnotation" +#define CMD_SID_PREVIOUS_POSTIT ".uno:PreviousAnnotation" +#define CMD_SID_INSERT_APPLET ".uno:InsertApplet" +#define CMD_SID_GALLERY_FORMATS ".uno:InsertGalleryPic" +#define CMD_SID_INSERT_GRAPHIC ".uno:InsertGraphic" +#define CMD_SID_INSERT_IMAGE ".uno:InsertImage" +#define CMD_SID_INSERT_MATH ".uno:InsertMath" +#define CMD_SID_ATTR_INSERT ".uno:InsertMode" +#define CMD_FN_NUM_NUMBERING_ON ".uno:DefaultNumbering" +#define CMD_SID_INSERT_OBJECT ".uno:InsertObject" +#define CMD_SID_INSERT_DIAGRAM ".uno:InsertObjectChart" +#define CMD_SID_INSERT_PLUGIN ".uno:InsertPlugin" +#define CMD_SID_INSERT_SOUND ".uno:InsertSound" +#define CMD_SID_CHARMAP ".uno:InsertSymbol" +#define CMD_SID_ATTR_TABLE ".uno:InsertSpreadsheet" +#define CMD_SID_INSERT_TABLE ".uno:InsertTable" +#define CMD_SID_INSERT_FRAME ".uno:InsertTextFrame" +#define CMD_SID_INSERT_VIDEO ".uno:InsertVideo" +#define CMD_SID_POLY_INTERSECT ".uno:Intersect" +#define CMD_SID_ATTR_CHAR_POSTURE ".uno:Italic" +#define CMD_SID_ATTR_CHAR_LATIN_POSTURE ".uno:ItalicLatin" +#define CMD_SID_ATTR_CHAR_CJK_POSTURE ".uno:ItalicCJK" +#define CMD_SID_ATTR_CHAR_CTL_POSTURE ".uno:ItalicCTL" +#define CMD_SID_ATTR_PARA_ADJUST_BLOCK ".uno:JustifyPara" +#define CMD_SID_INSERT_FIXEDTEXT ".uno:InsertFixedText" +#define CMD_SID_FM_FIXEDTEXT ".uno:Label" +#define CMD_SID_ATTR_CHAR_LANGUAGE ".uno:Language" +#define CMD_SID_ATTR_CHAR_LATIN_LANGUAGE ".uno:LanguageLatin" +#define CMD_SID_FM_RECORD_LAST ".uno:LastRecord" +#define CMD_SID_FM_LEAVE_CREATE ".uno:LeaveFMCreateMode" +#define CMD_SID_LEAVE_GROUP ".uno:LeaveGroup" +#define CMD_SID_ATTR_PARA_ADJUST_LEFT ".uno:LeftPara" +#define CMD_SID_ATTR_LRSPACE ".uno:LeftRightMargin" +#define CMD_SID_ATTR_PARA_LRSPACE ".uno:LeftRightParaMargin" +#define CMD_SID_ATTR_PARA_LRSPACE_VERTICAL ".uno:LeftRightParaMargin_Vertical" +#define CMD_SID_DRAW_LINE ".uno:Line" +#define CMD_SID_DRAW_XLINE ".uno:Line_Diagonal" +#define CMD_SID_FRAME_LINECOLOR ".uno:FrameLineColor" +#define CMD_SID_ATTR_LINE_DASH ".uno:LineDash" +#define CMD_SID_ATTR_LINEEND_STYLE ".uno:LineEndStyle" +#define CMD_SID_ATTR_PARA_LINESPACE ".uno:LineSpacing" +#define CMD_SID_FRAME_LINESTYLE ".uno:LineStyle" +#define CMD_SID_ATTR_LINE_WIDTH ".uno:LineWidth" +#define CMD_SID_FM_LISTBOX ".uno:ListBox" +#define CMD_SID_INSERT_LISTBOX ".uno:InsertListbox" +#define CMD_SID_POLY_MERGE ".uno:Merge" +#define CMD_SID_BASICIDE_NEWJAVAMODULE ".uno:NewJavaModule" +#define CMD_SID_FM_RECORD_NEW ".uno:NewRecord" +#define CMD_SID_FM_RECORD_NEXT ".uno:NextRecord" +#define CMD_SID_FM_NUMERICFIELD ".uno:NumericField" +#define CMD_SID_INSERT_NUMERICFIELD ".uno:InsertNumericField" +#define CMD_SID_OBJECT_ALIGN ".uno:ObjectAlign" +#define CMD_SID_FRAME_DOWN ".uno:ObjectBackOne" +#define CMD_SID_FRAME_UP ".uno:ObjectForwardOne" +#define CMD_SID_FM_OPEN_READONLY ".uno:OpenReadOnly" +#define CMD_SID_FM_ORDERCRIT ".uno:OrderCrit" +#define CMD_SID_ATTR_PARA_ORPHANS ".uno:Orphan" +#define CMD_SID_OUTLINE_BULLET ".uno:OutlineBullet" +#define CMD_SID_OUTLINE_COLLAPSE ".uno:OutlineCollapse" +#define CMD_SID_OUTLINE_COLLAPSE_ALL ".uno:OutlineCollapseAll" +#define CMD_SID_OUTLINE_DOWN ".uno:OutlineDown" +#define CMD_SID_OUTLINE_EXPAND ".uno:OutlineExpand" +#define CMD_SID_OUTLINE_EXPAND_ALL ".uno:OutlineExpandAll" +#define CMD_SID_ATTR_CHAR_CONTOUR ".uno:OutlineFont" +#define CMD_SID_OUTLINE_FORMAT ".uno:OutlineFormat" +#define CMD_SID_OUTLINE_LEFT ".uno:OutlineLeft" +#define CMD_SID_OUTLINE_RIGHT ".uno:OutlineRight" +#define CMD_SID_OUTLINE_UP ".uno:OutlineUp" +#define CMD_SID_ATTR_PARA_PAGEBREAK ".uno:Pagebreak" +#define CMD_SID_ATTR_PAGE_PAPERBIN ".uno:PagePaperBin" +#define CMD_SID_ATTR_PAGE_SIZE ".uno:AttributePageSize" +#define CMD_SID_ATTR_PARA_MODEL ".uno:AttributeParaModel" +#define CMD_SID_ATTR_PAGE ".uno:AttributePage" +#define CMD_SID_ATTR_CHAR_AUTOKERN ".uno:PairKerning" +#define CMD_SID_PARA_DLG ".uno:ParagraphDialog" +#define CMD_SID_ATTR_PARA_KEEP ".uno:ParaKeepTogether" +#define CMD_SID_ATTR_PARA_SPLIT ".uno:ParaSplit" +#define CMD_SID_INSERT_PATTERNFIELD ".uno:InsertPatternField" +#define CMD_SID_FM_PATTERNFIELD ".uno:PatternField" +#define CMD_SID_DRAW_PIE ".uno:Pie" +#define CMD_SID_DRAW_PIE_NOFILL ".uno:Pie_Unfilled" +#define CMD_SID_POLY_FORMEN ".uno:PolyFormen" +#define CMD_SID_DRAW_XPOLYGON ".uno:Polygon_Diagonal" +#define CMD_SID_DRAW_XPOLYGON_NOFILL ".uno:Polygon_Diagonal_Unfilled" +#define CMD_SID_DRAW_POLYGON_NOFILL ".uno:Polygon_Unfilled" +#define CMD_SID_ATTR_POSITION ".uno:Position" +#define CMD_SID_INSERT_PREVIEW ".uno:Preview" +#define CMD_SID_FM_RECORD_PREV ".uno:PrevRecord" +#define CMD_SID_INSERT_PROGRESSBAR ".uno:ProgressBar" +#define CMD_SID_FM_PROPERTY_CONTROL ".uno:PropertyController" +#define CMD_SID_FM_PUSHBUTTON ".uno:Pushbutton" +#define CMD_SID_INSERT_PUSHBUTTON ".uno:InsertPushbutton" +#define CMD_SID_INSERT_RADIOBUTTON ".uno:Radiobutton" +#define CMD_SID_FM_RADIOBUTTON ".uno:RadioButton" +#define CMD_SID_READONLY_MODE ".uno:ReadOnlyMode" +#define CMD_SID_FM_RECORD_FROM_TEXT ".uno:RecFromText" +#define CMD_SID_FM_RECORD_SAVE ".uno:RecSave" +#define CMD_SID_FM_SEARCH ".uno:RecSearch" +#define CMD_SID_DRAW_RECT ".uno:Rect" +#define CMD_SID_DRAW_RECT_ROUND ".uno:Rect_Rounded" +#define CMD_SID_DRAW_RECT_ROUND_NOFILL ".uno:Rect_Rounded_Unfilled" +#define CMD_SID_DRAW_RECT_NOFILL ".uno:Rect_Unfilled" +#define CMD_SID_FM_RECORD_TEXT ".uno:RecText" +#define CMD_SID_FM_RECORD_TOTAL ".uno:RecTotal" +#define CMD_SID_FM_RECORD_UNDO ".uno:RecUndo" +#define CMD_SID_FM_REFRESH ".uno:Refresh" +#define CMD_SID_FM_REFRESH_FORM_CONTROL ".uno:RefreshFormControl" +#define CMD_SID_FM_FILTER_REMOVE ".uno:RemoveFilter" +#define CMD_SID_FM_REMOVE_FILTER_SORT ".uno:RemoveFilterSort" +#define CMD_FID_SEARCH_REPLACESET ".uno:ReplaceSet" +#define CMD_SID_ATTR_PARA_ADJUST_RIGHT ".uno:RightPara" +#define CMD_SID_RULER_BORDER_DISTANCE ".uno:RulerBorderDistance" +#define CMD_SID_RULER_BORDERS ".uno:RulerBorders" +#define CMD_SID_RULER_BORDERS_VERTICAL ".uno:RulerBordersVertical" +#define CMD_SID_RULER_NULL_OFFSET ".uno:RulerNullOffset" +#define CMD_SID_RULER_PAGE_POS ".uno:RulerPagePos" +#define CMD_SID_RULER_PROTECT ".uno:RulerProtect" +#define CMD_SID_FM_EXECUTE ".uno:SbaExecuteSql" +#define CMD_SID_FM_NATIVESQL ".uno:SbaNativeSql" +#define CMD_SID_SCAN ".uno:Scan" +#define CMD_SID_SC_EDITOPTIONS ".uno:ScEditOptions" +#define CMD_SID_SCH_EDITOPTIONS ".uno:SchEditOptions" +#define CMD_SID_SD_EDITOPTIONS ".uno:SdEditOptions" +#define CMD_SID_SD_GRAPHIC_OPTIONS ".uno:SdGraphicOptions" +#define CMD_FID_SEARCH_OFF ".uno:SearchOff" +#define CMD_FID_SEARCH_ON ".uno:SearchOn" +#define CMD_FID_SEARCH_SEARCHSET ".uno:SearchSet" +#define CMD_SID_SELECT ".uno:Select" +#define CMD_SID_FRAME_TO_BOTTOM ".uno:SendToBack" +#define CMD_SID_SET_DEFAULT ".uno:SetDefault" +#define CMD_SID_HYPERLINK_SETLINK ".uno:SetHyperlink" +#define CMD_SID_ATTR_PARA_HYPHENZONE ".uno:SetHyphenZone" +#define CMD_SID_ATTR_LONG_LRSPACE ".uno:SetLongLeftRightMargin" +#define CMD_SID_ATTR_LONG_ULSPACE ".uno:SetLongTopBottomMargin" +#define CMD_SID_OBJECT_HELL ".uno:SetObjectToBackground" +#define CMD_SID_OBJECT_HEAVEN ".uno:SetObjectToForeground" +#define CMD_SID_ATTR_PAGE_MAXSIZE ".uno:SetPageMaxSize" +#define CMD_SID_ATTR_BORDER_SHADOW ".uno:BorderShadow" +#define CMD_SID_ATTR_FILL_SHADOW ".uno:FillShadow" +#define CMD_SID_ATTR_CHAR_SHADOWED ".uno:Shadowed" +#define CMD_SID_OUTLINE_SHOW ".uno:ShowDetail" +#define CMD_SID_FM_SHOW_FMEXPLORER ".uno:ShowFmExplorer" +#define CMD_SID_SHOW_ITEMBROWSER ".uno:ShowItemBrowser" +#define CMD_SID_SHOW_PROPERTYBROWSER ".uno:ShowPropBrowser" +#define CMD_SID_FM_SHOW_PROPERTIES ".uno:ShowProperties" +#define CMD_SID_FM_SHOW_PROPERTY_BROWSER ".uno:ShowPropertyBrowser" +#define CMD_SID_RULER ".uno:ShowRuler" +#define CMD_SID_SIM_EDITOPTIONS ".uno:SimEditOptions" +#define CMD_SID_ATTR_SIZE ".uno:Size" +#define CMD_SID_SM_EDITOPTIONS ".uno:SmEditOptions" +#define CMD_SID_FM_SORTDOWN ".uno:SortDown" +#define CMD_SID_FM_SORTUP ".uno:Sortup" +#define CMD_SID_ATTR_PARA_LINESPACE_10 ".uno:SpacePara1" +#define CMD_SID_ATTR_PARA_LINESPACE_15 ".uno:SpacePara15" +#define CMD_SID_ATTR_PARA_LINESPACE_20 ".uno:SpacePara2" +#define CMD_SID_ATTR_CHAR_KERNING ".uno:Spacing" +#define CMD_SID_AUTOSPELL_CHECK ".uno:SpellOnline" +#define CMD_SID_INSERT_SPINBUTTON ".uno:Spinbutton" +#define CMD_SID_DRAW_SQUARE ".uno:Square" +#define CMD_SID_DRAW_SQUARE_ROUND ".uno:Square_Rounded" +#define CMD_SID_DRAW_SQUARE_ROUND_NOFILL ".uno:Square_Rounded_Unfilled" +#define CMD_SID_DRAW_SQUARE_NOFILL ".uno:Square_Unfilled" +#define CMD_SID_3D_STATE ".uno:State3D" +#define CMD_SID_ATTR_CHAR_STRIKEOUT ".uno:Strikeout" +#define CMD_SID_SET_SUB_SCRIPT ".uno:SubScript" +#define CMD_SID_POLY_SUBSTRACT ".uno:Substract" +#define CMD_SID_SET_SUPER_SCRIPT ".uno:SuperScript" +#define CMD_SID_SW_EDITOPTIONS ".uno:SwEditOptions" +#define CMD_SID_FM_TAB_DIALOG ".uno:TabDialog" +#define CMD_SID_ATTR_TABSTOP ".uno:Tabstops" +#define CMD_SID_ATTR_TABSTOP_VERTICAL ".uno:TabstopsVertical" +#define CMD_SID_DIALOG_TESTMODE ".uno:TestMode" +#define CMD_SID_ATTR_CHAR ".uno:Text" +#define CMD_SID_DRAW_TEXT ".uno:DrawText" +#define CMD_SID_DRAW_TEXT_MARQUEE ".uno:Text_Marquee" +#define CMD_SID_TEXTDIRECTION_LEFT_TO_RIGHT ".uno:TextdirectionLeftToRight" +#define CMD_SID_TEXTDIRECTION_TOP_TO_BOTTOM ".uno:TextdirectionTopToBottom" +#define CMD_SID_ATTR_TEXT_FITTOSIZE ".uno:TextFitToSize" +#define CMD_SID_THESAURUS ".uno:Thesaurus" +#define CMD_SID_INSERT_TIMEFIELD ".uno:InsertTimeField" +#define CMD_SID_FM_TIMEFIELD ".uno:TimeField" +#define CMD_SID_BEZIER_EDIT ".uno:ToggleObjectBezierMode" +#define CMD_SID_OBJECT_ROTATE ".uno:ToggleObjectRotateMode" +#define CMD_SID_TEXTEDIT ".uno:ToolEdit" +#define CMD_SID_OBJECT_SELECT ".uno:SelectObject" +#define CMD_SID_ATTR_ULSPACE ".uno:TopBottomMargin" +#define CMD_SID_ATTR_TRANSFORM ".uno:TransformDialog" +#define CMD_SID_TWAIN_SELECT ".uno:TwainSelect" +#define CMD_SID_TWAIN_TRANSFER ".uno:TwainTransfer" +#define CMD_SID_ATTR_CHAR_UNDERLINE ".uno:Underline" +#define CMD_SID_ATTR_CHAR_OVERLINE ".uno:Overline" +#define CMD_SID_OUTLINE_REMOVE ".uno:Ungroup" +#define CMD_SID_INSERT_URLBUTTON ".uno:URLButton" +#define CMD_SID_FM_USE_WIZARDS ".uno:UseWizards" +#define CMD_SID_DRAW_CAPTION_VERTICAL ".uno:VerticalCaption" +#define CMD_SID_DRAW_TEXT_VERTICAL ".uno:VerticalText" +#define CMD_SID_INSERT_VFIXEDLINE ".uno:VFixedLine" +#define CMD_SID_FM_VIEW_AS_GRID ".uno:ViewFormAsGrid" +#define CMD_SID_INSERT_VSCROLLBAR ".uno:VScrollbar" +#define CMD_SID_ATTR_PARA_WIDOWS ".uno:Widow" +#define CMD_SID_3D_WIN ".uno:Window3D" +#define CMD_SID_ATTR_CHAR_WORDLINEMODE ".uno:WordMode" +#define CMD_SID_ATTR_LINE_COLOR ".uno:XLineColor" +#define CMD_SID_ATTR_LINE_STYLE ".uno:XLineStyle" +#define CMD_SID_ATTR_ZOOM ".uno:Zoom" +#define CMD_SID_SIZE_REAL ".uno:Zoom100Percent" +#define CMD_SID_SIZE_OPTIMAL ".uno:ZoomObjects" +#define CMD_SID_SIZE_ALL ".uno:ZoomOptimal" +#define CMD_SID_SIZE_PAGE ".uno:ZoomPage" +#define CMD_SID_SIZE_PAGE_WIDTH ".uno:ZoomPageWidth" +#define CMD_SID_SIZE_VISAREA ".uno:ZoomVisArea" +#define CMD_SID_FM_GRABCONTROLFOCUS ".uno:GrabControlFocus" +#define CMD_SID_FM_CREATE_FIELDCONTROL ".uno:CreateFieldControl" +#define CMD_SID_INSERT_SELECT ".uno:SelectMode" +#define CMD_SID_PARA_VERTALIGN ".uno:VerticalParagraphAlignment" +#define CMD_SID_ATTR_CHAR_RELIEF ".uno:CharacterRelief" +#define CMD_SID_ATTR_BRUSH_CHAR ".uno:CharacterBackgroundPattern" +#define CMD_SID_ATTR_CHAR_ROTATED ".uno:CharacterRotation" +#define CMD_SID_ATTR_CHAR_SCALEWIDTH ".uno:CharacterWidthScalingFactor" +#define CMD_SID_ATTR_NUMBERFORMAT_VALUE ".uno:NumberFormatValue" +#define CMD_SID_ATTR_ALIGN_HOR_JUSTIFY ".uno:HorizontalJustification" +#define CMD_SID_ATTR_ALIGN_VER_JUSTIFY ".uno:VerticalJustification" +#define CMD_SID_ATTR_ALIGN_INDENT ".uno:AlignmentIndent" +#define CMD_SID_ATTR_ALIGN_HYPHENATION ".uno:AlignmentHyphenation" +#define CMD_SID_ATTR_ALIGN_DEGREES ".uno:AlignmentRotation" +#define CMD_SID_ATTR_ALIGN_LOCKPOS ".uno:AlignmentRotationMode" +#define CMD_SID_ATTR_ALIGN_MARGIN ".uno:AlignmentMargin" +#define CMD_SID_ATTR_ALIGN_STACKED ".uno:AlignmentStacked" +#define CMD_SID_ATTR_PARA_LEFT_TO_RIGHT ".uno:ParaLeftToRight" +#define CMD_SID_ATTR_PARA_RIGHT_TO_LEFT ".uno:ParaRightToLeft" +#define CMD_SID_RULER_TEXT_RIGHT_TO_LEFT ".uno:TextRTL" +#define CMD_SID_OPEN_HYPERLINK ".uno:OpenHyperlinkOnCursor" +#define CMD_SID_CTLFONT_STATE ".uno:CTLFontState" +#define CMD_SID_VERTICALTEXT_STATE ".uno:VerticalTextState" +#define CMD_SID_OPEN_XML_FILTERSETTINGS ".uno:OpenXMLFilterSettings" +#define CMD_SID_HANGUL_HANJA_CONVERSION ".uno:HangulHanjaConversion" +#define CMD_SID_CHINESE_CONVERSION ".uno:ChineseConversion" +#define CMD_SID_SPELL_DIALOG ".uno:SpellDialog" +#define CMD_SID_RULER_ROWS ".uno:RulerRows" +#define CMD_SID_RULER_ROWS_VERTICAL ".uno:RulerRowsVertical" +#define CMD_SID_ATTR_CHAR_FONTLIST ".uno:FontNameList" +#define CMD_SID_EXTRUSION_TOOGLE ".uno:ExtrusionToggle" +#define CMD_SID_EXTRUSION_TILT_DOWN ".uno:ExtrusionTiltDown" +#define CMD_SID_EXTRUSION_TILT_UP ".uno:ExtrusionTiltUp" +#define CMD_SID_EXTRUSION_TILT_LEFT ".uno:ExtrusionTiltLeft" +#define CMD_SID_EXTRUSION_TILT_RIGHT ".uno:ExtrusionTiltRight" +#define CMD_SID_EXTRUSION_DEPTH_FLOATER ".uno:ExtrusionDepthFloater" +#define CMD_SID_EXTRUSION_DEPTH_DIALOG ".uno:ExtrusionDepthDialog" +#define CMD_SID_EXTRUSION_DIRECTION_FLOATER ".uno:ExtrusionDirectionFloater" +#define CMD_SID_EXTRUSION_LIGHTING_FLOATER ".uno:ExtrusionLightingFloater" +#define CMD_SID_EXTRUSION_SURFACE_FLOATER ".uno:ExtrusionSurfaceFloater" +#define CMD_SID_EXTRUSION_3D_COLOR ".uno:Extrusion3DColor" +#define CMD_SID_EXTRUSION_DEPTH ".uno:ExtrusionDepth" +#define CMD_SID_EXTRUSION_DIRECTION ".uno:ExtrusionDirection" +#define CMD_SID_EXTRUSION_PROJECTION ".uno:ExtrusionProjection" +#define CMD_SID_EXTRUSION_LIGHTING_DIRECTION ".uno:ExtrusionLightingDirection" +#define CMD_SID_EXTRUSION_LIGHTING_INTENSITY ".uno:ExtrusionLightingIntensity" +#define CMD_SID_EXTRUSION_SURFACE ".uno:ExtrusionSurface" +#define CMD_SID_FONTWORK_GALLERY_FLOATER ".uno:FontworkGalleryFloater" +#define CMD_SID_FONTWORK_SHAPE_TYPE ".uno:FontworkShapeType" +#define CMD_SID_FONTWORK_SAME_LETTER_HEIGHTS ".uno:FontworkSameLetterHeights" +#define CMD_SID_FONTWORK_ALIGNMENT_FLOATER ".uno:FontworkAlignmentFloater" +#define CMD_SID_FONTWORK_CHARACTER_SPACING_FLOATER ".uno:FontworkCharacterSpacingFloater" +#define CMD_SID_FONTWORK_SHAPE ".uno:FontworkShape" +#define CMD_SID_FONTWORK_ALIGNMENT ".uno:FontworkAlignment" +#define CMD_SID_FONTWORK_CHARACTER_SPACING ".uno:FontworkCharacterSpacing" +#define CMD_SID_FONTWORK_CHARACTER_SPACING_DIALOG ".uno:FontworkCharacterSpacingDialog" +#define CMD_SID_FONTWORK_KERN_CHARACTER_PAIRS ".uno:FontworkKernCharacterPairs" +#define CMD_SID_GET_COLORTABLE ".uno:GetColorTable" +#define CMD_SID_SPELLCHECKER_CHANGED ".uno:SpellCheckerChanged" +#define CMD_SID_ATTR_YEAR2000 ".uno:Year2000" +#define CMD_SID_INC_INDENT ".uno:IncrementIndent" +#define CMD_SID_DEC_INDENT ".uno:DecrementIndent" +#define CMD_SID_TABLE_CELL ".uno:StateTableCell" +#define CMD_SID_OUTLINE_TO_IMPRESS ".uno:SendOutlineToImpress" +#define CMD_SID_ATTR_DEFTABSTOP ".uno:DefTabStop" +#define CMD_SID_ATTR_LANGUAGE ".uno:DocumentLanguage" +#define CMD_SID_ATTR_CHAR_CJK_LANGUAGE ".uno:DocumentLanguageCJK" +#define CMD_SID_ATTR_CHAR_CTL_LANGUAGE ".uno:DocumentLanguageCTL" +#define CMD_SID_OPT_LOCALE_CHANGED ".uno:OptionsLocaleChanged" +#define CMD_SID_SBA_BRW_INSERT ".uno:SbaBrwInsert" +#define CMD_SID_DRAWTBX_CS_BASIC ".uno:BasicShapes" +#define CMD_SID_DRAWTBX_CS_SYMBOL ".uno:SymbolShapes" +#define CMD_SID_DRAWTBX_CS_ARROW ".uno:ArrowShapes" +#define CMD_SID_DRAWTBX_CS_FLOWCHART ".uno:FlowChartShapes" +#define CMD_SID_DRAWTBX_CS_CALLOUT ".uno:CalloutShapes" +#define CMD_SID_DRAWTBX_CS_STAR ".uno:StarShapes" +#define CMD_SID_DRAW_CS_ID ".uno:CustomShape" +#define CMD_SID_DASH_LIST ".uno:DashListState" +#define CMD_SID_LINEEND_LIST ".uno:LineEndListState" +#define CMD_SID_COLOR_TABLE ".uno:ColorTableState" +#define CMD_SID_GRADIENT_LIST ".uno:GradientListState" +#define CMD_SID_HATCH_LIST ".uno:HatchListState" +#define CMD_SID_BITMAP_LIST ".uno:BitmapListState" +#define CMD_SID_ATTR_CHAR_EMPHASISMARK ".uno:EmphasisMark" +#define CMD_SID_FM_SHOW_DATANAVIGATOR ".uno:ShowDataNavigator" +#define CMD_SID_FM_DATANAVIGATOR_CONTROL ".uno:FmDataNavigatorController" +#define CMD_SID_ALIGN_ANY_LEFT ".uno:CommonAlignLeft" +#define CMD_SID_ALIGN_ANY_HCENTER ".uno:CommonAlignHorizontalCenter" +#define CMD_SID_ALIGN_ANY_RIGHT ".uno:CommonAlignRight" +#define CMD_SID_ALIGN_ANY_JUSTIFIED ".uno:CommonAlignJustified" +#define CMD_SID_ALIGN_ANY_TOP ".uno:CommonAlignTop" +#define CMD_SID_ALIGN_ANY_VCENTER ".uno:CommonAlignVerticalCenter" +#define CMD_SID_ALIGN_ANY_BOTTOM ".uno:CommonAlignBottom" +#define CMD_SID_ALIGN_ANY_HDEFAULT ".uno:CommonAlignHorizontalDefault" +#define CMD_SID_ALIGN_ANY_VDEFAULT ".uno:CommonAlignVerticalDefault" +#define CMD_SID_AVMEDIA_TOOLBOX ".uno:AVMediaToolBox" +#define CMD_SID_BORDER_REDUCED_MODE ".uno:BorderReducedMode" +#define CMD_SID_COLOR_SETTINGS ".uno:ColorSettings" +#define CMD_SID_MAIL_EXPORT_FINISHED ".uno:MailExportFinished" +#define CMD_SID_INSERT_ZWSP ".uno:InsertZWSP" +#define CMD_SID_INSERT_ZWNBSP ".uno:InsertZWNBSP" +#define CMD_SID_INSERT_LRM ".uno:InsertLRM" +#define CMD_SID_INSERT_RLM ".uno:InsertRLM" +#define CMD_FN_INSERT_SOFT_HYPHEN ".uno:InsertSoftHyphen" +#define CMD_FN_INSERT_HARDHYPHEN ".uno:InsertHardHyphen" +#define CMD_FN_INSERT_HARD_SPACE ".uno:InsertNonBreakingSpace" +#define CMD_SID_BASICIDE_MANAGE_LANG ".uno:ManageLanguage" +#define CMD_SID_BASICIDE_CURRENT_LANG ".uno:CurrentLanguage" +#define CMD_SID_TABLE_MERGE_CELLS ".uno:MergeCells" +#define CMD_SID_TABLE_SPLIT_CELLS ".uno:SplitCell" +#define CMD_SID_OPTIMIZE_TABLE ".uno:OptimizeTable" +#define CMD_SID_TABLE_VERT_BOTTOM ".uno:CellVertBottom" +#define CMD_SID_TABLE_VERT_CENTER ".uno:CellVertCenter" +#define CMD_SID_TABLE_VERT_NONE ".uno:CellVertTop" +#define CMD_SID_TABLE_INSERT_ROW ".uno:InsertRows" +#define CMD_SID_TABLE_INSERT_COL ".uno:InsertColumns" +#define CMD_SID_TABLE_DELETE_ROW ".uno:DeleteRows" +#define CMD_SID_TABLE_DELETE_COL ".uno:DeleteColumns" +#define CMD_SID_TABLE_SELECT_ALL ".uno:SelectTable" +#define CMD_SID_TABLE_SELECT_COL ".uno:EntireColumn" +#define CMD_SID_TABLE_SELECT_ROW ".uno:EntireRow" +#define CMD_SID_FORMAT_TABLE_DLG ".uno:TableDialog" +#define CMD_SID_TABLE_AUTOSUM ".uno:AutoSum" +#define CMD_SID_TABLE_SORT_DIALOG ".uno:TableSort" +#define CMD_SID_OPEN_SMARTTAGMENU ".uno:OpenSmartTagMenuOnCursor" +#define CMD_SID_ATTR_ZOOMSLIDER ".uno:ZoomSlider" +#define CMD_SID_FONTNAMELIST ".uno:FontNameStringList" +#define CMD_SID_LANGUAGE_STATUS ".uno:LanguageStatus" +#define CMD_SID_CHAR_DLG_FOR_PARAGRAPH ".uno:FontDialogForParagraph" +#define CMD_SID_GROW_FONT_SIZE ".uno:Grow" +#define CMD_SID_SHRINK_FONT_SIZE ".uno:Shrink" +#define CMD_SID_RECHECK_DOCUMENT ".uno:RecheckDocument" +#define CMD_SID_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog" +#define CMD_SID_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog" + +#endif diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index 77a4e40e75..a041bdbbe2 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -195,9 +195,9 @@ class AbstractSvxNameDialog :public VclAbstractDialog //add for SvxNameDialog public: virtual void GetName( String& rName ) = 0; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) = 0; - virtual void SetEditHelpId(ULONG nHelpId) = 0; + virtual void SetEditHelpId(const rtl::OString&) = 0; //from class Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& ) = 0; virtual void SetText( const XubString& rStr ) = 0; }; @@ -243,7 +243,7 @@ public: //from SvxMultiPathDialog virtual void SetClassPathMode() = 0; //From Class Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& ) = 0; }; class AbstractSvxHpLinkDlg : public VclAbstractDialog //add for SvxHpLinkDlg @@ -500,7 +500,7 @@ public: virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ) = 0; + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) = 0; }; #endif diff --git a/svx/prj/d.lst b/svx/prj/d.lst index 7d2f508d9d..24dfe87f78 100644 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -18,6 +18,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res mkdir: %_DEST%\inc%_EXT%\svx +..\inc\svx\svxcommands.h %_DEST%\inc%_EXT%\svx\svxcommands.h ..\sdi\svx.sdi %_DEST%\inc%_EXT%\svx\svx.sdi ..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi ..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index d299defde4..685aa17f9a 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -37,7 +37,7 @@ // RID_SVXDLG_BMPMASK ---------------------------------------------------- DockingWindow RID_SVXDLG_BMPMASK { - HelpId = SID_BMPMASK ; + HelpId = CMD_SID_BMPMASK ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index cea1d5d41d..b5e28ab6cf 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -636,8 +636,7 @@ SvxTPView::SvxTPView( Window * pParent) { FreeResource(); - // FIXME: HELPID - aViewData.SetHelpId(""/*HID_REDLINING_VIEW_DG_VIEW_TABLE*/); + aViewData.SetHelpId(HID_REDLINING_VIEW_DG_VIEW_TABLE); aViewData.SetHeaderBarHelpId(HID_REDLINING_VIEW_DG_VIEW_HEADER); aMinSize=GetSizePixel(); @@ -1178,15 +1177,13 @@ void SvxTPFilter::ShowAction(BOOL bShow) { aCbRange.Hide(); aLbAction.Hide(); - // FIXME: HELPID - aCbRange.SetHelpId(""/*HID_REDLINING_FILTER_CB_RANGE*/); + aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_RANGE); } else { HideRange(); aCbRange.SetText(aActionStr); - // FIXME: HELPID - aCbRange.SetHelpId(""/*HID_REDLINING_FILTER_CB_ACTION*/); + aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_ACTION); aCbRange.Show(); aLbAction.Show(); @@ -1402,8 +1399,7 @@ SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, WinBits nWinStyle) aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName()); aTCAccept.SetTabPage( TP_VIEW, pTPView); aTCAccept.SetTabPage( TP_FILTER, pTPFilter); - // FIXME: HELPID - aTCAccept.SetHelpId(""/*HID_REDLINING_TABCONTROL*/); + aTCAccept.SetHelpId(HID_REDLINING_TABCONTROL); aTCAccept.SetTabPageSizePixel(aMinSize); Size aSize=aTCAccept.GetSizePixel(); @@ -1430,8 +1426,7 @@ SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, const ResId& rResId ) aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName()); aTCAccept.SetTabPage( TP_VIEW, pTPView); aTCAccept.SetTabPage( TP_FILTER, pTPFilter); - // FIXME: HELPID - aTCAccept.SetHelpId(""/*HID_REDLINING_TABCONTROL*/); + 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 814b7734f3..9d6644f5fb 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1009,12 +1009,9 @@ SvxLightCtl3D::SvxLightCtl3D( Window* pParent, WinBits nStyle ) void SvxLightCtl3D::Init() { // #i58240# set HelpIDs for scrollbars and switcher - // FIXME: HELPID - maHorScroller.SetHelpId(""/*HID_CTRL3D_HSCROLL*/); - // FIXME: HELPID - maVerScroller.SetHelpId(""/*HID_CTRL3D_VSCROLL*/); - // FIXME: HELPID - maSwitcher.SetHelpId(""/*HID_CTRL3D_SWITCHER*/); + maHorScroller.SetHelpId(HID_CTRL3D_HSCROLL); + maVerScroller.SetHelpId(HID_CTRL3D_VSCROLL); + maSwitcher.SetHelpId(HID_CTRL3D_SWITCHER); // Light preview maLightControl.Show(); diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src index 667ab90f96..d69a1600b2 100644 --- a/svx/source/dialog/fontwork.src +++ b/svx/source/dialog/fontwork.src @@ -34,7 +34,7 @@ // RID_SVXDLG_FONTWORK --------------------------------------------------- DockingWindow RID_SVXDLG_FONTWORK { - HelpId = SID_FONTWORK ; + HelpId = CMD_SID_FONTWORK ; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src index 75d6775340..4554a5f0bd 100644 --- a/svx/source/dialog/hyprlink.src +++ b/svx/source/dialog/hyprlink.src @@ -98,7 +98,7 @@ ToolBox RID_SVXDLG_HYPERLINK }; ToolBoxItem { - HelpID = SID_HYPERLINK_SETLINK ; + HelpID = CMD_SID_HYPERLINK_SETLINK ; Identifier = BTN_LINK ; Disable = TRUE ; DropDown = TRUE ; @@ -106,7 +106,7 @@ ToolBox RID_SVXDLG_HYPERLINK }; ToolBoxItem { - HelpID = SID_CREATELINK ; + HelpID = CMD_SID_CREATELINK ; Identifier = BTN_INSERT_BOOKMARK ; Disable = TRUE ; Hide = TRUE; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index b39f59010e..15c66c5eb5 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -427,7 +427,7 @@ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset ) void SvxSearchDialog::Construct_Impl() { #if ENABLE_LAYOUT - SetHelpId (SID_SEARCH_DLG); + SetHelpId (".uno:SearchDialog"); #endif /* ENABLE_LAYOUT */ // temporary to avoid incompatibility diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src index f00a6c8093..2fd0c7e8b2 100644 --- a/svx/source/dialog/srchdlg.src +++ b/svx/source/dialog/srchdlg.src @@ -29,6 +29,7 @@ #include #include "srchdlg.hrc" +#include #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ; @@ -51,7 +52,7 @@ String RID_SVXSTR_REPLACE ModelessDialog RID_SVXDLG_SEARCH { - HelpId = SID_SEARCH_DLG ; + HelpId = CMD_SID_SEARCH_DLG ; OutputSize = TRUE ; Hide = TRUE ; SvLook = TRUE ; diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index 0fce465eca..d8efdde913 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -27,6 +27,8 @@ #include #include "float3d.hrc" +#include + #define WIDTH 158 #define HEIGHT 209 #define BORDER 3 @@ -64,7 +66,7 @@ DockingWindow RID_SVXFLOAT_3D { - HelpID = SID_3D_WIN ; + HelpID = CMD_SID_3D_WIN ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 6a7b69dcff..b9914aace7 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1977,10 +1977,7 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V String sPattern; sPattern.AssignAscii("HID:"); if (sHelpURL.Equals(sPattern, 0, sPattern.Len())) - { - // FIXME: HELPID - pGrid->SetHelpId(rtl::OUStringToOString(sHelpURL, RTL_TEXTENCODING_UTF8)); - } + 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 c0d8a587e6..4e21fc3761 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -366,20 +366,13 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) m_aLastBtn.SetSymbol(SYMBOL_LAST); m_aNewBtn.SetModeImage(((DbGridControl*)pParent)->GetImage(DbGridControl_Base::NEW)); - // 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*/); + 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); // Handler fuer Buttons einrichten m_aFirstBtn.SetClickHdl(LINK(this,NavigationBar,OnClick)); diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src index f6e4c16404..0750d9127d 100644 --- a/svx/source/fmcomp/gridctrl.src +++ b/svx/source/fmcomp/gridctrl.src @@ -29,6 +29,8 @@ #include #include "globlmn.hrc" #include "fmhelp.hrc" +#include + Menu RID_SVXMNU_ROWS { ItemList = @@ -36,19 +38,19 @@ Menu RID_SVXMNU_ROWS MenuItem { Identifier = SID_FM_DELETEROWS ; - HelpID = SID_FM_DELETEROWS ; +// HelpId = CMD_SID_FM_DELETEROWS ; Text [ en-US ] = "Delete Rows" ; }; MenuItem { Identifier = SID_FM_RECORD_SAVE ; - HelpID = SID_FM_RECORD_SAVE ; + HelpId = CMD_SID_FM_RECORD_SAVE ; Text [ en-US ] = "Save Record" ; }; MenuItem { Identifier = SID_FM_RECORD_UNDO ; - HelpID = SID_FM_RECORD_UNDO ; + HelpId = CMD_SID_FM_RECORD_UNDO ; Text [ en-US ] = "Undo: Data entry" ; }; }; @@ -60,7 +62,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_INSERTCOL ; - HelpID = SID_FM_INSERTCOL ; +// HelpId = CMD_SID_FM_INSERTCOL ; Text [ en-US ] = "Insert ~Column" ; SubMenu = Menu { @@ -69,61 +71,61 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_EDIT ; - HelpID = SID_FM_EDIT ; + HelpId = CMD_SID_FM_EDIT ; Text [ en-US ] = "Text Box" ; }; MenuItem { Identifier = SID_FM_CHECKBOX ; - HelpID = SID_FM_CHECKBOX ; + HelpId = CMD_SID_FM_CHECKBOX ; Text [ en-US ] = "Check Box" ; }; MenuItem { Identifier = SID_FM_COMBOBOX ; - HelpID = SID_FM_COMBOBOX ; + HelpId = CMD_SID_FM_COMBOBOX ; Text [ en-US ] = "Combo Box" ; }; MenuItem { Identifier = SID_FM_LISTBOX ; - HelpID = SID_FM_LISTBOX ; + HelpId = CMD_SID_FM_LISTBOX ; Text [ en-US ] = "List Box" ; }; MenuItem { Identifier = SID_FM_DATEFIELD ; - HelpID = SID_FM_DATEFIELD ; + HelpId = CMD_SID_FM_DATEFIELD ; Text [ en-US ] = "Date Field" ; }; MenuItem { Identifier = SID_FM_TIMEFIELD ; - HelpID = SID_FM_TIMEFIELD ; + HelpId = CMD_SID_FM_TIMEFIELD ; Text [ en-US ] = "Time Field" ; }; MenuItem { Identifier = SID_FM_NUMERICFIELD ; - HelpID = SID_FM_NUMERICFIELD ; + HelpId = CMD_SID_FM_NUMERICFIELD ; Text [ en-US ] = "Numeric Field" ; }; MenuItem { Identifier = SID_FM_CURRENCYFIELD ; - HelpID = SID_FM_CURRENCYFIELD ; + HelpId = CMD_SID_FM_CURRENCYFIELD ; Text [ en-US ] = "Currency Field" ; }; MenuItem { Identifier = SID_FM_PATTERNFIELD ; - HelpID = SID_FM_PATTERNFIELD ; + HelpId = CMD_SID_FM_PATTERNFIELD ; Text [ en-US ] = "Pattern Field" ; }; MenuItem { Identifier = SID_FM_FORMATTEDFIELD ; - HelpID = SID_FM_FORMATTEDFIELD ; + HelpId = CMD_SID_FM_FORMATTEDFIELD ; Text [ en-US ] = "Formatted Field" ; }; MenuItem @@ -140,25 +142,25 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_CHANGECOL ; - HelpID = SID_FM_CHANGECOL ; +// HelpId = CMD_SID_FM_CHANGECOL ; Text [ en-US ] = "~Replace with" ; }; MenuItem { Identifier = SID_FM_DELETECOL ; - HelpID = SID_FM_DELETECOL ; +// HelpId = CMD_SID_FM_DELETECOL ; Text [ en-US ] = "Delete Column" ; }; MenuItem { Identifier = SID_FM_HIDECOL ; - HelpID = SID_FM_HIDECOL ; +// HelpId = CMD_SID_FM_HIDECOL ; Text [ en-US ] = "~Hide Column"; }; MenuItem { Identifier = SID_FM_SHOWCOLS ; - HelpID = SID_FM_SHOWCOLS ; +// HelpId = CMD_SID_FM_SHOWCOLS ; SubMenu = Menu { ItemList = @@ -166,7 +168,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOWCOLS_MORE ; - HelpID = SID_FM_SHOWCOLS_MORE ; +// HelpId = CMD_SID_FM_SHOWCOLS_MORE ; Text [ en-US ] = "~More..."; }; MenuItem @@ -176,7 +178,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOWALLCOLS ; - HelpID = SID_FM_SHOWALLCOLS ; +// HelpId = CMD_SID_FM_SHOWALLCOLS ; Text [ en-US ] = "~All"; }; }; @@ -186,7 +188,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOW_PROPERTY_BROWSER ; - HelpID = SID_FM_SHOW_PROPERTY_BROWSER ; + HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ; Text [ en-US ] = "Column..." ; }; }; diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 99ad6d9f89..af3cd66afc 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2388,8 +2388,7 @@ namespace svxform { DBG_CTOR(DataNavigator,NULL); - // FIXME: HELPID - SetHelpId( ""/*HID_DATA_NAVIGATOR_WIN*/ ); + 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 d321ebd8d0..c1795f5938 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1168,8 +1168,7 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent ) ,m_aTimerCounter( 0 ) ,m_aDropActionType( DA_SCROLLUP ) { - // FIXME: HELPID - SetHelpId( ""/*HID_FILTER_NAVIGATOR*/ ); + SetHelpId( HID_FILTER_NAVIGATOR ); { { @@ -1942,8 +1941,7 @@ 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 ) { - // FIXME: HELPID - SetHelpId( ""/*HID_FILTER_NAVIGATOR_WIN*/ ); + SetHelpId( HID_FILTER_NAVIGATOR_WIN ); m_pNavigator = new FmFilterNavigator( this ); m_pNavigator->Show(); diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src index 36c12a001e..bb6f133d86 100644 --- a/svx/source/form/filtnav.src +++ b/svx/source/form/filtnav.src @@ -34,25 +34,21 @@ Menu RID_FM_FILTER_MENU MenuItem { Identifier = SID_FM_DELETE ; - HelpID = SID_FM_DELETE ; Text [ en-US ] = "~Delete" ; }; MenuItem { Identifier = SID_FM_FILTER_EDIT ; - HelpID = SID_FM_FILTER_EDIT ; Text [ en-US ] = "~Edit" ; }; MenuItem { Identifier = SID_FM_FILTER_IS_NULL ; - HelpID = SID_FM_FILTER_IS_NULL ; Text [ en-US ] = "~Is Null" ; }; MenuItem { Identifier = SID_FM_FILTER_IS_NOT_NULL ; - HelpID = SID_FM_FILTER_IS_NOT_NULL ; Text [ en-US ] = "I~s not Null" ; }; }; diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index f19e7f65cb..7ab661c758 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -223,8 +223,7 @@ 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); - // FIXME: HELPID - SetUniqueId(""/*UID_FORMPROPBROWSER_FRAME*/); + SetUniqueId(UID_FORMPROPBROWSER_FRAME); try { diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 68b98eeb2e..52393a6e34 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -592,8 +592,7 @@ namespace svxform ,SfxControllerItem( SID_FM_FMEXPLORER_CONTROL, *_pBindings ) { DBG_CTOR(NavigatorFrame,NULL); - // FIXME: HELPID - SetHelpId( ""/*HID_FORM_NAVIGATOR_WIN*/ ); + SetHelpId( HID_FORM_NAVIGATOR_WIN ); m_pNavigatorTree = new NavigatorTree(comphelper::getProcessServiceFactory(), this ); m_pNavigatorTree->Show(); diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index 218df02f07..92e193e5da 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -29,6 +29,8 @@ #include "fmresids.hrc" #include "fmexpl.hrc" #include "globlmn.hrc" +#include + Menu RID_FMEXPLORER_POPUPMENU { ItemList = @@ -36,7 +38,7 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_NEW ; - HelpID = SID_FM_NEW ; +// HelpId = CMD_SID_FM_NEW ; Text [ en-US ] = "~New" ; SubMenu = Menu { @@ -45,13 +47,13 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_NEW_FORM ; - HelpID = SID_FM_NEW_FORM ; +// HelpId = CMD_SID_FM_NEW_FORM ; Text [ en-US ] = "Form" ; }; MenuItem { Identifier = SID_FM_NEW_HIDDEN ; - HelpID = SID_FM_NEW_HIDDEN ; +// HelpId = CMD_SID_FM_NEW_HIDDEN ; Text [ en-US ] = "Hidden Control" ; }; }; @@ -60,7 +62,7 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_CHANGECONTROLTYPE ; - HelpID = SID_FM_CHANGECONTROLTYPE ; + HelpId = CMD_SID_FM_CHANGECONTROLTYPE ; Text [ en-US ] = "Replace with"; }; MenuItem { ITEM_EDIT_CUT }; @@ -69,37 +71,37 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_DELETE ; - HelpID = SID_FM_DELETE ; +// HelpId = CMD_SID_FM_DELETE ; Text [ en-US ] = "~Delete" ; }; MenuItem { Identifier = SID_FM_TAB_DIALOG ; - HelpID = SID_FM_TAB_DIALOG ; + HelpId = CMD_SID_FM_TAB_DIALOG ; Text [ en-US ] = "Tab Order..." ; }; MenuItem { Identifier = SID_FM_RENAME_OBJECT ; - HelpID = SID_FM_RENAME_OBJECT ; +// HelpId = CMD_SID_FM_RENAME_OBJECT ; Text [ en-US ] = "~Rename" ; }; MenuItem { Identifier = SID_FM_SHOW_PROPERTY_BROWSER ; - HelpID = SID_FM_SHOW_PROPERTY_BROWSER ; + HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ; Text [ en-US ] = "Propert~ies" ; }; MenuItem { Identifier = SID_FM_OPEN_READONLY ; - HelpID = SID_FM_OPEN_READONLY ; + HelpId = CMD_SID_FM_OPEN_READONLY ; Text [ en-US ] = "Open in Design Mode" ; }; MenuItem { Identifier = SID_FM_AUTOCONTROLFOCUS ; - HelpID = SID_FM_AUTOCONTROLFOCUS ; + HelpId = CMD_SID_FM_AUTOCONTROLFOCUS ; Text [ en-US ] = "Automatic Control Focus"; }; }; @@ -112,140 +114,140 @@ Menu RID_FMSHELL_CONVERSIONMENU MenuItem { Identifier = SID_FM_CONVERTTO_EDIT ; - HelpID = SID_FM_CONVERTTO_EDIT ; + HelpId = CMD_SID_FM_CONVERTTO_EDIT ; Command = ".uno:ConvertToEdit" ; Text [ en-US ] = "~Text Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_BUTTON ; - HelpID = SID_FM_CONVERTTO_BUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_BUTTON ; Command = ".uno:ConvertToButton" ; Text [ en-US ] = "~Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FIXEDTEXT ; - HelpID = SID_FM_CONVERTTO_FIXEDTEXT ; + HelpId = CMD_SID_FM_CONVERTTO_FIXEDTEXT ; Command = ".uno:ConvertToFixed" ; Text [ en-US ] = "La~bel field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_GROUPBOX ; - HelpID = SID_FM_CONVERTTO_GROUPBOX ; + HelpId = CMD_SID_FM_CONVERTTO_GROUPBOX ; Command = ".uno:ConvertToGroup" ; Text [ en-US ] = "G~roup Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_LISTBOX ; - HelpID = SID_FM_CONVERTTO_LISTBOX ; + HelpId = CMD_SID_FM_CONVERTTO_LISTBOX ; Command = ".uno:ConvertToList" ; Text [ en-US ] = "L~ist Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_CHECKBOX ; - HelpID = SID_FM_CONVERTTO_CHECKBOX ; + HelpId = CMD_SID_FM_CONVERTTO_CHECKBOX ; Command = ".uno:ConvertToCheckBox" ; Text [ en-US ] = "~Check Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_RADIOBUTTON ; - HelpID = SID_FM_CONVERTTO_RADIOBUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_RADIOBUTTON ; Command = ".uno:ConvertToRadio" ; Text [ en-US ] = "~Radio Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_COMBOBOX ; - HelpID = SID_FM_CONVERTTO_COMBOBOX ; + HelpId = CMD_SID_FM_CONVERTTO_COMBOBOX ; Command = ".uno:ConvertToCombo" ; Text [ en-US ] = "Combo Bo~x"; }; MenuItem { Identifier = SID_FM_CONVERTTO_IMAGEBUTTON ; - HelpID = SID_FM_CONVERTTO_IMAGEBUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_IMAGEBUTTON ; Command = ".uno:ConvertToImageBtn" ; Text [ en-US ] = "I~mage Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FILECONTROL ; - HelpID = SID_FM_CONVERTTO_FILECONTROL ; + HelpId = CMD_SID_FM_CONVERTTO_FILECONTROL ; Command = ".uno:ConvertToFileControl" ; Text [ en-US ] = "~File Selection"; }; MenuItem { Identifier = SID_FM_CONVERTTO_DATE ; - HelpID = SID_FM_CONVERTTO_DATE ; + HelpId = CMD_SID_FM_CONVERTTO_DATE ; Command = ".uno:ConvertToDate" ; Text [ en-US ] = "~Date Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_TIME ; - HelpID = SID_FM_CONVERTTO_TIME ; + HelpId = CMD_SID_FM_CONVERTTO_TIME ; Command = ".uno:ConvertToTime" ; Text [ en-US ] = "Tim~e Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_NUMERIC ; - HelpID = SID_FM_CONVERTTO_NUMERIC ; + HelpId = CMD_SID_FM_CONVERTTO_NUMERIC ; Command = ".uno:ConvertToNumeric" ; Text [ en-US ] = "~Numerical Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_CURRENCY ; - HelpID = SID_FM_CONVERTTO_CURRENCY ; + HelpId = CMD_SID_FM_CONVERTTO_CURRENCY ; Command = ".uno:ConvertToCurrency" ; Text [ en-US ] = "C~urrency Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_PATTERN ; - HelpID = SID_FM_CONVERTTO_PATTERN ; + HelpId = CMD_SID_FM_CONVERTTO_PATTERN ; Command = ".uno:ConvertToPattern" ; Text [ en-US ] = "~Pattern Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_IMAGECONTROL ; - HelpID = SID_FM_CONVERTTO_IMAGECONTROL ; + HelpId = CMD_SID_FM_CONVERTTO_IMAGECONTROL ; Command = ".uno:ConvertToImageControl" ; Text [ en-US ] = "Ima~ge Control"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FORMATTED ; - HelpID = SID_FM_CONVERTTO_FORMATTED ; + HelpId = CMD_SID_FM_CONVERTTO_FORMATTED ; Command = ".uno:ConvertToFormatted" ; Text [ en-US ] = "Fo~rmatted Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_SCROLLBAR ; - HelpID = SID_FM_CONVERTTO_SCROLLBAR ; + HelpId = CMD_SID_FM_CONVERTTO_SCROLLBAR ; Command = ".uno:ConvertToScrollBar" ; Text [ en-US ] = "Scroll bar"; }; MenuItem { Identifier = SID_FM_CONVERTTO_SPINBUTTON; - HelpID = SID_FM_CONVERTTO_SPINBUTTON; + HelpId = CMD_SID_FM_CONVERTTO_SPINBUTTON; Command = ".uno:ConvertToSpinButton" ; Text [ en-US ] = "Spin Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_NAVIGATIONBAR; - HelpID = SID_FM_CONVERTTO_NAVIGATIONBAR; + HelpId = CMD_SID_FM_CONVERTTO_NAVIGATIONBAR; Command = ".uno:ConvertToNavigationBar" ; Text [ en-US ] = "Navigation Bar" ; }; diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src index f92b762b84..4261620d2d 100644 --- a/svx/source/form/formshell.src +++ b/svx/source/form/formshell.src @@ -47,7 +47,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_STYLE; - HelpID = MENU_FM_TEXTATTRIBITES_STYLE; +// HelpID = MENU_FM_TEXTATTRIBITES_STYLE; Text [ en-US ] = "St~yle"; SubMenu = Menu { @@ -96,7 +96,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_ALIGNMENT; - HelpID = MENU_FM_TEXTATTRIBITES_ALIGNMENT; +// HelpID = MENU_FM_TEXTATTRIBITES_ALIGNMENT; Text [ en-US ] = "~Alignment"; RadioCheck = TRUE; SubMenu = Menu @@ -129,7 +129,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_SPACING; - HelpID = MENU_FM_TEXTATTRIBITES_SPACING; +// HelpID = MENU_FM_TEXTATTRIBITES_SPACING; Text [ en-US ] = "~Line Spacing"; _MenuItemFlags = MIB_RADIOCHECK; SubMenu = Menu diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 0f3fd22c38..4e1a0b3f95 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -200,8 +200,7 @@ namespace svxform ,m_bKeyboardCut( sal_False ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NavigatorTree" ); - // FIXME: HELPID - SetHelpId( ""/*HID_FORM_NAVIGATOR*/ ); + 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 035f0603b2..0165212e24 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -104,8 +104,7 @@ FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent ) ,pTabWin( pParent ) { DBG_CTOR(FmFieldWinListBox,NULL); - // FIXME: HELPID - SetHelpId( ""/*HID_FIELD_SEL*/ ); + SetHelpId( HID_FIELD_SEL ); SetHighlightRange( ); } @@ -193,8 +192,7 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _ ,m_pChangeListener(NULL) { DBG_CTOR(FmFieldWin,NULL); - // FIXME: HELPID - SetHelpId( ""/*HID_FIELD_SEL_WIN*/ ); + 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 b68c6fe276..2548b7a901 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -318,8 +318,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) { SvxFmAbsRecWin* pWin = new SvxFmAbsRecWin( pParent, this ); - // FIXME: HELPID - pWin->SetUniqueId( ""/*UID_ABSOLUTE_RECORD_WINDOW*/ ); + pWin->SetUniqueId( UID_ABSOLUTE_RECORD_WINDOW ); return pWin; } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index cdd665472c..adc66750cf 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -152,8 +152,7 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, { StartListening( *mpGallery ); - // FIXME: HELPID - maNewTheme.SetHelpId( ""/*HID_GALLERY_NEWTHEME*/ ); + maNewTheme.SetHelpId( HID_GALLERY_NEWTHEME ); maNewTheme.SetText( String( GAL_RESID( RID_SVXSTR_GALLERY_CREATETHEME ) ) ); maNewTheme.SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) ); @@ -161,8 +160,7 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, if( mpGallery->GetUserURL().GetProtocol() == INET_PROT_NOT_VALID ) maNewTheme.Disable(); - // FIXME: HELPID - mpThemes->SetHelpId( ""/*HID_GALLERY_THEMELIST*/ ); + 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 c427509fa2..20148bcf1d 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -325,14 +325,12 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, maViewBox.InsertItem( TBX_ID_ICON, aDummyImage ); maViewBox.SetItemBits( TBX_ID_ICON, TIB_RADIOCHECK | TIB_AUTOCHECK ); - // FIXME: HELPID - maViewBox.SetHelpId( TBX_ID_ICON, ""/*HID_GALLERY_ICONVIEW*/ ); + 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 ); - // FIXME: HELPID - maViewBox.SetHelpId( TBX_ID_LIST, ""/*HID_GALLERY_LISTVIEW*/ ); + 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 0caea1cfd5..e471f54718 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -61,8 +61,7 @@ GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme ) DragSourceHelper( this ), mpTheme( pTheme ) { - // FIXME: HELPID - SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); + SetHelpId( HID_GALLERY_WINDOW ); InitSettings(); } @@ -74,8 +73,7 @@ GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) : DragSourceHelper( this ), mpTheme( NULL ) { - // FIXME: HELPID - SetHelpId( ""/*HID_GALLERY_PREVIEW*/ ); + SetHelpId( HID_GALLERY_PREVIEW ); InitSettings(); } @@ -311,8 +309,7 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme { EnableFullItemMode( FALSE ); - // FIXME: HELPID - SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); + SetHelpId( HID_GALLERY_WINDOW ); InitSettings(); SetExtraSpacing( 2 ); SetItemWidth( S_THUMB + 6 ); @@ -478,8 +475,7 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme mnCurRow( 0 ), mbInit( FALSE ) { - // FIXME: HELPID - SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); + SetHelpId( HID_GALLERY_WINDOW ); InitSettings(); diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src index 4fe6116fec..dc10111da6 100644 --- a/svx/source/gallery2/gallery.src +++ b/svx/source/gallery2/gallery.src @@ -35,7 +35,7 @@ DockingWindow RID_SVXDLG_GALLERYBROWSER { - HelpId = SID_GALLERY; + HelpId = CMD_SID_GALLERY; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 0e0c43446a..785298fee9 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -57,8 +57,6 @@ SvxInsertStatusBarControl::SvxInsertStatusBarControl( USHORT _nSlotId, SfxStatusBarControl( _nSlotId, _nId, rStb ), bInsert( TRUE ) { - // FIXME: HELPID - rStb.SetHelpId( _nId, ""/*_nSlotId*/ ); } // ----------------------------------------------------------------------- diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 3c91236b5f..338cab3001 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -176,6 +176,10 @@ struct SvxPosSizeStatusBarControl_Impl Images fu"r die Position und Gro"sse laden. */ +#define STR_POSITION ".uno:Position" +#define STR_TABLECELL ".uno:StateTableCell" +#define STR_FUNC ".uno:StatusBarFunc" + SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& rStb ) : @@ -190,9 +194,9 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId, pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) ); pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) ); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Position" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StateTableCell" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StatusBarFunc" ))); + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION ))); // SID_ATTR_POSITION + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL ))); // SID_TABLE_CELL + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC ))); // SID_PSZ_FUNCTION } // ----------------------------------------------------------------------- @@ -233,8 +237,14 @@ 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() ); - // FIXME: HELPID - GetStatusBar().SetHelpId( GetId(), ""/*nSID*/ ); + + switch ( nSID ) + { + case SID_ATTR_POSITION : GetStatusBar().SetHelpId( GetId(), STR_POSITION ); break; + case SID_TABLE_CELL: GetStatusBar().SetHelpId( GetId(), STR_TABLECELL ); break; + case SID_PSZ_FUNCTION: GetStatusBar().SetHelpId( GetId(), STR_FUNC ); break; + default: break; + } if ( nSID == SID_PSZ_FUNCTION ) { diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index e0348b7ac3..b268ba8ea1 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -107,14 +107,8 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl() delete mpImpl; } -void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState ) { - GetStatusBar().SetHelpText( GetId(), String() );// necessary ? - - // FIXME: HELPID - (void)nSID; - GetStatusBar().SetHelpId( GetId(), ""/*nSID*/ ); // necessary ? - if( SFX_ITEM_AVAILABLE != eState ) { mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN; diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 40441c877d..f178395199 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -111,8 +111,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( void ExtrusionDirectionWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_EXTRUSION_DIRECTION*/ ); + SetHelpId( HID_POPUP_EXTRUSION_DIRECTION ); USHORT i; for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) @@ -125,15 +124,12 @@ void ExtrusionDirectionWindow::implInit() // mpProjectionForewarder = new SfxStatusForwarder( SID_EXTRUSION_PROJECTION, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_DIRECTION*/ ); + 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 ); - // FIXME: HELPID - mpDirectionSet->SetHelpId( ""/*HID_VALUESET_EXTRUSION_DIRECTION*/ ); + mpDirectionSet->SetHelpId( HID_VALUESET_EXTRUSION_DIRECTION ); - // FIXME: HELPID - mpDirectionSet->SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); + mpDirectionSet->SetHelpId( HID_POPUP_LINEEND_CTRL ); mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); mpDirectionSet->SetColCount( 3 ); mpDirectionSet->EnableFullItemMode( FALSE ); @@ -505,15 +501,13 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( USHORT nId, void ExtrusionDepthWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_EXTRUSION_DEPTH*/ ); + 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 ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_DEPTH*/ ); + mpMenu->SetHelpId( HID_MENU_EXTRUSION_DEPTH ); mpMenu->SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); @@ -854,8 +848,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( void ExtrusionLightingWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_EXTRUSION_LIGHTING*/ ); + SetHelpId( HID_POPUP_EXTRUSION_LIGHTING ); USHORT i; for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ ) @@ -875,16 +868,13 @@ void ExtrusionLightingWindow::implInit() // mpLightingIntensityForewarder = new SfxStatusForwarder( SID_EXTRUSION_LIGHTING_INTENSITY, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_LIGHTING*/ ); + 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 ); - // FIXME: HELPID - mpLightingSet->SetHelpId( ""/*HID_VALUESET_EXTRUSION_LIGHTING*/ ); + mpLightingSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); - // FIXME: HELPID - mpLightingSet->SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); + mpLightingSet->SetHelpId( HID_POPUP_LINEEND_CTRL ); mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) ); mpLightingSet->SetColCount( 3 ); mpLightingSet->EnableFullItemMode( FALSE ); @@ -1236,16 +1226,14 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( void ExtrusionSurfaceWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_EXTRUSION_SURFACE*/ ); + SetHelpId( HID_POPUP_EXTRUSION_SURFACE ); bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); // mpSurfaceForewarder = new SfxStatusForwarder( SID_EXTRUSION_SURFACE, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_SURFACE*/ ); + 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 d79ae66907..c1d1e979a1 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -504,10 +504,8 @@ Window* SvxFillToolBoxControl::CreateItemWindow( Window *pParent ) pFillAttrLB = (SvxFillAttrBox*)pFillControl->pLbFillAttr; pFillTypeLB = (SvxFillTypeBox*)pFillControl->pLbFillType; - // FIXME: HELPID - pFillAttrLB->SetUniqueId( ""/*HID_FILL_ATTR_LISTBOX*/ ); - // FIXME: HELPID - pFillTypeLB->SetUniqueId( ""/*HID_FILL_TYPE_LISTBOX */); + pFillAttrLB->SetUniqueId( HID_FILL_ATTR_LISTBOX ); + pFillTypeLB->SetUniqueId( HID_FILL_TYPE_LISTBOX ); return pFillControl; } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index d8ca78d6d9..2ea1f2046e 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -361,8 +361,7 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( mxFrame( rFrame ), mbPopupMode( true ) { - // FIXME: HELPID - SetHelpId( ""/*HID_WIN_FONTWORK_ALIGN*/ ); + SetHelpId( HID_WIN_FONTWORK_ALIGN ); implInit(); } @@ -387,21 +386,18 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( mxFrame( rFrame ), mbPopupMode( true ) { - // FIXME: HELPID - SetHelpId( ""/*HID_WIN_FONTWORK_ALIGN*/ ); + SetHelpId( HID_WIN_FONTWORK_ALIGN ); implInit(); } void FontWorkAlignmentWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_FONTWORK_ALIGN*/ ); + SetHelpId( HID_POPUP_FONTWORK_ALIGN ); bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_POPUP_FONTWORK_ALIGN*/ ); + mpMenu->SetHelpId( HID_POPUP_FONTWORK_ALIGN ); mpMenu->SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 ); @@ -614,8 +610,7 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( mxFrame( rFrame ), mbPopupMode( true ) { - // FIXME: HELPID - SetHelpId( ""/*HID_WIN_FONTWORK_CHARSPACE*/ ); + SetHelpId( HID_WIN_FONTWORK_CHARSPACE ); implInit(); } @@ -631,21 +626,18 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( mxFrame( rFrame ), mbPopupMode( true ) { - // FIXME: HELPID - SetHelpId( ""/*HID_WIN_FONTWORK_CHARSPACE*/ ); + SetHelpId( HID_WIN_FONTWORK_CHARSPACE ); implInit(); } void FontWorkCharacterSpacingWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_FONTWORK_CHARSPACE*/ ); + SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); // bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_POPUP_FONTWORK_CHARSPACE*/ ); + 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 ccd7a584ab..2ba5e0c732 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -316,7 +316,7 @@ public: // ----------------------------------------------------------------------------- -ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : +ImplGrafControl::ImplGrafControl( Window* pParent, USHORT, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : Control( pParent, WB_TABSTOP ), maImage ( this ), maField ( this, rCmd, rFrame ) @@ -353,9 +353,6 @@ ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OU maImage.Show(); - // FIXME: HELPID - (void)nSlotId; - // 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 b8fd95df59..f3a21c1ff6 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -423,10 +423,8 @@ void SvxLineEndWindow::implInit() SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = NULL; - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_LINEEND*/ ); - // FIXME: HELPID - aLineEndSet.SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); + SetHelpId( HID_POPUP_LINEEND ); + aLineEndSet.SetHelpId( HID_POPUP_LINEEND_CTRL ); if ( pDocSh ) { diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk index 47da008e87..8abfa24938 100644 --- a/svx/source/tbxctrls/makefile.mk +++ b/svx/source/tbxctrls/makefile.mk @@ -74,7 +74,6 @@ SRC1FILES = \ lboxctrl.src \ linectrl.src \ tbcontrl.src \ - tbxdraw.src \ grafctrl.src # --- Targets ------------------------------------------------------- diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index b0bdbcdcc7..db1c5424ef 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -905,10 +905,8 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, lcl_CalcSizeValueSet( *this, aColorSet, aSize12 ); - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_COLOR*/ ); - // FIXME: HELPID - aColorSet.SetHelpId( ""/*HID_POPUP_COLOR_CTRL*/ ); + SetHelpId( HID_POPUP_COLOR ); + aColorSet.SetHelpId( HID_POPUP_COLOR_CTRL ); SetText( rWndTitle ); aColorSet.Show(); @@ -1092,8 +1090,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& lcl_CalcSizeValueSet( *this, aFrameSet,Size( 20, 20 )); - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_FRAME*/ ); + SetHelpId( HID_POPUP_FRAME ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME) ); aFrameSet.Show(); } @@ -1353,8 +1350,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r lcl_CalcSizeValueSet( *this, aLineSet, aBmpSize ); - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_LINE*/ ); + SetHelpId( HID_POPUP_LINE ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME_STYLE) ); aLineSet.Show(); } diff --git a/svx/source/tbxctrls/tbxdraw.src b/svx/source/tbxctrls/tbxdraw.src deleted file mode 100644 index e4c7c1d296..0000000000 --- a/svx/source/tbxctrls/tbxdraw.src +++ /dev/null @@ -1,265 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - // include --------------------------------------------------------------- -#include "tbxdraw.hrc" -#include -#include "helpid.hrc" -#include - // pragma ---------------------------------------------------------------- - - // ----------------------------------------------------------------------- -#define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; } -FloatingWindow RID_SVXTBX_DRAW -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpID = HID_DRAWTOOL_TBX ; - ToolBox TBX_DRAW - { - HelpId = HID_SVXTBX_DRAW ; - SVLook = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_OBJECT_SELECT ; - HelpID = SID_OBJECT_SELECT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Selection" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_LINE ; - HelpID = SID_DRAW_LINE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Line" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_RECT ; - HelpID = SID_DRAW_RECT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Rectangle" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_ELLIPSE ; - HelpID = SID_DRAW_ELLIPSE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Ellipse" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_POLYGON_NOFILL ; - HelpID = SID_DRAW_POLYGON_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Polygon" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_BEZIER_NOFILL ; - HelpID = SID_DRAW_BEZIER_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Curve"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_FREELINE_NOFILL ; - HelpID = SID_DRAW_FREELINE_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Freeform Line"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_ARC ; - HelpID = SID_DRAW_ARC ; - RadioCheck = TRUE ; - Text [ en-US ] = "Arc" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_PIE ; - HelpID = SID_DRAW_PIE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Ellipse Pie" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CIRCLECUT ; - HelpID = SID_DRAW_CIRCLECUT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Circle Segment" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT ; - HelpID = SID_DRAW_TEXT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Text" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT_VERTICAL ; - HelpID = SID_DRAW_TEXT_VERTICAL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Text"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT_MARQUEE ; - HelpID = SID_DRAW_TEXT_MARQUEE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Text Animation" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION ; - HelpID = SID_DRAW_CAPTION ; - RadioCheck = TRUE ; - Text [ en-US ] = "Callouts" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION_VERTICAL ; - HelpID = SID_DRAW_CAPTION_VERTICAL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Callout"; - }; - }; - }; - Text [ en-US ] = "Draw Functions" ; -}; -FloatingWindow RID_SVXTBX_ALIGNMENT -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - HelpID = HID_ALIGN_TBX ; - SVLook = TRUE ; - Text [ en-US ] = "Alignment" ; - ToolBox TBX_ALIGNMENT - { - HelpId = HID_SVXTBX_ALIGNMENT ; - SVLook = TRUE ; - HelpID = SID_OBJECT_ALIGN ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_LEFT ; - HelpID = SID_OBJECT_ALIGN_LEFT ; - Text [ en-US ] = "Left" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_CENTER ; - HelpID = SID_OBJECT_ALIGN_CENTER ; - Text [ en-US ] = "Center" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_RIGHT ; - HelpID = SID_OBJECT_ALIGN_RIGHT ; - Text [ en-US ] = "Right" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_UP ; - HelpID = SID_OBJECT_ALIGN_UP ; - Text [ en-US ] = "Top" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_MIDDLE ; - HelpID = SID_OBJECT_ALIGN_MIDDLE ; - Text [ en-US ] = "Centered" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_DOWN ; - HelpID = SID_OBJECT_ALIGN_DOWN ; - Text [ en-US ] = "Bottom" ; - }; - }; - }; -}; - // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/toolbars/extrusionbar.src b/svx/source/toolbars/extrusionbar.src index 3e6c6ad7e5..dd6f3066a5 100644 --- a/svx/source/toolbars/extrusionbar.src +++ b/svx/source/toolbars/extrusionbar.src @@ -1,65 +1,6 @@ #include #include -ToolBox RID_SVX_EXTRUSION_BAR -{ - HelpId = RID_SVX_EXTRUSION_BAR ; - Align = BOXALIGN_BOTTOM ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_EXTRUSION_TOOGLE ; - HelpID = SID_EXTRUSION_TOOGLE ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_DOWN ; - HelpID = SID_EXTRUSION_TILT_DOWN ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_UP ; - HelpID = SID_EXTRUSION_TILT_UP ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_LEFT ; - HelpID = SID_EXTRUSION_TILT_LEFT ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_RIGHT ; - HelpID = SID_EXTRUSION_TILT_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_DEPTH_FLOATER ; - HelpID = SID_EXTRUSION_DEPTH_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_DIRECTION_FLOATER ; - HelpID = SID_EXTRUSION_DIRECTION_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_LIGHTING_FLOATER ; - HelpID = SID_EXTRUSION_LIGHTING_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_SURFACE_FLOATER ; - HelpID = SID_EXTRUSION_SURFACE_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_3D_COLOR ; - HelpID = SID_EXTRUSION_3D_COLOR ; - }; - }; -}; - String RID_SVX_EXTRUSION_BAR { Text [ en-US ] = "Extrusion"; diff --git a/svx/source/toolbars/fontworkbar.src b/svx/source/toolbars/fontworkbar.src index ed9b152fe4..a3a686b51a 100644 --- a/svx/source/toolbars/fontworkbar.src +++ b/svx/source/toolbars/fontworkbar.src @@ -27,40 +27,6 @@ #include -ToolBox RID_SVX_FONTWORK_BAR -{ - HelpId = RID_SVX_FONTWORK_BAR ; - Align = BOXALIGN_BOTTOM ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_FONTWORK_GALLERY_FLOATER ; - HelpID = SID_FONTWORK_GALLERY_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_SHAPE_TYPE ; - HelpID = SID_FONTWORK_SHAPE_TYPE ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_SAME_LETTER_HEIGHTS ; - HelpID = SID_FONTWORK_SAME_LETTER_HEIGHTS ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_ALIGNMENT_FLOATER ; - HelpID = SID_FONTWORK_ALIGNMENT_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_CHARACTER_SPACING_FLOATER ; - HelpID = SID_FONTWORK_CHARACTER_SPACING_FLOATER ; - }; - }; -}; - String RID_SVX_FONTWORK_BAR { Text [ en-US ] = "Fontwork"; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 8ce287900c..7ccf3b4daf 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -485,18 +485,13 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) { FreeResource(); - // 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_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_aCB_Reverse.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_CB_REVERSE*/ ); + m_aCB_Reverse.SetHelpId( HID_SVX_CHINESE_DICTIONARY_CB_REVERSE ); - // 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*/ ); + m_aCT_DictionaryToSimplified.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED ); + m_aCT_DictionaryToTraditional.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL ); SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); @@ -583,8 +578,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) m_pHeaderBar = m_aCT_DictionaryToSimplified.createHeaderBar( aColumn1, aColumn2, aColumn3, nWidth1, nWidth2, nWidth3 ); if(m_pHeaderBar) - // FIXME: HELPID - m_pHeaderBar->SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_HEADER*/ ); + 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 85cd9550eb..401242860a 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -72,12 +72,9 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) { FreeResource(); - // 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*/ ); + 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 ); SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index d7b8ae15d7..5da9027e6a 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -167,20 +167,17 @@ #define ERRCODE_UUI_SSLWARN_INVALID_1 (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 1) #define TITLE_UUI_SSLWARN_INVALID (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 3) -#define HID_DLG_LOGIN (HID_UUI_START + 0) -#define HID_DLG_COOKIES (HID_UUI_START + 1) -#define HID_DLG_MASTERPASSWORD_UUI (HID_UUI_START+2) -#define HID_DLG_MASTERPASSWORD_CRT (HID_UUI_START+3) -#define HID_DLG_FILTER_SELECT (HID_UUI_START+4) -#define HID_DLG_PASSWORD_UUI (HID_UUI_START+5) -#define HID_DLG_PASSWORD_CRT (HID_UUI_START+6) -#define HID_DLG_UNKNOWNAUTH_UUI (HID_UUI_START+7) -#define HID_DLG_SSLWARN_UUI (HID_UUI_START+8) -#define HID_XMLSECDLG_MACROWARN (HID_UUI_START+9) -#define HID_DLG_NEWERVERSIONWARNING (HID_UUI_START+10) - -// HID_UUI_END (aka HID_CHAOS_NEW_DATABASE) is reserved in -// sfx2/util/hidother.src +#define HID_DLG_LOGIN "UUI_HID_DLG_LOGIN" +#define HID_DLG_COOKIES "UUI_HID_DLG_COOKIES" +#define HID_DLG_MASTERPASSWORD_UUI "UUI_HID_DLG_MASTERPASSWORD_UUI" +#define HID_DLG_MASTERPASSWORD_CRT "UUI_HID_DLG_MASTERPASSWORD_CRT" +#define HID_DLG_FILTER_SELECT "UUI_HID_DLG_FILTER_SELECT" +#define HID_DLG_PASSWORD_UUI "UUI_HID_DLG_PASSWORD_UUI" +#define HID_DLG_PASSWORD_CRT "UUI_HID_DLG_PASSWORD_CRT" +#define HID_DLG_UNKNOWNAUTH_UUI "UUI_HID_DLG_UNKNOWNAUTH_UUI" +#define HID_DLG_SSLWARN_UUI "UUI_HID_DLG_SSLWARN_UUI" +#define HID_XMLSECDLG_MACROWARN "UUI_HID_XMLSECDLG_MACROWARN" +#define HID_DLG_NEWERVERSIONWARNING "UUI_HID_DLG_NEWERVERSIONWARNING" #endif // UUI_IDS_HRC -- cgit v1.2.3 From 8e5c3a6bf266168f1066ef57526734011be54072 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- avmedia/inc/helpids.hrc | 2 -- desktop/source/inc/helpid.hrc | 2 -- editeng/inc/helpid.hrc | 5 ----- formula/inc/helpids.hrc | 4 ---- formula/util/hidother.src | 4 ---- framework/inc/helpid.hrc | 6 ------ sfx2/source/inc/helpid.hrc | 1 - sfx2/util/hidother.src | 41 ----------------------------------------- svx/inc/fmhelp.hrc | 3 --- svx/inc/helpid.hrc | 3 --- svx/inc/svx/exthelpid.hrc | 4 ---- svx/util/hidother.src | 5 ----- 12 files changed, 80 deletions(-) (limited to 'editeng') diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc index 753852047b..a16eaa6ce9 100644 --- a/avmedia/inc/helpids.hrc +++ b/avmedia/inc/helpids.hrc @@ -28,8 +28,6 @@ #ifndef _AVMEDIA_HELPIDS_HRC #define _AVMEDIA_HELPIDS_HRC -#include - #define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY" #define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE" #define HID_AVMEDIA_TOOLBOXITEM_STOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP" diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 30439b5362..facdc1f410 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -28,8 +28,6 @@ #if ! defined INCLUDED_DESKTOP_HELPID_HRC #define INCLUDED_DESKTOP_HELPID_HRC -#include "svl/solar.hrc" - #define HID_PACKAGE_MANAGER "DESKTOP_HID_PACKAGE_MANAGER" #define HID_PACKAGE_MANAGER_TREELISTBOX "DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX" #define HID_PACKAGE_MANAGER_PROGRESS "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS" diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc index 2bce731ad2..5eef98a021 100644 --- a/editeng/inc/helpid.hrc +++ b/editeng/inc/helpid.hrc @@ -30,11 +30,6 @@ #ifndef _EDITENG_HELPID_HRC #define _EDITENG_HELPID_HRC -// include --------------------------------------------------------------- - -#include - -// Help-Ids -------------------------------------------------------------- #define HID_EDITENG_SPELLER_WORDLANGUAGE "EDITENG_HID_EDITENG_SPELLER_WORDLANGUAGE" #define HID_EDITENG_SPELLER_PARALANGUAGE "EDITENG_HID_EDITENG_SPELLER_PARALANGUAGE" #define HID_EDITENG_SPELLER_ADDWORD "EDITENG_HID_EDITENG_SPELLER_ADDWORD" diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc index dcb1f7d1be..c2f6903517 100644 --- a/formula/inc/helpids.hrc +++ b/formula/inc/helpids.hrc @@ -27,10 +27,6 @@ #ifndef FORMULA_HELPID_HRC #define FORMULA_HELPID_HRC -#ifndef _SOLAR_HRC -#include // HID_FORMULA_START -#endif - #define HID_FORMULADLG_FORMULA "FORMULA_HID_FORMULADLG_FORMULA" #define HID_FORMULA_FAP_FORMULA "FORMULA_HID_FORMULA_FAP_FORMULA" #define HID_FORMULA_FAP_STRUCT "FORMULA_HID_FORMULA_FAP_STRUCT" diff --git a/formula/util/hidother.src b/formula/util/hidother.src index 8f56afa1cd..a6d3111b5b 100644 --- a/formula/util/hidother.src +++ b/formula/util/hidother.src @@ -27,10 +27,6 @@ #include "../inc/helpids.hrc" -#ifndef _SBASLTID_HRC -#include -#endif - hidspecial HID_FORMULADLG_FORMULA { HelpId = HID_FORMULADLG_FORMULA; }; hidspecial HID_FORMULA_FAP_FORMULA { HelpId = HID_FORMULA_FAP_FORMULA; }; hidspecial HID_FORMULA_FAP_STRUCT { HelpId = HID_FORMULA_FAP_STRUCT; }; diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc index 42476b240a..a092a83a10 100644 --- a/framework/inc/helpid.hrc +++ b/framework/inc/helpid.hrc @@ -27,12 +27,6 @@ #ifndef _FRAMEWORK_HELPID_HRC #define _FRAMEWORK_HELPID_HRC -// include ------------------------------------------------------------------ - -#include - -// Help-Ids ----------------------------------------------------------------- - #define HID_BACKINGWINDOW "FWK_HID_BACKINGWINDOW" #define HID_LICENSEDIALOG "FWK_HID_LICENSEDIALOG" #define HID_STATUSBAR "FWK_HID_STATUSBAR" diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index 18449a2fa3..d47f6781fd 100755 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -29,7 +29,6 @@ // include ------------------------------------------------------------------ -#include #include // Help-Ids ----------------------------------------------------------------- diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src index d379a863fc..80f40fcd9c 100644 --- a/sfx2/util/hidother.src +++ b/sfx2/util/hidother.src @@ -26,9 +26,6 @@ ************************************************************************/ #include "../source/inc/helpid.hrc" // HID_XXX -#include "../inc/sfx2/sfxsids.hrc" // SID_XXX -#include "../inc/sfx2/sfx.hrc" - hidspecial HID_APP_WIN { HelpID = HID_APP_WIN; }; hidspecial HID_DESKTOP { HelpID = HID_DESKTOP; }; @@ -40,27 +37,15 @@ hidspecial HID_FILEDLG_READ_ONLY { HelpID = HID_FILEDLG_READ_ONLY; }; hidspecial HID_FILEDLG_STANDARD { HelpID = HID_FILEDLG_STANDARD; }; hidspecial HID_FILEDLG_URL { HelpID = HID_FILEDLG_URL; }; hidspecial HID_FILEDLG_USE_PASSWD { HelpID = HID_FILEDLG_USE_PASSWD; }; -hidspecial HID_INTERFACE_SFXMAILVIEW { HelpID = HID_INTERFACE_SFXMAILVIEW; }; -hidspecial HID_INTERFACE_SFXEXPLVIEWSH { HelpID = HID_INTERFACE_SFXEXPLVIEWSH; }; -hidspecial HID_INTERFACE_SFXFRAMESETVIEW { HelpID = HID_INTERFACE_SFXFRAMESETVIEW; }; -hidspecial HID_INTERFACE_SFXFRAMESETSOURCEVIEW { HelpID = HID_INTERFACE_SFXFRAMESETSOURCEVIEW; }; -hidspecial HID_INTERFACE_SFXHELP_VIEWSH { HelpID = HID_INTERFACE_SFXHELP_VIEWSH; }; hidspecial HID_PREVIEW_FRAME { HelpID = HID_PREVIEW_FRAME; }; hidspecial HID_PRINT_OPTIONS { HelpID = HID_PRINT_OPTIONS; }; hidspecial HID_TEMPLATE_FILTER { HelpID = HID_TEMPLATE_FILTER; }; hidspecial HID_TEMPLATE_FMT { HelpID = HID_TEMPLATE_FMT; }; hidspecial HID_SEARCH_DLG_TABLB { HelpID = HID_SEARCH_DLG_TABLB; }; -hidspecial SID_STYLE_FAMILY1 { HelpID = SID_STYLE_FAMILY1; }; -hidspecial SID_STYLE_FAMILY2 { HelpID = SID_STYLE_FAMILY2; }; -hidspecial SID_STYLE_FAMILY3 { HelpID = SID_STYLE_FAMILY3; }; -hidspecial SID_STYLE_FAMILY4 { HelpID = SID_STYLE_FAMILY4; }; -hidspecial SID_STYLE_FAMILY5 { HelpID = SID_STYLE_FAMILY5; }; -hidspecial SID_FILTER_NAME { HelpID = SID_FILTER_NAME; }; hidspecial HID_NAVIGATOR_WINDOW { HelpID = HID_NAVIGATOR_WINDOW; }; hidspecial HID_HELPAGENT_TIP_BOX { HelpId = HID_HELPAGENT_TIP_BOX; }; hidspecial HID_TEMPLDLG_TOOLBOX_LEFT { HelpId = HID_TEMPLDLG_TOOLBOX_LEFT;}; hidspecial HID_EXPLORER_SRCH_COUNT { HelpId = HID_EXPLORER_SRCH_COUNT;}; -hidspecial HID_INTERFACE_SFXPLUGINVIEW { HelpID = HID_INTERFACE_SFXPLUGINVIEW; }; hidspecial HID_TABDLG_RESET_BTN { HelpID = HID_TABDLG_RESET_BTN; }; hidspecial HID_TABDLG_STANDARD_BTN { HelpID = HID_TABDLG_STANDARD_BTN; }; hidspecial HID_CONFIG_EVENT_OFFICE_BASED { HelpID = HID_CONFIG_EVENT_OFFICE_BASED; }; @@ -70,35 +55,10 @@ hidspecial HID_EXPLORERMENU_ARRANGEICONS { HelpID = HID_EXPLORERMENU_ARRANGEICO hidspecial HID_EXPLORERMENU_STDTEMPLATE { HelpID = HID_EXPLORERMENU_STDTEMPLATE; }; hidspecial HID_EXPLORER_DOCVIEW_ICON { HelpID = HID_EXPLORER_DOCVIEW_ICON; }; hidspecial HID_EXPLORER_DOCVIEW_DETAILS { HelpID = HID_EXPLORER_DOCVIEW_DETAILS; }; -hidspecial HID_CHAOSDOC_WIN { HelpID = HID_CHAOSDOC_WIN; }; -hidspecial HID_CHAOSDOC_WIN_HEADER { HelpID = HID_CHAOSDOC_WIN_HEADER; }; -hidspecial HID_CHAOSDOC_WIN_PARTS { HelpID = HID_CHAOSDOC_WIN_PARTS; }; -hidspecial HID_CHAOSDOC_WIN_BODY { HelpID = HID_CHAOSDOC_WIN_BODY; }; hidspecial HID_BRWBOX_HEADERBAR { HelpID = HID_BRWBOX_HEADERBAR; }; hidspecial HID_TASKBAR { HelpID = HID_TASKBAR; }; hidspecial HID_TASKBUTTONBAR { HelpID = HID_TASKBUTTONBAR; }; hidspecial HID_TASKTOOLBAR { HelpID = HID_TASKTOOLBAR; }; -hidspecial HID_CHAOS_NEW_IMAP_BOX { HelpID = HID_CHAOS_NEW_IMAP_BOX; }; -hidspecial HID_CHAOS_NEW_IMAP_MSG { HelpID = HID_CHAOS_NEW_IMAP_MSG; }; -hidspecial HID_CHAOS_NEW_IMAP_FLD { HelpID = HID_CHAOS_NEW_IMAP_FLD; }; -hidspecial HID_CHAOS_NEW_NEWS_BOX { HelpID = HID_CHAOS_NEW_NEWS_BOX; }; -hidspecial HID_CHAOS_NEW_NEWS_MSG { HelpID = HID_CHAOS_NEW_NEWS_MSG; }; -hidspecial HID_CHAOS_NEW_IMAP_BOX { HelpID = HID_CHAOS_NEW_IMAP_BOX; }; -hidspecial HID_CHAOS_NEW_FSYS_FLD { HelpID = HID_CHAOS_NEW_FSYS_FLD; }; -hidspecial HID_CHAOS_NEW_FSYS_LNK { HelpID = HID_CHAOS_NEW_FSYS_LNK; }; -hidspecial HID_CHAOS_NEW_FTP_BOX { HelpID = HID_CHAOS_NEW_FTP_BOX; }; -hidspecial HID_CHAOS_NEW_FTP_FLD { HelpID = HID_CHAOS_NEW_FTP_FLD; }; -hidspecial HID_CHAOS_NEW_OUT_BOX { HelpID = HID_CHAOS_NEW_OUT_BOX; }; -hidspecial HID_CHAOS_NEW_OUT_MSG { HelpID = HID_CHAOS_NEW_OUT_MSG; }; -hidspecial HID_CHAOS_NEW_POP3_BOX { HelpID = HID_CHAOS_NEW_POP3_BOX; }; -hidspecial HID_CHAOS_NEW_POP3_MSG { HelpID = HID_CHAOS_NEW_POP3_MSG; }; -hidspecial HID_CHAOS_NEW_SEARCH { HelpID = HID_CHAOS_NEW_SEARCH; }; -hidspecial HID_CHAOS_NEW_VIM_BOX { HelpID = HID_CHAOS_NEW_VIM_BOX; }; -hidspecial HID_CHAOS_NEW_VIM_MSG { HelpID = HID_CHAOS_NEW_VIM_MSG; }; -hidspecial HID_CHAOS_NEW_SUBSCR_BOX { HelpID = HID_CHAOS_NEW_SUBSCR_BOX; }; -hidspecial HID_CHAOS_NEW_BOOKMARK { HelpID = HID_CHAOS_NEW_BOOKMARK; }; -hidspecial HID_CHAOS_NEW_PUB_BOX { HelpID = HID_CHAOS_NEW_PUB_BOX; }; -hidspecial HID_UUI_END { HelpID = HID_UUI_END; }; // aka HID_CHAOS_NEW_DATABASE hidspecial HID_CNT_DLG_SEARCH_BT_SHOW { HelpID = HID_CNT_DLG_SEARCH_BT_SHOW; }; hidspecial HID_CNT_DLG_SEARCH_BT_UPDATE { HelpID = HID_CNT_DLG_SEARCH_BT_UPDATE; }; hidspecial HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE { HelpID = HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE; }; @@ -107,7 +67,6 @@ hidspecial HID_CNT_PAGE_HEADER { HelpID = HID_CNT_PAGE_HEADER; }; hidspecial HID_CNT_PAGE_DESCRIPTION { HelpID = HID_CNT_PAGE_DESCRIPTION; }; hidspecial HID_CNT_LB_HEADER { HelpID = HID_CNT_LB_HEADER; }; hidspecial HID_CNT_LB_DESCRIPTION { HelpID = HID_CNT_LB_DESCRIPTION; }; -hidspecial SID_GROUPVIEW { HelpID = SID_GROUPVIEW; }; hidspecial HID_GROUPVIEW_CONTENT_BIG { HelpID = HID_GROUPVIEW_CONTENT_BIG; }; hidspecial HID_GROUPVIEW_CONTENT_SMALL { HelpID = HID_GROUPVIEW_CONTENT_SMALL; }; hidspecial HID_GROUPVIEW_CONTENT_TREE { HelpID = HID_GROUPVIEW_CONTENT_TREE; }; diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 75a24b0f33..282a175af6 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -27,9 +27,6 @@ #ifndef _SVX_FMHELP_HRC #define _SVX_FMHELP_HRC -// include ----------------------------------------------------------- -#include - // Help-Ids -------------------------------------------------------------- #define HID_DLG_DBMSG "SVX_HID_DLG_DBMSG" #define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR" diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 3e17ee9511..fcab99591f 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -26,9 +26,6 @@ ************************************************************************/ #ifndef _SVX_HELPID_HRC #define _SVX_HELPID_HRC -// include --------------------------------------------------------------- - -#include #include #include diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc index 42a303dba4..828ed6c124 100644 --- a/svx/inc/svx/exthelpid.hrc +++ b/svx/inc/svx/exthelpid.hrc @@ -28,8 +28,6 @@ #define _SVX_EXTHELPID_HRC // include --------------------------------------------------------------- -#include - // these HIDs are used in SVX and also in other modules, mainly CUI // the reason is that different controls have the same help texts assigned // but are implemented in different libraries @@ -40,7 +38,5 @@ #define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE" #define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE" -// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here! - #endif diff --git a/svx/util/hidother.src b/svx/util/hidother.src index f00cb22137..a0be09063f 100644 --- a/svx/util/hidother.src +++ b/svx/util/hidother.src @@ -25,8 +25,6 @@ * ************************************************************************/ #include "../inc/helpid.hrc" // HID_XXX -#include "hidother.hrc" -#include #include "../inc/fmhelp.hrc" /* #define HID_AUTOCORR_HELP_CHGNONBRKSPACE HID_AUTOCORR_HELP_START+20 */ @@ -54,7 +52,6 @@ hidspecial HID_GRID_TRAVEL_LAST { HelpID = HID_GRID_TRAVEL_LAST ;}; hidspecial HID_GRID_TRAVEL_NEW { HelpID = HID_GRID_TRAVEL_NEW ;}; hidspecial HID_GRID_TRAVEL_NEXT { HelpID = HID_GRID_TRAVEL_NEXT ;}; hidspecial HID_GRID_TRAVEL_PREV { HelpID = HID_GRID_TRAVEL_PREV ;}; -hidspecial HID_INTERFACE_BASIDE_VIEWSH { HelpID = HID_INTERFACE_BASIDE_VIEWSH; }; hidspecial HID_POPUP_COLOR { HelpID = HID_POPUP_COLOR; }; hidspecial HID_POPUP_COLOR_CTRL { HelpID = HID_POPUP_COLOR_CTRL; }; hidspecial HID_POPUP_FRAME { HelpID = HID_POPUP_FRAME; }; @@ -74,6 +71,4 @@ hidspecial HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL { HelpId = HI hidspecial HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS { HelpId = HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS; }; hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED; }; hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL; }; -hidspecial SID_DSBROWSER_EXPLORER { HelpID = SID_DSBROWSER_EXPLORER ;}; -hidspecial SID_GALLERY_IMPORTTHEME { HelpID = SID_GALLERY_IMPORTTHEME; }; hidspecial UID_FORMPROPBROWSER_FRAME { HelpID = UID_FORMPROPBROWSER_FRAME ;}; -- cgit v1.2.3 From 61fadc68d4b04b7cfdeaaa780c48bf2617f9efa6 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Jul 2010 14:50:49 +0200 Subject: CWS changehid: #i111784#: consolidate usage of HID schema; remove unused SetDialogHelpId methods --- editeng/inc/pch/precompiled_editeng.hxx | 1 - fpicker/source/office/OfficeControlAccess.cxx | 22 +++++++++++++--------- sfx2/inc/pch/precompiled_sfx2.hxx | 1 - sfx2/inc/sfx2/filedlghelper.hxx | 1 - sfx2/inc/sfx2/opengrf.hxx | 3 --- sfx2/source/appl/opengrf.cxx | 5 +---- sfx2/source/dialog/filedlghelper.cxx | 18 ++---------------- sfx2/source/dialog/filedlgimpl.hxx | 1 - sfx2/source/dialog/taskpane.cxx | 11 ++++++----- svx/inc/pch/precompiled_svx.hxx | 1 - svx/inc/pfiledlg.hxx | 2 -- svx/source/dialog/docrecovery.cxx | 1 - svx/source/dialog/pfiledlg.cxx | 5 ----- svx/source/fmcomp/fmgridif.cxx | 10 +++++----- 14 files changed, 27 insertions(+), 55 deletions(-) (limited to 'editeng') diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index d82ecc6cb6..9d432f73a7 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -739,7 +739,6 @@ #include "svtools/parhtml.hxx" #include "svtools/parrtf.hxx" #include "unotools/pathoptions.hxx" -#include "svl/pickerhelper.hxx" #include "svl/poolitem.hxx" #include "unotools/printwarningoptions.hxx" #include "svl/ptitem.hxx" diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 263248bada..a7f9aeebf8 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -33,9 +33,8 @@ #include #include #include -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HPP_ #include -#endif +#include #include #include @@ -201,14 +200,15 @@ namespace svt } //--------------------------------------------------------------------- - void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& _rURL, sal_Bool _bFileView ) + void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& sHelpURL, sal_Bool _bFileView ) { - String sHelpURL( _rURL ); - if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) ) - sHelpURL = sHelpURL.Copy( sizeof( "HID:" ) - 1 ); + rtl::OUString sHelpID( sHelpURL ); + INetURLObject aHID( sHelpURL ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + sHelpID = aHID.GetURLPath(); // URLs should always be UTF8 encoded and escaped - rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); + rtl::OString sID( rtl::OUStringToOString( sHelpID, RTL_TEXTENCODING_UTF8 ) ); if ( _bFileView ) // the file view "overloaded" the SetHelpId static_cast< SvtFileView* >( _pControl )->SetHelpId( sID ); @@ -224,8 +224,12 @@ namespace svt // the file view "overloaded" the SetHelpId aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( ); - ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - sHelpURL += rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ); + ::rtl::OUString sHelpURL; + ::rtl::OUString aTmp( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) ); + INetURLObject aHID( aTmp ); + if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) + sHelpURL = rtl::OUString::createFromAscii( INET_HID_SCHEME ); + sHelpURL += aTmp; return sHelpURL; } diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 2fa36042db..4463b0003e 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -543,7 +543,6 @@ #include "svl/ownlist.hxx" #include "svtools/parhtml.hxx" #include "unotools/pathoptions.hxx" -#include "svl/pickerhelper.hxx" #include "svl/poolitem.hxx" #include "svtools/printoptions.hxx" #include "unotools/printwarningoptions.hxx" diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index 963db8a73c..bdb53a17a1 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -282,7 +282,6 @@ public: a corresponding element herein. */ void SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); - void SetDialogHelpId( const rtl::OString& _nHelpId ); void CreateMatcher( const String& rName ); /** sets the context of the dialog and trigger necessary actions e.g. loading config, setting help id diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx index 02503e64cd..09f6752a27 100644 --- a/sfx2/inc/sfx2/opengrf.hxx +++ b/sfx2/inc/sfx2/opengrf.hxx @@ -54,10 +54,7 @@ public: String GetCurrentFilter() const; void SetCurrentFilter(const String&); - /// Set dialog help id at FileDlgHelper void SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId ); - /// Set control help ids at FileDlgHelper - void SetDialogHelpId( const rtl::OString& _rHelpId ); private: // disable copy and assignment SFX2_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&); diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 904cd41072..0d18659ec6 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -289,7 +289,4 @@ void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const ch mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId ); } -void SvxOpenGraphicDialog::SetDialogHelpId( const rtl::OString& _nHelpId ) -{ - mpImpl->aFileDlg.SetDialogHelpId( _nHelpId ); -} + diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index e8f17c7a62..b5a89bf4f4 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1213,13 +1213,14 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con // forward these ids to the file picker try { - const ::rtl::OUString sHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); + const ::rtl::OUString sHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME ) ); // the ids for the single controls uno::Reference< XFilePickerControlAccess > xControlAccess( mxFileDlg, UNO_QUERY ); if ( xControlAccess.is() ) { while ( *_pControlId ) { + DBG_ASSERT( INetURLObject( rtl::OStringToOUString( *_pHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); ::rtl::OUString sId( sHelpIdPrefix ); sId += ::rtl::OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 ); xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, makeAny( sId ) ); @@ -1234,12 +1235,6 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con } } -// ------------------------------------------------------------------------ -void FileDialogHelper_Impl::setDialogHelpId( const rtl::OString& _nHelpId ) -{ - svt::SetDialogHelpId( mxFileDlg, _nHelpId ); -} - // ------------------------------------------------------------------------ IMPL_LINK( FileDialogHelper_Impl, InitControls, void*, NOTINTERESTEDIN ) { @@ -2344,9 +2339,6 @@ void FileDialogHelper_Impl::SetContext( FileDialogHelper::Context _eNewContext ) const OUString* pConfigId = GetLastFilterConfigId( _eNewContext ); if( pConfigId ) LoadLastUsedFilter( *pConfigId ); - -// if( nNewHelpId ) -// this->setDialogHelpId( nNewHelpId ); } // ------------------------------------------------------------------------ @@ -2497,12 +2489,6 @@ void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const ch mpImp->setControlHelpIds( _pControlId, _pHelpId ); } -// ------------------------------------------------------------------------ -void FileDialogHelper::SetDialogHelpId( const rtl::OString& _nHelpId ) -{ - mpImp->setDialogHelpId( _nHelpId ); -} - void FileDialogHelper::SetContext( Context _eNewContext ) { mpImp->SetContext( _eNewContext ); diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 5ea1ecfab9..e2d2bfbf40 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -143,7 +143,6 @@ namespace sfx2 void correctVirtualDialogType(); void setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); - void setDialogHelpId( const rtl::OString& ); sal_Bool CheckFilterOptionsCapability( const SfxFilter* _pFilter ); diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index ab57f7c37e..2c99035d96 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -60,7 +60,7 @@ #include #include #include - +#include #include //...................................................................................................................... @@ -410,10 +410,11 @@ namespace sfx2 static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL ) { - rtl::OString aHelpId( _rHelpURL, _rHelpURL.getLength(), RTL_TEXTENCODING_UTF8 ); - if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) ) - aHelpId = aHelpId.copy( sizeof( "HID:" ) - 1 ); - return aHelpId; + INetURLObject aHID( _rHelpURL ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + else + return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 8dda799ab3..30d19ad230 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -805,7 +805,6 @@ #include "svtools/parhtml.hxx" #include "svtools/parrtf.hxx" #include "unotools/pathoptions.hxx" -#include "svl/pickerhelper.hxx" #include "svl/poolitem.hxx" #include "unotools/printwarningoptions.hxx" #include "svl/ptitem.hxx" diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/pfiledlg.hxx index 51ece588e9..b6f5ec7802 100644 --- a/svx/inc/pfiledlg.hxx +++ b/svx/inc/pfiledlg.hxx @@ -54,8 +54,6 @@ public: static bool IsAvailable (USHORT nKind); - // setting HelpId and/or context of FileDialogHelper - void SetDialogHelpId( const rtl::OString& nHelpId ); void SetContext( sfx2::FileDialogHelper::Context eNewContext ); }; diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 0b97433d53..3aa4ec8daa 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -1585,7 +1585,6 @@ void BrokenRecoveryDialog::impl_askForSavePath() { css::uno::Reference< css::ui::dialogs::XFolderPicker > xFolderPicker( m_pCore->getSMGR()->createInstance(SERVICENAME_FOLDERPICKER), css::uno::UNO_QUERY_THROW); -// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER ); INetURLObject aURL(m_sSavePath, INET_PROT_FILE); xFolderPicker->setDisplayDirectory(aURL.GetMainURL(INetURLObject::NO_DECODE)); diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index 5b0c83c57a..ae8b95344c 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -274,11 +274,6 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind) return bFound; } -void SvxPluginFileDlg::SetDialogHelpId( const rtl::OString& _nHelpId ) -{ - maFileDlg.SetDialogHelpId( _nHelpId ); -} - void SvxPluginFileDlg::SetContext( sfx2::FileDialogHelper::Context _eNewContext ) { maFileDlg.SetContext( _eNewContext ); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index b9914aace7..d7a264f354 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -38,6 +38,7 @@ #include "sdbdatacolumn.hxx" #include "svx/fmgridcl.hxx" #include "svx/svxids.hrc" +#include /** === begin UNO includes === **/ #include @@ -1973,11 +1974,10 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V } else if ( 0 == PropertyName.compareTo( FM_PROP_HELPURL ) ) { - String sHelpURL(::comphelper::getString(Value)); - String sPattern; - sPattern.AssignAscii("HID:"); - if (sHelpURL.Equals(sPattern, 0, sPattern.Len())) - pGrid->SetHelpId(rtl::OUStringToOString(sHelpURL, RTL_TEXTENCODING_UTF8)); + INetURLObject aHID( ::comphelper::getString(Value) ); + DBG_ASSERT( aHID.GetProtocol() == INET_PROT_HID, "Wrong HelpURL!" ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + pGrid->SetHelpId( rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); } else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) ) { -- cgit v1.2.3 From 35f02192db00361fc547b6a18bd78a49fbe9b4f2 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 24 Jun 2010 09:08:52 +0200 Subject: cws tl81: #i112179# dictionary issue with context menus fixed --- editeng/source/editeng/editview.cxx | 11 +++++++++-- editeng/source/misc/unolingu.cxx | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) mode change 100644 => 100755 editeng/source/misc/unolingu.cxx (limited to 'editeng') diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index c892117d0b..9a347fc7fc 100755 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1044,7 +1044,8 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) { PopupMenu aPopupMenu( EditResId( RID_MENU_SPELL ) ); PopupMenu *pAutoMenu = aPopupMenu.GetPopupMenu( MN_AUTOCORR ); - PopupMenu *pInsertMenu = aPopupMenu.GetPopupMenu( MN_INSERT ); + PopupMenu *pInsertMenu = aPopupMenu.GetPopupMenu( MN_INSERT ); // add word to user-dictionaries + pInsertMenu->SetMenuFlags( MENU_FLAG_NOAUTOMNEMONICS ); //! necessary to retrieve the correct dictionary names later EditPaM aPaM2( aPaM ); aPaM2.GetIndex()++; @@ -1261,7 +1262,13 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) } else if ( nId >= MN_DICTSTART ) { - Reference< XDictionary > xDic( pDic[nId - MN_DICTSTART], UNO_QUERY ); + String aDicName ( pInsertMenu->GetItemText(nId) ); + + uno::Reference< linguistic2::XDictionary > xDic; + uno::Reference< linguistic2::XDictionaryList > xDicList( SvxGetDictionaryList() ); + if (xDicList.is()) + xDic = xDicList->getDictionaryByName( aDicName ); + if (xDic.is()) xDic->add( aSelected, sal_False, String() ); // save modified user-dictionary if it is persistent diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx old mode 100644 new mode 100755 index 7aefa78f98..60ef854c56 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -1197,7 +1197,10 @@ uno::Reference< XDictionary > LinguMgr::GetStandard() // add new dictionary to list if (xTmp.is()) + { xTmpDicList->addDictionary( xTmp ); + xTmp->setActive( sal_True ); + } xDic = uno::Reference< XDictionary > ( xTmp, UNO_QUERY ); } #if OSL_DEBUG_LEVEL > 1 -- cgit v1.2.3 From af923bfdf0913c9875f455c76b8670f313ab402f Mon Sep 17 00:00:00 2001 From: Malte Timmermann Date: Fri, 25 Jun 2010 13:15:03 +0200 Subject: codecleanup02: #i112685# Removed ifdefs and code for WIN,W30,W31 --- basic/source/runtime/dllmgr.cxx | 27 ++------ basic/source/runtime/methods.cxx | 51 ++------------ basic/source/runtime/methods1.cxx | 33 --------- basic/source/runtime/step0.cxx | 7 -- connectivity/source/drivers/adabas/BDriver.cxx | 34 +++++----- connectivity/source/drivers/adabas/BFunctions.cxx | 2 +- connectivity/source/drivers/dbase/DTable.cxx | 8 --- connectivity/source/drivers/file/FResultSet.cxx | 5 -- connectivity/source/drivers/hsqldb/HStorageMap.cxx | 2 +- connectivity/source/drivers/mozab/MDriver.cxx | 2 +- connectivity/source/drivers/odbc/OFunctions.cxx | 4 -- connectivity/source/inc/odbc/OFunctiondefs.hxx | 2 +- editeng/source/editeng/editattr.cxx | 9 --- editeng/source/misc/txtrange.cxx | 8 --- framework/inc/macros/debug/memorymeasure.hxx | 2 +- idl/source/cmptools/hash.cxx | 4 -- idl/source/prj/database.cxx | 6 -- idl/source/prj/idldll.cxx | 79 ---------------------- idl/source/prj/makefile.mk | 1 - sfx2/source/appl/app.cxx | 2 +- sfx2/source/appl/appquit.cxx | 3 - sfx2/source/appl/impldde.cxx | 8 +-- sfx2/source/appl/makefile.mk | 1 - sfx2/source/appl/sfxdll.cxx | 69 ------------------- sfx2/source/dialog/dinfdlg.cxx | 13 ---- sfx2/source/dialog/filedlghelper.cxx | 2 +- sfx2/source/view/viewfrm.cxx | 7 -- svx/inc/svimbase.hxx | 4 -- svx/inc/svx/svdedtv.hxx | 12 ---- svx/inc/svx/svdmodel.hxx | 2 +- svx/inc/svx/xpoly.hxx | 4 -- svx/source/engine3d/scene3d.cxx | 2 +- svx/source/svdraw/svdedtv.cxx | 40 ----------- svx/source/svdraw/svdocirc.cxx | 2 - svx/source/svdraw/svdpagv.cxx | 4 -- svx/util/svxpch.cxx | 2 +- ucb/source/ucp/odma/odma_lib.cxx | 4 -- 37 files changed, 42 insertions(+), 425 deletions(-) delete mode 100644 idl/source/prj/idldll.cxx delete mode 100644 sfx2/source/appl/sfxdll.cxx (limited to 'editeng') diff --git a/basic/source/runtime/dllmgr.cxx b/basic/source/runtime/dllmgr.cxx index 092548b36f..7ab5ca44eb 100644 --- a/basic/source/runtime/dllmgr.cxx +++ b/basic/source/runtime/dllmgr.cxx @@ -34,7 +34,7 @@ #include #endif -#if defined( WIN ) || defined( WNT ) +#if defined( WNT ) #ifndef _SVWIN_H #undef WB_LEFT #undef WB_RIGHT @@ -47,10 +47,7 @@ #include #include -#if defined(WIN) -typedef HINSTANCE SbiDllHandle; -typedef FARPROC SbiDllProc; -#elif defined(WNT) +#if defined(WNT) typedef HMODULE SbiDllHandle; typedef int(*SbiDllProc)(); #elif defined(OS2) @@ -72,7 +69,7 @@ typedef void* SbiDllProc; #endif extern "C" { -#if defined(INTEL) && (defined(WIN) || defined(WNT)) +#if defined(INTEL) && defined(WNT) extern INT16 WINAPI CallINT( SbiDllProc, char *stack, short nstack); extern INT32 WINAPI CallLNG( SbiDllProc, char *stack, short nstack); @@ -273,7 +270,7 @@ SbError SbiDllMgr::Call( const char* pProcName, const char* pDllName, void SbiDllMgr::CheckDllName( ByteString& rDllName ) { -#if defined(WIN) || defined(WNT) || defined(OS2) +#if defined(WNT) || defined(OS2) if( rDllName.Search('.') == STRING_NOTFOUND ) rDllName += ".DLL"; #else @@ -292,12 +289,7 @@ SbiDllHandle SbiDllMgr::CreateDllHandle( const ByteString& rDllName ) SbiDllHandle hLib; #endif -#if defined(WIN) - hLib = LoadLibrary( (const char*)rDllName ); - if( (ULONG)hLib < 32 ) - hLib = 0; - -#elif defined(WNT) +#if defined(WNT) hLib = LoadLibrary( rDllName.GetBuffer() ); if( !(ULONG)hLib ) { @@ -318,7 +310,7 @@ SbiDllHandle SbiDllMgr::CreateDllHandle( const ByteString& rDllName ) void SbiDllMgr::FreeDllHandle( SbiDllHandle hLib ) { -#if defined(WIN) || defined(WNT) +#if defined(WNT) if( hLib ) FreeLibrary ((HINSTANCE) hLib); #elif defined(OS2) @@ -354,7 +346,7 @@ SbiDllProc SbiDllMgr::GetProcAddr(SbiDllHandle hLib, const ByteString& rProcName strncpy( buf2, "_", sizeof(buf2)-1 ); strncat( buf2, buf1, sizeof(buf2)-1-strlen(buf2) ); -#if defined(WIN) || defined(WNT) +#if defined(WNT) if( nOrd > 0 ) pProc = (SbiDllProc)GetProcAddress( hLib, (char*)(long) nOrd ); else @@ -543,12 +535,7 @@ void* SbiDllMgr::CreateStack( SbxArray* pArgs, USHORT& rSize ) char* pTop = pStack; USHORT nCount = pArgs->Count(); // erstes Element ueberspringen -#ifndef WIN for( USHORT nCur = 1; nCur < nCount; nCur++ ) -#else - // unter 16-Bit Windows anders rum (OS/2 ?????) - for( USHORT nCur = nCount-1; nCur >= 1; nCur-- ) -#endif { SbxVariable* pVar = pArgs->Get( nCur ); // AB 22.1.1996, Referenz diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 41e7df439c..419865ae23 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -103,15 +103,10 @@ using namespace com::sun::star::io; #include #include -#if defined (WIN) || defined (WNT) || defined (OS2) +#if defined (WNT) || defined (OS2) #include // _getdcwd get current work directory, _chdrive #endif -#ifdef WIN -#include // _dos_getfileattr -#include -#endif - #ifdef UNX #include #include @@ -420,7 +415,7 @@ RTLFUNC(CurDir) // zu ermitteln, dass eine virtuelle URL geliefert werden koennte. // rPar.Get(0)->PutEmpty(); -#if defined (WIN) || defined (WNT) || defined (OS2) +#if defined (WNT) || defined (OS2) int nCurDir = 0; // Current dir // JSM if ( rPar.Count() == 2 ) { @@ -527,7 +522,7 @@ RTLFUNC(ChDrive) // JSM #ifndef UNX String aPar1 = rPar.Get(1)->GetString(); -#if defined (WIN) || defined (WNT) || defined (OS2) +#if defined (WNT) || defined (OS2) if (aPar1.Len() > 0) { int nCurDrive = (int)aPar1.GetBuffer()[0]; ; @@ -2792,11 +2787,7 @@ RTLFUNC(Dir) pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger(); else pRTLData->nDirFlags = 0; - // Nur diese Bitmaske ist unter Windows erlaubt - #ifdef WIN - if( nFlags & ~0x1E ) - StarBASIC::Error( SbERR_BAD_ARGUMENT ), pRTLData->nDirFlags = 0; - #endif + // Sb_ATTR_VOLUME wird getrennt gehandelt if( pRTLData->nDirFlags & Sb_ATTR_VOLUME ) aPath = aEntry.GetVolume(); @@ -2826,31 +2817,7 @@ RTLFUNC(Dir) } DirEntry aNextEntry=(*(pRTLData->pDir))[pRTLData->nCurDirPos++]; aPath = aNextEntry.GetName(); //Full(); - #ifdef WIN - aNextEntry.ToAbs(); - String sFull(aNextEntry.GetFull()); - unsigned nFlags; - - if (_dos_getfileattr( sFull.GetStr(), &nFlags )) - StarBASIC::Error( SbERR_FILE_NOT_FOUND ); - else - { - INT16 nCurFlags = pRTLData->nDirFlags; - if( (nCurFlags == Sb_ATTR_NORMAL) - && !(nFlags & ( _A_HIDDEN | _A_SYSTEM | _A_VOLID | _A_SUBDIR ) ) ) - break; - else if( (nCurFlags & Sb_ATTR_HIDDEN) && (nFlags & _A_HIDDEN) ) - break; - else if( (nCurFlags & Sb_ATTR_SYSTEM) && (nFlags & _A_SYSTEM) ) - break; - else if( (nCurFlags & Sb_ATTR_VOLUME) && (nFlags & _A_VOLID) ) - break; - else if( (nCurFlags & Sb_ATTR_DIRECTORY) && (nFlags & _A_SUBDIR) ) - break; - } - #else break; - #endif } } rPar.Get(0)->PutString( aPath ); @@ -4381,16 +4348,6 @@ RTLFUNC(SetAttr) // JSM // #57064 Bei virtuellen URLs den Real-Path extrahieren DirEntry aEntry( aStr ); String aFile = aEntry.GetFull(); - #ifdef WIN - int nErr = _dos_setfileattr( aFile.GetStr(),(unsigned ) nFlags ); - if ( nErr ) - { - if (errno == EACCES) - StarBASIC::Error( SbERR_ACCESS_DENIED ); - else - StarBASIC::Error( SbERR_FILE_NOT_FOUND ); - } - #endif ByteString aByteFile( aFile, gsl_getSystemTextEncoding() ); #ifdef WNT if (!SetFileAttributes (aByteFile.GetBuffer(),(DWORD)nFlags)) diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 69c6713122..de3cf72d89 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -28,11 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" -#if defined(WIN) -#include -#else #include // getenv -#endif #include #include #include @@ -52,10 +48,6 @@ #include #endif -#if defined(WIN) -#include -#endif - #ifndef CLK_TCK #define CLK_TCK CLOCKS_PER_SEC #endif @@ -1152,31 +1144,10 @@ RTLFUNC(Environ) } String aResult; // sollte ANSI sein, aber unter Win16 in DLL nicht moeglich -#if defined(WIN) - LPSTR lpszEnv = GetDOSEnvironment(); - String aCompareStr( rPar.Get(1)->GetString() ); - aCompareStr += '='; - const char* pCompare = aCompareStr.GetStr(); - int nCompareLen = aCompareStr.Len(); - while ( *lpszEnv ) - { - // Es werden alle EnvString in der Form ENV=VAL 0-terminiert - // aneinander gehaengt. - - if ( strnicmp( pCompare, lpszEnv, nCompareLen ) == 0 ) - { - aResult = (const char*)(lpszEnv+nCompareLen); - rPar.Get(0)->PutString( aResult ); - return; - } - lpszEnv += lstrlen( lpszEnv ) + 1; // Next Enviroment-String - } -#else ByteString aByteStr( rPar.Get(1)->GetString(), gsl_getSystemTextEncoding() ); const char* pEnvStr = getenv( aByteStr.GetBuffer() ); if ( pEnvStr ) aResult = String::CreateFromAscii( pEnvStr ); -#endif rPar.Get(0)->PutString( aResult ); } @@ -1187,11 +1158,7 @@ static double GetDialogZoomFactor( BOOL bX, long nValue ) if( pDevice ) { Size aRefSize( nValue, nValue ); -#ifndef WIN Fraction aFracX( 1, 26 ); -#else - Fraction aFracX( 1, 23 ); -#endif Fraction aFracY( 1, 24 ); MapMode aMap( MAP_APPFONT, Point(), aFracX, aFracY ); Size aScaledSize = pDevice->LogicToPixel( aRefSize, aMap ); diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx index 96a3e80a84..a2722ec451 100644 --- a/basic/source/runtime/step0.cxx +++ b/basic/source/runtime/step0.cxx @@ -135,7 +135,6 @@ void SbiRuntime::StepCompare( SbxOperator eOp ) } } -#ifndef WIN static SbxVariable* pTRUE = NULL; static SbxVariable* pFALSE = NULL; @@ -159,12 +158,6 @@ void SbiRuntime::StepCompare( SbxOperator eOp ) } PushVar( pFALSE ); } -#else - BOOL bRes = p2->Compare( eOp, *p1 ); - SbxVariable* pRes = new SbxVariable; - pRes->PutBool( bRes ); - PushVar( pRes ); -#endif } void SbiRuntime::StepEXP() { StepArith( SbxEXP ); } diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx index c39ac718f7..632aa9c918 100644 --- a/connectivity/source/drivers/adabas/BDriver.cxx +++ b/connectivity/source/drivers/adabas/BDriver.cxx @@ -854,7 +854,7 @@ void ODriver::createNeededDirs(const ::rtl::OUString& sDBName) if(UCBContentHelper::Exists(sTemp)) UCBContentHelper::Kill(sTemp); -#if !(defined(WIN) || defined(WNT)) +#if !(defined(WNT)) sTemp = sDBConfig; sTemp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diag")); if(!UCBContentHelper::IsFolder(sTemp)) @@ -876,7 +876,7 @@ void ODriver::createNeededDirs(const ::rtl::OUString& sDBName) void ODriver::clearDatabase(const ::rtl::OUString& sDBName) { // stop the database ::rtl::OUString sCommand; -#if defined(WIN) || defined(WNT) +#if defined(WNT) ::rtl::OUString sStop = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stop")); OArgumentList aArgs(2,&sDBName,&sStop); sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_cons.exe")); @@ -921,7 +921,7 @@ void ODriver::createDb( const TDatabaseStruct& _aInfo) PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KERNELTRACESIZE")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("100"))); PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LOG_QUEUE_PAGES")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10"))); -#if !(defined(WIN) || defined(WNT)) +#if !defined(WNT) PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OPMSG1")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/dev/null"))); #endif @@ -989,7 +989,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME, ::std::auto_ptr pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); (*pFileStream) << "x_param" -#if defined(WIN) || defined(WNT) +#if defined(WNT) << ".exe" #endif << " -d " @@ -1000,7 +1000,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME, << ::rtl::OString(_PWD,_PWD.getLength(),gsl_getSystemTextEncoding()) << " " << ::rtl::OString(_CMD,_CMD.getLength(),gsl_getSystemTextEncoding()) -#if (defined(WIN) || defined(WNT)) +#if defined(WNT) #if (OSL_DEBUG_LEVEL > 1) || defined(DBG_UTIL) << " >> %DBWORK%\\create.log 2>&1" #endif @@ -1050,7 +1050,7 @@ void ODriver::PutParam(const ::rtl::OUString& sDBName, { OArgumentList aArgs(3,&sDBName,&rWhat,&rHow); ::rtl::OUString sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("putparam")); -#if defined(WIN) || defined(WNT) +#if defined(WNT) sCommand += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe")); #endif @@ -1112,7 +1112,7 @@ OSL_TRACE("CreateFile %d",_nSize); int ODriver::X_START(const ::rtl::OUString& sDBName) { ::rtl::OUString sCommand; -#if defined(WIN) || defined(WNT) +#if defined(WNT) ::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d")); ::rtl::OUString sArg3 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService")); @@ -1150,7 +1150,7 @@ int ODriver::X_START(const ::rtl::OUString& sDBName) int ODriver::X_STOP(const ::rtl::OUString& sDBName) { ::rtl::OUString sCommand; -#if defined(WIN) || defined(WNT) +#if defined(WNT) ::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d")); ::rtl::OUString sArg2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService")); @@ -1195,7 +1195,7 @@ void ODriver::XUTIL(const ::rtl::OUString& _rParam, ::std::auto_ptr pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); (*pFileStream) << -#if defined(WIN) || defined(WNT) +#if defined(WNT) "xutil.exe" #else "utility" @@ -1248,7 +1248,7 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName, ::std::auto_ptr pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); (*pFileStream) << "xload" -#if defined(WIN) || defined(WNT) +#if defined(WNT) << ".exe" #endif << " -d " @@ -1317,7 +1317,7 @@ void ODriver::fillEnvironmentVariables() ::rtl::OUString ODriver::generateInitFile() const { String sExt; -#if !(defined(WIN) || defined(WNT)) +#if !defined(WNT) sExt = String::CreateFromAscii(".sh"); #else sExt = String::CreateFromAscii(".bat"); @@ -1325,13 +1325,13 @@ void ODriver::fillEnvironmentVariables() String sWorkUrl(m_sDbWorkURL); ::utl::TempFile aCmdFile(String::CreateFromAscii("Init"),&sExt,&sWorkUrl); -#if !(defined(WIN) || defined(WNT)) +#if !defined(WNT) String sPhysicalPath; LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath); chmod(ByteString(sPhysicalPath,gsl_getSystemTextEncoding()).GetBuffer(),S_IRUSR|S_IWUSR|S_IXUSR); #endif -#if !(defined(WIN) || defined(WNT)) +#if !defined(WNT) SvStream* pFileStream = aCmdFile.GetStream(STREAM_WRITE); (*pFileStream) << "#!/bin/sh" << sNewLine @@ -1441,7 +1441,7 @@ void ODriver::X_CONS(const ::rtl::OUString& sDBName,const ::rtl::OString& _ACTIO pFileStream->Seek(STREAM_SEEK_TO_END); (*pFileStream) << "x_cons" -#if defined(WIN) || defined(WNT) +#if defined(WNT) << ".exe" #endif << " " @@ -1524,7 +1524,7 @@ sal_Bool ODriver::isVersion(const ::rtl::OUString& sDBName, const char* _pVersio pFileStream->Seek(STREAM_SEEK_TO_END); (*pFileStream) << "getparam" -#if defined(WIN) || defined(WNT) +#if defined(WNT) << ".exe" #endif << " " @@ -1574,7 +1574,7 @@ void ODriver::checkAndInsertNewDevSpace(const ::rtl::OUString& sDBName, pFileStream->Seek(STREAM_SEEK_TO_END); (*pFileStream) << "getparam" -#if defined(WIN) || defined(WNT) +#if defined(WNT) << ".exe" #endif << " " @@ -1654,7 +1654,7 @@ sal_Bool ODriver::isKernelVersion(const char* _pVersion) // ----------------------------------------------------------------------------- void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) { -#if defined(WIN) || defined(WNT) +#if defined(WNT) // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% -b %m_sDbRoot%\env\TERMCHAR.ind ::rtl::OUString aBatch = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-b ")); ::rtl::OUString sTemp2 = m_sDbRootURL + m_sDelimit diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx index 5c65e4e477..22761bf44a 100644 --- a/connectivity/source/drivers/adabas/BFunctions.cxx +++ b/connectivity/source/drivers/adabas/BFunctions.cxx @@ -129,7 +129,7 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath) } const sal_Char* pLibraryAsciiName = NULL; -#if defined(WIN) || defined(WNT) +#if defined(WNT) pLibraryAsciiName = "SQLOD32.DLL"; #elif ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX) pLibraryAsciiName = "odbclib.so"; diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 2982f484a3..453418dc81 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1432,16 +1432,8 @@ BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile) char aBuffer[512]; // write buffer memset(aBuffer,0,sizeof(aBuffer)); -#ifdef WIN - m_pMemoStream->Seek(0L); - for (UINT16 i = 0; i < 512; i++) - { - (*m_pMemoStream) << BYTE(0); - } -#else m_pMemoStream->SetFiller('\0'); m_pMemoStream->SetStreamSize(512); -#endif m_pMemoStream->Seek(0L); (*m_pMemoStream) << long(1); // Zeiger auf ersten freien Block diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index ef0ae138a2..03c4004fde 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -75,12 +75,7 @@ using namespace com::sun::star::sdbcx; using namespace com::sun::star::container; // Maximale Anzahl von Rows, die mit ORDER BY sortiert durchlaufen werden koennen: -#if defined (WIN) -#define MAX_KEYSET_SIZE 0x3ff0 // Etwas weniger als ein Segment, damit - // noch Platz fuer Memory Debug-Informationen -#else #define MAX_KEYSET_SIZE 0x40000 // 256K -#endif namespace { diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index c6af914682..de9c1e6893 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -133,7 +133,7 @@ namespace connectivity ::rtl::OUString StorageContainer::removeOldURLPrefix(const ::rtl::OUString& _sURL) { ::rtl::OUString sRet = _sURL; -#if defined(WIN) || defined(WNT) +#if defined(WNT) sal_Int32 nIndex = sRet.lastIndexOf('\\'); #else sal_Int32 nIndex = sRet.lastIndexOf('/'); diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index ac4e3be969..f1cbc63188 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -249,7 +249,7 @@ EDriverType MozabDriver::impl_classifyURL( const ::rtl::OUString& url ) const sal_Char* pScheme; } aSchemeMap[] = { -#if defined(WNT) || defined(WIN) +#if defined(WNT) { Outlook, "outlook" }, { OutlookExpress, "outlookexp" }, #endif diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx index d693a9a298..292ed6ef1d 100644 --- a/connectivity/source/drivers/odbc/OFunctions.cxx +++ b/connectivity/source/drivers/odbc/OFunctions.cxx @@ -109,10 +109,6 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath) if (bLoaded) return sal_True; -#ifdef WIN - _rPath = ::rtl::OUString::createFromAscii("ODBC.DLL"); - -#endif #ifdef WNT _rPath = ::rtl::OUString::createFromAscii("ODBC32.DLL"); #endif diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index 0cff012b5e..274e9cb55a 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -29,7 +29,7 @@ #ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_ #define _CONNECTIVITY_OFUNCTIONDEFS_HXX_ -#if defined(WIN) || defined(WNT) +#if defined(WNT) #ifdef _MSC_VER #pragma warning(push) diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index 0e6ae868af..ca7d461114 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -266,10 +266,6 @@ EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAt DBG_ASSERT( rAttr.Which() == EE_CHAR_ESCAPEMENT, "Kein Escapementattribut!" ); } -#if defined( WIN ) && !defined( WNT ) -#pragma optimize ("", off) -#endif - void EditCharAttribEscapement::SetFont( SvxFont& rFont, OutputDevice* ) { USHORT nProp = ((const SvxEscapementItem*)GetItem())->GetProp(); @@ -283,11 +279,6 @@ void EditCharAttribEscapement::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetEscapement( nEsc ); } -#if defined( WIN ) && !defined( WNT ) -#pragma optimize ("", on) -#endif - - // ------------------------------------------------------------------------- // class EditCharAttribOutline // ------------------------------------------------------------------------- diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx index e0440e424c..7f66d10d17 100644 --- a/editeng/source/misc/txtrange.cxx +++ b/editeng/source/misc/txtrange.cxx @@ -45,10 +45,6 @@ |* *************************************************************************/ -#ifdef WIN -#pragma optimize ( "", off ) -#endif - TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon, USHORT nCacheSz, USHORT nLft, USHORT nRght, BOOL bSimpl, BOOL bInnr, BOOL bVert ) : @@ -97,10 +93,6 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const baseg mpLinePolyPolygon = NULL; } -#ifdef WIN -#pragma optimize ( "", on ) -#endif - /************************************************************************* |* |* TextRanger::~TextRanger() diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx index e4106a3fa8..4ed1603b62 100644 --- a/framework/inc/macros/debug/memorymeasure.hxx +++ b/framework/inc/macros/debug/memorymeasure.hxx @@ -37,7 +37,7 @@ #ifdef ENABLE_MEMORYMEASURE - #if !defined( WIN ) && !defined( WNT ) + #if !defined( WNT ) #error "Macros to measure memory access not available under platforms different from windows!" #endif diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx index d4305a0b3b..ac6fe446ad 100644 --- a/idl/source/cmptools/hash.cxx +++ b/idl/source/cmptools/hash.cxx @@ -141,10 +141,6 @@ BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert, SvStringHashTable::SvStringHashTable( UINT32 nMaxEntries ) : SvHashTable( nMaxEntries ) { -#ifdef WIN - DBG_ASSERT( (UINT32)nMaxEntries * sizeof( SvStringHashEntry ) <= 0xFF00, - "Hash table size cannot exeed 64k byte" ) -#endif pEntries = new SvStringHashEntry[ nMaxEntries ]; // RefCount auf eins setzen diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 320fd20cad..cc4e5d48c0 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -697,10 +697,8 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm ) *************************************************************************/ void SvIdlDataBase::Write( const ByteString & rText ) { -#ifndef W31 if( nVerbosity != 0 ) fprintf( stdout, "%s", rText.GetBuffer() ); -#endif } /************************************************************************* @@ -714,7 +712,6 @@ void SvIdlDataBase::WriteError( const ByteString & rErrWrn, ULONG nRow, ULONG nColumn ) const { //Fehlerbehandlung -#ifndef W31 fprintf( stderr, "\n%s --- %s: ( %ld, %ld )\n", rFileName.GetBuffer(), rErrWrn.GetBuffer(), nRow, nColumn ); @@ -722,7 +719,6 @@ void SvIdlDataBase::WriteError( const ByteString & rErrWrn, { // Fehler gesetzt fprintf( stderr, "\t%s\n", rErrorText.GetBuffer() ); } -#endif } /************************************************************************* @@ -733,7 +729,6 @@ void SvIdlDataBase::WriteError( const ByteString & rErrWrn, void SvIdlDataBase::WriteError( SvTokenStream & rInStm ) { //Fehlerbehandlung -#ifndef W31 String aFileName( rInStm.GetFileName() ); ByteString aErrorText; ULONG nRow = 0, nColumn = 0; @@ -793,7 +788,6 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm ) if( aN.Len() ) fprintf( stderr, "%s versus %s\n", pTok->GetString().GetBuffer(), aN.GetBuffer() ); } -#endif } /****************** SvIdlWorkingBase ****************************************/ diff --git a/idl/source/prj/idldll.cxx b/idl/source/prj/idldll.cxx deleted file mode 100644 index f5fc8dab9c..0000000000 --- a/idl/source/prj/idldll.cxx +++ /dev/null @@ -1,79 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_idl.hxx" - -#ifdef WIN -#include - -#ifndef _SYSDEP_HXX -#include -#endif - -// Statische DLL-Verwaltungs-Variablen -static HINSTANCE hDLLInst = 0; // HANDLE der DLL - - -/*************************************************************************** -|* -|* LibMain() -|* -|* Beschreibung Initialisierungsfunktion der DLL -|* Ersterstellung TH 05.05.93 -|* Letzte Aenderung TH 05.05.93 -|* -***************************************************************************/ - -extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR ) -{ -#ifndef WNT - if ( nHeap ) - UnlockData( 0 ); -#endif - - hDLLInst = hDLL; - - return TRUE; -} - -/*************************************************************************** -|* -|* WEP() -|* -|* Beschreibung DLL-Deinitialisierung -|* Ersterstellung TH 05.05.93 -|* Letzte Aenderung TH 05.05.93 -|* -***************************************************************************/ - -extern "C" int CALLBACK WEP( int ) -{ - return 1; -} - -#endif diff --git a/idl/source/prj/makefile.mk b/idl/source/prj/makefile.mk index 3e0a55a7fd..c33d2e9f3d 100644 --- a/idl/source/prj/makefile.mk +++ b/idl/source/prj/makefile.mk @@ -41,7 +41,6 @@ CDEFS+=-DIDL_COMPILER OBJFILES= $(OBJ)$/command.obj \ $(OBJ)$/svidl.obj \ $(OBJ)$/globals.obj \ - $(OBJ)$/idldll.obj \ $(OBJ)$/database.obj # --- Targets ------------------------------------------------------------ diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index ca8062bcb7..de333ac5a7 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -129,7 +129,7 @@ #include #endif -#if defined( WIN ) || defined( WNT ) || defined( OS2 ) +#if defined( WNT ) || defined( OS2 ) #define DDE_AVAILABLE #endif diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 7c41c802bb..14bd6c73c3 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -30,9 +30,6 @@ #include #include -#ifdef WIN -#define _TL_LANG_SPECIAL -#endif #include #ifndef _MSGBOX_HXX //autogen #include diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 8db6fb93dd..fd642941b4 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#if defined(WIN) || defined(WNT) +#if defined(WNT) #include #endif @@ -211,7 +211,7 @@ BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/, BOOL SvDDEObject::Connect( SvBaseLink * pSvLink ) { -#if defined(WIN) || defined(WNT) +#if defined(WNT) static BOOL bInWinExec = FALSE; #endif USHORT nLinkType = pSvLink->GetUpdateMode(); @@ -258,7 +258,7 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink ) // ansonsten unter Win/WinNT die Applikation direkt starten } -#if defined(WIN) || defined(WNT) +#if defined(WNT) // Server nicht da, starten und nochmal versuchen if( !bInWinExec ) @@ -291,7 +291,7 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink ) } } else -#endif // WIN / WNT +#endif // WNT { nError = DDELINK_ERROR_APP; } diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk index 72ac94a9b3..30f7435507 100644 --- a/sfx2/source/appl/makefile.mk +++ b/sfx2/source/appl/makefile.mk @@ -101,7 +101,6 @@ SFX_OBJECTS = \ $(SLO)$/module.obj \ $(SLO)$/newhelp.obj \ $(SLO)$/opengrf.obj \ - $(SLO)$/sfxdll.obj \ $(SLO)$/sfxhelp.obj \ $(SLO)$/sfxpicklist.obj \ $(SLO)$/shutdownicon.obj \ diff --git a/sfx2/source/appl/sfxdll.cxx b/sfx2/source/appl/sfxdll.cxx deleted file mode 100644 index 3635770b38..0000000000 --- a/sfx2/source/appl/sfxdll.cxx +++ /dev/null @@ -1,69 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sfx2.hxx" - -#ifdef WIN -#include -#endif - -#ifndef GCC -#endif - -#ifdef WIN - -// Statische DLL-Verwaltungs-Variablen -static HINSTANCE hDLLInst = 0; - -//========================================================================== - -extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR ) -{ -#ifndef WNT - if ( nHeap ) - UnlockData( 0 ); -#endif - - hDLLInst = hDLL; - - return TRUE; -} - - -//-------------------------------------------------------------------------- - -extern "C" int CALLBACK WEP( int ) -{ - return 1; -} - - -//========================================================================== - -#endif - diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 409e29c1e4..c934090294 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1523,19 +1523,6 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent, { // Dateiname String aFile( pInfoItem->GetValue() ); -#ifdef WIN - if ( aFile.Len() <= 8 ) - { - String sTmp( SfxResId( STR_NONAME ) ); - USHORT nLen = Min( (USHORT)8, sTmp.Len() ); - - if ( sTmp.Copy( 0, nLen ).Lower() == - aFile.Copy( 0, nLen ).Lower() ) - { - aFile = pInfoItem->GetValue(); - } - } -#endif INetURLObject aURL; aURL.SetSmartProtocol( INET_PROT_FILE ); diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 3167c13ccd..f26ac86550 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1927,7 +1927,7 @@ void FileDialogHelper_Impl::addGraphicFilter() } } -#if defined(WIN) || defined(WNT) +#if defined(WNT) if ( aExtensions.Len() > 240 ) aExtensions = DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ); #endif diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 9013bd84f5..3439cf7054 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1108,10 +1108,6 @@ void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame ) DBG_CHKTHIS(SfxViewFrame, 0); SFX_APP(); -#ifdef WIN - pSfxApp->TestFreeResources_Impl(); -#endif - pDispatcher->DoActivate_Impl( bUI, pOldFrame ); // Wenn ich einen parent habe und dieser ist kein parent des alten @@ -1176,9 +1172,6 @@ void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame ) pFrame = pFrame->GetParentViewFrame(); } } -#ifdef WIN - pSfxApp->TestFreeResources_Impl(); -#endif } //------------------------------------------------------------------------ diff --git a/svx/inc/svimbase.hxx b/svx/inc/svimbase.hxx index 58fb0c969c..7f4b4710f8 100644 --- a/svx/inc/svimbase.hxx +++ b/svx/inc/svimbase.hxx @@ -36,11 +36,7 @@ // - Defines - // ----------- -#ifdef WIN -#define _SVHUGE huge -#else #define _SVHUGE -#endif // ---------------- // - SimDepthType - diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx index 6a3bbd1f75..88ea8fc715 100644 --- a/svx/inc/svx/svdedtv.hxx +++ b/svx/inc/svx/svdedtv.hxx @@ -208,7 +208,6 @@ public: // verwendet. NotifyNewUndoAction() wird in diesem Fall erst beim letzten // EndUndo() gerufen. NotifyNewUndoAction() wird nicht gerufen bei einer // leeren Klammerung. -#ifndef WIN void BegUndo() { pMod->BegUndo(); } // Undo-Klammerung auf void BegUndo(const String& rComment) { pMod->BegUndo(rComment); } // Undo-Klammerung auf void BegUndo(const String& rComment, const String& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE) { pMod->BegUndo(rComment,rObjDescr,eFunc); } // Undo-Klammerung auf @@ -218,17 +217,6 @@ public: // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: void SetUndoComment(const String& rComment) { pMod->SetUndoComment(rComment); } void SetUndoComment(const String& rComment, const String& rObjDescr) { pMod->SetUndoComment(rComment,rObjDescr); } -#else // ifndef WIN - void BegUndo(); - void BegUndo(const String& rComment); - void BegUndo(const String& rComment, const String& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE); - void BegUndo(SdrUndoGroup* pUndoGrp); - void EndUndo(); // Undo-Klammerung zu (inkl BroadcastEdges) - void AddUndo(SdrUndoAction* pUndo); - // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: - void SetUndoComment(const String& rComment); - void SetUndoComment(const String& rComment, const String& rObjDescr); -#endif bool IsUndoEnabled() const; std::vector< SdrUndoAction* > CreateConnectorUndo( SdrObject& rO ); diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index a40f1c184a..3ffa731bd3 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -53,7 +53,7 @@ class OutputDevice; #include -#if defined(UNX) || defined(WIN) || defined(WNT) +#if defined(UNX) || defined(WNT) #define DEGREE_CHAR ((sal_Unicode)176) /* 0xB0 = Ansi */ #endif diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx index 837d681afd..a8ccd34713 100644 --- a/svx/inc/svx/xpoly.hxx +++ b/svx/inc/svx/xpoly.hxx @@ -45,11 +45,7 @@ class OutputDevice; #define XPOLYPOLY_APPEND 0xFFFF #define XPOLY_APPEND 0xFFFF -#ifdef WIN // Windows 16 Bit -#define XPOLY_MAXPOINTS 8160 /* =0xFF00/sizeof(Point), also mit etwas Platz! */ -#else #define XPOLY_MAXPOINTS 0xFFF0 /* Auch fuer die 32-Bitter etwas Luft lassen */ -#endif /************************************************************************/ // Punktstile im XPolygon: diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 0bd03d0229..e5a55a6964 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -240,7 +240,7 @@ void E3dScene::SetDefaultAttributes(E3dDefaultAttributes& /*rDefault*/) #endif // Fuer WIN95/NT die FP-Exceptions abschalten -#if defined(WNT) || defined(WIN) +#if defined(WNT) #define SC_FPEXCEPTIONS_ON() _control87( _MCW_EM, 0 ) #define SC_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM ) SC_FPEXCEPTIONS_OFF(); diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index de7a564ff1..08cf1ada74 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -1039,46 +1039,6 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO //////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef WIN -void SdrEditView::BegUndo() // Undo-Klammerung auf -{ - pMod->BegUndo(); -} - -void SdrEditView::BegUndo(const String& rComment) // Undo-Klammerung auf -{ - pMod->BegUndo(rComment); -} - -void SdrEditView::BegUndo(const String& rComment, const String& rObjDescr, - SdrRepeatFunc eFunc) // Undo-Klammerung auf -{ - pMod->BegUndo(rComment,rObjDescr,eFunc); -} - -void SdrEditView::BegUndo(SdrUndoGroup* pUndoGrp) // Undo-Klammerung auf -{ - pMod->BegUndo(pUndoGrp); -} - -void SdrEditView::AddUndo(SdrUndoAction* pUndo) // Action hinzufuegen -{ - pMod->AddUndo(pUndo); -} - // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: -void SdrEditView::SetUndoComment(const String& rComment) -{ - pMod->SetUndoComment(rComment); -} - - -void SdrEditView::SetUndoComment(const String& rComment, - const String& rObjDescr) -{ - pMod->SetUndoComment(rComment,rObjDescr); -} -#endif - bool SdrEditView::IsUndoEnabled() const { return pMod->IsUndoEnabled(); diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 288cfcc593..58f4c6950d 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -171,10 +171,8 @@ FASTBOOL SdrCircObj::PaintNeedsXPolyCirc() const // und wenn nicht WIN dann (erstmal) auch fuer Kreis-/Ellipsenausschnitte // und Kreis-/Ellipsenboegen (wg. Genauigkeit) FASTBOOL bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT; -#ifndef WIN // Wenn nicht Win, dann fuer alle ausser Vollkreis (erstmal!!!) if (meCircleKind!=OBJ_CIRC) bNeed=TRUE; -#endif const SfxItemSet& rSet = GetObjectItemSet(); if(!bNeed) diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 669ec8c49b..1ca0b0623f 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -580,10 +580,6 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C rOut.SetLineColor( aColor ); bool bMap0=rOut.IsMapModeEnabled(); -#ifdef WIN // SetPixel-Profiling fuer Windows - COLORREF aWinColRef=PALETTERGB(aColor.GetRed()>>8,aColor.GetGreen()>>8,aColor.GetBlue()>>8); - HDC aWinhDC=Sysdepen::GethDC(rOut); -#endif long nWrX=0;//aWriterPageOffset.X(); long nWrY=0;//aWriterPageOffset.Y(); diff --git a/svx/util/svxpch.cxx b/svx/util/svxpch.cxx index 9e35443965..819fbfd7f4 100644 --- a/svx/util/svxpch.cxx +++ b/svx/util/svxpch.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include #include -#if defined(WNT) || defined (WIN) +#if defined(WNT) #include #endif #include diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx index b6a0d3ada1..69142a7b0e 100644 --- a/ucb/source/ucp/odma/odma_lib.cxx +++ b/ucb/source/ucp/odma/odma_lib.cxx @@ -78,10 +78,6 @@ namespace odma if (bLoaded) return sal_True; ::rtl::OUString sPath; - #ifdef WIN - sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODMA.DLL")); - - #endif #ifdef WNT sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODMA32.DLL")); #endif -- cgit v1.2.3 From 47dedcebd9aefd29eea53550935b16881cf44d76 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 1 Jul 2010 15:19:53 +0200 Subject: cws tl81: #i112788# patch was broken, old code restored --- editeng/source/editeng/impedit2.cxx | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'editeng') diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index e0e780c784..fedfb0d367 100755 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -4209,18 +4209,8 @@ long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT DBG_ERROR("svx::ImpEditEngine::GetXPos(), index out of range!"); } -#if 0 + // old code restored see #i112788 (which leaves #i74188 unfixed again) long nPosInPortion = pLine->GetCharPosArray().GetObject( nPos ); -#else - // #i74188# (positioning the cursor after deleting components of combined indic characters) - SvxFont aTmpFont( pParaPortion->GetNode()->GetCharAttribs().GetDefFont() ); - SeekCursor( pParaPortion->GetNode(), nPos+1, aTmpFont ); - aTmpFont.SetPhysFont( GetRefDevice() ); - ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() ); - String sSegment(*pParaPortion->GetNode(), pLine->GetStart(), nPos+1); - long nPosInPortion = aTmpFont.QuickGetTextSize( GetRefDevice(), - sSegment, 0, nPos+1, NULL ).Width(); -#endif if ( !pPortion->IsRightToLeft() ) { -- cgit v1.2.3 From 73bc0bbd9e8f0adbfe722c2afe4c44857abda4bf Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Fri, 2 Jul 2010 14:45:29 +0200 Subject: cws tl81: warning-free code --- editeng/source/editeng/editview.cxx | 1 - 1 file changed, 1 deletion(-) mode change 100755 => 100644 editeng/source/editeng/editview.cxx (limited to 'editeng') diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx old mode 100755 new mode 100644 index 9a347fc7fc..decb2dda5a --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1265,7 +1265,6 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) String aDicName ( pInsertMenu->GetItemText(nId) ); uno::Reference< linguistic2::XDictionary > xDic; - uno::Reference< linguistic2::XDictionaryList > xDicList( SvxGetDictionaryList() ); if (xDicList.is()) xDic = xDicList->getDictionaryByName( aDicName ); -- cgit v1.2.3 From 72a6ffc6b3722d3871ea2c8e9bc827b7affc93ad Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Fri, 9 Jul 2010 10:55:23 +0200 Subject: cws tl83: #i113004# crash when spell checking in sd fixed --- editeng/source/editeng/impedit4.cxx | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) mode change 100755 => 100644 editeng/source/editeng/impedit4.cxx (limited to 'editeng') diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx old mode 100755 new mode 100644 index 6fc80acf06..9b09b563be --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1458,7 +1458,11 @@ Reference< XSpellChecker1 > ImpEditEngine::GetSpeller() SpellInfo * ImpEditEngine::CreateSpellInfo( const EditSelection &rSel, bool bMultipleDocs ) { - pSpellInfo = new SpellInfo; + if (!pSpellInfo) + pSpellInfo = new SpellInfo; + else + *pSpellInfo = SpellInfo(); // reset to default values + pSpellInfo->bMultipleDoc = bMultipleDocs; EditSelection aSentenceSel( SelectSentence( rSel ) ); // pSpellInfo->aSpellStart = CreateEPaM( aSentenceSel.Min() ); @@ -2023,7 +2027,6 @@ bool ImpEditEngine::SpellSentence(EditView& rEditView, #else bool bRet = false; EditSelection aCurSel( rEditView.pImpEditView->GetEditSelection() ); - //the pSpellInfo has to be created on demand if(!pSpellInfo) pSpellInfo = CreateSpellInfo( aCurSel, true ); pSpellInfo->aCurSentenceStart = aCurSel.Min(); @@ -2191,8 +2194,12 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, { #ifdef SVX_LIGHT #else + // Note: rNewPortions.size() == 0 is valid and happens when the whole + // sentence got removed in the dialog + DBG_ASSERT(pSpellInfo, "pSpellInfo not initialized"); - if(pSpellInfo) + if (pSpellInfo && + pSpellInfo->aLastSpellPortions.size() > 0) // no portions -> no text to be changed { // get current paragraph length to calculate later on how the sentence length changed, // in order to place the cursor at the end of the sentence again @@ -2202,6 +2209,10 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, UndoActionStart( EDITUNDO_INSERT ); if(pSpellInfo->aLastSpellPortions.size() == rNewPortions.size()) { + DBG_ASSERT( rNewPortions.size() > 0, "rNewPortions should not be empty here" ); + DBG_ASSERT( pSpellInfo->aLastSpellPortions.size() == pSpellInfo->aLastSpellContentSelections.size(), + "aLastSpellPortions and aLastSpellContentSelections size mismatch" ); + //the simple case: the same number of elements on both sides //each changed element has to be applied to the corresponding source element svx::SpellPortions::const_iterator aCurrentNewPortion = rNewPortions.end(); @@ -2252,6 +2263,8 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, } else { + DBG_ASSERT( pSpellInfo->aLastSpellContentSelections.size() > 0, "aLastSpellContentSelections should not be empty here" ); + //select the complete sentence SpellContentSelections::const_iterator aCurrentEndPosition = pSpellInfo->aLastSpellContentSelections.end(); --aCurrentEndPosition; -- cgit v1.2.3 From 9951e7b7804b3643b9bf7e837e5cd0f09373a8fc Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Wed, 28 Jul 2010 13:54:38 +0200 Subject: fwk152: #i113249# Fix broken HTML clipboard --- editeng/source/editeng/eehtml.cxx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'editeng') diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 87bf077bb2..651b232848 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -43,7 +43,7 @@ #include #include #include - +#include #define ACTION_INSERTTEXT 1 #define ACTION_INSERTPARABRK 2 @@ -66,6 +66,16 @@ EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValu nNumberingLevel = 0; bFieldsInserted = FALSE; + DBG_ASSERT( RTL_TEXTENCODING_DONTKNOW == GetSrcEncoding( ), "EditHTMLParser::EditHTMLParser: Where does the encoding come from?" ); + DBG_ASSERT( !IsSwitchToUCS2(), "EditHTMLParser::::EditHTMLParser: Switch to UCS2?" ); + + // Altough the real default encoding is ISO8859-1, we use MS-1252 + // als default encoding. + SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) ); + + // If the file starts with a BOM, switch to UCS2. + SetSwitchToUCS2( TRUE ); + if ( pHTTPHeaderAttrs ) SetEncodingByHTTPHeader( pHTTPHeaderAttrs ); } -- cgit v1.2.3 From 02d554112d9c0174e21b7ea7e4aea15fe564afa9 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 29 Jul 2010 14:57:46 +0200 Subject: sw33bf08: #i113461#: SvxAutoCorrect::AutoCorrect(): apply patch by dtardon: do not freeze after erasing non-breaking space inserted by French AutoCorrection --- editeng/source/misc/svxacorr.cxx | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'editeng') diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 78edae142d..8eea009a4e 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1243,27 +1243,25 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, else if ( bIsNextRun && !IsAutoCorrectChar( cChar ) ) { // Remove the NBSP if it wasn't an autocorrection - if ( NeedsHardspaceAutocorr( rTxt.GetChar( nInsPos - 1 ) ) && + if ( nInsPos != 0 && NeedsHardspaceAutocorr( rTxt.GetChar( nInsPos - 1 ) ) && cChar != ' ' && cChar != '\t' && cChar != CHAR_HARDBLANK ) { // Look for the last HARD_SPACE xub_StrLen nPos = nInsPos - 1; - bool bFound = false; - while ( nPos != STRING_NOTFOUND && !bFound ) + bool bContinue = true; + while ( bContinue ) { - sal_Unicode cTmpChar = rTxt.GetChar( nPos ); + const sal_Unicode cTmpChar = rTxt.GetChar( nPos ); if ( cTmpChar == CHAR_HARDBLANK ) - bFound = true; - else if ( !NeedsHardspaceAutocorr( cTmpChar ) ) - nPos = STRING_NOTFOUND; + { + rDoc.Delete( nPos, nPos + 1 ); + nRet = AddNonBrkSpace; + bContinue = false; + } + else if ( !NeedsHardspaceAutocorr( cTmpChar ) || nPos == 0 ) + bContinue = false; nPos--; } - - if ( bFound && nPos != STRING_NOTFOUND ) - { - rDoc.Delete( nPos + 1, nPos + 2 ); - nRet = AddNonBrkSpace; - } } } } -- cgit v1.2.3 From 4aa0a027c7994cad5529534a32b9a903f01907b1 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Tue, 17 Aug 2010 16:46:36 +0200 Subject: cws sw33bf08: #i113584#, #i113587# transliteration fixed --- editeng/source/editeng/impedit.hxx | 3 + editeng/source/editeng/impedit4.cxx | 369 ++++++++++++++++++++++++++++++------ 2 files changed, 312 insertions(+), 60 deletions(-) (limited to 'editeng') diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 9c425bc07c..709475a219 100755 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -1002,6 +1003,8 @@ public: void SetAutoCompleteText( const String& rStr, sal_Bool bUpdateTipWindow ); EditSelection TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode ); + short ReplaceTextOnly( ContentNode* pNode, USHORT nCurrentStart, xub_StrLen nLen, const String& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rOffsets ); + void SetAsianCompressionMode( USHORT n ); USHORT GetAsianCompressionMode() const { return nAsianCompressionMode; } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 6fc80acf06..04888ff83f 100755 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -76,6 +76,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -83,6 +86,8 @@ #include #include +#include + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -2798,8 +2803,23 @@ void ImpEditEngine::SetAutoCompleteText( const String& rStr, sal_Bool bClearTipW #endif // !SVX_LIGHT } + +struct TransliterationChgData +{ + USHORT nStart; + xub_StrLen nLen; + EditSelection aSelection; + String aNewText; + uno::Sequence< sal_Int32 > aOffsets; +}; + + EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode ) { + uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() ); + if (!_xBI.is()) + return rSelection; + EditSelection aSel( rSelection ); aSel.Adjust( aEditDoc ); @@ -2808,8 +2828,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, EditSelection aNewSel( aSel ); - USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() ); - USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() ); + const USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() ); + const USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() ); BOOL bChanges = FALSE; BOOL bLenChanged = FALSE; @@ -2832,83 +2852,266 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, USHORT nCurrentEnd = nEndPos; sal_uInt16 nLanguage = LANGUAGE_SYSTEM; - do - { - if ( bConsiderLanguage ) + // since we don't use Hiragana/Katakana or half-width/full-width transliterations here + // it is fine to use ANYWORD_IGNOREWHITESPACES. (ANY_WORD btw is broken and will + // occasionaly miss words in consecutive sentences). Also with ANYWORD_IGNOREWHITESPACES + // text like 'just-in-time' will be converted to 'Just-In-Time' which seems to be the + // proper thing to do. + const sal_Int16 nWordType = i18n::WordType::ANYWORD_IGNOREWHITESPACES; + + //! In order to have less trouble with changing text size, e.g. because + //! of ligatures or � (German small sz) being resolved, we need to process + //! the text replacements from end to start. + //! This way the offsets for the yet to be changed words will be + //! left unchanged by the already replaced text. + //! For this we temporarily save the changes to be done in this vector + std::vector< TransliterationChgData > aChanges; + TransliterationChgData aChgData; + + if (nTransliterationMode == i18n::TransliterationModulesExtra::TITLE_CASE) + { + // for 'capitalize every word' we need to iterate over each word + + i18n::Boundary aSttBndry; + i18n::Boundary aEndBndry; + aSttBndry = _xBI->getWordBoundary( + *pNode, nStartPos, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nStartPos + 1 ) ) ), + nWordType, TRUE /*prefer forward direction*/); + aEndBndry = _xBI->getWordBoundary( + *pNode, nEndPos, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nEndPos + 1 ) ) ), + nWordType, FALSE /*prefer backward direction*/); + + // prevent backtracking to the previous word if selection is at word boundary + if (aSttBndry.endPos <= nStartPos) + { + aSttBndry = _xBI->nextWord( + *pNode, aSttBndry.endPos, + SvxCreateLocale( GetLanguage( EditPaM( pNode, aSttBndry.endPos + 1 ) ) ), + nWordType); + } + // prevent advancing to the next word if selection is at word boundary + if (aEndBndry.startPos >= nEndPos) { - nLanguage = GetLanguage( EditPaM( pNode, nCurrentStart+1 ), &nCurrentEnd ); - if ( nCurrentEnd > nEndPos ) - nCurrentEnd = nEndPos; + aEndBndry = _xBI->previousWord( + *pNode, aEndBndry.startPos, + SvxCreateLocale( GetLanguage( EditPaM( pNode, aEndBndry.startPos + 1 ) ) ), + nWordType); } - xub_StrLen nLen = nCurrentEnd - nCurrentStart; + i18n::Boundary aCurWordBndry( aSttBndry ); + while (aCurWordBndry.startPos <= aEndBndry.startPos) + { + nCurrentStart = (xub_StrLen)aCurWordBndry.startPos; + nCurrentEnd = (xub_StrLen)aCurWordBndry.endPos; + sal_Int32 nLen = nCurrentEnd - nCurrentStart; + DBG_ASSERT( nLen > 0, "invalid word length of 0" ); +#if OSL_DEBUG_LEVEL > 1 + String aText( pNode->Copy( nCurrentStart, nLen ) ); +#endif + + Sequence< sal_Int32 > aOffsets; + String aNewText( aTranslitarationWrapper.transliterate( *pNode, + GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ), + nCurrentStart, nLen, &aOffsets )); - Sequence aOffsets; - String aNewText( aTranslitarationWrapper.transliterate( *pNode, nLanguage, nCurrentStart, nLen, &aOffsets ) ); + if (!pNode->Equals( aNewText, nCurrentStart, nLen )) + { + aChgData.nStart = nCurrentStart; + aChgData.nLen = nLen; + aChgData.aSelection = EditSelection( EditPaM( pNode, nCurrentStart ), EditPaM( pNode, nCurrentEnd ) ); + aChgData.aNewText = aNewText; + aChgData.aOffsets = aOffsets; + aChanges.push_back( aChgData ); + } +#if OSL_DEBUG_LEVEL > 1 + String aSelTxt ( GetSelected( aChgData.aSelection ) ); + (void) aSelTxt; +#endif - if( ( nLen != aNewText.Len() ) || !pNode->Equals( aNewText, nCurrentStart, nLen ) ) + aCurWordBndry = _xBI->nextWord( *pNode, nCurrentEnd, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentEnd + 1 ) ) ), + nWordType); + } + DBG_ASSERT( nCurrentEnd >= aEndBndry.endPos, "failed to reach end of transliteration" ); + } + else if (nTransliterationMode == i18n::TransliterationModulesExtra::SENTENCE_CASE) + { + // for 'sentence case' we need to iterate sentence by sentence + + sal_Int32 nLastStart = _xBI->beginOfSentence( + *pNode, nEndPos, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nEndPos + 1 ) ) ) ); + sal_Int32 nLastEnd = _xBI->endOfSentence( + *pNode, nLastStart, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nLastStart + 1 ) ) ) ); + + // extend nCurrentStart, nCurrentEnd to the current sentence boundaries + nCurrentStart = _xBI->beginOfSentence( + *pNode, nStartPos, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nStartPos + 1 ) ) ) ); + nCurrentEnd = _xBI->endOfSentence( + *pNode, nCurrentStart, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ) ) ); + + // prevent backtracking to the previous sentence if selection starts at end of a sentence + if (nCurrentEnd <= nStartPos) { - bChanges = TRUE; - if ( nLen != aNewText.Len() ) - bLenChanged = TRUE; + // now nCurrentStart is probably located on a non-letter word. (unless we + // are in Asian text with no spaces...) + // Thus to get the real sentence start we should locate the next real word, + // that is one found by DICTIONARY_WORD + i18n::Boundary aBndry = _xBI->nextWord( *pNode, nCurrentEnd, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentEnd + 1 ) ) ), + i18n::WordType::DICTIONARY_WORD); + + // now get new current sentence boundaries + nCurrentStart = _xBI->beginOfSentence( + *pNode, aBndry.startPos, + SvxCreateLocale( GetLanguage( EditPaM( pNode, aBndry.startPos + 1 ) ) ) ); + nCurrentEnd = _xBI->endOfSentence( + *pNode, nCurrentStart, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ) ) ); + } + // prevent advancing to the next sentence if selection ends at start of a sentence + if (nLastStart >= nEndPos) + { + // now nCurrentStart is probably located on a non-letter word. (unless we + // are in Asian text with no spaces...) + // Thus to get the real sentence start we should locate the previous real word, + // that is one found by DICTIONARY_WORD + i18n::Boundary aBndry = _xBI->previousWord( *pNode, nLastStart, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nLastStart + 1 ) ) ), + i18n::WordType::DICTIONARY_WORD); + nLastEnd = _xBI->endOfSentence( + *pNode, aBndry.startPos, + SvxCreateLocale( GetLanguage( EditPaM( pNode, aBndry.startPos + 1 ) ) ) ); + if (nCurrentEnd > nLastEnd) + nCurrentEnd = nLastEnd; + } -#ifndef SVX_LIGHT - // Create UndoAction on Demand.... - if ( !pUndo && IsUndoEnabled() && !IsInUndo() ) - { - ESelection aESel( CreateESel( aSel ) ); - pUndo = new EditUndoTransliteration( this, aESel, nTransliterationMode ); + while (nCurrentStart < nLastEnd) + { + sal_Int32 nLen = nCurrentEnd - nCurrentStart; + DBG_ASSERT( nLen > 0, "invalid word length of 0" ); +#if OSL_DEBUG_LEVEL > 1 + String aText( pNode->Copy( nCurrentStart, nLen ) ); +#endif - if ( ( nStartNode == nEndNode ) && !aSel.Min().GetNode()->GetCharAttribs().HasAttrib( aSel.Min().GetIndex(), aSel.Max().GetIndex() ) ) - pUndo->SetText( aSel.Min().GetNode()->Copy( aSel.Min().GetIndex(), aSel.Max().GetIndex()-aSel.Min().GetIndex() ) ); - else - pUndo->SetText( CreateBinTextObject( aSel, NULL ) ); + Sequence< sal_Int32 > aOffsets; + String aNewText( aTranslitarationWrapper.transliterate( *pNode, + GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ), + nCurrentStart, nLen, &aOffsets )); + + if (!pNode->Equals( aNewText, nCurrentStart, nLen )) + { + aChgData.nStart = nCurrentStart; + aChgData.nLen = nLen; + aChgData.aSelection = EditSelection( EditPaM( pNode, nCurrentStart ), EditPaM( pNode, nCurrentEnd ) ); + aChgData.aNewText = aNewText; + aChgData.aOffsets = aOffsets; + aChanges.push_back( aChgData ); } -#endif - // Change text without loosing the attributes - USHORT nCharsAfterTransliteration = - sal::static_int_cast< USHORT >(aOffsets.getLength()); - const sal_Int32* pOffsets = aOffsets.getConstArray(); - short nDiffs = 0; - for ( USHORT n = 0; n < nCharsAfterTransliteration; n++ ) + i18n::Boundary aFirstWordBndry; + aFirstWordBndry = _xBI->nextWord( + *pNode, nCurrentEnd, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentEnd + 1 ) ) ), + nWordType); + nCurrentStart = aFirstWordBndry.startPos; + nCurrentEnd = _xBI->endOfSentence( + *pNode, nCurrentStart, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ) ) ); + } + DBG_ASSERT( nCurrentEnd >= nLastEnd, "failed to reach end of transliteration" ); + } + else + { + do + { + if ( bConsiderLanguage ) { - USHORT nCurrentPos = nCurrentStart+n; - sal_Int32 nDiff = (nCurrentPos-nDiffs) - pOffsets[n]; + nLanguage = GetLanguage( EditPaM( pNode, nCurrentStart+1 ), &nCurrentEnd ); + if ( nCurrentEnd > nEndPos ) + nCurrentEnd = nEndPos; + } - if ( !nDiff ) - { - DBG_ASSERT( nCurrentPos < pNode->Len(), "TransliterateText - String smaller than expected!" ); - pNode->SetChar( nCurrentPos, aNewText.GetChar(n) ); - } - else if ( nDiff < 0 ) - { - // Replace first char, delete the rest... - DBG_ASSERT( nCurrentPos < pNode->Len(), "TransliterateText - String smaller than expected!" ); - pNode->SetChar( nCurrentPos, aNewText.GetChar(n) ); + xub_StrLen nLen = nCurrentEnd - nCurrentStart; - DBG_ASSERT( (nCurrentPos+1) < pNode->Len(), "TransliterateText - String smaller than expected!" ); - GetEditDoc().RemoveChars( EditPaM( pNode, nCurrentPos+1 ), sal::static_int_cast< USHORT >(-nDiff) ); - } - else - { - DBG_ASSERT( nDiff == 1, "TransliterateText - Diff other than expected! But should work..." ); - GetEditDoc().InsertText( EditPaM( pNode, nCurrentPos ), aNewText.GetChar(n) ); + Sequence< sal_Int32 > aOffsets; + String aNewText( aTranslitarationWrapper.transliterate( *pNode, nLanguage, nCurrentStart, nLen, &aOffsets ) ); - } - nDiffs = sal::static_int_cast< short >(nDiffs + nDiff); + if (!pNode->Equals( aNewText, nCurrentStart, nLen )) + { + aChgData.nStart = nCurrentStart; + aChgData.nLen = nLen; + aChgData.aSelection = EditSelection( EditPaM( pNode, nCurrentStart ), EditPaM( pNode, nCurrentEnd ) ); + aChgData.aNewText = aNewText; + aChgData.aOffsets = aOffsets; + aChanges.push_back( aChgData ); } - if ( nNode == nEndNode ) - aNewSel.Max().GetIndex() = - aNewSel.Max().GetIndex() + nDiffs; + nCurrentStart = nCurrentEnd; + } while( nCurrentEnd < nEndPos ); + } - ParaPortion* pParaPortion = GetParaPortions()[nNode]; - pParaPortion->MarkSelectionInvalid( nCurrentStart, std::max< USHORT >( nCurrentStart+nLen, nCurrentStart+aNewText.Len() ) ); + if (aChanges.size() > 0) + { +#ifndef SVX_LIGHT + // Create a single UndoAction on Demand for all the changes ... + if ( !pUndo && IsUndoEnabled() && !IsInUndo() ) + { + // adjust selection to include all changes + for (size_t i = 0; i < aChanges.size(); ++i) + { + const EditSelection &rSel = aChanges[i].aSelection; + if (aSel.Min().GetNode() == rSel.Min().GetNode() && + aSel.Min().GetIndex() > rSel.Min().GetIndex()) + aSel.Min().SetIndex( rSel.Min().GetIndex() ); + if (aSel.Max().GetNode() == rSel.Max().GetNode() && + aSel.Max().GetIndex() < rSel.Max().GetIndex()) + aSel.Max().SetIndex( rSel.Max().GetIndex() ); + } + aNewSel = aSel; + + ESelection aESel( CreateESel( aSel ) ); + pUndo = new EditUndoTransliteration( this, aESel, nTransliterationMode ); + const bool bSingleNode = aSel.Min().GetNode()== aSel.Max().GetNode(); + const bool bHasAttribs = aSel.Min().GetNode()->GetCharAttribs().HasAttrib( aSel.Min().GetIndex(), aSel.Max().GetIndex() ); + if (bSingleNode && !bHasAttribs) + pUndo->SetText( aSel.Min().GetNode()->Copy( aSel.Min().GetIndex(), aSel.Max().GetIndex()-aSel.Min().GetIndex() ) ); + else + pUndo->SetText( CreateBinTextObject( aSel, NULL ) ); } - nCurrentStart = nCurrentEnd; - } while( nCurrentEnd < nEndPos ); +#endif + + // now apply the changes from end to start to leave the offsets of the + // yet unchanged text parts remain the same. + for (size_t i = 0; i < aChanges.size(); ++i) + { + const TransliterationChgData &rData = aChanges[ aChanges.size() - 1 - i ]; + + bChanges = TRUE; + if (rData.nLen != rData.aNewText.Len()) + bLenChanged = TRUE; + + // Change text without loosing the attributes + USHORT nDiffs = ReplaceTextOnly( rData.aSelection.Min().GetNode(), + rData.nStart, rData.nLen, rData.aNewText, rData.aOffsets ); + + // adjust selection in end node to possibly changed size + if (aSel.Max().GetNode() == rData.aSelection.Max().GetNode()) + aNewSel.Max().GetIndex() = aNewSel.Max().GetIndex() + nDiffs; + + USHORT nSelNode = aEditDoc.GetPos( rData.aSelection.Min().GetNode() ); + ParaPortion* pParaPortion = GetParaPortions()[nSelNode]; + pParaPortion->MarkSelectionInvalid( rData.nStart, + std::max< USHORT >( rData.nStart + rData.nLen, + rData.nStart + rData.aNewText.Len() ) ); + } + } // if (aChanges.size() > 0) } #ifndef SVX_LIGHT @@ -2932,6 +3135,52 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, return aNewSel; } + +short ImpEditEngine::ReplaceTextOnly( + ContentNode* pNode, + USHORT nCurrentStart, xub_StrLen nLen, + const String& rNewText, + const uno::Sequence< sal_Int32 >& rOffsets ) +{ + (void) nLen; + + // Change text without loosing the attributes + USHORT nCharsAfterTransliteration = + sal::static_int_cast< USHORT >(rOffsets.getLength()); + const sal_Int32* pOffsets = rOffsets.getConstArray(); + short nDiffs = 0; + for ( USHORT n = 0; n < nCharsAfterTransliteration; n++ ) + { + USHORT nCurrentPos = nCurrentStart+n; + sal_Int32 nDiff = (nCurrentPos-nDiffs) - pOffsets[n]; + + if ( !nDiff ) + { + DBG_ASSERT( nCurrentPos < pNode->Len(), "TransliterateText - String smaller than expected!" ); + pNode->SetChar( nCurrentPos, rNewText.GetChar(n) ); + } + else if ( nDiff < 0 ) + { + // Replace first char, delete the rest... + DBG_ASSERT( nCurrentPos < pNode->Len(), "TransliterateText - String smaller than expected!" ); + pNode->SetChar( nCurrentPos, rNewText.GetChar(n) ); + + DBG_ASSERT( (nCurrentPos+1) < pNode->Len(), "TransliterateText - String smaller than expected!" ); + GetEditDoc().RemoveChars( EditPaM( pNode, nCurrentPos+1 ), sal::static_int_cast< USHORT >(-nDiff) ); + } + else + { + DBG_ASSERT( nDiff == 1, "TransliterateText - Diff other than expected! But should work..." ); + GetEditDoc().InsertText( EditPaM( pNode, nCurrentPos ), rNewText.GetChar(n) ); + + } + nDiffs = sal::static_int_cast< short >(nDiffs + nDiff); + } + + return nDiffs; +} + + void ImpEditEngine::SetAsianCompressionMode( USHORT n ) { if ( n != nAsianCompressionMode ) -- cgit v1.2.3 From 358aeb01c2b9cf3936b1a967e50baa035526b0ee Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 26 Aug 2010 21:50:11 +0200 Subject: impress200: #i114089# clear user any after they are applied to the shape --- editeng/inc/editeng/unoipset.hxx | 1 + editeng/source/uno/unoipset.cxx | 21 ++++++++++++--------- svx/source/unodraw/unoshape.cxx | 1 + 3 files changed, 14 insertions(+), 9 deletions(-) (limited to 'editeng') diff --git a/editeng/inc/editeng/unoipset.hxx b/editeng/inc/editeng/unoipset.hxx index 22789ed959..3875ba82e0 100644 --- a/editeng/inc/editeng/unoipset.hxx +++ b/editeng/inc/editeng/unoipset.hxx @@ -64,6 +64,7 @@ public: sal_Bool AreThereOwnUsrAnys() const { return (pCombiList ? sal_True : sal_False); } ::com::sun::star::uno::Any* GetUsrAnyForID(sal_uInt16 nWID) const; void AddUsrAnyForID(const ::com::sun::star::uno::Any& rAny, sal_uInt16 nWID); + void ClearAllUsrAny(); com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const; const SfxItemPropertyMapEntry* getPropertyMapEntries() const {return _pMap;} diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 879c2ef8bb..a6c30e9eb0 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -71,15 +71,7 @@ SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMapEntry* pMap, Sfx //---------------------------------------------------------------------- SvxItemPropertySet::~SvxItemPropertySet() { -/* - if(pItemPool) - delete pItemPool; - pItemPool = NULL; -*/ - - if(pCombiList) - delete pCombiList; - pCombiList = NULL; + ClearAllUsrAny(); } //---------------------------------------------------------------------- @@ -111,6 +103,17 @@ void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID) pCombiList->Insert(pNew); } +//---------------------------------------------------------------------- + +void SvxItemPropertySet::ClearAllUsrAny() +{ + if(pCombiList) + delete pCombiList; + pCombiList = NULL; +} + +//---------------------------------------------------------------------- + sal_Bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) { sal_Bool bConvert = sal_True; // the default is that all metric items must be converted diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 8b5004334e..4eaa22e866 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -708,6 +708,7 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& // next entry ++aSrcIt; } + const_cast< SvxItemPropertySet& >(rPropSet).ClearAllUsrAny(); } } -- cgit v1.2.3 From b9ac40c5e85941fb7896ce11c005106b69a89ec8 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 10 Sep 2010 13:10:07 +0200 Subject: sb129: #i113189# change UNO components to use passive registration --- avmedia/prj/d.lst | 5 + avmedia/source/framework/soundhandler.cxx | 38 ----- avmedia/source/gstreamer/avmediagst.component | 34 ++++ avmedia/source/gstreamer/exports.dxp | 1 - avmedia/source/gstreamer/gstuno.cxx | 29 ---- avmedia/source/gstreamer/makefile.mk | 8 + avmedia/source/java/MediaUno.java | 9 -- avmedia/source/java/avmedia.jar.component | 34 ++++ avmedia/source/java/makefile.mk | 8 + .../source/quicktime/avmediaQuickTime.component | 34 ++++ avmedia/source/quicktime/makefile.mk | 8 + avmedia/source/quicktime/quicktimeuno.cxx | 29 ---- avmedia/source/win/avmediawin.component | 34 ++++ avmedia/source/win/exports.dxp | 1 - avmedia/source/win/makefile.mk | 8 + avmedia/source/win/winuno.cxx | 27 ---- avmedia/source/xine/exports.dxp | 1 - avmedia/source/xine/xineuno.cxx | 29 ---- avmedia/util/avmedia.component | 34 ++++ avmedia/util/makefile.mk | 8 + basic/prj/d.lst | 1 + basic/util/makefile.mk | 6 + basic/util/sb.component | 39 +++++ configmgr/prj/d.lst | 1 + configmgr/source/configmgr.component | 45 ++++++ configmgr/source/makefile.mk | 8 + configmgr/source/services.cxx | 48 ------ connectivity/prj/d.lst | 17 ++ .../commontools/FDatabaseMetaDataResultSet.cxx | 5 - connectivity/source/cpool/Zregistration.cxx | 29 ---- connectivity/source/cpool/dbpool2.component | 34 ++++ connectivity/source/cpool/exports.dxp | 1 - connectivity/source/cpool/makefile.mk | 6 + connectivity/source/dbtools/dbtools.component | 37 +++++ connectivity/source/dbtools/exports.dxp | 1 - connectivity/source/dbtools/makefile.mk | 8 + connectivity/source/drivers/adabas/Bservices.cxx | 52 ------ .../source/drivers/adabas/adabas.component | 35 ++++ connectivity/source/drivers/adabas/adabas.mxp.map | 1 - connectivity/source/drivers/adabas/exports.dxp | 1 - connectivity/source/drivers/adabas/makefile.mk | 8 + connectivity/source/drivers/ado/Aservices.cxx | 52 ------ connectivity/source/drivers/ado/ado.component | 35 ++++ connectivity/source/drivers/ado/exports.dxp | 1 - connectivity/source/drivers/ado/makefile.mk | 8 + connectivity/source/drivers/calc/Cservices.cxx | 52 ------ connectivity/source/drivers/calc/calc.component | 35 ++++ connectivity/source/drivers/calc/exports.dxp | 1 - connectivity/source/drivers/calc/makefile.mk | 8 + connectivity/source/drivers/dbase/Dservices.cxx | 52 ------ connectivity/source/drivers/dbase/dbase.component | 35 ++++ connectivity/source/drivers/dbase/dbase.mxp.map | 1 - connectivity/source/drivers/dbase/exports.dxp | 1 - connectivity/source/drivers/dbase/makefile.mk | 8 + connectivity/source/drivers/evoab/LServices.cxx | 52 ------ connectivity/source/drivers/evoab/exports.dxp | 1 - connectivity/source/drivers/evoab2/NServices.cxx | 51 ------ connectivity/source/drivers/evoab2/evoab.component | 34 ++++ connectivity/source/drivers/evoab2/makefile.mk | 8 + connectivity/source/drivers/flat/Eservices.cxx | 52 ------ connectivity/source/drivers/flat/exports.dxp | 1 - connectivity/source/drivers/flat/flat.component | 35 ++++ connectivity/source/drivers/flat/flat.mxp.map | 1 - connectivity/source/drivers/flat/makefile.mk | 8 + connectivity/source/drivers/hsqldb/Hservices.cxx | 52 ------ connectivity/source/drivers/hsqldb/exports.dxp | 1 - .../source/drivers/hsqldb/hsqldb.component | 35 ++++ connectivity/source/drivers/hsqldb/hsqldb.map | 1 - connectivity/source/drivers/hsqldb/makefile.mk | 8 + connectivity/source/drivers/jdbc/exports.dxp | 1 - connectivity/source/drivers/jdbc/jdbc.component | 34 ++++ connectivity/source/drivers/jdbc/jdbc.mxp.map | 1 - connectivity/source/drivers/jdbc/jservices.cxx | 51 ------ connectivity/source/drivers/jdbc/makefile.mk | 8 + connectivity/source/drivers/kab/KServices.cxx | 52 ------ connectivity/source/drivers/kab/exports.dxp | 1 - connectivity/source/drivers/kab/kab1.component | 34 ++++ connectivity/source/drivers/kab/makefile.mk | 8 + .../source/drivers/macab/MacabServices.cxx | 52 ------ connectivity/source/drivers/macab/exports.dxp | 1 - connectivity/source/drivers/macab/macab1.component | 34 ++++ connectivity/source/drivers/macab/makefile.mk | 8 + connectivity/source/drivers/mozab/MServices.cxx | 57 ------- .../drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 45 ------ .../source/drivers/mozab/bootstrap/makefile.mk | 9 +- .../drivers/mozab/bootstrap/mozbootstrap.component | 34 ++++ connectivity/source/drivers/mozab/exports.dxp | 1 - connectivity/source/drivers/mozab/makefile.mk | 8 + connectivity/source/drivers/mozab/mozab.component | 37 +++++ connectivity/source/drivers/mysql/Yservices.cxx | 52 ------ connectivity/source/drivers/mysql/exports.dxp | 1 - connectivity/source/drivers/mysql/makefile.mk | 8 + connectivity/source/drivers/mysql/mysql.component | 35 ++++ connectivity/source/drivers/odbc/makefile.mk | 8 + connectivity/source/drivers/odbc/odbc.component | 34 ++++ connectivity/source/drivers/odbc/oservices.cxx | 52 ------ connectivity/source/manager/exports.dxp | 1 - connectivity/source/manager/makefile.mk | 6 + connectivity/source/manager/mregistration.cxx | 33 ---- connectivity/source/manager/sdbc.mxp.map | 1 - connectivity/source/manager/sdbc2.component | 34 ++++ desktop/prj/d.lst | 7 + desktop/source/app/exports.dxp | 1 - desktop/source/deployment/deployment.component | 64 ++++++++ desktop/source/deployment/dp_services.cxx | 21 --- .../source/deployment/gui/deploymentgui.component | 40 +++++ desktop/source/deployment/gui/dp_gui_service.cxx | 8 - desktop/source/deployment/gui/makefile.mk | 8 + desktop/source/deployment/makefile.mk | 8 + desktop/source/migration/services/cexports.cxx | 7 - desktop/source/migration/services/cexportsoo3.cxx | 7 - desktop/source/migration/services/makefile.mk | 17 +- .../migration/services/migrationoo2.component | 37 +++++ .../migration/services/migrationoo3.component | 34 ++++ desktop/source/migration/services/migrationoo3.map | 8 - desktop/source/offacc/acceptor.cxx | 17 -- desktop/source/offacc/makefile.mk | 8 + desktop/source/offacc/offacc.component | 34 ++++ .../com/sun/star/registration/Registration.java | 4 - .../com/sun/star/registration/makefile.mk | 7 + .../registration/productregistration.jar.component | 34 ++++ desktop/source/so_comp/services.cxx | 26 --- desktop/source/splash/makefile.mk | 8 + desktop/source/splash/services_spl.cxx | 26 --- desktop/source/splash/spl.component | 37 +++++ editeng/util/editeng.dxp | 1 - embeddedobj/prj/d.lst | 2 + embeddedobj/source/commonembedding/register.cxx | 42 ----- embeddedobj/source/msole/emboleobj.component | 35 ++++ .../source/msole/emboleobj.windows.component | 39 +++++ embeddedobj/source/msole/exports.dxp | 1 - embeddedobj/source/msole/makefile.mk | 11 ++ embeddedobj/util/embobj.component | 43 +++++ embeddedobj/util/exports.dxp | 1 - embeddedobj/util/makefile.mk | 8 + eventattacher/prj/d.lst | 1 + eventattacher/source/eventattacher.cxx | 28 ---- eventattacher/source/evtatt.component | 34 ++++ eventattacher/source/makefile.mk | 8 + fileaccess/prj/d.lst | 1 + fileaccess/source/FileAccess.cxx | 26 --- fileaccess/source/fileacc.component | 34 ++++ fileaccess/source/makefile.mk | 8 + formula/prj/d.lst | 1 + formula/source/core/api/services.cxx | 6 - formula/util/for.component | 34 ++++ formula/util/makefile.mk | 8 + fpicker/prj/d.lst | 10 +- fpicker/source/aqua/FPentry.cxx | 26 --- fpicker/source/aqua/fps-aqua-ucd.txt | 13 -- fpicker/source/aqua/fps_aqua.component | 37 +++++ fpicker/source/aqua/makefile.mk | 8 + fpicker/source/generic/fpicker.component | 37 +++++ fpicker/source/generic/fpicker.cxx | 7 - fpicker/source/generic/makefile.mk | 8 + fpicker/source/office/fps_office.component | 37 +++++ fpicker/source/office/fps_office.cxx | 7 - fpicker/source/office/makefile.mk | 8 + fpicker/source/unx/gnome/FPentry.cxx | 26 --- fpicker/source/unx/gnome/fps-gnome-ucd.txt | 13 -- fpicker/source/unx/gnome/fps_gnome.component | 37 +++++ fpicker/source/unx/gnome/makefile.mk | 8 + fpicker/source/unx/kde4/KDE4FPEntry.cxx | 21 --- fpicker/source/unx/kde4/fps-kde4-ucd.txt | 6 - fpicker/source/unx/kde4/fps_kde4.component | 34 ++++ fpicker/source/unx/kde4/makefile.mk | 8 + fpicker/source/win32/filepicker/FPentry.cxx | 25 --- fpicker/source/win32/folderpicker/Fopentry.cxx | 25 --- fpicker/util/exports.dxp | 1 - fpicker/util/fop.component | 34 ++++ fpicker/util/fps.component | 34 ++++ fpicker/util/makefile.mk | 13 ++ framework/inc/macros/debug/registration.hxx | 21 --- framework/inc/macros/registration.hxx | 96 +---------- framework/prj/d.lst | 3 + .../source/register/register3rdcomponents.cxx | 10 -- framework/source/register/registerlogindialog.cxx | 7 - framework/source/register/registerservices.cxx | 64 -------- framework/source/register/registertemp.cxx | 29 ---- framework/util/fwk.component | 142 ++++++++++++++++ framework/util/fwl.component | 100 ++++++++++++ framework/util/fwm.component | 43 +++++ framework/util/makefile.mk | 20 +++ linguistic/prj/d.lst | 1 + linguistic/source/convdiclist.cxx | 25 --- linguistic/source/dlistimp.cxx | 25 --- linguistic/source/gciterator.cxx | 24 --- linguistic/source/grammarchecker.cxx | 21 --- linguistic/source/lng.component | 46 ++++++ linguistic/source/lngopt.cxx | 23 --- linguistic/source/lngreg.cxx | 58 ------- linguistic/source/lngsvcmgr.cxx | 25 --- linguistic/source/makefile.mk | 13 +- .../script/framework/security/SecurityDialog.java | 5 - scripting/java/ScriptFramework.component | 34 ++++ .../java/ScriptProviderForBeanShell.component | 37 +++++ scripting/java/ScriptProviderForJava.component | 37 +++++ .../java/ScriptProviderForJavaScript.component | 37 +++++ .../beanshell/ScriptProviderForBeanShell.java | 35 ---- .../provider/java/ScriptProviderForJava.java | 35 ---- .../javascript/ScriptProviderForJavaScript.java | 34 ---- scripting/java/makefile.mk | 34 ++++ scripting/prj/d.lst | 12 ++ scripting/source/basprov/basprov.component | 37 +++++ scripting/source/basprov/basprov.cxx | 7 - scripting/source/basprov/makefile.mk | 8 + scripting/source/dlgprov/dlgprov.component | 36 +++++ scripting/source/dlgprov/dlgprov.cxx | 7 - scripting/source/dlgprov/makefile.mk | 8 + scripting/source/protocolhandler/exports.dxp | 1 - scripting/source/protocolhandler/makefile.mk | 8 + .../protocolhandler/protocolhandler.component | 34 ++++ scripting/source/protocolhandler/scripthandler.cxx | 21 --- scripting/source/provider/MasterScriptProvider.cxx | 36 ----- scripting/source/provider/exports.dxp | 1 - scripting/source/pyprov/mailmerge.component | 37 +++++ scripting/source/pyprov/makefile.mk | 14 ++ scripting/source/pyprov/pythonscript.component | 35 ++++ .../source/runtimemgr/ScriptRuntimeManager.cxx | 62 ------- scripting/source/runtimemgr/exports.dxp | 1 - scripting/source/storage/exports.dxp | 1 - scripting/source/stringresource/makefile.mk | 8 + .../source/stringresource/stringresource.component | 40 +++++ scripting/source/stringresource/stringresource.cxx | 7 - scripting/source/vbaevents/makefile.mk | 8 + scripting/source/vbaevents/service.cxx | 10 -- scripting/source/vbaevents/vbaevents.component | 37 +++++ scripting/util/exports.dxp | 1 - scripting/util/makefile.mk | 8 + scripting/util/scriptframe.component | 49 ++++++ sfx2/inc/sfx2/sfxuno.hxx | 47 ------ sfx2/prj/d.lst | 1 + sfx2/source/appl/appuno.cxx | 160 ------------------ sfx2/source/doc/SfxDocumentMetaData.cxx | 7 - sfx2/util/makefile.mk | 8 + sfx2/util/sfx.component | 75 +++++++++ shell/prj/d.lst | 11 +- shell/source/backends/desktopbe/desktopbackend.cxx | 6 - shell/source/backends/desktopbe/desktopbe1-ucd.txt | 6 - .../source/backends/desktopbe/desktopbe1.component | 34 ++++ shell/source/backends/desktopbe/makefile.mk | 10 +- shell/source/backends/gconfbe/gconfbackend.cxx | 6 - shell/source/backends/gconfbe/gconfbe1-ucd.txt | 6 - shell/source/backends/gconfbe/gconfbe1.component | 34 ++++ shell/source/backends/gconfbe/makefile.mk | 11 +- shell/source/backends/kde4be/kde4backend.cxx | 6 - shell/source/backends/kde4be/kde4be1-ucd.txt | 6 - shell/source/backends/kde4be/kde4be1.component | 34 ++++ shell/source/backends/kde4be/makefile.mk | 10 +- shell/source/backends/kdebe/kdebackend.cxx | 6 - shell/source/backends/kdebe/kdebe1-ucd.txt | 6 - shell/source/backends/kdebe/kdebe1.component | 34 ++++ shell/source/backends/kdebe/makefile.mk | 10 +- shell/source/backends/localebe/localebe1.component | 34 ++++ shell/source/backends/localebe/localebecdef.cxx | 7 - shell/source/backends/localebe/makefile.mk | 8 + shell/source/backends/macbe/macbe1.component | 34 ++++ shell/source/backends/macbe/macbecdef.cxx | 7 - shell/source/backends/macbe/makefile.mk | 8 + shell/source/backends/wininetbe/makefile.mk | 8 + .../source/backends/wininetbe/wininetbe1.component | 34 ++++ shell/source/backends/wininetbe/wininetbecdef.cxx | 7 - shell/source/cmdmail/cmdmail.component | 34 ++++ shell/source/cmdmail/cmdmailentry.cxx | 24 --- shell/source/cmdmail/exports.dxp | 1 - shell/source/cmdmail/makefile.mk | 7 + shell/source/unix/exec/makefile.mk | 8 + shell/source/unix/exec/shellexecentry.cxx | 23 --- shell/source/unix/exec/syssh.component | 34 ++++ shell/source/win32/SysShentry.cxx | 26 --- shell/source/win32/exports.dxp | 1 - shell/source/win32/makefile.mk | 8 + shell/source/win32/simplemail/exports.dxp | 1 - shell/source/win32/simplemail/makefile.mk | 8 + shell/source/win32/simplemail/smplmail.component | 34 ++++ shell/source/win32/simplemail/smplmailentry.cxx | 26 --- shell/source/win32/syssh.component | 34 ++++ svx/prj/d.lst | 3 + svx/source/core/coreservices.cxx | 38 ----- .../unodialogs/textconversiondlgs/makefile.mk | 8 + .../unodialogs/textconversiondlgs/services.cxx | 7 - .../textconversiondlgs.component | 34 ++++ svx/source/unodraw/unoctabl.cxx | 54 ------- svx/util/gal.dxp | 1 - svx/util/makefile.mk | 14 ++ svx/util/svx.component | 76 +++++++++ svx/util/svx.dxp | 1 - svx/util/svxcore.component | 49 ++++++ sysui/util/exports.dxp | 1 - ucb/prj/d.lst | 15 +- ucb/source/cacher/cached1.component | 43 +++++ ucb/source/cacher/cacheserv.cxx | 77 --------- ucb/source/cacher/makefile.mk | 8 + ucb/source/core/exports2.dxp | 1 - ucb/source/core/makefile.mk | 8 + ucb/source/core/ucb1.component | 46 ++++++ ucb/source/core/ucbserv.cxx | 87 ---------- ucb/source/sorter/makefile.mk | 8 + ucb/source/sorter/sortmain.cxx | 55 ------- ucb/source/sorter/srtrs1.component | 34 ++++ ucb/source/ucp/expand/makefile.mk | 8 + ucb/source/ucp/expand/ucpexpand.cxx | 8 - ucb/source/ucp/expand/ucpexpand1.component | 35 ++++ ucb/source/ucp/ext/makefile.mk | 8 + ucb/source/ucp/ext/ucpext.component | 35 ++++ ucb/source/ucp/ext/ucpext_services.cxx | 6 - ucb/source/ucp/file/exports2.dxp | 1 - ucb/source/ucp/file/makefile.mk | 8 + ucb/source/ucp/file/prov.cxx | 54 ------- ucb/source/ucp/file/ucpfile1.component | 34 ++++ ucb/source/ucp/ftp/ftpservices.cxx | 54 ------- ucb/source/ucp/ftp/makefile.mk | 8 + ucb/source/ucp/ftp/ucpftp1.component | 34 ++++ ucb/source/ucp/gio/gio_provider.cxx | 35 ---- ucb/source/ucp/gio/makefile.mk | 10 +- ucb/source/ucp/gio/ucpgio-ucd.txt | 6 - ucb/source/ucp/gio/ucpgio.component | 34 ++++ ucb/source/ucp/gvfs/gvfs_provider.cxx | 45 ------ ucb/source/ucp/gvfs/makefile.mk | 9 +- ucb/source/ucp/gvfs/ucpgvfs-ucd.txt | 6 - ucb/source/ucp/gvfs/ucpgvfs.component | 34 ++++ ucb/source/ucp/hierarchy/hierarchyservices.cxx | 63 -------- ucb/source/ucp/hierarchy/makefile.mk | 8 + ucb/source/ucp/hierarchy/ucphier1.component | 38 +++++ ucb/source/ucp/odma/odma_services.cxx | 39 ----- ucb/source/ucp/package/makefile.mk | 8 + ucb/source/ucp/package/pkgservices.cxx | 59 ------- ucb/source/ucp/package/ucppkg1.component | 34 ++++ ucb/source/ucp/tdoc/makefile.mk | 8 + ucb/source/ucp/tdoc/tdoc_services.cxx | 62 ------- ucb/source/ucp/tdoc/ucptdoc1.component | 37 +++++ ucb/source/ucp/webdav/makefile.mk | 8 + ucb/source/ucp/webdav/ucpdav1.component | 34 ++++ ucb/source/ucp/webdav/webdavservices.cxx | 54 ------- uui/prj/d.lst | 1 + uui/source/services.cxx | 80 --------- uui/util/makefile.mk | 8 + uui/util/uui.component | 44 +++++ vbahelper/prj/d.lst | 1 + vbahelper/source/msforms/service.cxx | 10 -- vbahelper/util/makefile.mk | 8 + vbahelper/util/msforms.component | 37 +++++ xmlhelp/prj/d.lst | 3 + .../source/com/sun/star/help/HelpComponent.java | 25 +-- xmlhelp/source/com/sun/star/help/HelpSearch.java | 19 +-- .../com/sun/star/help/LuceneHelpWrapper.component | 37 +++++ xmlhelp/source/com/sun/star/help/makefile.mk | 8 + xmlhelp/source/cxxhelp/provider/services.cxx | 55 ------- xmlhelp/source/treeview/makefile.mk | 8 + xmlhelp/source/treeview/tvfactory.cxx | 57 ------- xmlhelp/source/treeview/tvhlp1.component | 35 ++++ xmlhelp/util/makefile.mk | 8 + xmlhelp/util/ucpchelp1.component | 35 ++++ xmloff/prj/d.lst | 2 + xmloff/source/core/facreg.cxx | 111 ------------- xmloff/source/transform/XMLFilterRegistration.cxx | 33 ---- xmloff/source/transform/makefile.mk | 8 + xmloff/source/transform/xof.component | 118 ++++++++++++++ xmloff/util/makefile.mk | 8 + xmloff/util/xo.component | 178 +++++++++++++++++++++ xmlscript/prj/d.lst | 1 + xmlscript/source/misc/unoservices.cxx | 9 -- xmlscript/util/makefile.mk | 8 + xmlscript/util/xcr.component | 46 ++++++ 364 files changed, 4831 insertions(+), 3785 deletions(-) create mode 100644 avmedia/source/gstreamer/avmediagst.component create mode 100644 avmedia/source/java/avmedia.jar.component create mode 100644 avmedia/source/quicktime/avmediaQuickTime.component create mode 100644 avmedia/source/win/avmediawin.component create mode 100644 avmedia/util/avmedia.component create mode 100644 basic/util/sb.component create mode 100644 configmgr/source/configmgr.component create mode 100644 connectivity/source/cpool/dbpool2.component create mode 100644 connectivity/source/dbtools/dbtools.component create mode 100644 connectivity/source/drivers/adabas/adabas.component create mode 100644 connectivity/source/drivers/ado/ado.component create mode 100644 connectivity/source/drivers/calc/calc.component create mode 100644 connectivity/source/drivers/dbase/dbase.component create mode 100644 connectivity/source/drivers/evoab2/evoab.component create mode 100644 connectivity/source/drivers/flat/flat.component create mode 100644 connectivity/source/drivers/hsqldb/hsqldb.component create mode 100644 connectivity/source/drivers/jdbc/jdbc.component create mode 100644 connectivity/source/drivers/kab/kab1.component create mode 100644 connectivity/source/drivers/macab/macab1.component create mode 100644 connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component create mode 100644 connectivity/source/drivers/mozab/mozab.component create mode 100644 connectivity/source/drivers/mysql/mysql.component create mode 100644 connectivity/source/drivers/odbc/odbc.component create mode 100644 connectivity/source/manager/sdbc2.component create mode 100644 desktop/source/deployment/deployment.component create mode 100644 desktop/source/deployment/gui/deploymentgui.component mode change 100755 => 100644 desktop/source/deployment/gui/dp_gui_service.cxx mode change 100755 => 100644 desktop/source/migration/services/cexportsoo3.cxx create mode 100644 desktop/source/migration/services/migrationoo2.component create mode 100644 desktop/source/migration/services/migrationoo3.component delete mode 100755 desktop/source/migration/services/migrationoo3.map create mode 100644 desktop/source/offacc/offacc.component create mode 100644 desktop/source/registration/com/sun/star/registration/productregistration.jar.component create mode 100644 desktop/source/splash/spl.component create mode 100644 embeddedobj/source/msole/emboleobj.component create mode 100644 embeddedobj/source/msole/emboleobj.windows.component create mode 100644 embeddedobj/util/embobj.component create mode 100644 eventattacher/source/evtatt.component create mode 100644 fileaccess/source/fileacc.component create mode 100644 formula/util/for.component delete mode 100644 fpicker/source/aqua/fps-aqua-ucd.txt create mode 100644 fpicker/source/aqua/fps_aqua.component create mode 100644 fpicker/source/generic/fpicker.component create mode 100644 fpicker/source/office/fps_office.component delete mode 100644 fpicker/source/unx/gnome/fps-gnome-ucd.txt create mode 100644 fpicker/source/unx/gnome/fps_gnome.component delete mode 100644 fpicker/source/unx/kde4/fps-kde4-ucd.txt create mode 100644 fpicker/source/unx/kde4/fps_kde4.component create mode 100644 fpicker/util/fop.component create mode 100644 fpicker/util/fps.component create mode 100644 framework/util/fwk.component create mode 100644 framework/util/fwl.component create mode 100644 framework/util/fwm.component create mode 100644 linguistic/source/lng.component create mode 100644 scripting/java/ScriptFramework.component create mode 100644 scripting/java/ScriptProviderForBeanShell.component create mode 100644 scripting/java/ScriptProviderForJava.component create mode 100644 scripting/java/ScriptProviderForJavaScript.component create mode 100644 scripting/source/basprov/basprov.component create mode 100644 scripting/source/dlgprov/dlgprov.component create mode 100644 scripting/source/protocolhandler/protocolhandler.component create mode 100644 scripting/source/pyprov/mailmerge.component create mode 100644 scripting/source/pyprov/pythonscript.component create mode 100644 scripting/source/stringresource/stringresource.component mode change 100644 => 100755 scripting/source/vbaevents/makefile.mk create mode 100644 scripting/source/vbaevents/vbaevents.component create mode 100644 scripting/util/scriptframe.component mode change 100755 => 100644 sfx2/source/appl/appuno.cxx create mode 100644 sfx2/util/sfx.component delete mode 100644 shell/source/backends/desktopbe/desktopbe1-ucd.txt create mode 100644 shell/source/backends/desktopbe/desktopbe1.component delete mode 100644 shell/source/backends/gconfbe/gconfbe1-ucd.txt create mode 100644 shell/source/backends/gconfbe/gconfbe1.component delete mode 100644 shell/source/backends/kde4be/kde4be1-ucd.txt create mode 100644 shell/source/backends/kde4be/kde4be1.component delete mode 100644 shell/source/backends/kdebe/kdebe1-ucd.txt create mode 100644 shell/source/backends/kdebe/kdebe1.component create mode 100644 shell/source/backends/localebe/localebe1.component create mode 100644 shell/source/backends/macbe/macbe1.component create mode 100644 shell/source/backends/wininetbe/wininetbe1.component create mode 100644 shell/source/cmdmail/cmdmail.component create mode 100644 shell/source/unix/exec/syssh.component create mode 100644 shell/source/win32/simplemail/smplmail.component create mode 100644 shell/source/win32/syssh.component create mode 100644 svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component create mode 100644 svx/util/svx.component create mode 100644 svx/util/svxcore.component create mode 100644 ucb/source/cacher/cached1.component create mode 100644 ucb/source/core/ucb1.component create mode 100644 ucb/source/sorter/srtrs1.component create mode 100644 ucb/source/ucp/expand/ucpexpand1.component create mode 100644 ucb/source/ucp/ext/ucpext.component create mode 100644 ucb/source/ucp/file/ucpfile1.component create mode 100644 ucb/source/ucp/ftp/ucpftp1.component delete mode 100644 ucb/source/ucp/gio/ucpgio-ucd.txt create mode 100644 ucb/source/ucp/gio/ucpgio.component delete mode 100644 ucb/source/ucp/gvfs/ucpgvfs-ucd.txt create mode 100644 ucb/source/ucp/gvfs/ucpgvfs.component create mode 100644 ucb/source/ucp/hierarchy/ucphier1.component create mode 100644 ucb/source/ucp/package/ucppkg1.component create mode 100644 ucb/source/ucp/tdoc/ucptdoc1.component create mode 100644 ucb/source/ucp/webdav/ucpdav1.component create mode 100644 uui/util/uui.component create mode 100644 vbahelper/util/msforms.component create mode 100644 xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component create mode 100644 xmlhelp/source/treeview/tvhlp1.component create mode 100644 xmlhelp/util/ucpchelp1.component create mode 100644 xmloff/source/transform/xof.component create mode 100644 xmloff/util/xo.component create mode 100644 xmlscript/util/xcr.component (limited to 'editeng') diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst index c82db252aa..eb140ed457 100644 --- a/avmedia/prj/d.lst +++ b/avmedia/prj/d.lst @@ -16,3 +16,8 @@ mkdir: %_DEST%\inc%_EXT%\avmedia ..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc%_EXT%\avmedia\mediatoolbox.hxx ..\%__SRC%\class\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar +..\%__SRC%\misc\avmedia.component %_DEST%\xml%_EXT%\avmedia.component +..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml%_EXT%\avmedia.jar.component +..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml%_EXT%\avmediaQuickTime.component +..\%__SRC%\misc\avmediagst.component %_DEST%\xml%_EXT%\avmediagst.component +..\%__SRC%\misc\avmediawin.component %_DEST%\xml%_EXT%\avmediawin.component diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 1e2a1f9f16..784e023e19 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -497,44 +497,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - rtl::OUString sKeyName = DECLARE_ASCII( "/" ); - sKeyName += avmedia::SoundHandler::impl_getStaticImplementationName(); - sKeyName += DECLARE_ASCII( "/UNO/SERVICES" ); - css::uno::Reference< css::registry::XRegistryKey > xNewKey( - static_cast< css::registry::XRegistryKey* >( pRegistryKey )->createKey(sKeyName)); - - if ( xNewKey.is() == sal_True ) - { - css::uno::Sequence< ::rtl::OUString > seqServiceNames = avmedia::SoundHandler::impl_getStaticSupportedServiceNames(); - const ::rtl::OUString* pArray = seqServiceNames.getArray(); - sal_Int32 nLength = seqServiceNames.getLength(); - for ( sal_Int32 nCounter = 0; nCounter < nLength; ++nCounter ) - xNewKey->createKey( pArray[nCounter] ); - } - - bRet = sal_True; - } - catch( css::registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/avmedia/source/gstreamer/avmediagst.component b/avmedia/source/gstreamer/avmediagst.component new file mode 100644 index 0000000000..75d39d275f --- /dev/null +++ b/avmedia/source/gstreamer/avmediagst.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/avmedia/source/gstreamer/exports.dxp +++ b/avmedia/source/gstreamer/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx index a13a0f153b..8470d8cb6c 100644 --- a/avmedia/source/gstreamer/gstuno.cxx +++ b/avmedia/source/gstreamer/gstuno.cxx @@ -48,35 +48,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xNewKey1( - static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( - ::rtl::OUString::createFromAscii( - "/" AVMEDIA_GSTREAMER_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/" - AVMEDIA_GSTREAMER_MANAGER_SERVICENAME ) ) ); - - bRet = sal_True; - } - catch( registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk index 2f22c73337..c648fcc77f 100644 --- a/avmedia/source/gstreamer/makefile.mk +++ b/avmedia/source/gstreamer/makefile.mk @@ -69,3 +69,11 @@ DEF1EXPORTFILE=exports.dxp .ENDIF .INCLUDE : target.mk + +ALLTAR : $(MISC)/avmediagst.component + +$(MISC)/avmediagst.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + avmediagst.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt avmediagst.component diff --git a/avmedia/source/java/MediaUno.java b/avmedia/source/java/MediaUno.java index 004ae7cf68..b77fd97eae 100644 --- a/avmedia/source/java/MediaUno.java +++ b/avmedia/source/java/MediaUno.java @@ -64,13 +64,4 @@ public class MediaUno return null; } - - // ------------------------------------------------------------------------- - - public static boolean __writeRegistryServiceInfo( - com.sun.star.registry.XRegistryKey regKey ) - { - return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo( - s_implName, s_serviceName, regKey ); - } } diff --git a/avmedia/source/java/avmedia.jar.component b/avmedia/source/java/avmedia.jar.component new file mode 100644 index 0000000000..d7cc160bd7 --- /dev/null +++ b/avmedia/source/java/avmedia.jar.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk index 37c53a7211..1fe771c117 100644 --- a/avmedia/source/java/makefile.mk +++ b/avmedia/source/java/makefile.mk @@ -59,3 +59,11 @@ CUSTOMMANIFESTFILE = manifest # --- Targets ------------------------------------------------------ .INCLUDE: target.mk + +ALLTAR : $(MISC)/avmedia.jar.component + +$(MISC)/avmedia.jar.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)avmedia.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component diff --git a/avmedia/source/quicktime/avmediaQuickTime.component b/avmedia/source/quicktime/avmediaQuickTime.component new file mode 100644 index 0000000000..aa0251d74c --- /dev/null +++ b/avmedia/source/quicktime/avmediaQuickTime.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk index f3c9f244f3..358fce4918 100644 --- a/avmedia/source/quicktime/makefile.mk +++ b/avmedia/source/quicktime/makefile.mk @@ -83,3 +83,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map dummy: @echo " Nothing to build for GUIBASE=$(GUIBASE)" .ENDIF + +ALLTAR : $(MISC)/avmediaQuickTime.component + +$(MISC)/avmediaQuickTime.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx index 641b7df67b..d43dc02685 100644 --- a/avmedia/source/quicktime/quicktimeuno.cxx +++ b/avmedia/source/quicktime/quicktimeuno.cxx @@ -48,35 +48,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xNewKey1( - static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( - ::rtl::OUString::createFromAscii( - "/" AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/" - AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) ) ); - - bRet = sal_True; - } - catch( registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/avmedia/source/win/avmediawin.component b/avmedia/source/win/avmediawin.component new file mode 100644 index 0000000000..c80c19bff0 --- /dev/null +++ b/avmedia/source/win/avmediawin.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/avmedia/source/win/exports.dxp b/avmedia/source/win/exports.dxp index db9c0a52f2..926e49f5f1 100644 --- a/avmedia/source/win/exports.dxp +++ b/avmedia/source/win/exports.dxp @@ -1,4 +1,3 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk index b70841e8bd..37db25b6a8 100644 --- a/avmedia/source/win/makefile.mk +++ b/avmedia/source/win/makefile.mk @@ -80,3 +80,11 @@ SHL1STDLIBS += dxguid.lib .ENDIF .INCLUDE : target.mk + +ALLTAR : $(MISC)/avmediawin.component + +$(MISC)/avmediawin.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + avmediawin.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt avmediawin.component diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx index 0d559c4f75..8a56e3dd77 100644 --- a/avmedia/source/win/winuno.cxx +++ b/avmedia/source/win/winuno.cxx @@ -48,33 +48,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xNewKey1( - static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( - ::rtl::OUString::createFromAscii( "/com.sun.star.comp.avmedia.Manager_DirectX/UNO/SERVICES/com.sun.star.media.Manager_DirectX" ) ) ); - - bRet = sal_True; - } - catch( registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/avmedia/source/xine/exports.dxp b/avmedia/source/xine/exports.dxp index db9c0a52f2..926e49f5f1 100644 --- a/avmedia/source/xine/exports.dxp +++ b/avmedia/source/xine/exports.dxp @@ -1,4 +1,3 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/avmedia/source/xine/xineuno.cxx b/avmedia/source/xine/xineuno.cxx index 87c0b53298..52d8bac62c 100644 --- a/avmedia/source/xine/xineuno.cxx +++ b/avmedia/source/xine/xineuno.cxx @@ -48,35 +48,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xNewKey1( - static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( - ::rtl::OUString::createFromAscii( - "/" AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/" - AVMEDIA_XINE_MANAGER_SERVICENAME ) ) ); - - bRet = sal_True; - } - catch( registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/avmedia/util/avmedia.component b/avmedia/util/avmedia.component new file mode 100644 index 0000000000..fa01dc03eb --- /dev/null +++ b/avmedia/util/avmedia.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk index b0d0a6816c..a0712204be 100644 --- a/avmedia/util/makefile.mk +++ b/avmedia/util/makefile.mk @@ -77,3 +77,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo LibMain>>$@ @echo CT>>$@ .ENDIF + +ALLTAR : $(MISC)/avmedia.component + +$(MISC)/avmedia.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + avmedia.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt avmedia.component diff --git a/basic/prj/d.lst b/basic/prj/d.lst index d2a083ebcb..d8d0fce419 100644 --- a/basic/prj/d.lst +++ b/basic/prj/d.lst @@ -57,3 +57,4 @@ mkdir: %_DEST%\inc%_EXT%\basic ..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx ..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx +..\%__SRC%\misc\sb.component %_DEST%\xml%_EXT%\sb.component diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk index 629586f044..31a4dcca8f 100644 --- a/basic/util/makefile.mk +++ b/basic/util/makefile.mk @@ -143,4 +143,10 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk $(SRS)$/basic.srs: $(TYPE) $(SRS)$/classes.srs + $(SRS)$/runtime.srs + $(SRS)$/sbx.srs > $@ +ALLTAR : $(MISC)/sb.component +$(MISC)/sb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + sb.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt sb.component diff --git a/basic/util/sb.component b/basic/util/sb.component new file mode 100644 index 0000000000..4687bd1e7d --- /dev/null +++ b/basic/util/sb.component @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst index 17ccdbe86a..34b6cf3e00 100644 --- a/configmgr/prj/d.lst +++ b/configmgr/prj/d.lst @@ -1,3 +1,4 @@ ..\%__SRC%\bin\configmgr.uno.dll %_DEST%\bin%_EXT%\configmgr.uno.dll ..\%__SRC%\lib\configmgr.uno.dylib %_DEST%\lib%_EXT%\configmgr.uno.dylib ..\%__SRC%\lib\configmgr.uno.so %_DEST%\lib%_EXT%\configmgr.uno.so +..\%__SRC%\misc\configmgr.component %_DEST%\xml%_EXT%\configmgr.component diff --git a/configmgr/source/configmgr.component b/configmgr/source/configmgr.component new file mode 100644 index 0000000000..6ed5125700 --- /dev/null +++ b/configmgr/source/configmgr.component @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + diff --git a/configmgr/source/makefile.mk b/configmgr/source/makefile.mk index 37235a726c..94747d9dd8 100644 --- a/configmgr/source/makefile.mk +++ b/configmgr/source/makefile.mk @@ -81,3 +81,11 @@ SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/configmgr.component + +$(MISC)/configmgr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + configmgr.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt configmgr.component diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx index f8c3289664..b1ef8d2169 100644 --- a/configmgr/source/services.cxx +++ b/configmgr/source/services.cxx @@ -28,7 +28,6 @@ #include "precompiled_configmgr.hxx" #include "sal/config.h" -#include "com/sun/star/registry/XRegistryKey.hpp" #include "com/sun/star/uno/Exception.hpp" #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/XComponentContext.hpp" @@ -36,9 +35,6 @@ #include "cppuhelper/implementationentry.hxx" #include "osl/diagnose.h" #include "uno/lbnames.h" -#include "rtl/textenc.h" -#include "rtl/ustring.h" -#include "rtl/ustring.hxx" #include "sal/types.h" #include "configurationprovider.hxx" @@ -89,47 +85,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - if (!component_writeInfoHelper(pServiceManager, pRegistryKey, services)) { - return false; - } - try { - css::uno::Reference< css::registry::XRegistryKey >( - (css::uno::Reference< css::registry::XRegistryKey >( - static_cast< css::registry::XRegistryKey * >(pRegistryKey))-> - createKey( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/com.sun.star.comp.configuration.DefaultProvider/UNO/" - "SINGLETONS/" - "com.sun.star.configuration.theDefaultProvider")))), - css::uno::UNO_SET_THROW)-> - setStringValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.DefaultProvider"))); - css::uno::Reference< css::registry::XRegistryKey >( - (css::uno::Reference< css::registry::XRegistryKey >( - static_cast< css::registry::XRegistryKey * >(pRegistryKey))-> - createKey( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/com.sun.star.comp.configuration.Update/UNO/" - "SINGLETONS/com.sun.star.configuration.Update")))), - css::uno::UNO_SET_THROW)-> - setStringValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.Update_Service"))); - } catch (css::uno::Exception & e) { - (void) e; - OSL_TRACE( - "configmgr component_writeInfo exception: %s", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); - return false; - } - return true; -} diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst index e116ee5740..01d82ba917 100644 --- a/connectivity/prj/d.lst +++ b/connectivity/prj/d.lst @@ -31,3 +31,20 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess ..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu ..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip ..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip +..\%__SRC%\misc\adabas.component %_DEST%\xml%_EXT%\adabas.component +..\%__SRC%\misc\ado.component %_DEST%\xml%_EXT%\ado.component +..\%__SRC%\misc\calc.component %_DEST%\xml%_EXT%\calc.component +..\%__SRC%\misc\dbase.component %_DEST%\xml%_EXT%\dbase.component +..\%__SRC%\misc\dbpool2.component %_DEST%\xml%_EXT%\dbpool2.component +..\%__SRC%\misc\dbtools.component %_DEST%\xml%_EXT%\dbtools.component +..\%__SRC%\misc\evoab.component %_DEST%\xml%_EXT%\evoab.component +..\%__SRC%\misc\flat.component %_DEST%\xml%_EXT%\flat.component +..\%__SRC%\misc\hsqldb.component %_DEST%\xml%_EXT%\hsqldb.component +..\%__SRC%\misc\jdbc.component %_DEST%\xml%_EXT%\jdbc.component +..\%__SRC%\misc\kab1.component %_DEST%\xml%_EXT%\kab1.component +..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component +..\%__SRC%\misc\mozab.component %_DEST%\xml%_EXT%\mozab.component +..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml%_EXT%\mozbootstrap.component +..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component +..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component +..\%__SRC%\misc\sdbc2.component %_DEST%\xml%_EXT%\sdbc2.component diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index a5f0797ac2..30c8e6c8a9 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -899,11 +899,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const *_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* serviceManager, com::sun::star::registry::XRegistryKey* registryKey) -{ - return cppu::component_writeInfoHelper(serviceManager, registryKey, entries); -} //--------------------------------------------------------------------------------------- SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* implName, ::com::sun::star::lang::XMultiServiceFactory* serviceManager, void* registryKey) { diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx index efe1dc8a0d..43ae4a9caa 100644 --- a/connectivity/source/cpool/Zregistration.cxx +++ b/connectivity/source/cpool/Zregistration.cxx @@ -49,35 +49,6 @@ extern "C" *_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey) -{ - ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/"); - sMainKeyName += OPoolCollection::getImplementationName_Static(); - sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); - - try - { - Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName); - if (!xMainKey.is()) - return sal_False; - - Sequence< ::rtl::OUString > sServices = OPoolCollection::getSupportedServiceNames_Static(); - const ::rtl::OUString* pServices = sServices.getConstArray(); - for (sal_Int32 i=0; icreateKey(*pServices); - } - catch(InvalidRegistryException&) - { - return sal_False; - } - catch(InvalidValueException&) - { - return sal_False; - } - return sal_True; -} - //--------------------------------------------------------------------------------------- void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { diff --git a/connectivity/source/cpool/dbpool2.component b/connectivity/source/cpool/dbpool2.component new file mode 100644 index 0000000000..2fa8a14495 --- /dev/null +++ b/connectivity/source/cpool/dbpool2.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/connectivity/source/cpool/exports.dxp b/connectivity/source/cpool/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/cpool/exports.dxp +++ b/connectivity/source/cpool/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk index 1f6e49c6cb..9908a6d242 100644 --- a/connectivity/source/cpool/makefile.mk +++ b/connectivity/source/cpool/makefile.mk @@ -78,4 +78,10 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk +ALLTAR : $(MISC)/dbpool2.component +$(MISC)/dbpool2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + dbpool2.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt dbpool2.component diff --git a/connectivity/source/dbtools/dbtools.component b/connectivity/source/dbtools/dbtools.component new file mode 100644 index 0000000000..08be953bb9 --- /dev/null +++ b/connectivity/source/dbtools/dbtools.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/connectivity/source/dbtools/exports.dxp b/connectivity/source/dbtools/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/dbtools/exports.dxp +++ b/connectivity/source/dbtools/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk index af4ac13e54..a73dae3d04 100644 --- a/connectivity/source/dbtools/makefile.mk +++ b/connectivity/source/dbtools/makefile.mk @@ -95,3 +95,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo _TI >$@ @echo _real >>$@ + +ALLTAR : $(MISC)/dbtools.component + +$(MISC)/dbtools.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + dbtools.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt dbtools.component diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx index 3b974687f3..f2fc7517f7 100644 --- a/connectivity/source/drivers/adabas/Bservices.cxx +++ b/connectivity/source/drivers/adabas/Bservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "adabas/BDriver.hxx" #include -#include using namespace connectivity::adabas; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -122,31 +95,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriver::getImplementationName_Static(), - ODriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/adabas/adabas.component b/connectivity/source/drivers/adabas/adabas.component new file mode 100644 index 0000000000..3c359c3d02 --- /dev/null +++ b/connectivity/source/drivers/adabas/adabas.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/connectivity/source/drivers/adabas/adabas.mxp.map b/connectivity/source/drivers/adabas/adabas.mxp.map index 2ce9f11141..f64c44c13f 100644 --- a/connectivity/source/drivers/adabas/adabas.mxp.map +++ b/connectivity/source/drivers/adabas/adabas.mxp.map @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory __mh_dylib_header ___builtin_delete diff --git a/connectivity/source/drivers/adabas/exports.dxp b/connectivity/source/drivers/adabas/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/drivers/adabas/exports.dxp +++ b/connectivity/source/drivers/adabas/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk index 9268f02a3b..ffc3960391 100644 --- a/connectivity/source/drivers/adabas/makefile.mk +++ b/connectivity/source/drivers/adabas/makefile.mk @@ -104,3 +104,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/adabas.component + +$(MISC)/adabas.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + adabas.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt adabas.component diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index 00254201fc..5feeb925ee 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "ado/ADriver.hxx" #include -#include using namespace connectivity::ado; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "ADO::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -121,31 +94,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine"; } -//--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriver::getImplementationName_Static(), - ODriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "ADO::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/ado/ado.component b/connectivity/source/drivers/ado/ado.component new file mode 100644 index 0000000000..1962a6b710 --- /dev/null +++ b/connectivity/source/drivers/ado/ado.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/connectivity/source/drivers/ado/exports.dxp b/connectivity/source/drivers/ado/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/drivers/ado/exports.dxp +++ b/connectivity/source/drivers/ado/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk index 33e4706482..2b3c91a201 100644 --- a/connectivity/source/drivers/ado/makefile.mk +++ b/connectivity/source/drivers/ado/makefile.mk @@ -112,3 +112,11 @@ dummy: # --- Targets ---------------------------------- .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/ado.component + +$(MISC)/ado.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ado.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ado.component diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx index 75f69d0d21..6524ea68e4 100644 --- a/connectivity/source/drivers/calc/Cservices.cxx +++ b/connectivity/source/drivers/calc/Cservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "calc/CDriver.hxx" #include -#include using namespace connectivity::calc; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -122,31 +95,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriver::getImplementationName_Static(), - ODriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/calc/calc.component b/connectivity/source/drivers/calc/calc.component new file mode 100644 index 0000000000..be949f70de --- /dev/null +++ b/connectivity/source/drivers/calc/calc.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/connectivity/source/drivers/calc/exports.dxp b/connectivity/source/drivers/calc/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/drivers/calc/exports.dxp +++ b/connectivity/source/drivers/calc/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk index 8e193524aa..a7393b3c8e 100644 --- a/connectivity/source/drivers/calc/makefile.mk +++ b/connectivity/source/drivers/calc/makefile.mk @@ -94,3 +94,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/calc.component + +$(MISC)/calc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + calc.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt calc.component diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx index e3a295452c..e557f8c8bb 100644 --- a/connectivity/source/drivers/dbase/Dservices.cxx +++ b/connectivity/source/drivers/dbase/Dservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "dbase/DDriver.hxx" #include -#include using namespace connectivity::dbase; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -122,31 +95,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriver::getImplementationName_Static(), - ODriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/dbase/dbase.component b/connectivity/source/drivers/dbase/dbase.component new file mode 100644 index 0000000000..7f913f0836 --- /dev/null +++ b/connectivity/source/drivers/dbase/dbase.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/connectivity/source/drivers/dbase/dbase.mxp.map b/connectivity/source/drivers/dbase/dbase.mxp.map index c5b4377b04..87eccc45b6 100644 --- a/connectivity/source/drivers/dbase/dbase.mxp.map +++ b/connectivity/source/drivers/dbase/dbase.mxp.map @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory __mh_dylib_header ___builtin_delete diff --git a/connectivity/source/drivers/dbase/exports.dxp b/connectivity/source/drivers/dbase/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/drivers/dbase/exports.dxp +++ b/connectivity/source/drivers/dbase/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk index f855cf1f45..62b7ae96f8 100644 --- a/connectivity/source/drivers/dbase/makefile.mk +++ b/connectivity/source/drivers/dbase/makefile.mk @@ -127,3 +127,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/dbase.component + +$(MISC)/dbase.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + dbase.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt dbase.component diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx index 08a3c5fae8..6abf81acc9 100644 --- a/connectivity/source/drivers/evoab/LServices.cxx +++ b/connectivity/source/drivers/evoab/LServices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "LDriver.hxx" #include -#include using namespace connectivity::evoab; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -122,31 +95,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - OEvoabDriver::getImplementationName_Static(), - OEvoabDriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/evoab/exports.dxp b/connectivity/source/drivers/evoab/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/drivers/evoab/exports.dxp +++ b/connectivity/source/drivers/evoab/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index b898b3e626..a749dd9e63 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.cxx @@ -35,7 +35,6 @@ using namespace connectivity::evoab; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "EVOAB::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -122,31 +96,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - OEvoabDriver::getImplementationName_Static(), - OEvoabDriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/evoab2/evoab.component b/connectivity/source/drivers/evoab2/evoab.component new file mode 100644 index 0000000000..a99719388d --- /dev/null +++ b/connectivity/source/drivers/evoab2/evoab.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk index e8a1cf96cd..3f5b62903b 100644 --- a/connectivity/source/drivers/evoab2/makefile.mk +++ b/connectivity/source/drivers/evoab2/makefile.mk @@ -110,3 +110,11 @@ DEF1NAME= $(SHL1TARGET) # --- Targets ---------------------------------- .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/evoab.component + +$(MISC)/evoab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + evoab.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt evoab.component diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx index 57a923667f..a2cb13c168 100644 --- a/connectivity/source/drivers/flat/Eservices.cxx +++ b/connectivity/source/drivers/flat/Eservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "flat/EDriver.hxx" #include -#include using namespace connectivity::flat; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -122,31 +95,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriver::getImplementationName_Static(), - ODriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/flat/exports.dxp b/connectivity/source/drivers/flat/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/drivers/flat/exports.dxp +++ b/connectivity/source/drivers/flat/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/flat/flat.component b/connectivity/source/drivers/flat/flat.component new file mode 100644 index 0000000000..fe8b79ee73 --- /dev/null +++ b/connectivity/source/drivers/flat/flat.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/connectivity/source/drivers/flat/flat.mxp.map b/connectivity/source/drivers/flat/flat.mxp.map index 54a8532f78..2737c61b5a 100644 --- a/connectivity/source/drivers/flat/flat.mxp.map +++ b/connectivity/source/drivers/flat/flat.mxp.map @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory __mh_dylib_header ___builtin_delete diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk index 2d1f99f759..23920f91c2 100644 --- a/connectivity/source/drivers/flat/makefile.mk +++ b/connectivity/source/drivers/flat/makefile.mk @@ -105,3 +105,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/flat.component + +$(MISC)/flat.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + flat.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt flat.component diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index 5f98d0da5b..e2fb61c927 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.cxx @@ -30,13 +30,11 @@ #include "hsqldb/HDriver.hxx" #include -#include using namespace connectivity::hsqldb; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -49,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -123,31 +96,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriverDelegator::getImplementationName_Static(), - ODriverDelegator::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/hsqldb/exports.dxp b/connectivity/source/drivers/hsqldb/exports.dxp index 7ff56f4f99..3efc73741d 100644 --- a/connectivity/source/drivers/hsqldb/exports.dxp +++ b/connectivity/source/drivers/hsqldb/exports.dxp @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII diff --git a/connectivity/source/drivers/hsqldb/hsqldb.component b/connectivity/source/drivers/hsqldb/hsqldb.component new file mode 100644 index 0000000000..eb8ae477e7 --- /dev/null +++ b/connectivity/source/drivers/hsqldb/hsqldb.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/connectivity/source/drivers/hsqldb/hsqldb.map b/connectivity/source/drivers/hsqldb/hsqldb.map index a13f907752..c1d8320d19 100644 --- a/connectivity/source/drivers/hsqldb/hsqldb.map +++ b/connectivity/source/drivers/hsqldb/hsqldb.map @@ -1,7 +1,6 @@ UDK_3_0_0 { global: component_getImplementationEnvironment; - component_writeInfo; component_getFactory; Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream; Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII; diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk index e1a953055c..5be6fa08cd 100644 --- a/connectivity/source/drivers/hsqldb/makefile.mk +++ b/connectivity/source/drivers/hsqldb/makefile.mk @@ -115,3 +115,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/hsqldb.component + +$(MISC)/hsqldb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + hsqldb.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt hsqldb.component diff --git a/connectivity/source/drivers/jdbc/exports.dxp b/connectivity/source/drivers/jdbc/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/drivers/jdbc/exports.dxp +++ b/connectivity/source/drivers/jdbc/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/jdbc/jdbc.component b/connectivity/source/drivers/jdbc/jdbc.component new file mode 100644 index 0000000000..5d7db4690b --- /dev/null +++ b/connectivity/source/drivers/jdbc/jdbc.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/connectivity/source/drivers/jdbc/jdbc.mxp.map b/connectivity/source/drivers/jdbc/jdbc.mxp.map index a4457e2478..e02823e8c4 100644 --- a/connectivity/source/drivers/jdbc/jdbc.mxp.map +++ b/connectivity/source/drivers/jdbc/jdbc.mxp.map @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory __mh_dylib_header ___builtin_delete diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index 28506fc34c..cfe3b69ab5 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -34,7 +34,6 @@ using namespace connectivity; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -47,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pModCount ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "SBA::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -121,31 +95,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - java_sql_Driver::getImplementationName_Static(), - java_sql_Driver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "SBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk index 4661995216..510daeac4a 100644 --- a/connectivity/source/drivers/jdbc/makefile.mk +++ b/connectivity/source/drivers/jdbc/makefile.mk @@ -110,3 +110,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/jdbc.component + +$(MISC)/jdbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + jdbc.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt jdbc.component diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx index 8bb3b96ad7..230b6d1ddc 100644 --- a/connectivity/source/drivers/kab/KServices.cxx +++ b/connectivity/source/drivers/kab/KServices.cxx @@ -30,13 +30,11 @@ #include "KDriver.hxx" #include -#include using namespace connectivity::kab; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -49,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pTemp ); -//*************************************************************************************** -// -// The following C Api must be provided! -// It consists in three functions that must be exported by the module -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "KAB::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -122,31 +95,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void*, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - KabDriver::getImplementationName_Static(), - KabDriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "KAB::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/kab/exports.dxp b/connectivity/source/drivers/kab/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/drivers/kab/exports.dxp +++ b/connectivity/source/drivers/kab/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/kab/kab1.component b/connectivity/source/drivers/kab/kab1.component new file mode 100644 index 0000000000..77227501d3 --- /dev/null +++ b/connectivity/source/drivers/kab/kab1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk index 219bdd6cd0..c085cddb2d 100644 --- a/connectivity/source/drivers/kab/makefile.mk +++ b/connectivity/source/drivers/kab/makefile.mk @@ -138,3 +138,11 @@ dummy: .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/kab1.component + +$(MISC)/kab1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + kab1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt kab1.component diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index 6fc29f4736..1cd88c9082 100755 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.cxx @@ -30,13 +30,11 @@ #include "MacabDriver.hxx" #include -#include using namespace connectivity::macab; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -49,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pTemp ); -//*************************************************************************************** -// -// The following C Api must be provided! -// It consists in three functions that must be exported by the module -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "MACAB::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -122,31 +95,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void*, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - MacabDriver::getImplementationName_Static(), - MacabDriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "MACAB::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/macab/exports.dxp b/connectivity/source/drivers/macab/exports.dxp index 9630d7e067..f0e1c69934 100755 --- a/connectivity/source/drivers/macab/exports.dxp +++ b/connectivity/source/drivers/macab/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/macab/macab1.component b/connectivity/source/drivers/macab/macab1.component new file mode 100644 index 0000000000..0a120c0418 --- /dev/null +++ b/connectivity/source/drivers/macab/macab1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk index 35532b15ec..0565d31713 100755 --- a/connectivity/source/drivers/macab/makefile.mk +++ b/connectivity/source/drivers/macab/makefile.mk @@ -127,3 +127,11 @@ dummy: .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/macab1.component + +$(MISC)/macab1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + macab1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt macab1.component diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx index 7845c79e4b..2ae4ec8371 100644 --- a/connectivity/source/drivers/mozab/MServices.cxx +++ b/connectivity/source/drivers/mozab/MServices.cxx @@ -39,7 +39,6 @@ using namespace connectivity::mozab; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::mozilla::XMozillaBootstrap; @@ -53,31 +52,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pTemp ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM("/")); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -127,37 +101,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - - REGISTER_PROVIDER( - MozabDriver::getImplementationName_Static(), - MozabDriver::getSupportedServiceNames_Static(), xKey); - - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")); - REGISTER_PROVIDER( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")), - aSNS, xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) { diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index c07547ebef..6bfc68f3e0 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -238,7 +238,6 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( #include using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -251,50 +250,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const ::rtl::OUString& aServiceImplName, - const Sequence< ::rtl::OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - ::rtl::OUString aMainKeyName; - aMainKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/")); - aMainKeyName += aServiceImplName; - aMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")); - REGISTER_PROVIDER( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")), - aSNS, xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { MozillaBootstrap * pBootstrap = reinterpret_cast(OMozillaBootstrap_CreateInstance(rServiceManager)); diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk index 6a4172da20..b44436e488 100644 --- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk +++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk @@ -78,6 +78,14 @@ SHL1STDLIBS=\ $(SALLIB) \ $(COMPHELPERLIB) +ALLTAR : $(MISC)/mozbootstrap.component + +$(MISC)/mozbootstrap.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component + .ELSE SLOFILES += \ $(SLO)$/MNSInit.obj \ @@ -90,4 +98,3 @@ SLOFILES += \ # --- Targets ---------------------------------- .INCLUDE : target.mk - diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component new file mode 100644 index 0000000000..5da158924a --- /dev/null +++ b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/connectivity/source/drivers/mozab/exports.dxp b/connectivity/source/drivers/mozab/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/drivers/mozab/exports.dxp +++ b/connectivity/source/drivers/mozab/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index b1e12fde6f..852560f1c9 100644 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -184,3 +184,11 @@ $(MISC)$/$(SHL2TARGET).flt: makefile.mk @echo _TI >$@ @echo _real >>$@ + +ALLTAR : $(MISC)/mozab.component + +$(MISC)/mozab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + mozab.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt mozab.component diff --git a/connectivity/source/drivers/mozab/mozab.component b/connectivity/source/drivers/mozab/mozab.component new file mode 100644 index 0000000000..70f5da3bfe --- /dev/null +++ b/connectivity/source/drivers/mozab/mozab.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx index 5262fa400a..7dd8616126 100644 --- a/connectivity/source/drivers/mysql/Yservices.cxx +++ b/connectivity/source/drivers/mysql/Yservices.cxx @@ -29,13 +29,11 @@ #include "precompiled_connectivity.hxx" #include "mysql/YDriver.hxx" #include -#include using namespace connectivity::mysql; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -48,31 +46,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pT ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -122,31 +95,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODriverDelegator::getImplementationName_Static(), - ODriverDelegator::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/drivers/mysql/exports.dxp b/connectivity/source/drivers/mysql/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/drivers/mysql/exports.dxp +++ b/connectivity/source/drivers/mysql/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk index fbb68321cb..453f4b652f 100644 --- a/connectivity/source/drivers/mysql/makefile.mk +++ b/connectivity/source/drivers/mysql/makefile.mk @@ -82,3 +82,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/mysql.component + +$(MISC)/mysql.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + mysql.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt mysql.component diff --git a/connectivity/source/drivers/mysql/mysql.component b/connectivity/source/drivers/mysql/mysql.component new file mode 100644 index 0000000000..ced2297fa0 --- /dev/null +++ b/connectivity/source/drivers/mysql/mysql.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk index 508cbfb6df..426c75bf01 100644 --- a/connectivity/source/drivers/odbc/makefile.mk +++ b/connectivity/source/drivers/odbc/makefile.mk @@ -76,3 +76,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Targets ---------------------------------- .INCLUDE : $(PRJ)$/target.pmk + +ALLTAR : $(MISC)/odbc.component + +$(MISC)/odbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + odbc.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt odbc.component diff --git a/connectivity/source/drivers/odbc/odbc.component b/connectivity/source/drivers/odbc/odbc.component new file mode 100644 index 0000000000..d4e6bc127d --- /dev/null +++ b/connectivity/source/drivers/odbc/odbc.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx index 2d2b468bb2..c8acc78ffb 100644 --- a/connectivity/source/drivers/odbc/oservices.cxx +++ b/connectivity/source/drivers/odbc/oservices.cxx @@ -30,13 +30,11 @@ #include "ORealDriver.hxx" #include "odbc/ODriver.hxx" #include -#include using namespace connectivity::odbc; using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; @@ -49,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pTemp ); -//*************************************************************************************** -// -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. -// - -//--------------------------------------------------------------------------------------- -void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, - const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) -{ - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); - aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); - - Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); - OSL_ENSURE(xNewKey.is(), "ODBC::component_writeInfo : could not create a registry key !"); - - for (sal_Int32 i=0; icreateKey(Services[i]); -} - - //--------------------------------------------------------------------------------------- struct ProviderRequest { @@ -123,31 +96,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* /*pServiceManager*/, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - - REGISTER_PROVIDER( - ODBCDriver::getImplementationName_Static(), - ODBCDriver::getSupportedServiceNames_Static(), xKey); - - return sal_True; - } - catch (::com::sun::star::registry::InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); - } - - return sal_False; -} - //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/connectivity/source/manager/exports.dxp b/connectivity/source/manager/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/connectivity/source/manager/exports.dxp +++ b/connectivity/source/manager/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk index 52ec191ec8..4880407952 100644 --- a/connectivity/source/manager/makefile.mk +++ b/connectivity/source/manager/makefile.mk @@ -76,4 +76,10 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk +ALLTAR : $(MISC)/sdbc2.component +$(MISC)/sdbc2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + sdbc2.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt sdbc2.component diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx index 464015f937..07ef27892f 100644 --- a/connectivity/source/manager/mregistration.cxx +++ b/connectivity/source/manager/mregistration.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::registry; //========================================================================== //= registration @@ -50,38 +49,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const *_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//--------------------------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey) -{ - - - sal_Bool bReturn = sal_False; - - try - { - ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/"); - sMainKeyName += ::drivermanager::OSDBCDriverManager::getImplementationName_static(); - sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); - Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName); - if (xMainKey.is()) - { - Sequence< ::rtl::OUString > sServices(::drivermanager::OSDBCDriverManager::getSupportedServiceNames_static()); - const ::rtl::OUString* pBegin = sServices.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + sServices.getLength(); - for (;pBegin != pEnd ; ++pBegin) - xMainKey->createKey(*pBegin); - bReturn = sal_True; - } - } - catch(InvalidRegistryException&) - { - } - catch(InvalidValueException&) - { - } - return bReturn; -} - //--------------------------------------------------------------------------------------- SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { diff --git a/connectivity/source/manager/sdbc.mxp.map b/connectivity/source/manager/sdbc.mxp.map index 14e33ebafb..431725adbb 100644 --- a/connectivity/source/manager/sdbc.mxp.map +++ b/connectivity/source/manager/sdbc.mxp.map @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory __mh_dylib_header ___builtin_delete diff --git a/connectivity/source/manager/sdbc2.component b/connectivity/source/manager/sdbc2.component new file mode 100644 index 0000000000..6cce2b1d9f --- /dev/null +++ b/connectivity/source/manager/sdbc2.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst index 92a4853c2b..e288e18c1f 100644 --- a/desktop/prj/d.lst +++ b/desktop/prj/d.lst @@ -143,3 +143,10 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar ..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs +..\%__SRC%\misc\migrationoo3.component %_DEST%\xml%_EXT%\migrationoo3.component +..\%__SRC%\misc\productregistration.jar.component %_DEST%\xml%_EXT%\productregistration.jar.component +..\%__SRC%\misc\deployment.component %_DEST%\xml%_EXT%\deployment.component +..\%__SRC%\misc\deploymentgui.component %_DEST%\xml%_EXT%\deploymentgui.component +..\%__SRC%\misc\migrationoo2.component %_DEST%\xml%_EXT%\migrationoo2.component +..\%__SRC%\misc\offacc.component %_DEST%\xml%_EXT%\offacc.component +..\%__SRC%\misc\spl.component %_DEST%\xml%_EXT%\spl.component diff --git a/desktop/source/app/exports.dxp b/desktop/source/app/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/desktop/source/app/exports.dxp +++ b/desktop/source/app/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/desktop/source/deployment/deployment.component b/desktop/source/deployment/deployment.component new file mode 100644 index 0000000000..11385c7aa8 --- /dev/null +++ b/desktop/source/deployment/deployment.component @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx index 4e5277ea11..db42a215e7 100644 --- a/desktop/source/deployment/dp_services.cxx +++ b/desktop/source/deployment/dp_services.cxx @@ -92,27 +92,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) -{ - return component_writeInfoHelper( - pServiceManager, pRegistryKey, - dp_registry::backend::configuration::serviceDecl, - dp_registry::backend::component::serviceDecl, - dp_registry::backend::help::serviceDecl, - dp_registry::backend::script::serviceDecl, - dp_registry::backend::sfwk::serviceDecl, - dp_registry::backend::executable::serviceDecl, - dp_manager::factory::serviceDecl, - dp_log::serviceDecl, - dp_info::serviceDecl, - dp_manager::serviceDecl) && - dp_manager::factory::singleton_entries( pRegistryKey ) && - dp_info::singleton_entries( pRegistryKey ) && - dp_manager::singleton_entries( pRegistryKey); -} - void * SAL_CALL component_getFactory( sal_Char const * pImplName, lang::XMultiServiceFactory * pServiceManager, diff --git a/desktop/source/deployment/gui/deploymentgui.component b/desktop/source/deployment/gui/deploymentgui.component new file mode 100644 index 0000000000..d613f482e7 --- /dev/null +++ b/desktop/source/deployment/gui/deploymentgui.component @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx old mode 100755 new mode 100644 index aaa6e6f64b..b8daa7668d --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -356,14 +356,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) -{ - return component_writeInfoHelper( - pServiceManager, pRegistryKey, dp_gui::serviceDecl, dp_gui::licenseDecl, dp_gui::updateDecl ); -} - void * SAL_CALL component_getFactory( sal_Char const * pImplName, lang::XMultiServiceFactory * pServiceManager, diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk index 52092a077a..fe3921bf50 100644 --- a/desktop/source/deployment/gui/makefile.mk +++ b/desktop/source/deployment/gui/makefile.mk @@ -107,3 +107,11 @@ RESLIB1IMAGES= $(PRJ)$/res .INCLUDE : target.mk + +ALLTAR : $(MISC)/deploymentgui.component + +$(MISC)/deploymentgui.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk index 6d83a5c100..991ba7026d 100644 --- a/desktop/source/deployment/makefile.mk +++ b/desktop/source/deployment/makefile.mk @@ -110,3 +110,11 @@ RESLIB1SRSFILES += $(SRS)$/deployment_misc.srs .INCLUDE : target.mk + +ALLTAR : $(MISC)/deployment.component + +$(MISC)/deployment.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + deployment.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt deployment.component diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx index a5b9bc8aab..8424917d7a 100644 --- a/desktop/source/migration/services/cexports.cxx +++ b/desktop/source/migration/services/cexports.cxx @@ -63,13 +63,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, entries ); -} - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx old mode 100755 new mode 100644 index 2ac1a0bcbc..10ab816900 --- a/desktop/source/migration/services/cexportsoo3.cxx +++ b/desktop/source/migration/services/cexportsoo3.cxx @@ -51,13 +51,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, entries ); -} - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk index 2f3eb9308e..38f97084b3 100644 --- a/desktop/source/migration/services/makefile.mk +++ b/desktop/source/migration/services/makefile.mk @@ -87,7 +87,7 @@ DEF1NAME=$(SHL1TARGET) COMP2TYPELIST = migrationoo3 SHL2TARGET=migrationoo3.uno -SHL2VERSIONMAP = migrationoo3.map +SHL2VERSIONMAP = $(SOLARENV)/src/component.map SHL2OBJS= \ $(SLO)$/cexportsoo3.obj \ @@ -117,3 +117,18 @@ DEF2NAME=$(SHL2TARGET) .INCLUDE : target.mk +ALLTAR : $(MISC)/migrationoo3.component + +$(MISC)/migrationoo3.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component + +ALLTAR : $(MISC)/migrationoo2.component + +$(MISC)/migrationoo2.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt migrationoo2.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt migrationoo2.component diff --git a/desktop/source/migration/services/migrationoo2.component b/desktop/source/migration/services/migrationoo2.component new file mode 100644 index 0000000000..2b21ab123b --- /dev/null +++ b/desktop/source/migration/services/migrationoo2.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/desktop/source/migration/services/migrationoo3.component b/desktop/source/migration/services/migrationoo3.component new file mode 100644 index 0000000000..380c389ab7 --- /dev/null +++ b/desktop/source/migration/services/migrationoo3.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/desktop/source/migration/services/migrationoo3.map b/desktop/source/migration/services/migrationoo3.map deleted file mode 100755 index ac2c3750bf..0000000000 --- a/desktop/source/migration/services/migrationoo3.map +++ /dev/null @@ -1,8 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 17d445a1ad..4275de98b8 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -317,23 +317,6 @@ component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, u *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -sal_Bool SAL_CALL -component_writeInfo(void *pServiceManager, void *pRegistryKey) -{ - Reference< XMultiServiceFactory > xMan(reinterpret_cast< XMultiServiceFactory* >(pServiceManager)); - Reference< XRegistryKey > xKey(reinterpret_cast< XRegistryKey* >(pRegistryKey)); - - // register service - ::rtl::OUString aTempStr; - ::rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += Acceptor::impl_getImplementationName(); - aImpl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - Reference< XRegistryKey > xNewKey = xKey->createKey(aImpl); - xNewKey->createKey(Acceptor::impl_getSupportedServiceNames()[0]); - - return sal_True; -} - void * SAL_CALL component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *) { diff --git a/desktop/source/offacc/makefile.mk b/desktop/source/offacc/makefile.mk index c2d53930b5..809c28414b 100644 --- a/desktop/source/offacc/makefile.mk +++ b/desktop/source/offacc/makefile.mk @@ -60,3 +60,11 @@ SHL1STDLIBS= \ .INCLUDE : target.mk + +ALLTAR : $(MISC)/offacc.component + +$(MISC)/offacc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + offacc.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt offacc.component diff --git a/desktop/source/offacc/offacc.component b/desktop/source/offacc/offacc.component new file mode 100644 index 0000000000..6f0d4a97a2 --- /dev/null +++ b/desktop/source/offacc/offacc.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/desktop/source/registration/com/sun/star/registration/Registration.java b/desktop/source/registration/com/sun/star/registration/Registration.java index 6ac22c7c39..cb64b3de64 100644 --- a/desktop/source/registration/com/sun/star/registration/Registration.java +++ b/desktop/source/registration/com/sun/star/registration/Registration.java @@ -63,10 +63,6 @@ public class Registration { return xSingleServiceFactory; } - public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { - return FactoryHelper.writeRegistryServiceInfo(Registration.class.getName(), _serviceName, regKey); - } - static final String _serviceName = "com.sun.star.comp.framework.DoRegistrationJob"; static public class _Registration implements XJob { diff --git a/desktop/source/registration/com/sun/star/registration/makefile.mk b/desktop/source/registration/com/sun/star/registration/makefile.mk index 9784166eb9..8598022562 100644 --- a/desktop/source/registration/com/sun/star/registration/makefile.mk +++ b/desktop/source/registration/com/sun/star/registration/makefile.mk @@ -53,3 +53,10 @@ CUSTOMMANIFESTFILE = manifest .INCLUDE : target.mk +ALLTAR : $(MISC)/productregistration.jar.component + +$(MISC)/productregistration.jar.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt productregistration.jar.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)productregistration.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt productregistration.jar.component diff --git a/desktop/source/registration/com/sun/star/registration/productregistration.jar.component b/desktop/source/registration/com/sun/star/registration/productregistration.jar.component new file mode 100644 index 0000000000..c022a98ae0 --- /dev/null +++ b/desktop/source/registration/com/sun/star/registration/productregistration.jar.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx index 8955b4f0e8..8a5e561444 100644 --- a/desktop/source/so_comp/services.cxx +++ b/desktop/source/so_comp/services.cxx @@ -100,32 +100,6 @@ component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -sal_Bool SAL_CALL -component_writeInfo( - void* pServiceManager, - void* pRegistryKey) -{ - Reference xMan( - reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; - Reference xKey( - reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; - - // iterate over service names and register them... - OUString aImpl; - const char* pServiceName = NULL; - const char* pImplName = NULL; - for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) { - pServiceName= pServices[i]; - pImplName = pImplementations[i]; - aImpl = OUString::createFromAscii("/") - + OUString::createFromAscii(pImplName) - + OUString::createFromAscii("/UNO/SERVICES"); - Reference xNewKey = xKey->createKey(aImpl); - xNewKey->createKey(OUString::createFromAscii(pServiceName)); - } - return sal_True; -} - void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk index 8960968743..02483aae83 100644 --- a/desktop/source/splash/makefile.mk +++ b/desktop/source/splash/makefile.mk @@ -87,3 +87,11 @@ DO_PHONY=.PHONY $(INCCOM)$/introbmpnames.hxx $(DO_PHONY): echo const char INTRO_BITMAP_STRINGLIST[]=$(EMQ)"$(INTRO_BITMAPS:f:t",")$(EMQ)"$(EMQ); > $@ echo LASTTIME_INTRO_BITMAPS=$(INTRO_BITMAPS:f) > $(MISC)$/intro_bmp_names.mk + +ALLTAR : $(MISC)/spl.component + +$(MISC)/spl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + spl.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt spl.component diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx index fb96ec83e9..ff5469ac30 100755 --- a/desktop/source/splash/services_spl.cxx +++ b/desktop/source/splash/services_spl.cxx @@ -97,32 +97,6 @@ component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -sal_Bool SAL_CALL -component_writeInfo( - void* pServiceManager, - void* pRegistryKey) -{ - Reference xMan( - reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; - Reference xKey( - reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; - - // iterate over service names and register them... - OUString aImpl; - const char* pServiceName = NULL; - const char* pImplName = NULL; - for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) { - pServiceName= pServices[i]; - pImplName = pImplementations[i]; - aImpl = OUString::createFromAscii("/") - + OUString::createFromAscii(pImplName) - + OUString::createFromAscii("/UNO/SERVICES"); - Reference xNewKey = xKey->createKey(aImpl); - xNewKey->createKey(OUString::createFromAscii(pServiceName)); - } - return sal_True; -} - void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, diff --git a/desktop/source/splash/spl.component b/desktop/source/splash/spl.component new file mode 100644 index 0000000000..2caecf5c0e --- /dev/null +++ b/desktop/source/splash/spl.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/editeng/util/editeng.dxp b/editeng/util/editeng.dxp index 9630d7e067..f0e1c69934 100644 --- a/editeng/util/editeng.dxp +++ b/editeng/util/editeng.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/embeddedobj/prj/d.lst b/embeddedobj/prj/d.lst index 6972174716..e85b439a1e 100644 --- a/embeddedobj/prj/d.lst +++ b/embeddedobj/prj/d.lst @@ -4,3 +4,5 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.* +..\%__SRC%\misc\embobj.component %_DEST%\xml%_EXT%\embobj.component +..\%__SRC%\misc\emboleobj.component %_DEST%\xml%_EXT%\emboleobj.component diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index eb990c382f..ba6eadb25b 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -87,47 +87,5 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic return pRet; } -sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - sal_Int32 nInd = 0; - uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) ); - - uno::Reference< registry::XRegistryKey > xNewKey; - - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - OOoEmbeddedObjectFactory::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - uno::Sequence< ::rtl::OUString > rServices = OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames(); - for( nInd = 0; nInd < rServices.getLength(); nInd++ ) - xNewKey->createKey( rServices.getConstArray()[nInd] ); - - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - rServices = OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames(); - for( nInd = 0; nInd < rServices.getLength(); nInd++ ) - xNewKey->createKey( rServices.getConstArray()[nInd] ); - - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - UNOEmbeddedObjectCreator::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - rServices = UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames(); - for( nInd = 0; nInd < rServices.getLength(); nInd++ ) - xNewKey->createKey( rServices.getConstArray()[nInd] ); - - return sal_True; - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} - } // extern "C" diff --git a/embeddedobj/source/msole/emboleobj.component b/embeddedobj/source/msole/emboleobj.component new file mode 100644 index 0000000000..96f8ed0d8d --- /dev/null +++ b/embeddedobj/source/msole/emboleobj.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/embeddedobj/source/msole/emboleobj.windows.component b/embeddedobj/source/msole/emboleobj.windows.component new file mode 100644 index 0000000000..644a1d4f19 --- /dev/null +++ b/embeddedobj/source/msole/emboleobj.windows.component @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/embeddedobj/source/msole/exports.dxp b/embeddedobj/source/msole/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/embeddedobj/source/msole/exports.dxp +++ b/embeddedobj/source/msole/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk index 07b08bce69..f40e231bc2 100644 --- a/embeddedobj/source/msole/makefile.mk +++ b/embeddedobj/source/msole/makefile.mk @@ -130,3 +130,14 @@ DEF1NAME= $(SHL1TARGET) .INCLUDE : target.mk +ALLTAR : $(MISC)/emboleobj.component + +.IF "$(OS)" == "WNT" +my_platform = .windows +.END + +$(MISC)/emboleobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + emboleobj.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt emboleobj$(my_platform).component diff --git a/embeddedobj/util/embobj.component b/embeddedobj/util/embobj.component new file mode 100644 index 0000000000..e46945dcb7 --- /dev/null +++ b/embeddedobj/util/embobj.component @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + diff --git a/embeddedobj/util/exports.dxp b/embeddedobj/util/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/embeddedobj/util/exports.dxp +++ b/embeddedobj/util/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/embeddedobj/util/makefile.mk b/embeddedobj/util/makefile.mk index 763d64c164..eb2416bd4d 100644 --- a/embeddedobj/util/makefile.mk +++ b/embeddedobj/util/makefile.mk @@ -87,3 +87,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo CLEAR_THE_FILE > $@ @echo __CT >>$@ + +ALLTAR : $(MISC)/embobj.component + +$(MISC)/embobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + embobj.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt embobj.component diff --git a/eventattacher/prj/d.lst b/eventattacher/prj/d.lst index 5f9f228eda..202a0a06ae 100644 --- a/eventattacher/prj/d.lst +++ b/eventattacher/prj/d.lst @@ -1,3 +1,4 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT% +..\%__SRC%\misc\evtatt.component %_DEST%\xml%_EXT%\evtatt.component diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index a4182adb27..2100cbb615 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -842,34 +842,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * , void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - // DefaultRegistry - Reference< XRegistryKey > xNewKey( - reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME "/UNO/SERVICES") ))); - - Sequence< OUString > aSNL - ( ::comp_EventAttacher::EventAttacherImpl::getSupportedServiceNames_Static() ); - const OUString * pArray = aSNL.getConstArray(); - for ( sal_Int32 nPos = aSNL.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - return sal_True; - } - catch (InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} -//================================================================================================== void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/eventattacher/source/evtatt.component b/eventattacher/source/evtatt.component new file mode 100644 index 0000000000..3e48d58893 --- /dev/null +++ b/eventattacher/source/evtatt.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/eventattacher/source/makefile.mk b/eventattacher/source/makefile.mk index 632a1fa41a..360dcdabd7 100644 --- a/eventattacher/source/makefile.mk +++ b/eventattacher/source/makefile.mk @@ -61,3 +61,11 @@ SHL1LIBS= $(SLB)$/$(TARGET).lib # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/evtatt.component + +$(MISC)/evtatt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + evtatt.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt evtatt.component diff --git a/fileaccess/prj/d.lst b/fileaccess/prj/d.lst index 695487c560..c9b2bdd18f 100644 --- a/fileaccess/prj/d.lst +++ b/fileaccess/prj/d.lst @@ -3,3 +3,4 @@ ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* ..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml +..\%__SRC%\misc\fileacc.component %_DEST%\xml%_EXT%\fileacc.component diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index c30c298ef0..77de990a71 100644 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -914,32 +914,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - Reference< XRegistryKey > xNewKey( - reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - rtl::OUString::createFromAscii("/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) ); - - const Sequence< rtl::OUString > & rSNL = io_FileAccess::FileAccess_getSupportedServiceNames(); - const rtl::OUString * pArray = rSNL.getConstArray(); - for ( sal_Int32 nPos = rSNL.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - return sal_True; - } - catch (InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} -//================================================================================================== void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { diff --git a/fileaccess/source/fileacc.component b/fileaccess/source/fileacc.component new file mode 100644 index 0000000000..3f14d40532 --- /dev/null +++ b/fileaccess/source/fileacc.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk index 2b78265346..8c8a91b0f6 100644 --- a/fileaccess/source/makefile.mk +++ b/fileaccess/source/makefile.mk @@ -66,3 +66,11 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib .INCLUDE : target.mk + +ALLTAR : $(MISC)/fileacc.component + +$(MISC)/fileacc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fileacc.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fileacc.component diff --git a/formula/prj/d.lst b/formula/prj/d.lst index 3ad1e39484..d2afebacf4 100644 --- a/formula/prj/d.lst +++ b/formula/prj/d.lst @@ -35,3 +35,4 @@ mkdir: %_DEST%\inc%_EXT%\formula +..\%__SRC%\misc\for.component %_DEST%\xml%_EXT%\for.component diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx index 39809ab9b6..b828953ac2 100644 --- a/formula/source/core/api/services.cxx +++ b/formula/source/core/api/services.cxx @@ -66,10 +66,4 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * serviceManager, void * registryKey) -{ - return cppu::component_writeInfoHelper( - serviceManager, registryKey, entries); -} } // extern "C" diff --git a/formula/util/for.component b/formula/util/for.component new file mode 100644 index 0000000000..99a1adfbf9 --- /dev/null +++ b/formula/util/for.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk index 7ae30b007d..3c6f91f607 100644 --- a/formula/util/makefile.mk +++ b/formula/util/makefile.mk @@ -136,3 +136,11 @@ RESLIB2SRSFILES=$(RES2FILELIST) .INCLUDE : target.mk + +ALLTAR : $(MISC)/for.component + +$(MISC)/for.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + for.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt for.component diff --git a/fpicker/prj/d.lst b/fpicker/prj/d.lst index 7c4e0bf602..4fff0467fc 100644 --- a/fpicker/prj/d.lst +++ b/fpicker/prj/d.lst @@ -9,6 +9,10 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid ..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml ..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml -..\source\unx\gnome\fps-gnome-ucd.txt %_DEST%\bin%_EXT%\fps-gnome-ucd.txt -..\source\unx\kde4\fps-kde4-ucd.txt %_DEST%\bin%_EXT%\fps-kde4-ucd.txt -..\source\aqua\fps-aqua-ucd.txt %_DEST%\bin%_EXT%\fps-aqua-ucd.txt +..\%__SRC%\misc\fop.component %_DEST%\xml%_EXT%\fop.component +..\%__SRC%\misc\fpicker.component %_DEST%\xml%_EXT%\fpicker.component +..\%__SRC%\misc\fps.component %_DEST%\xml%_EXT%\fps.component +..\%__SRC%\misc\fps_aqua.component %_DEST%\xml%_EXT%\fps_aqua.component +..\%__SRC%\misc\fps_gnome.component %_DEST%\xml%_EXT%\fps_gnome.component +..\%__SRC%\misc\fps_kde4.component %_DEST%\xml%_EXT%\fps_kde4.component +..\%__SRC%\misc\fps_office.component %_DEST%\xml%_EXT%\fps_office.component diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx index d38c0a0a5a..1df58ce346 100644 --- a/fpicker/source/aqua/FPentry.cxx +++ b/fpicker/source/aqua/FPentry.cxx @@ -95,32 +95,6 @@ void SAL_CALL component_getImplementationEnvironment( // //------------------------------------------------ -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); - pXNewKey->createKey( OUString::createFromAscii( FOLDER_PICKER_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "InvalidRegistryException caught" ); - bRetVal = sal_False; - } - } - - return bRetVal; -} - -//------------------------------------------------ -// -//------------------------------------------------ - void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { diff --git a/fpicker/source/aqua/fps-aqua-ucd.txt b/fpicker/source/aqua/fps-aqua-ucd.txt deleted file mode 100644 index d71e8f4a57..0000000000 --- a/fpicker/source/aqua/fps-aqua-ucd.txt +++ /dev/null @@ -1,13 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.ui.dialogs.SalAquaFilePicker -ComponentName=fps_aqua.uno.dylib -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ui.dialogs.AquaFilePicker - -[ComponentDescriptor] -ImplementationName=com.sun.star.ui.dialogs.SalAquaFolderPicker -ComponentName=fps_aqua.uno.dylib -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ui.dialogs.AquaFolderPicker diff --git a/fpicker/source/aqua/fps_aqua.component b/fpicker/source/aqua/fps_aqua.component new file mode 100644 index 0000000000..a04443e37f --- /dev/null +++ b/fpicker/source/aqua/fps_aqua.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk index 10990e22d5..ff0473c8a7 100644 --- a/fpicker/source/aqua/makefile.mk +++ b/fpicker/source/aqua/makefile.mk @@ -83,3 +83,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/fps_aqua.component + +$(MISC)/fps_aqua.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fps_aqua.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fps_aqua.component diff --git a/fpicker/source/generic/fpicker.component b/fpicker/source/generic/fpicker.component new file mode 100644 index 0000000000..7d44d006d9 --- /dev/null +++ b/fpicker/source/generic/fpicker.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 980c04513b..8654b13210 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -216,13 +216,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * pServiceManager, void * pRegistryKey) -{ - return cppu::component_writeInfoHelper ( - pServiceManager, pRegistryKey, g_entries); -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey) { diff --git a/fpicker/source/generic/makefile.mk b/fpicker/source/generic/makefile.mk index bfbfb65f3d..0b2ad77baa 100644 --- a/fpicker/source/generic/makefile.mk +++ b/fpicker/source/generic/makefile.mk @@ -60,3 +60,11 @@ DEF1NAME= $(SHL1TARGET) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/fpicker.component + +$(MISC)/fpicker.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fpicker.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fpicker.component diff --git a/fpicker/source/office/fps_office.component b/fpicker/source/office/fps_office.component new file mode 100644 index 0000000000..3e49f68a49 --- /dev/null +++ b/fpicker/source/office/fps_office.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx index 13bc9dedc1..fd1743fa21 100644 --- a/fpicker/source/office/fps_office.cxx +++ b/fpicker/source/office/fps_office.cxx @@ -63,13 +63,6 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return cppu::component_writeInfoHelper ( - pServiceManager, pRegistryKey, g_entries); -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey) { diff --git a/fpicker/source/office/makefile.mk b/fpicker/source/office/makefile.mk index adc3c30f9a..7481fd867c 100644 --- a/fpicker/source/office/makefile.mk +++ b/fpicker/source/office/makefile.mk @@ -86,3 +86,11 @@ RESLIB1SRSFILES=\ # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/fps_office.component + +$(MISC)/fps_office.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fps_office.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fps_office.component diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx index 93097ff8d1..459d943abf 100644 --- a/fpicker/source/unx/gnome/FPentry.cxx +++ b/fpicker/source/unx/gnome/FPentry.cxx @@ -99,32 +99,6 @@ void SAL_CALL component_getImplementationEnvironment( // //------------------------------------------------ -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); - pXNewKey->createKey( OUString::createFromAscii( FOLDER_PICKER_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "InvalidRegistryException caught" ); - bRetVal = sal_False; - } - } - - return bRetVal; -} - -//------------------------------------------------ -// -//------------------------------------------------ - void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { diff --git a/fpicker/source/unx/gnome/fps-gnome-ucd.txt b/fpicker/source/unx/gnome/fps-gnome-ucd.txt deleted file mode 100644 index 4a84215dc9..0000000000 --- a/fpicker/source/unx/gnome/fps-gnome-ucd.txt +++ /dev/null @@ -1,13 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.ui.dialogs.SalGtkFilePicker -ComponentName=fps_gnome.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ui.dialogs.GtkFilePicker - -[ComponentDescriptor] -ImplementationName=com.sun.star.ui.dialogs.SalGtkFolderPicker -ComponentName=fps_gnome.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ui.dialogs.GtkFolderPicker diff --git a/fpicker/source/unx/gnome/fps_gnome.component b/fpicker/source/unx/gnome/fps_gnome.component new file mode 100644 index 0000000000..72bca42f8a --- /dev/null +++ b/fpicker/source/unx/gnome/fps_gnome.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/fpicker/source/unx/gnome/makefile.mk b/fpicker/source/unx/gnome/makefile.mk index 04c6e650ff..82b2413dd4 100644 --- a/fpicker/source/unx/gnome/makefile.mk +++ b/fpicker/source/unx/gnome/makefile.mk @@ -96,3 +96,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/fps_gnome.component + +$(MISC)/fps_gnome.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fps_gnome.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fps_gnome.component diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx index dfcb339452..c8425e5ce3 100644 --- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx +++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx @@ -55,27 +55,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey ) - { - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "InvalidRegistryException caught" ); - bRetVal = sal_False; - } - } - - return bRetVal; - } - void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* ) { void* pRet = 0; diff --git a/fpicker/source/unx/kde4/fps-kde4-ucd.txt b/fpicker/source/unx/kde4/fps-kde4-ucd.txt deleted file mode 100644 index 8ecc4e0a0a..0000000000 --- a/fpicker/source/unx/kde4/fps-kde4-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.ui.dialogs.KDE4FilePicker -ComponentName=fps_kde4.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ui.dialogs.KDE4FilePicker diff --git a/fpicker/source/unx/kde4/fps_kde4.component b/fpicker/source/unx/kde4/fps_kde4.component new file mode 100644 index 0000000000..d627212b75 --- /dev/null +++ b/fpicker/source/unx/kde4/fps_kde4.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/fpicker/source/unx/kde4/makefile.mk b/fpicker/source/unx/kde4/makefile.mk index e245e66184..7ccf6df6a0 100644 --- a/fpicker/source/unx/kde4/makefile.mk +++ b/fpicker/source/unx/kde4/makefile.mk @@ -80,3 +80,11 @@ DEF1VERSIONMAP=exports.map $(MISC)$/KDE4FilePicker.moc.cxx : KDE4FilePicker.hxx $(MOC4) $< -o $@ + +ALLTAR : $(MISC)/fps_kde4.component + +$(MISC)/fps_kde4.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fps_kde4.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fps_kde4.component diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index a99f467cce..0289b40d0e 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -104,31 +104,6 @@ void SAL_CALL component_getImplementationEnvironment( // //------------------------------------------------ -sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "InvalidRegistryException caught" ); - bRetVal = sal_False; - } - } - - return bRetVal; -} - -//------------------------------------------------ -// -//------------------------------------------------ - void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* ) { diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx index d379ca47a5..9c9574f13f 100644 --- a/fpicker/source/win32/folderpicker/Fopentry.cxx +++ b/fpicker/source/win32/folderpicker/Fopentry.cxx @@ -87,31 +87,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_REGKEY_NAME ) ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - bRetVal = sal_False; - } - } - - return bRetVal; -} - //---------------------------------------------------------------------- // component_getFactory // returns a factory to create XFilePicker-Services diff --git a/fpicker/util/exports.dxp b/fpicker/util/exports.dxp index 028ac41759..f0e1c69934 100644 --- a/fpicker/util/exports.dxp +++ b/fpicker/util/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/fpicker/util/fop.component b/fpicker/util/fop.component new file mode 100644 index 0000000000..a31c096dd4 --- /dev/null +++ b/fpicker/util/fop.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/fpicker/util/fps.component b/fpicker/util/fps.component new file mode 100644 index 0000000000..cc18d21102 --- /dev/null +++ b/fpicker/util/fps.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk index c249e4259e..60bd3333cb 100644 --- a/fpicker/util/makefile.mk +++ b/fpicker/util/makefile.mk @@ -100,3 +100,16 @@ DEF2EXPORTFILE= exports.dxp .INCLUDE : target.mk +ALLTAR : $(MISC)/fop.component $(MISC)/fps.component + +$(MISC)/fop.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fop.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fop.component + +$(MISC)/fps.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fps.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fps.component diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx index 21f8ad20d3..9f7219c484 100644 --- a/framework/inc/macros/debug/registration.hxx +++ b/framework/inc/macros/debug/registration.hxx @@ -53,26 +53,6 @@ "registration.log" #endif - /*_____________________________________________________________________________________________________________ - LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) - - Write informations for component_writeInfo() in log file. - _____________________________________________________________________________________________________________*/ - - #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) \ - { \ - ::rtl::OStringBuffer sOut( 1024 ); \ - sOut.append( "component_writeInfo():" ); \ - sOut.append( SINFOTEXT ); \ - WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \ - } - - /*_____________________________________________________________________________________________________________ - LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) - - Write informations for component_getFactory() in log file. - _____________________________________________________________________________________________________________*/ - #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) \ { \ ::rtl::OStringBuffer sOut( 1024 ); \ @@ -88,7 +68,6 @@ _____________________________________________________________________________________________________________*/ #undef LOGFILE_REGISTRATION - #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) #endif // #ifdef ENABLE_REGISTRATIONDEBUG diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 4b95530d45..de84e05dd6 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -37,10 +37,8 @@ //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#include #include #include -#include //_________________________________________________________________________________________________________________ // other includes @@ -57,65 +55,12 @@ macros for registration of services Please use follow public macros only! - 1) COMPONENTINFO( CLASS ) => use it as parameter for COMPONENT_WRITEINFO( INFOS ) - 2) IFFACTORY( CLASS ) => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) - 3) COMPONENTGETIMPLEMENTATIONENVIRONMENT => use it to define exported function component_getImplementationEnvironment() - 4) COMPONENTWRITEINFO( INFOS ) => use it to define exported function component_writeInfo() - 5) COMPONENTGETFACTORY( IFFACTORIES ) => use it to define exported function component_getFactory() + IFFACTORY( CLASS ) => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) + COMPONENTGETIMPLEMENTATIONENVIRONMENT => use it to define exported function component_getImplementationEnvironment() + COMPONENTGETFACTORY( IFFACTORIES ) => use it to define exported function component_getFactory() _________________________________________________________________________________________________________________*/ -//***************************************************************************************************************** -// public -// use it as parameter for COMPONENT_WRITEINFO( INFOS ) -//***************************************************************************************************************** - -#define COMPONENTINFO( CLASS ) \ - try \ - { \ - /* Set default result of follow operations !!! */ \ - bReturn = sal_False; \ - /* Do the follow only, if given key is valid ! */ \ - if ( xKey.is() == sal_True ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\t\txKey is valid ...\n" ) \ - /* Build new keyname */ \ - sKeyName = DECLARE_ASCII( "/" ); \ - sKeyName += CLASS::impl_getStaticImplementationName(); \ - sKeyName += DECLARE_ASCII( "/UNO/SERVICES" ); \ - LOG_REGISTRATION_WRITEINFO( "\t\t\tcreate key \"" ) \ - LOG_REGISTRATION_WRITEINFO( U2B( sKeyName ) ) \ - LOG_REGISTRATION_WRITEINFO( "\" ...\n" ) \ - /* Create new key with new name. */ \ - xNewKey = xKey->createKey( sKeyName ); \ - /* If this new key valid ... */ \ - if ( xNewKey.is() == sal_True ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\t\t\ttsuccessful ...\n" ) \ - /* Get information about supported services. */ \ - seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \ - pArray = seqServiceNames.getArray() ; \ - nLength = seqServiceNames.getLength() ; \ - nCounter = 0 ; \ - /* Then set this information on this key. */ \ - for ( nCounter = 0; nCounter < nLength; ++nCounter ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\t\t\twrite key \"" ) \ - LOG_REGISTRATION_WRITEINFO( U2B( pArray[nCounter] ) ) \ - LOG_REGISTRATION_WRITEINFO( "\" to registry ...\n" ) \ - xNewKey->createKey( pArray[nCounter] ); \ - } \ - /* Result of this operations = OK. */ \ - bReturn = sal_True ; \ - } \ - } \ - } \ - catch( ::com::sun::star::registry::InvalidRegistryException& ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\n\nERROR:\nInvalidRegistryException detected\n\n" ) \ - bReturn = sal_False ; \ - } - //***************************************************************************************************************** // public // use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) @@ -142,41 +87,6 @@ ________________________________________________________________________________ *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; \ } -//***************************************************************************************************************** -// public -// define registration of service -//***************************************************************************************************************** -#define COMPONENTWRITEINFO( INFOS ) \ - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/ , \ - void* pRegistryKey ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t[start]\n" ) \ - /* Set default return value for this operation - if it failed. */ \ - sal_Bool bReturn = sal_False ; \ - if ( pRegistryKey != NULL ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\tpRegistryKey is valid ...\n" ) \ - /* Define variables for following helper macros! */ \ - /* bReturn will set automaticly. */ \ - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey ; \ - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xNewKey ; \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames ; \ - const ::rtl::OUString* pArray ; \ - sal_Int32 nLength ; \ - sal_Int32 nCounter ; \ - ::rtl::OUString sKeyName ; \ - xKey = reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ); \ - /* This parameter will expand to */ \ - /* "COMPONENT_INFO(a) */ \ - /* ... */ \ - /* COMPONENT_INFO(z)" */ \ - INFOS \ - } \ - LOG_REGISTRATION_WRITEINFO( "\t[end]\n" ) \ - /* Return with result of this operation. */ \ - return bReturn ; \ - } - //***************************************************************************************************************** // public // define method to instanciate new services diff --git a/framework/prj/d.lst b/framework/prj/d.lst index 7f260f07cf..f066b17245 100644 --- a/framework/prj/d.lst +++ b/framework/prj/d.lst @@ -49,3 +49,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar ..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml +..\%__SRC%\misc\fwk.component %_DEST%\xml%_EXT%\fwk.component +..\%__SRC%\misc\fwl.component %_DEST%\xml%_EXT%\fwl.component +..\%__SRC%\misc\fwm.component %_DEST%\xml%_EXT%\fwm.component diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx index e9c63ac04e..3ddbad0da3 100644 --- a/framework/source/register/register3rdcomponents.cxx +++ b/framework/source/register/register3rdcomponents.cxx @@ -47,10 +47,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) - COMPONENTINFO( Service2 ) - ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -63,12 +59,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::HelpOnStartup ) - COMPONENTINFO( ::framework::TabWinFactory ) - COMPONENTINFO( ::framework::SystemExec ) - COMPONENTINFO( ::framework::ShellJob ) - ) - COMPONENTGETFACTORY ( IFFACTORY( ::framework::HelpOnStartup ) else IFFACTORY( ::framework::TabWinFactory ) else IFFACTORY( ::framework::SystemExec ) else diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx index 166f489b94..01dd6f806c 100644 --- a/framework/source/register/registerlogindialog.cxx +++ b/framework/source/register/registerlogindialog.cxx @@ -48,10 +48,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) - COMPONENTINFO( Service2 ) - ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -64,8 +60,5 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::LoginDialog ) - ) - COMPONENTGETFACTORY ( IFFACTORY( ::framework::LoginDialog ) ) diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 297431d80f..7078ec6beb 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -47,10 +47,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) - COMPONENTINFO( Service2 ) - ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -117,66 +113,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer ) - COMPONENTINFO( ::framework::Desktop ) - COMPONENTINFO( ::framework::Frame ) - //COMPONENTINFO( ::framework::Oxt_Handler ) - COMPONENTINFO( ::framework::JobExecutor ) - //COMPONENTINFO( ::framework::DispatchRecorderSupplier ) - //COMPONENTINFO( ::framework::DispatchRecorder ) - //COMPONENTINFO( ::framework::MailToDispatcher ) - //COMPONENTINFO( ::framework::ServiceHandler ) - COMPONENTINFO( ::framework::JobDispatch ) - COMPONENTINFO( ::framework::BackingComp ) - //COMPONENTINFO( ::framework::DispatchHelper ) - COMPONENTINFO( ::framework::LayoutManager ) - //COMPONENTINFO( ::framework::License ) - COMPONENTINFO( ::framework::UIElementFactoryManager ) - COMPONENTINFO( ::framework::PopupMenuControllerFactory ) - //COMPONENTINFO( ::framework::FontMenuController ) - //COMPONENTINFO( ::framework::FontSizeMenuController ) - COMPONENTINFO( ::framework::ObjectMenuController ) - //COMPONENTINFO( ::framework::HeaderMenuController ) - //COMPONENTINFO( ::framework::FooterMenuController ) - COMPONENTINFO( ::framework::ControlMenuController ) - //COMPONENTINFO( ::framework::MacrosMenuController ) - COMPONENTINFO( ::framework::UICommandDescription ) - COMPONENTINFO( ::framework::ModuleManager ) - COMPONENTINFO( ::framework::UIConfigurationManager ) - COMPONENTINFO( ::framework::ModuleUIConfigurationManagerSupplier ) - COMPONENTINFO( ::framework::ModuleUIConfigurationManager ) - COMPONENTINFO( ::framework::MenuBarFactory ) - COMPONENTINFO( ::framework::GlobalAcceleratorConfiguration ) - COMPONENTINFO( ::framework::ModuleAcceleratorConfiguration ) - COMPONENTINFO( ::framework::DocumentAcceleratorConfiguration ) - COMPONENTINFO( ::framework::ToolBoxFactory ) - COMPONENTINFO( ::framework::AddonsToolBoxFactory ) - COMPONENTINFO( ::framework::WindowStateConfiguration ) - COMPONENTINFO( ::framework::ToolbarControllerFactory ) - //COMPONENTINFO( ::framework::ToolbarsMenuController ) - COMPONENTINFO( ::framework::AutoRecovery ) - COMPONENTINFO( ::framework::StatusIndicatorFactory ) - COMPONENTINFO( ::framework::RecentFilesMenuController ) - COMPONENTINFO( ::framework::StatusBarFactory ) - COMPONENTINFO( ::framework::UICategoryDescription ) - COMPONENTINFO( ::framework::StatusbarControllerFactory ) - COMPONENTINFO( ::framework::SessionListener ) - //COMPONENTINFO( ::framework::LogoImageStatusbarController ) - //COMPONENTINFO( ::framework::LogoTextStatusbarController ) - //COMPONENTINFO( ::framework::NewMenuController ) - COMPONENTINFO( ::framework::TaskCreatorService ) - //COMPONENTINFO( ::framework::SimpleTextStatusbarController ) - //COMPONENTINFO( ::framework::UriAbbreviation ) - //COMPONENTINFO( ::framework::PopupMenuDispatcher ) - COMPONENTINFO( ::framework::ImageManager ) - COMPONENTINFO( ::framework::LangSelectionStatusbarController ) - //COMPONENTINFO( ::framework::LanguageSelectionMenuController ) - //COMPONENTINFO( ::framework::TabWindowService ) - COMPONENTINFO( ::framework::WindowContentFactoryManager ) - COMPONENTINFO( ::framework::SubstitutePathVariables ) - COMPONENTINFO( ::framework::PathSettings ) - ) - COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else IFFACTORY( ::framework::Desktop ) else IFFACTORY( ::framework::Frame ) else diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index b4a1252ffa..2ad7f59365 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -47,10 +47,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) - COMPONENTINFO( Service2 ) - ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) @@ -82,31 +78,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::MediaTypeDetectionHelper ) - COMPONENTINFO( ::framework::MailToDispatcher ) - COMPONENTINFO( ::framework::NewMenuController ) - COMPONENTINFO( ::framework::ToolbarsMenuController ) - COMPONENTINFO( ::framework::MacrosMenuController ) - COMPONENTINFO( ::framework::FontSizeMenuController ) - COMPONENTINFO( ::framework::HeaderMenuController ) - COMPONENTINFO( ::framework::FooterMenuController ) - COMPONENTINFO( ::framework::FontMenuController ) - COMPONENTINFO( ::framework::ServiceHandler ) - COMPONENTINFO( ::framework::LogoImageStatusbarController ) - COMPONENTINFO( ::framework::LogoTextStatusbarController ) - COMPONENTINFO( ::framework::SimpleTextStatusbarController ) - COMPONENTINFO( ::framework::UriAbbreviation ) - COMPONENTINFO( ::framework::LanguageSelectionMenuController ) - COMPONENTINFO( ::framework::PopupMenuDispatcher ) - COMPONENTINFO( ::framework::DispatchHelper ) - COMPONENTINFO( ::framework::TabWindowService ) - COMPONENTINFO( ::framework::DispatchRecorder ) - COMPONENTINFO( ::framework::DispatchRecorderSupplier ) - COMPONENTINFO( ::framework::Oxt_Handler ) - COMPONENTINFO( ::framework::License ) - COMPONENTINFO( ::framework::PopupMenuController ) - ) - COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::MailToDispatcher ) else IFFACTORY( ::framework::ServiceHandler ) else diff --git a/framework/util/fwk.component b/framework/util/fwk.component new file mode 100644 index 0000000000..e6ceb91e80 --- /dev/null +++ b/framework/util/fwk.component @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/framework/util/fwl.component b/framework/util/fwl.component new file mode 100644 index 0000000000..aa124d1cdc --- /dev/null +++ b/framework/util/fwl.component @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/framework/util/fwm.component b/framework/util/fwm.component new file mode 100644 index 0000000000..624249ff43 --- /dev/null +++ b/framework/util/fwm.component @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 91532cda76..a66643994f 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -423,3 +423,23 @@ $(MISC)$/$(SHL2TARGET).flt: makefile.mk @echo _TI2>>$@ @echo LIBMAIN>>$@ @echo LibMain>>$@ + +ALLTAR : $(MISC)/fwk.component $(MISC)/fwl.component $(MISC)/fwm.component + +$(MISC)/fwk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fwk.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fwk.component + +$(MISC)/fwl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fwl.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fwl.component + +$(MISC)/fwm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fwm.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fwm.component diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst index 01a755e53c..0e0534feaf 100644 --- a/linguistic/prj/d.lst +++ b/linguistic/prj/d.lst @@ -8,3 +8,4 @@ mkdir: %_DEST%\inc%_EXT%\linguistic ..\inc\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx +..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 9199d43ad9..65fb6dbce5 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -692,31 +692,6 @@ uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance( return StaticConvDicList::get(); } - -sal_Bool SAL_CALL ConvDicList_writeInfo( - void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) -{ - try - { - String aImpl( '/' ); - aImpl += ConvDicList::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - uno::Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey(aImpl ); - uno::Sequence< OUString > aServices = - ConvDicList::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i]); - - return sal_True; - } - catch(Exception &) - { - return sal_False; - } -} - - void * SAL_CALL ConvDicList_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 989d0588e4..872b942dea 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -796,31 +796,6 @@ uno::Sequence< rtl::OUString > DicList::getSupportedServiceNames_Static() throw( return aSNS; } - -sal_Bool SAL_CALL DicList_writeInfo( - void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) -{ - try - { - String aImpl( '/' ); - aImpl += DicList::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - uno::Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey(aImpl ); - uno::Sequence< rtl::OUString > aServices = - DicList::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i]); - - return sal_True; - } - catch(Exception &) - { - return sal_False; - } -} - - void * SAL_CALL DicList_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 101c231db6..444649493c 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1333,27 +1333,3 @@ void * SAL_CALL GrammarCheckingIterator_getFactory( } return pRet; } - - -sal_Bool SAL_CALL GrammarCheckingIterator_writeInfo( - void * /*pServiceManager*/, - registry::XRegistryKey * pRegistryKey ) -{ - try - { - OUString aImpl( '/' ); - aImpl += GrammarCheckingIterator_getImplementationName().getStr(); - aImpl += A2OU( "/UNO/SERVICES" ); - uno::Reference< registry::XRegistryKey > xNewKey = pRegistryKey->createKey( aImpl ); - uno::Sequence< OUString > aServices = GrammarCheckingIterator_getSupportedServiceNames(); - for( sal_Int32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; - } - catch (uno::Exception &) - { - return sal_False; - } -} - diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx index 1f076f0f39..fb12f96559 100644 --- a/linguistic/source/grammarchecker.cxx +++ b/linguistic/source/grammarchecker.cxx @@ -276,27 +276,6 @@ OUString SAL_CALL GrammarChecker::getImplementationName( ) throw(uno::RuntimeEx return getImplementationName_Static(); } -sal_Bool SAL_CALL GrammarChecker_writeInfo( void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) -{ - try - { - String aImpl( '/' ); - aImpl += GrammarChecker::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - uno::Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey( aImpl ); - uno::Sequence< OUString > aServices = GrammarChecker::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); ++i ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; - } - catch(uno::Exception &) - { - return sal_False; - } -} - uno::Reference< uno::XInterface > SAL_CALL GrammarChecker_CreateInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ ) throw(uno::Exception) diff --git a/linguistic/source/lng.component b/linguistic/source/lng.component new file mode 100644 index 0000000000..f4f3ca603a --- /dev/null +++ b/linguistic/source/lng.component @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index d377f856e8..e00500d17e 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -665,29 +665,6 @@ uno::Sequence< OUString > LinguProps::getSupportedServiceNames_Static() return aSNS; } - -sal_Bool SAL_CALL LinguProps_writeInfo( void * /*pServiceManager*/, - XRegistryKey * pRegistryKey ) -{ - try - { - String aImpl( '/' ); - aImpl += LinguProps::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - Reference< XRegistryKey > xNewKey = - pRegistryKey->createKey(aImpl ); - uno::Sequence< OUString > aServices = LinguProps::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i]); - - return sal_True; - } - catch(Exception &) - { - return sal_False; - } -} - void * SAL_CALL LinguProps_getFactory( const sal_Char * pImplName, XMultiServiceFactory *pServiceManager, void * ) { diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index 2eaadda56f..be7fb66b9a 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.cxx @@ -38,42 +38,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; -//////////////////////////////////////// -// declaration of external RegEntry-functions defined by the service objects -// - -extern sal_Bool SAL_CALL LngSvcMgr_writeInfo -( - void * /*pServiceManager*/, - XRegistryKey * pRegistryKey -); - -extern sal_Bool SAL_CALL DicList_writeInfo -( - void * /*pServiceManager*/, XRegistryKey * pRegistryKey -); - -extern sal_Bool SAL_CALL LinguProps_writeInfo -( - void * /*pServiceManager*/, - XRegistryKey * pRegistryKey -); - -extern sal_Bool SAL_CALL ConvDicList_writeInfo -( - void * /*pServiceManager*/, XRegistryKey * pRegistryKey -); - -extern sal_Bool SAL_CALL GrammarCheckingIterator_writeInfo -( - void * /*pServiceManager*/, XRegistryKey * pRegistryKey -); - -//extern sal_Bool SAL_CALL GrammarChecker_writeInfo -//( -// void * /*pServiceManager*/, XRegistryKey * pRegistryKey -//); - extern void * SAL_CALL LngSvcMgr_getFactory ( const sal_Char * pImplName, @@ -129,28 +93,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo -( - void * pServiceManager, - XRegistryKey * pRegistryKey -) -{ - sal_Bool bRet = LngSvcMgr_writeInfo( pServiceManager, pRegistryKey ); - if(bRet) - bRet = LinguProps_writeInfo( pServiceManager, pRegistryKey ); - if(bRet) - bRet = DicList_writeInfo( pServiceManager, pRegistryKey ); - if(bRet) - bRet = ConvDicList_writeInfo( pServiceManager, pRegistryKey ); - if(bRet) - bRet = GrammarCheckingIterator_writeInfo( pServiceManager, pRegistryKey ); -/* - if(bRet) - bRet = GrammarChecker_writeInfo( pServiceManager, pRegistryKey ); -*/ - return bRet; -} - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 82caafe02e..42f87e2358 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1990,31 +1990,6 @@ uno::Reference< uno::XInterface > SAL_CALL LngSvcMgr_CreateInstance( return xService; } - - -sal_Bool SAL_CALL LngSvcMgr_writeInfo( - void * /*pServiceManager*/, - registry::XRegistryKey * pRegistryKey ) -{ - try - { - String aImpl( '/' ); - aImpl += LngSvcMgr::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - uno::Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey( aImpl ); - uno::Sequence< OUString > aServices = LngSvcMgr::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; - } - catch(uno::Exception &) - { - return sal_False; - } -} - void * SAL_CALL LngSvcMgr_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk index 3f68afb305..9bbd456ce8 100644 --- a/linguistic/source/makefile.mk +++ b/linguistic/source/makefile.mk @@ -91,9 +91,8 @@ DEF1DES =Linguistic main DLL .IF "$(GUI)"=="WNT" -DEF1EXPORT1 = component_writeInfo -DEF1EXPORT2 = component_getFactory -DEF1EXPORT3 = component_getImplementationEnvironment +DEF1EXPORT1 = component_getFactory +DEF1EXPORT2 = component_getImplementationEnvironment .ENDIF # --- Targets ------------------------------------------------------ @@ -109,3 +108,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo component >> $@ @echo __CT >> $@ + +ALLTAR : $(MISC)/lng.component + +$(MISC)/lng.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + lng.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt lng.component diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java index 8b3d4479ce..9003f5ee0e 100644 --- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java +++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java @@ -215,11 +215,6 @@ XInitialization { return xSingleServiceFactory; } - public static boolean __writeRegistryServiceInfo( XRegistryKey regKey ) { - return FactoryHelper.writeRegistryServiceInfo( - SecurityDialog.class.getName(), SecurityDialog.__serviceName, regKey ); - } - // XServiceInfo public String getImplementationName( ) { return getClass().getName(); diff --git a/scripting/java/ScriptFramework.component b/scripting/java/ScriptFramework.component new file mode 100644 index 0000000000..d6f9a8f62b --- /dev/null +++ b/scripting/java/ScriptFramework.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/scripting/java/ScriptProviderForBeanShell.component b/scripting/java/ScriptProviderForBeanShell.component new file mode 100644 index 0000000000..fe040d71d9 --- /dev/null +++ b/scripting/java/ScriptProviderForBeanShell.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/scripting/java/ScriptProviderForJava.component b/scripting/java/ScriptProviderForJava.component new file mode 100644 index 0000000000..4ea6ea8a10 --- /dev/null +++ b/scripting/java/ScriptProviderForJava.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/scripting/java/ScriptProviderForJavaScript.component b/scripting/java/ScriptProviderForJavaScript.component new file mode 100644 index 0000000000..e9725d8659 --- /dev/null +++ b/scripting/java/ScriptProviderForJavaScript.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java index 3120487935..6a9a16f7b1 100755 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java @@ -123,41 +123,6 @@ public class ScriptProviderForBeanShell return xSingleServiceFactory; } - - - /** - * Writes the service information into the given registry key. - * This method is called by the JavaLoader - *

- * - * @param regKey the registryKey - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo( XRegistryKey regKey ) - { - String impl = "com.sun.star.script.framework.provider.beanshell." + - "ScriptProviderForBeanShell$_ScriptProviderForBeanShell"; - - String service1 = "com.sun.star.script.provider." + - "ScriptProvider"; - String service2 = "com.sun.star.script.provider." + - "LanguageScriptProvider"; - String service3 = "com.sun.star.script.provider." + - "ScriptProviderForBeanShell"; - String service4 = "com.sun.star.script.browse." + - "BrowseNode"; - - if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) ) - { - return true; - } - return false; - } - } class ScriptImpl implements XScript diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java index c89285ffdf..ab5e51db82 100755 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java @@ -134,41 +134,6 @@ public class ScriptProviderForJava return xSingleServiceFactory; } - - - /** - * Writes the service information into the given registry key. - * This method is called by the JavaLoader - *

- * - * @param regKey the registryKey - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo( XRegistryKey regKey ) - { - String impl = "com.sun.star.script.framework.provider.java." + - "ScriptProviderForJava$_ScriptProviderForJava"; - - String service1 = "com.sun.star.script.provider." + - "ScriptProvider"; - String service2 = "com.sun.star.script.provider." + - "LanguageScriptProvider"; - String service3 = "com.sun.star.script.provider." + - "ScriptProviderForJava"; - String service4 = "com.sun.star.script.browse." + - "BrowseNode"; - - if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) ) - { - return true; - } - return false; - } - } class ScriptImpl implements XScript diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java index a90e4bc41a..e855bea4fb 100755 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java @@ -124,40 +124,6 @@ public class ScriptProviderForJavaScript return xSingleServiceFactory; } - - - /** - * Writes the service information into the given registry key. - * This method is called by the JavaLoader - *

- * - * @param regKey the registryKey - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo( XRegistryKey regKey ) - { - String impl = "com.sun.star.script.framework.provider.javascript." + - "ScriptProviderForJavaScript$_ScriptProviderForJavaScript"; - - String service1 = "com.sun.star.script.provider." + - "ScriptProvider"; - String service2 = "com.sun.star.script.provider." + - "LanguageScriptProvider"; - String service3 = "com.sun.star.script.provider." + - "ScriptProviderForJavaScript"; - String service4 = "com.sun.star.script.browse." + - "BrowseNode"; - - if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) ) - { - return true; - } - return false; - } } class ScriptImpl implements XScript { diff --git a/scripting/java/makefile.mk b/scripting/java/makefile.mk index 6a5a81bf97..dc8ee1abdc 100755 --- a/scripting/java/makefile.mk +++ b/scripting/java/makefile.mk @@ -36,3 +36,37 @@ TARGET=scriptruntimeforjava ALLTAR : ANTBUILD .ENDIF .ENDIF + +ALLTAR : \ + $(MISC)/ScriptFramework.component \ + $(MISC)/ScriptProviderForBeanShell.component \ + $(MISC)/ScriptProviderForJava.component \ + $(MISC)/ScriptProviderForJavaScript.component + +$(MISC)/ScriptFramework.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)ScriptFramework.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.component + +$(MISC)/ScriptProviderForBeanShell.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt \ + ScriptProviderForBeanShell.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForBeanShell.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt \ + ScriptProviderForBeanShell.component + +$(MISC)/ScriptProviderForJava.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt ScriptProviderForJava.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForJava.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ScriptProviderForJava.component + +$(MISC)/ScriptProviderForJavaScript.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt \ + ScriptProviderForJavaScript.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForJavaScript.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt \ + ScriptProviderForJavaScript.component diff --git a/scripting/prj/d.lst b/scripting/prj/d.lst index ef216fe84f..4b9d435af7 100644 --- a/scripting/prj/d.lst +++ b/scripting/prj/d.lst @@ -15,3 +15,15 @@ mkdir: %_DEST%\bin%_EXT%\pyuno ..\source\storage\storage.xml %_DEST%\xml%_EXT%\storage.xml ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib +..\%__SRC%\misc\mailmerge.component %_DEST%\xml%_EXT%\mailmerge.component +..\%__SRC%\misc\pythonscript.component %_DEST%\xml%_EXT%\pythonscript.component +..\%__SRC%\misc\ScriptFramework.component %_DEST%\xml%_EXT%\ScriptFramework.component +..\%__SRC%\misc\ScriptProviderForBeanShell.component %_DEST%\xml%_EXT%\ScriptProviderForBeanShell.component +..\%__SRC%\misc\ScriptProviderForJava.component %_DEST%\xml%_EXT%\ScriptProviderForJava.component +..\%__SRC%\misc\ScriptProviderForJavaScript.component %_DEST%\xml%_EXT%\ScriptProviderForJavaScript.component +..\%__SRC%\misc\basprov.component %_DEST%\xml%_EXT%\basprov.component +..\%__SRC%\misc\dlgprov.component %_DEST%\xml%_EXT%\dlgprov.component +..\%__SRC%\misc\protocolhandler.component %_DEST%\xml%_EXT%\protocolhandler.component +..\%__SRC%\misc\scriptframe.component %_DEST%\xml%_EXT%\scriptframe.component +..\%__SRC%\misc\stringresource.component %_DEST%\xml%_EXT%\stringresource.component +..\%__SRC%\misc\vbaevents.component %_DEST%\xml%_EXT%\vbaevents.component diff --git a/scripting/source/basprov/basprov.component b/scripting/source/basprov/basprov.component new file mode 100644 index 0000000000..528ab6544e --- /dev/null +++ b/scripting/source/basprov/basprov.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index c616371276..9e6117af9c 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -589,13 +589,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, ::basprov::s_component_entries ); - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/basprov/makefile.mk b/scripting/source/basprov/makefile.mk index 5001e5db28..c98f961e6b 100644 --- a/scripting/source/basprov/makefile.mk +++ b/scripting/source/basprov/makefile.mk @@ -71,3 +71,11 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/basprov.component + +$(MISC)/basprov.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + basprov.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt basprov.component diff --git a/scripting/source/dlgprov/dlgprov.component b/scripting/source/dlgprov/dlgprov.component new file mode 100644 index 0000000000..f7ceed336c --- /dev/null +++ b/scripting/source/dlgprov/dlgprov.component @@ -0,0 +1,36 @@ + + + + + + + + + + diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index e9e12993c4..57aaffe256 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -853,13 +853,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, ::dlgprov::s_component_entries ); - } - void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/dlgprov/makefile.mk b/scripting/source/dlgprov/makefile.mk index 6c8ec298c7..111dca58ed 100644 --- a/scripting/source/dlgprov/makefile.mk +++ b/scripting/source/dlgprov/makefile.mk @@ -80,3 +80,11 @@ $(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ echo $@ + +ALLTAR : $(MISC)/dlgprov.component + +$(MISC)/dlgprov.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + dlgprov.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt dlgprov.component diff --git a/scripting/source/protocolhandler/exports.dxp b/scripting/source/protocolhandler/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/scripting/source/protocolhandler/exports.dxp +++ b/scripting/source/protocolhandler/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/scripting/source/protocolhandler/makefile.mk b/scripting/source/protocolhandler/makefile.mk index c782c1a188..ec69c00b20 100644 --- a/scripting/source/protocolhandler/makefile.mk +++ b/scripting/source/protocolhandler/makefile.mk @@ -61,3 +61,11 @@ DEF1EXPORTFILE= exports.dxp # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/protocolhandler.component + +$(MISC)/protocolhandler.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt protocolhandler.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt protocolhandler.component diff --git a/scripting/source/protocolhandler/protocolhandler.component b/scripting/source/protocolhandler/protocolhandler.component new file mode 100644 index 0000000000..db177a896c --- /dev/null +++ b/scripting/source/protocolhandler/protocolhandler.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 388be37eb7..e8c45b5d88 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -537,27 +537,6 @@ extern "C" *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } - sal_Bool SAL_CALL component_writeInfo( void * pServiceManager , - void * pRegistryKey ) - { - (void)pServiceManager; - - Reference< css::registry::XRegistryKey > xKey( - reinterpret_cast< css::registry::XRegistryKey* >( pRegistryKey ) ) ; - - ::rtl::OUString aStr = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); - aStr += - ::scripting_protocolhandler::ScriptProtocolHandler::impl_getStaticImplementationName(); - - aStr += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ) ); - Reference< css::registry::XRegistryKey > xNewKey = xKey->createKey( aStr ); - xNewKey->createKey( - ::rtl::OUString::createFromAscii( ::scripting_protocolhandler::MYSERVICENAME ) - ); - - return sal_True; - } - void* SAL_CALL component_getFactory( const sal_Char * pImplementationName , void * pServiceManager , void * pRegistryKey ) diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index fcaaf00877..efd7862892 100755 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -981,42 +981,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - /** - * This function creates an implementation section in the registry and another subkey - * - * for each supported service. - * @param pServiceManager the service manager - * @param pRegistryKey the registry key - */ - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) - { - if (::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, - ::scripting_runtimemgr::s_entries )) - { - try - { - // MasterScriptProviderFactory Mangager singleton - registry::XRegistryKey * pKey = - reinterpret_cast< registry::XRegistryKey * >(pRegistryKey); - - Reference< registry::XRegistryKey >xKey = pKey->createKey( - OUSTR("com.sun.star.script.provider.MasterScriptProviderFactory/UNO/SINGLETONS/com.sun.star.script.provider.theMasterScriptProviderFactory")); - xKey->setStringValue( OUSTR("com.sun.star.script.provider.MasterScriptProviderFactory") ); - // BrowseNodeFactory Mangager singleton - xKey = pKey->createKey( - OUSTR("com.sun.star.script.browse.BrowseNodeFactory/UNO/SINGLETONS/com.sun.star.script.browse.theBrowseNodeFactory")); - xKey->setStringValue( OUSTR("com.sun.star.script.browse.BrowseNodeFactory") ); - return sal_True; - } - catch (Exception &) - { - } - } - return sal_False; - } - /** * This function is called to get service factories for an implementation. * diff --git a/scripting/source/provider/exports.dxp b/scripting/source/provider/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/scripting/source/provider/exports.dxp +++ b/scripting/source/provider/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/scripting/source/pyprov/mailmerge.component b/scripting/source/pyprov/mailmerge.component new file mode 100644 index 0000000000..dd6a65e9a1 --- /dev/null +++ b/scripting/source/pyprov/mailmerge.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk index 3c02785951..42c161adbb 100644 --- a/scripting/source/pyprov/makefile.mk +++ b/scripting/source/pyprov/makefile.mk @@ -47,3 +47,17 @@ $(DLLDEST)$/%.py: %.py cp $? $@ .INCLUDE : target.mk + +ALLTAR : $(MISC)/mailmerge.component $(MISC)/pythonscript.component + +$(MISC)/mailmerge.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + mailmerge.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_PYTHON)mailmerge' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt mailmerge.component + +$(MISC)/pythonscript.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt pythonscript.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_PYTHON)pythonscript' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt pythonscript.component diff --git a/scripting/source/pyprov/pythonscript.component b/scripting/source/pyprov/pythonscript.component new file mode 100644 index 0000000000..08f8950972 --- /dev/null +++ b/scripting/source/pyprov/pythonscript.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx index 6fa510c65e..e23265364b 100755 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx +++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx @@ -485,68 +485,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - /** - * This function creates an implementation section in the registry and another subkey - * - * for each supported service. - * @param pServiceManager the service manager - * @param pRegistryKey the registry key - */ - sal_Bool SAL_CALL component_writeInfo( lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) - { - if (::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, - ::scripting_runtimemgr::s_entries )) - { - try - { - // register RuntimeManager singleton - - registry::XRegistryKey * pKey = - reinterpret_cast< registry::XRegistryKey * >(pRegistryKey); - - Reference< registry::XRegistryKey > xKey( - pKey->createKey( - - OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeManager"))); - xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager") ); - - // ScriptStorage Mangaer singleton - - xKey = pKey->createKey( - OUSTR("drafts.com.sun.star.script.framework.storage.ScriptStorageManager/UNO/SINGLETONS/drafts.com.sun.star.script.framework.storage.theScriptStorageManager")); - xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.storage.ScriptStorageManager") ); - // Singleton entries are not handled by the setup process - // below is the only alternative at the momement which - // is to programmatically do this. - - // "Java" Runtime singleton entry - - xKey = pKey->createKey( - OUSTR("com.sun.star.scripting.runtime.java.ScriptRuntimeForJava$_ScriptRuntimeForJava/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeForJava")); - xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeForJava") ); - - // "JavaScript" Runtime singleton entry - - xKey = pKey->createKey( - OUSTR("com.sun.star.scripting.runtime.javascript.ScriptRuntimeForJavaScript$_ScriptRuntimeForJavaScript/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeForJavaScript")); - xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeForJavaScript") ); - - // "BeanShell" Runtime singleton entry - - xKey = pKey->createKey( - OUSTR("com.sun.star.scripting.runtime.beanshell.ScriptRuntimeForBeanShell$_ScriptRuntimeForBeanShell/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeForBeanShell")); - xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeForBeanShell") ); - - return sal_True; - } - catch (Exception & exc) - { - } - } - return sal_False; - } - /** * This function is called to get service factories for an implementation. * diff --git a/scripting/source/runtimemgr/exports.dxp b/scripting/source/runtimemgr/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/scripting/source/runtimemgr/exports.dxp +++ b/scripting/source/runtimemgr/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/scripting/source/storage/exports.dxp b/scripting/source/storage/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/scripting/source/storage/exports.dxp +++ b/scripting/source/storage/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/scripting/source/stringresource/makefile.mk b/scripting/source/stringresource/makefile.mk index dfc2d19791..71f8ee39e7 100644 --- a/scripting/source/stringresource/makefile.mk +++ b/scripting/source/stringresource/makefile.mk @@ -60,3 +60,11 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/stringresource.component + +$(MISC)/stringresource.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt stringresource.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt stringresource.component diff --git a/scripting/source/stringresource/stringresource.component b/scripting/source/stringresource/stringresource.component new file mode 100644 index 0000000000..6d64d95539 --- /dev/null +++ b/scripting/source/stringresource/stringresource.component @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 330ae8397b..bbde6609e0 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -3080,13 +3080,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, ::stringresource::s_component_entries ); - } - void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/vbaevents/makefile.mk b/scripting/source/vbaevents/makefile.mk old mode 100644 new mode 100755 index 1946c61d1e..287bbe2b05 --- a/scripting/source/vbaevents/makefile.mk +++ b/scripting/source/vbaevents/makefile.mk @@ -91,3 +91,11 @@ $(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ echo $@ + +ALLTAR : $(MISC)/vbaevents.component + +$(MISC)/vbaevents.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + vbaevents.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt vbaevents.component diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index ea2c44f1dc..1a6fe2927a 100755 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.cxx @@ -110,16 +110,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - OSL_TRACE("In component_writeInfo"); - if ( ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, s_component_entries ) ) - return sal_True; - return sal_False; - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/vbaevents/vbaevents.component b/scripting/source/vbaevents/vbaevents.component new file mode 100644 index 0000000000..e8cbf3d88f --- /dev/null +++ b/scripting/source/vbaevents/vbaevents.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/scripting/util/exports.dxp b/scripting/util/exports.dxp index 9630d7e067..f0e1c69934 100644 --- a/scripting/util/exports.dxp +++ b/scripting/util/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/scripting/util/makefile.mk b/scripting/util/makefile.mk index f18970f164..04435caab1 100644 --- a/scripting/util/makefile.mk +++ b/scripting/util/makefile.mk @@ -65,3 +65,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk + +ALLTAR : $(MISC)/scriptframe.component + +$(MISC)/scriptframe.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt scriptframe.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt scriptframe.component diff --git a/scripting/util/scriptframe.component b/scripting/util/scriptframe.component new file mode 100644 index 0000000000..5b3fe8c396 --- /dev/null +++ b/scripting/util/scriptframe.component @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx index 2953b95644..f070dd4676 100644 --- a/sfx2/inc/sfx2/sfxuno.hxx +++ b/sfx2/inc/sfx2/sfxuno.hxx @@ -73,7 +73,6 @@ #define UNOPROPERTYVALUE ::com::sun::star::beans::PropertyValue #define UNOREFERENCE ::com::sun::star::uno::Reference #define UNORUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException -#define UNOINVALIDREGISTRYEXCEPTION ::com::sun::star::registry::InvalidRegistryException #define UNOSEQUENCE ::com::sun::star::uno::Sequence #define UNOTYPE ::com::sun::star::uno::Type #define UNOURL ::com::sun::star::util::URL @@ -590,52 +589,6 @@ sal_Bool GetPasswd_Impl( const SfxItemSet* pSet, ::rtl::OUString& rPasswd ); return xReturn ; \ } -//************************************************************************************************************************ -// definition for "extern c component_writeInfo()" -//************************************************************************************************************************ -#define COMPONENT_INFO(CLASS) \ - \ - try \ - { \ - /* Set default result of follow operations !!! */ \ - bReturn = sal_False ; \ - \ - /* Do the follow only, if given key is valid ! */ \ - if ( xKey.is () ) \ - { \ - /* Build new keyname */ \ - sKeyName = UNOOUSTRING::createFromAscii( "/" ) ; \ - sKeyName += CLASS::impl_getStaticImplementationName() ; \ - sKeyName += UNOOUSTRING::createFromAscii( "/UNO/SERVICES" ); \ - \ - /* Create new key with new name. */ \ - xNewKey = xKey->createKey( sKeyName ); \ - \ - /* If this new key valid ... */ \ - if ( xNewKey.is () ) \ - { \ - /* Get information about supported services. */ \ - seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \ - pArray = seqServiceNames.getArray() ; \ - nLength = seqServiceNames.getLength() ; \ - nCounter = 0 ; \ - \ - /* Then set this information on this key. */ \ - for ( nCounter = 0; nCounter < nLength; ++nCounter ) \ - { \ - xNewKey->createKey( pArray [nCounter] ); \ - } \ - \ - /* Result of this operations = OK. */ \ - bReturn = sal_True ; \ - } \ - } \ - } \ - catch( UNOINVALIDREGISTRYEXCEPTION& ) \ - { \ - bReturn = sal_False ; \ - } \ - //************************************************************************************************************************ // definition for "extern c component_getFactory()" //************************************************************************************************************************ diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index 0748aa19cd..0768000425 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -44,3 +44,4 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx ..\inc\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx +..\%__SRC%\misc\sfx.component %_DEST%\xml%_EXT%\sfx.component diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx old mode 100755 new mode 100644 index 2a7bb3f56d..3768fe1409 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -2124,166 +2124,6 @@ SFX2_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( - void* , - void* pRegistryKey ) -{ - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ) ) ; - - // register actual implementations and their services - ::rtl::OUString aImpl; - ::rtl::OUString aTempStr; - ::rtl::OUString aKeyStr; - Reference< XRegistryKey > xNewKey; - Reference< XRegistryKey > xLoaderKey; - - // PluginObject - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += ::sfx2::PluginObject::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") ); - - #if 0 - // AppletObject - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += ::sfx2::AppletObject::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") ); - #endif - - // IFrameObject - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += ::sfx2::IFrameObject::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") ); - - // global app event broadcaster - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxGlobalEvents_Impl::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster") ); - - // global app dispatcher - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxAppDispatchProvider::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.ProtocolHandler") ); - - // standalone document info - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxStandaloneDocumentInfoObject::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.StandaloneDocumentInfo") ); - - // frame loader - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxFrameLoader_Impl::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - Sequence < ::rtl::OUString > aServices = SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames(); - sal_Int32 nCount = aServices.getLength(); - for ( sal_Int16 i=0; icreateKey( aServices.getConstArray()[i] ); - - // macro loader - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxMacroLoader::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.ProtocolHandler") ); - - // - sfx document templates - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxDocTplService::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.DocumentTemplates") ); - - // quickstart wrapper service - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += ShutdownIcon::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.office.Quickstart") ); - - // application script library container service - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxApplicationScriptLibraryContainer::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.script.ApplicationScriptLibraryContainer") ); - - // application dialog library container service - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += SfxApplicationDialogLibraryContainer::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.script.ApplicationDialogLibraryContainer") ); - - // converter of fs folders to packages - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += OPackageStructureCreator::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - Sequence< ::rtl::OUString > rServices = OPackageStructureCreator::impl_getStaticSupportedServiceNames(); - for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) - xNewKey->createKey( rServices.getConstArray()[ind] ); - - // subfilter to parse a stream in OASIS format generated by the filter - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += ::sfx2::OwnSubFilterService::impl_getStaticImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - rServices = ::sfx2::OwnSubFilterService::impl_getStaticSupportedServiceNames(); - for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) - xNewKey->createKey( rServices.getConstArray()[ind] ); - - // document meta data - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += comp_SfxDocumentMetaData::_getImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentProperties") ); - - return sal_True; -} - SFX2_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* pImplementationName , void* pServiceManager , diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 95fe000709..16a9ba4603 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -2380,12 +2380,5 @@ extern "C" void * SAL_CALL component_getFactory( return ::cppu::component_getFactoryHelper( implName, serviceManager, registryKey, entries); } - -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * serviceManager, void * registryKey) -{ - return ::cppu::component_writeInfoHelper(serviceManager, registryKey, - entries); -} #endif diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk index 2d93e7692d..f520e2097e 100644 --- a/sfx2/util/makefile.mk +++ b/sfx2/util/makefile.mk @@ -162,3 +162,11 @@ SHL3NOCHECK=TRUE .INCLUDE : target.mk + +ALLTAR : $(MISC)/sfx.component + +$(MISC)/sfx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + sfx.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt sfx.component diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component new file mode 100644 index 0000000000..1c28afd417 --- /dev/null +++ b/sfx2/util/sfx.component @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shell/prj/d.lst b/shell/prj/d.lst index ea8be0bbaf..3ef183dbdf 100644 --- a/shell/prj/d.lst +++ b/shell/prj/d.lst @@ -10,6 +10,7 @@ ..\%__SRC%\bin\x64\propertyhdl.dll %_DEST%\bin%_EXT%\propertyhdl_x64.dll ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a +..\%__SRC%\misc\cmdmail.component %_DEST%\xml%_EXT%\cmdmail.component ..\%__SRC%\bin\open-url %_DEST%\bin%_EXT%\open-url ..\%__SRC%\bin\cde-open-url %_DEST%\bin%_EXT%\cde-open-url @@ -21,5 +22,13 @@ ..\%__SRC%\misc\*.xml %_DEST%\xml%_EXT%\*.xml -..\%__SRC%\misc\*-ucd.txt %_DEST%\bin%_EXT%\*-ucd.txt +..\%__SRC%\misc\desktopbe1.component %_DEST%\xml%_EXT%\desktopbe1.component +..\%__SRC%\misc\gconfbe1.component %_DEST%\xml%_EXT%\gconfbe1.component +..\%__SRC%\misc\kde4be1.component %_DEST%\xml%_EXT%\kde4be1.component +..\%__SRC%\misc\kdebe1.component %_DEST%\xml%_EXT%\kdebe1.component ..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h +..\%__SRC%\misc\localebe1.component %_DEST%\xml%_EXT%\localebe1.component +..\%__SRC%\misc\macbe1.component %_DEST%\xml%_EXT%\macbe1.component +..\%__SRC%\misc\smplmail.component %_DEST%\xml%_EXT%\smplmail.component +..\%__SRC%\misc\syssh.component %_DEST%\xml%_EXT%\syssh.component +..\%__SRC%\misc\wininetbe1.component %_DEST%\xml%_EXT%\wininetbe1.component diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 21371755b4..e628e8e1b8 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -282,9 +282,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} diff --git a/shell/source/backends/desktopbe/desktopbe1-ucd.txt b/shell/source/backends/desktopbe/desktopbe1-ucd.txt deleted file mode 100644 index fd874a82ea..0000000000 --- a/shell/source/backends/desktopbe/desktopbe1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.DesktopBackend -ComponentName=desktopbe1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.DesktopBackend diff --git a/shell/source/backends/desktopbe/desktopbe1.component b/shell/source/backends/desktopbe/desktopbe1.component new file mode 100644 index 0000000000..9ef1421076 --- /dev/null +++ b/shell/source/backends/desktopbe/desktopbe1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/shell/source/backends/desktopbe/makefile.mk b/shell/source/backends/desktopbe/makefile.mk index 29260821d5..66ad8cf99e 100644 --- a/shell/source/backends/desktopbe/makefile.mk +++ b/shell/source/backends/desktopbe/makefile.mk @@ -48,6 +48,12 @@ SHL1TARGET = desktopbe1.uno SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) -UNIXTEXT = $(MISC)/desktopbe1-ucd.txt - .INCLUDE: target.mk + +ALLTAR : $(MISC)/desktopbe1.component + +$(MISC)/desktopbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + desktopbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt desktopbe1.component diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 122d1cad02..fb3fdb1143 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -231,9 +231,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} diff --git a/shell/source/backends/gconfbe/gconfbe1-ucd.txt b/shell/source/backends/gconfbe/gconfbe1-ucd.txt deleted file mode 100644 index daa5444ff0..0000000000 --- a/shell/source/backends/gconfbe/gconfbe1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.GconfBackend -ComponentName=gconfbe1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.GconfBackend diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component new file mode 100644 index 0000000000..7638e05b54 --- /dev/null +++ b/shell/source/backends/gconfbe/gconfbe1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk index a8d9b23aa9..9e77a0867a 100644 --- a/shell/source/backends/gconfbe/makefile.mk +++ b/shell/source/backends/gconfbe/makefile.mk @@ -39,7 +39,6 @@ VISIBILITY_HIDDEN=TRUE # no "lib" prefix DLLPRE = -UCDSRCEXT = txt .IF "$(ENABLE_LOCKDOWN)" == "YES" CFLAGS+=-DENABLE_LOCKDOWN @@ -89,8 +88,10 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk -ALLTAR : $(MISC)/$(TARGET)1-ucd.txt - -$(MISC)/$(TARGET)1-ucd.txt : $$(@:b).$(UCDSRCEXT) - cat $< | tr -d "\015" > $@ +ALLTAR : $(MISC)/gconfbe1.component +$(MISC)/gconfbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + gconfbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt gconfbe1.component diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 44ddb49bd0..2bf3d144a5 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -250,9 +250,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} diff --git a/shell/source/backends/kde4be/kde4be1-ucd.txt b/shell/source/backends/kde4be/kde4be1-ucd.txt deleted file mode 100644 index 9671199b26..0000000000 --- a/shell/source/backends/kde4be/kde4be1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.KDE4Backend -ComponentName=kde4be1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.KDE4Backend diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component new file mode 100644 index 0000000000..8ea7ae1210 --- /dev/null +++ b/shell/source/backends/kde4be/kde4be1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/shell/source/backends/kde4be/makefile.mk b/shell/source/backends/kde4be/makefile.mk index 1f9093a95a..477e47ca61 100644 --- a/shell/source/backends/kde4be/makefile.mk +++ b/shell/source/backends/kde4be/makefile.mk @@ -44,8 +44,6 @@ VISIBILITY_HIDDEN=TRUE CFLAGSCXX+=-Wno-shadow .ENDIF -UNIXTEXT=$(MISC)/$(TARGET)1-ucd.txt - # no "lib" prefix DLLPRE = @@ -79,3 +77,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets --- .INCLUDE : target.mk + +ALLTAR : $(MISC)/kde4be1.component + +$(MISC)/kde4be1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + kde4be1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt kde4be1.component diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 53a00cf359..ad38a6cfc8 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -250,9 +250,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} diff --git a/shell/source/backends/kdebe/kdebe1-ucd.txt b/shell/source/backends/kdebe/kdebe1-ucd.txt deleted file mode 100644 index adf7e17431..0000000000 --- a/shell/source/backends/kdebe/kdebe1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.KDEBackend -ComponentName=kdebe1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.KDEBackend diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component new file mode 100644 index 0000000000..393fbc80d5 --- /dev/null +++ b/shell/source/backends/kdebe/kdebe1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk index 31bf77b47b..b1b12ad3c6 100644 --- a/shell/source/backends/kdebe/makefile.mk +++ b/shell/source/backends/kdebe/makefile.mk @@ -44,8 +44,6 @@ VISIBILITY_HIDDEN=TRUE CFLAGSCXX+=-Wno-shadow .ENDIF -UNIXTEXT=$(MISC)/$(TARGET)1-ucd.txt - # no "lib" prefix DLLPRE = @@ -79,3 +77,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets --- .INCLUDE : target.mk + +ALLTAR : $(MISC)/kdebe1.component + +$(MISC)/kdebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + kdebe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt kdebe1.component diff --git a/shell/source/backends/localebe/localebe1.component b/shell/source/backends/localebe/localebe1.component new file mode 100644 index 0000000000..7236a61982 --- /dev/null +++ b/shell/source/backends/localebe/localebe1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index 8326c65075..54eb55c80c 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -72,13 +72,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) { - return cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, kImplementations_entries); -} - -//------------------------------------------------------------------------------ - extern "C" void *component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/backends/localebe/makefile.mk b/shell/source/backends/localebe/makefile.mk index bd12bcdb28..1efe3ed5e4 100644 --- a/shell/source/backends/localebe/makefile.mk +++ b/shell/source/backends/localebe/makefile.mk @@ -70,3 +70,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/localebe1.component + +$(MISC)/localebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + localebe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt localebe1.component diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component new file mode 100644 index 0000000000..10bac2e2b6 --- /dev/null +++ b/shell/source/backends/macbe/macbe1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index e0609dd06b..6f4e4d53f4 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -73,13 +73,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) { - return cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, kImplementations_entries); -} - -//------------------------------------------------------------------------------ - extern "C" void *component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/backends/macbe/makefile.mk b/shell/source/backends/macbe/makefile.mk index c3a58ec9f5..dd20834b26 100644 --- a/shell/source/backends/macbe/makefile.mk +++ b/shell/source/backends/macbe/makefile.mk @@ -76,3 +76,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk .ENDIF # "$(OS)" != "MACOSX" + +ALLTAR : $(MISC)/macbe1.component + +$(MISC)/macbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + macbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt macbe1.component diff --git a/shell/source/backends/wininetbe/makefile.mk b/shell/source/backends/wininetbe/makefile.mk index 9f79fa706f..7d8a6be14b 100644 --- a/shell/source/backends/wininetbe/makefile.mk +++ b/shell/source/backends/wininetbe/makefile.mk @@ -66,3 +66,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/wininetbe1.component + +$(MISC)/wininetbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + wininetbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt wininetbe1.component diff --git a/shell/source/backends/wininetbe/wininetbe1.component b/shell/source/backends/wininetbe/wininetbe1.component new file mode 100644 index 0000000000..d8930280fb --- /dev/null +++ b/shell/source/backends/wininetbe/wininetbe1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index 7ecdbecf32..d325118ebf 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -73,13 +73,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) { - return cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, kImplementations_entries); -} - -//------------------------------------------------------------------------------ - extern "C" void *component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/cmdmail/cmdmail.component b/shell/source/cmdmail/cmdmail.component new file mode 100644 index 0000000000..7e56741d16 --- /dev/null +++ b/shell/source/cmdmail/cmdmail.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 63a0fa0517..61ae62fa85 100755 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -54,7 +54,6 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_SERVICE_NAME "com.sun.star.system.SimpleCommandMail" #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail" -#define COMP_REGKEY_NAME "/com.sun.star.comp.system.SimpleCommandMail/UNO/SERVICES/com.sun.star.system.SimpleCommandMail" //----------------------------------------------------------------------- // @@ -85,29 +84,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( COMP_REGKEY_NAME ) ) ); - return sal_True; - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - } - } - - return sal_False; -} - //---------------------------------------------------------------------- // component_getFactory //---------------------------------------------------------------------- diff --git a/shell/source/cmdmail/exports.dxp b/shell/source/cmdmail/exports.dxp index 028ac41759..f0e1c69934 100644 --- a/shell/source/cmdmail/exports.dxp +++ b/shell/source/cmdmail/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk index 5781afe8f5..e4d5ec48b9 100644 --- a/shell/source/cmdmail/makefile.mk +++ b/shell/source/cmdmail/makefile.mk @@ -62,3 +62,10 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk +ALLTAR : $(MISC)/cmdmail.component + +$(MISC)/cmdmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + cmdmail.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt cmdmail.component diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk index 4bf77436f6..1a26d377b1 100644 --- a/shell/source/unix/exec/makefile.mk +++ b/shell/source/unix/exec/makefile.mk @@ -88,3 +88,11 @@ run_test : $(BIN)$/$(TESTAPP1).sh $(BIN)$/$(TESTAPP1).sh : $$(@:f) $(COPY) $< $@ -chmod +x $@ + +ALLTAR : $(MISC)/syssh.component + +$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + syssh.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt syssh.component diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 134d750773..0d006cd2b9 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -83,29 +83,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//----------------------------------------------------------------------- -// component_writeInfo -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SHELLEXEC_REGKEY_NAME ) ) ); - return sal_True; - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - } - } - - return sal_False; -} - //---------------------------------------------------------------------- // component_getFactory //---------------------------------------------------------------------- diff --git a/shell/source/unix/exec/syssh.component b/shell/source/unix/exec/syssh.component new file mode 100644 index 0000000000..030240dff3 --- /dev/null +++ b/shell/source/unix/exec/syssh.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index 18da51da6d..93c44387a5 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -85,32 +85,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine"; } -//----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( - OUString::createFromAscii( SYSSHEXEC_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - bRetVal = sal_False; - } - } - - return bRetVal; -} - //---------------------------------------------------------------------- // component_getFactory // returns a factory to create XFilePicker-Services diff --git a/shell/source/win32/exports.dxp b/shell/source/win32/exports.dxp index 028ac41759..f0e1c69934 100644 --- a/shell/source/win32/exports.dxp +++ b/shell/source/win32/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk index 9a9564ed76..7a01eefed8 100644 --- a/shell/source/win32/makefile.mk +++ b/shell/source/win32/makefile.mk @@ -67,3 +67,11 @@ DEF1EXPORTFILE= exports.dxp INCLUDE!:=$(subst,/stl, $(INCLUDE)) .EXPORT : INCLUDE + +ALLTAR : $(MISC)/syssh.component + +$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + syssh.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt syssh.component diff --git a/shell/source/win32/simplemail/exports.dxp b/shell/source/win32/simplemail/exports.dxp index 028ac41759..f0e1c69934 100644 --- a/shell/source/win32/simplemail/exports.dxp +++ b/shell/source/win32/simplemail/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk index 84a209e4c0..abd35e408e 100644 --- a/shell/source/win32/simplemail/makefile.mk +++ b/shell/source/win32/simplemail/makefile.mk @@ -77,3 +77,11 @@ APP1DEF=$(MISC)$/$(APP1TARGET).def .INCLUDE : target.mk + +ALLTAR : $(MISC)/smplmail.component + +$(MISC)/smplmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + smplmail.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt smplmail.component diff --git a/shell/source/win32/simplemail/smplmail.component b/shell/source/win32/simplemail/smplmail.component new file mode 100644 index 0000000000..59246c6d15 --- /dev/null +++ b/shell/source/win32/simplemail/smplmail.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index fd66e40a5f..c6cd80536e 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -85,32 +85,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( - OUString::createFromAscii( COMP_REGKEY_NAME ) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - bRetVal = sal_False; - } - } - - return bRetVal; -} - //---------------------------------------------------------------------- // component_getFactory // returns a factory to create XFilePicker-Services diff --git a/shell/source/win32/syssh.component b/shell/source/win32/syssh.component new file mode 100644 index 0000000000..1e783f5221 --- /dev/null +++ b/shell/source/win32/syssh.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/svx/prj/d.lst b/svx/prj/d.lst index 2403c04c43..f8b71ea694 100644 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -552,3 +552,6 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table ..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* +..\%__SRC%\misc\svx.component %_DEST%\xml%_EXT%\svx.component +..\%__SRC%\misc\svxcore.component %_DEST%\xml%_EXT%\svxcore.component +..\%__SRC%\misc\textconversiondlgs.component %_DEST%\xml%_EXT%\textconversiondlgs.component diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index 2df0bf05a1..fb39434d60 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -77,44 +77,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -static void writeInfo ( - XRegistryKey * pRegistryKey, - const OUString& rImplementationName, - const Sequence< OUString >& rServices) -{ - Reference< XRegistryKey > xNewKey( - pRegistryKey->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) ); - - for( sal_Int32 i = 0; i < rServices.getLength(); i++ ) - xNewKey->createKey( rServices.getConstArray()[i]); -} - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * , void * pRegistryKey) -{ - if( pRegistryKey ) - { - try - { - XRegistryKey *pKey = reinterpret_cast< XRegistryKey * >( pRegistryKey ); - - writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionDirectionControl_getImplementationName(),::svx::ExtrusionDirectionControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionLightingControl_getImplementationName(),::svx::ExtrusionLightingControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionSurfaceControl_getImplementationName(),::svx::ExtrusionSurfaceControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::FontWorkAlignmentControl_getImplementationName(),::svx::FontWorkAlignmentControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::FontWorkCharacterSpacingControl_getImplementationName(),::svx::FontWorkCharacterSpacingControl_getSupportedServiceNames() ); - } - catch (InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return sal_True; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/svx/source/unodialogs/textconversiondlgs/makefile.mk b/svx/source/unodialogs/textconversiondlgs/makefile.mk index b5013ca9d1..ec0cdca262 100644 --- a/svx/source/unodialogs/textconversiondlgs/makefile.mk +++ b/svx/source/unodialogs/textconversiondlgs/makefile.mk @@ -88,3 +88,11 @@ $(SRS)$/$(TARGET).srs: $(INCCOM)$/chinese_direction.hrc $(SLO)$/chinese_dictionarydialog.obj: $(INCCOM)$/chinese_direction.hrc $(SLO)$/chinese_translationdialog.obj: $(INCCOM)$/chinese_direction.hrc + +ALLTAR : $(MISC)/textconversiondlgs.component + +$(MISC)/textconversiondlgs.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt textconversiondlgs.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt textconversiondlgs.component diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index f54d77c910..c80795a175 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -53,13 +53,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, g_entries_unodialogs_chinesetranslation ); -} -//================================================================================================== void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component b/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component new file mode 100644 index 0000000000..1847435836 --- /dev/null +++ b/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 060ab89ffc..44b63a88a0 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -261,60 +261,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -static void writeInfo ( - registry::XRegistryKey * pRegistryKey, - const OUString& rImplementationName, - const uno::Sequence< OUString >& rServices) -{ - uno::Reference< registry::XRegistryKey > xNewKey( - pRegistryKey->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) ); - - for( sal_Int32 i = 0; i < rServices.getLength(); i++ ) - xNewKey->createKey( rServices.getConstArray()[i]); -} - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * , void * pRegistryKey) -{ - if( pRegistryKey ) - { - try - { - registry::XRegistryKey *pKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey ); - - writeInfo( pKey, SvxShapeCollection::getImplementationName_Static(), SvxShapeCollection::getSupportedServiceNames_Static() ); - writeInfo( pKey, SvxUnoColorTable::getImplementationName_Static(), SvxUnoColorTable::getSupportedServiceNames_Static() ); - writeInfo( pKey, EnhancedCustomShapeEngine_getImplementationName(), EnhancedCustomShapeEngine_getSupportedServiceNames() ); - writeInfo( pKey, svx::RecoveryUI::st_getImplementationName(), svx::RecoveryUI::st_getSupportedServiceNames() ); - writeInfo( pKey, svx::GraphicExporter_getImplementationName(), svx::GraphicExporter_getSupportedServiceNames() ); - writeInfo( pKey, svx::FontHeightToolBoxControl::getImplementationName_Static(), svx::FontHeightToolBoxControl::getSupportedServiceNames_Static() ); - - writeInfo( pKey, svx::FindTextToolbarController::getImplementationName_Static(), svx::FindTextToolbarController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::DownSearchToolboxController::getImplementationName_Static(), svx::DownSearchToolboxController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::UpSearchToolboxController::getImplementationName_Static(), svx::UpSearchToolboxController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::FindbarDispatcher::getImplementationName_Static(), svx::FindbarDispatcher::getSupportedServiceNames_Static() ); - - writeInfo( pKey, ::unogallery::GalleryThemeProvider_getImplementationName(),::unogallery::GalleryThemeProvider_getSupportedServiceNames() ); - - // XPrimitiveFactory2D - writeInfo( pKey, - drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static(), - drawinglayer::primitive2d::PrimitiveFactory2D::getSupportedServiceNames_Static() ); - - writeInfo( pKey, ::svx::SvXMLGraphicImportHelper_getImplementationName(),::svx::SvXMLGraphicImportHelper_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::SvXMLGraphicExportHelper_getImplementationName(),::svx::SvXMLGraphicExportHelper_getSupportedServiceNames() ); -// writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() ); - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return sal_True; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/svx/util/gal.dxp b/svx/util/gal.dxp index 227006cc4e..e8f2e0a948 100644 --- a/svx/util/gal.dxp +++ b/svx/util/gal.dxp @@ -17,5 +17,4 @@ Gallery_InsertSdrObj Gallery_GetThemeNameFromId Gallery_BeginLocking Gallery_EndLocking -component_writeInfo component_getFactory diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index 050decc8d4..18f52487e4 100644 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk @@ -196,3 +196,17 @@ RESLIB1SRSFILES= $(SRSFILELIST) .INCLUDE : target.mk + +ALLTAR : $(MISC)/svx.component $(MISC)/svxcore.component + +$(MISC)/svx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + svx.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt svx.component + +$(MISC)/svxcore.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + svxcore.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt svxcore.component diff --git a/svx/util/svx.component b/svx/util/svx.component new file mode 100644 index 0000000000..5907d69fef --- /dev/null +++ b/svx/util/svx.component @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svx/util/svx.dxp b/svx/util/svx.dxp index 9630d7e067..f0e1c69934 100644 --- a/svx/util/svx.dxp +++ b/svx/util/svx.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component new file mode 100644 index 0000000000..2f829cb52a --- /dev/null +++ b/svx/util/svxcore.component @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sysui/util/exports.dxp b/sysui/util/exports.dxp index 028ac41759..f0e1c69934 100644 --- a/sysui/util/exports.dxp +++ b/sysui/util/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst index b02c8184a6..65a32e21fb 100644 --- a/ucb/prj/d.lst +++ b/ucb/prj/d.lst @@ -31,5 +31,16 @@ ..\source\ucp\gvfs\ucpgvfs.xml %_DEST%\xml%_EXT%\ucpgvfs.xml ..\source\ucp\tdoc\ucptdoc.xml %_DEST%\xml%_EXT%\ucptdoc.xml -..\%__SRC%\misc\ucpgvfs-ucd.txt %_DEST%\bin%_EXT%\ucpgvfs-ucd.txt -..\%__SRC%\misc\ucpgio-ucd.txt %_DEST%\bin%_EXT%\ucpgio-ucd.txt +..\%__SRC%\misc\ucpgvfs.component %_DEST%\xml%_EXT%\ucpgvfs.component +..\%__SRC%\misc\ucpgio.component %_DEST%\xml%_EXT%\ucpgio.component +..\%__SRC%\misc\cached1.component %_DEST%\xml%_EXT%\cached1.component +..\%__SRC%\misc\srtrs1.component %_DEST%\xml%_EXT%\srtrs1.component +..\%__SRC%\misc\ucb1.component %_DEST%\xml%_EXT%\ucb1.component +..\%__SRC%\misc\ucpdav1.component %_DEST%\xml%_EXT%\ucpdav1.component +..\%__SRC%\misc\ucpexpand1.component %_DEST%\xml%_EXT%\ucpexpand1.component +..\%__SRC%\misc\ucpext.component %_DEST%\xml%_EXT%\ucpext.component +..\%__SRC%\misc\ucpfile1.component %_DEST%\xml%_EXT%\ucpfile1.component +..\%__SRC%\misc\ucpftp1.component %_DEST%\xml%_EXT%\ucpftp1.component +..\%__SRC%\misc\ucphier1.component %_DEST%\xml%_EXT%\ucphier1.component +..\%__SRC%\misc\ucppkg1.component %_DEST%\xml%_EXT%\ucppkg1.component +..\%__SRC%\misc\ucptdoc1.component %_DEST%\xml%_EXT%\ucptdoc1.component diff --git a/ucb/source/cacher/cached1.component b/ucb/source/cacher/cached1.component new file mode 100644 index 0000000000..aa19e54b5d --- /dev/null +++ b/ucb/source/cacher/cached1.component @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index 031276472b..b9ed8e369a 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -40,45 +40,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) @@ -86,44 +47,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // CachedContentResultSetFactory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - CachedContentResultSetFactory::getImplementationName_Static(), - CachedContentResultSetFactory::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // CachedContentResultSetStubFactory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - CachedContentResultSetStubFactory::getImplementationName_Static(), - CachedContentResultSetStubFactory::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // CachedDynamicResultSetFactory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - CachedDynamicResultSetFactory::getImplementationName_Static(), - CachedDynamicResultSetFactory::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // CachedDynamicResultSetStubFactory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - CachedDynamicResultSetStubFactory::getImplementationName_Static(), - CachedDynamicResultSetStubFactory::getSupportedServiceNames_Static() ); -} - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) diff --git a/ucb/source/cacher/makefile.mk b/ucb/source/cacher/makefile.mk index 600fefc174..24d245ec6c 100644 --- a/ucb/source/cacher/makefile.mk +++ b/ucb/source/cacher/makefile.mk @@ -66,3 +66,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/cached1.component + +$(MISC)/cached1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + cached1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt cached1.component diff --git a/ucb/source/core/exports2.dxp b/ucb/source/core/exports2.dxp index a1936474f7..8091459f4d 100644 --- a/ucb/source/core/exports2.dxp +++ b/ucb/source/core/exports2.dxp @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory _ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk index 34765eb742..6360f82320 100644 --- a/ucb/source/core/makefile.mk +++ b/ucb/source/core/makefile.mk @@ -74,3 +74,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucb1.component + +$(MISC)/ucb1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucb1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucb1.component diff --git a/ucb/source/core/ucb1.component b/ucb/source/core/ucb1.component new file mode 100644 index 0000000000..e9d408822c --- /dev/null +++ b/ucb/source/core/ucb1.component @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index 9c22dabe18..a0f28b8c55 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -29,7 +29,6 @@ #include "precompiled_ucb.hxx" #include #include -#include #include "ucb.hxx" #include "ucbstore.hxx" #include "ucbprops.hxx" @@ -39,46 +38,6 @@ using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using namespace com::sun::star::registry; - -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( @@ -87,52 +46,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // Universal Content Broker. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - UniversalContentBroker::getImplementationName_Static(), - UniversalContentBroker::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // UCB Store. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - UcbStore::getImplementationName_Static(), - UcbStore::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // UCB PropertiesManager. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - UcbPropertiesManager::getImplementationName_Static(), - UcbPropertiesManager::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // UCP Proxy Factory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - UcbContentProviderProxyFactory::getImplementationName_Static(), - UcbContentProviderProxyFactory::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // Command Environment. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - ucb_cmdenv::UcbCommandEnvironment::getImplementationName_Static(), - ucb_cmdenv::UcbCommandEnvironment::getSupportedServiceNames_Static() ); -} - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) diff --git a/ucb/source/sorter/makefile.mk b/ucb/source/sorter/makefile.mk index 68a9959589..008e39b4bc 100644 --- a/ucb/source/sorter/makefile.mk +++ b/ucb/source/sorter/makefile.mk @@ -61,3 +61,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/srtrs1.component + +$(MISC)/srtrs1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + srtrs1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt srtrs1.component diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index a1c781c4d4..1f533c3948 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -30,51 +30,10 @@ #include #include #include -#include using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using namespace com::sun::star::registry; - -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( @@ -83,20 +42,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // SortedDynamicResultSetFactory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - SortedDynamicResultSetFactory::getImplementationName_Static(), - SortedDynamicResultSetFactory::getSupportedServiceNames_Static() ); -} - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) diff --git a/ucb/source/sorter/srtrs1.component b/ucb/source/sorter/srtrs1.component new file mode 100644 index 0000000000..c32705160c --- /dev/null +++ b/ucb/source/sorter/srtrs1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/ucb/source/ucp/expand/makefile.mk b/ucb/source/ucp/expand/makefile.mk index 32de160318..70e441171a 100644 --- a/ucb/source/ucp/expand/makefile.mk +++ b/ucb/source/ucp/expand/makefile.mk @@ -59,3 +59,11 @@ DEF1NAME = $(SHL1TARGET) .ENDIF # L10N_framework .INCLUDE : target.mk + +ALLTAR : $(MISC)/ucpexpand1.component + +$(MISC)/ucpexpand1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpexpand1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpexpand1.component diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index ea72dedbc9..7f691ece8c 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -273,14 +273,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, s_entries ); -} - void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, diff --git a/ucb/source/ucp/expand/ucpexpand1.component b/ucb/source/ucp/expand/ucpexpand1.component new file mode 100644 index 0000000000..5997e90298 --- /dev/null +++ b/ucb/source/ucp/expand/ucpexpand1.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/ucb/source/ucp/ext/makefile.mk b/ucb/source/ucp/ext/makefile.mk index 23c30b3bda..e106b8e1ba 100644 --- a/ucb/source/ucp/ext/makefile.mk +++ b/ucb/source/ucp/ext/makefile.mk @@ -63,3 +63,11 @@ SHL1DEF = $(MISC)$/$(SHL1TARGET).def DEF1NAME = $(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/ucpext.component + +$(MISC)/ucpext.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpext.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpext.component diff --git a/ucb/source/ucp/ext/ucpext.component b/ucb/source/ucp/ext/ucpext.component new file mode 100644 index 0000000000..d673777a67 --- /dev/null +++ b/ucb/source/ucp/ext/ucpext.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx index 5e2d995d39..26897b5b76 100644 --- a/ucb/source/ucp/ext/ucpext_services.cxx +++ b/ucb/source/ucp/ext/ucpext_services.cxx @@ -79,12 +79,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - //------------------------------------------------------------------------------------------------------------------ - sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) - { - return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, ::ucb::ucp::ext::s_aServiceEntries ); - } - //------------------------------------------------------------------------------------------------------------------ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/ucb/source/ucp/file/exports2.dxp b/ucb/source/ucp/file/exports2.dxp index 6c42314f22..4804c8d0ae 100644 --- a/ucb/source/ucp/file/exports2.dxp +++ b/ucb/source/ucp/file/exports2.dxp @@ -1,5 +1,4 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory _ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk index 8007a24923..3d97cb2387 100644 --- a/ucb/source/ucp/file/makefile.mk +++ b/ucb/source/ucp/file/makefile.mk @@ -78,3 +78,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucpfile1.component + +$(MISC)/ucpfile1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpfile1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpfile1.component diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 1c4f268e93..04a51d7f70 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -31,7 +31,6 @@ #include #include #include -#include #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBBUTE_HPP_ #include #endif @@ -52,45 +51,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::ucb; using namespace com::sun::star::container; -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) @@ -98,20 +58,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // File Content Provider. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - fileaccess::shell::getImplementationName_static(), - fileaccess::shell::getSupportedServiceNames_static() ); -} - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) diff --git a/ucb/source/ucp/file/ucpfile1.component b/ucb/source/ucp/file/ucpfile1.component new file mode 100644 index 0000000000..2803245122 --- /dev/null +++ b/ucb/source/ucp/file/ucpfile1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx index ca2cf3823d..1eb9feca51 100644 --- a/ucb/source/ucp/ftp/ftpservices.cxx +++ b/ucb/source/ucp/ftp/ftpservices.cxx @@ -35,45 +35,6 @@ using namespace com::sun::star; using namespace ftp; -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -81,21 +42,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // FTP Content Provider. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - FTPContentProvider::getImplementationName_Static(), - FTPContentProvider::getSupportedServiceNames_Static() ); -} - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk index a0f1410040..c2f1ce154a 100644 --- a/ucb/source/ucp/ftp/makefile.mk +++ b/ucb/source/ucp/ftp/makefile.mk @@ -104,3 +104,11 @@ DEF1NAME=$(SHL1TARGET) + +ALLTAR : $(MISC)/ucpftp1.component + +$(MISC)/ucpftp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpftp1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpftp1.component diff --git a/ucb/source/ucp/ftp/ucpftp1.component b/ucb/source/ucp/ftp/ucpftp1.component new file mode 100644 index 0000000000..fa4cfe6e75 --- /dev/null +++ b/ucb/source/ucp/ftp/ucpftp1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 9921f3a118..d84ea35bd3 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -102,41 +102,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); } -static sal_Bool writeInfo( void *pRegistryKey, - const rtl::OUString &rImplementationName, uno::Sequence< rtl::OUString > const &rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * > (pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - {} - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment **) { diff --git a/ucb/source/ucp/gio/makefile.mk b/ucb/source/ucp/gio/makefile.mk index 86b32fbc07..4cca611c7e 100644 --- a/ucb/source/ucp/gio/makefile.mk +++ b/ucb/source/ucp/gio/makefile.mk @@ -37,8 +37,6 @@ NO_BSYMBOLIC=TRUE .INCLUDE: settings.mk .IF "$(L10N_framework)"=="" -UNIXTEXT=$(MISC)/$(TARGET)-ucd.txt - .IF "$(ENABLE_GIO)"!="" COMPILER_WARN_ALL=TRUE PKGCONFIG_MODULES=gio-2.0 @@ -79,3 +77,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map .ENDIF # L10N_framework .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucpgio.component + +$(MISC)/ucpgio.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpgio.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpgio.component diff --git a/ucb/source/ucp/gio/ucpgio-ucd.txt b/ucb/source/ucp/gio/ucpgio-ucd.txt deleted file mode 100644 index ce7657fa73..0000000000 --- a/ucb/source/ucp/gio/ucpgio-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.GIOContentProvider -ComponentName=ucpgio1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ucb.GIOContentProvider diff --git a/ucb/source/ucp/gio/ucpgio.component b/ucb/source/ucp/gio/ucpgio.component new file mode 100644 index 0000000000..caa8fc361f --- /dev/null +++ b/ucb/source/ucp/gio/ucpgio.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index 92fa95c0e6..07e232317a 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -143,42 +143,6 @@ ContentProvider::queryContent( //============================ shlib entry points ============================================= - -// cut and paste verbatim from webdav (that sucks). -static sal_Bool -writeInfo( void *pRegistryKey, - const rtl::OUString &rImplementationName, - uno::Sequence< rtl::OUString > const &rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try { - xKey = static_cast< registry::XRegistryKey * > - (pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) { - try { - xKey->createKey( rServiceNames[ n ] ); - - } catch ( registry::InvalidRegistryException const & ) { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment **/*ppEnv*/ ) @@ -186,15 +150,6 @@ component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" sal_Bool SAL_CALL -component_writeInfo( void */*pServiceManager*/, - void *pRegistryKey ) -{ - return pRegistryKey && - writeInfo( pRegistryKey, - ::gvfs::ContentProvider::getImplementationName_Static(), - ::gvfs::ContentProvider::getSupportedServiceNames_Static() ); -} extern "C" void * SAL_CALL component_getFactory( const sal_Char *pImplName, void *pServiceManager, diff --git a/ucb/source/ucp/gvfs/makefile.mk b/ucb/source/ucp/gvfs/makefile.mk index a0e8a0bda3..87fcca87cf 100644 --- a/ucb/source/ucp/gvfs/makefile.mk +++ b/ucb/source/ucp/gvfs/makefile.mk @@ -37,8 +37,6 @@ NO_BSYMBOLIC=TRUE .INCLUDE: settings.mk .IF "$(L10N_framework)"=="" -UNIXTEXT=$(MISC)/$(TARGET)-ucd.txt - .IF "$(ENABLE_GNOMEVFS)"!="" COMPILER_WARN_ALL=TRUE PKGCONFIG_MODULES=gnome-vfs-2.0 @@ -84,3 +82,10 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map .INCLUDE: target.mk +ALLTAR : $(MISC)/ucpgvfs.component + +$(MISC)/ucpgvfs.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpgvfs.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpgvfs.component diff --git a/ucb/source/ucp/gvfs/ucpgvfs-ucd.txt b/ucb/source/ucp/gvfs/ucpgvfs-ucd.txt deleted file mode 100644 index e9ecce6eff..0000000000 --- a/ucb/source/ucp/gvfs/ucpgvfs-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.GnomeVFSContentProvider -ComponentName=ucpgvfs1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.ucb.GnomeVFSContentProvider diff --git a/ucb/source/ucp/gvfs/ucpgvfs.component b/ucb/source/ucp/gvfs/ucpgvfs.component new file mode 100644 index 0000000000..cec3e4d1e2 --- /dev/null +++ b/ucb/source/ucp/gvfs/ucpgvfs.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx index 3249334d90..d884b29366 100644 --- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx @@ -29,52 +29,12 @@ #include "precompiled_ucb.hxx" #include #include -#include #include "hierarchyprovider.hxx" #include "hierarchydatasource.hxx" using namespace com::sun::star; using namespace hierarchy_ucp; -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -82,29 +42,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // Hierarchy Content Provider. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - HierarchyContentProvider::getImplementationName_Static(), - HierarchyContentProvider::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // Hierarchy Data Source. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - HierarchyDataSource::getImplementationName_Static(), - HierarchyDataSource::getSupportedServiceNames_Static() ); -} - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) diff --git a/ucb/source/ucp/hierarchy/makefile.mk b/ucb/source/ucp/hierarchy/makefile.mk index 00b481b5e7..9263faa24b 100644 --- a/ucb/source/ucp/hierarchy/makefile.mk +++ b/ucb/source/ucp/hierarchy/makefile.mk @@ -82,3 +82,11 @@ DEF1NAME=$(SHL1TARGET) .ENDIF # L10N_framework .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucphier1.component + +$(MISC)/ucphier1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucphier1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucphier1.component diff --git a/ucb/source/ucp/hierarchy/ucphier1.component b/ucb/source/ucp/hierarchy/ucphier1.component new file mode 100644 index 0000000000..5483187d86 --- /dev/null +++ b/ucb/source/ucp/hierarchy/ucphier1.component @@ -0,0 +1,38 @@ + + + + + + + + + + + + diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx index 1140083942..42fc7e4cdd 100644 --- a/ucb/source/ucp/odma/odma_services.cxx +++ b/ucb/source/ucp/odma/odma_services.cxx @@ -39,45 +39,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) diff --git a/ucb/source/ucp/package/makefile.mk b/ucb/source/ucp/package/makefile.mk index a8cdf74307..b78150aed2 100644 --- a/ucb/source/ucp/package/makefile.mk +++ b/ucb/source/ucp/package/makefile.mk @@ -87,3 +87,11 @@ DEF1NAME=$(SHL1TARGET) .ENDIF # L10N_framework .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucppkg1.component + +$(MISC)/ucppkg1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucppkg1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucppkg1.component diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index 61edd11642..b287536f33 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -34,50 +34,6 @@ using namespace com::sun::star; -namespace { - -//========================================================================= -sal_Bool writeInfo( - void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -} // namespace - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -85,21 +41,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // Write info into registry. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - ::package_ucp::ContentProvider::getImplementationName_Static(), - ::package_ucp::ContentProvider::getSupportedServiceNames_Static() ); -} - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) diff --git a/ucb/source/ucp/package/ucppkg1.component b/ucb/source/ucp/package/ucppkg1.component new file mode 100644 index 0000000000..a2e2418b56 --- /dev/null +++ b/ucb/source/ucp/package/ucppkg1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/ucb/source/ucp/tdoc/makefile.mk b/ucb/source/ucp/tdoc/makefile.mk index 83e9599eed..82c76b34b2 100644 --- a/ucb/source/ucp/tdoc/makefile.mk +++ b/ucb/source/ucp/tdoc/makefile.mk @@ -92,3 +92,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucptdoc1.component + +$(MISC)/ucptdoc1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucptdoc1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucptdoc1.component diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx index 26b1d8a2de..cc60b72394 100644 --- a/ucb/source/ucp/tdoc/tdoc_services.cxx +++ b/ucb/source/ucp/tdoc/tdoc_services.cxx @@ -38,45 +38,6 @@ using namespace com::sun::star; using namespace tdoc_ucp; -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -84,29 +45,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // Transient Documents Content Provider. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - ContentProvider::getImplementationName_Static(), - ContentProvider::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // Transient Documents Document Content Factory. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - DocumentContentFactory::getImplementationName_Static(), - DocumentContentFactory::getSupportedServiceNames_Static() ); -} - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) diff --git a/ucb/source/ucp/tdoc/ucptdoc1.component b/ucb/source/ucp/tdoc/ucptdoc1.component new file mode 100644 index 0000000000..8ba1471bd9 --- /dev/null +++ b/ucb/source/ucp/tdoc/ucptdoc1.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk index 73ee298697..162d582664 100644 --- a/ucb/source/ucp/webdav/makefile.mk +++ b/ucb/source/ucp/webdav/makefile.mk @@ -158,3 +158,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets ---------------------------------------------------------- .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucpdav1.component + +$(MISC)/ucpdav1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpdav1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpdav1.component diff --git a/ucb/source/ucp/webdav/ucpdav1.component b/ucb/source/ucp/webdav/ucpdav1.component new file mode 100644 index 0000000000..4e18b566e1 --- /dev/null +++ b/ucb/source/ucp/webdav/ucpdav1.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx index 288772231a..af09f8734e 100644 --- a/ucb/source/ucp/webdav/webdavservices.cxx +++ b/ucb/source/ucp/webdav/webdavservices.cxx @@ -34,45 +34,6 @@ using namespace com::sun::star; -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -80,21 +41,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // WebDAV Content Provider. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - ::webdav_ucp::ContentProvider::getImplementationName_Static(), - ::webdav_ucp::ContentProvider::getSupportedServiceNames_Static() ); -} - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) diff --git a/uui/prj/d.lst b/uui/prj/d.lst index 30c6f812fd..46b0118319 100644 --- a/uui/prj/d.lst +++ b/uui/prj/d.lst @@ -7,3 +7,4 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid ..\%__SRC%\lib\iuui.lib %_DEST%\lib%_EXT%\iuui.lib ..\util\uui.xml %_DEST%\xml%_EXT%\uui.xml +..\%__SRC%\misc\uui.component %_DEST%\xml%_EXT%\uui.component diff --git a/uui/source/services.cxx b/uui/source/services.cxx index 7ec7c34056..30af064df6 100644 --- a/uui/source/services.cxx +++ b/uui/source/services.cxx @@ -41,49 +41,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; -namespace { - -sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - { - return sal_False; - } - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -} // namespace - //============================================================================ // // component_getImplementationEnvironment @@ -97,43 +54,6 @@ component_getImplementationEnvironment(sal_Char const ** pEnvTypeName, *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//============================================================================ -// -// component_writeInfo -// -//============================================================================ - -extern "C" sal_Bool SAL_CALL component_writeInfo(void *, void * pRegistryKey) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // UUI Interaction Handler. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - OUString::createFromAscii( - UUIInteractionHandler::m_aImplementationName ), - UUIInteractionHandler::getSupportedServiceNames_static() ) && - - ////////////////////////////////////////////////////////////////////// - // UUI Interaction Request String Resolver. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - OUString::createFromAscii( - UUIInteractionRequestStringResolver::m_aImplementationName ), - UUIInteractionRequestStringResolver::getSupportedServiceNames_static() ) && - - ////////////////////////////////////////////////////////////////////// - // UUI Password Container Interaction Handler. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - uui::PasswordContainerInteractionHandler::getImplementationName_Static(), - uui::PasswordContainerInteractionHandler::getSupportedServiceNames_Static() ); -} - //============================================================================ // // component_getFactory diff --git a/uui/util/makefile.mk b/uui/util/makefile.mk index 163a7bb550..8a77e71b5e 100644 --- a/uui/util/makefile.mk +++ b/uui/util/makefile.mk @@ -62,3 +62,11 @@ RESLIB1SRSFILES = \ $(SRS)$/source.srs .INCLUDE: target.mk + +ALLTAR : $(MISC)/uui.component + +$(MISC)/uui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + uui.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt uui.component diff --git a/uui/util/uui.component b/uui/util/uui.component new file mode 100644 index 0000000000..0a15ad6eb8 --- /dev/null +++ b/uui/util/uui.component @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + diff --git a/vbahelper/prj/d.lst b/vbahelper/prj/d.lst index 2d20ab1f98..a5457b7304 100644 --- a/vbahelper/prj/d.lst +++ b/vbahelper/prj/d.lst @@ -26,4 +26,5 @@ mkdir: %_DEST%\inc%_EXT%\basic ..\inc\vbahelper\vbatextframe.hxx %_DEST%\inc%_EXT%\vbahelper\vbatextframe.hxx ..\inc\vbahelper\vbashaperange.hxx %_DEST%\inc%_EXT%\vbahelper\vbashaperange.hxx ..\inc\vbahelper\vbapagesetupbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbapagesetupbase.hxx +..\%__SRC%\misc\msforms.component %_DEST%\xml%_EXT%\msforms.component ..\inc\vbahelper\vbaeventshelperbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaeventshelperbase.hxx diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx index 22d99f24ea..01e6014a37 100644 --- a/vbahelper/source/msforms/service.cxx +++ b/vbahelper/source/msforms/service.cxx @@ -57,16 +57,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - OSL_TRACE("In component_writeInfo"); - - // Component registration - return component_writeInfoHelper( pServiceManager, pRegistryKey, - controlprovider::serviceDecl, userform::serviceDecl ); - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk index dda4be0cbc..9469df4736 100644 --- a/vbahelper/util/makefile.mk +++ b/vbahelper/util/makefile.mk @@ -102,3 +102,11 @@ SHL2LIBS=$(SLB)$/$(TARGET_MSFORMS).lib # --- Targets ----------------------------------------------------------- .INCLUDE : target.mk + +ALLTAR : $(MISC)/msforms.component + +$(MISC)/msforms.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + msforms.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt msforms.component diff --git a/vbahelper/util/msforms.component b/vbahelper/util/msforms.component new file mode 100644 index 0000000000..98ce4a8451 --- /dev/null +++ b/vbahelper/util/msforms.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/xmlhelp/prj/d.lst b/xmlhelp/prj/d.lst index 1cfa107f73..02eec754b6 100644 --- a/xmlhelp/prj/d.lst +++ b/xmlhelp/prj/d.lst @@ -5,3 +5,6 @@ ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.* ..\util\ucpchelp.xml %_DEST%\xml%_EXT%\ucpchelp.xml ..\%__SRC%\lib\ihelplinker.lib %_DEST%\lib%_EXT%\ihelplinker.lib +..\%__SRC%\misc\LuceneHelpWrapper.component %_DEST%\xml%_EXT%\LuceneHelpWrapper.component +..\%__SRC%\misc\tvhlp1.component %_DEST%\xml%_EXT%\tvhlp1.component +..\%__SRC%\misc\ucpchelp1.component %_DEST%\xml%_EXT%\ucpchelp1.component diff --git a/xmlhelp/source/com/sun/star/help/HelpComponent.java b/xmlhelp/source/com/sun/star/help/HelpComponent.java index 18cb3feaa0..e0b5f0faf8 100755 --- a/xmlhelp/source/com/sun/star/help/HelpComponent.java +++ b/xmlhelp/source/com/sun/star/help/HelpComponent.java @@ -68,10 +68,8 @@ import java.io.PrintStream; import java.io.File; */ -/** This class capsulates the class, that implements the minimal component, a - * factory for creating the service (__getComponentFactory) and a - * method, that writes the information into the given registry key - * (__writeRegistryServiceInfo). +/** This class capsulates the class, that implements the minimal component and a + * factory for creating the service (__getComponentFactory). */ public class HelpComponent { @@ -98,25 +96,6 @@ public class HelpComponent return xFactory; } - /** - * Writes the service information into the given registry key. - * This method is called by the JavaLoader - *

- * @return returns true if the operation succeeded - * @param regKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) - { - boolean bSuccessHelpSearch = Factory.writeRegistryServiceInfo - (HelpSearch._HelpSearch.class.getName(), - HelpSearch._HelpSearch.getServiceNames(), regKey); - boolean bSuccessHelpIndexer = Factory.writeRegistryServiceInfo - (HelpIndexer.class.getName(), - HelpIndexer.getServiceNames(), regKey); - - return bSuccessHelpSearch && bSuccessHelpIndexer; - } /** This method is a member of the interface for initializing an object * directly after its creation. * @param object This array of arbitrary objects will be passed to the diff --git a/xmlhelp/source/com/sun/star/help/HelpSearch.java b/xmlhelp/source/com/sun/star/help/HelpSearch.java index 714bb75a52..d140d3093a 100644 --- a/xmlhelp/source/com/sun/star/help/HelpSearch.java +++ b/xmlhelp/source/com/sun/star/help/HelpSearch.java @@ -54,10 +54,8 @@ import org.apache.lucene.search.WildcardQuery; import com.sun.star.script.XInvocation; import com.sun.star.beans.XIntrospectionAccess; -/** This class capsulates the class, that implements the minimal component, a - * factory for creating the service (__getComponentFactory) and a - * method, that writes the information into the given registry key - * (__writeRegistryServiceInfo). +/** This class capsulates the class, that implements the minimal component and a + * factory for creating the service (__getComponentFactory). */ public class HelpSearch { @@ -314,19 +312,6 @@ public class HelpSearch return xFactory; } - /** - * Writes the service information into the given registry key. - * This method is called by the JavaLoader - *

- * @return returns true if the operation succeeded - * @param regKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { - return Factory.writeRegistryServiceInfo(_HelpSearch.class.getName(), - _HelpSearch.getServiceNames(), - regKey); - } /** This method is a member of the interface for initializing an object * directly after its creation. * @param object This array of arbitrary objects will be passed to the diff --git a/xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component b/xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component new file mode 100644 index 0000000000..04b35bcb12 --- /dev/null +++ b/xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk index ffa08b30cf..a67f755a1c 100644 --- a/xmlhelp/source/com/sun/star/help/makefile.mk +++ b/xmlhelp/source/com/sun/star/help/makefile.mk @@ -76,6 +76,14 @@ fix_system_lucene: @echo "Fix Java Class-Path entry for Lucene libraries from system." @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \ -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF + +ALLTAR : $(MISC)/LuceneHelpWrapper.component + +$(MISC)/LuceneHelpWrapper.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt LuceneHelpWrapper.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt LuceneHelpWrapper.component .ELSE all: @echo java disabled diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx index 7cb7e1d706..834638807b 100644 --- a/xmlhelp/source/cxxhelp/provider/services.cxx +++ b/xmlhelp/source/cxxhelp/provider/services.cxx @@ -35,46 +35,6 @@ using namespace com::sun::star; -//========================================================================= -static sal_Bool writeInfo( - void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - uno::Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -82,21 +42,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // Write info into registry. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - ::chelp::ContentProvider::getImplementationName_Static(), - ::chelp::ContentProvider::getSupportedServiceNames_Static() ); -} - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName, diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk index 0c385862d7..be0ed8e76f 100644 --- a/xmlhelp/source/treeview/makefile.mk +++ b/xmlhelp/source/treeview/makefile.mk @@ -67,3 +67,11 @@ DEF1DES=UCB : Treeview help .INCLUDE: target.mk + +ALLTAR : $(MISC)/tvhlp1.component + +$(MISC)/tvhlp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + tvhlp1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt tvhlp1.component diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 7e705cc3f6..10f508b745 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -255,49 +255,6 @@ TVFactory::CreateInstance( return Reference< XInterface >::query( xP ); } - - -//========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - Sequence< rtl::OUString > const & rServiceNames ) -{ - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< registry::XRegistryKey > xKey; - try - { - xKey = static_cast< registry::XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( registry::InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( registry::InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - - - //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) @@ -307,20 +264,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - - -//========================================================================= -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - (void)pServiceManager; - - return pRegistryKey && writeInfo( pRegistryKey, - TVFactory::getImplementationName_static(), - TVFactory::getSupportedServiceNames_static() ); -} - - //========================================================================= extern "C" void * SAL_CALL component_getFactory( const sal_Char * pImplName,void * pServiceManager,void * pRegistryKey ) diff --git a/xmlhelp/source/treeview/tvhlp1.component b/xmlhelp/source/treeview/tvhlp1.component new file mode 100644 index 0000000000..525de73e00 --- /dev/null +++ b/xmlhelp/source/treeview/tvhlp1.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk index 10206670b5..5ce7bf2f10 100644 --- a/xmlhelp/util/makefile.mk +++ b/xmlhelp/util/makefile.mk @@ -76,3 +76,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE: target.mk + +ALLTAR : $(MISC)/ucpchelp1.component + +$(MISC)/ucpchelp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpchelp1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ucpchelp1.component diff --git a/xmlhelp/util/ucpchelp1.component b/xmlhelp/util/ucpchelp1.component new file mode 100644 index 0000000000..a8bb64124e --- /dev/null +++ b/xmlhelp/util/ucpchelp1.component @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst index 7784bca047..9bbfe05f3a 100644 --- a/xmloff/prj/d.lst +++ b/xmloff/prj/d.lst @@ -116,3 +116,5 @@ mkdir: %_DEST%\inc%_EXT%\xmloff\table ..\inc\xmloff\table\XMLTableImport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableImport.hxx ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib +..\%__SRC%\misc\xo.component %_DEST%\xml%_EXT%\xo.component +..\%__SRC%\misc\xof.component %_DEST%\xml%_EXT%\xof.component diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index c20a6ff98c..826379026e 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -167,117 +167,6 @@ XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void SAL_CALL writeInfo( registry::XRegistryKey * pRegistryKey, const OUString& rImplementationName, const uno::Sequence< OUString >& rServices ) -{ - uno::Reference< registry::XRegistryKey > xNewKey( - pRegistryKey->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) ); - - for( sal_Int32 i = 0; i < rServices.getLength(); i++ ) - xNewKey->createKey( rServices.getConstArray()[i]); -} - -#define WRITEINFO(className)\ - writeInfo( pKey, className##_getImplementationName(), className##_getSupportedServiceNames() ) - -XMLOFF_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) -{ - if( pRegistryKey ) - { - try - { - registry::XRegistryKey *pKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey ); - - // impress oasis import - WRITEINFO( XMLImpressImportOasis ); - WRITEINFO( XMLImpressStylesImportOasis ); - WRITEINFO( XMLImpressContentImportOasis ); - WRITEINFO( XMLImpressMetaImportOasis ); - WRITEINFO( XMLImpressSettingsImportOasis ); - - // impress oasis export - WRITEINFO( XMLImpressExportOasis ); - WRITEINFO( XMLImpressStylesExportOasis ); - WRITEINFO( XMLImpressContentExportOasis ); - WRITEINFO( XMLImpressMetaExportOasis ); - WRITEINFO( XMLImpressSettingsExportOasis ); - - // animation import - WRITEINFO( AnimationsImport ); - - // impress OOo export - WRITEINFO( XMLImpressExportOOO ); - WRITEINFO( XMLImpressStylesExportOOO ); - WRITEINFO( XMLImpressContentExportOOO ); - WRITEINFO( XMLImpressMetaExportOOO ); - WRITEINFO( XMLImpressSettingsExportOOO ); - - // draw oasis import - WRITEINFO( XMLDrawImportOasis ); - WRITEINFO( XMLDrawStylesImportOasis ); - WRITEINFO( XMLDrawContentImportOasis ); - WRITEINFO( XMLDrawMetaImportOasis ); - WRITEINFO( XMLDrawSettingsImportOasis ); - - // draw oasis export - WRITEINFO( XMLDrawExportOasis ); - WRITEINFO( XMLDrawStylesExportOasis ); - WRITEINFO( XMLDrawContentExportOasis ); - WRITEINFO( XMLDrawMetaExportOasis ); - WRITEINFO( XMLDrawSettingsExportOasis ); - - // draw OOo export - WRITEINFO( XMLDrawExportOOO ); - WRITEINFO( XMLDrawStylesExportOOO ); - WRITEINFO( XMLDrawContentExportOOO ); - WRITEINFO( XMLDrawMetaExportOOO ); - WRITEINFO( XMLDrawSettingsExportOOO ); - - // drawing layer export - WRITEINFO( XMLDrawingLayerExport ); - - // impress xml clipboard export - WRITEINFO( XMLImpressClipboardExport ); - - // chart oasis import - WRITEINFO( SchXMLImport ); - WRITEINFO( SchXMLImport_Meta ); - WRITEINFO( SchXMLImport_Styles ); - WRITEINFO( SchXMLImport_Content ); - - // chart oasis export - WRITEINFO( SchXMLExport_Oasis ); - WRITEINFO( SchXMLExport_Oasis_Meta ); - WRITEINFO( SchXMLExport_Oasis_Styles ); - WRITEINFO( SchXMLExport_Oasis_Content ); - - // chart OOo export - WRITEINFO( SchXMLExport ); - WRITEINFO( SchXMLExport_Styles ); - WRITEINFO( SchXMLExport_Content ); - - // meta - WRITEINFO( XMLMetaImportComponent ); - WRITEINFO( XMLMetaExportComponent ); - - WRITEINFO( XMLVersionListPersistence ); - - // meta OOo - WRITEINFO( XMLMetaExportOOO ); - - // writer auto text events - WRITEINFO( XMLAutoTextEventExport ); - WRITEINFO( XMLAutoTextEventImport ); - WRITEINFO( XMLAutoTextEventExportOOO ); - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_True; -} - #define SINGLEFACTORY(classname)\ if( classname##_getImplementationName().equalsAsciiL( pImplName, nImplNameLen ) )\ {\ diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index 80098d18e9..c08d030b93 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -146,39 +146,6 @@ void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTyp *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) -{ - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xMasterKey( reinterpret_cast< registry::XRegistryKey * >( pRegistryKey ) ); - - const ServiceDescriptor* pDescriptor = getServiceDescriptors(); - while ( pDescriptor->getImplementationName ) - { - ::rtl::OUString sNewKeyName( RTL_CONSTASCII_USTRINGPARAM("/") ); - sNewKeyName += pDescriptor->getImplementationName(); - sNewKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ); - - uno::Reference< registry::XRegistryKey > xNewKey( xMasterKey->createKey( sNewKeyName ) ); - - uno::Sequence< ::rtl::OUString > aServices = pDescriptor->getSupportedServiceNames(); - const ::rtl::OUString* pServices = aServices.getConstArray(); - for( sal_Int32 i = 0; i < aServices.getLength(); ++i, ++pServices ) - xNewKey->createKey( *pServices); - - ++pDescriptor; - } - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "xof::component_writeInfo: InvalidRegistryException!" ); - } - } - return sal_True; -} - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = NULL; diff --git a/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk index bba8deb6db..031549fcb3 100644 --- a/xmloff/source/transform/makefile.mk +++ b/xmloff/source/transform/makefile.mk @@ -93,3 +93,11 @@ DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) .INCLUDE: target.mk + +ALLTAR : $(MISC)/xof.component + +$(MISC)/xof.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + xof.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt xof.component diff --git a/xmloff/source/transform/xof.component b/xmloff/source/transform/xof.component new file mode 100644 index 0000000000..8f9c88f7fa --- /dev/null +++ b/xmloff/source/transform/xof.component @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk index b8745b6b8f..857067985c 100644 --- a/xmloff/util/makefile.mk +++ b/xmloff/util/makefile.mk @@ -86,3 +86,11 @@ DEF1DES =XML Office Lib # --- Targets ---------------------------------------------------------- .ENDIF .INCLUDE : target.mk + +ALLTAR : $(MISC)/xo.component + +$(MISC)/xo.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + xo.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt xo.component diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component new file mode 100644 index 0000000000..7fe2119636 --- /dev/null +++ b/xmloff/util/xo.component @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xmlscript/prj/d.lst b/xmlscript/prj/d.lst index 51b2891e49..2f1ff7e377 100644 --- a/xmlscript/prj/d.lst +++ b/xmlscript/prj/d.lst @@ -11,3 +11,4 @@ mkdir: %_DEST%\inc%_EXT%\xmlscript ..\inc\xmlscript\xmlns.h %_DEST%\inc%_EXT%\xmlscript\xmlns.h ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.dtd +..\%__SRC%\misc\xcr.component %_DEST%\xml%_EXT%\xcr.component diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index 6209df3751..155fcc2800 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -115,15 +115,6 @@ extern "C" // ----------------------------------------------------------------------------- - sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) - { - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, ::xmlscript::s_entries ); - } - - // ----------------------------------------------------------------------------- - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk index 3ccf63dc3b..ba731470b2 100644 --- a/xmlscript/util/makefile.mk +++ b/xmlscript/util/makefile.mk @@ -74,3 +74,11 @@ $(MISC)$/$(SHL1TARGET).flt : makefile.mk xcr.flt @echo ------------------------------ @echo Making: $@ $(TYPE) xcr.flt > $@ + +ALLTAR : $(MISC)/xcr.component + +$(MISC)/xcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + xcr.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt xcr.component diff --git a/xmlscript/util/xcr.component b/xmlscript/util/xcr.component new file mode 100644 index 0000000000..5ffe7f862f --- /dev/null +++ b/xmlscript/util/xcr.component @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3