From 4cda571eda7bd9abe5f95d13a6d0b0cb93ed24b0 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Thu, 8 Jul 2010 12:27:24 +0200 Subject: renaissance1: resolved merge conflicts, cleanup. --- sfx2/inc/brokenpackageint.hxx | 0 sfx2/inc/sfx2/objsh.hxx | 0 sfx2/inc/sfx2/securitypage.hxx | 0 sfx2/inc/sfx2/sfx.hrc | 0 sfx2/inc/sfx2/titledockwin.hxx | 10 ++++++++++ sfx2/sdi/sfx.sdi | 0 sfx2/source/appl/appuno.cxx | 0 sfx2/source/dialog/dinfdlg.cxx | 0 sfx2/source/dialog/dinfdlg.src | 0 sfx2/source/dialog/makefile.mk | 0 sfx2/source/dialog/securitypage.cxx | 0 sfx2/source/dialog/securitypage.hrc | 0 sfx2/source/dialog/securitypage.src | 0 sfx2/source/dialog/titledockwin.cxx | 24 ++++++++++-------------- sfx2/source/doc/objxtor.cxx | 0 sfx2/source/inc/helpid.hrc | 0 16 files changed, 20 insertions(+), 14 deletions(-) mode change 100644 => 100755 sfx2/inc/brokenpackageint.hxx mode change 100644 => 100755 sfx2/inc/sfx2/objsh.hxx mode change 100644 => 100755 sfx2/inc/sfx2/securitypage.hxx mode change 100644 => 100755 sfx2/inc/sfx2/sfx.hrc mode change 100644 => 100755 sfx2/sdi/sfx.sdi mode change 100644 => 100755 sfx2/source/appl/appuno.cxx mode change 100644 => 100755 sfx2/source/dialog/dinfdlg.cxx mode change 100644 => 100755 sfx2/source/dialog/dinfdlg.src mode change 100644 => 100755 sfx2/source/dialog/makefile.mk mode change 100644 => 100755 sfx2/source/dialog/securitypage.cxx mode change 100644 => 100755 sfx2/source/dialog/securitypage.hrc mode change 100644 => 100755 sfx2/source/dialog/securitypage.src mode change 100644 => 100755 sfx2/source/doc/objxtor.cxx mode change 100644 => 100755 sfx2/source/inc/helpid.hrc (limited to 'sfx2') diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx old mode 100644 new mode 100755 diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx old mode 100644 new mode 100755 diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx old mode 100644 new mode 100755 diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc old mode 100644 new mode 100755 diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx index ebb4497a0ba2..2728cc621138 100644 --- a/sfx2/inc/sfx2/titledockwin.hxx +++ b/sfx2/inc/sfx2/titledockwin.hxx @@ -100,6 +100,11 @@ namespace sfx2 ToolBox& GetToolBox() { return m_aToolbox; } const ToolBox& GetToolBox() const { return m_aToolbox; } + /** Return the border that is painted around the inner window as + decoration. + */ + SvBorder GetDecorationBorder (void) const { return m_aBorder; } + protected: // Window overridables virtual void Paint( const Rectangle& i_rArea ); @@ -153,6 +158,11 @@ namespace sfx2 since the last Paint(). */ bool m_bLayoutPending; + + /** Height of the title bar. Calculated in impl_layout(). + */ + int m_nTitleBarHeight; + }; //...................................................................................................................... diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi old mode 100644 new mode 100755 diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/securitypage.hrc b/sfx2/source/dialog/securitypage.hrc old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/securitypage.src b/sfx2/source/dialog/securitypage.src old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 58a61d66ba8b..4be0948d8047 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -51,6 +51,7 @@ namespace sfx2 ,m_aContentWindow( this, WB_DIALOGCONTROL ) ,m_aBorder( 3, 1, 3, 3 ) ,m_bLayoutPending( false ) + ,m_nTitleBarHeight(0) { impl_construct(); } @@ -139,23 +140,23 @@ namespace sfx2 Size aWindowSize( GetOutputSizePixel() ); // position the tool box - int nTitleBarHeight( GetSettings().GetStyleSettings().GetTitleHeight() ); - if ( aToolBoxSize.Height() > nTitleBarHeight ) - nTitleBarHeight = aToolBoxSize.Height(); + m_nTitleBarHeight = GetSettings().GetStyleSettings().GetTitleHeight(); + if ( aToolBoxSize.Height() > m_nTitleBarHeight ) + m_nTitleBarHeight = aToolBoxSize.Height(); m_aToolbox.SetPosSizePixel( Point( aWindowSize.Width() - aToolBoxSize.Width(), - ( nTitleBarHeight - aToolBoxSize.Height() ) / 2 + ( m_nTitleBarHeight - aToolBoxSize.Height() ) / 2 ), aToolBoxSize ); // Place the content window. - if ( nTitleBarHeight < aToolBoxSize.Height() ) - nTitleBarHeight = aToolBoxSize.Height(); - aWindowSize.Height() -= nTitleBarHeight; + if ( m_nTitleBarHeight < aToolBoxSize.Height() ) + m_nTitleBarHeight = aToolBoxSize.Height(); + aWindowSize.Height() -= m_nTitleBarHeight; m_aContentWindow.SetPosSizePixel( - Point( m_aBorder.Left(), nTitleBarHeight + m_aBorder.Top() ), + Point( m_aBorder.Left(), m_nTitleBarHeight + m_aBorder.Top() ), Size( aWindowSize.Width() - m_aBorder.Left() - m_aBorder.Right(), aWindowSize.Height() - m_aBorder.Top() - m_aBorder.Bottom() @@ -175,11 +176,6 @@ namespace sfx2 Push( PUSH_FONT | PUSH_FILLCOLOR | PUSH_LINECOLOR ); - int nTitleBarHeight( GetSettings().GetStyleSettings().GetTitleHeight() ); - const Size aToolBoxSize = m_aToolbox.CalcWindowSizePixel(); - if ( aToolBoxSize.Height() > nTitleBarHeight ) - nTitleBarHeight = aToolBoxSize.Height(); - SetFillColor( GetSettings().GetStyleSettings().GetDialogColor() ); SetLineColor(); @@ -194,7 +190,7 @@ namespace sfx2 int nInnerLeft = nOuterLeft + m_aBorder.Left() - 1; int nOuterRight = aWindowSize.Width() - 1; int nInnerRight = nOuterRight - m_aBorder.Right() + 1; - int nInnerTop = nTitleBarHeight + m_aBorder.Top() - 1; + int nInnerTop = m_nTitleBarHeight + m_aBorder.Top() - 1; int nOuterBottom = aWindowSize.Height() - 1; int nInnerBottom = nOuterBottom - m_aBorder.Bottom() + 1; diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx old mode 100644 new mode 100755 diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc old mode 100644 new mode 100755 -- cgit v1.2.3 From 50c6c0aaebeda0f131e35da61729479180184192 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 --- 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/migration/wizard.cxx | 12 ++- editeng/source/editeng/editview.cxx | 6 +- editeng/source/misc/svxacorr.cxx | 3 +- formula/inc/formula/formdata.hxx | 7 +- formula/inc/formula/formula.hxx | 14 ++-- formula/source/ui/dlg/formula.cxx | 93 ++++++++++++++-------- formula/source/ui/dlg/funcpage.cxx | 10 ++- formula/source/ui/dlg/funcpage.hxx | 3 +- formula/source/ui/dlg/funcutl.cxx | 6 +- formula/source/ui/dlg/parawin.cxx | 10 ++- fpicker/source/office/OfficeControlAccess.cxx | 17 ++-- fpicker/source/office/iodlg.cxx | 74 +++++++++++------ framework/source/layoutmanager/layoutmanager.cxx | 4 +- framework/source/services/backingcomp.cxx | 3 +- framework/source/services/backingwindow.cxx | 18 ++--- .../source/uielement/macrosmenucontroller.cxx | 6 +- framework/source/uielement/menubarmanager.cxx | 4 +- framework/source/uielement/statusbarmanager.cxx | 3 +- framework/source/uielement/statusbarwrapper.cxx | 3 +- framework/source/uielement/toolbarmanager.cxx | 16 ++-- framework/source/uielement/toolbarmerger.cxx | 4 +- .../source/uielement/toolbarsmenucontroller.cxx | 3 +- sfx2/inc/sfx2/passwd.hxx | 2 +- sfx2/inc/sfxhelp.hxx | 12 ++- sfx2/source/appl/appserv.cxx | 6 +- sfx2/source/appl/newhelp.cxx | 57 ++++++++----- sfx2/source/appl/sfxhelp.cxx | 24 +++++- sfx2/source/dialog/about.cxx | 3 +- sfx2/source/dialog/basedlgs.cxx | 30 +++---- sfx2/source/dialog/dockwin.cxx | 17 ++-- sfx2/source/dialog/filedlghelper.cxx | 3 +- sfx2/source/dialog/navigat.cxx | 3 +- sfx2/source/dialog/tabdlg.cxx | 12 ++- sfx2/source/dialog/templdlg.cxx | 21 +++-- sfx2/source/doc/docvor.cxx | 5 +- sfx2/source/doc/new.cxx | 3 +- sfx2/source/doc/querytemplate.cxx | 3 +- sfx2/source/menu/mnumgr.cxx | 6 +- sfx2/source/menu/virtmenu.cxx | 3 +- sfx2/source/toolbox/tbxitem.cxx | 3 +- sfx2/source/view/frame2.cxx | 3 +- svx/inc/svx/simptabl.hxx | 3 +- svx/source/dialog/ctredlin.cxx | 15 ++-- svx/source/dialog/dlgctl3d.cxx | 9 ++- svx/source/fmcomp/fmgridif.cxx | 4 +- svx/source/fmcomp/gridctrl.cxx | 21 +++-- svx/source/form/datanavi.cxx | 3 +- svx/source/form/filtnav.cxx | 6 +- svx/source/form/fmPropBrw.cxx | 3 +- svx/source/form/fmexpl.cxx | 3 +- 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/stbctrls/insctrl.cxx | 3 +- svx/source/stbctrls/pszctrl.cxx | 3 +- svx/source/stbctrls/xmlsecctrl.cxx | 3 +- 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/tbcontrl.cxx | 12 ++- .../chinese_dictionarydialog.cxx | 18 +++-- .../chinese_translationdialog.cxx | 9 ++- 73 files changed, 540 insertions(+), 289 deletions(-) (limited to 'sfx2') diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index a71b5268abd7..781f2b7d290d 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -94,10 +94,12 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, ""/*HID_AVMEDIA_TOOLBOXITEM_OPEN*/ ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, implGetImage( AVMEDIA_IMG_INSERT ), String( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, HID_AVMEDIA_TOOLBOXITEM_INSERT ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, ""/*HID_AVMEDIA_TOOLBOXITEM_INSERT*/ ); maPlayToolBox.InsertSeparator(); } @@ -117,18 +119,22 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : } maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage( AVMEDIA_IMG_PLAY ), String( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), TIB_CHECKABLE ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, HID_AVMEDIA_TOOLBOXITEM_PLAY ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, ""/*HID_AVMEDIA_TOOLBOXITEM_PLAY*/ ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, implGetImage( AVMEDIA_IMG_PAUSE ), String( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ), TIB_CHECKABLE ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, HID_AVMEDIA_TOOLBOXITEM_PAUSE ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, ""/*HID_AVMEDIA_TOOLBOXITEM_PAUSE*/ ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_STOP, implGetImage( AVMEDIA_IMG_STOP ), String( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ), TIB_CHECKABLE ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, HID_AVMEDIA_TOOLBOXITEM_STOP ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, ""/*HID_AVMEDIA_TOOLBOXITEM_STOP*/ ); maPlayToolBox.InsertSeparator(); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, implGetImage( AVMEDIA_IMG_ENDLESS ), String( AVMEDIA_RESID( AVMEDIA_STR_ENDLESS ) ) ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, HID_AVMEDIA_TOOLBOXITEM_LOOP ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, ""/*HID_AVMEDIA_TOOLBOXITEM_LOOP*/ ); if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle ) maPlayToolBox.InsertSeparator(); @@ -141,7 +147,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maTimeSlider.SetSlideHdl( LINK( this, MediaControl, implTimeHdl ) ); maTimeSlider.SetEndSlideHdl( LINK( this, MediaControl, implTimeEndHdl ) ); maTimeSlider.SetRange( Range( 0, AVMEDIA_TIME_RANGE ) ); - maTimeSlider.SetHelpId( HID_AVMEDIA_TIMESLIDER ); + // FIXME: HELPID + maTimeSlider.SetHelpId( ""/*HID_AVMEDIA_TIMESLIDER*/ ); maTimeSlider.SetUpdateMode( true ); maTimeSlider.SetSizePixel( Size( 128, maPlayToolBox.GetSizePixel().Height() ) ); maTimeSlider.Show(); @@ -151,7 +158,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maTimeEdit.SetUpdateMode( true ); maTimeEdit.SetSizePixel( Size( maTimeEdit.GetTextWidth( aTimeText ) + 8, maPlayToolBox.GetSizePixel().Height() ) ); maTimeEdit.SetControlBackground( Application::GetSettings().GetStyleSettings().GetWindowColor() ); - maTimeEdit.SetHelpId( HID_AVMEDIA_TIMEEDIT ); + // FIXME: HELPID + maTimeEdit.SetHelpId( ""/*HID_AVMEDIA_TIMEEDIT*/ ); maTimeEdit.Disable(); maTimeEdit.Show(); maMinSize.Width() += maTimeEdit.GetSizePixel().Width(); @@ -160,7 +168,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maMuteToolBox.InsertSeparator(); maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage( AVMEDIA_IMG_MUTE ), String( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) ); - maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, HID_AVMEDIA_TOOLBOXITEM_MUTE ); + // FIXME: HELPID + maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, ""/*HID_AVMEDIA_TOOLBOXITEM_MUTE*/ ); maMuteToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) ); maMuteToolBox.SetSizePixel( maMuteToolBox.CalcWindowSizePixel() ); @@ -171,7 +180,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maVolumeSlider.SetEndSlideHdl( LINK( this, MediaControl, implVolumeEndHdl ) ); maVolumeSlider.SetRange( Range( AVMEDIA_DB_RANGE, 0 ) ); maVolumeSlider.SetUpdateMode( true ); - maVolumeSlider.SetHelpId( HID_AVMEDIA_VOLUMESLIDER ); + // FIXME: HELPID + maVolumeSlider.SetHelpId( ""/*HID_AVMEDIA_VOLUMESLIDER*/ ); maVolumeSlider.SetSizePixel( Size( 48, maPlayToolBox.GetSizePixel().Height() ) ); maVolumeSlider.Show(); maMinSize.Width() += maVolumeSlider.GetSizePixel().Width(); @@ -182,10 +192,12 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_200 ) ), AVMEDIA_ZOOMLEVEL_200 ); mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_FIT ) ), AVMEDIA_ZOOMLEVEL_FIT ); mpZoomListBox->SetSelectHdl( LINK( this, MediaControl, implZoomSelectHdl ) ); - mpZoomListBox->SetHelpId( HID_AVMEDIA_ZOOMLISTBOX ); + // FIXME: HELPID + mpZoomListBox->SetHelpId( ""/*HID_AVMEDIA_ZOOMLISTBOX*/ ); maZoomToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM ) ) ); - maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, HID_AVMEDIA_ZOOMLISTBOX ); + // FIXME: HELPID + maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, ""/*HID_AVMEDIA_ZOOMLISTBOX*/ ); maZoomToolBox.SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, mpZoomListBox ); maZoomToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) ); diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index caab783c6a7c..c66f88817fe3 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -124,7 +124,8 @@ void MediaFloater::ToggleFloatingMode() Window* pWindow = mpMediaWindow->getWindow(); if( pWindow ) - pWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); + // FIXME: HELPID + pWindow->SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ ); mpMediaWindow->show(); } diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 553eea6196c1..14d174beec80 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -179,7 +179,8 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo mpEmptyBmpEx( NULL ), mpAudioBmpEx( NULL ) { - maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); + // FIXME: HELPID + maChildWindow.SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ ); maChildWindow.Hide(); if( mpMediaWindowControl ) diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 2d0733dfbae3..fa61c437e1ba 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -183,10 +183,14 @@ ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl( ExtMgrDialog* pParent, TheExtensionMan m_pEnableBtn = new PushButton( this, WB_TABSTOP ); m_pRemoveBtn = new PushButton( this, WB_TABSTOP ); - SetHelpId( HID_EXTENSION_MANAGER_LISTBOX ); - m_pOptionsBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_OPTIONS ); - m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); - m_pRemoveBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_REMOVE ); + // FIXME: HELPID + SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX*/ ); + // FIXME: HELPID + m_pOptionsBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_OPTIONS*/ ); + // FIXME: HELPID + m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_DISABLE*/ ); + // FIXME: HELPID + m_pRemoveBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_REMOVE*/ ); m_pOptionsBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, HandleOptionsBtn ) ); m_pEnableBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, HandleEnableBtn ) ); @@ -294,12 +298,14 @@ void ExtBoxWithBtns_Impl::SetButtonStatus( const TEntry_Impl pEntry ) if ( ( pEntry->m_eState == REGISTERED ) || ( pEntry->m_eState == NOT_AVAILABLE ) ) { m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); - m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); + // FIXME: HELPID + m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_DISABLE*/ ); } else { m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); - m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_ENABLE ); + // FIXME: HELPID + m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_ENABLE*/ ); } if ( ( pEntry->m_eState == NOT_AVAILABLE ) || pEntry->m_bMissingDeps ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 2e02a90f59fd..3e5db094d032 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -186,7 +186,8 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan m_pScrollBar( NULL ), m_pManager( pManager ) { - SetHelpId( HID_EXTENSION_MANAGER_LISTBOX ); + // FIXME: HELPID + SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX*/ ); m_pScrollBar = new ScrollBar( this, WB_VERT ); m_pScrollBar->SetScrollHdl( LINK( this, ExtensionBox_Impl, ScrollHdl ) ); diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 50992eb07a97..9e837f235db1 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -221,7 +221,8 @@ LicenseDialogImpl::LicenseDialogImpl( FreeResource(); - m_acceptButton.SetUniqueId(UID_BTN_LICENSE_ACCEPT); + // FIXME: HELPID + m_acceptButton.SetUniqueId(""/*UID_BTN_LICENSE_ACCEPT*/); m_fiArrow1.Show(true); m_fiArrow2.Show(false); m_mlLicense.SetText(sLicenseText); diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx index 48ee2abc71ca..3169386db192 100644 --- a/desktop/source/migration/wizard.cxx +++ b/desktop/source/migration/wizard.cxx @@ -191,10 +191,14 @@ FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAccep SetPageSizePixel(LogicToPixel(aTPSize, MAP_APPFONT)); //set help id - m_pPrevPage->SetHelpId(HID_FIRSTSTART_PREV); - m_pNextPage->SetHelpId(HID_FIRSTSTART_NEXT); - m_pCancel->SetHelpId(HID_FIRSTSTART_CANCEL); - m_pFinish->SetHelpId(HID_FIRSTSTART_FINISH); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_FIRSTSTART_PREV*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_FIRSTSTART_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_FIRSTSTART_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_FIRSTSTART_FINISH*/); // m_pHelp->SetUniqueId(UID_FIRSTSTART_HELP); m_pHelp->Hide(); m_pHelp->Disable(); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 766023a0038c..35c51b82d1fe 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1083,9 +1083,11 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) String aParaStr( EditResId( RID_STR_PARAGRAPH ) ); aParaStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpPara ); aPopupMenu.InsertItem( MN_WORDLANGUAGE, aWordStr ); - aPopupMenu.SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE ); + // FIXME: HELPID + aPopupMenu.SetHelpId( MN_WORDLANGUAGE, ""/*HID_EDITENG_SPELLER_WORDLANGUAGE*/ ); aPopupMenu.InsertItem( MN_PARALANGUAGE, aParaStr ); - aPopupMenu.SetHelpId( MN_PARALANGUAGE, HID_EDITENG_SPELLER_PARALANGUAGE ); + // FIXME: HELPID + aPopupMenu.SetHelpId( MN_PARALANGUAGE, ""/*HID_EDITENG_SPELLER_PARALANGUAGE*/ ); } // ## Create mnemonics here diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 64343517c69f..3e875e0b0fdc 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1416,7 +1416,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, if( nHelpId ) { nHelpId += HID_AUTOCORR_HELP_START - 1; - Application::GetHelp()->OpenHelpAgent( nHelpId ); + // FIXME: HELPID + Application::GetHelp()->OpenHelpAgent( String()/*nHelpId*/ ); } } diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx index da211d4f7449..780f95f8fdb5 100644 --- a/formula/inc/formula/formdata.hxx +++ b/formula/inc/formula/formdata.hxx @@ -53,7 +53,7 @@ public: inline USHORT GetEdFocus() const { return nEdFocus; } inline const String& GetUndoStr() const { return aUndoStr; } inline BOOL GetMatrixFlag()const{ return bMatrix;} - inline ULONG GetUniqueId()const { return nUniqueId;} + inline rtl::OString GetUniqueId()const { return aUniqueId;} inline const Selection& GetSelection()const { return aSelection;} inline void SetMode( USHORT nNew ) { nMode = nNew; } @@ -64,7 +64,7 @@ public: inline void SetEdFocus( USHORT nNew ) { nEdFocus = nNew; } inline void SetUndoStr( const String& rNew ) { aUndoStr = rNew; } inline void SetMatrixFlag(BOOL bNew) { bMatrix=bNew;} - inline void SetUniqueId(ULONG nNew) { nUniqueId=nNew;} + inline void SetUniqueId(const rtl::OString nNew) { aUniqueId=nNew;} inline void SetSelection(const Selection& aSel) { aSelection=aSel;} protected: void Reset(); @@ -81,7 +81,8 @@ private: USHORT nEdFocus; String aUndoStr; BOOL bMatrix; - ULONG nUniqueId; + // FIXME: HELPID + rtl::OString aUniqueId; Selection aSelection; }; diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx index d88d1fe62057..0039b66b4ae2 100644 --- a/formula/inc/formula/formula.hxx +++ b/formula/inc/formula/formula.hxx @@ -80,8 +80,10 @@ protected: ::std::pair RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( BOOL bForced = FALSE ); - ULONG FindFocusWin(Window *pWin); - void SetFocusWin(Window *pWin,ULONG nUniqueId); + // FIXME: HELPID + rtl::OString FindFocusWin(Window *pWin); + // FIXME: HELPID + void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId); void HighlightFunctionParas(const String& aFormula); void SetMeText(const String& _sText); @@ -129,12 +131,14 @@ protected: ::std::pair RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( BOOL bForced = FALSE ); - ULONG FindFocusWin(Window *pWin); - void SetFocusWin(Window *pWin,ULONG nUniqueId); + // FIXME: HELPID + rtl::OString FindFocusWin(Window *pWin); + // FIXME: HELPID + void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId); void HighlightFunctionParas(const String& aFormula); void SetMeText(const String& _sText); - FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate); + FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate); void Update(); BOOL CheckMatrix(String& aFormula /*IN/OUT*/); String GetMeText() const; diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index f1a97171fa11..8255aae371da 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -143,7 +143,7 @@ namespace formula void PreNotify( NotifyEvent& rNEvt ); RefEdit* GetCurrRefEdit(); - ULONG FindFocusWin(Window *pWin); + rtl::OString FindFocusWin(Window *pWin); const FormulaHelper& GetFormulaHelper() const; uno::Reference< sheet::XFormulaOpCodeMapper > GetFormulaOpCodeMapper() const; @@ -226,11 +226,15 @@ namespace formula FormulaHelper m_aFormulaHelper; - SmartId m_aSmartEditHelpId; + // FIXME: HELPID + rtl::OString m_aEditHelpId; - ULONG nOldHelp; - ULONG nOldUnique; - ULONG nActivWinId; + // FIXME: HELPID + rtl::OString aOldHelp; + // FIXME: HELPID + rtl::OString aOldUnique; + // FIXME: HELPID + rtl::OString aActivWinId; BOOL bIsShutDown; @@ -300,7 +304,6 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aTxtOk ( aBtnEnd.GetText() ), m_aFormulaHelper(_pFunctionMgr), // - nActivWinId (0), bIsShutDown (FALSE), nEdFocus (0), pFuncDesc (NULL), @@ -314,8 +317,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aRefBtn.Hide(); pMEdit = aMEFormula.GetEdit(); - m_aSmartEditHelpId = pMEdit->GetSmartHelpId(); - pMEdit->SetSmartUniqueId(m_aSmartEditHelpId); + m_aEditHelpId = pMEdit->GetHelpId(); + pMEdit->SetUniqueId( m_aEditHelpId ); bEditFlag=FALSE; bStructUpdate=TRUE; @@ -331,8 +334,10 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage); aTabCtrl.SetTabPage( TP_STRUCT, pStructPage); - nOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1" - nOldUnique = pParent->GetUniqueId(); + // FIXME: HELPID + aOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1" + // FIXME: HELPID + aOldUnique = pParent->GetUniqueId(); aFtResult.Show( _bSupportResult ); aWndResult.Show( _bSupportResult ); @@ -408,27 +413,30 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) Window* pWin=rNEvt.GetWindow(); if(pWin!=NULL) { - nActivWinId = pWin->GetUniqueId(); - if(nActivWinId==0) + aActivWinId = pWin->GetUniqueId(); + // FIXME: HELPID + if(aActivWinId.getLength()==0) { Window* pParent=pWin->GetParent(); while(pParent!=NULL) { - nActivWinId=pParent->GetUniqueId(); + aActivWinId=pParent->GetUniqueId(); - if(nActivWinId!=0) break; + // FIXME: HELPID + if(aActivWinId.getLength()!=0) break; pParent=pParent->GetParent(); } } - if(nActivWinId!=0) + // FIXME: HELPID + if(aActivWinId!=0) { FormEditData* pData = m_pHelper->getFormEditData(); if (pData && !aTimer.IsActive()) // wird nicht ueber Close zerstoert; { - pData->SetUniqueId(nActivWinId); + pData->SetUniqueId(aActivWinId); } } } @@ -825,8 +833,10 @@ void FormulaDlg_Impl::FillListboxes() aNewTitle = aTitle1; // HelpId fuer 1. Seite ist die aus der Resource - m_pParent->SetHelpId( nOldHelp ); - m_pParent->SetUniqueId( nOldUnique ); + // FIXME: HELPID + m_pParent->SetHelpId( aOldHelp ); + // FIXME: HELPID + m_pParent->SetUniqueId( aOldUnique ); } // ----------------------------------------------------------------------------- void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) @@ -862,9 +872,12 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) aFtEditName.SetText( pFuncDesc->getFunctionName() ); aFtEditName.Show(); pParaWin->Show(); + // FIXME: HELPID + #if 0 const long nHelpId = pFuncDesc->getHelpId(); if ( nHelpId ) pMEdit->SetSmartHelpId(SmartId(nHelpId)); + #endif } xub_StrLen nOldStart, nOldEnd; @@ -920,7 +933,8 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) else { aFtEditName.SetText(String()); - pMEdit->SetSmartHelpId(m_aSmartEditHelpId); + // FIXME: HELPID + pMEdit->SetHelpId( m_aEditHelpId ); } // Test, ob vorne/hinten noch mehr Funktionen sind @@ -1790,20 +1804,21 @@ BOOL FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection) } return pTheRefEdit == NULL; } -ULONG FormulaDlg_Impl::FindFocusWin(Window *pWin) +rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin) { - ULONG nUniqueId=0; + rtl::OString aUniqueId; if(pWin->HasFocus()) { - nUniqueId=pWin->GetUniqueId(); - if(nUniqueId==0) + // FIXME: HELPID + aUniqueId=pWin->GetUniqueId(); + if(aUniqueId.getLength()==0) { Window* pParent=pWin->GetParent(); while(pParent!=NULL) { - nUniqueId=pParent->GetUniqueId(); + aUniqueId=pParent->GetUniqueId(); - if(nUniqueId!=0) break; + if(aUniqueId.getLength()!=0) break; pParent=pParent->GetParent(); } @@ -1816,11 +1831,11 @@ ULONG FormulaDlg_Impl::FindFocusWin(Window *pWin) for(USHORT i=0;iGetChild(i); - nUniqueId=FindFocusWin(pChild); - if(nUniqueId>0) break; + aUniqueId=FindFocusWin(pChild); + if(aUniqueId.getLength()>0) break; } } - return nUniqueId; + return aUniqueId; } void FormulaDlg_Impl::SetEdSelection() @@ -1925,13 +1940,15 @@ void FormulaModalDialog::RefInputDoneAfter( BOOL bForced ) m_pImpl->RefInputDoneAfter( bForced ); } -ULONG FormulaModalDialog::FindFocusWin(Window *pWin) +rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin) { + // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } -void FormulaModalDialog::SetFocusWin(Window *pWin,ULONG nUniqueId) +void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { + // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2007,10 +2024,13 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, ,_pHelper,_pFunctionMgr,_pDlg)) { FreeResource(); + // FIXME: HELPID + #if 0 if(GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId SetHelpId(GetUniqueId()); //fuer einen ModelessDialog entfernt und //in eine UniqueId gewandelt wird, machen //wir das an dieser Stelle rueckgaengig. + #endif SetText(m_pImpl->aTitle1); } @@ -2080,13 +2100,15 @@ void FormulaDlg::RefInputDoneAfter( BOOL bForced ) m_pImpl->RefInputDoneAfter( bForced ); } -ULONG FormulaDlg::FindFocusWin(Window *pWin) +rtl::OString FormulaDlg::FindFocusWin(Window *pWin) { + // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } -void FormulaDlg::SetFocusWin(Window *pWin,ULONG nUniqueId) +void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { + // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2156,7 +2178,8 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG ) if (pData) // wird nicht ueber Close zerstoert; { m_pImpl->m_pHelper->setReferenceInput(pData); - ULONG nUniqueId=pData->GetUniqueId(); + // FIXME: HELPID + rtl::OString nUniqueId(pData->GetUniqueId()); SetFocusWin(this,nUniqueId); } return 0; @@ -2182,7 +2205,7 @@ void FormEditData::Reset() nOffset = 0; nEdFocus = 0; bMatrix =FALSE; - nUniqueId=0; + aUniqueId=rtl::OString(); aSelection.Min()=0; aSelection.Max()=0; aUndoStr.Erase(); @@ -2211,7 +2234,7 @@ const FormEditData& FormEditData::operator=( const FormEditData& r ) nEdFocus = r.nEdFocus; aUndoStr = r.aUndoStr; bMatrix = r.bMatrix ; - nUniqueId = r.nUniqueId; + aUniqueId = r.aUniqueId; aSelection = r.aSelection; return *this; } diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 3633afa29316..a66b4b2137af 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -102,8 +102,8 @@ FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager): m_pFunctionManager(_pFunctionManager) { FreeResource(); - m_aSmartHelpId = aLbFunction.GetSmartHelpId(); - aLbFunction.SetSmartUniqueId(m_aSmartHelpId); + m_aHelpId = aLbFunction.GetHelpId(); + aLbFunction.SetUniqueId(m_aHelpId); InitLRUList(); @@ -190,15 +190,19 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb ) const IFunctionDescription* pDesc = GetFuncDesc( GetFunction() ); if ( pDesc ) { + // FIXME: HELPID + #if 0 const long nHelpId = pDesc->getHelpId(); if ( nHelpId ) aLbFunction.SetSmartHelpId(SmartId(nHelpId)); + #endif } aSelectionLink.Call(this); } else { - aLbFunction.SetSmartHelpId(m_aSmartHelpId); + // FIXME: HELPID + aLbFunction.SetHelpId(m_aHelpId); UpdateFunctionList(); } return 0; diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 09f77cc81019..4d7dc5739d0f 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -82,7 +82,8 @@ private: m_pFunctionManager; ::std::vector< TFunctionDesc > aLRUList; - SmartId m_aSmartHelpId; + // FIXME: HELPID + rtl::OString m_aHelpId; void impl_addFunctions(const IFunctionCategory* _pCategory); diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 4ba8d87c139b..db8a4e136015 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -758,8 +758,10 @@ EditBox::EditBox( Window* pParent, const ResId& rResId ) // #105582# the HelpId from the resource must be set for the MultiLineEdit, // not for the control that contains it. - pMEdit->SetSmartHelpId( GetSmartHelpId() ); - SetSmartHelpId( SmartId() ); + // FIXME: HELPID + pMEdit->SetHelpId( GetHelpId() ); + // FIXME: HELPID + SetHelpId( "" ); } EditBox::~EditBox() diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 3876621a3ec0..9afa9fb20587 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -294,22 +294,28 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc) { SetEditDesc(aDefaultString); } - long nHelpId = pFuncDesc->getHelpId(); nArgs = pFuncDesc->getSuppressedArgumentCount(); pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping); aSlider.Hide(); + // FIXME: HELPID + #if 0 + long nHelpId = pFuncDesc->getHelpId(); SetHelpId( nHelpId ); aEdArg1.SetHelpId( nHelpId ); aEdArg2.SetHelpId( nHelpId ); aEdArg3.SetHelpId( nHelpId ); aEdArg4.SetHelpId( nHelpId ); + #endif // Unique-IDs muessen gleich bleiben fuer Automatisierung - SetUniqueId( HID_FORMULA_FAP_PAGE ); + // FIXME: HELPID + #if 0 + SetUniqueId( ""/*HID_FORMULA_FAP_PAGE*/ ); aEdArg1.SetUniqueId( HID_FORMULA_FAP_EDIT1 ); aEdArg2.SetUniqueId( HID_FORMULA_FAP_EDIT2 ); aEdArg3.SetUniqueId( HID_FORMULA_FAP_EDIT3 ); aEdArg4.SetUniqueId( HID_FORMULA_FAP_EDIT4 ); + #endif SetActiveLine(0); } else diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index e0b5d259302d..c51a326477fa 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -206,14 +206,13 @@ namespace svt String sHelpURL( _rURL ); if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) ) { - String sID = sHelpURL.Copy( sizeof( "HID:" ) - 1 ); - sal_Int32 nHelpId = sID.ToInt32(); - + // FIXME: HELPID + rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); if ( _bFileView ) // the file view "overloaded" the SetHelpId - static_cast< SvtFileView* >( _pControl )->SetHelpId( nHelpId ); + static_cast< SvtFileView* >( _pControl )->SetHelpId( sID ); else - _pControl->SetHelpId( nHelpId ); + _pControl->SetHelpId( sID ); } else { @@ -224,13 +223,13 @@ namespace svt //--------------------------------------------------------------------- ::rtl::OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView ) { - sal_Int32 nHelpId = _pControl->GetHelpId(); + // FIXME: HELPID + rtl::OString aHelpId = _pControl->GetHelpId(); if ( _bFileView ) // the file view "overloaded" the SetHelpId - nHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( ); + aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( ); - ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - sHelpURL += ::rtl::OUString::valueOf( (sal_Int32)nHelpId ); + rtl::OUString sHelpURL( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) ); return sHelpURL; } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index c7a18050c3ff..87df9e404b6a 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -600,7 +600,8 @@ void SvtFileDialog::Init_Impl bool bSaveMode = ( FILEDLG_MODE_SAVE == _pImp->_eMode ); pURLBox->SetNoURLSelection( bSaveMode ); - _pImp->_pEdFileName->SetHelpId( HID_FILEDLG_AUTOCOMPLETEBOX ); + // FIXME: HELPID + _pImp->_pEdFileName->SetHelpId( ""/*HID_FILEDLG_AUTOCOMPLETEBOX*/ ); _pImp->_pFtFileType = new FixedText( this, SvtResId( FT_EXPLORERFILE_FILETYPE ) ); _pImp->CreateFilterListControl( this, SvtResId( LB_EXPLORERFILE_FILETYPE ) ); @@ -649,7 +650,8 @@ void SvtFileDialog::Init_Impl _pFileView->SetUrlFilter( &m_aURLFilter ); _pFileView->EnableAutoResize(); - _pFileView->SetHelpId( HID_FILEDLG_STANDARD ); + // FIXME: HELPID + _pFileView->SetHelpId( ""/*HID_FILEDLG_STANDARD*/ ); _pFileView->SetStyle( _pFileView->GetStyle() | WB_TABSTOP ); // Positionen und Groessen der Knoepfe bestimmen. @@ -701,7 +703,8 @@ void SvtFileDialog::Init_Impl if ( nStyle & SFXWB_READONLY ) { _pCbReadOnly = new CheckBox( this, SvtResId( CB_EXPLORERFILE_READONLY ) ); - _pCbReadOnly->SetHelpId( HID_FILEOPEN_READONLY ); + // FIXME: HELPID + _pCbReadOnly->SetHelpId( ""/*HID_FILEOPEN_READONLY*/ ); _pCbReadOnly->SetText( SvtResId( STR_SVT_FILEPICKER_READONLY ) ); AddControl( _pCbReadOnly ); ReleaseOwnerShip( _pCbReadOnly ); @@ -810,15 +813,23 @@ void SvtFileDialog::Init_Impl { // different help ids if in save-as mode // 90744 - 09.08.2001 - frank.schoenheit@sun.com - SetHelpId( HID_FILESAVE_DIALOG ); - - _pImp->_pEdFileName->SetHelpId( HID_FILESAVE_FILEURL ); - _pImp->_pBtnFileOpen->SetHelpId( HID_FILESAVE_DOSAVE ); - _pImp->_pBtnNewFolder->SetHelpId( HID_FILESAVE_CREATEDIRECTORY ); - _pImp->_pBtnStandard->SetHelpId( HID_FILESAVE_DEFAULTDIRECTORY ); - _pImp->_pBtnUp->SetHelpId( HID_FILESAVE_LEVELUP ); - _pImp->GetFilterListControl()->SetHelpId( HID_FILESAVE_FILETYPE ); - _pFileView->SetHelpId( HID_FILESAVE_FILEVIEW ); + // FIXME: HELPID + SetHelpId( ""/*HID_FILESAVE_DIALOG*/ ); + + // FIXME: HELPID + _pImp->_pEdFileName->SetHelpId( ""/*HID_FILESAVE_FILEURL*/ ); + // FIXME: HELPID + _pImp->_pBtnFileOpen->SetHelpId( ""/*HID_FILESAVE_DOSAVE*/ ); + // FIXME: HELPID + _pImp->_pBtnNewFolder->SetHelpId( ""/*HID_FILESAVE_CREATEDIRECTORY*/ ); + // FIXME: HELPID + _pImp->_pBtnStandard->SetHelpId( ""/*HID_FILESAVE_DEFAULTDIRECTORY*/ ); + // FIXME: HELPID + _pImp->_pBtnUp->SetHelpId( ""/*HID_FILESAVE_LEVELUP*/ ); + // FIXME: HELPID + _pImp->GetFilterListControl()->SetHelpId( ""/*HID_FILESAVE_FILETYPE*/ ); + // FIXME: HELPID + _pFileView->SetHelpId( ""/*HID_FILESAVE_FILEVIEW*/ ); // formerly, there was only _pLbFileVersion, which was used for 3 different // use cases. For reasons of maintainability, I introduced extra members (_pLbTemplates, _pLbImageTemplates) @@ -827,16 +838,23 @@ void SvtFileDialog::Init_Impl // tests I made lead to a dialog where _no_ of the three list boxes was present. // 96930 - 15.08.2002 - fs@openoffice.org if ( _pImp->_pLbFileVersion ) - _pImp->_pLbFileVersion->SetHelpId( HID_FILESAVE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); if ( _pImp->_pLbTemplates ) - _pImp->_pLbTemplates->SetHelpId( HID_FILESAVE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); if ( _pImp->_pLbImageTemplates ) - _pImp->_pLbImageTemplates->SetHelpId( HID_FILESAVE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); - if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( HID_FILESAVE_SAVEWITHPASSWORD ); - if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( HID_FILESAVE_AUTOEXTENSION ); - if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( HID_FILESAVE_CUSTOMIZEFILTER ); - if ( _pCbSelection ) _pCbSelection->SetHelpId( HID_FILESAVE_SELECTION ); + // FIXME: HELPID + if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( ""/*HID_FILESAVE_SAVEWITHPASSWORD*/ ); + // FIXME: HELPID + if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( ""/*HID_FILESAVE_AUTOEXTENSION*/ ); + // FIXME: HELPID + if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( ""/*HID_FILESAVE_CUSTOMIZEFILTER*/ ); + // FIXME: HELPID + if ( _pCbSelection ) _pCbSelection->SetHelpId( ""/*HID_FILESAVE_SELECTION*/ ); } // correct the z-order of the controls @@ -2981,7 +2999,8 @@ void SvtFileDialog::AddControls_Impl( ) { _pCbLinkBox = new CheckBox( this ); _pCbLinkBox ->SetText( SvtResId( STR_SVT_FILEPICKER_INSERT_AS_LINK ) ); - _pCbLinkBox ->SetHelpId( HID_FILEDLG_LINK_CB ); + // FIXME: HELPID + _pCbLinkBox ->SetHelpId( ""/*HID_FILEDLG_LINK_CB*/ ); AddControl( _pCbLinkBox ); ReleaseOwnerShip( _pCbLinkBox ); _pCbLinkBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) ); @@ -2998,7 +3017,8 @@ void SvtFileDialog::AddControls_Impl( ) // "Vorschau" _pCbPreviewBox = new CheckBox( this ); _pCbPreviewBox->SetText( SvtResId( STR_SVT_FILEPICKER_SHOW_PREVIEW ) ); - _pCbPreviewBox->SetHelpId( HID_FILEDLG_PREVIEW_CB ); + // FIXME: HELPID + _pCbPreviewBox->SetHelpId( ""/*HID_FILEDLG_PREVIEW_CB*/ ); AddControl( _pCbPreviewBox ); ReleaseOwnerShip( _pCbPreviewBox ); _pCbPreviewBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) ); @@ -3046,7 +3066,8 @@ void SvtFileDialog::AddControls_Impl( ) { _pPbPlay = new PushButton( this ); _pPbPlay->SetText( SvtResId( STR_SVT_FILEPICKER_PLAY ) ); - _pPbPlay->SetHelpId( HID_FILESAVE_DOPLAY ); + // FIXME: HELPID + _pPbPlay->SetHelpId( ""/*HID_FILESAVE_DOPLAY*/ ); AddControl( _pPbPlay ); ReleaseOwnerShip( _pPbPlay ); _pPbPlay->SetClickHdl( LINK( this, SvtFileDialog, PlayButtonHdl_Impl ) ); @@ -3058,7 +3079,8 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtFileVersion->SetText( SvtResId( STR_SVT_FILEPICKER_VERSION ) ); _pImp->_pLbFileVersion = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - _pImp->_pLbFileVersion->SetHelpId( HID_FILEOPEN_VERSION ); + // FIXME: HELPID + _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ ); } else if ( _nExtraBits & SFX_EXTRA_TEMPLATES ) { @@ -3066,7 +3088,8 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_TEMPLATES ) ); _pImp->_pLbTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - _pImp->_pLbTemplates->SetHelpId( HID_FILEOPEN_VERSION ); + // FIXME: HELPID + _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ ); // This is strange. During the re-factoring during 96930, I discovered that this help id // is set in the "Templates mode". This was hidden in the previous implementation. // Shouldn't this be a more meaningfull help id. @@ -3078,7 +3101,8 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtImageTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_IMAGE_TEMPLATE ) ); _pImp->_pLbImageTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - _pImp->_pLbImageTemplates->SetHelpId( HID_FILEOPEN_IMAGE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILEOPEN_IMAGE_TEMPLATE*/ ); } } diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 458368bd6581..9541c45689b1 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -4005,7 +4005,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent ) if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { pToolBox = (ToolBox *)pWindow; - aToolbarName = pToolBox->GetSmartHelpId().GetStr(); + aToolbarName = rtl::OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 ); sal_Int32 i = aToolbarName.lastIndexOf( ':' ); if (( aToolbarName.getLength() > 0 ) && ( i > 0 ) && (( i+ 1 ) < aToolbarName.getLength() )) @@ -4066,7 +4066,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent ) if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { pToolBox = (ToolBox *)pWindow; - aToolbarName = pToolBox->GetSmartHelpId().GetStr(); + aToolbarName = rtl::OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 ); if (( aToolbarName.getLength() > 0 ) && ( m_nLockCount == 0 )) m_aAsyncLayoutTimer.Start(); } diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 13c5647341e6..c8cf5249dd9a 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -528,7 +528,8 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f } // set help ID for our canvas - pWindow->SetHelpId(HID_BACKINGWINDOW); + // FIXME: HELPID + pWindow->SetHelpId(""/*HID_BACKINGWINDOW*/); // inform BackingWindow about frame BackingWindow* pBack = dynamic_cast(pWindow ); diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index e4d37d1fe059..6aa5e274b744 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -211,15 +211,15 @@ BackingWindow::BackingWindow( Window* i_pParent ) : if( mxDesktop.is() ) mxDesktopDispatchProvider = Reference< XDispatchProvider >( mxDesktop, UNO_QUERY ); - maWriterButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:WriterButton" ) ) ) ); - maCalcButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:CalcButton" ) ) ) ); - maImpressButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:ImpressButton" ) ) ) ); - maDrawButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:DrawButton" ) ) ) ); - maDBButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:DBButton" ) ) ) ); - maMathButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:MathButton" ) ) ) ); - maTemplateButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:TemplateButton" ) ) ) ); - maOpenButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:OpenButton" ) ) ) ); - maToolbox.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Toolbox" ) ) ) ); + maWriterButton.SetHelpId( ".HelpId:StartCenter:WriterButton" ); + maCalcButton.SetHelpId( ".HelpId:StartCenter:CalcButton" ); + maImpressButton.SetHelpId( ".HelpId:StartCenter:ImpressButton" ); + maDrawButton.SetHelpId( ".HelpId:StartCenter:DrawButton" ); + maDBButton.SetHelpId( ".HelpId:StartCenter:DBButton" ); + maMathButton.SetHelpId( ".HelpId:StartCenter:MathButton" ); + maTemplateButton.SetHelpId( ".HelpId:StartCenter:TemplateButton" ); + maOpenButton.SetHelpId( ".HelpId:StartCenter:OpenButton" ); + maToolbox.SetHelpId( ".HelpId:StartCenter:Toolbox" ); // init background initBackground(); diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index f0f5d52a47d6..7be1516f1331 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -98,7 +98,8 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo pPopupMenu->InsertItem( 2, aDisplayName ); pPopupMenu->SetItemCommand( 2, aCommand ); //pPopupMenu->SetHelpId( 2, HID_SVX_BASIC_MACRO_ORGANIZER ); - pPopupMenu->SetHelpId( 2, 40012 ); + // FIXME: HELPID + pPopupMenu->SetHelpId( 2, ""/*40012*/ ); // insert providers but not basic or java addScriptItems( pPopupMenu, 4); @@ -219,7 +220,8 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt pPopupMenu->InsertItem( itemId, aDisplayName ); pPopupMenu->SetItemCommand( itemId, aCommand ); //pPopupMenu->SetHelpId( itemId, HID_SVX_COMMON_MACRO_ORGANIZER ); - pPopupMenu->SetHelpId( itemId, 40014 ); + // FIXME: HELPID + pPopupMenu->SetHelpId( itemId, ""/*40014*/ ); itemId++; break; } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 9fbdf87336cc..0a3295c1395e 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1797,7 +1797,9 @@ void MenuBarManager::FillMenu( sal_Int32 nHelpId = aHelpURL.toInt32(); if ( nHelpId > 0 ) - pMenu->SetHelpId( nId, (USHORT)nHelpId ); + // FIXME: HELPID + // (should set aHelpURL ? + pMenu->SetHelpId( nId, ""/*(USHORT)nHelpId*/ ); if ( nStyle ) { MenuItemBits nBits = pMenu->GetItemBits( nId ); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index cb9cbb2896f7..d143b717366c 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -537,7 +537,8 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc rtl::OUString aId( aHelpURL.copy( HELPID_PREFIX_LENGTH )); sal_uInt16 nHelpId = (sal_uInt16)(aId.toInt32()); if ( nHelpId > 0 ) - m_pStatusBar->SetHelpId( nId, nHelpId ); + // FIXME: HELPID + m_pStatusBar->SetHelpId( nId, ""/*nHelpId*/ ); } ++nId; diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 030a790b35e3..ed506f5345e3 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -137,7 +137,8 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) pStatusBarManager = new StatusBarManager( m_xServiceFactory, xFrame, m_aResourceURL, pStatusBar ); ((FrameworkStatusBar*)pStatusBar)->SetStatusBarManager( pStatusBarManager ); m_xStatusBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pStatusBarManager ), UNO_QUERY ); - pStatusBar->SetUniqueId( HID_STATUSBAR ); + // FIXME: HELPID + pStatusBar->SetUniqueId( ""/*HID_STATUSBAR*/ ); } } diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index d89b81c0f9b6..19625d5e198b 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -303,10 +303,10 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic // set name for testtool, the useful part is after the last '/' sal_Int32 idx = rResourceName.lastIndexOf('/'); idx++; // will become 0 if '/' not found: use full string - ::rtl::OUString aHelpIdAsString( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX_TESTTOOL )); + ::rtl::OString aHelpIdAsString( HELPID_PREFIX_TESTTOOL ); ::rtl::OUString aToolbarName = rResourceName.copy( idx ); - aHelpIdAsString += aToolbarName; - m_pToolBar->SetSmartHelpId( SmartId( aHelpIdAsString ) ); + aHelpIdAsString += rtl::OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 );; + m_pToolBar->SetHelpId( aHelpIdAsString ); m_aAsyncUpdateControllersTimer.SetTimeout( 50 ); m_aAsyncUpdateControllersTimer.SetTimeoutHdl( LINK( this, ToolBarManager, AsyncUpdateControllersHdl ) ); @@ -883,7 +883,10 @@ void ToolBarManager::CreateControllers() if ( nId == 0 ) continue; - sal_Int16 nWidth( sal_Int16( m_pToolBar->GetHelpId( nId ))); + // FIXME: HELPID + // What ? A width initalized with a help id ? Should we perhaps add two bananas and a coconut to it ? + // sal_Int16 nWidth( sal_Int16( m_pToolBar->GetHelpId( nId ))); + sal_Int16 nWidth( nId ); rtl::OUString aLoadURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:OpenUrl" )); rtl::OUString aCommandURL( m_pToolBar->GetItemCommand( nId )); sal_Bool bInit( sal_True ); @@ -892,7 +895,7 @@ void ToolBarManager::CreateControllers() svt::ToolboxController* pController( 0 ); - m_pToolBar->SetHelpId( nId, 0 ); // reset value again + m_pToolBar->SetHelpId( nId, "" ); // reset value again if ( bHasDisabledEntries ) { aURL.Complete = aCommandURL; @@ -1282,7 +1285,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine } // Add additional information for the controller to the obsolete help id - m_pToolBar->SetHelpId( ULONG( nWidth )); + // FIXME: HELPID + m_pToolBar->SetHelpId( ""/*ULONG( nWidth )*/); if ( !bIsVisible ) m_pToolBar->HideItem( nId ); diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 83f280cb46a7..025ebea06a19 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -701,7 +701,9 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_u pToolbar->SetItemState( nItemId, STATE_NOCHECK ); // Use obsolete help id to transport the width of the item - pToolbar->SetHelpId( nItemId, rItem.nWidth ); + // FIXME: HELPID + // this looks broken + pToolbar->SetHelpId( nItemId, ""/*rItem.nWidth*/ ); // Use the user data to store add-on specific data with the toolbar item AddonsParams* pAddonParams = new AddonsParams; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 02402205bd1c..3d0cda946771 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -216,7 +216,8 @@ void ToolbarsMenuController::addCommand( PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); if ( !!aImage ) pVCLPopupMenu->SetItemImage( nItemId, aImage ); - pVCLPopupMenu->SetHelpId( nItemId, nHelpId ); + // FIXME: HELPID + pVCLPopupMenu->SetHelpId( nItemId, ""/*nHelpId*/ ); } m_aCommandVector.push_back( rCommandURL ); diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx index 4f4a04834257..b0105553cd40 100644 --- a/sfx2/inc/sfx2/passwd.hxx +++ b/sfx2/inc/sfx2/passwd.hxx @@ -78,7 +78,7 @@ public: void SetMinLen( USHORT Len ); void SetMaxLen( USHORT Len ); - void SetEditHelpId( ULONG nId ) { maPasswordED.SetHelpId( nId ); } + void SetEditHelpId( const rtl::OString& rId ) { maPasswordED.SetHelpId( rId ); } void ShowExtras( USHORT nExtras ) { mnExtras = nExtras; } void AllowAsciiOnly( bool i_bAsciiOnly = true ) { mbAsciiOnly = i_bAsciiOnly; } diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx index 60ad04b2e9ab..6a87729e30e3 100644 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfxhelp.hxx @@ -45,12 +45,14 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: - SAL_DLLPRIVATE virtual BOOL Start( ULONG nHelpId, const Window* pWindow ); + // FIXME: HELPID + // SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); SAL_DLLPRIVATE String GetHelpModuleName_Impl(); - SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ); + // FIXME: HELPID + // SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ); SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ); public: @@ -60,10 +62,12 @@ public: inline void SetTicket( const String& rTicket ) { aTicket = rTicket; } inline void SetUser( const String& rUser ) { aUser = rUser; } - virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); + // FIXME: HELPID + //virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); virtual XubString GetHelpText( const String&, const Window* pWindow ); - static String CreateHelpURL( ULONG nHelpId, const String& rModuleName ); + // FIXME: HELPID + // static String CreateHelpURL( ULONG nHelpId, const String& rModuleName ); static String CreateHelpURL( const String& aCommandURL, const String& rModuleName ); static void OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId ); static String GetDefaultHelpModule(); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 14789100bb24..2abcdffe0169 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -354,7 +354,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( 66056 == nHelpId ) { // show Support page with new URL - String sHelpURL = SfxHelp::CreateHelpURL( nHelpId, String() ); + // FIXME: HELPID + String sHelpURL = SfxHelp::CreateHelpURL( String()/*nHelpId*/, String() ); String sParams = sHelpURL.Copy( sHelpURL.Search( '?' ) ); sHelpURL = String::CreateFromAscii("vnd.sun.star.help://shared/text/shared/05/00000001.xhp"); sHelpURL += sParams; @@ -362,7 +363,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) pHelp->Start( sHelpURL, NULL ); } else - pHelp->Start( nHelpId, NULL ); // show start page + // FIXME: HELPID + pHelp->Start( String()/*nHelpId*/, NULL ); // show start page bDone = TRUE; } break; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 597509cf34bd..6b8dfe3a023c 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2105,24 +2105,32 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : xFrame->setName( DEFINE_CONST_UNICODE("OFFICE_HELP") ); lcl_disableLayoutOfFrame(xFrame); - aToolBox.SetHelpId( HID_HELP_TOOLBOX ); + // FIXME: HELPID + aToolBox.SetHelpId( ""/*HID_HELP_TOOLBOX*/ ); aToolBox.InsertItem( TBI_INDEX, aIndexOffText ); - aToolBox.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ ); aToolBox.InsertSeparator(); aToolBox.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ) ); - aToolBox.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ ); aToolBox.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ) ); - aToolBox.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ ); aToolBox.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ) ); - aToolBox.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ ); aToolBox.InsertSeparator(); aToolBox.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ) ); - aToolBox.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ ); aToolBox.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ) ); - aToolBox.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ ); aToolBox.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ) ); - aToolBox.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ ); InitToolBoxImages(); aToolBox.Show(); @@ -2139,7 +2147,8 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) ); if ( aOnStartupCB.GetHelpId() == 0 ) - aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX ); + // FIXME: HELPID + aOnStartupCB.SetHelpId( ""/*HID_HELP_ONSTARTUP_BOX*/ ); } // ----------------------------------------------------------------------- @@ -2595,32 +2604,40 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) else aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ) ); - aMenu.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) ); - aMenu.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ ); aMenu.EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() ); aMenu.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) ); - aMenu.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ ); aMenu.EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() ); aMenu.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) ); - aMenu.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) ); - aMenu.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ ); aMenu.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) ); - aMenu.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ ); aMenu.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) ); - aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) ); - aMenu.SetHelpId( TBI_SELECTIONMODE, HID_HELP_TEXT_SELECTION_MODE ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_SELECTIONMODE, ""/*HID_HELP_TEXT_SELECTION_MODE*/ ); Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY ); URL aURL; aURL.Complete = DEFINE_CONST_UNICODE(".uno:SelectTextMode"); @@ -2640,7 +2657,8 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aMenu.InsertSeparator(); aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) ); - aMenu.SetHelpId( TBI_COPY, SID_COPY ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_COPY, ""/*SID_COPY*/ ); aMenu.EnableItem( TBI_COPY, HasSelection() ); if ( bIsDebug ) @@ -3225,7 +3243,8 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( aWinPos ( 0, 0 ), sTitle ( pParent->GetText() ) { - SetHelpId( HID_HELP_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_HELP_WINDOW*/ ); SetStyle( GetStyle() | WB_DIALOGCONTROL ); pHelpInterceptor->InitWaiter( this ); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index b9ff344a1513..cd2f6b189fd1 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -326,7 +326,8 @@ public: ~SfxHelp_Impl(); SfxHelpOptions_Impl* GetOptions(); - String GetHelpText( ULONG nHelpId, const String& rModule ); // get "Active Help" + // FIXME: HELPID + // String GetHelpText( ULONG nHelpId, const String& rModule ); // get "Active Help" String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ); sal_Bool HasModule( const ::rtl::OUString& rModule ); // module installed sal_Bool IsHelpInstalled(); // module list not empty @@ -370,6 +371,8 @@ void SfxHelp_Impl::Load() } } +#if 0 +// FIXME: HELPID String SfxHelp_Impl::GetHelpText( ULONG nHelpId, const String& rModule ) { // create help url @@ -379,6 +382,7 @@ String SfxHelp_Impl::GetHelpText( ULONG nHelpId, const String& rModule ) // load help string return SfxContentHelper::GetActiveHelpString( aHelpURL ); } +#endif String SfxHelp_Impl::GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ) { @@ -581,6 +585,8 @@ String SfxHelp::GetHelpModuleName_Impl() return sModuleName; } +#if 0 +// FIXME: HELPID String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ) { String aModuleName( rModuleName ); @@ -650,6 +656,7 @@ String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ) return aHelpURL; } +#endif String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ) { @@ -802,7 +809,8 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) } else { - aHelpURL = CreateHelpURL_Impl( 0, GetHelpModuleName_Impl( ) ); + // FIXME: HELPID + aHelpURL = CreateHelpURL_Impl( String()/*0*/, GetHelpModuleName_Impl( ) ); // pb i91715: strings begin with ".HelpId:" are not words of the basic ide // they are helpid-strings used by the testtool -> so we ignore them @@ -851,6 +859,8 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) return TRUE; } +#if 0 +// FIXME: HELPID BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow ) { String aHelpModuleName( GetHelpModuleName_Impl() ); @@ -878,7 +888,10 @@ BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow ) return Start( aHelpURL, pWindow ); } +#endif +#if 0 +// FIXME: HELPID XubString SfxHelp::GetHelpText( ULONG nHelpId, const Window* pWindow ) { String aModuleName = GetHelpModuleName_Impl(); @@ -919,6 +932,7 @@ XubString SfxHelp::GetHelpText( ULONG nHelpId, const Window* pWindow ) return aHelpText; } +#endif XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* ) { @@ -937,6 +951,8 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* ) return sHelpText; } +#if 0 +// FIXME: HELPID String SfxHelp::CreateHelpURL( ULONG nHelpId, const String& rModuleName ) { String aURL; @@ -945,6 +961,7 @@ String SfxHelp::CreateHelpURL( ULONG nHelpId, const String& rModuleName ) aURL = pHelp->CreateHelpURL_Impl( nHelpId, rModuleName ); return aURL; } +#endif String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName ) { @@ -976,7 +993,8 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId ) try { URL aURL; - aURL.Complete = CreateHelpURL_Impl( nHelpId, GetHelpModuleName_Impl() ); + // FIXME: HELPID + aURL.Complete = CreateHelpURL_Impl( String()/*nHelpId*/, GetHelpModuleName_Impl() ); Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ), UNO_QUERY ); xTrans->parseStrict(aURL); diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx index 4635733b934d..1d1ef73ad8cf 100644 --- a/sfx2/source/dialog/about.cxx +++ b/sfx2/source/dialog/about.cxx @@ -298,7 +298,8 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS FreeResource(); // explizite Help-Id - SetHelpId( SID_ABOUT ); + // FIXME: HELPID + SetHelpId( ""/*SID_ABOUT*/ ); //#112429# replace occurences of "StarOffice" in the "StarSuite" version String sCopyright( aCopyrightText.GetText() ); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 2ea5ef5fe4b1..d85a01870074 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -373,9 +373,9 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); @@ -393,9 +393,9 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); @@ -421,7 +421,8 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + nHelpId = 0; // pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } @@ -523,7 +524,8 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + nHelpId = 0; //pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } @@ -561,9 +563,9 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); @@ -582,9 +584,9 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 7b4e4289a49c..8ad551278a27 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -918,11 +918,13 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, */ { - ULONG nId = GetHelpId(); + // FIXME: HELPID + ULONG nId = 0;// GetHelpId(); if ( !nId && pCW ) nId = pCW->GetType(); - SetHelpId( 0 ); - SetUniqueId( nId ); + SetHelpId( "" ); + // FIXME: HELPID + SetUniqueId( ""/*nId*/ ); pImp = new SfxDockingWindow_Impl; pImp->bConstructed = FALSE; @@ -960,9 +962,9 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, */ { - ULONG nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); pImp = new SfxDockingWindow_Impl; pImp->bConstructed = FALSE; @@ -1847,7 +1849,8 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + //nHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 5270eb5d4207..2785a38305cd 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -276,7 +276,8 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve OUString aHelpText; Help* pHelp = Application::GetHelp(); if ( pHelp ) - aHelpText = String( pHelp->GetHelpText( nHelpId, NULL ) ); + // FIXME: HELPID + aHelpText = String( pHelp->GetHelpText( String()/*nHelpId*/, NULL ) ); return aHelpText; } diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index d7f258e7ccb3..b271d1e04dc7 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -51,7 +51,8 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE); eChildAlignment = SFX_ALIGN_NOALIGNMENT; - pWindow->SetHelpId ( HID_NAVIGATOR_WINDOW ); + // FIXME: HELPID + pWindow->SetHelpId ( ""/*HID_NAVIGATOR_WINDOW*/ ); pWindow->SetOutputSizePixel( Size( 270, 240 ) ); ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo ); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 93c2e0e09595..065b407c6769 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -664,7 +664,8 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText ) aCancelBtn.Show(); aHelpBtn.Show(); aResetBtn.Show(); - aResetBtn.SetHelpId( HID_TABDLG_RESET_BTN ); + // FIXME: HELPID + aResetBtn.SetHelpId( ""/*HID_TABDLG_RESET_BTN*/ ); if ( pUserBtn ) { @@ -680,7 +681,8 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText ) String aStd( SfxResId( STR_STANDARD_SHORTCUT ) ); aBaseFmtBtn.SetText( aStd ); aBaseFmtBtn.SetClickHdl( LINK( this, SfxTabDialog, BaseFmtHdl ) ); - aBaseFmtBtn.SetHelpId( HID_TABDLG_STANDARD_BTN ); + // FIXME: HELPID + aBaseFmtBtn.SetHelpId( ""/*HID_TABDLG_STANDARD_BTN*/ ); // bFmt = tempor"ares Flag im Ctor() "ubergeben, // wenn bFmt == 2, dann auch TRUE, @@ -787,7 +789,8 @@ void SfxTabDialog::EnableApplyButton(BOOL bEnable) pImpl->pApplyButton->SetText( String( SfxResId( STR_APPLY ) ) ); pImpl->pApplyButton->Show(); - pImpl->pApplyButton->SetHelpId( HID_TABDLG_APPLY_BTN ); + // FIXME: HELPID + pImpl->pApplyButton->SetHelpId( ""/*HID_TABDLG_APPLY_BTN*/ ); } else { @@ -1783,7 +1786,8 @@ long SfxTabDialog::Notify( NotifyEvent& rNEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + // nHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 9edeb05b43ac..4777798aef2b 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -778,8 +778,10 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Sfx bHierarchical ( FALSE ), bBindingUpdate ( TRUE ) { - aFmtLb.SetHelpId( HID_TEMPLATE_FMT ); - aFilterLb.SetHelpId( HID_TEMPLATE_FILTER ); + // FIXME: HELPID + aFmtLb.SetHelpId( ""/*HID_TEMPLATE_FMT*/ ); + // FIXME: HELPID + aFilterLb.SetHelpId( ""/*HID_TEMPLATE_FILTER*/ ); aFmtLb.SetWindowBits( WB_SORT | WB_HIDESELECTION ); Font aFont = aFmtLb.GetFont(); aFont.SetWeight( WEIGHT_NORMAL ); @@ -2359,7 +2361,8 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( Font aFont=aFilterLb.GetFont(); aFont.SetWeight( WEIGHT_NORMAL ); aFilterLb.SetFont( aFont ); - m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT ); + // FIXME: HELPID + m_aActionTbL.SetHelpId( ""/*HID_TEMPLDLG_TOOLBOX_LEFT*/ ); } // ------------------------------------------------------------------------ @@ -2384,7 +2387,8 @@ void SfxTemplateDialog_Impl::InsertFamilyItem(USHORT nId,const SfxStyleFamilyIte default: DBG_ERROR("unbekannte StyleFamily"); break; } m_aActionTbL.InsertItem( nId, pItem->GetImage(), pItem->GetText(), 0, 0); - m_aActionTbL.SetHelpId( nId, nHelpId ); + // FIXME: HELPID + m_aActionTbL.SetHelpId( nId, ""/*nHelpId*/ ); } // ------------------------------------------------------------------------ @@ -2683,18 +2687,21 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) uno::Any aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleNewByExample")); ::rtl::OUString sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel ); - pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE); + // FIXME: HELPID + pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, ""/*HID_TEMPLDLG_NEWBYEXAMPLE*/); aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleUpdateByExample")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel ); - pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE); + // FIXME: HELPID + pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, ""/*HID_TEMPLDLG_UPDATEBYEXAMPLE*/); aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:LoadStyles")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel ); - pMenu->SetHelpId(SID_TEMPLATE_LOAD, SID_TEMPLATE_LOAD); + // FIXME: HELPID + pMenu->SetHelpId(SID_TEMPLATE_LOAD, ""/*SID_TEMPLATE_LOAD*/); pMenu->SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, MenuSelectHdl)); pMenu->Execute( pBox, diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 719dc5b8d223..1d57e0b9c761 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -245,8 +245,9 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent, // * always work with an own instance, even if we get only NULL in this ctor } - aLeftLb.SetHelpId( HID_CTL_ORGANIZER_LEFT ); - aRightLb.SetHelpId( HID_CTL_ORGANIZER_RIGHT ); + // FIXME: HELPID + aLeftLb.SetHelpId( ""/*HID_CTL_ORGANIZER_LEFT*/ ); + aRightLb.SetHelpId( ""/*HID_CTL_ORGANIZER_RIGHT*/ ); String aWorkPath = SvtPathOptions().GetWorkPath(); if ( aWorkPath.Len() ) diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index d3235b1c7a7f..3b1ebde3f1ae 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -177,7 +177,8 @@ SfxPreviewWin::SfxPreviewWin( Window* pParent, const ResId& rResId, SfxObjectShellLock &rDocSh ) : Window(pParent, rResId), rDocShell( rDocSh ) { - SetHelpId( HID_PREVIEW_FRAME ); + // FIXME: HELPID + SetHelpId( ""/*HID_PREVIEW_FRAME*/ ); // adjust contrast mode initially bool bUseContrast = UseHighContrastSetting(); diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index 8e006721351a..a254deb24c52 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -41,7 +41,8 @@ QueryTemplateBox::QueryTemplateBox( Window* pParent, const String& rMessage ) : MessBox ( pParent, 0, Application::GetDisplayName(), rMessage ) { SetImage( QueryBox::GetStandardImage() ); - SetHelpId( MSG_QUERY_LOAD_TEMPLATE ); + // FIXME: HELPID + SetHelpId( ""/*MSG_QUERY_LOAD_TEMPLATE*/ ); AddButton( String( SfxResId( STR_QRYTEMPL_UPDATE_BTN ) ), RET_YES, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON ); diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index ec803718f457..9137abd04764 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -160,7 +160,8 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen // einf"ugen pMenu->InsertItem( nId, aVerbs[n].VerbName ); - pMenu->SetHelpId( nId, (ULONG) nId ); + // FIXME: HELPID + pMenu->SetHelpId( nId, ""/*(ULONG) nId*/ ); } } } @@ -378,7 +379,8 @@ void SfxPopupMenuManager::InsertSeparator( USHORT nPos ) void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, USHORT nPos ) { pSVMenu->InsertItem( nId, rName, nBits,nPos ); - pSVMenu->SetHelpId( nId, (ULONG) nId ); + // FIXME: HELPID + pSVMenu->SetHelpId( nId, ""/*(ULONG) nId*/ ); } //------------------------------------------------------------------------- diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 13c84bc531e2..e3d694eae747 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -464,7 +464,8 @@ void SfxVirtualMenu::CreateFromSVMenu() pSVMenu->SetPopupMenu( nSlotId, pPopup ); } */ - pSVMenu->SetHelpId( nSlotId, 0L ); + // FIXME: HELPID + pSVMenu->SetHelpId( nSlotId, ""/*0L*/ ); pMnuCtrl = pItems+nPos; // normalerweise jetzt erst im Activate-Handler diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index f5b38d5a8a18..fc26d0077161 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1520,7 +1520,8 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId , bBigImages( FALSE ) , pMenu( 0 ) { - rBox.SetHelpId( nId, HID_TBXCONTROL_FILENEW ); + // FIXME: HELPID + rBox.SetHelpId( nId, ""/*HID_TBXCONTROL_FILENEW*/ ); rBox.SetItemBits( nId, rBox.GetItemBits( nId ) | TIB_DROPDOWN); // Determine the current background color of the menus diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index d99ad8733e03..fea860f6a3ff 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -130,7 +130,8 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + // nHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index 1f5543e9e484..a4718c80f099 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -172,7 +172,8 @@ public: void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; } const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } - void SetHeaderBarHelpId(ULONG nHelpId) {aHeaderBar.SetHelpId(nHelpId);} + // FIXME: HELPID + void SetHeaderBarHelpId(ULONG nHelpId) {aHeaderBar.SetHelpId(""/*nHelpId*/);} }; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 503814823467..124f7fdd2910 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -636,7 +636,8 @@ SvxTPView::SvxTPView( Window * pParent) { FreeResource(); - aViewData.SetHelpId(HID_REDLINING_VIEW_DG_VIEW_TABLE); + // FIXME: HELPID + aViewData.SetHelpId(""/*HID_REDLINING_VIEW_DG_VIEW_TABLE*/); aViewData.SetHeaderBarHelpId(HID_REDLINING_VIEW_DG_VIEW_HEADER); aMinSize=GetSizePixel(); @@ -1177,13 +1178,15 @@ void SvxTPFilter::ShowAction(BOOL bShow) { aCbRange.Hide(); aLbAction.Hide(); - aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_RANGE); + // FIXME: HELPID + aCbRange.SetHelpId(""/*HID_REDLINING_FILTER_CB_RANGE*/); } else { HideRange(); aCbRange.SetText(aActionStr); - aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_ACTION); + // FIXME: HELPID + aCbRange.SetHelpId(""/*HID_REDLINING_FILTER_CB_ACTION*/); aCbRange.Show(); aLbAction.Show(); @@ -1399,7 +1402,8 @@ SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, WinBits nWinStyle) aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName()); aTCAccept.SetTabPage( TP_VIEW, pTPView); aTCAccept.SetTabPage( TP_FILTER, pTPFilter); - aTCAccept.SetHelpId(HID_REDLINING_TABCONTROL); + // FIXME: HELPID + aTCAccept.SetHelpId(""/*HID_REDLINING_TABCONTROL*/); aTCAccept.SetTabPageSizePixel(aMinSize); Size aSize=aTCAccept.GetSizePixel(); @@ -1426,7 +1430,8 @@ SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, const ResId& rResId ) aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName()); aTCAccept.SetTabPage( TP_VIEW, pTPView); aTCAccept.SetTabPage( TP_FILTER, pTPFilter); - aTCAccept.SetHelpId(HID_REDLINING_TABCONTROL); + // FIXME: HELPID + aTCAccept.SetHelpId(""/*HID_REDLINING_TABCONTROL*/); aTCAccept.SetTabPageSizePixel(aMinSize); Size aSize=aTCAccept.GetSizePixel(); diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 95c27a5dcec8..6437b193a793 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1009,9 +1009,12 @@ SvxLightCtl3D::SvxLightCtl3D( Window* pParent, WinBits nStyle ) void SvxLightCtl3D::Init() { // #i58240# set HelpIDs for scrollbars and switcher - maHorScroller.SetHelpId(HID_CTRL3D_HSCROLL); - maVerScroller.SetHelpId(HID_CTRL3D_VSCROLL); - maSwitcher.SetHelpId(HID_CTRL3D_SWITCHER); + // FIXME: HELPID + maHorScroller.SetHelpId(""/*HID_CTRL3D_HSCROLL*/); + // FIXME: HELPID + maVerScroller.SetHelpId(""/*HID_CTRL3D_VSCROLL*/); + // FIXME: HELPID + maSwitcher.SetHelpId(""/*HID_CTRL3D_SWITCHER*/); // Light preview maLightControl.Show(); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 2cc87eb9e648..fe6a2372b7a0 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1978,8 +1978,8 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V sPattern.AssignAscii("HID:"); if (sHelpURL.Equals(sPattern, 0, sPattern.Len())) { - String sID = sHelpURL.Copy(sPattern.Len()); - pGrid->SetHelpId(sID.ToInt32()); + // FIXME: HELPID + pGrid->SetHelpId(rtl::OUStringToOString(sHelpURL, RTL_TEXTENCODING_UTF8)); } } else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) ) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 8cc52e4c0b7d..2c63880afd05 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -366,13 +366,20 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) m_aLastBtn.SetSymbol(SYMBOL_LAST); m_aNewBtn.SetModeImage(((DbGridControl*)pParent)->GetImage(DbGridControl_Base::NEW)); - m_aFirstBtn.SetHelpId(HID_GRID_TRAVEL_FIRST); - m_aPrevBtn.SetHelpId(HID_GRID_TRAVEL_PREV); - m_aNextBtn.SetHelpId(HID_GRID_TRAVEL_NEXT); - m_aLastBtn.SetHelpId(HID_GRID_TRAVEL_LAST); - m_aNewBtn.SetHelpId(HID_GRID_TRAVEL_NEW); - m_aAbsolute.SetHelpId(HID_GRID_TRAVEL_ABSOLUTE); - m_aRecordCount.SetHelpId(HID_GRID_NUMBEROFRECORDS); + // FIXME: HELPID + m_aFirstBtn.SetHelpId(""/*HID_GRID_TRAVEL_FIRST*/); + // FIXME: HELPID + m_aPrevBtn.SetHelpId(""/*HID_GRID_TRAVEL_PREV*/); + // FIXME: HELPID + m_aNextBtn.SetHelpId(""/*HID_GRID_TRAVEL_NEXT*/); + // FIXME: HELPID + m_aLastBtn.SetHelpId(""/*HID_GRID_TRAVEL_LAST*/); + // FIXME: HELPID + m_aNewBtn.SetHelpId(""/*HID_GRID_TRAVEL_NEW*/); + // FIXME: HELPID + m_aAbsolute.SetHelpId(""/*HID_GRID_TRAVEL_ABSOLUTE*/); + // FIXME: HELPID + m_aRecordCount.SetHelpId(""/*HID_GRID_NUMBEROFRECORDS*/); // Handler fuer Buttons einrichten m_aFirstBtn.SetClickHdl(LINK(this,NavigationBar,OnClick)); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index e02e8664c6ac..e3425c00b130 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2388,7 +2388,8 @@ namespace svxform { DBG_CTOR(DataNavigator,NULL); - SetHelpId( HID_DATA_NAVIGATOR_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_DATA_NAVIGATOR_WIN*/ ); SetText( SVX_RES( RID_STR_DATANAVIGATOR ) ); Size aSize = m_aDataWin.GetOutputSizePixel(); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9d1b65208fdf..c985c34f12f1 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1168,7 +1168,8 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent ) ,m_aTimerCounter( 0 ) ,m_aDropActionType( DA_SCROLLUP ) { - SetHelpId( HID_FILTER_NAVIGATOR ); + // FIXME: HELPID + SetHelpId( ""/*HID_FILTER_NAVIGATOR*/ ); { { @@ -1941,7 +1942,8 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) ,SfxControllerItem( SID_FM_FILTER_NAVIGATOR_CONTROL, *_pBindings ) { - SetHelpId( HID_FILTER_NAVIGATOR_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_FILTER_NAVIGATOR_WIN*/ ); m_pNavigator = new FmFilterNavigator( this ); m_pNavigator->Show(); diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index bcc275896410..939253dec5bb 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -223,7 +223,8 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding ::Size aPropWinSize(STD_WIN_SIZE_X,STD_WIN_SIZE_Y); SetMinOutputSizePixel(::Size(STD_MIN_SIZE_X,STD_MIN_SIZE_Y)); SetOutputSizePixel(aPropWinSize); - SetUniqueId(UID_FORMPROPBROWSER_FRAME); + // FIXME: HELPID + SetUniqueId(""/*UID_FORMPROPBROWSER_FRAME*/); try { diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index c27b5b69d075..a2e1469418f0 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -592,7 +592,8 @@ namespace svxform ,SfxControllerItem( SID_FM_FMEXPLORER_CONTROL, *_pBindings ) { DBG_CTOR(NavigatorFrame,NULL); - SetHelpId( HID_FORM_NAVIGATOR_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_FORM_NAVIGATOR_WIN*/ ); m_pNavigatorTree = new NavigatorTree(comphelper::getProcessServiceFactory(), this ); m_pNavigatorTree->Show(); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 0c83655042d2..5e37d88126c3 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -200,7 +200,8 @@ namespace svxform ,m_bKeyboardCut( sal_False ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NavigatorTree" ); - SetHelpId( HID_FORM_NAVIGATOR ); + // FIXME: HELPID + SetHelpId( ""/*HID_FORM_NAVIGATOR*/ ); m_aNavigatorImages = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); m_aNavigatorImagesHC = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 7a51348dfaa3..1a87a06010e1 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -104,7 +104,8 @@ FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent ) ,pTabWin( pParent ) { DBG_CTOR(FmFieldWinListBox,NULL); - SetHelpId( HID_FIELD_SEL ); + // FIXME: HELPID + SetHelpId( ""/*HID_FIELD_SEL*/ ); SetHighlightRange( ); } @@ -192,7 +193,8 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _ ,m_pChangeListener(NULL) { DBG_CTOR(FmFieldWin,NULL); - SetHelpId( HID_FIELD_SEL_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_FIELD_SEL_WIN*/ ); SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) ); pListBox = new FmFieldWinListBox( this ); diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index f275fd9efd72..85babb34a1a7 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -318,7 +318,8 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) { SvxFmAbsRecWin* pWin = new SvxFmAbsRecWin( pParent, this ); - pWin->SetUniqueId( UID_ABSOLUTE_RECORD_WINDOW ); + // FIXME: HELPID + pWin->SetUniqueId( ""/*UID_ABSOLUTE_RECORD_WINDOW*/ ); return pWin; } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index ccbcd40862de..29c38653b4ac 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -152,7 +152,8 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, { StartListening( *mpGallery ); - maNewTheme.SetHelpId( HID_GALLERY_NEWTHEME ); + // FIXME: HELPID + maNewTheme.SetHelpId( ""/*HID_GALLERY_NEWTHEME*/ ); maNewTheme.SetText( String( GAL_RESID( RID_SVXSTR_GALLERY_CREATETHEME ) ) ); maNewTheme.SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) ); @@ -160,7 +161,8 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, if( mpGallery->GetUserURL().GetProtocol() == INET_PROT_NOT_VALID ) maNewTheme.Disable(); - mpThemes->SetHelpId( HID_GALLERY_THEMELIST ); + // FIXME: HELPID + mpThemes->SetHelpId( ""/*HID_GALLERY_THEMELIST*/ ); mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) ); for( ULONG i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ ) diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 0483a1bc1425..ae1fc2f0e086 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -325,12 +325,14 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, maViewBox.InsertItem( TBX_ID_ICON, aDummyImage ); maViewBox.SetItemBits( TBX_ID_ICON, TIB_RADIOCHECK | TIB_AUTOCHECK ); - maViewBox.SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW ); + // FIXME: HELPID + maViewBox.SetHelpId( TBX_ID_ICON, ""/*HID_GALLERY_ICONVIEW*/ ); maViewBox.SetQuickHelpText( TBX_ID_ICON, String( GAL_RESID( RID_SVXSTR_GALLERY_ICONVIEW ) ) ); maViewBox.InsertItem( TBX_ID_LIST, aDummyImage ); maViewBox.SetItemBits( TBX_ID_LIST, TIB_RADIOCHECK | TIB_AUTOCHECK ); - maViewBox.SetHelpId( TBX_ID_LIST, HID_GALLERY_LISTVIEW ); + // FIXME: HELPID + maViewBox.SetHelpId( TBX_ID_LIST, ""/*HID_GALLERY_LISTVIEW*/ ); maViewBox.SetQuickHelpText( TBX_ID_LIST, String( GAL_RESID( RID_SVXSTR_GALLERY_LISTVIEW ) ) ); maViewBox.SetBorder( 0, 1 ); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 8022cecc0fbe..ccfb931f2d29 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -61,7 +61,8 @@ GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme ) DragSourceHelper( this ), mpTheme( pTheme ) { - SetHelpId( HID_GALLERY_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); InitSettings(); } @@ -73,7 +74,8 @@ GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) : DragSourceHelper( this ), mpTheme( NULL ) { - SetHelpId( HID_GALLERY_PREVIEW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_PREVIEW*/ ); InitSettings(); } @@ -309,7 +311,8 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme { EnableFullItemMode( FALSE ); - SetHelpId( HID_GALLERY_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); InitSettings(); SetExtraSpacing( 2 ); SetItemWidth( S_THUMB + 6 ); @@ -475,7 +478,8 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme mnCurRow( 0 ), mbInit( FALSE ) { - SetHelpId( HID_GALLERY_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); InitSettings(); diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 241ffeb8bc36..676c8b0dc842 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -57,7 +57,8 @@ SvxInsertStatusBarControl::SvxInsertStatusBarControl( USHORT _nSlotId, SfxStatusBarControl( _nSlotId, _nId, rStb ), bInsert( TRUE ) { - rStb.SetHelpId( _nId, _nSlotId ); + // FIXME: HELPID + rStb.SetHelpId( _nId, ""/*_nSlotId*/ ); } // ----------------------------------------------------------------------- diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index edb72ab05eac..fbcb925fd579 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -233,7 +233,8 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, // da Kombi-Controller, immer die aktuelle Id als HelpId setzen // gecachten HelpText vorher l"oschen GetStatusBar().SetHelpText( GetId(), String() ); - GetStatusBar().SetHelpId( GetId(), nSID ); + // FIXME: HELPID + GetStatusBar().SetHelpId( GetId(), ""/*nSID*/ ); if ( nSID == SID_PSZ_FUNCTION ) { diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 06d1e9642b9e..130817432e7f 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -111,7 +111,8 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con { GetStatusBar().SetHelpText( GetId(), String() );// necessary ? - GetStatusBar().SetHelpId( GetId(), nSID ); // necessary ? + // FIXME: HELPID + GetStatusBar().SetHelpId( GetId(), ""/*nSID*/ ); // necessary ? if( SFX_ITEM_AVAILABLE != eState ) { diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index a4cab5f3ef16..c9374ab27fb6 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -111,7 +111,8 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( void ExtrusionDirectionWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_DIRECTION ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_DIRECTION*/ ); USHORT i; for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) @@ -124,12 +125,15 @@ void ExtrusionDirectionWindow::implInit() // mpProjectionForewarder = new SfxStatusForwarder( SID_EXTRUSION_PROJECTION, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_DIRECTION*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); mpDirectionSet = new ValueSet( mpMenu, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); - mpDirectionSet->SetHelpId( HID_VALUESET_EXTRUSION_DIRECTION ); + // FIXME: HELPID + mpDirectionSet->SetHelpId( ""/*HID_VALUESET_EXTRUSION_DIRECTION*/ ); - mpDirectionSet->SetHelpId( HID_POPUP_LINEEND_CTRL ); + // FIXME: HELPID + mpDirectionSet->SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); mpDirectionSet->SetColCount( 3 ); mpDirectionSet->EnableFullItemMode( FALSE ); @@ -501,13 +505,15 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( USHORT nId, void ExtrusionDepthWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_DEPTH ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_DEPTH*/ ); // mpDepthForewarder = new SfxStatusForwarder( SID_EXTRUSION_DEPTH, *this ); // mpMetricForewarder = new SfxStatusForwarder( SID_ATTR_METRIC, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_DEPTH ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_DEPTH*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); @@ -848,7 +854,8 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( void ExtrusionLightingWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_LIGHTING ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_LIGHTING*/ ); USHORT i; for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ ) @@ -868,13 +875,16 @@ void ExtrusionLightingWindow::implInit() // mpLightingIntensityForewarder = new SfxStatusForwarder( SID_EXTRUSION_LIGHTING_INTENSITY, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_LIGHTING ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_LIGHTING*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) ); mpLightingSet = new ValueSet( mpMenu, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); - mpLightingSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); + // FIXME: HELPID + mpLightingSet->SetHelpId( ""/*HID_VALUESET_EXTRUSION_LIGHTING*/ ); - mpLightingSet->SetHelpId( HID_POPUP_LINEEND_CTRL ); + // FIXME: HELPID + mpLightingSet->SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) ); mpLightingSet->SetColCount( 3 ); mpLightingSet->EnableFullItemMode( FALSE ); @@ -1226,14 +1236,16 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( void ExtrusionSurfaceWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_SURFACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_SURFACE*/ ); bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); // mpSurfaceForewarder = new SfxStatusForwarder( SID_EXTRUSION_SURFACE, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_SURFACE ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_SURFACE*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), bHighContrast ? maImgSurface1h : maImgSurface1 ); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 31c77e221d62..5a16fc41e90b 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -504,8 +504,10 @@ Window* SvxFillToolBoxControl::CreateItemWindow( Window *pParent ) pFillAttrLB = (SvxFillAttrBox*)pFillControl->pLbFillAttr; pFillTypeLB = (SvxFillTypeBox*)pFillControl->pLbFillType; - pFillAttrLB->SetUniqueId( HID_FILL_ATTR_LISTBOX ); - pFillTypeLB->SetUniqueId( HID_FILL_TYPE_LISTBOX ); + // FIXME: HELPID + pFillAttrLB->SetUniqueId( ""/*HID_FILL_ATTR_LISTBOX*/ ); + // FIXME: HELPID + pFillTypeLB->SetUniqueId( ""/*HID_FILL_TYPE_LISTBOX */); return pFillControl; } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 1b4f89ca1e8c..dbd815ae3d14 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -361,7 +361,8 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_ALIGN ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_ALIGN*/ ); implInit(); } @@ -386,18 +387,21 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_ALIGN ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_ALIGN*/ ); implInit(); } void FontWorkAlignmentWindow::implInit() { - SetHelpId( HID_POPUP_FONTWORK_ALIGN ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_FONTWORK_ALIGN*/ ); bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_POPUP_FONTWORK_ALIGN ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_POPUP_FONTWORK_ALIGN*/ ); mpMenu->SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 ); @@ -610,7 +614,8 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_CHARSPACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_CHARSPACE*/ ); implInit(); } @@ -626,18 +631,21 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_CHARSPACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_CHARSPACE*/ ); implInit(); } void FontWorkCharacterSpacingWindow::implInit() { - SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_FONTWORK_CHARSPACE*/ ); // bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_POPUP_FONTWORK_CHARSPACE*/ ); mpMenu->SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK ); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index fa5ddd579dee..f73e9b756ccf 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -353,8 +353,9 @@ ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OU maImage.Show(); - maField.SetHelpId( nSlotId ); - maField.SetSmartHelpId( SmartId( rCmd )); + // FIXME: HELPID + // maField.SetHelpId( nSlotId ); + maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); maField.Show(); } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 6deab3eca30b..f3e208f3e6ce 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -423,8 +423,10 @@ void SvxLineEndWindow::implInit() SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = NULL; - SetHelpId( HID_POPUP_LINEEND ); - aLineEndSet.SetHelpId( HID_POPUP_LINEEND_CTRL ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_LINEEND*/ ); + // FIXME: HELPID + aLineEndSet.SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); if ( pDocSh ) { diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 5c99e84e6a47..6b5998a3f1b9 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -905,8 +905,10 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, lcl_CalcSizeValueSet( *this, aColorSet, aSize12 ); - SetHelpId( HID_POPUP_COLOR ); - aColorSet.SetHelpId( HID_POPUP_COLOR_CTRL ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_COLOR*/ ); + // FIXME: HELPID + aColorSet.SetHelpId( ""/*HID_POPUP_COLOR_CTRL*/ ); SetText( rWndTitle ); aColorSet.Show(); @@ -1090,7 +1092,8 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& lcl_CalcSizeValueSet( *this, aFrameSet,Size( 20, 20 )); - SetHelpId( HID_POPUP_FRAME ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_FRAME*/ ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME) ); aFrameSet.Show(); } @@ -1350,7 +1353,8 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r lcl_CalcSizeValueSet( *this, aLineSet, aBmpSize ); - SetHelpId( HID_POPUP_LINE ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_LINE*/ ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME_STYLE) ); aLineSet.Show(); } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index dda324cb98d1..97bcf74e6c10 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -485,13 +485,18 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) { FreeResource(); - m_aRB_To_Simplified.SetHelpId( HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED ); - m_aRB_To_Traditional.SetHelpId( HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL ); + // FIXME: HELPID + m_aRB_To_Simplified.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED*/ ); + // FIXME: HELPID + m_aRB_To_Traditional.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL*/ ); - m_aCB_Reverse.SetHelpId( HID_SVX_CHINESE_DICTIONARY_CB_REVERSE ); + // FIXME: HELPID + m_aCB_Reverse.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_CB_REVERSE*/ ); - m_aCT_DictionaryToSimplified.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED ); - m_aCT_DictionaryToTraditional.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL ); + // FIXME: HELPID + m_aCT_DictionaryToSimplified.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED*/ ); + // FIXME: HELPID + m_aCT_DictionaryToTraditional.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL*/ ); SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); @@ -578,7 +583,8 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) m_pHeaderBar = m_aCT_DictionaryToSimplified.createHeaderBar( aColumn1, aColumn2, aColumn3, nWidth1, nWidth2, nWidth3 ); if(m_pHeaderBar) - m_pHeaderBar->SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_HEADER ); + // FIXME: HELPID + m_pHeaderBar->SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_HEADER*/ ); long pTabs[] = { 3, 0, nWidth1, nWidth1 + nWidth2 }; m_aCT_DictionaryToSimplified.SetTabs( &pTabs[0], MAP_PIXEL ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 213ddc22bace..a2f308248224 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -72,9 +72,12 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) { FreeResource(); - m_aRB_To_Simplified.SetHelpId( HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED ); - m_aRB_To_Traditional.SetHelpId( HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL ); - m_aCB_Use_Variants.SetHelpId( HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS ); + // FIXME: HELPID + m_aRB_To_Simplified.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED*/ ); + // FIXME: HELPID + m_aRB_To_Traditional.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL*/ ); + // FIXME: HELPID + m_aCB_Use_Variants.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS*/ ); SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); -- cgit v1.2.3 From f8a801d058e39e89a71c85afdb0b1c1718f36b45 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 20:20:37 +0200 Subject: fix windows compile --- sfx2/inc/sfxhelp.hxx | 4 +++- sfx2/source/appl/sfxhelp.cxx | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'sfx2') diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx index 6a87729e30e3..b19f78c6184b 100644 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfxhelp.hxx @@ -48,7 +48,8 @@ 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 ); - SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); + // FIXME: HELPID + // SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); SAL_DLLPRIVATE String GetHelpModuleName_Impl(); // FIXME: HELPID @@ -69,6 +70,7 @@ public: // 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 String GetDefaultHelpModule(); static ::rtl::OUString GetCurrentModuleIdentifier(); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index cd2f6b189fd1..9c246c592b82 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -974,11 +974,18 @@ String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleN void SfxHelp::OpenHelpAgent( SfxFrame*, ULONG nHelpId ) { +// FIXME HELPID +#if 0 SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); if ( pHelp ) pHelp->OpenHelpAgent( nHelpId ); +#else +(void)nHelpId; +#endif } +// FIXME: HELPID +#if 0 void SfxHelp::OpenHelpAgent( ULONG nHelpId ) { if ( SvtHelpOptions().IsHelpAgentAutoStartMode() ) @@ -1023,6 +1030,7 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId ) // } } } +#endif String SfxHelp::GetDefaultHelpModule() { -- cgit v1.2.3 From f24b1da07ebfbc95e76af93fc9c7133f7d52daa5 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 'sfx2') diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc index 2d7ccd764762..902230466053 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 781f2b7d290d..a71b5268abd7 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 c66f88817fe3..caab783c6a7c 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 14d174beec80..553eea6196c1 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 fa61c437e1ba..2d0733dfbae3 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 3e5db094d032..2e02a90f59fd 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 9e837f235db1..50992eb07a97 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 2619c4398881..1dfae71768b3 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 3169386db192..48ee2abc71ca 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 204f97842bf9..4b6a745c4415 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 35c51b82d1fe..766023a0038c 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 3e875e0b0fdc..42d7816199c7 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 110b1dfd2470..8dd3a95ae067 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 780f95f8fdb5..0db3492a9519 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 0039b66b4ae2..c12501f61103 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 ff51f806b734..796f46752411 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 3adbd95d9fd1..1d71b40919eb 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -50,7 +50,7 @@ namespace formula virtual void fillVisibleArgumentMapping(::std::vector& ) const {} virtual void initArgumentInfo() const {} virtual ::rtl::OUString getSignature() const { return ::rtl::OUString(); } - virtual long getHelpId() const { return 0; } + virtual rtl::OString getHelpId() const { return ""; } virtual sal_uInt32 getParameterCount() const { return 0; } virtual ::rtl::OUString getParameterName(sal_uInt32 ) const { return ::rtl::OUString(); } virtual ::rtl::OUString getParameterDescription(sal_uInt32 ) const { return ::rtl::OUString(); } diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 8255aae371da..0a971e94e5b6 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -226,14 +226,10 @@ namespace formula FormulaHelper m_aFormulaHelper; - // FIXME: HELPID rtl::OString m_aEditHelpId; - // FIXME: HELPID rtl::OString aOldHelp; - // FIXME: HELPID rtl::OString aOldUnique; - // FIXME: HELPID rtl::OString aActivWinId; BOOL bIsShutDown; @@ -334,9 +330,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage); aTabCtrl.SetTabPage( TP_STRUCT, pStructPage); - // FIXME: HELPID aOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1" - // FIXME: HELPID aOldUnique = pParent->GetUniqueId(); aFtResult.Show( _bSupportResult ); @@ -414,7 +408,6 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) if(pWin!=NULL) { aActivWinId = pWin->GetUniqueId(); - // FIXME: HELPID if(aActivWinId.getLength()==0) { Window* pParent=pWin->GetParent(); @@ -422,14 +415,12 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) { aActivWinId=pParent->GetUniqueId(); - // FIXME: HELPID if(aActivWinId.getLength()!=0) break; pParent=pParent->GetParent(); } } - // FIXME: HELPID - if(aActivWinId!=0) + if(aActivWinId.getLength()) { FormEditData* pData = m_pHelper->getFormEditData(); @@ -833,9 +824,7 @@ void FormulaDlg_Impl::FillListboxes() aNewTitle = aTitle1; // HelpId fuer 1. Seite ist die aus der Resource - // FIXME: HELPID m_pParent->SetHelpId( aOldHelp ); - // FIXME: HELPID m_pParent->SetUniqueId( aOldUnique ); } // ----------------------------------------------------------------------------- @@ -872,12 +861,9 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) aFtEditName.SetText( pFuncDesc->getFunctionName() ); aFtEditName.Show(); pParaWin->Show(); - // FIXME: HELPID - #if 0 - const long nHelpId = pFuncDesc->getHelpId(); - if ( nHelpId ) - pMEdit->SetSmartHelpId(SmartId(nHelpId)); - #endif + const rtl::OString aHelpId = pFuncDesc->getHelpId(); + if ( aHelpId.getLength() ) + pMEdit->SetHelpId(aHelpId); } xub_StrLen nOldStart, nOldEnd; @@ -933,7 +919,6 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) else { aFtEditName.SetText(String()); - // FIXME: HELPID pMEdit->SetHelpId( m_aEditHelpId ); } // Test, ob vorne/hinten noch mehr Funktionen sind @@ -1809,7 +1794,6 @@ rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin) rtl::OString aUniqueId; if(pWin->HasFocus()) { - // FIXME: HELPID aUniqueId=pWin->GetUniqueId(); if(aUniqueId.getLength()==0) { @@ -1942,13 +1926,11 @@ void FormulaModalDialog::RefInputDoneAfter( BOOL bForced ) rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin) { - // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { - // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2024,13 +2006,10 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, ,_pHelper,_pFunctionMgr,_pDlg)) { FreeResource(); - // FIXME: HELPID - #if 0 - if(GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId + if(!GetHelpId().getLength()) //Hack, da im SfxModelessDialog die HelpId SetHelpId(GetUniqueId()); //fuer einen ModelessDialog entfernt und //in eine UniqueId gewandelt wird, machen //wir das an dieser Stelle rueckgaengig. - #endif SetText(m_pImpl->aTitle1); } @@ -2102,13 +2081,11 @@ void FormulaDlg::RefInputDoneAfter( BOOL bForced ) rtl::OString FormulaDlg::FindFocusWin(Window *pWin) { - // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { - // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2178,7 +2155,6 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG ) if (pData) // wird nicht ueber Close zerstoert; { m_pImpl->m_pHelper->setReferenceInput(pData); - // FIXME: HELPID rtl::OString nUniqueId(pData->GetUniqueId()); SetFocusWin(this,nUniqueId); } diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index a66b4b2137af..1f8b64c7b4ba 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -190,18 +190,14 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb ) const IFunctionDescription* pDesc = GetFuncDesc( GetFunction() ); if ( pDesc ) { - // FIXME: HELPID - #if 0 - const long nHelpId = pDesc->getHelpId(); - if ( nHelpId ) - aLbFunction.SetSmartHelpId(SmartId(nHelpId)); - #endif + const rtl::OString sHelpId = pDesc->getHelpId(); + if ( sHelpId.getLength() ) + aLbFunction.SetHelpId(sHelpId); } aSelectionLink.Call(this); } else { - // FIXME: HELPID aLbFunction.SetHelpId(m_aHelpId); UpdateFunctionList(); } diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 4d7dc5739d0f..225114ff00aa 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -82,7 +82,6 @@ private: m_pFunctionManager; ::std::vector< TFunctionDesc > aLRUList; - // FIXME: HELPID rtl::OString m_aHelpId; diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index db8a4e136015..c4e28b3da8f1 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -758,9 +758,7 @@ EditBox::EditBox( Window* pParent, const ResId& rResId ) // #105582# the HelpId from the resource must be set for the MultiLineEdit, // not for the control that contains it. - // FIXME: HELPID pMEdit->SetHelpId( GetHelpId() ); - // FIXME: HELPID SetHelpId( "" ); } diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 9afa9fb20587..5e656aea0967 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -297,25 +297,19 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc) nArgs = pFuncDesc->getSuppressedArgumentCount(); pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping); aSlider.Hide(); - // FIXME: HELPID - #if 0 - long nHelpId = pFuncDesc->getHelpId(); - SetHelpId( nHelpId ); - aEdArg1.SetHelpId( nHelpId ); - aEdArg2.SetHelpId( nHelpId ); - aEdArg3.SetHelpId( nHelpId ); - aEdArg4.SetHelpId( nHelpId ); - #endif + rtl::OString sHelpId = pFuncDesc->getHelpId(); + SetHelpId( sHelpId ); + aEdArg1.SetHelpId( sHelpId ); + aEdArg2.SetHelpId( sHelpId ); + aEdArg3.SetHelpId( sHelpId ); + aEdArg4.SetHelpId( sHelpId ); // Unique-IDs muessen gleich bleiben fuer Automatisierung - // FIXME: HELPID - #if 0 - SetUniqueId( ""/*HID_FORMULA_FAP_PAGE*/ ); + SetUniqueId( HID_FORMULA_FAP_PAGE ); aEdArg1.SetUniqueId( HID_FORMULA_FAP_EDIT1 ); aEdArg2.SetUniqueId( HID_FORMULA_FAP_EDIT2 ); aEdArg3.SetUniqueId( HID_FORMULA_FAP_EDIT3 ); aEdArg4.SetUniqueId( HID_FORMULA_FAP_EDIT4 ); - #endif SetActiveLine(0); } else diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index c51a326477fa..1e34b2eee840 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 87df9e404b6a..c7a18050c3ff 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 9f5997a4089c..e27ec2cbe3bc 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 f40d5fcaaa2d..3f9068e65d26 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 d33ab0d7baad..5b9822af86e6 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 8016bbb620b8..12301f170f26 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 dcb0b57182df..5ffc014d1771 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 c8cf5249dd9a..13c5647341e6 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 8741fff39320..000000000000 --- 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 7be1516f1331..34579e903d6a 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 0a3295c1395e..58c1c8782f9e 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 d143b717366c..553026827524 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 ed506f5345e3..030a790b35e3 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 19625d5e198b..3cf90b1867f5 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 025ebea06a19..aca62a8b44ef 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 d3a616a76629..6ed3e7233a77 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 4b2535a7e61b..9509219eb99a 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 3508ea026637..fc7b318965b0 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 f0dd2248c456..8d99d6efd9f4 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 d17553e2b2d0..ac267c7c6d45 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 ee1c81daa603..98c282562354 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 efbc2d2c75af..10fbd222a2ed 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 0d11462685d5..a041f6687c62 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 000000000000..bdf27baac7b3 --- /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 d82abeefe8bc..f3d773f98afc 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 b19f78c6184b..608361a1e777 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 10a920852848..785eea211f4f 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 0858e66e7347..47750cd73f78 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 2abcdffe0169..decb3dd186f0 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 6b8dfe3a023c..9289920b8e09 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 a4d134df27fa..23fb100c7895 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 9c246c592b82..a18521e3a289 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& rM 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& rM 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 ) - { - aHelpURL = CreateHelpURL_Impl( rURL, GetHelpModuleName_Impl( ) ); - } - else + String aHelpModuleName( GetHelpModuleName_Impl() ); + aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName ); + if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) { - // 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 e66dd2c56eaf..444be02127b3 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 0aa4df6902ee..6b05c03160ff 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 1d1ef73ad8cf..73284dbd9806 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 d85a01870074..df1f13155513 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 f1e100e17cf5..78844d335f6a 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 a54d2c340d04..53e232a7c63c 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 8ad551278a27..499987f5ff3b 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 2785a38305cd..6512bac43b7e 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 b023b8fb53a9..bfd94595feee 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 b271d1e04dc7..d7f258e7ccb3 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 fa5fa62a2ee4..90ed1a139cbb 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 065b407c6769..3c7a58cd09f9 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 4777798aef2b..a3d9fd7b4ed2 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 a4adcd77b6d3..e5b4f1fd9cdf 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 838168e64526..7e8fd688af52 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 d17b62c9b52a..497d4ccd7c97 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 91d966fbd2d5..3192de44c19a 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 1d57e0b9c761..719dc5b8d223 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 2c9975de9bb8..d9ef886f59bb 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 3ad0cc51a923..f7df58ffd397 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 3b1ebde3f1ae..d3235b1c7a7f 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 146f9f630570..63c9f49110dd 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 e73594af1e10..2e5968d83077 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 a254deb24c52..3e6a529bc67e 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 29ad461d18da..86353e4ca968 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 97c9c7f640fa..0f9501e8502a 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 9137abd04764..c76f47345979 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 e3d694eae747..48ff6a3948c5 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 defccd4e23be..9b5fbd2d5d4e 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 fc26d0077161..f5b38d5a8a18 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 fea860f6a3ff..ef2574c0d574 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 ab9aa9f8ce1b..6c4787cd1fbc 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 e328a39a0707..252bdc69623e 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 6d9153818cde..63687550dd12 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 d193652b57fc..e1b785cf3bee 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 68cd1b224650..4d885e422b70 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 c409ed5b63be..e24dedbdc22c 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 000000000000..54376da62e7b --- /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 df11041b38a8..983a048a4ff7 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 7d2f508d9d21..24dfe87f78e4 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 445a46025dd0..e65ce8c119aa 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 124f7fdd2910..503814823467 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 6437b193a793..95c27a5dcec8 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 b0c63d9313d4..c6239dc5ef09 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 abefc7832d8b..c59a2f8eb52a 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 5f3aa24394a3..8e717b309151 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 52c91d17587d..a724edbe28bb 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 b3e8992f4338..3e80dc9fe485 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 fe6a2372b7a0..9d596d529774 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 2c63880afd05..8cc52e4c0b7d 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 e974f5b28b1a..60e43a19f41e 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 e3425c00b130..e02e8664c6ac 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 c985c34f12f1..9d1b65208fdf 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 82b74e84331c..c03e90df7130 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 939253dec5bb..bcc275896410 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 a2e1469418f0..c27b5b69d075 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 17881727cd5f..d1d8001eeec0 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 5a7e25e14f13..b36590354b17 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 5e37d88126c3..0c83655042d2 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 1a87a06010e1..7a51348dfaa3 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 85babb34a1a7..f275fd9efd72 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 29c38653b4ac..ccbcd40862de 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 ae1fc2f0e086..0483a1bc1425 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 ccfb931f2d29..8022cecc0fbe 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 fae88c0db251..81ab0f1ac6d9 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 676c8b0dc842..2ca1c5b5cfdd 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 fbcb925fd579..e980ece5c8b6 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 3df835510ed6..92d8f7ad0746 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 c9374ab27fb6..a4cab5f3ef16 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 5a16fc41e90b..31c77e221d62 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 dbd815ae3d14..1b4f89ca1e8c 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 aae0bd4fc12b..849d495e214e 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 f3e208f3e6ce..6deab3eca30b 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 47da008e87a3..8abfa24938f9 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 6b5998a3f1b9..5c99e84e6a47 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 0641ff39e1bf..000000000000 --- 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 3e6c6ad7e5cb..dd6f3066a51e 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 79279b3432db..a7bdd2cccada 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 97bcf74e6c10..dda324cb98d1 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 a2f308248224..213ddc22bace 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 9bf5856bc270..a75cd02b17b8 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 f63122a36c49fddb002aa366c656baace37c25d8 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 15 Jul 2010 15:24:55 +0200 Subject: CWS changehid: #i111874#: remove unnecessary HelpIds --- sfx2/util/hidother.src | 1 - 1 file changed, 1 deletion(-) (limited to 'sfx2') diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src index 38e5577a72be..262bfdf4639d 100644 --- a/sfx2/util/hidother.src +++ b/sfx2/util/hidother.src @@ -159,7 +159,6 @@ hidspecial HID_HELP_TOOLBOXITEM_PRINT { HelpID = HID_HELP_TOOLBOXITEM_ hidspecial HID_HELP_TOOLBOXITEM_BOOKMARKS { HelpID = HID_HELP_TOOLBOXITEM_BOOKMARKS; }; hidspecial HID_HELP_TOOLBOXITEM_SEARCHDIALOG { HelpID = HID_HELP_TOOLBOXITEM_SEARCHDIALOG; }; hidspecial HID_TBXCONTROL_FILENEW { HelpID = HID_TBXCONTROL_FILENEW; }; -hidspecial HID_GLOBAL_FALLBACK { HelpID = HID_GLOBAL_FALLBACK; }; hidspecial HID_CLOSE_WARNING { HelpID = HID_CLOSE_WARNING; }; hidspecial HID_DID_SAVE_PACKED_XML { HelpID = HID_DID_SAVE_PACKED_XML; }; hidspecial HID_HELP_ONHELP { HelpID = HID_HELP_ONHELP; }; -- cgit v1.2.3 From fc36d6a80a11f89c6a155f737e6a42665c039564 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 'sfx2') diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc index 902230466053..4b1d2e04d628 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 1dfae71768b3..d96b12196342 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 4b6a745c4415..6d6c4822b037 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 796f46752411..5502c4370d58 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 8cf49660e919..09a79b694e87 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 3f9068e65d26..b5cd1f6a4ac1 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 d15a8b0f9962..c9054643fc11 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 262bfdf4639d..ccce4820cf2f 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_ARRA 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 6c4787cd1fbc..1222145655c1 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 21912fdc2829..be75fe019f96 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 4d885e422b70..360a4914c10e 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 dd566cf9abdc..e3c1f72cce4d 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 61fbf48ab38bb3b3a6cc41de3435f327ccccf830 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 22:04:23 +0200 Subject: CWS changehid: remove code dealing with obsolete SID_INSERT_APPLET --- sfx2/inc/sfx2/sfxsids.hrc | 1 - sfx2/source/appl/appcfg.cxx | 18 --- sfx2/source/appl/appuno.cxx | 1 - sfx2/source/doc/applet.cxx | 383 -------------------------------------------- sfx2/source/doc/makefile.mk | 2 - sfx2/source/inc/applet.hxx | 122 -------------- svx/inc/globlmn_tmpl.hrc | 12 -- svx/sdi/svx.sdi | 27 ---- 8 files changed, 566 deletions(-) delete mode 100644 sfx2/source/doc/applet.cxx delete mode 100644 sfx2/source/inc/applet.hxx (limited to 'sfx2') diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 26e1991c24b8..9ab4a50b63d8 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -421,7 +421,6 @@ #define SID_INSERT_PLUGIN (SID_SFX_START + 672) #define SID_INSERT_SOUND (SID_SFX_START + 676) #define SID_INSERT_VIDEO (SID_SFX_START + 677) -#define SID_INSERT_APPLET (SID_SFX_START + 673) #define SID_HYPERLINK_DIALOG (SID_SFX_START + 678) diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 6afa8c68ed83..0b5e94ea24f0 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -58,8 +58,6 @@ #include #include -//#include -//#include #include #include @@ -828,22 +826,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) #endif } - // INet Session neu aufsetzen - if ( bResetSession ) - { - // no more sj2 - #if 0 - try - { - SjApplet2::settingsChanged(); - } - catch ( ... ) - { - DBG_ERRORFILE( "SjApplet2::settingsChanged() throws an exception" ); - } - #endif - } - // geaenderte Daten speichern aInetOptions.flush(); } diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 6f9d3b258745..a9c6bd5630ae 100755 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -134,7 +134,6 @@ using namespace ::com::sun::star::io; #include "brokenpackageint.hxx" #include "eventsupplier.hxx" #include "xpackcreator.hxx" -// #include "applet.hxx" #include "plugin.hxx" #include "iframe.hxx" #include diff --git a/sfx2/source/doc/applet.cxx b/sfx2/source/doc/applet.cxx deleted file mode 100644 index 844eb5726b1a..000000000000 --- a/sfx2/source/doc/applet.cxx +++ /dev/null @@ -1,383 +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" - -#include "applet.hxx" -#include -#include - -#include "com/sun/star/uno/XComponentContext.hpp" -#include "cppuhelper/factory.hxx" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace ::com::sun::star; -using namespace ::comphelper; - -namespace sfx2 -{ -class AppletWindow_Impl : public SystemChildWindow -{ -public: - SjApplet2* pApplet; - AppletWindow_Impl( Window* pParent, SjApplet2* pApp ) - : SystemChildWindow( pParent, WB_CLIPCHILDREN ) - , pApplet(pApp) - {} - - virtual void Resize(); -}; - -void AppletWindow_Impl::Resize() -{ - Size aSize( GetOutputSizePixel() ); - if ( pApplet ) - pApplet->setSizePixel( aSize ); -} - -class AppletWrapper_Impl : public SjApplet2 -{ - virtual void appletResize( const Size & ); - virtual void showDocument( const INetURLObject &, const XubString & ); - virtual void showStatus( const XubString & ); -}; - -void AppletWrapper_Impl::appletResize( const Size & ) {} -void AppletWrapper_Impl::showDocument( const INetURLObject &, const XubString & ) {} -void AppletWrapper_Impl::showStatus( const XubString & ) {} - -#define PROPERTY_UNBOUND 0 -#define PROPERTY_MAYBEVOID ::com::sun::star::beans::PropertyAttribute::MAYBEVOID - -#define WID_APPLET_CODE 1 -#define WID_APPLET_CODEBASE 2 -#define WID_APPLET_COMMANDS 3 -#define WID_APPLET_DOCBASE 4 -#define WID_APPLET_ISSCRIPT 5 -#define WID_APPLET_NAME 6 -const SfxItemPropertyMapEntry* lcl_GetAppletPropertyMap_Impl() -{ - static SfxItemPropertyMapEntry aAppletPropertyMap_Impl[] = - { - { MAP_CHAR_LEN("AppletCode") , WID_APPLET_CODE , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("AppletCodeBase"), WID_APPLET_CODEBASE , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("AppletCommands"), WID_APPLET_COMMANDS , CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("AppletDocBase"), WID_APPLET_DOCBASE , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("AppletIsScript"), WID_APPLET_ISSCRIPT , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("AppletName") , WID_APPLET_NAME , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 }, - {0,0,0,0,0,0} - }; -return aAppletPropertyMap_Impl; -} - -::rtl::OUString AppletObject::getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ) -{ - return impl_getStaticImplementationName(); -} - -::sal_Bool AppletObject::supportsService( const ::rtl::OUString& sServiceName ) - throw( ::com::sun::star::uno::RuntimeException ) -{ - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames = - getSupportedServiceNames(); - const ::rtl::OUString* pArray = seqServiceNames.getConstArray(); - for ( ::sal_Int32 nCounter=0; nCounter -AppletObject::getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ) -{ - return impl_getStaticSupportedServiceNames(); -} - -::com::sun::star::uno::Sequence< ::rtl::OUString > -AppletObject::impl_getStaticSupportedServiceNames() -{ - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 ); - seqServiceNames.getArray() [0] = ::rtl::OUString::createFromAscii( - "com.sun.star.embed.SpecialEmbeddedObject" ); - return seqServiceNames ; -} - -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > -AppletObject::impl_createInstance( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ) - throw( ::com::sun::star::uno::Exception ) -{ - return static_cast< ::cppu::OWeakObject * >( new AppletObject( xContext ) ); -} - -::rtl::OUString AppletObject::impl_getStaticImplementationName() -{ - return ::rtl::OUString::createFromAscii( - "com.sun.star.comp.sfx2.AppletObject" ); -} - -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > -AppletObject::impl_createFactory() -{ - return uno::Reference< uno::XInterface >( - cppu::createSingleComponentFactory( - impl_createInstance, impl_getStaticImplementationName(), - impl_getStaticSupportedServiceNames() ), - uno::UNO_QUERY_THROW ); -} - -AppletObject::AppletObject( - const uno::Reference < uno::XComponentContext >& rContext ) - : mxContext( rContext ) - , maPropMap( lcl_GetAppletPropertyMap_Impl() ) - , mpApplet( NULL ) - , mbMayScript( FALSE ) -{ -} - -AppletObject::~AppletObject() -{ -} - -void SAL_CALL AppletObject::initialize( const uno::Sequence< uno::Any >& aArguments ) throw ( uno::Exception, uno::RuntimeException ) -{ - if ( aArguments.getLength() ) - aArguments[0] >>= mxObj; -} - -sal_Bool SAL_CALL AppletObject::load( - const uno::Sequence < com::sun::star::beans::PropertyValue >& /*lDescriptor*/, - const uno::Reference < frame::XFrame >& xFrame ) -throw( uno::RuntimeException ) -{ - if ( SvtJavaOptions().IsExecuteApplets() && SvtMiscOptions().IsPluginsEnabled() ) - { - mpApplet = new AppletWrapper_Impl; - - Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); - Window* pWin = new AppletWindow_Impl( pParent, mpApplet ); - pWin->SetBackground(); - pWin->Show(); - - // aCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "width" ) ), String( aPosSize.GetWidth() ) ); - // aCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "height" ) ), String( aPosSize.GetHeight() ) ); - - if( maName.getLength() ) - maCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "name" ) ), maName ); - - if( maCodeBase.getLength() ) - { - for ( sal_uInt32 nParams=0; nParamsInit( mxContext, pWin, aDocBase, maCmdList ); - uno::Reference < awt::XWindow > xWindow( pWin->GetComponentInterface(), uno::UNO_QUERY ); - - // we must destroy the applet before the parent is destroyed - xWindow->addEventListener( this ); - - xFrame->setComponent( xWindow, uno::Reference < frame::XController >() ); - return TRUE; - } - - return FALSE; -} - -void SAL_CALL AppletObject::cancel() throw( com::sun::star::uno::RuntimeException ) -{ - if ( mpApplet ) - { - mpApplet->appletClose(); // reparenting window - DELETEZ( mpApplet ); - } -} - -void SAL_CALL AppletObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::disposing( const com::sun::star::lang::EventObject& ) throw (com::sun::star::uno::RuntimeException) -{ - cancel(); -} - -uno::Reference< beans::XPropertySetInfo > SAL_CALL AppletObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ) -{ - static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( &maPropMap ); - return xInfo; -} - -void SAL_CALL AppletObject::setPropertyValue(const ::rtl::OUString& aPropertyName, const uno::Any& aAny) - throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) -{ - - const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); - if( !pEntry ) - throw beans::UnknownPropertyException(); - switch( pEntry->nWID ) - { - case WID_APPLET_CODE : - aAny >>= maClass; - break; - case WID_APPLET_CODEBASE : - //pImpl->aCodeBase = rURL.GetMainURL( INetURLObject::NO_DECODE ); - //if( rURL.GetProtocol() == INET_PROT_FILE - // && pImpl->aCodeBase.GetChar( 9 ) == INET_ENC_DELIM_TOKEN ) - // // Laufwerksbuchstabe auf ':' patchen - // pImpl->aCodeBase.SetChar( 9, INET_DELIM_TOKEN ); - - aAny >>= maCodeBase; - break; - case WID_APPLET_COMMANDS : - { - maCmdList.Clear(); - uno::Sequence < beans::PropertyValue > aCommandSequence; - if( aAny >>= aCommandSequence ) - maCmdList.FillFromSequence( aCommandSequence ); - } - break; - case WID_APPLET_DOCBASE : - aAny >>= maDocBase; - break; - case WID_APPLET_ISSCRIPT : - aAny >>= mbMayScript; - break; - case WID_APPLET_NAME : - aAny >>= maName; - break; - default:; - - } -} - -uno::Any SAL_CALL AppletObject::getPropertyValue(const ::rtl::OUString& aPropertyName) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) -{ - uno::Any aAny; - const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); - if( !pEntry ) - throw beans::UnknownPropertyException(); - switch( pEntry->nWID ) - { - case WID_APPLET_CODE : - aAny <<= maClass; - break; - case WID_APPLET_CODEBASE : - aAny <<= maCodeBase; - break; - case WID_APPLET_COMMANDS : - { - uno::Sequence< beans::PropertyValue > aCommandSequence; - maCmdList.FillSequence( aCommandSequence ); - aAny <<= aCommandSequence; - } - break; - case WID_APPLET_DOCBASE : - break; - case WID_APPLET_ISSCRIPT : - aAny <<= mbMayScript; - break; - case WID_APPLET_NAME : - aAny <<= maName; - break; - default:; - - } - return aAny; -} - -void SAL_CALL AppletObject::addPropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::removePropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::addVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::removeVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) -{ -} - -::sal_Int16 SAL_CALL AppletObject::execute() throw (::com::sun::star::uno::RuntimeException) -{ - SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - uno::Reference < beans::XPropertySet > xSet( this ); - VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, SID_INSERT_APPLET, mxObj ); - if ( pDlg ) - pDlg->Execute(); - return 0; -} - -void SAL_CALL AppletObject::setTitle( const ::rtl::OUString& ) throw (::com::sun::star::uno::RuntimeException) -{ -} - -} diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk index b1bddf82e428..d663d34cf5ba 100644 --- a/sfx2/source/doc/makefile.mk +++ b/sfx2/source/doc/makefile.mk @@ -87,8 +87,6 @@ SLOFILES = \ $(SLO)$/syspath.obj \ $(SLO)$/syspathw32.obj -# $(SLO)$/applet.obj \ - .IF "$(GUI)" == "WNT" #HACK TO DISABLE PCH diff --git a/sfx2/source/inc/applet.hxx b/sfx2/source/inc/applet.hxx deleted file mode 100644 index 5b7d61ebe314..000000000000 --- a/sfx2/source/inc/applet.hxx +++ /dev/null @@ -1,122 +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. - * - ************************************************************************/ - -#ifndef _SFX_APPLET_HXX -#define _SFX_APPLET_HXX - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; - class XInterface; -} } } } - -class SjApplet2; -namespace sfx2 -{ - -class AppletObject : public ::cppu::WeakImplHelper6 < - com::sun::star::util::XCloseable, - com::sun::star::lang::XEventListener, - com::sun::star::frame::XSynchronousFrameLoader, - com::sun::star::ui::dialogs::XExecutableDialog, - com::sun::star::lang::XInitialization, - com::sun::star::beans::XPropertySet > -{ - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > - mxContext; - com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxObj; - SfxItemPropertyMap maPropMap; - SvCommandList maCmdList; - ::rtl::OUString maClass; - ::rtl::OUString maName; - ::rtl::OUString maCodeBase; - ::rtl::OUString maDocBase; - SjApplet2* mpApplet; - sal_Bool mbMayScript; - - AppletObject( AppletObject & ); // not defined - void operator =( AppletObject & ); // not defined - - AppletObject( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rContext ); - ~AppletObject(); - - virtual sal_Bool SAL_CALL load( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& lDescriptor, - const com::sun::star::uno::Reference < com::sun::star::frame::XFrame >& xFrame ) throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL cancel() throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - - virtual ::rtl::OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& sServiceName ) - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); - - static ::com::sun::star::uno::Sequence< ::rtl::OUString > - impl_getStaticSupportedServiceNames(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL impl_createInstance( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ) - throw( ::com::sun::star::uno::Exception ); - -public: - static ::rtl::OUString impl_getStaticImplementationName(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - impl_createFactory(); -}; - -} -#endif diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index b71e872ffd92..e86a684d93f2 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -601,17 +601,6 @@ Text [ en-US ] = "~Video..." ; \ }; -#ifdef SOLAR_JAVA -#define TMP_SID_INSERT_APPLET \ - MenuItem\ - {\ - Identifier = SID_INSERT_APPLET ; \ - Command = ".uno:InsertApplet" ; \ - Text [ en-US ] = "~Applet..." ; \ - }; -#else -#define TMP_SID_INSERT_APPLET -#endif #define ITEM_INSERT_OBJECT_MN \ MenuItem\ {\ @@ -631,7 +620,6 @@ TMP_SID_INSERT_PLUGIN\ TMP_SID_INSERT_SOUND\ TMP_SID_INSERT_VIDEO\ - TMP_SID_INSERT_APPLET\ MenuItem\ {\ Identifier = SID_INSERT_MATH ; \ diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 240ca9cbd4e1..87eb3062833b 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -6204,33 +6204,6 @@ SfxVoidItem PreviousAnnotation SID_PREVIOUS_POSTIT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- -SfxVoidItem InsertApplet SID_INSERT_APPLET -(SfxStringItem Class FN_PARAM_1, - SfxStringItem ClassLocation FN_PARAM_2, - SfxStringItem Commands FN_PARAM_3) -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INSERT; -] - //-------------------------------------------------------------------------- SfxUInt32Item InsertGalleryPic SID_GALLERY_FORMATS () -- cgit v1.2.3 From 6b7cfcf20984092bb9907083bcf089709d005da5 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 22:05:23 +0200 Subject: CWS changehid: #i111784#: SetDialogHelpId changed --- sfx2/inc/sfx2/filedlghelper.hxx | 2 +- sfx2/inc/sfx2/opengrf.hxx | 2 +- sfx2/source/appl/opengrf.cxx | 2 +- sfx2/source/dialog/filedlghelper.cxx | 4 ++-- sfx2/source/dialog/filedlgimpl.hxx | 2 +- svx/inc/pfiledlg.hxx | 2 +- svx/source/dialog/pfiledlg.cxx | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sfx2') diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index 392c5d47d3ca..e56aea052d18 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -282,7 +282,7 @@ public: a corresponding element herein. */ void SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); - void SetDialogHelpId( const sal_Int32 _nHelpId ); + 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 a041f6687c62..1c307111cdd0 100644 --- a/sfx2/inc/sfx2/opengrf.hxx +++ b/sfx2/inc/sfx2/opengrf.hxx @@ -57,7 +57,7 @@ public: /// Set dialog help id at FileDlgHelper void SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId ); /// Set control help ids at FileDlgHelper - void SetDialogHelpId( const INT32 _nHelpId ); + 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 23fb100c7895..d83e93157902 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -289,7 +289,7 @@ void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const ch mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId ); } -void SvxOpenGraphicDialog::SetDialogHelpId( const INT32 _nHelpId ) +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 870e521f3849..552dc8f11fc9 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1235,7 +1235,7 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::setDialogHelpId( sal_Int32 _nHelpId ) +void FileDialogHelper_Impl::setDialogHelpId( const rtl::OString& _nHelpId ) { svt::SetDialogHelpId( mxFileDlg, _nHelpId ); } @@ -2498,7 +2498,7 @@ void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const ch } // ------------------------------------------------------------------------ -void FileDialogHelper::SetDialogHelpId( const sal_Int32 _nHelpId ) +void FileDialogHelper::SetDialogHelpId( const rtl::OString& _nHelpId ) { mpImp->setDialogHelpId( _nHelpId ); } diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 5f4782e72bfb..30b516a84ac5 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -143,7 +143,7 @@ namespace sfx2 void correctVirtualDialogType(); void setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); - void setDialogHelpId( sal_Int32 nId ); + void setDialogHelpId( const rtl::OString& ); sal_Bool CheckFilterOptionsCapability( const SfxFilter* _pFilter ); diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/pfiledlg.hxx index 646575ac4e0c..694881920f8d 100644 --- a/svx/inc/pfiledlg.hxx +++ b/svx/inc/pfiledlg.hxx @@ -55,7 +55,7 @@ public: static bool IsAvailable (USHORT nKind); // setting HelpId and/or context of FileDialogHelper - void SetDialogHelpId( const sal_Int32 nHelpId ); + void SetDialogHelpId( const rtl::OString& nHelpId ); void SetContext( sfx2::FileDialogHelper::Context eNewContext ); }; diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index aa6e0b835e2c..f53ba885f2a0 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -274,7 +274,7 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind) return bFound; } -void SvxPluginFileDlg::SetDialogHelpId( const sal_Int32 _nHelpId ) +void SvxPluginFileDlg::SetDialogHelpId( const rtl::OString& _nHelpId ) { maFileDlg.SetDialogHelpId( _nHelpId ); } -- cgit v1.2.3 From db369db99b2f897b1a304a4c010dfd1998e2fa40 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 'sfx2') diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index d82ecc6cb6b5..9d432f73a731 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 7d33030ed2a9..50e99f2b590b 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 b43dba7d6673..1d4003fa44e6 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 e56aea052d18..619358f077ac 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 1c307111cdd0..df8ae09f90a3 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 d83e93157902..fd2043a9a431 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 552dc8f11fc9..874a430b6bda 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 30b516a84ac5..91190b575e1c 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 d684e3cf124a..3ef6a96bdaf4 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 95ed1449c846..b53064312a38 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 694881920f8d..93d99c4774a2 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 b4ee4dd2956f..1b77364b6c7e 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 f53ba885f2a0..af8d283185a6 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 9d596d529774..5a033cd77d44 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 e92515df270ea0d52e47d6922a83d968f6445b93 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 21 Jul 2010 17:46:37 +0200 Subject: CWS changehid: #i111784#: rework keyword search --- sfx2/inc/sfxhelp.hxx | 3 +- sfx2/source/appl/sfxhelp.cxx | 92 ++++++++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 38 deletions(-) (limited to 'sfx2') diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx index 608361a1e777..17589c7cd399 100644 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfxhelp.hxx @@ -45,9 +45,10 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: + SAL_DLLPRIVATE BOOL Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ); + SAL_DLLPRIVATE virtual BOOL SearchKeyword( const XubString& rKeyWord ); SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId ); - SAL_DLLPRIVATE String GetHelpModuleName_Impl(); SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index a18521e3a289..db3015824134 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -705,8 +705,17 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow return sHelpText; } +BOOL SfxHelp::SearchKeyword( const XubString& rKeyword ) +{ + return Start_Impl( String(), NULL, rKeyword ); +} BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) +{ + return Start_Impl( rURL, pWindow, String() ); +} + +BOOL SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ) { // check if help is available String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") ); @@ -720,54 +729,63 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) return FALSE; } - // check if it's an URL or a jump mark! - String aHelpURL(rURL ); - INetURLObject aParser (aHelpURL); - ::rtl::OUString sKeyword; + /* rURL may be + - a "real" URL + - a HelpID (formerly a long, now a string) + If rURL is a URL, CreateHelpURL should be called for this URL + If rURL is an arbitrary string, the same should happen, but the URL should be tried out + if it delivers real help content. In case only the Help Error Document is returned, the + parent of the window for that help was called, is asked for its HelpID. + For compatibility reasons this upward search is not implemented for "real" URLs. + Help keyword search now is implemented as own method; in former versions it + was done via Help::Start, but this implementation conflicted with the upward search. + */ + String aHelpURL; + INetURLObject aParser( rURL ); INetProtocol nProtocol = aParser.GetProtocol(); - if ( nProtocol != INET_PROT_VND_SUN_STAR_HELP ) + String aHelpModuleName( GetHelpModuleName_Impl() ); + switch ( nProtocol ) { - String aHelpModuleName( GetHelpModuleName_Impl() ); - aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName ); - if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) + case INET_PROT_NOT_VALID : { - // no help found -> try with parent help id. - Window* pParent = pWindow->GetParent(); - while ( pParent ) + // no URL, just a HelpID (maybe empty in case of keyword search) + aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName ); + if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) { - ByteString aHelpId = pParent->GetHelpId(); - aHelpURL = CreateHelpURL( String( aHelpId, RTL_TEXTENCODING_UTF8 ), aHelpModuleName ); - if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) - break; - else + // no help found -> try with parent help id. + Window* pParent = pWindow->GetParent(); + while ( pParent ) { - pParent = pParent->GetParent(); - if ( !pParent ) - // create help url of start page ( helpid == 0 -> start page) - aHelpURL = CreateHelpURL( String(), aHelpModuleName ); + 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 ); + } } } + break; } - - // 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 ); + case INET_PROT_VND_SUN_STAR_HELP: + // already a vnd.sun.star.help URL -> nothing to do + aHelpURL = rURL; + break; + default: + aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName ); + break; } Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); - // check if help is still open - // If not - create new one and return acces directly - // to the internal sub frame, which shows the help content. - - // Note further: We search for this sub frame here directly instead of - // the real top level help task ... It's needed to have the same - // sub frame available - so we can use it for loading (which is done - // in both cases)! - + // check if help window is still open + // If not, create a new one and return access directly to the internal sub frame showing the help content + // search must be done here; search one desktop level could return an arbitraty frame Reference< XFrame > xHelp = xDesktop->findFrame( ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")), FrameSearchFlag::CHILDREN); @@ -791,8 +809,8 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) pHelpWindow->SetHelpURL( aHelpURL ); pHelpWindow->loadHelpContent(aHelpURL); - if ( sKeyword.getLength() > 0 ) - pHelpWindow->OpenKeyword( sKeyword ); + if ( rKeyword.Len() ) + pHelpWindow->OpenKeyword( rKeyword ); Reference < ::com::sun::star::awt::XTopWindow > xTopWindow( xHelp->getContainerWindow(), UNO_QUERY ); if ( xTopWindow.is() ) -- cgit v1.2.3 From 124df99b73b2c0b450bd5c9dd74883e16fc2c3e7 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 22 Jul 2010 15:03:48 +0200 Subject: CWS changehid: #i111874#: pickerhelper.hxx removed --- sfx2/source/dialog/filedlghelper.cxx | 1 - 1 file changed, 1 deletion(-) (limited to 'sfx2') diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 874a430b6bda..d5a9abe6b597 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -79,7 +79,6 @@ #include #include #include -#include #include #include #include -- cgit v1.2.3 From d19dc752fe6b9f88c7c6aa4686d8d8c6404cde26 Mon Sep 17 00:00:00 2001 From: Gregor Hartmann Date: Fri, 27 Aug 2010 14:02:22 +0200 Subject: build breakers --- sfx2/source/statbar/stbitem.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2') diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 9b5fbd2d5d4e..e5de57d835c3 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -135,8 +135,8 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( { rtl::OString aCmd(".uno:"); aCmd += pSlot->GetUnoName(); - return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule ); pStatusBar->SetHelpId( nSlotId, aCmd ); + return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule ); } } -- cgit v1.2.3 From 5e838ad7d9d9919a362497cf5f04bdb2e7c1c6f7 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:02:51 +0200 Subject: CWS gnumake2: move delivered header files from sfx2/inc to sfx2/inc/sfx2; removed unused code; avoid delivering sfx.srs to solver --- idl/source/prj/command.cxx | 4 + sfx2/inc/QuerySaveDocument.hxx | 48 ---- sfx2/inc/basmgr.hxx | 38 --- sfx2/inc/brokenpackageint.hxx | 90 ------ sfx2/inc/dinfedt.hxx | 82 ------ sfx2/inc/docinsert.hxx | 92 ------ sfx2/inc/imagemgr.hxx | 39 --- sfx2/inc/imgmgr.hxx | 70 ----- sfx2/inc/mailmodelapi.hxx | 144 ---------- sfx2/inc/mieclip.hxx | 66 ----- sfx2/inc/minfitem.hxx | 81 ------ sfx2/inc/sfx2/QuerySaveDocument.hxx | 48 ++++ sfx2/inc/sfx2/basmgr.hxx | 38 +++ sfx2/inc/sfx2/brokenpackageint.hxx | 90 ++++++ sfx2/inc/sfx2/dinfedt.hxx | 82 ++++++ sfx2/inc/sfx2/docinsert.hxx | 92 ++++++ sfx2/inc/sfx2/imagemgr.hxx | 39 +++ sfx2/inc/sfx2/imgmgr.hxx | 70 +++++ sfx2/inc/sfx2/mailmodelapi.hxx | 144 ++++++++++ sfx2/inc/sfx2/mieclip.hxx | 66 +++++ sfx2/inc/sfx2/minfitem.hxx | 81 ++++++ sfx2/inc/sfx2/passwd.hxx | 6 +- sfx2/inc/sfx2/sfx.hrc | 3 - sfx2/inc/sfx2/sfxresid.hxx | 59 ++++ sfx2/inc/sfx2/tplpitem.hxx | 59 ++++ sfx2/inc/sfx2/viewfac.hxx | 65 +++++ sfx2/inc/sfx2/viewsh.hxx | 4 +- sfx2/inc/sfxresid.hxx | 61 ---- sfx2/inc/tplpitem.hxx | 59 ---- sfx2/inc/viewfac.hxx | 70 ----- sfx2/prj/d.lst | 29 +- sfx2/source/appl/app.cxx | 15 +- sfx2/source/appl/app.src | 58 ++++ sfx2/source/appl/appbas.cxx | 8 +- sfx2/source/appl/appcfg.cxx | 2 +- sfx2/source/appl/appdata.cxx | 2 +- sfx2/source/appl/appinit.cxx | 2 +- sfx2/source/appl/appmain.cxx | 2 +- sfx2/source/appl/appmisc.cxx | 2 +- sfx2/source/appl/appopen.cxx | 2 +- sfx2/source/appl/appquit.cxx | 2 +- sfx2/source/appl/appserv.cxx | 4 +- sfx2/source/appl/appuno.cxx | 5 +- sfx2/source/appl/imagemgr.cxx | 4 +- sfx2/source/appl/impldde.cxx | 2 +- sfx2/source/appl/linkmgr2.cxx | 2 +- sfx2/source/appl/lnkbase2.cxx | 2 +- sfx2/source/appl/makefile.mk | 3 +- sfx2/source/appl/module.cxx | 2 +- sfx2/source/appl/newhelp.cxx | 4 +- sfx2/source/appl/sfx.src | 91 ------ sfx2/source/appl/sfxhelp.cxx | 2 +- sfx2/source/appl/shutdownicon.cxx | 6 +- sfx2/source/appl/workwin.cxx | 2 +- sfx2/source/bastyp/fltfnc.cxx | 2 +- sfx2/source/bastyp/frmhtmlw.cxx | 2 +- sfx2/source/bastyp/mieclip.cxx | 2 +- sfx2/source/bastyp/progress.cxx | 2 +- sfx2/source/bastyp/sfxresid.cxx | 2 +- sfx2/source/config/evntconf.cxx | 12 +- sfx2/source/control/macrconf.cxx | 4 +- sfx2/source/control/minfitem.cxx | 5 +- sfx2/source/control/msgpool.cxx | 2 +- sfx2/source/control/objface.cxx | 2 +- sfx2/source/dialog/about.cxx | 21 +- sfx2/source/dialog/alienwarn.cxx | 2 +- sfx2/source/dialog/basedlgs.cxx | 2 +- sfx2/source/dialog/dinfdlg.cxx | 4 +- sfx2/source/dialog/dinfedt.cxx | 4 +- sfx2/source/dialog/filedlghelper.cxx | 2 +- sfx2/source/dialog/filtergrouping.cxx | 2 +- sfx2/source/dialog/mailmodel.cxx | 11 +- sfx2/source/dialog/mailmodelapi.cxx | 8 +- sfx2/source/dialog/makefile.mk | 10 - sfx2/source/dialog/mgetempl.cxx | 2 +- sfx2/source/dialog/navigat.cxx | 2 +- sfx2/source/dialog/newstyle.cxx | 2 +- sfx2/source/dialog/passwd.cxx | 2 +- sfx2/source/dialog/printopt.cxx | 2 +- sfx2/source/dialog/recfloat.cxx | 4 +- sfx2/source/dialog/sfxdlg.cxx | 4 +- sfx2/source/dialog/sfxurl.cxx | 2 +- sfx2/source/dialog/splitwin.cxx | 2 +- sfx2/source/dialog/srchdlg.cxx | 2 +- sfx2/source/dialog/styledlg.cxx | 2 +- sfx2/source/dialog/tabdlg.cxx | 2 +- sfx2/source/dialog/templdlg.cxx | 6 +- sfx2/source/dialog/tplcitem.cxx | 5 +- sfx2/source/dialog/tplpitem.cxx | 5 +- sfx2/source/dialog/versdlg.cxx | 2 +- sfx2/source/doc/QuerySaveDocument.cxx | 7 +- sfx2/source/doc/docfac.cxx | 4 +- sfx2/source/doc/docfile.cxx | 2 +- sfx2/source/doc/docinsert.cxx | 2 +- sfx2/source/doc/doctdlg.cxx | 2 +- sfx2/source/doc/doctempl.cxx | 2 +- sfx2/source/doc/doctemplates.cxx | 2 +- sfx2/source/doc/docvor.cxx | 2 +- sfx2/source/doc/graphhelp.cxx | 2 +- sfx2/source/doc/guisaveas.cxx | 2 +- sfx2/source/doc/new.cxx | 8 +- sfx2/source/doc/objcont.cxx | 4 +- sfx2/source/doc/objmisc.cxx | 2 +- sfx2/source/doc/objserv.cxx | 2 +- sfx2/source/doc/objstor.cxx | 2 +- sfx2/source/doc/objuno.cxx | 2 +- sfx2/source/doc/objxtor.cxx | 6 +- sfx2/source/doc/querytemplate.cxx | 2 +- sfx2/source/doc/sfxbasemodel.cxx | 6 +- sfx2/source/layout/sfxtabdialog.cxx | 2 +- sfx2/source/menu/mnuitem.cxx | 6 +- sfx2/source/menu/mnumgr.cxx | 2 +- sfx2/source/menu/virtmenu.cxx | 9 +- sfx2/source/notify/eventsupplier.cxx | 2 +- sfx2/source/toolbox/imgmgr.cxx | 4 +- sfx2/source/toolbox/tbxitem.cxx | 6 +- sfx2/source/view/frmload.cxx | 2 +- sfx2/source/view/orgmgr.cxx | 2 +- sfx2/source/view/printer.cxx | 2 +- sfx2/source/view/prnmon.cxx | 2 +- sfx2/source/view/topfrm.cxx | 2 +- sfx2/source/view/view.hrc | 6 - sfx2/source/view/viewfac.cxx | 13 +- sfx2/source/view/viewfrm.cxx | 20 +- sfx2/source/view/viewprn.cxx | 2 +- sfx2/source/view/viewsh.cxx | 4 +- svx/source/src/errtxt.src | 518 ++++++++++++++++++++++++++++++++++ svx/source/src/makefile.mk | 5 +- svx/util/makefile.mk | 98 +++---- 129 files changed, 1732 insertions(+), 1326 deletions(-) delete mode 100644 sfx2/inc/QuerySaveDocument.hxx delete mode 100644 sfx2/inc/basmgr.hxx delete mode 100644 sfx2/inc/brokenpackageint.hxx delete mode 100644 sfx2/inc/dinfedt.hxx delete mode 100644 sfx2/inc/docinsert.hxx delete mode 100644 sfx2/inc/imagemgr.hxx delete mode 100644 sfx2/inc/imgmgr.hxx delete mode 100644 sfx2/inc/mailmodelapi.hxx delete mode 100644 sfx2/inc/mieclip.hxx delete mode 100644 sfx2/inc/minfitem.hxx create mode 100644 sfx2/inc/sfx2/QuerySaveDocument.hxx create mode 100644 sfx2/inc/sfx2/basmgr.hxx create mode 100644 sfx2/inc/sfx2/brokenpackageint.hxx create mode 100644 sfx2/inc/sfx2/dinfedt.hxx create mode 100644 sfx2/inc/sfx2/docinsert.hxx create mode 100644 sfx2/inc/sfx2/imagemgr.hxx create mode 100644 sfx2/inc/sfx2/imgmgr.hxx create mode 100644 sfx2/inc/sfx2/mailmodelapi.hxx create mode 100644 sfx2/inc/sfx2/mieclip.hxx create mode 100644 sfx2/inc/sfx2/minfitem.hxx create mode 100644 sfx2/inc/sfx2/sfxresid.hxx create mode 100644 sfx2/inc/sfx2/tplpitem.hxx create mode 100644 sfx2/inc/sfx2/viewfac.hxx delete mode 100644 sfx2/inc/sfxresid.hxx delete mode 100644 sfx2/inc/tplpitem.hxx delete mode 100644 sfx2/inc/viewfac.hxx create mode 100644 svx/source/src/errtxt.src (limited to 'sfx2') diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index 29c49199dc30..5c346cf06bab 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -205,7 +205,11 @@ BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand ) } } else + { + const ByteString aStr( aFileName, RTL_TEXTENCODING_UTF8 ); + fprintf( stderr, "unable to read input file: %s\n", aStr.GetBuffer() ); return FALSE; + } } return TRUE; } diff --git a/sfx2/inc/QuerySaveDocument.hxx b/sfx2/inc/QuerySaveDocument.hxx deleted file mode 100644 index bf54199e7f26..000000000000 --- a/sfx2/inc/QuerySaveDocument.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: QuerySaveDocument.hxx,v $ - * $Revision: 1.5 $ - * - * 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 SFX_QUERYSAVEDOCUMENT_HXX -#define SFX_QUERYSAVEDOCUMENT_HXX - -#include "sal/config.h" -#include "sfx2/dllapi.h" - -class Window; -class String; -/** opens the generell query save document dialog. - @param _pParent - The parent window. - @_rTitle - The title of the document. -*/ -SFX2_DLLPUBLIC short ExecuteQuerySaveDocument( - Window* _pParent,const String& _rTitle); - -#endif //SFX_QUERYSAVEDOCUMENT_HXX - diff --git a/sfx2/inc/basmgr.hxx b/sfx2/inc/basmgr.hxx deleted file mode 100644 index 6b5f2790f676..000000000000 --- a/sfx2/inc/basmgr.hxx +++ /dev/null @@ -1,38 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: basmgr.hxx,v $ - * $Revision: 1.9 $ - * - * 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 _SFX_BASMGR_HXX -#define _SFX_BASMGR_HXX - -#ifndef _BASMGR_HXX_ -#include -#endif - -#endif //_SFX_BASMGR_HXX diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx deleted file mode 100644 index 6003329b8c01..000000000000 --- a/sfx2/inc/brokenpackageint.hxx +++ /dev/null @@ -1,90 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: brokenpackageint.hxx,v $ - * $Revision: 1.5 $ - * - * 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 "sal/config.h" -#include "sfx2/dllapi.h" -#include -#include -#include -#include - -using namespace ::framework; -typedef ContinuationBase< ::com::sun::star::task::XInteractionApprove > SfxContinuationApprove; -typedef ContinuationBase< ::com::sun::star::task::XInteractionDisapprove > SfxContinuationDisapprove; - -class SFX2_DLLPUBLIC RequestPackageReparation : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > -{ - ::com::sun::star::uno::Any m_aRequest; - - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > m_lContinuations; - - SfxContinuationApprove* m_pApprove; - SfxContinuationDisapprove* m_pDisapprove; - -public: - RequestPackageReparation( ::rtl::OUString aName ); - - sal_Bool isApproved() { return m_pApprove->isSelected(); } - - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() - throw( ::com::sun::star::uno::RuntimeException ); - - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > SAL_CALL getContinuations() - throw( ::com::sun::star::uno::RuntimeException ); -}; - -class SFX2_DLLPUBLIC NotifyBrokenPackage : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > -{ - ::com::sun::star::uno::Any m_aRequest; - - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > m_lContinuations; - - ContinuationAbort* m_pAbort; - -public: - NotifyBrokenPackage( ::rtl::OUString aName ); - - sal_Bool isAborted() { return m_pAbort->isSelected(); } - - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() - throw( ::com::sun::star::uno::RuntimeException ); - - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > SAL_CALL getContinuations() - throw( ::com::sun::star::uno::RuntimeException ); -}; - diff --git a/sfx2/inc/dinfedt.hxx b/sfx2/inc/dinfedt.hxx deleted file mode 100644 index 60ed7088cd3f..000000000000 --- a/sfx2/inc/dinfedt.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dinfedt.hxx,v $ - * $Revision: 1.4 $ - * - * 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 _SFX_DINFEDT_HXX -#define _SFX_DINFEDT_HXX - -// include --------------------------------------------------------------- - -#ifndef _SV_BUTTON_HXX -#include -#endif -#include -#include -#include - -// class InfoEdit_Impl --------------------------------------------------- - -class InfoEdit_Impl : public Edit -{ -public: - InfoEdit_Impl( Window* pParent, const ResId& rResId ) : - Edit( pParent, rResId ) {} - - virtual void KeyInput( const KeyEvent& rKEvent ); -}; - -// class SfxDocInfoEditDlg ----------------------------------------------- - -class SfxDocInfoEditDlg : public ModalDialog -{ -private: - FixedLine aInfoFL; - InfoEdit_Impl aInfo1ED; - InfoEdit_Impl aInfo2ED; - InfoEdit_Impl aInfo3ED; - InfoEdit_Impl aInfo4ED; - OKButton aOkBT; - CancelButton aCancelBT; - HelpButton aHelpBtn; - -public: - SfxDocInfoEditDlg( Window* pParent ); - - void SetText1( const String &rStr) { aInfo1ED.SetText( rStr ); } - void SetText2( const String &rStr) { aInfo2ED.SetText( rStr ); } - void SetText3( const String &rStr) { aInfo3ED.SetText( rStr ); } - void SetText4( const String &rStr) { aInfo4ED.SetText( rStr ); } - - String GetText1() const { return aInfo1ED.GetText(); } - String GetText2() const { return aInfo2ED.GetText(); } - String GetText3() const { return aInfo3ED.GetText(); } - String GetText4() const { return aInfo4ED.GetText(); } -}; - -#endif - diff --git a/sfx2/inc/docinsert.hxx b/sfx2/inc/docinsert.hxx deleted file mode 100644 index 306a26ed5e3e..000000000000 --- a/sfx2/inc/docinsert.hxx +++ /dev/null @@ -1,92 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: docinsert.hxx,v $ - * $Revision: 1.3 $ - * - * 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 _SFX_DOCINSERT_HXX -#define _SFX_DOCINSERT_HXX - -#include -#include -#include - -#include "sfx2/dllapi.h" - -namespace sfx2 { class FileDialogHelper; } -class SfxMedium; -class SfxMediumList; -class SfxItemSet; -class SvStringsDtor; - -// ============================================================================ - -namespace sfx2 { - -// ============================================================================ - -// ============================================================================ -// DocumentInserter -// ============================================================================ - -class SFX2_DLLPUBLIC DocumentInserter -{ -private: - String m_sDocFactory; - String m_sFilter; - Link m_aDialogClosedLink; - - bool m_bMultiSelectionEnabled; - sal_Int64 m_nDlgFlags; - ErrCode m_nError; - - sfx2::FileDialogHelper* m_pFileDlg; - SfxItemSet* m_pItemSet; - SvStringsDtor* m_pURLList; - - DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); - -public: - DocumentInserter( sal_Int64 _nFlags, const String& _rFactory, bool _bEnableMultiSelection = false ); - ~DocumentInserter(); - - void StartExecuteModal( const Link& _rDialogClosedLink ); - SfxMedium* CreateMedium(); - SfxMediumList* CreateMediumList(); - - inline ErrCode GetError() const { return m_nError; } - inline String GetFilter() const { return m_sFilter; } -}; - -// ============================================================================ - -} // namespace sfx2 - -// ============================================================================ - -#endif // _SFX_DOCINSERT_HXX - diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/imagemgr.hxx deleted file mode 100644 index faceb7bf846e..000000000000 --- a/sfx2/inc/imagemgr.hxx +++ /dev/null @@ -1,39 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: imagemgr.hxx,v $ - * $Revision: 1.5 $ - * - * 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 "sal/config.h" -#include "sfx2/dllapi.h" -#include -#include - -#include -#include - -SFX2_DLLPUBLIC Image SAL_CALL GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast ); diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx deleted file mode 100644 index b72676a79ab8..000000000000 --- a/sfx2/inc/imgmgr.hxx +++ /dev/null @@ -1,70 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: imgmgr.hxx,v $ - * $Revision: 1.18 $ - * - * 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 _SFXIMGMGR_HXX -#define _SFXIMGMGR_HXX - -#include "sal/config.h" -#include "sfx2/dllapi.h" - -#include -#include -#ifndef _IMAGE_HXX //autogen -#include -#endif - -class ToolBox; -class SfxModule; -class SfxImageManager_Impl; -class SFX2_DLLPUBLIC SfxImageManager -{ - SfxImageManager_Impl* pImp; - -public: - static SfxImageManager* GetImageManager( SfxModule* ); - - SfxImageManager( SfxModule* pModule = 0 ); - ~SfxImageManager(); - - void RegisterToolBox( ToolBox *pBox, USHORT nFlags=0xFFFF); - void ReleaseToolBox( ToolBox *pBox ); - - // get images from resources - void SetImages( ToolBox& rToolBox ); - void SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge ); - void SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge ); - - Image GetImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const; - Image GetImage( USHORT nId, BOOL bHiContrast ) const; - Image SeekImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const; - Image SeekImage( USHORT nId, BOOL bHiContrast ) const; -}; - -#endif diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/mailmodelapi.hxx deleted file mode 100644 index 4f8442f89ba2..000000000000 --- a/sfx2/inc/mailmodelapi.hxx +++ /dev/null @@ -1,144 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: mailmodelapi.hxx,v $ - * $Revision: 1.8 $ - * - * 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 INCLUDED_SFX_MAILMODEL_HXX -#define INCLUDED_SFX_MAILMODEL_HXX - -#include -#include -#include -#include "tools/link.hxx" -#include -#include "sfx2/dllapi.h" - -// class SfxMailModel_Impl ----------------------------------------------- - -class AddressList_Impl; - -class SFX2_DLLPUBLIC SfxMailModel -{ -public: - enum MailPriority - { - PRIO_HIGHEST, - PRIO_HIGH, - PRIO_NORMAL, - PRIO_LOW, - PRIO_LOWEST - }; - - enum AddressRole - { - ROLE_TO, - ROLE_CC, - ROLE_BCC - }; - - enum MailDocType - { - TYPE_SELF, - TYPE_ASPDF - }; - -private: - enum SaveResult - { - SAVE_SUCCESSFULL, - SAVE_CANCELLED, - SAVE_ERROR - }; - - ::std::vector< ::rtl::OUString > maAttachedDocuments; - AddressList_Impl* mpToList; - AddressList_Impl* mpCcList; - AddressList_Impl* mpBccList; - String maFromAddress; - String maSubject; - MailPriority mePriority; - - sal_Bool mbLoadDone; - - void ClearList( AddressList_Impl* pList ); - void MakeValueList( AddressList_Impl* pList, String& rValueList ); - SaveResult SaveDocumentAsFormat( const rtl::OUString& aSaveFileName, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel, - const rtl::OUString& rType, - rtl::OUString& rFileNamePath ); - SaveResult ShowFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel, - const ::rtl::OUString& rFilterName, - const ::rtl::OUString& rType, - bool bModified, - sal_Int32& rNumArgs, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); - - DECL_LINK( DoneHdl, void* ); - -public: - enum SendMailResult - { - SEND_MAIL_OK, - SEND_MAIL_CANCELLED, - SEND_MAIL_ERROR - }; - - SfxMailModel(); - ~SfxMailModel(); - - void AddAddress( const String& rAddress, AddressRole eRole ); - void SetFromAddress( const String& rAddress ) { maFromAddress = rAddress; } - void SetSubject( const String& rSubject ) { maSubject = rSubject; } - void SetPriority( MailPriority ePrio ) { mePriority = ePrio; } - - /** attaches a document to the current attachment list, can be called more than once. - * at the moment there will be a dialog for export executed for every model which is going to be attached. - * - * \param sDocumentType - The doc type to export. PDF will be at the moment only a direct export (no dialog). - * \param xModel - The current model to attach - * \param sAttachmentTitle - The title which will be used as attachment title - * \return @see error code - */ - SendMailResult AttachDocument( const ::rtl::OUString& sDocumentType, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel, - const ::rtl::OUString& sAttachmentTitle ); - - SendMailResult SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& rType ); - SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); - - sal_Int32 GetCount() const; - sal_Bool IsEmpty() const; -}; - -BOOL CreateFromAddress_Impl( String& rFrom ); - -#endif // INCLUDED_SFX_MAILMODEL_HXX diff --git a/sfx2/inc/mieclip.hxx b/sfx2/inc/mieclip.hxx deleted file mode 100644 index f754feadc677..000000000000 --- a/sfx2/inc/mieclip.hxx +++ /dev/null @@ -1,66 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: mieclip.hxx,v $ - * $Revision: 1.6 $ - * - * 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 _MIECLIP_HXX -#define _MIECLIP_HXX - -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include "sal/types.h" -#include -#include - -class SvStream; -class SotDataObject; -class SvData; - -class SFX2_DLLPUBLIC MSE40HTMLClipFormatObj -{ - SvStream* pStrm; - String sBaseURL; - -public: - MSE40HTMLClipFormatObj() : pStrm(0) {} - ~MSE40HTMLClipFormatObj(); - -//JP 31.01.2001: old interfaces - SAL_DLLPRIVATE BOOL GetData( SotDataObject& ); - SAL_DLLPRIVATE BOOL GetData( SvData& ); -//JP 31.01.2001: the new one - SvStream* IsValid( SvStream& ); - - const SvStream* GetStream() const { return pStrm; } - SvStream* GetStream() { return pStrm; } - const String& GetBaseURL() const { return sBaseURL; } -}; - - -#endif //_MIECLIP_HXX - diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/minfitem.hxx deleted file mode 100644 index 9e97bef83cb3..000000000000 --- a/sfx2/inc/minfitem.hxx +++ /dev/null @@ -1,81 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: minfitem.hxx,v $ - * $Revision: 1.4 $ - * - * 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 _SFX_MINFITEM_HXX -#define _SFX_MINFITEM_HXX - -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include -#include -class BasicManager; - -class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem -{ - const BasicManager* pBasicManager; - String aLibName; - String aModuleName; - String aMethodName; - String aCommentText; - -public: - TYPEINFO(); - SfxMacroInfoItem( USHORT nWhich, - const BasicManager* pMgr, - const String &rLibName, - const String &rModuleName, - const String &rMethodName, - const String &rComment); - - SfxMacroInfoItem( const SfxMacroInfoItem& ); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - String GetComment() const - { return aCommentText; } - void SetComment( const String& r ) - { aCommentText = r; } - String GetMethod() const - { return aMethodName; } - void SetMethod( const String& r ) - { aMethodName = r; } - String GetModule() const - { return aModuleName; } - void SetModule( const String& r ) - { aModuleName = r; } - String GetLib() const - { return aLibName; } - void SetLib( const String& r ) - { aLibName = r; } - const BasicManager* GetBasicManager() const - { return pBasicManager; } - String GetQualifiedName() const; -}; - -#endif diff --git a/sfx2/inc/sfx2/QuerySaveDocument.hxx b/sfx2/inc/sfx2/QuerySaveDocument.hxx new file mode 100644 index 000000000000..bf54199e7f26 --- /dev/null +++ b/sfx2/inc/sfx2/QuerySaveDocument.hxx @@ -0,0 +1,48 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: QuerySaveDocument.hxx,v $ + * $Revision: 1.5 $ + * + * 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 SFX_QUERYSAVEDOCUMENT_HXX +#define SFX_QUERYSAVEDOCUMENT_HXX + +#include "sal/config.h" +#include "sfx2/dllapi.h" + +class Window; +class String; +/** opens the generell query save document dialog. + @param _pParent + The parent window. + @_rTitle + The title of the document. +*/ +SFX2_DLLPUBLIC short ExecuteQuerySaveDocument( + Window* _pParent,const String& _rTitle); + +#endif //SFX_QUERYSAVEDOCUMENT_HXX + diff --git a/sfx2/inc/sfx2/basmgr.hxx b/sfx2/inc/sfx2/basmgr.hxx new file mode 100644 index 000000000000..6b5f2790f676 --- /dev/null +++ b/sfx2/inc/sfx2/basmgr.hxx @@ -0,0 +1,38 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: basmgr.hxx,v $ + * $Revision: 1.9 $ + * + * 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 _SFX_BASMGR_HXX +#define _SFX_BASMGR_HXX + +#ifndef _BASMGR_HXX_ +#include +#endif + +#endif //_SFX_BASMGR_HXX diff --git a/sfx2/inc/sfx2/brokenpackageint.hxx b/sfx2/inc/sfx2/brokenpackageint.hxx new file mode 100644 index 000000000000..6003329b8c01 --- /dev/null +++ b/sfx2/inc/sfx2/brokenpackageint.hxx @@ -0,0 +1,90 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: brokenpackageint.hxx,v $ + * $Revision: 1.5 $ + * + * 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 "sal/config.h" +#include "sfx2/dllapi.h" +#include +#include +#include +#include + +using namespace ::framework; +typedef ContinuationBase< ::com::sun::star::task::XInteractionApprove > SfxContinuationApprove; +typedef ContinuationBase< ::com::sun::star::task::XInteractionDisapprove > SfxContinuationDisapprove; + +class SFX2_DLLPUBLIC RequestPackageReparation : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +{ + ::com::sun::star::uno::Any m_aRequest; + + ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > + > m_lContinuations; + + SfxContinuationApprove* m_pApprove; + SfxContinuationDisapprove* m_pDisapprove; + +public: + RequestPackageReparation( ::rtl::OUString aName ); + + sal_Bool isApproved() { return m_pApprove->isSelected(); } + + virtual ::com::sun::star::uno::Any SAL_CALL getRequest() + throw( ::com::sun::star::uno::RuntimeException ); + + virtual ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > + > SAL_CALL getContinuations() + throw( ::com::sun::star::uno::RuntimeException ); +}; + +class SFX2_DLLPUBLIC NotifyBrokenPackage : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +{ + ::com::sun::star::uno::Any m_aRequest; + + ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > + > m_lContinuations; + + ContinuationAbort* m_pAbort; + +public: + NotifyBrokenPackage( ::rtl::OUString aName ); + + sal_Bool isAborted() { return m_pAbort->isSelected(); } + + virtual ::com::sun::star::uno::Any SAL_CALL getRequest() + throw( ::com::sun::star::uno::RuntimeException ); + + virtual ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > + > SAL_CALL getContinuations() + throw( ::com::sun::star::uno::RuntimeException ); +}; + diff --git a/sfx2/inc/sfx2/dinfedt.hxx b/sfx2/inc/sfx2/dinfedt.hxx new file mode 100644 index 000000000000..60ed7088cd3f --- /dev/null +++ b/sfx2/inc/sfx2/dinfedt.hxx @@ -0,0 +1,82 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: dinfedt.hxx,v $ + * $Revision: 1.4 $ + * + * 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 _SFX_DINFEDT_HXX +#define _SFX_DINFEDT_HXX + +// include --------------------------------------------------------------- + +#ifndef _SV_BUTTON_HXX +#include +#endif +#include +#include +#include + +// class InfoEdit_Impl --------------------------------------------------- + +class InfoEdit_Impl : public Edit +{ +public: + InfoEdit_Impl( Window* pParent, const ResId& rResId ) : + Edit( pParent, rResId ) {} + + virtual void KeyInput( const KeyEvent& rKEvent ); +}; + +// class SfxDocInfoEditDlg ----------------------------------------------- + +class SfxDocInfoEditDlg : public ModalDialog +{ +private: + FixedLine aInfoFL; + InfoEdit_Impl aInfo1ED; + InfoEdit_Impl aInfo2ED; + InfoEdit_Impl aInfo3ED; + InfoEdit_Impl aInfo4ED; + OKButton aOkBT; + CancelButton aCancelBT; + HelpButton aHelpBtn; + +public: + SfxDocInfoEditDlg( Window* pParent ); + + void SetText1( const String &rStr) { aInfo1ED.SetText( rStr ); } + void SetText2( const String &rStr) { aInfo2ED.SetText( rStr ); } + void SetText3( const String &rStr) { aInfo3ED.SetText( rStr ); } + void SetText4( const String &rStr) { aInfo4ED.SetText( rStr ); } + + String GetText1() const { return aInfo1ED.GetText(); } + String GetText2() const { return aInfo2ED.GetText(); } + String GetText3() const { return aInfo3ED.GetText(); } + String GetText4() const { return aInfo4ED.GetText(); } +}; + +#endif + diff --git a/sfx2/inc/sfx2/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx new file mode 100644 index 000000000000..306a26ed5e3e --- /dev/null +++ b/sfx2/inc/sfx2/docinsert.hxx @@ -0,0 +1,92 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: docinsert.hxx,v $ + * $Revision: 1.3 $ + * + * 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 _SFX_DOCINSERT_HXX +#define _SFX_DOCINSERT_HXX + +#include +#include +#include + +#include "sfx2/dllapi.h" + +namespace sfx2 { class FileDialogHelper; } +class SfxMedium; +class SfxMediumList; +class SfxItemSet; +class SvStringsDtor; + +// ============================================================================ + +namespace sfx2 { + +// ============================================================================ + +// ============================================================================ +// DocumentInserter +// ============================================================================ + +class SFX2_DLLPUBLIC DocumentInserter +{ +private: + String m_sDocFactory; + String m_sFilter; + Link m_aDialogClosedLink; + + bool m_bMultiSelectionEnabled; + sal_Int64 m_nDlgFlags; + ErrCode m_nError; + + sfx2::FileDialogHelper* m_pFileDlg; + SfxItemSet* m_pItemSet; + SvStringsDtor* m_pURLList; + + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); + +public: + DocumentInserter( sal_Int64 _nFlags, const String& _rFactory, bool _bEnableMultiSelection = false ); + ~DocumentInserter(); + + void StartExecuteModal( const Link& _rDialogClosedLink ); + SfxMedium* CreateMedium(); + SfxMediumList* CreateMediumList(); + + inline ErrCode GetError() const { return m_nError; } + inline String GetFilter() const { return m_sFilter; } +}; + +// ============================================================================ + +} // namespace sfx2 + +// ============================================================================ + +#endif // _SFX_DOCINSERT_HXX + diff --git a/sfx2/inc/sfx2/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx new file mode 100644 index 000000000000..faceb7bf846e --- /dev/null +++ b/sfx2/inc/sfx2/imagemgr.hxx @@ -0,0 +1,39 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: imagemgr.hxx,v $ + * $Revision: 1.5 $ + * + * 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 "sal/config.h" +#include "sfx2/dllapi.h" +#include +#include + +#include +#include + +SFX2_DLLPUBLIC Image SAL_CALL GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast ); diff --git a/sfx2/inc/sfx2/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx new file mode 100644 index 000000000000..b72676a79ab8 --- /dev/null +++ b/sfx2/inc/sfx2/imgmgr.hxx @@ -0,0 +1,70 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: imgmgr.hxx,v $ + * $Revision: 1.18 $ + * + * 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 _SFXIMGMGR_HXX +#define _SFXIMGMGR_HXX + +#include "sal/config.h" +#include "sfx2/dllapi.h" + +#include +#include +#ifndef _IMAGE_HXX //autogen +#include +#endif + +class ToolBox; +class SfxModule; +class SfxImageManager_Impl; +class SFX2_DLLPUBLIC SfxImageManager +{ + SfxImageManager_Impl* pImp; + +public: + static SfxImageManager* GetImageManager( SfxModule* ); + + SfxImageManager( SfxModule* pModule = 0 ); + ~SfxImageManager(); + + void RegisterToolBox( ToolBox *pBox, USHORT nFlags=0xFFFF); + void ReleaseToolBox( ToolBox *pBox ); + + // get images from resources + void SetImages( ToolBox& rToolBox ); + void SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge ); + void SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge ); + + Image GetImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const; + Image GetImage( USHORT nId, BOOL bHiContrast ) const; + Image SeekImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const; + Image SeekImage( USHORT nId, BOOL bHiContrast ) const; +}; + +#endif diff --git a/sfx2/inc/sfx2/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx new file mode 100644 index 000000000000..4f8442f89ba2 --- /dev/null +++ b/sfx2/inc/sfx2/mailmodelapi.hxx @@ -0,0 +1,144 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: mailmodelapi.hxx,v $ + * $Revision: 1.8 $ + * + * 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 INCLUDED_SFX_MAILMODEL_HXX +#define INCLUDED_SFX_MAILMODEL_HXX + +#include +#include +#include +#include "tools/link.hxx" +#include +#include "sfx2/dllapi.h" + +// class SfxMailModel_Impl ----------------------------------------------- + +class AddressList_Impl; + +class SFX2_DLLPUBLIC SfxMailModel +{ +public: + enum MailPriority + { + PRIO_HIGHEST, + PRIO_HIGH, + PRIO_NORMAL, + PRIO_LOW, + PRIO_LOWEST + }; + + enum AddressRole + { + ROLE_TO, + ROLE_CC, + ROLE_BCC + }; + + enum MailDocType + { + TYPE_SELF, + TYPE_ASPDF + }; + +private: + enum SaveResult + { + SAVE_SUCCESSFULL, + SAVE_CANCELLED, + SAVE_ERROR + }; + + ::std::vector< ::rtl::OUString > maAttachedDocuments; + AddressList_Impl* mpToList; + AddressList_Impl* mpCcList; + AddressList_Impl* mpBccList; + String maFromAddress; + String maSubject; + MailPriority mePriority; + + sal_Bool mbLoadDone; + + void ClearList( AddressList_Impl* pList ); + void MakeValueList( AddressList_Impl* pList, String& rValueList ); + SaveResult SaveDocumentAsFormat( const rtl::OUString& aSaveFileName, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel, + const rtl::OUString& rType, + rtl::OUString& rFileNamePath ); + SaveResult ShowFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel, + const ::rtl::OUString& rFilterName, + const ::rtl::OUString& rType, + bool bModified, + sal_Int32& rNumArgs, + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); + + DECL_LINK( DoneHdl, void* ); + +public: + enum SendMailResult + { + SEND_MAIL_OK, + SEND_MAIL_CANCELLED, + SEND_MAIL_ERROR + }; + + SfxMailModel(); + ~SfxMailModel(); + + void AddAddress( const String& rAddress, AddressRole eRole ); + void SetFromAddress( const String& rAddress ) { maFromAddress = rAddress; } + void SetSubject( const String& rSubject ) { maSubject = rSubject; } + void SetPriority( MailPriority ePrio ) { mePriority = ePrio; } + + /** attaches a document to the current attachment list, can be called more than once. + * at the moment there will be a dialog for export executed for every model which is going to be attached. + * + * \param sDocumentType + The doc type to export. PDF will be at the moment only a direct export (no dialog). + * \param xModel + The current model to attach + * \param sAttachmentTitle + The title which will be used as attachment title + * \return @see error code + */ + SendMailResult AttachDocument( const ::rtl::OUString& sDocumentType, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel, + const ::rtl::OUString& sAttachmentTitle ); + + SendMailResult SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + const rtl::OUString& rType ); + SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); + + sal_Int32 GetCount() const; + sal_Bool IsEmpty() const; +}; + +BOOL CreateFromAddress_Impl( String& rFrom ); + +#endif // INCLUDED_SFX_MAILMODEL_HXX diff --git a/sfx2/inc/sfx2/mieclip.hxx b/sfx2/inc/sfx2/mieclip.hxx new file mode 100644 index 000000000000..f754feadc677 --- /dev/null +++ b/sfx2/inc/sfx2/mieclip.hxx @@ -0,0 +1,66 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: mieclip.hxx,v $ + * $Revision: 1.6 $ + * + * 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 _MIECLIP_HXX +#define _MIECLIP_HXX + +#include "sal/config.h" +#include "sfx2/dllapi.h" +#include "sal/types.h" +#include +#include + +class SvStream; +class SotDataObject; +class SvData; + +class SFX2_DLLPUBLIC MSE40HTMLClipFormatObj +{ + SvStream* pStrm; + String sBaseURL; + +public: + MSE40HTMLClipFormatObj() : pStrm(0) {} + ~MSE40HTMLClipFormatObj(); + +//JP 31.01.2001: old interfaces + SAL_DLLPRIVATE BOOL GetData( SotDataObject& ); + SAL_DLLPRIVATE BOOL GetData( SvData& ); +//JP 31.01.2001: the new one + SvStream* IsValid( SvStream& ); + + const SvStream* GetStream() const { return pStrm; } + SvStream* GetStream() { return pStrm; } + const String& GetBaseURL() const { return sBaseURL; } +}; + + +#endif //_MIECLIP_HXX + diff --git a/sfx2/inc/sfx2/minfitem.hxx b/sfx2/inc/sfx2/minfitem.hxx new file mode 100644 index 000000000000..9e97bef83cb3 --- /dev/null +++ b/sfx2/inc/sfx2/minfitem.hxx @@ -0,0 +1,81 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: minfitem.hxx,v $ + * $Revision: 1.4 $ + * + * 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 _SFX_MINFITEM_HXX +#define _SFX_MINFITEM_HXX + +#include "sal/config.h" +#include "sfx2/dllapi.h" +#include +#include +class BasicManager; + +class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem +{ + const BasicManager* pBasicManager; + String aLibName; + String aModuleName; + String aMethodName; + String aCommentText; + +public: + TYPEINFO(); + SfxMacroInfoItem( USHORT nWhich, + const BasicManager* pMgr, + const String &rLibName, + const String &rModuleName, + const String &rMethodName, + const String &rComment); + + SfxMacroInfoItem( const SfxMacroInfoItem& ); + + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + String GetComment() const + { return aCommentText; } + void SetComment( const String& r ) + { aCommentText = r; } + String GetMethod() const + { return aMethodName; } + void SetMethod( const String& r ) + { aMethodName = r; } + String GetModule() const + { return aModuleName; } + void SetModule( const String& r ) + { aModuleName = r; } + String GetLib() const + { return aLibName; } + void SetLib( const String& r ) + { aLibName = r; } + const BasicManager* GetBasicManager() const + { return pBasicManager; } + String GetQualifiedName() const; +}; + +#endif diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx index bfe8debecca1..e80dd9871744 100644 --- a/sfx2/inc/sfx2/passwd.hxx +++ b/sfx2/inc/sfx2/passwd.hxx @@ -31,14 +31,12 @@ #define _SFX_PASSWD_HXX #include "sal/config.h" -#include "sfx2/dllapi.h" - -#ifndef _SV_BUTTON_HXX +#include #include -#endif #include #include #include +#include // defines --------------------------------------------------------------- diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index 9bba3997a71f..64036fd876d4 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -359,9 +359,6 @@ #define RID_ITEMLIST_LINGU (RID_OPTIONS_START + 11) #define RID_SFXPAGE_PRINTOPTIONS (RID_OPTIONS_START + 12) -#define STR_UNDO (RID_SFX_VIEW_START+11) -#define STR_REDO (RID_SFX_VIEW_START+12) -#define STR_REPEAT (RID_SFX_VIEW_START+13) #define RID_STR_NEW_TASK (RID_SFX_DOC_START+ 76) // Member-Ids ------------------------------------------------------------ diff --git a/sfx2/inc/sfx2/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx new file mode 100644 index 000000000000..d3a4443bf2cc --- /dev/null +++ b/sfx2/inc/sfx2/sfxresid.hxx @@ -0,0 +1,59 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: sfxresid.hxx,v $ + * $Revision: 1.5 $ + * + * 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 _SFX_SFXRESID_HXX +#define _SFX_SFXRESID_HXX + +#include +#include "sfx2/dllapi.h" +#include + +class SFX2_DLLPUBLIC SfxResId: public ResId +{ +public: + SfxResId( USHORT nId ); + static ResMgr* GetResMgr(); + static void DeleteResMgr(); +}; + +//============================================================================ +class SfxSimpleResId +{ + String m_sText; + +public: + SfxSimpleResId(USHORT nID); + + String getText() const { return m_sText; } + + operator String() const { return getText(); } +}; + + +#endif diff --git a/sfx2/inc/sfx2/tplpitem.hxx b/sfx2/inc/sfx2/tplpitem.hxx new file mode 100644 index 000000000000..d50298b59716 --- /dev/null +++ b/sfx2/inc/sfx2/tplpitem.hxx @@ -0,0 +1,59 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: tplpitem.hxx,v $ + * $Revision: 1.5 $ + * + * 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 _SFX_TPLPITEM_HXX +#define _SFX_TPLPITEM_HXX + +#include "sal/config.h" +#include "sfx2/dllapi.h" +#include +#include +#include + +class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem +{ + String aStyle; +public: + TYPEINFO(); + SfxTemplateItem(); + SfxTemplateItem( USHORT nWhich, + const String &rStyle, + USHORT nMask = 0xffff ); + SfxTemplateItem( const SfxTemplateItem& ); + + const String& GetStyleName() const { return aStyle; } + + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + virtual BYTE GetFlagCount() const; + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); +}; + +#endif diff --git a/sfx2/inc/sfx2/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx new file mode 100644 index 000000000000..4d21a93a4ea1 --- /dev/null +++ b/sfx2/inc/sfx2/viewfac.hxx @@ -0,0 +1,65 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: viewfac.hxx,v $ + * $Revision: 1.5 $ + * + * 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 _VIEWFAC_HXX +#define _VIEWFAC_HXX + +#include "sal/config.h" +#include "sfx2/dllapi.h" +#include +#ifndef _RESID_HXX //autogen +#include +#endif + +class SfxViewFrame; +class SfxViewShell; +class Window; + +typedef SfxViewShell* (*SfxViewCtor)(SfxViewFrame*, SfxViewShell*); +typedef void (*SfxViewInit)(); + +// CLASS ----------------------------------------------------------------- +class SFX2_DLLPUBLIC SfxViewFactory +{ +public: + SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal ); + ~SfxViewFactory(); + + SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh); + void InitFactory(); + USHORT GetOrdinal() const { return nOrd; } + +private: + SfxViewCtor fnCreate; + SfxViewInit fnInit; + USHORT nOrd; +}; + +#endif + diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 83ac73dbdd80..e5bb30bfb1db 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -135,13 +135,13 @@ public: \ static SfxViewFactory&Factory() { return *pFactory; } \ static void InitFactory() -#define SFX_IMPL_VIEWFACTORY(Class, rResId) \ +#define SFX_IMPL_VIEWFACTORY(Class) \ SfxViewFactory* Class::pFactory; \ SfxViewShell* __EXPORT Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \ { return new Class(pFrame, pOldView); } \ void Class::RegisterFactory( USHORT nPrio ) \ { \ - pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,rResId);\ + pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio);\ InitFactory(); \ } \ void Class::InitFactory() diff --git a/sfx2/inc/sfxresid.hxx b/sfx2/inc/sfxresid.hxx deleted file mode 100644 index 63835281153d..000000000000 --- a/sfx2/inc/sfxresid.hxx +++ /dev/null @@ -1,61 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: sfxresid.hxx,v $ - * $Revision: 1.5 $ - * - * 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 _SFX_SFXRESID_HXX -#define _SFX_SFXRESID_HXX - -#include - -#ifndef _RESID_HXX //autogen -#include -#endif - -class SfxResId: public ResId -{ -public: - SfxResId( USHORT nId ); - static ResMgr* GetResMgr(); - static void DeleteResMgr(); -}; - -//============================================================================ -class SfxSimpleResId -{ - String m_sText; - -public: - SfxSimpleResId(USHORT nID); - - String getText() const { return m_sText; } - - operator String() const { return getText(); } -}; - - -#endif diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/tplpitem.hxx deleted file mode 100644 index d50298b59716..000000000000 --- a/sfx2/inc/tplpitem.hxx +++ /dev/null @@ -1,59 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: tplpitem.hxx,v $ - * $Revision: 1.5 $ - * - * 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 _SFX_TPLPITEM_HXX -#define _SFX_TPLPITEM_HXX - -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include -#include -#include - -class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem -{ - String aStyle; -public: - TYPEINFO(); - SfxTemplateItem(); - SfxTemplateItem( USHORT nWhich, - const String &rStyle, - USHORT nMask = 0xffff ); - SfxTemplateItem( const SfxTemplateItem& ); - - const String& GetStyleName() const { return aStyle; } - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - virtual BYTE GetFlagCount() const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); -}; - -#endif diff --git a/sfx2/inc/viewfac.hxx b/sfx2/inc/viewfac.hxx deleted file mode 100644 index 24b4a860f0b0..000000000000 --- a/sfx2/inc/viewfac.hxx +++ /dev/null @@ -1,70 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: viewfac.hxx,v $ - * $Revision: 1.5 $ - * - * 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 _VIEWFAC_HXX -#define _VIEWFAC_HXX - -#include "sal/config.h" -#include "sfx2/dllapi.h" -#include -#ifndef _RESID_HXX //autogen -#include -#endif - -class SfxViewFrame; -class SfxViewShell; -class Window; - -typedef SfxViewShell* (*SfxViewCtor)(SfxViewFrame*, SfxViewShell*); -typedef void (*SfxViewInit)(); - -// CLASS ----------------------------------------------------------------- -class SFX2_DLLPUBLIC SfxViewFactory -{ -public: - SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, - USHORT nOrdinal, const ResId& aDescrResId ); - ~SfxViewFactory(); - - SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh); - void InitFactory(); - - String GetDescription() const - { return String( aDescription ); } - USHORT GetOrdinal() const { return nOrd; } - -private: - SfxViewCtor fnCreate; - SfxViewInit fnInit; - USHORT nOrd; - ResId aDescription; -}; - -#endif - diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index fe71b1715769..b36ec3fea06a 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -22,20 +22,33 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid ..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml ..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv -..\inc\sfx2\dllapi.h %_DEST%\inc%_EXT%\sfx2\dllapi.h ..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi ..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi + +..\inc\sfx2\brokenpackageint.hxx %_DEST%\inc%_EXT%\sfx2\brokenpackageint.hxx +..\inc\sfx2\dinfedt.hxx %_DEST%\inc%_EXT%\sfx2\dinfedt.hxx +..\inc\sfx2\imgmgr.hxx %_DEST%\inc%_EXT%\sfx2\imgmgr.hxx +..\inc\sfx2\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx +..\inc\sfx2\minfitem.hxx %_DEST%\inc%_EXT%\sfx2\minfitem.hxx +..\inc\sfx2\tplpitem.hxx %_DEST%\inc%_EXT%\sfx2\tplpitem.hxx +..\inc\sfx2\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx +..\inc\sfx2\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx +..\inc\sfx2\QuerySaveDocument.hxx %_DEST%\inc%_EXT%\sfx2\QuerySaveDocument.hxx +..\inc\sfx2\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx +..\inc\sfx2\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx +..\inc\sfx2\viewfac.hxx %_DEST%\inc%_EXT%\sfx2\viewfac.hxx +..\inc\sfx2\sfxresid.hxx %_DEST%\inc%_EXT%\sfx2\sfxresid.hxx + +..\inc\sfx2\dllapi.h %_DEST%\inc%_EXT%\sfx2\dllapi.h ..\inc\sfx2\app.hxx %_DEST%\inc%_EXT%\sfx2\app.hxx ..\inc\sfx2\basedlgs.hxx %_DEST%\inc%_EXT%\sfx2\basedlgs.hxx ..\inc\sfx2\bindings.hxx %_DEST%\inc%_EXT%\sfx2\bindings.hxx -..\inc\brokenpackageint.hxx %_DEST%\inc%_EXT%\sfx2\brokenpackageint.hxx ..\inc\sfx2\chalign.hxx %_DEST%\inc%_EXT%\sfx2\chalign.hxx ..\inc\sfx2\childwin.hxx %_DEST%\inc%_EXT%\sfx2\childwin.hxx ..\inc\sfx2\ctrlitem.hxx %_DEST%\inc%_EXT%\sfx2\ctrlitem.hxx ..\inc\sfx2\dispatch.hxx %_DEST%\inc%_EXT%\sfx2\dispatch.hxx ..\inc\sfx2\dinfdlg.hxx %_DEST%\inc%_EXT%\sfx2\dinfdlg.hxx -..\inc\dinfedt.hxx %_DEST%\inc%_EXT%\sfx2\dinfedt.hxx ..\inc\sfx2\docinf.hxx %_DEST%\inc%_EXT%\sfx2\docinf.hxx ..\inc\sfx2\docfac.hxx %_DEST%\inc%_EXT%\sfx2\docfac.hxx ..\inc\sfx2\docfile.hxx %_DEST%\inc%_EXT%\sfx2\docfile.hxx @@ -53,15 +66,12 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\frmhtmlw.hxx %_DEST%\inc%_EXT%\sfx2\frmhtmlw.hxx ..\inc\sfx2\genlink.hxx %_DEST%\inc%_EXT%\sfx2\genlink.hxx ..\inc\sfx2\hintpost.hxx %_DEST%\inc%_EXT%\sfx2\hintpost.hxx -..\inc\imgmgr.hxx %_DEST%\inc%_EXT%\sfx2\imgmgr.hxx ..\inc\sfx2\imgdef.hxx %_DEST%\inc%_EXT%\sfx2\imgdef.hxx ..\inc\sfx2\ipclient.hxx %_DEST%\inc%_EXT%\sfx2\ipclient.hxx ..\inc\sfx2\macrconf.hxx %_DEST%\inc%_EXT%\sfx2\macrconf.hxx ..\inc\sfx2\topfrm.hxx %_DEST%\inc%_EXT%\sfx2\topfrm.hxx ..\inc\sfx2\mgetempl.hxx %_DEST%\inc%_EXT%\sfx2\mgetempl.hxx -..\inc\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx ..\inc\sfx2\minarray.hxx %_DEST%\inc%_EXT%\sfx2\minarray.hxx -..\inc\minfitem.hxx %_DEST%\inc%_EXT%\sfx2\minfitem.hxx ..\inc\sfx2\minstack.hxx %_DEST%\inc%_EXT%\sfx2\minstack.hxx ..\inc\sfx2\mnuitem.hxx %_DEST%\inc%_EXT%\sfx2\mnuitem.hxx ..\inc\sfx2\module.hxx %_DEST%\inc%_EXT%\sfx2\module.hxx @@ -97,10 +107,8 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\tabdlg.hxx %_DEST%\inc%_EXT%\sfx2\tabdlg.hxx ..\inc\sfx2\tbxctrl.hxx %_DEST%\inc%_EXT%\sfx2\tbxctrl.hxx ..\inc\sfx2\templdlg.hxx %_DEST%\inc%_EXT%\sfx2\templdlg.hxx -..\inc\tplpitem.hxx %_DEST%\inc%_EXT%\sfx2\tplpitem.hxx ..\inc\sfx2\viewfrm.hxx %_DEST%\inc%_EXT%\sfx2\viewfrm.hxx ..\inc\sfx2\viewsh.hxx %_DEST%\inc%_EXT%\sfx2\viewsh.hxx -..\inc\viewfac.hxx %_DEST%\inc%_EXT%\sfx2\viewfac.hxx ..\inc\sfx2\appuno.hxx %_DEST%\inc%_EXT%\sfx2\appuno.hxx ..\inc\sfx2\sfxuno.hxx %_DEST%\inc%_EXT%\sfx2\sfxuno.hxx ..\inc\sfx2\sfxbasemodel.hxx %_DEST%\inc%_EXT%\sfx2\sfxbasemodel.hxx @@ -109,8 +117,6 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\srchitem.hxx %_DEST%\inc%_EXT%\sfx2\srchitem.hxx ..\inc\sfx2\srchdefs.hxx %_DEST%\inc%_EXT%\sfx2\srchdefs.hxx ..\inc\sfx2\cntids.hrc %_DEST%\inc%_EXT%\sfx2\cntids.hrc -..\inc\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx -..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx ..\inc\sfx2\sfxdlg.hxx %_DEST%\inc%_EXT%\sfx2\sfxdlg.hxx ..\inc\sfx2\dialogs.hrc %_DEST%\inc%_EXT%\sfx2\dialogs.hrc ..\inc\sfx2\itemwrapper.hxx %_DEST%\inc%_EXT%\sfx2\itemwrapper.hxx @@ -121,9 +127,6 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\linksrc.hxx %_DEST%\inc%_EXT%\sfx2\linksrc.hxx ..\inc\sfx2\querystatus.hxx %_DEST%\inc%_EXT%\sfx2\querystatus.hxx ..\inc\sfx2\sfxstatuslistener.hxx %_DEST%\inc%_EXT%\sfx2\sfxstatuslistener.hxx -..\inc\QuerySaveDocument.hxx %_DEST%\inc%_EXT%\sfx2\QuerySaveDocument.hxx -..\inc\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx -..\inc\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx ..\inc\sfx2\layout.hxx %_DEST%\inc%_EXT%\sfx2\layout.hxx ..\inc\sfx2\layout-tabdlg.hxx %_DEST%\inc%_EXT%\sfx2\layout-tabdlg.hxx ..\inc\sfx2\layout-post.hxx %_DEST%\inc%_EXT%\sfx2\layout-post.hxx diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 8d13066a8340..443f00edb27e 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -46,14 +46,10 @@ #include #include #include -#ifndef _SOUND_HXX //autogen #include -#endif #include #include -#ifndef _MSGBOX_HXX //autogen #include -#endif #include #include @@ -61,8 +57,6 @@ #include #include #include -#ifndef GCC -#endif #define _SVSTDARR_STRINGSDTOR #include @@ -81,23 +75,18 @@ #include #include #include -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include -#endif #include #include - #include #include #include - #include - #include #include "sfxhelp.hxx" #include #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "arrdecl.hxx" #include #include @@ -294,7 +283,7 @@ void SfxPropertyHandler::Property( ApplicationProperty& rProp ) #include #include #include -#include "imagemgr.hxx" +#include "sfx2/imagemgr.hxx" #include "fwkhelper.hxx" ::osl::Mutex SfxApplication::gMutex; diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index 463788d2d6d0..ab27b83bb889 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -34,6 +34,45 @@ #include "app.hrc" #include "helpid.hrc" +String STR_NONAME +{ + Text [ en-US ] = "Untitled" ; +}; +String STR_CLOSE +{ + Text [ en-US ] = "Close" ; +}; +String STR_STYLE_FILTER_AUTO +{ + Text [ en-US ] = "Automatic" ; +}; +String STR_STANDARD_SHORTCUT +{ + Text [ en-US ] = "Standard" ; +}; +String STR_BYTES +{ + Text [ en-US ] = "Bytes" ; +}; +String STR_KB +{ + Text [ en-US ] = "KB" ; +}; +String STR_MB +{ + Text [ en-US ] = "MB" ; +}; +String STR_GB +{ + Text [ en-US ] = "GB" ; +}; +QueryBox MSG_QUERY_LASTVERSION +{ + Buttons = WB_YES_NO ; + DefButton = WB_DEF_NO ; + Message [ en-US ] = "Cancel all changes?" ; +}; + InfoBox RID_DOCALREADYLOADED_DLG { Message [ en-US ] = "Document already open." ; @@ -1061,3 +1100,22 @@ Image IMG_MISSING_4 { ImageBitmap = Bitmap { File = "sn064.bmp" ; }; }; +String STR_STANDARD +{ + Text [ en-US ] = "Standard" ; +}; +String STR_NONE +{ + Text [ en-US ] = "- None -" ; +}; +String STR_SFX_FILTERNAME_ALL +{ + Text [ en-US ] = "All files (*.*)" ; +}; +// i66948 used in project scripting +String STR_ERRUNOEVENTBINDUNG +{ + Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name."; +}; + + diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 4fe352c3c4bc..977ab7a4aa36 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -63,7 +63,7 @@ #include "arrdecl.hxx" #include #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include @@ -72,8 +72,8 @@ #include #include #include -#include "tplpitem.hxx" -#include "minfitem.hxx" +#include "sfx2/tplpitem.hxx" +#include "sfx2/minfitem.hxx" #include "app.hrc" #include #include @@ -82,7 +82,7 @@ #include "appdata.hxx" #include "appbas.hxx" #include "sfxhelp.hxx" -#include "basmgr.hxx" +#include "sfx2/basmgr.hxx" #include "sorgitm.hxx" #include "appbaslib.hxx" #include diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 5638800a9e4f..affe0d19c0ec 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -96,7 +96,7 @@ #include #include "helper.hxx" // SfxContentHelper::... #include "app.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "shutdownicon.hxx" using namespace ::com::sun::star::uno; diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index e53a4cacdb93..468aa3fd9a01 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -60,7 +60,7 @@ #include #include "referers.hxx" #include "app.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "objshimp.hxx" #include #include "imestatuswindow.hxx" diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 837ccc461586..1bca6323f699 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -85,7 +85,7 @@ #include #include #include "sfxhelp.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "sfxtypes.hxx" #include #include "nochaos.hxx" diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 253311c54f3d..28373f81ad08 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -56,7 +56,7 @@ #include #include "arrdecl.hxx" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include "intro.hxx" diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 1bb12990cb42..55785115ec2d 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -67,7 +67,7 @@ #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "appdata.hxx" #include "arrdecl.hxx" diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index bf3cb633cf6a..0ff8c1b14c7f 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -101,7 +101,7 @@ #include #include "referers.hxx" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "app.hrc" #include diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 63d33e54997b..36f4913ff8e3 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -56,7 +56,7 @@ #include #include #include "arrdecl.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 4580a11270e0..bbf567c0b852 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -124,12 +124,12 @@ #include #include "app.hrc" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "arrdecl.hxx" #include #include "appdata.hxx" #include -#include "minfitem.hxx" +#include "sfx2/minfitem.hxx" #include #include #include diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 7fb6ef35167f..1f6aa25d0e28 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -55,10 +55,7 @@ #include #include #include -#ifndef _BASIC_SBUNO_HXX #include -#endif - #include #include #include @@ -134,7 +131,7 @@ using namespace ::com::sun::star::io; #include "fltoptint.hxx" #include #include -#include "brokenpackageint.hxx" +#include "sfx2/brokenpackageint.hxx" #include "eventsupplier.hxx" #include "xpackcreator.hxx" // #include "applet.hxx" diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index 6f226bad8040..8efebe016640 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include "imagemgr.hxx" +#include "sfx2/imagemgr.hxx" #include #include #include @@ -44,7 +44,7 @@ #include #include -#include "imgmgr.hxx" +#include "sfx2/imgmgr.hxx" #include #include #include diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 2bf84f87e973..e6bfaaf0d797 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -48,7 +48,7 @@ #include "dde.hrc" #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 3533fb8a428f..b51d8a31c175 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -43,7 +43,7 @@ //#include "iface.hxx" #include "app.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #define _SVSTDARR_STRINGSDTOR diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 8a852b44b6f7..c6568dc4f298 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -45,7 +45,7 @@ //#include #include "app.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk index 48d1258e2838..d72cf8718a0b 100644 --- a/sfx2/source/appl/makefile.mk +++ b/sfx2/source/appl/makefile.mk @@ -60,7 +60,8 @@ CFLAGS+=-DENABLE_QUICKSTART_APPLET .INCLUDE: pkg_config.mk CFLAGS+=$(PKGCONFIG_CFLAGS) CFLAGS+=-DENABLE_QUICKSTART_APPLET - CDEFS+=-DPLUGIN_NAME=libqstart_gtk$(DLLPOSTFIX)$(DLLPOST) +# definition moved to shutdownicon.cxx +# CDEFS+=-DPLUGIN_NAME=libqstart_gtk$(DLLPOSTFIX)$(DLLPOST) .ENDIF # "$(ENABLE_SYSTRAY_GTK)"=="TRUE" .ELSE CDEFS+=-DDLL_NAME=sfx$(DLLPOSTFIX)$(DLLPOST) diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 566d1af69242..d1c6e14c74d4 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -41,7 +41,7 @@ #include #include #include "arrdecl.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include "stbitem.hxx" diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index c5412f35d0f6..3649f31943e5 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -33,14 +33,14 @@ #include "newhelp.hxx" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "helpinterceptor.hxx" #include "helper.hxx" #include #include #include "sfxtypes.hxx" #include "panelist.hxx" -#include "imgmgr.hxx" +#include "sfx2/imgmgr.hxx" #include "srchdlg.hxx" #include "sfxhelp.hxx" diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src index ba9f4a3ffe11..9be3d778013b 100644 --- a/sfx2/source/appl/sfx.src +++ b/sfx2/source/appl/sfx.src @@ -30,107 +30,16 @@ #include -String STR_NONAME -{ - Text [ en-US ] = "Untitled" ; -}; - -String STR_NONE -{ - Text [ en-US ] = "- None -" ; -}; - -String STR_CLOSE -{ - Text [ en-US ] = "Close" ; -}; - -String STR_STYLE_FILTER_AUTO -{ - Text [ en-US ] = "Automatic" ; -}; - String STR_STYLE_FILTER_USED { Text [ en-US ] = "Applied Styles" ; }; - - - String STR_STYLE_FILTER_USERDEF { Text [ en-US ] = "Custom Styles" ; }; - String STR_STYLE_FILTER_ALL { Text [ en-US ] = "All Styles" ; }; -String STR_STANDARD -{ - Text [ en-US ] = "Standard" ; -}; -String STR_STANDARD_SHORTCUT -{ - Text [ en-US ] = "Standard" ; -}; - -String STR_SFX_FILTERNAME_ALL -{ - Text [ en-US ] = "All files (*.*)" ; -}; - -String STR_BYTES -{ - Text [ en-US ] = "Bytes" ; -}; - -String STR_KB -{ - Text [ en-US ] = "KB" ; -}; - -String STR_MB -{ - Text [ en-US ] = "MB" ; -}; - - -String STR_GB -{ - Text [ en-US ] = "GB" ; -}; - -String STR_UNDO -{ - Text [ en-US ] = "Undo: " ; -}; - -String STR_REDO -{ - Text [ en-US ] = "Re~do: " ; -}; - -String STR_REPEAT -{ - Text [ en-US ] = "~Repeat: " ; -}; - -String RID_STR_NEW_TASK -{ - Text [ en-US ] = "New task"; -}; -QueryBox MSG_QUERY_LASTVERSION -{ - Buttons = WB_YES_NO ; - DefButton = WB_DEF_NO ; - Message [ en-US ] = "Cancel all changes?" ; -}; - -// i66948 used in project scripting -String STR_ERRUNOEVENTBINDUNG -{ - Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name."; -}; - diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 491de2138917..eea3097e83f9 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -83,7 +83,7 @@ #include "newhelp.hxx" #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "helper.hxx" #include "app.hrc" diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 52805082de38..1a6e31b7769c 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -71,7 +71,7 @@ #endif #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -91,6 +91,10 @@ extern "C" { static void SAL_CALL thisModule() {} } # endif #endif +#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK) +#define PLUGIN_NAME "libqstart_gtkli.so" +#endif + class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener > { public: diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 7287023f1845..1ca17aa97478 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -50,7 +50,7 @@ #include #include "splitwin.hxx" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include // SFX_ITEMSET_SET #include diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 4b4c17a2c5f2..074a3052b443 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -123,7 +123,7 @@ using namespace ::vos; #include #include "openflag.hxx" #include "bastyp.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 2d1c6db11762..96ee65bc0b0a 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -49,7 +49,7 @@ #include #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include "bastyp.hrc" diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx index e48c3a0cb069..24f988d18a58 100644 --- a/sfx2/source/bastyp/mieclip.cxx +++ b/sfx2/source/bastyp/mieclip.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj() diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 8f143bb4baee..813640aa327c 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -54,7 +54,7 @@ #include "sfxtypes.hxx" #include #include "workwin.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "bastyp.hrc" #include diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx index a256438f4286..dc82a0b5f80a 100644 --- a/sfx2/source/bastyp/sfxresid.cxx +++ b/sfx2/source/bastyp/sfxresid.cxx @@ -35,7 +35,7 @@ #endif #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include // ----------------------------------------------------------------------- diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 763595913fcd..a20101006d67 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -31,35 +31,27 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include -#ifndef _SV_RESARY_HXX #include -#endif #include #include #include #include #include - -#include + #include #include -#ifndef _RTL_USTRING_ #include -#endif - #include #include #include - #include - #include #include #include #include #include #include "config.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "eventsupplier.hxx" #include diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx index d4149421f161..fcbe65c6826a 100644 --- a/sfx2/source/control/macrconf.cxx +++ b/sfx2/source/control/macrconf.cxx @@ -62,8 +62,8 @@ #include #include #include -#include "minfitem.hxx" -#include "imgmgr.hxx" +#include "sfx2/minfitem.hxx" +#include "sfx2/imgmgr.hxx" #include #include #include diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx index e288d5e77c7d..53aa3a3b694d 100644 --- a/sfx2/source/control/minfitem.cxx +++ b/sfx2/source/control/minfitem.cxx @@ -33,10 +33,7 @@ // INCLUDE --------------------------------------------------------------- -#ifndef GCC -#endif - -#include "minfitem.hxx" +#include "sfx2/minfitem.hxx" // STATIC DATA ----------------------------------------------------------- diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index 2e62d76feff6..69948bfabd9e 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -44,7 +44,7 @@ #include #include "sfxtypes.hxx" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "arrdecl.hxx" #include diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index b21c859687f5..b17c6364fe3a 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -42,7 +42,7 @@ #include #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx index 916af19962d6..6aed793a2daa 100644 --- a/sfx2/source/dialog/about.cxx +++ b/sfx2/source/dialog/about.cxx @@ -32,17 +32,8 @@ #include "precompiled_sfx2.hxx" // include --------------------------------------------------------------- -#include - -#ifndef _SV_APP_HXX #include -#endif -#ifndef _MSGBOX_HXX //autogen #include -#endif -#ifndef GCC -#endif - #include #include #include @@ -50,13 +41,11 @@ #include #include #include - #include #include "about.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include - #include "dialog.hrc" // defines --------------------------------------------------------------- @@ -138,7 +127,13 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS } // load image from module path - rtl::OUString aAbouts( RTL_CONSTASCII_USTRINGPARAM( ABOUT_BITMAP_STRINGLIST ) ); +// rtl::OUString aAbouts( RTL_CONSTASCII_USTRINGPARAM( ABOUT_BITMAP_STRINGLIST ) ); +#ifdef ABOUTBMPNAMES + rtl::OUString aAbouts( RTL_CONSTASCII_USTRINGPARAM( "ABOUTBMPNAMES" ) ); +#else + rtl::OUString aAbouts; +#endif + bool bLoaded = false; sal_Int32 nIndex = 0; do diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index f7f3f7b14ec9..90c5b4cdfbae 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" #include "alienwarn.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "alienwarn.hrc" diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 89075b918b42..59f51449c3f1 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -52,7 +52,7 @@ #include #include "sfxhelp.hxx" #include "workwin.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "dialog.hrc" using namespace ::com::sun::star::uno; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index fe03231c6db7..7d76e3ea0ad8 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -62,8 +62,8 @@ #include #include -#include "sfxresid.hxx" -#include "dinfedt.hxx" +#include "sfx2/sfxresid.hxx" +#include "sfx2/dinfedt.hxx" #include #include #include diff --git a/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx index f96b3a2135ce..185f026bf868 100644 --- a/sfx2/source/dialog/dinfedt.cxx +++ b/sfx2/source/dialog/dinfedt.cxx @@ -34,8 +34,8 @@ #ifndef GCC #endif -#include "dinfedt.hxx" -#include "sfxresid.hxx" +#include "sfx2/dinfedt.hxx" +#include "sfx2/sfxresid.hxx" #include #include "dinfedt.hrc" diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 683aedcbf32f..1b5c9a6f4606 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -92,7 +92,7 @@ #include #include "openflag.hxx" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "filedlghelper.hrc" #include "filtergrouping.hxx" diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 4809462b70ca..23d016e2edc4 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -35,7 +35,7 @@ #include #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index b36a6923184e..013855c2cdfc 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -50,27 +50,22 @@ #include #include #include -#ifndef _COM_SUN_STAR_SECURITY_DOCUMENTSIGNATURESINFORMATION_HPP_ #include -#endif #include #include #include #include #include #include - -#ifndef _RTL_TEXTENC_H -#include -#endif +#include #include #include #include #include -#include +#include #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "dialog.hrc" diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx index 2e87d2c4a9ba..75781551ca93 100644 --- a/sfx2/source/dialog/mailmodelapi.cxx +++ b/sfx2/source/dialog/mailmodelapi.cxx @@ -47,9 +47,7 @@ #include #include #include -#ifndef _RTL_TEXTENC_H -#include -#endif +#include #include #include #include @@ -60,13 +58,13 @@ #include #include -#include "mailmodelapi.hxx" +#include "sfx2/mailmodelapi.hxx" #include #include #include "sfxtypes.hxx" #include "dialog.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include "guisaveas.hxx" diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk index 230bbe432aea..7e044f0fb528 100644 --- a/sfx2/source/dialog/makefile.mk +++ b/sfx2/source/dialog/makefile.mk @@ -103,16 +103,6 @@ CFLAGS+=-DBUILD_VER_STRING="$(subst,",\" "$(BUILD_VER_STRING)")" .INCLUDE : target.mk -$(INCCOM)$/cuilib.hxx: makefile.mk -.IF "$(GUI)"=="UNX" - $(RM) $@ - echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE - echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@ -.ENDIF - -$(SLO)$/sfxdlg.obj : $(INCCOM)$/cuilib.hxx - $(SLO)$/about.obj : $(INCCOM)$/aboutbmpnames.hxx .INCLUDE .IGNORE : $(MISC)$/about_bmp_names.mk diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 319c3b873b48..73fb36cafc5f 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -49,7 +49,7 @@ #include #include #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 9f7cecd97745..eb2b84e3bdb4 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -39,7 +39,7 @@ #include #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "helpid.hrc" SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR ); diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 05920c07973e..3e29562679ec 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -39,7 +39,7 @@ #include #include "dialog.hrc" #include "newstyle.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" // PRIVATE METHODES ------------------------------------------------------ diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 981657d476fa..db73330c867f 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -38,7 +38,7 @@ #include #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "dialog.hrc" #include "passwd.hrc" diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 29472b65208b..962befe73c87 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -41,7 +41,7 @@ #include "printopt.hrc" #include "dialog.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 7782b5178d8f..1cd257874e1f 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -45,13 +45,13 @@ #include "recfloat.hxx" #include "dialog.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include #include #include -#include "imagemgr.hxx" +#include "sfx2/imagemgr.hxx" using namespace ::com::sun::star; diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx index 0e5f91ccea34..4b88851f82dd 100644 --- a/sfx2/source/dialog/sfxdlg.cxx +++ b/sfx2/source/dialog/sfxdlg.cxx @@ -32,7 +32,9 @@ #include "precompiled_sfx2.hxx" #include -#include "cuilib.hxx" +//#include "cuilib.hxx" + +#define DLL_NAME "libcuili.so" #include #include diff --git a/sfx2/source/dialog/sfxurl.cxx b/sfx2/source/dialog/sfxurl.cxx index b50ad18d89ea..bd85c842c88d 100644 --- a/sfx2/source/dialog/sfxurl.cxx +++ b/sfx2/source/dialog/sfxurl.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include -#include +#include #include SfxUrlDialog::SfxUrlDialog( Window *pParent ) diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 750bf90d175c..569d3ec69c99 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -52,7 +52,7 @@ #include #include #include "dialog.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "virtmenu.hxx" #include diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 500d530bab3f..ead9ae9557a7 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" #include "srchdlg.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "srchdlg.hrc" diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 7d4e60e117e9..ca84402c4b24 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -42,7 +42,7 @@ #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "dialog.hrc" diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 1008c76b8d9f..8709ad210ea6 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -45,7 +45,7 @@ #include #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "sfxhelp.hxx" #include #include diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 584dd488da56..d1afc08cda10 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -63,8 +63,8 @@ #include #include #include -#include "tplpitem.hxx" -#include "sfxresid.hxx" +#include "sfx2/tplpitem.hxx" +#include "sfx2/sfxresid.hxx" #include "templdlg.hrc" #include @@ -76,7 +76,7 @@ #include "docvor.hxx" #include #include -#include "imgmgr.hxx" +#include "sfx2/imgmgr.hxx" #include "helpid.hrc" #include "appdata.hxx" #include diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index 111cab903f7e..060a1046bf40 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -36,12 +36,9 @@ #include #include -#ifndef GCC -#endif - #include #include -#include "tplpitem.hxx" +#include "sfx2/tplpitem.hxx" #include "tplcitem.hxx" #include "templdgi.hxx" diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index 06f85bea9b60..3caae405721a 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -33,10 +33,7 @@ // INCLUDE --------------------------------------------------------------- -#ifndef GCC -#endif - -#include "tplpitem.hxx" +#include "sfx2/tplpitem.hxx" #include diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 5d2cf91b0c8f..25a905861380 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -49,7 +49,7 @@ #include "versdlg.hrc" #include "versdlg.hxx" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx index 22a1ab5eef4c..65de7a6dafd1 100644 --- a/sfx2/source/doc/QuerySaveDocument.cxx +++ b/sfx2/source/doc/QuerySaveDocument.cxx @@ -30,15 +30,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include "QuerySaveDocument.hxx" +#include "sfx2/QuerySaveDocument.hxx" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "doc.hrc" -#ifndef _MSGBOX_HXX //autogen #include -#endif + // ----------------------------------------------------------------------------- short ExecuteQuerySaveDocument(Window* _pParent,const String& _rTitle) { diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 012109cac21a..b27a98eb9a09 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -44,13 +44,13 @@ #include #include #include -#include "viewfac.hxx" +#include "sfx2/viewfac.hxx" #include "fltfnc.hxx" #include "arrdecl.hxx" #include #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "doc.hrc" diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 108c9f27858a..bdb63f622130 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -147,7 +147,7 @@ using namespace ::com::sun::star::io; #include // GetFilterContainer #include "doc.hrc" #include "openflag.hxx" // SFX_STREAM_READONLY etc. -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include //#include "xmlversion.hxx" diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 9615cc4f51a7..622e7dcf5fa2 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" #include -#include "docinsert.hxx" +#include "sfx2/docinsert.hxx" #include #include #include diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx index a00b047230d1..d74aaf02d89a 100644 --- a/sfx2/source/doc/doctdlg.cxx +++ b/sfx2/source/doc/doctdlg.cxx @@ -40,7 +40,7 @@ #include #include "docvor.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "sfxtypes.hxx" #include #include diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 80492708d652..8773b3745567 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -98,7 +98,7 @@ using namespace ::ucbhelper; #include #include "sfxtypes.hxx" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "doc.hrc" #include #include diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 4439dc05f9ff..1a4b4e8d0d82 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -68,7 +68,7 @@ #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "sfxurlrelocator.hxx" #include "doctemplateslocal.hxx" #include diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 86a86ccb61b4..0b840a20792e 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -67,7 +67,7 @@ #include "sfxtypes.hxx" #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "doc.hrc" #include #include "docvor.hrc" diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index bd0e65830870..5dc3edfdbd76 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -81,7 +81,7 @@ #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "graphhelp.hxx" #include "doc.hrc" diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index bceca0db94ca..8966f0e8a651 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -77,7 +77,7 @@ #include #include -#include +#include #include #include #include diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 0fe45c49db95..05d2cd5e4599 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -34,9 +34,7 @@ #include #include #include -#ifndef _SVMEDIT_HXX #include -#endif #include #include #include @@ -45,9 +43,7 @@ #include #include "new.hrc" -#ifndef _SFX_DOC_HRC #include "doc.hrc" -#endif #include #include "helpid.hrc" #include "sfxtypes.hxx" @@ -57,8 +53,8 @@ #include #include "fltfnc.hxx" #include -#include "viewfac.hxx" -#include "sfxresid.hxx" +#include "sfx2/viewfac.hxx" +#include "sfx2/sfxresid.hxx" #include #include "preview.hxx" #include diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 6883f0976566..2e56b1b96a8e 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -64,7 +64,7 @@ #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "appdata.hxx" #include #include "fltfnc.hxx" @@ -77,7 +77,7 @@ #include #include #include -#include "basmgr.hxx" +#include "sfx2/basmgr.hxx" #include #include "doc.hrc" #include diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 3c78bad9220e..2143f9cbd8ad 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -129,7 +129,7 @@ using namespace ::com::sun::star::container; #include "appdata.hxx" #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index fb555c5edeec..83b0f4d19844 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -72,7 +72,7 @@ #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index ead9a7c9fd9a..b730b0510011 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -114,7 +114,7 @@ #include #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "fltfnc.hxx" #include diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx index eb022afc60df..27d740bf59c6 100644 --- a/sfx2/source/doc/objuno.cxx +++ b/sfx2/source/doc/objuno.cxx @@ -71,7 +71,7 @@ #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "doc.hrc" using namespace ::com::sun::star; diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 91c0f605e453..ec1710ed8d36 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -98,7 +98,7 @@ #include #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "objshimp.hxx" #include "appbas.hxx" #include "sfxtypes.hxx" @@ -109,8 +109,8 @@ #include "appdata.hxx" #include #include -#include "basmgr.hxx" -#include "QuerySaveDocument.hxx" +#include "sfx2/basmgr.hxx" +#include "sfx2/QuerySaveDocument.hxx" #include "helpid.hrc" #include #include "appbaslib.hxx" diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index d430205a831e..c07457bc074a 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" #include "querytemplate.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "doc.hrc" #include diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 158dbdb9e13e..e0adbc9c5b2a 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -111,7 +111,7 @@ #include #include #include -#include +#include #include #include #include @@ -122,12 +122,12 @@ #include #include #include "sfx2/docstoragemodifylistener.hxx" -#include "brokenpackageint.hxx" +#include "sfx2/brokenpackageint.hxx" #include "graphhelp.hxx" #include #include -#include +#include //________________________________________________________________________________________________________ // const diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx index 92454ae62f36..c2a1b48f0271 100644 --- a/sfx2/source/layout/sfxtabdialog.cxx +++ b/sfx2/source/layout/sfxtabdialog.cxx @@ -45,7 +45,7 @@ #include #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "sfxhelp.hxx" #include #include diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 0e80cc207ce0..e194a718bbb3 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -75,9 +75,9 @@ #include #include #include -#include "imgmgr.hxx" -#include "imagemgr.hxx" -#include "sfxresid.hxx" +#include "sfx2/imgmgr.hxx" +#include "sfx2/imagemgr.hxx" +#include "sfx2/sfxresid.hxx" #include "../doc/doc.hrc" using namespace ::com::sun::star::uno; diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 076932ba9dea..01d94dc141cf 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -71,7 +71,7 @@ #include "sfxtypes.hxx" #include #include "mnucfga.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 87f35805d1e7..04eaba861b94 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -39,14 +39,9 @@ #include #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include -#ifndef GCC -#endif - #include "virtmenu.hxx" #include #include "statcach.hxx" @@ -63,9 +58,9 @@ #include #include "sfxpicklist.hxx" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "menu.hrc" -#include "imagemgr.hxx" +#include "sfx2/imagemgr.hxx" #include #include #include diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index ec542c4af595..b8cef9dd2074 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -54,7 +54,7 @@ #include "eventsupplier.hxx" #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "sfxlocal.hrc" diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index eb9305fc0e49..00699c6880f9 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -34,10 +34,10 @@ #include #include -#include "imgmgr.hxx" +#include "sfx2/imgmgr.hxx" #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include "statcach.hxx" #include diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 29e6b85d67d2..6921541ffeda 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -95,7 +95,7 @@ #include "sfxtypes.hxx" #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include @@ -106,11 +106,11 @@ #include #include "helpid.hrc" #include "workwin.hxx" -#include "imgmgr.hxx" +#include "sfx2/imgmgr.hxx" #include "virtmenu.hxx" #include #include -#include "imagemgr.hxx" +#include "sfx2/imagemgr.hxx" #include #include diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index b439dca4ffed..088df6253f21 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -92,7 +92,7 @@ namespace css = ::com::sun::star; #include #include #include -#include "brokenpackageint.hxx" +#include "sfx2/brokenpackageint.hxx" #include "objshimp.hxx" SfxFrameLoader_Impl::SfxFrameLoader_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory >& /*xFactory*/ ) diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index 71d991759566..00568c394d23 100644 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -56,7 +56,7 @@ #include "docvor.hxx" #include "orgmgr.hxx" #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "view.hrc" #include #include "fltfnc.hxx" diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index 1ea49ecd879b..5944b7c0e9fd 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -47,7 +47,7 @@ #include #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "view.hrc" #ifdef MSC diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx index f875143bfab0..3377fceff67f 100644 --- a/sfx2/source/view/prnmon.cxx +++ b/sfx2/source/view/prnmon.cxx @@ -53,7 +53,7 @@ #include "sfxtypes.hxx" #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index f3596de6b1c2..cc2aa178d6f1 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -72,7 +72,7 @@ #include #include -#include +#include // wg. pTopFrames #include "appdata.hxx" diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc index 208828d1fcad..39c94d21b8e7 100644 --- a/sfx2/source/view/view.hrc +++ b/sfx2/source/view/view.hrc @@ -44,12 +44,6 @@ #define STR_NOSTARTPRINTER (RID_SFX_VIEW_START+ 9) #define STR_PRINTING (RID_SFX_VIEW_START+10) -#ifndef STR_UNDO -#define STR_UNDO (RID_SFX_VIEW_START+11) -#define STR_REDO (RID_SFX_VIEW_START+12) -#define STR_REPEAT (RID_SFX_VIEW_START+13) -#endif - #define DLG_PRINTMONITOR (RID_SFX_VIEW_START) #define FT_DOCNAME 1 #define FT_PRINTING 2 diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index 2eff45e0501d..1114b5864641 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -32,11 +32,8 @@ #include "precompiled_sfx2.hxx" // INCLUDE --------------------------------------------------------------- -#ifndef GCC -#endif - #include -#include "viewfac.hxx" +#include "sfx2/viewfac.hxx" // STATIC DATA ----------------------------------------------------------- @@ -56,16 +53,12 @@ void SfxViewFactory::InitFactory() // CTOR / DTOR ----------------------------------------------------------- -SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, - USHORT nOrdinal, const ResId& aDescrResId ): +SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal ): fnCreate(fnC), fnInit(fnI), - nOrd(nOrdinal), - aDescription(aDescrResId.GetId(), *aDescrResId.GetResMgr()) + nOrd(nOrdinal) { - aDescription.SetRT(aDescrResId.GetRT()); DBG_CTOR(SfxViewFactory, 0); -// SFX_APP()->RegisterViewFactory_Impl(*this); } SfxViewFactory::~SfxViewFactory() diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 945419189b78..ba2bcc7615c7 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -38,12 +38,8 @@ #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif -#ifndef _SPLITWIN_HXX //autogen #include -#endif #include #include #include @@ -51,9 +47,7 @@ #include #include #include -#ifndef _MSGBOX_HXX //autogen #include -#endif #include #include #include @@ -91,6 +85,8 @@ #include #include #include +#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -117,10 +113,10 @@ namespace css = ::com::sun::star; #include #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "appbas.hxx" #include -#include "viewfac.hxx" +#include "sfx2/viewfac.hxx" #include #include "fltfnc.hxx" #include @@ -137,7 +133,7 @@ namespace css = ::com::sun::star; #include "workwin.hxx" #include "helper.hxx" #include "macro.hxx" -#include "minfitem.hxx" +#include "sfx2/minfitem.hxx" #include "../appl/app.hrc" //------------------------------------------------------------------------- DBG_NAME(SfxViewFrame) @@ -1050,7 +1046,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) if ( pShUndoMgr && pShUndoMgr->GetUndoActionCount() ) { - String aTmp( SfxResId( STR_UNDO ) ); + String aTmp( SvtResId( STR_UNDO ) ); aTmp += pShUndoMgr->GetUndoActionComment(0); rSet.Put( SfxStringItem( SID_UNDO, aTmp ) ); } @@ -1059,7 +1055,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) if ( pShUndoMgr && pShUndoMgr->GetRedoActionCount() ) { - String aTmp( SfxResId(STR_REDO) ); + String aTmp( SvtResId(STR_REDO) ); aTmp += pShUndoMgr->GetRedoActionComment(0); rSet.Put( SfxStringItem( SID_REDO, aTmp ) ); } @@ -1069,7 +1065,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) if ( pShUndoMgr && pTarget && pShUndoMgr->GetRepeatActionCount() && pShUndoMgr->CanRepeat(*pTarget, 0) ) { - String aTmp( SfxResId(STR_REPEAT) ); + String aTmp( SvtResId(STR_REPEAT) ); aTmp += pShUndoMgr->GetRepeatActionComment(*pTarget, 0); rSet.Put( SfxStringItem( SID_REPEAT, aTmp ) ); } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index e4a53a8a6e7a..f132bb80d96a 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -57,7 +57,7 @@ #include "viewimp.hxx" #include #include -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include "sfxtypes.hxx" diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 86c9ba0bb70e..167cd59eb71f 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -73,7 +73,7 @@ #include "view.hrc" #include #include "viewimp.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include #include #include @@ -85,7 +85,7 @@ #include "sfxlocal.hrc" #include #include -#include "mailmodelapi.hxx" +#include "sfx2/mailmodelapi.hxx" #include #include #include diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src new file mode 100644 index 000000000000..bae4091dea53 --- /dev/null +++ b/svx/source/src/errtxt.src @@ -0,0 +1,518 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: errtxt.src,v $ + * $Revision: 1.63 $ + * + * 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. + * + ************************************************************************/ + +#define __RSC +#include +#include + +// pragma ---------------------------------------------------------------- +Resource RID_ERRCTX +{ + String ERRCTX_ERROR + { + Text [ en-US ] = "Error" ; + }; + String ERRCTX_WARNING + { + Text [ en-US ] = "Warning" ; + }; + String ERRCTX_SFX_LOADTEMPLATE + { + Text [ en-US ] = "$(ERR) loading the template $(ARG1)" ; + }; + String ERRCTX_SFX_SAVEDOC + { + Text [ en-US ] = "$(ERR) saving the document $(ARG1)"; + }; + String ERRCTX_SFX_SAVEASDOC + { + Text [ en-US ] = "$(ERR) saving the document $(ARG1)"; + }; + String ERRCTX_SFX_DOCINFO + { + Text [ en-US ] = "$(ERR) displaying doc. information for document $(ARG1)" ; + }; + String ERRCTX_SFX_DOCTEMPLATE + { + Text [ en-US ] = "$(ERR) writing document $(ARG1) as template" ; + }; + String ERRCTX_SFX_MOVEORCOPYCONTENTS + { + Text [ en-US ] = "$(ERR) copying or moving document contents" ; + }; + String ERRCTX_SFX_DOCMANAGER + { + Text [ en-US ] = "$(ERR) starting the Document Manager" ; + }; + String ERRCTX_SFX_OPENDOC + { + Text [ en-US ] = "$(ERR) loading document $(ARG1)" ; + }; + String ERRCTX_SFX_NEWDOCDIRECT + { + Text [ en-US ] = "$(ERR) creating a new document" ; + }; + String ERRCTX_SFX_NEWDOC + { + Text [ en-US ] = "$(ERR) creating a new document" ; + }; + String ERRCTX_SFX_CREATEOBJSH + { + Text [ en-US ] = "$(ERR) expanding entry" ; + }; + String ERRCTX_SFX_LOADBASIC + { + Text [ en-US ] = "$(ERR) loading BASIC of document $(ARG1)" ; + }; + String ERRCTX_SFX_SEARCHADDRESS + { + Text [ en-US ] = "$(ERR) searching for an address"; + }; +}; +Resource RID_ERRHDL +{ + String ERRCODE_CLASS_ABORT + { + Text [ en-US ] = "Abort" ; + }; + String ERRCODE_CLASS_NOTEXISTS + { + Text [ en-US ] = "Nonexistent object" ; + }; + String ERRCODE_CLASS_ALREADYEXISTS + { + Text [ en-US ] = "Object already exists" ; + }; + String ERRCODE_CLASS_ACCESS + { + Text [ en-US ] = "Object not accessible" ; + }; + String ERRCODE_CLASS_PATH + { + Text [ en-US ] = "Inadmissible path" ; + }; + String ERRCODE_CLASS_LOCKING + { + Text [ en-US ] = "Locking problem" ; + }; + String ERRCODE_CLASS_PARAMETER + { + Text [ en-US ] = "Wrong parameter" ; + }; + String ERRCODE_CLASS_SPACE + { + Text [ en-US ] = "Resource exhausted" ; + }; + String ERRCODE_CLASS_NOTSUPPORTED + { + Text [ en-US ] = "Action not supported" ; + }; + String ERRCODE_CLASS_READ + { + Text [ en-US ] = "Read-Error" ; + }; + String ERRCODE_CLASS_WRITE + { + Text [ en-US ] = "Write Error" ; + }; + String ERRCODE_CLASS_UNKNOWN + { + Text [ en-US ] = "unknown" ; + }; + String ERRCODE_CLASS_VERSION + { + Text [ en-US ] = "Version Incompatibility" ; + }; + String ERRCODE_CLASS_GENERAL + { + Text [ en-US ] = "General Error" ; + }; + String ERRCODE_CLASS_FORMAT + { + Text [ en-US ] = "Incorrect format" ; + }; + String ERRCODE_CLASS_CREATE + { + Text [ en-US ] = "Error creating object" ; + }; + String ERRCODE_CLASS_SBX + { + Text [ en-US ] = "Inadmissible value or data type" ; + }; + String ERRCODE_CLASS_RUNTIME + { + Text [ en-US ] = "BASIC runtime error" ; + }; + String ERRCODE_CLASS_COMPILER + { + Text [ en-US ] = "BASIC syntax error" ; + }; + String 1 + { + Text [ en-US ] = "General Error" ; + }; + String ERRCODE_IO_GENERAL + { + Text [ en-US ] = "General input/output error." ; + }; + String ERRCODE_IO_MISPLACEDCHAR + { + Text [ en-US ] = "Invalid file name." ; + }; + String ERRCODE_IO_NOTEXISTS + { + Text [ en-US ] = "Nonexistent file." ; + }; + String ERRCODE_IO_ALREADYEXISTS + { + Text [ en-US ] = "File already exists." ; + }; + String ERRCODE_IO_NOTADIRECTORY + { + Text [ en-US ] = "The object is not a directory." ; + }; + String ERRCODE_IO_NOTAFILE + { + Text [ en-US ] = "The object is not a file." ; + }; + String ERRCODE_IO_INVALIDDEVICE + { + Text [ en-US ] = "The specified device is invalid." ; + }; + String ERRCODE_IO_ACCESSDENIED + { + Text [ en-US ] = "The object cannot be accessed\ndue to insufficient user rights." ; + }; + String ERRCODE_IO_LOCKVIOLATION + { + Text [ en-US ] = "Sharing violation while accessing the object." ; + }; + String ERRCODE_IO_OUTOFSPACE + { + Text [ en-US ] = "No more space on device." ; + }; + String ERRCODE_IO_ISWILDCARD + { + Text [ en-US ] = "This operation cannot be run on\nfiles containing wildcards." ; + }; + String ERRCODE_IO_NOTSUPPORTED + { + Text [ en-US ] = "This operation is not supported on this operating system." ; + }; + String ERRCODE_IO_TOOMANYOPENFILES + { + Text [ en-US ] = "There are too many files open." ; + }; + String ERRCODE_IO_CANTREAD + { + Text [ en-US ] = "Data could not be read from the file." ; + }; + String ERRCODE_IO_CANTWRITE + { + Text [ en-US ] = "The file could not be written." ; + }; + String ERRCODE_IO_OUTOFMEMORY + { + Text [ en-US ] = "The operation could not be run due to insufficient memory." ; + }; + String ERRCODE_IO_CANTSEEK + { + Text [ en-US ] = "The seek operation could not be run." ; + }; + String ERRCODE_IO_CANTTELL + { + Text [ en-US ] = "The tell operation could not be run." ; + }; + String ERRCODE_IO_WRONGVERSION + { + Text [ en-US ] = "Incorrect file version." ; + }; + String ERRCODE_IO_WRONGFORMAT + { + Text [ en-US ] = "Incorrect file format." ; + }; + String ERRCODE_IO_INVALIDCHAR + { + Text [ en-US ] = "The file name contains invalid characters." ; + }; + String ERRCODE_IO_UNKNOWN + { + Text [ en-US ] = "An unknown I/O error has occurred." ; + }; + String ERRCODE_IO_INVALIDACCESS + { + Text [ en-US ] = "An invalid attempt was made to access the file." ; + }; + String ERRCODE_IO_CANTCREATE + { + Text [ en-US ] = "The file could not be created." ; + }; + String ERRCODE_IO_INVALIDPARAMETER + { + Text [ en-US ] = "The operation was started under an invalid parameter." ; + }; + String ERRCODE_IO_ABORT + { + Text [ en-US ] = "The operation on the file was aborted." ; + }; + String ERRCODE_IO_NOTEXISTSPATH + { + Text [ en-US ] = "Path to the file does not exist." ; + }; + String ERRCODE_IO_RECURSIVE + { + Text [ en-US ] = "An object cannot be copied into itself." ; + }; + String ERRCODE_SFX_NOSTDTEMPLATE + { + Text [ en-US ] = "The default template could not be opened." ; + }; + String ERRCODE_SFX_TEMPLATENOTFOUND + { + Text [ en-US ] = "The specified template could not be found." ; + }; + String ERRCODE_SFX_NOTATEMPLATE + { + Text [ en-US ] = "The file cannot be used as template." ; + }; + String ERRCODE_SFX_CANTREADDOCINFO + { + Text [ en-US ] = "Document information could not be read from the file because\nthe document information format is unknown or because document information does not\nexist." ; + }; + String ERRCODE_SFX_ALREADYOPEN + { + Text [ en-US ] = "This document has already been opened for editing." ; + }; + String ERRCODE_SFX_WRONGPASSWORD + { + Text [ en-US ] = "The wrong password has been entered." ; + }; + String ERRCODE_SFX_DOLOADFAILED + { + Text [ en-US ] = "Error reading file." ; + }; + String ERRCODE_SFX_DOCUMENTREADONLY + { + Text [ en-US ] = "The document was opened as read-only." ; + }; + String ERRCODE_SFX_OLEGENERAL + { + Text [ en-US ] = "General OLE Error." ; + }; + String ERRCODE_INET_NAME_RESOLVE + { + Text [ en-US ] = "The host name $(ARG1) could not be resolved." ; + }; + String ERRCODE_INET_CONNECT + { + Text [ en-US ] = "Could not establish Internet connection to $(ARG1)." ; + }; + String ERRCODE_INET_READ + { + Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ; + }; + String ERRCODE_INET_WRITE + { + Text [ en-US ] = "Error transferring data to the Internet.\nServer error message: $(ARG1)." ; + }; + String ERRCODE_INET_GENERAL + { + Text [ en-US ] = "General Internet error has occurred." ; + }; + String ERRCODE_INET_OFFLINE + { + Text [ en-US ] = "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ; + }; + String ERRCODE_SFXMSG_STYLEREPLACE + { + ExtraData = ERRCODE_MSG_ERROR | ERRCODE_BUTTON_OK_CANCEL ; + Text [ en-US ] = "Should the $(ARG1) Style be replaced?" ; + }; + String ERRCODE_SFX_NOFILTER + { + Text [ en-US ] = "A filter has not been found." ; + }; + String ERRCODE_SFX_CANTFINDORIGINAL + { + Text [ en-US ] = "The original could not be determined." ; + }; + String ERRCODE_SFX_CANTCREATECONTENT + { + Text [ en-US ] = "The contents could not be created." ; + }; + String ERRCODE_SFX_CANTCREATELINK + { + Text [ en-US ] = "The link could not be created." ; + }; + String ERRCODE_SFX_WRONGBMKFORMAT + { + Text [ en-US ] = "The link format is invalid." ; + }; + String ERRCODE_SFX_WRONGICONFILE + { + Text [ en-US ] = "The configuration of the icon display is invalid." ; + }; + String ERRCODE_SFX_CANTWRITEICONFILE + { + Text [ en-US ] = "The configuration of the icon display can not be saved." ; + }; + String ERRCODE_SFX_CANTDELICONFILE + { + Text [ en-US ] = "The configuration of the icon display could not be deleted." ; + }; + String ERRCODE_SFX_CANTRENAMECONTENT + { + Text [ en-US ] = "Contents cannot be renamed." ; + }; + String ERRCODE_SFX_INVALIDBMKPATH + { + Text [ en-US ] = "The bookmark folder is invalid." ; + }; + String ERRCODE_SFX_CANTWRITEURLCFGFILE + { + Text [ en-US ] = "The configuration of the URLs to be saved locally could not be saved." ; + }; + String ERRCODE_SFX_WRONGURLCFGFORMAT + { + Text [ en-US ] = "The configuration format of the URLs to be saved locally is invalid." ; + }; + String ERRCODE_SFX_NODOCUMENT + { + Text [ en-US ] = "This action cannot be applied to a document that does not exist." ; + }; + String ERRCODE_SFX_INVALIDLINK + { + Text [ en-US ] = "The link refers to an invalid target." ; + }; + String ERRCODE_SFX_INVALIDTRASHPATH + { + Text [ en-US ] = "The Recycle Bin path is invalid." ; + }; + String ERRCODE_SFX_NOTRESTORABLE + { + Text [ en-US ] = "The entry could not be restored." ; + }; + String ERRCODE_IO_NAMETOOLONG + { + Text [ en-US ] = "The file name is too long for the target file system." ; + }; + String ERRCODE_SFX_CONSULTUSER + { + Text [ en-US ] = "The details for running the function are incomplete." ; + }; + String ERRCODE_SFX_INVALIDSYNTAX + { + Text [ en-US ] = "The input syntax is invalid." ; + }; + String ERRCODE_SFX_CANTCREATEFOLDER + { + Text [ en-US ] = "The input syntax is invalid." ; + }; + String ERRCODE_SFX_CANTRENAMEFOLDER + { + Text [ en-US ] = "The input syntax is invalid." ; + }; + String ERRCODE_SFX_WRONG_CDF_FORMAT + { + Text [ en-US ] = "The channel document has an invalid format." ; + }; + String ERRCODE_SFX_EMPTY_SERVER + { + Text [ en-US ] = "The server must not be empty." ; + }; + String ERRCODE_SFX_NO_ABOBOX + { + Text [ en-US ] = "A subscription folder is required to install a Channel." ; + }; + String ERRCODE_IO_NOTSTORABLEINBINARYFORMAT + { + Text [ en-US ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format."; + }; + String ERRCODE_SFX_TARGETFILECORRUPTED + { + Text [ en-US ] = "The file $(FILENAME) cannot be saved. Please check your system settings. You can find an automatically generated backup copy of this file in folder $(PATH) named $(BACKUPNAME)."; + }; + String ERRCODE_SFX_NOMOREDOCUMENTSALLOWED + { + Text [ en-US ] = "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."; + }; + String ERRCODE_SFX_CANTCREATEBACKUP + { + Text [ en-US ] = "Could not create backup copy." ; + }; + String ERRCODE_SFX_MACROS_SUPPORT_DISABLED + { + Text [ en-US ] = "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled."; + }; + String ERRCODE_SFX_DOCUMENT_MACRO_DISABLED + { + Text [ en-US ] = "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; + }; + String ERRCODE_SFX_BROKENSIGNATURE + { + Text [ en-US ] = "The digitally signed document content and/or macros do not match the current document signature.\n\nThis could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; + }; + String ERRCODE_SFX_INCOMPLETE_ENCRYPTION + { + Text [ en-US ] = "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; + }; + + String ERRCODE_IO_INVALIDLENGTH + { + Text [ en-US ] = "Invalid data length." ; + }; + String ERRCODE_IO_CURRENTDIR + { + Text [ en-US ] = "Function not possible: path contains current directory." ; + }; + String ERRCODE_IO_NOTSAMEDEVICE + { + Text [ en-US ] = "Function not possible: device (drive) not identical." ; + }; + String ERRCODE_IO_DEVICENOTREADY + { + Text [ en-US ] = "Device (drive) not ready." ; + }; + String ERRCODE_IO_BADCRC + { + Text [ en-US ] = "Wrong check amount." ; + }; + String ERRCODE_IO_WRITEPROTECTED + { + Text [ en-US ] = "Function not possible: write protected." ; + }; + String ERRCODE_SFX_SHARED_NOPASSWORDCHANGE + { + Text [ en-US ] = "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first."; + }; +}; + +// eof ------------------------------------------------------------------------ + diff --git a/svx/source/src/makefile.mk b/svx/source/src/makefile.mk index b1ce27695884..630c9c420bb8 100644 --- a/svx/source/src/makefile.mk +++ b/svx/source/src/makefile.mk @@ -43,8 +43,6 @@ TARGET=ofa RES1FILELIST=\ $(SRS)$/app.srs \ - $(SOLARCOMMONRESDIR)$/svtools.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs \ $(SOLARCOMMONRESDIR)$/basic.srs RESLIB1NAME=$(TARGET) @@ -55,7 +53,8 @@ RESLIB1SRSFILES=$(RES1FILELIST) SRS1NAME= app SRC1FILES= \ - app.src + app.src \ + errtxt.src .INCLUDE : target.mk diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index 070aecc308b6..92eee374f9da 100644 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk @@ -125,30 +125,31 @@ SHL1USE_EXPORTS=name SHL1LIBS= $(LIB5TARGET) $(LIB6TARGET) SHL1STDLIBS= \ - $(AVMEDIALIB) \ - $(SFX2LIB) \ - $(XMLOFFLIB) \ - $(GOODIESLIB) \ - $(BASEGFXLIB) \ - $(DRAWINGLAYERLIB) \ - $(LNGLIB) \ - $(BASICLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(I18NPAPERLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(SALLIB) \ - $(ICUUCLIB) + $(AVMEDIALIB) \ + $(BASEGFXLIB) \ + $(BASICLIB) \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(DRAWINGLAYERLIB) \ + $(FWELIB) \ + $(GOODIESLIB) \ + $(I18NISOLANGLIB) \ + $(I18NPAPERLIB) \ + $(ICUUCLIB) \ + $(LNGLIB) \ + $(SALLIB) \ + $(SFX2LIB) \ + $(SOTLIB) \ + $(SVLLIB) \ + $(SVTOOLLIB) \ + $(TKLIB) \ + $(TOOLSLIB) \ + $(UCBHELPERLIB) \ + $(UNOTOOLSLIB) \ + $(VCLLIB) \ + $(VOSLIB) \ + $(XMLOFFLIB) \ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) @@ -162,29 +163,29 @@ SHL2DEPN=$(SHL1TARGETN) SHL2LIBS= $(LIB1TARGET) $(LIB2TARGET) $(LIB3TARGET) $(LIB4TARGET) SHL2STDLIBS= \ - $(SVXCORELIB) \ - $(SFX2LIB) \ - $(XMLOFFLIB) \ - $(GOODIESLIB) \ - $(BASEGFXLIB) \ - $(DRAWINGLAYERLIB) \ - $(BASICLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(XMLSCRIPTLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(SALLIB) \ - $(ICUUCLIB) + $(BASEGFXLIB) \ + $(BASICLIB) \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(DRAWINGLAYERLIB) \ + $(GOODIESLIB) \ + $(I18NISOLANGLIB) \ + $(ICUUCLIB) \ + $(SALLIB) \ + $(SFX2LIB) \ + $(SOTLIB) \ + $(SVLLIB) \ + $(SVTOOLLIB) \ + $(SVXCORELIB) \ + $(TKLIB) \ + $(TOOLSLIB) \ + $(UCBHELPERLIB) \ + $(UNOTOOLSLIB) \ + $(VCLLIB) \ + $(VOSLIB) \ + $(XMLOFFLIB) \ + $(XMLSCRIPTLIB) \ .IF "$(GUI)"=="WNT" SHL2STDLIBS+=$(SHELLLIB) @@ -219,8 +220,7 @@ SRSFILELIST=\ $(SRS)$/svxlink.srs \ $(SRS)$/accessibility.srs \ $(SRS)$/table.srs \ - $(SRS)$/toolbars.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs + $(SRS)$/toolbars.srs RESLIB1NAME=svx RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw -- cgit v1.2.3 From 692dac6c6e964a64909f9adfba44f936810c2646 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 17 Apr 2010 12:41:17 +0200 Subject: CWS gnumake2: new gbuild system --- framework/Makefile | 30 +++ framework/prj/gbuild.lst | 3 + framework/prj/makefile.mk | 2 + framework/prj/target_lib_fwe.mk | 117 +++++++++ framework/prj/target_lib_fwi.mk | 96 ++++++++ framework/prj/target_lib_fwk.mk | 189 +++++++++++++++ framework/prj/target_lib_fwl.mk | 100 ++++++++ framework/prj/target_lib_fwm.mk | 81 +++++++ framework/prj/target_module_framework.mk | 55 +++++ framework/prj/target_package_dtd.mk | 35 +++ framework/prj/target_package_inc.mk | 47 ++++ framework/prj/target_package_uiconfig.mk | 32 +++ framework/prj/target_package_unotypes.mk | 30 +++ framework/prj/target_res_fwe.mk | 61 +++++ sfx2/Makefile | 30 +++ sfx2/prj/gbuild.lst | 4 + sfx2/prj/makefile.mk | 2 + sfx2/prj/target_lib_qstart.mk | 80 +++++++ sfx2/prj/target_lib_sfx2.mk | 285 ++++++++++++++++++++++ sfx2/prj/target_module_sfx2.mk | 47 ++++ sfx2/prj/target_package_inc.mk | 159 +++++++++++++ sfx2/prj/target_res_sfx2.mk | 76 ++++++ xmloff/Makefile | 30 +++ xmloff/prj/gbuild.lst | 4 + xmloff/prj/makefile.mk | 2 + xmloff/prj/target_lib_xo.mk | 392 +++++++++++++++++++++++++++++++ xmloff/prj/target_lib_xof.mk | 110 +++++++++ xmloff/prj/target_module_xmloff.mk | 42 ++++ xmloff/prj/target_package_inc.mk | 129 ++++++++++ 29 files changed, 2270 insertions(+) create mode 100644 framework/Makefile create mode 100644 framework/prj/gbuild.lst create mode 100644 framework/prj/makefile.mk create mode 100644 framework/prj/target_lib_fwe.mk create mode 100644 framework/prj/target_lib_fwi.mk create mode 100644 framework/prj/target_lib_fwk.mk create mode 100644 framework/prj/target_lib_fwl.mk create mode 100644 framework/prj/target_lib_fwm.mk create mode 100644 framework/prj/target_module_framework.mk create mode 100644 framework/prj/target_package_dtd.mk create mode 100644 framework/prj/target_package_inc.mk create mode 100644 framework/prj/target_package_uiconfig.mk create mode 100644 framework/prj/target_package_unotypes.mk create mode 100644 framework/prj/target_res_fwe.mk create mode 100644 sfx2/Makefile create mode 100644 sfx2/prj/gbuild.lst create mode 100644 sfx2/prj/makefile.mk create mode 100644 sfx2/prj/target_lib_qstart.mk create mode 100644 sfx2/prj/target_lib_sfx2.mk create mode 100644 sfx2/prj/target_module_sfx2.mk create mode 100644 sfx2/prj/target_package_inc.mk create mode 100644 sfx2/prj/target_res_sfx2.mk create mode 100644 xmloff/Makefile create mode 100644 xmloff/prj/gbuild.lst create mode 100644 xmloff/prj/makefile.mk create mode 100644 xmloff/prj/target_lib_xo.mk create mode 100644 xmloff/prj/target_lib_xof.mk create mode 100644 xmloff/prj/target_module_xmloff.mk create mode 100644 xmloff/prj/target_package_inc.mk (limited to 'sfx2') diff --git a/framework/Makefile b/framework/Makefile new file mode 100644 index 000000000000..d020b04dba7c --- /dev/null +++ b/framework/Makefile @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 ../solenv/inc/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) diff --git a/framework/prj/gbuild.lst b/framework/prj/gbuild.lst new file mode 100644 index 000000000000..3591f5b29a63 --- /dev/null +++ b/framework/prj/gbuild.lst @@ -0,0 +1,3 @@ +fr framework : l10n svtools NULL +fr framework usr1 - all fr_mkout NULL +fr framework\prj nmake - all fr_all NULL diff --git a/framework/prj/makefile.mk b/framework/prj/makefile.mk new file mode 100644 index 000000000000..a5f9aa9d8248 --- /dev/null +++ b/framework/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -sj9 diff --git a/framework/prj/target_lib_fwe.mk b/framework/prj/target_lib_fwe.mk new file mode 100644 index 000000000000..9387cad85a67 --- /dev/null +++ b/framework/prj/target_lib_fwe.mk @@ -0,0 +1,117 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fwe)) + +$(call gb_Library_get_headers_target,fwe) : $(call gb_Package_get_target,framework_inc) + +$(eval $(call gb_Library_set_include,fwe,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/framework/ \ + -I$(SRCDIR)/framework/inc \ + -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/source/inc \ + -I$(OUTDIR)/inc/framework \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,fwe,\ + $$(DEFS) \ + -DFWE_DLLIMPLEMENTATION\ +)) + +$(eval $(call gb_Library_add_linked_libs,fwe,\ + comphelper \ + cppu \ + cppuhelper \ + fwi \ + sal \ + stl \ + svl \ + svt \ + tl \ + utl \ + vcl \ + vos3 \ +)) + +$(eval $(call gb_Library_add_exception_objects,fwe,\ + framework/source/fwe/classes/actiontriggercontainer \ + framework/source/fwe/classes/actiontriggerpropertyset \ + framework/source/fwe/classes/actiontriggerseparatorpropertyset \ + framework/source/fwe/classes/addonmenu \ + framework/source/fwe/classes/addonsoptions \ + framework/source/fwe/classes/bmkmenu \ + framework/source/fwe/classes/fwkresid \ + framework/source/fwe/classes/imagewrapper \ + framework/source/fwe/classes/menuextensionsupplier \ + framework/source/fwe/classes/rootactiontriggercontainer \ + framework/source/fwe/classes/sfxhelperfunctions \ + framework/source/fwe/dispatch/interaction \ + framework/source/fwe/helper/acceleratorinfo \ + framework/source/fwe/helper/actiontriggerhelper \ + framework/source/fwe/helper/configimporter \ + framework/source/fwe/helper/imageproducer \ + framework/source/fwe/helper/propertysetcontainer \ + framework/source/fwe/helper/titlehelper \ + framework/source/fwe/helper/uiconfigelementwrapperbase \ + framework/source/fwe/helper/uielementwrapperbase \ + framework/source/fwe/interaction/preventduplicateinteraction \ + framework/source/fwe/xml/eventsconfiguration \ + framework/source/fwe/xml/eventsdocumenthandler \ + framework/source/fwe/xml/imagesconfiguration \ + framework/source/fwe/xml/imagesdocumenthandler \ + framework/source/fwe/xml/menuconfiguration \ + framework/source/fwe/xml/menudocumenthandler \ + framework/source/fwe/xml/saxnamespacefilter \ + framework/source/fwe/xml/statusbarconfiguration \ + framework/source/fwe/xml/statusbardocumenthandler \ + framework/source/fwe/xml/toolboxconfiguration \ + framework/source/fwe/xml/toolboxdocumenthandler \ + framework/source/fwe/xml/toolboxlayoutdocumenthandler \ + framework/source/fwe/xml/xmlnamespaces \ +)) + +ifeq ($(OS),LINUX) + +$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS)))) + +$(eval $(call gb_Library_add_linked_libs,fwe,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fwe,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# TODO: visibility +# vim: set noet sw=4 ts=4: diff --git a/framework/prj/target_lib_fwi.mk b/framework/prj/target_lib_fwi.mk new file mode 100644 index 000000000000..0c1d9a63fedf --- /dev/null +++ b/framework/prj/target_lib_fwi.mk @@ -0,0 +1,96 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fwi)) + +$(call gb_Library_get_headers_target,fwi) : $(call gb_Package_get_target,framework_inc) + +$(eval $(call gb_Library_set_defs,fwi,\ + $$(DEFS) \ + -DFWI_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_set_include,fwi,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/framework/ \ + -I$(SRCDIR)/framework/inc \ + -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/source/inc \ + -I$(OUTDIR)/inc/framework \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,fwi,\ + comphelper \ + stl \ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ + vos3 \ +)) + +$(eval $(call gb_Library_add_exception_objects,fwi,\ + framework/source/fwi/classes/converter \ + framework/source/fwi/classes/framelistanalyzer \ + framework/source/fwi/classes/propertysethelper \ + framework/source/fwi/classes/protocolhandlercache \ + framework/source/fwi/helper/mischelper \ + framework/source/fwi/helper/networkdomain \ + framework/source/fwi/helper/popupmenucontrollerbase \ + framework/source/fwi/helper/shareablemutex \ + framework/source/fwi/jobs/configaccess \ + framework/source/fwi/jobs/jobconst \ + framework/source/fwi/threadhelp/lockhelper \ + framework/source/fwi/threadhelp/transactionmanager \ + framework/source/fwi/uielement/constitemcontainer \ + framework/source/fwi/uielement/itemcontainer \ + framework/source/fwi/uielement/rootitemcontainer \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,fwi,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fwi,\ + advapi32 \ + kernel32 \ + msvcrt \ + stl \ + unicows \ + uwinapi \ +)) +endif +# TODO: visibility +# vim: set noet sw=4 ts=4: diff --git a/framework/prj/target_lib_fwk.mk b/framework/prj/target_lib_fwk.mk new file mode 100644 index 000000000000..2cdbc14a2938 --- /dev/null +++ b/framework/prj/target_lib_fwk.mk @@ -0,0 +1,189 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fwk)) + +$(call gb_Library_get_headers_target,fwk) : $(call gb_Package_get_target,framework_inc) + +$(eval $(call gb_Library_set_include,fwk,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/framework/ \ + -I$(SRCDIR)/framework/inc \ + -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/source/inc \ + -I$(OUTDIR)/inc/framework \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,fwk,\ + comphelper \ + fwe \ + fwi \ + i18nisolang1 \ + sot \ + stl \ + svl \ + svt \ + tk \ + tl \ + ucbhelper \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,fwk,\ + framework/source/accelerators/acceleratorcache \ + framework/source/accelerators/acceleratorconfiguration \ + framework/source/accelerators/documentacceleratorconfiguration \ + framework/source/accelerators/globalacceleratorconfiguration \ + framework/source/accelerators/keymapping \ + framework/source/accelerators/moduleacceleratorconfiguration \ + framework/source/accelerators/presethandler \ + framework/source/accelerators/storageholder \ + framework/source/classes/droptargetlistener \ + framework/source/classes/framecontainer \ + framework/source/classes/menumanager \ + framework/source/classes/taskcreator \ + framework/source/constant/containerquery \ + framework/source/constant/contenthandler \ + framework/source/constant/filter \ + framework/source/constant/frameloader \ + framework/source/dispatch/closedispatcher \ + framework/source/dispatch/dispatchinformationprovider \ + framework/source/dispatch/dispatchprovider \ + framework/source/dispatch/helpagentdispatcher \ + framework/source/dispatch/interceptionhelper \ + framework/source/dispatch/loaddispatcher \ + framework/source/dispatch/menudispatcher \ + framework/source/dispatch/startmoduledispatcher \ + framework/source/dispatch/windowcommanddispatch \ + framework/source/helper/dockingareadefaultacceptor \ + framework/source/helper/ocomponentaccess \ + framework/source/helper/ocomponentenumeration \ + framework/source/helper/oframes \ + framework/source/helper/persistentwindowstate \ + framework/source/helper/statusindicator \ + framework/source/helper/statusindicatorfactory \ + framework/source/helper/tagwindowasmodified \ + framework/source/helper/titlebarupdate \ + framework/source/helper/vclstatusindicator \ + framework/source/helper/wakeupthread \ + framework/source/interaction/quietinteraction \ + framework/source/jobs/job \ + framework/source/jobs/jobdata \ + framework/source/jobs/jobdispatch \ + framework/source/jobs/jobexecutor \ + framework/source/jobs/jobresult \ + framework/source/jobs/joburl \ + framework/source/layoutmanager/layoutmanager \ + framework/source/loadenv/loaddispatchlistener \ + framework/source/loadenv/loadenv \ + framework/source/loadenv/targethelper \ + framework/source/register/registerservices \ + framework/source/services/autorecovery \ + framework/source/services/backingcomp \ + framework/source/services/backingwindow \ + framework/source/services/desktop \ + framework/source/services/frame \ + framework/source/services/modulemanager \ + framework/source/services/pathsettings \ + framework/source/services/sessionlistener \ + framework/source/services/substitutepathvars \ + framework/source/services/taskcreatorsrv \ + framework/source/services/uriabbreviation \ + framework/source/services/urltransformer \ + framework/source/uiconfiguration/globalsettings \ + framework/source/uiconfiguration/graphicnameaccess \ + framework/source/uiconfiguration/imagemanager \ + framework/source/uiconfiguration/imagemanagerimpl \ + framework/source/uiconfiguration/moduleimagemanager \ + framework/source/uiconfiguration/moduleuicfgsupplier \ + framework/source/uiconfiguration/moduleuiconfigurationmanager \ + framework/source/uiconfiguration/uicategorydescription \ + framework/source/uiconfiguration/uiconfigurationmanager \ + framework/source/uiconfiguration/uiconfigurationmanagerimpl \ + framework/source/uiconfiguration/windowstateconfiguration \ + framework/source/uielement/addonstoolbarmanager \ + framework/source/uielement/addonstoolbarwrapper \ + framework/source/uielement/buttontoolbarcontroller \ + framework/source/uielement/comboboxtoolbarcontroller \ + framework/source/uielement/complextoolbarcontroller \ + framework/source/uielement/controlmenucontroller \ + framework/source/uielement/dropdownboxtoolbarcontroller \ + framework/source/uielement/edittoolbarcontroller \ + framework/source/uielement/generictoolbarcontroller \ + framework/source/uielement/imagebuttontoolbarcontroller \ + framework/source/uielement/langselectionstatusbarcontroller \ + framework/source/uielement/menubarmanager \ + framework/source/uielement/menubarmerger \ + framework/source/uielement/menubarwrapper \ + framework/source/uielement/objectmenucontroller \ + framework/source/uielement/progressbarwrapper \ + framework/source/uielement/recentfilesmenucontroller \ + framework/source/uielement/spinfieldtoolbarcontroller \ + framework/source/uielement/statusbar \ + framework/source/uielement/statusbarmanager \ + framework/source/uielement/statusbarwrapper \ + framework/source/uielement/statusindicatorinterfacewrapper \ + framework/source/uielement/togglebuttontoolbarcontroller \ + framework/source/uielement/toolbar \ + framework/source/uielement/toolbarmanager \ + framework/source/uielement/toolbarmerger \ + framework/source/uielement/toolbarwrapper \ + framework/source/uielement/uicommanddescription \ + framework/source/uifactory/addonstoolboxfactory \ + framework/source/uifactory/factoryconfiguration \ + framework/source/uifactory/menubarfactory \ + framework/source/uifactory/popupmenucontrollerfactory \ + framework/source/uifactory/statusbarcontrollerfactory \ + framework/source/uifactory/statusbarfactory \ + framework/source/uifactory/toolbarcontrollerfactory \ + framework/source/uifactory/toolboxfactory \ + framework/source/uifactory/uielementfactorymanager \ + framework/source/uifactory/windowcontentfactorymanager \ + framework/source/xml/acceleratorconfigurationreader \ + framework/source/xml/acceleratorconfigurationwriter \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,fwk,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fwk,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/framework/prj/target_lib_fwl.mk b/framework/prj/target_lib_fwl.mk new file mode 100644 index 000000000000..8e549041cae3 --- /dev/null +++ b/framework/prj/target_lib_fwl.mk @@ -0,0 +1,100 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fwl)) + +$(call gb_Library_get_headers_target,fwl) : $(call gb_Package_get_target,framework_inc) + +$(eval $(call gb_Library_set_include,fwl,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/framework/ \ + -I$(SRCDIR)/framework/inc \ + -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/source/inc \ + -I$(OUTDIR)/inc/framework \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,fwl,\ + comphelper \ + fwe \ + fwi \ + i18nisolang1 \ + stl \ + svl \ + svt \ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,fwl,\ + framework/source/register/registertemp \ + framework/source/services/mediatypedetectionhelper \ + framework/source/dispatch/mailtodispatcher \ + framework/source/dispatch/oxt_handler \ + framework/source/uielement/toolbarsmenucontroller \ + framework/source/uielement/newmenucontroller \ + framework/source/uielement/macrosmenucontroller \ + framework/source/uielement/langselectionmenucontroller \ + framework/source/uielement/headermenucontroller \ + framework/source/uielement/footermenucontroller \ + framework/source/uielement/fontsizemenucontroller \ + framework/source/uielement/fontmenucontroller \ + framework/source/services/tabwindowservice \ + framework/source/classes/fwktabwindow \ + framework/source/uielement/logotextstatusbarcontroller \ + framework/source/classes/fwlresid \ + framework/source/uielement/logoimagestatusbarcontroller \ + framework/source/uielement/simpletextstatusbarcontroller \ + framework/source/services/uriabbreviation \ + framework/source/dispatch/servicehandler \ + framework/source/services/license \ + framework/source/recording/dispatchrecorder \ + framework/source/recording/dispatchrecordersupplier \ + framework/source/services/dispatchhelper \ + framework/source/dispatch/popupmenudispatcher \ +)) +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,fwl,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fwl,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/framework/prj/target_lib_fwm.mk b/framework/prj/target_lib_fwm.mk new file mode 100644 index 000000000000..e0b4df3ef2c8 --- /dev/null +++ b/framework/prj/target_lib_fwm.mk @@ -0,0 +1,81 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fwm)) + +$(call gb_Library_get_headers_target,fwm) : $(call gb_Package_get_target,framework_inc) + +$(eval $(call gb_Library_set_include,fwm,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/framework/ \ + -I$(SRCDIR)/framework/inc \ + -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/source/inc \ + -I$(OUTDIR)/inc/framework \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,fwm,\ + comphelper \ + fwi \ + stl \ + svl \ + svt \ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ + vos3 \ +)) + +$(eval $(call gb_Library_add_exception_objects,fwm,\ + framework/source/dispatch/systemexec \ + framework/source/jobs/helponstartup \ + framework/source/jobs/shelljob \ + framework/source/register/register3rdcomponents \ + framework/source/tabwin/tabwindow \ + framework/source/tabwin/tabwinfactory \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,fwm,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fwm,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/framework/prj/target_module_framework.mk b/framework/prj/target_module_framework.mk new file mode 100644 index 000000000000..86a30a0b3e45 --- /dev/null +++ b/framework/prj/target_module_framework.mk @@ -0,0 +1,55 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 $(foreach targetdef,\ + lib_fwe \ + lib_fwi \ + lib_fwk \ + lib_fwl \ + lib_fwm \ + package_dtd \ + package_inc \ + package_uiconfig \ + package_unotypes \ + res_fwe \ +,$(SRCDIR)/framework/prj/target_$(targetdef).mk) + + +$(eval $(call gb_Module_Module,framework,\ + $(call gb_AllLangResTarget_get_target,fwe) \ + $(call gb_Library_get_target,fwe) \ + $(call gb_Library_get_target,fwi) \ + $(call gb_Library_get_target,fwk) \ + $(call gb_Library_get_target,fwl) \ + $(call gb_Library_get_target,fwm) \ + $(call gb_Library_get_target,fwe) \ + $(call gb_Package_get_target,framework_dtd) \ + $(call gb_Package_get_target,framework_inc) \ + $(call gb_Package_get_target,framework_uiconfig) \ + $(call gb_Package_get_target,framework_unotypes) \ +)) +# vim: set noet ts=4 sw=4: diff --git a/framework/prj/target_package_dtd.mk b/framework/prj/target_package_dtd.mk new file mode 100644 index 000000000000..db23783c4ef9 --- /dev/null +++ b/framework/prj/target_package_dtd.mk @@ -0,0 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,framework_dtd,$(SRCDIR)/framework/dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/accelerator.dtd,accelerator.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/event.dtd,event.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/groupuinames.dtd,groupuinames.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/image.dtd,image.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/menubar.dtd,menubar.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/statusbar.dtd,statusbar.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/toolbar.dtd,toolbar.dtd)) diff --git a/framework/prj/target_package_inc.mk b/framework/prj/target_package_inc.mk new file mode 100644 index 000000000000..32ae89b7b1be --- /dev/null +++ b/framework/prj/target_package_inc.mk @@ -0,0 +1,47 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,framework_inc,$(SRCDIR)/framework/inc)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/acceleratorinfo.hxx,helper/acceleratorinfo.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/actiontriggerhelper.hxx,helper/actiontriggerhelper.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonmenu.hxx,classes/addonmenu.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx,classes/addonsoptions.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,classes/bmkmenu.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,helper/configimporter.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,xml/eventsconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,helper/imageproducer.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,xml/imagesconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,dispatch/interaction.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuconfiguration.hxx,xml/menuconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuextensionsupplier.hxx,classes/menuextensionsupplier.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/preventduplicateinteraction.hxx,interaction/preventduplicateinteraction.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/sfxhelperfunctions.hxx,classes/sfxhelperfunctions.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/titlehelper.hxx,helper/titlehelper.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/toolboxconfiguration.hxx,xml/toolboxconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/fwedllapi.h,fwedllapi.h)) +$(eval $(call gb_Package_add_file,framework_inc,inc/fwkdllapi.h,fwkdllapi.h)) +$(eval $(call gb_Package_add_file,framework_inc,inc/fwidllapi.h,fwidllapi.h)) diff --git a/framework/prj/target_package_uiconfig.mk b/framework/prj/target_package_uiconfig.mk new file mode 100644 index 000000000000..c92344a153f5 --- /dev/null +++ b/framework/prj/target_package_uiconfig.mk @@ -0,0 +1,32 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,framework_uiconfig,$(SRCDIR)/framework/uiconfig)) +$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/accelerator/en-US/default.xml,startmodule/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/menubar/menubar.xml,startmodule/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/statusbar/statusbar.xml,startmodule/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/toolbar/standardbar.xml,startmodule/toolbar/standardbar.xml)) diff --git a/framework/prj/target_package_unotypes.mk b/framework/prj/target_package_unotypes.mk new file mode 100644 index 000000000000..01069ae93dc4 --- /dev/null +++ b/framework/prj/target_package_unotypes.mk @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,framework_unotypes,$(SRCDIR)/framework/source/unotypes)) +$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwk.xml,fwk.xml)) +$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwl.xml,fwl.xml)) diff --git a/framework/prj/target_res_fwe.mk b/framework/prj/target_res_fwe.mk new file mode 100644 index 000000000000..aa7e93c4095b --- /dev/null +++ b/framework/prj/target_res_fwe.mk @@ -0,0 +1,61 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,fwe)) + +$(eval $(call gb_AllLangResTarget_add_srs,fwe,\ + fwe/fwk_classes \ + fwe/fwk_services \ +)) + + +$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_classes)) + +$(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\ + $$(INCLUDE) \ + -I$(SRCDIR)/framework/inc \ + -I$(SRCDIR)/framework/inc/classes \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\ + framework/source/classes/resource.src \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services)) + +$(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\ + $$(INCLUDE) \ + -I$(SRCDIR)/framework/inc \ + -I$(SRCDIR)/framework/inc/services \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,fwe/fwk_services,\ + framework/source/services/fwk_services.src \ +)) +# vim: set noet sw=4 ts=4: diff --git a/sfx2/Makefile b/sfx2/Makefile new file mode 100644 index 000000000000..d020b04dba7c --- /dev/null +++ b/sfx2/Makefile @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 ../solenv/inc/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) diff --git a/sfx2/prj/gbuild.lst b/sfx2/prj/gbuild.lst new file mode 100644 index 000000000000..7dc2a95cb994 --- /dev/null +++ b/sfx2/prj/gbuild.lst @@ -0,0 +1,4 @@ +sf sfx2 : l10n idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL +sf sfx2 usr1 - all sf_mkout NULL +sf sfx2\prj nmake - all sf_prj NULL + diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk new file mode 100644 index 000000000000..a5f9aa9d8248 --- /dev/null +++ b/sfx2/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -sj9 diff --git a/sfx2/prj/target_lib_qstart.mk b/sfx2/prj/target_lib_qstart.mk new file mode 100644 index 000000000000..2da2ada42db3 --- /dev/null +++ b/sfx2/prj/target_lib_qstart.mk @@ -0,0 +1,80 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +#ifeq ($(OS),UNX) +$(eval $(call gb_Library_Library,qstart)) + +$(eval $(call gb_Library_set_include,qstart,\ + $$(INCLUDE) \ + -I$(SRCDIR)/sfx2/inc \ + -I$(SRCDIR)/sfx2/inc/sfx2 \ + -I$(SRCDIR)/sfx2/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +#WTF: this nice code is currently found in the makefile.mk (unix part only) +# PKGCONFIG_MODULES=gtk+-2.0 +# .IF "$(PKGCONFIG_ROOT)"!="" +# PKG_CONFIG=$(PKGCONFIG_ROOT)/bin/pkg-config +# PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)/lib/pkgconfig +# .EXPORT : PKG_CONFIG_PATH +# PKGCONFIG_PREFIX=--define-variable=prefix=$(PKGCONFIG_ROOT) +# .ELSE +# PKG_CONFIG*=pkg-config +# .ENDIF +# PKGCONFIG_CFLAGS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --cflags $(PKGCONFIG_MODULES)) +# PKGCONFIG_LIBS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --libs $(PKGCONFIG_MODULES)) +# CFLAGS+=$(PKGCONFIG_CFLAGS + +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Library_set_defs,qstart,\ + $$(DEFS) \ + -DDLL_NAME=libsfx$(DLLPOSTFIX)$(DLLPOST) \ + -DENABLE_QUICKSTART_APPLET \ +)) +endif + +#todo: add libs +$(eval $(call gb_Library_add_linked_libs,qstart,\ + sfx \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,qstart,\ + icuuc \ + dl \ + m \ + pthread \ +)) + +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Library_add_exception_objects,qstart,\ + sfx2/source/appl/shutdowniconunx.ob \ +)) +endif + +endif diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk new file mode 100644 index 000000000000..7770abef5a28 --- /dev/null +++ b/sfx2/prj/target_lib_sfx2.mk @@ -0,0 +1,285 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,sfx)) + +$(call gb_Library_get_headers_target,sfx) : $(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) +$(call gb_Library_get_clean_target,sfx) : $(call gb_SdiTarget_get_clean_target,sfx2/sdi/sfxslots) + +$(eval $(call gb_Library_set_include,sfx,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/sfx2/sdi \ + -I$(WORKDIR)/inc/sfx2 \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/sfx2/inc \ + -I$(SRCDIR)/sfx2/inc/sfx2 \ + -I$(SRCDIR)/sfx2/source/inc \ + -I$(SRCDIR)/sfx2/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ + $(LIBXML_CFLAGS) \ +)) + +$(eval $(call gb_Library_set_defs,sfx,\ + $$(DEFS) \ + -DSFX2_DLLIMPLEMENTATION \ + -DABOUTBMPNAMES="$(ABOUTBITMAPS)" \ +)) + +ifneq ($(OS),UNX) +$(eval $(call gb_Library_set_defs,sfx,\ + $$(DEFS) \ + -DENABLE_QUICKSTART_APPLET \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,sfx,\ + comphelper \ + i18nisolang1 \ + sb \ + sot \ + svl \ + svt \ + tk \ + tl \ + ucbhelper \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ + vos3 \ + fwe \ + sax \ + xml2 \ + stl \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,sfx,\ + icuuc \ + dl \ + m \ + pthread \ +)) + +$(eval $(call gb_Library_add_exception_objects,sfx,\ + sfx2/source/appl/appcfg \ + sfx2/source/appl/imagemgr \ + sfx2/source/appl/appopen \ + sfx2/source/appl/appmain \ + sfx2/source/appl/appmisc \ + sfx2/source/appl/appinit \ + sfx2/source/appl/helpinterceptor \ + sfx2/source/appl/newhelp \ + sfx2/source/appl/sfxhelp \ + sfx2/source/appl/shutdownicon \ + sfx2/source/appl/shutdowniconw32 \ + sfx2/source/appl/sfxpicklist \ + sfx2/source/appl/helpdispatch \ + sfx2/source/appl/xpackcreator \ + sfx2/source/appl/app \ + sfx2/source/appl/appbas \ + sfx2/source/appl/appchild \ + sfx2/source/appl/appdata \ + sfx2/source/appl/appdde \ + sfx2/source/appl/appquit \ + sfx2/source/appl/appreg \ + sfx2/source/appl/appserv \ + sfx2/source/appl/appuno \ + sfx2/source/appl/appbaslib \ + sfx2/source/appl/childwin \ + sfx2/source/appl/imestatuswindow \ + sfx2/source/appl/impldde \ + sfx2/source/appl/linkmgr2 \ + sfx2/source/appl/linksrc \ + sfx2/source/appl/lnkbase2 \ + sfx2/source/appl/module \ + sfx2/source/appl/sfxdll \ + sfx2/source/appl/workwin \ + sfx2/source/appl/fwkhelper \ + sfx2/source/bastyp/sfxhtml \ + sfx2/source/bastyp/frmhtml \ + sfx2/source/bastyp/frmhtmlw \ + sfx2/source/bastyp/misc \ + sfx2/source/bastyp/progress \ + sfx2/source/bastyp/sfxresid \ + sfx2/source/bastyp/bitset \ + sfx2/source/bastyp/minarray \ + sfx2/source/bastyp/fltfnc \ + sfx2/source/bastyp/mieclip \ + sfx2/source/bastyp/fltlst \ + sfx2/source/bastyp/helper \ + sfx2/source/config/evntconf \ + sfx2/source/control/bindings \ + sfx2/source/control/ctrlitem \ + sfx2/source/control/dispatch \ + sfx2/source/control/macrconf \ + sfx2/source/control/macro \ + sfx2/source/control/minfitem \ + sfx2/source/control/msg \ + sfx2/source/control/msgpool \ + sfx2/source/control/objface \ + sfx2/source/control/querystatus \ + sfx2/source/control/request \ + sfx2/source/control/sfxstatuslistener \ + sfx2/source/control/shell \ + sfx2/source/control/sorgitm \ + sfx2/source/control/srchitem \ + sfx2/source/control/statcach \ + sfx2/source/control/unoctitm \ + sfx2/source/dialog/filedlghelper \ + sfx2/source/dialog/filtergrouping \ + sfx2/source/dialog/itemconnect \ + sfx2/source/dialog/mailmodel \ + sfx2/source/dialog/partwnd \ + sfx2/source/dialog/recfloat \ + sfx2/source/dialog/templdlg \ + sfx2/source/dialog/dinfdlg \ + sfx2/source/dialog/dockwin \ + sfx2/source/doc/printhelper \ + sfx2/source/doc/docinf \ + sfx2/source/doc/oleprops \ + sfx2/source/doc/iframe \ + sfx2/source/doc/plugin \ + sfx2/source/doc/docfile \ + sfx2/source/doc/objuno \ + sfx2/source/doc/frmdescr \ + sfx2/source/doc/objxtor \ + sfx2/source/doc/objmisc \ + sfx2/source/doc/objstor \ + sfx2/source/doc/objcont \ + sfx2/source/doc/objserv \ + sfx2/source/doc/objitem \ + sfx2/source/doc/ownsubfilterservice \ + sfx2/source/doc/docfac \ + sfx2/source/doc/docfilt \ + sfx2/source/doc/doctempl \ + sfx2/source/doc/doctemplates \ + sfx2/source/doc/doctemplateslocal \ + sfx2/source/doc/docvor \ + sfx2/source/doc/new \ + sfx2/source/doc/doctdlg \ + sfx2/source/doc/sfxbasemodel \ + sfx2/source/doc/guisaveas \ + sfx2/source/doc/objembed \ + sfx2/source/doc/graphhelp \ + sfx2/source/doc/QuerySaveDocument \ + sfx2/source/doc/opostponedtruncationstream \ + sfx2/source/doc/docinsert \ + sfx2/source/doc/docmacromode \ + sfx2/source/doc/SfxDocumentMetaData \ + sfx2/source/doc/Metadatable \ + sfx2/source/doc/DocumentMetadataAccess \ + sfx2/source/doc/sfxmodelfactory \ + sfx2/source/doc/sfxacldetect \ + sfx2/source/doc/docstoragemodifylistener \ + sfx2/source/doc/querytemplate \ + sfx2/source/explorer/nochaos \ + sfx2/source/inet/inettbc \ + sfx2/source/menu/mnumgr \ + sfx2/source/menu/virtmenu \ + sfx2/source/menu/objmnctl \ + sfx2/source/menu/mnuitem \ + sfx2/source/notify/eventsupplier \ + sfx2/source/statbar/stbitem \ + sfx2/source/toolbox/tbxitem \ + sfx2/source/toolbox/imgmgr \ + sfx2/source/view/ipclient \ + sfx2/source/view/viewsh \ + sfx2/source/view/frmload \ + sfx2/source/view/frame \ + sfx2/source/view/printer \ + sfx2/source/view/prnmon \ + sfx2/source/view/viewprn \ + sfx2/source/view/viewfac \ + sfx2/source/view/orgmgr \ + sfx2/source/view/viewfrm \ + sfx2/source/view/impframe \ + sfx2/source/view/topfrm \ + sfx2/source/view/sfxbasecontroller \ + sfx2/source/view/userinputinterception \ +)) + +$(eval $(call gb_Library_add_noexception_objects,sfx,\ + sfx2/source/dialog/about \ + sfx2/source/dialog/alienwarn \ + sfx2/source/dialog/basedlgs \ + sfx2/source/dialog/dinfedt \ + sfx2/source/dialog/intro \ + sfx2/source/dialog/mgetempl \ + sfx2/source/dialog/navigat \ + sfx2/source/dialog/newstyle \ + sfx2/source/dialog/passwd \ + sfx2/source/dialog/printopt \ + sfx2/source/dialog/sfxdlg \ + sfx2/source/dialog/sfxurl \ + sfx2/source/dialog/splitwin \ + sfx2/source/dialog/srchdlg \ + sfx2/source/dialog/styfitem \ + sfx2/source/dialog/styledlg \ + sfx2/source/dialog/tabdlg \ + sfx2/source/dialog/tplcitem \ + sfx2/source/dialog/tplpitem \ + sfx2/source/dialog/versdlg \ + sfx2/source/notify/hintpost \ +)) + +$(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx)) + +$(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\ + $$(INCLUDE) \ + -I$(SRCDIR)/sfx2/inc/sfx2 \ + -I$(SRCDIR)/sfx2/inc \ + -I$(SRCDIR)/sfx2/sdi \ +)) + +ifeq ($(OS),OS2) +$(eval $(call gb_Library_add_exception_objects,sfx,\ + sfx2/source/appl/shutdowniconOs2.ob \ +)) +endif +ifeq ($(OS),OSX) +$(eval $(call gb_Library_add_exception_objects,sfx,\ + sfx2/source/appl/shutdowniconaqua.ob \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,sfx,\ + advapi32 \ + gdi32 \ + kernel32 \ + msvcrt \ + oldnames \ + ole32 \ + shell32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: + diff --git a/sfx2/prj/target_module_sfx2.mk b/sfx2/prj/target_module_sfx2.mk new file mode 100644 index 000000000000..d3a1996bab05 --- /dev/null +++ b/sfx2/prj/target_module_sfx2.mk @@ -0,0 +1,47 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,sfx2,\ + $(call gb_AllLangResTarget_get_target,sfx) \ + $(call gb_Library_get_target,sfx) \ +)) + +$(eval $(call gb_Module_read_includes,sfx2,\ + lib_sfx2 \ + package_inc \ + res_sfx2 \ +)) + +#todo: map file? +#todo: source/appl ohne Optimierung? +#todo: source/control ohne Optimierung? +#todo: source/dialog BUILD_VER_STRING +#todo: source/doc SYSTEM_LIBXML2 +#todo: noopt for acldetect.cxx? +#todo: ENABLE_LAYOUT +#todo: quickstarter +#todo: link against cocoa on Mac diff --git a/sfx2/prj/target_package_inc.mk b/sfx2/prj/target_package_inc.mk new file mode 100644 index 000000000000..9661439ce35c --- /dev/null +++ b/sfx2/prj/target_package_inc.mk @@ -0,0 +1,159 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) + +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/topfrm.hxx,sfx2/topfrm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfxhelp.hxx,sfx2/sfxhelp.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/stbitem.hxx,sfx2/stbitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/srchitem.hxx,sfx2/srchitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/srchdefs.hxx,sfx2/srchdefs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx)) + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sfx2/prj/target_res_sfx2.mk b/sfx2/prj/target_res_sfx2.mk new file mode 100644 index 000000000000..3feb0e2b9f6d --- /dev/null +++ b/sfx2/prj/target_res_sfx2.mk @@ -0,0 +1,76 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,sfx)) + +$(eval $(call gb_AllLangResTarget_add_srs,sfx,\ + sfx/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,sfx/res)) + +$(eval $(call gb_SrsTarget_set_include,sfx/res,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/sfx2/source/dialog \ + -I$(SRCDIR)/sfx2/source/inc \ + -I$(SRCDIR)/sfx2/inc/ \ + -I$(SRCDIR)/sfx2/inc/sfx \ +)) + +$(eval $(call gb_SrsTarget_add_files,sfx/res,\ + sfx2/source/appl/app.src \ + sfx2/source/appl/newhelp.src \ + sfx2/source/appl/dde.src \ + sfx2/source/appl/sfx.src \ + sfx2/source/doc/doc.src \ + sfx2/source/doc/new.src \ + sfx2/source/doc/doctdlg.src \ + sfx2/source/doc/doctempl.src \ + sfx2/source/doc/graphhelp.src \ + sfx2/source/menu/menu.src \ + sfx2/source/view/view.src \ + sfx2/source/dialog/alienwarn.src \ + sfx2/source/dialog/dialog.src \ + sfx2/source/dialog/dinfdlg.src \ + sfx2/source/dialog/dinfedt.src \ + sfx2/source/dialog/filedlghelper.src \ + sfx2/source/dialog/mailwindow.src \ + sfx2/source/dialog/mgetempl.src \ + sfx2/source/dialog/newstyle.src \ + sfx2/source/dialog/passwd.src \ + sfx2/source/dialog/printopt.src \ + sfx2/source/dialog/recfloat.src \ + sfx2/source/dialog/srchdlg.src \ + sfx2/source/dialog/templdlg.src \ + sfx2/source/dialog/versdlg.src \ + sfx2/source/bastyp/bastyp.src \ + sfx2/source/bastyp/fltfnc.src \ +)) + + diff --git a/xmloff/Makefile b/xmloff/Makefile new file mode 100644 index 000000000000..d020b04dba7c --- /dev/null +++ b/xmloff/Makefile @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 ../solenv/inc/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) diff --git a/xmloff/prj/gbuild.lst b/xmloff/prj/gbuild.lst new file mode 100644 index 000000000000..4dcebafb0386 --- /dev/null +++ b/xmloff/prj/gbuild.lst @@ -0,0 +1,4 @@ +xo xmloff : offapi svl vos NULL +xo xmloff usr1 - all xo_mkout NULL +xo xmloff\prj nmake - all xo_prj NULL + diff --git a/xmloff/prj/makefile.mk b/xmloff/prj/makefile.mk new file mode 100644 index 000000000000..a5f9aa9d8248 --- /dev/null +++ b/xmloff/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -sj9 diff --git a/xmloff/prj/target_lib_xo.mk b/xmloff/prj/target_lib_xo.mk new file mode 100644 index 000000000000..fa66d59aa08f --- /dev/null +++ b/xmloff/prj/target_lib_xo.mk @@ -0,0 +1,392 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,xo)) + +$(call gb_Library_get_headers_target,xo) : $(call gb_Package_get_target,xo_inc) + +$(eval $(call gb_Library_set_include,xo,\ + $$(SOLARINC) \ + -I. \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/xmloff/inc \ + -I$(SRCDIR)/xmloff/source/inc \ + -I$(SRCDIR)/xmloff/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,xo,\ + $$(DEFS) \ + -DXMLOFF_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,xo,\ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + sal \ + stl \ + svl \ + tl \ + utl \ + vos3 \ +)) + +$(eval $(call gb_Library_add_exception_objects,xo,\ + xmloff/source/draw/ximpshap \ + xmloff/source/draw/ximppage \ + xmloff/source/draw/ximpstyl \ + xmloff/source/draw/XMLShapeStyleContext \ + xmloff/source/draw/sdxmlimp \ + xmloff/source/draw/shapeimport \ + xmloff/source/draw/ximplink \ + xmloff/source/draw/propimp0 \ + xmloff/source/draw/ximpbody \ + xmloff/source/draw/eventimp \ + xmloff/source/draw/layerimp \ + xmloff/source/draw/shapeexport2 \ + xmloff/source/draw/animimp \ + xmloff/source/draw/ximp3dscene \ + xmloff/source/draw/ximpgrp \ + xmloff/source/draw/XMLImageMapExport \ + xmloff/source/draw/numithdl \ + xmloff/source/draw/XMLReplacementImageContext \ + xmloff/source/draw/ximpshow \ + xmloff/source/draw/descriptionimp \ + xmloff/source/draw/xexptran \ + xmloff/source/draw/animationexport \ + xmloff/source/draw/viewcontext \ + xmloff/source/draw/sdpropls \ + xmloff/source/draw/shapeexport3 \ + xmloff/source/draw/ximp3dobject \ + xmloff/source/draw/EnhancedCustomShapeToken \ + xmloff/source/draw/ximpcustomshape \ + xmloff/source/draw/shapeexport4 \ + xmloff/source/draw/animationimport \ + xmloff/source/draw/XMLGraphicsDefaultStyle \ + xmloff/source/draw/ximpnote \ + xmloff/source/draw/shapeexport \ + xmloff/source/draw/XMLImageMapContext \ + xmloff/source/draw/sdxmlexp \ + xmloff/source/draw/animexp \ + xmloff/source/draw/layerexp \ + xmloff/source/draw/XMLNumberStyles \ + xmloff/source/draw/XMLShapePropertySetContext \ + xmloff/source/chart/SchXMLImport \ + xmloff/source/chart/XMLErrorIndicatorPropertyHdl \ + xmloff/source/chart/PropertyMaps \ + xmloff/source/chart/ColorPropertySet \ + xmloff/source/chart/transporttypes \ + xmloff/source/chart/XMLSymbolImageContext \ + xmloff/source/chart/SchXMLTools \ + xmloff/source/chart/XMLLabelSeparatorContext \ + xmloff/source/chart/XMLChartPropertyContext \ + xmloff/source/chart/SchXMLSeriesHelper \ + xmloff/source/chart/SchXMLSeries2Context \ + xmloff/source/chart/SchXMLPlotAreaContext \ + xmloff/source/chart/contexts \ + xmloff/source/chart/XMLErrorBarStylePropertyHdl \ + xmloff/source/chart/XMLAxisPositionPropertyHdl \ + xmloff/source/chart/SchXMLParagraphContext \ + xmloff/source/chart/XMLTextOrientationHdl \ + xmloff/source/chart/XMLSymbolTypePropertyHdl \ + xmloff/source/chart/SchXMLChartContext \ + xmloff/source/chart/XMLChartStyleContext \ + xmloff/source/chart/SchXMLAutoStylePoolP \ + xmloff/source/chart/SchXMLTableContext \ + xmloff/source/chart/SchXMLCalculationSettingsContext \ + xmloff/source/chart/SchXMLExport \ + xmloff/source/text/XMLChangedRegionImportContext \ + xmloff/source/text/XMLIndexUserSourceContext \ + xmloff/source/text/txtfldi \ + xmloff/source/text/XMLTextShapeImportHelper \ + xmloff/source/text/XMLIndexTOCStylesContext \ + xmloff/source/text/XMLIndexSimpleEntryContext \ + xmloff/source/text/txtftne \ + xmloff/source/text/XMLTextColumnsExport \ + xmloff/source/text/XMLChangeImportContext \ + xmloff/source/text/XMLSectionSourceImportContext \ + xmloff/source/text/XMLIndexAlphabeticalSourceContext \ + xmloff/source/text/txtparae \ + xmloff/source/text/XMLIndexTabStopEntryContext \ + xmloff/source/text/XMLTextMasterPageContext \ + xmloff/source/text/XMLTextHeaderFooterContext \ + xmloff/source/text/XMLIndexBibliographyEntryContext \ + xmloff/source/text/XMLIndexTOCContext \ + xmloff/source/text/XMLSectionImportContext \ + xmloff/source/text/XMLStringBufferImportContext \ + xmloff/source/text/XMLTextShapeStyleContext \ + xmloff/source/text/XMLSectionFootnoteConfigImport \ + xmloff/source/text/txtparai \ + xmloff/source/text/XMLIndexIllustrationSourceContext \ + xmloff/source/text/txtprmap \ + xmloff/source/text/XMLRedlineExport \ + xmloff/source/text/XMLTextMasterPageExport \ + xmloff/source/text/XMLIndexTableSourceContext \ + xmloff/source/text/XMLLineNumberingExport \ + xmloff/source/text/XMLSectionExport \ + xmloff/source/text/XMLTextMasterStylesContext \ + xmloff/source/text/XMLTextFrameContext \ + xmloff/source/text/XMLFootnoteImportContext \ + xmloff/source/text/txtvfldi \ + xmloff/source/text/txtdropi \ + xmloff/source/text/XMLTextListAutoStylePool \ + xmloff/source/text/XMLIndexTitleTemplateContext \ + xmloff/source/text/XMLChangeElementImportContext \ + xmloff/source/text/XMLIndexSourceBaseContext \ + xmloff/source/text/XMLTextNumRuleInfo \ + xmloff/source/text/XMLSectionFootnoteConfigExport \ + xmloff/source/text/XMLFootnoteConfigurationImportContext \ + xmloff/source/text/XMLIndexTOCSourceContext \ + xmloff/source/text/txtlists \ + xmloff/source/text/XMLLineNumberingSeparatorImportContext \ + xmloff/source/text/XMLLineNumberingImportContext \ + xmloff/source/text/XMLIndexMarkExport \ + xmloff/source/text/XMLSectionSourceDDEImportContext \ + xmloff/source/text/XMLFootnoteBodyImportContext \ + xmloff/source/text/XMLTextColumnsContext \ + xmloff/source/text/XMLAutoTextContainerEventImport \ + xmloff/source/text/XMLAutoMarkFileContext \ + xmloff/source/text/txtflde \ + xmloff/source/text/txtstyli \ + xmloff/source/text/txtsecte \ + xmloff/source/text/XMLPropertyBackpatcher \ + xmloff/source/text/XMLChangeInfoContext \ + xmloff/source/text/XMLCalculationSettingsContext \ + xmloff/source/text/XMLIndexBodyContext \ + xmloff/source/text/XMLTextFrameHyperlinkContext \ + xmloff/source/text/txtexppr \ + xmloff/source/text/XMLTextCharStyleNamesElementExport \ + xmloff/source/text/XMLAutoTextEventExport \ + xmloff/source/text/txtdrope \ + xmloff/source/text/XMLIndexSpanEntryContext \ + xmloff/source/text/XMLIndexChapterInfoEntryContext \ + xmloff/source/text/XMLTextListItemContext \ + xmloff/source/text/XMLIndexTemplateContext \ + xmloff/source/text/XMLAutoTextEventImport \ + xmloff/source/text/txtstyle \ + xmloff/source/text/XMLTrackedChangesImportContext \ + xmloff/source/text/XMLTextTableContext \ + xmloff/source/text/XMLIndexBibliographyConfigurationContext \ + xmloff/source/text/txtprhdl \ + xmloff/source/text/txtimppr \ + xmloff/source/text/XMLTextMarkImportContext \ + xmloff/source/text/XMLIndexBibliographySourceContext \ + xmloff/source/text/txtimp \ + xmloff/source/text/XMLIndexObjectSourceContext \ + xmloff/source/text/XMLTextPropertySetContext \ + xmloff/source/text/XMLTextListBlockContext \ + xmloff/source/script/XMLEventImportHelper \ + xmloff/source/script/xmlscripti \ + xmloff/source/script/XMLStarBasicExportHandler \ + xmloff/source/script/XMLScriptExportHandler \ + xmloff/source/script/XMLEventsImportContext \ + xmloff/source/script/xmlbasici \ + xmloff/source/script/XMLEventExport \ + xmloff/source/script/XMLScriptContextFactory \ + xmloff/source/script/XMLStarBasicContextFactory \ + xmloff/source/table/XMLTableImport \ + xmloff/source/table/XMLTableExport \ + xmloff/source/xforms/XFormsSubmissionContext \ + xmloff/source/xforms/SchemaRestrictionContext \ + xmloff/source/xforms/XFormsInstanceContext \ + xmloff/source/xforms/SchemaContext \ + xmloff/source/xforms/XFormsBindContext \ + xmloff/source/xforms/xformsexport \ + xmloff/source/xforms/xformsimport \ + xmloff/source/xforms/SchemaSimpleTypeContext \ + xmloff/source/xforms/TokenContext \ + xmloff/source/xforms/XFormsModelContext \ + xmloff/source/xforms/xformsapi \ + xmloff/source/forms/controlelement \ + xmloff/source/forms/formcellbinding \ + xmloff/source/forms/elementexport \ + xmloff/source/forms/eventimport \ + xmloff/source/forms/layerimport \ + xmloff/source/forms/elementimport \ + xmloff/source/forms/formattributes \ + xmloff/source/forms/formlayerimport \ + xmloff/source/forms/officeforms \ + xmloff/source/forms/layerexport \ + xmloff/source/forms/formlayerexport \ + xmloff/source/forms/eventexport \ + xmloff/source/forms/formenums \ + xmloff/source/forms/valueproperties \ + xmloff/source/forms/formstyles \ + xmloff/source/forms/controlpropertyhdl \ + xmloff/source/forms/propertyexport \ + xmloff/source/forms/gridcolumnproptranslator \ + xmloff/source/forms/propertyimport \ + xmloff/source/forms/controlpropertymap \ + xmloff/source/forms/formevents \ + xmloff/source/forms/strings \ + xmloff/source/forms/attriblistmerge \ + xmloff/source/forms/logging \ + xmloff/source/forms/formsimp \ + xmloff/source/style/opaquhdl \ + xmloff/source/style/impastp4 \ + xmloff/source/style/PageMasterImportContext \ + xmloff/source/style/DashStyle \ + xmloff/source/style/MultiPropertySetHelper \ + xmloff/source/style/PageMasterStyleMap \ + xmloff/source/style/WordWrapPropertyHdl \ + xmloff/source/style/XMLConstantsPropertyHandler \ + xmloff/source/style/xmltabi \ + xmloff/source/style/MarkerStyle \ + xmloff/source/style/XMLElementPropertyContext \ + xmloff/source/style/VisAreaExport \ + xmloff/source/style/undlihdl \ + xmloff/source/style/XMLIsPercentagePropertyHandler \ + xmloff/source/style/EnumPropertyHdl \ + xmloff/source/style/durationhdl \ + xmloff/source/style/XMLFontAutoStylePool \ + xmloff/source/style/shadwhdl \ + xmloff/source/style/xmlaustp \ + xmloff/source/style/numehelp \ + xmloff/source/style/adjushdl \ + xmloff/source/style/PageMasterExportPropMapper \ + xmloff/source/style/postuhdl \ + xmloff/source/style/TransGradientStyle \ + xmloff/source/style/XMLRectangleMembersHandler \ + xmloff/source/style/xmlbahdl \ + xmloff/source/style/xmlprcon \ + xmloff/source/style/ImageStyle \ + xmloff/source/style/xmlnumi \ + xmloff/source/style/kernihdl \ + xmloff/source/style/XMLBitmapLogicalSizePropertyHandler \ + xmloff/source/style/impastp1 \ + xmloff/source/style/xmlnumfi \ + xmloff/source/style/VisAreaContext \ + xmloff/source/style/bordrhdl \ + xmloff/source/style/prhdlfac \ + xmloff/source/style/xmlnumfe \ + xmloff/source/style/xmlimppr \ + xmloff/source/style/cdouthdl \ + xmloff/source/style/styleexp \ + xmloff/source/style/AttributeContainerHandler \ + xmloff/source/style/PageMasterPropHdl \ + xmloff/source/style/XMLBackgroundImageExport \ + xmloff/source/style/PageMasterPropMapper \ + xmloff/source/style/PagePropertySetContext \ + xmloff/source/style/XMLPercentOrMeasurePropertyHandler \ + xmloff/source/style/XMLBackgroundImageContext \ + xmloff/source/style/prstylei \ + xmloff/source/style/csmaphdl \ + xmloff/source/style/PageHeaderFooterContext \ + xmloff/source/style/XMLFontStylesContext \ + xmloff/source/style/PageMasterImportPropMapper \ + xmloff/source/style/lspachdl \ + xmloff/source/style/StyleMap \ + xmloff/source/style/XMLClipPropertyHandler \ + xmloff/source/style/XMLPageExport \ + xmloff/source/style/PageMasterPropHdlFactory \ + xmloff/source/style/xmlnume \ + xmloff/source/style/NamedBoolPropertyHdl \ + xmloff/source/style/xmlexppr \ + xmloff/source/style/xmltabe \ + xmloff/source/style/chrhghdl \ + xmloff/source/style/FillStyleContext \ + xmloff/source/style/breakhdl \ + xmloff/source/style/fonthdl \ + xmloff/source/style/escphdl \ + xmloff/source/style/xmlstyle \ + xmloff/source/style/HatchStyle \ + xmloff/source/style/chrlohdl \ + xmloff/source/style/xmlprhdl \ + xmloff/source/style/GradientStyle \ + xmloff/source/style/uniref \ + xmloff/source/style/impastp2 \ + xmloff/source/style/impastp3 \ + xmloff/source/style/XMLFootnoteSeparatorExport \ + xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler \ + xmloff/source/style/DrawAspectHdl \ + xmloff/source/style/tabsthdl \ + xmloff/source/style/xmlprmap \ + xmloff/source/style/XMLFillBitmapSizePropertyHandler \ + xmloff/source/style/XMLFootnoteSeparatorImport \ + xmloff/source/style/backhdl \ + xmloff/source/style/weighhdl \ + xmloff/source/style/SinglePropertySetInfoCache \ + xmloff/source/style/shdwdhdl \ + xmloff/source/core/i18nmap \ + xmloff/source/core/xmlimp \ + xmloff/source/core/unointerfacetouniqueidentifiermapper \ + xmloff/source/core/xmlexp \ + xmloff/source/core/XMLEmbeddedObjectExportFilter \ + xmloff/source/core/PropertySetMerger \ + xmloff/source/core/xmltoken \ + xmloff/source/core/xmlerror \ + xmloff/source/core/nmspmap \ + xmloff/source/core/xmlkywd \ + xmloff/source/core/xmluconv \ + xmloff/source/core/XMLBase64Export \ + xmloff/source/core/DomExport \ + xmloff/source/core/RDFaExportHelper \ + xmloff/source/core/xmltkmap \ + xmloff/source/core/DocumentSettingsContext \ + xmloff/source/core/xmlictxt \ + xmloff/source/core/XMLBase64ImportContext \ + xmloff/source/core/xmlehelp \ + xmloff/source/core/XMLEmbeddedObjectImportContext \ + xmloff/source/core/xmlcnitm \ + xmloff/source/core/ProgressBarHelper \ + xmloff/source/core/XMLBasicExportFilter \ + xmloff/source/core/facreg \ + xmloff/source/core/unoatrcn \ + xmloff/source/core/SettingsExportHelper \ + xmloff/source/core/DomBuilderContext \ + xmloff/source/core/attrlist \ + xmloff/source/core/RDFaImportHelper \ + xmloff/source/meta/xmlmetae \ + xmloff/source/meta/xmlversion \ + xmloff/source/meta/MetaImportComponent \ + xmloff/source/meta/xmlmetai \ + xmloff/source/meta/MetaExportComponent \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,xo,\ + icuuc \ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,xo,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet ts=4 sw=4: diff --git a/xmloff/prj/target_lib_xof.mk b/xmloff/prj/target_lib_xof.mk new file mode 100644 index 000000000000..a414106da31e --- /dev/null +++ b/xmloff/prj/target_lib_xof.mk @@ -0,0 +1,110 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,xof)) + +$(eval $(call gb_Library_set_include,xof,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/xmloff/inc \ + -I$(SRCDIR)/xmloff/source/inc \ + -I$(SRCDIR)/xmloff/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,xof,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + salhelper \ + stl \ + xo \ +)) + +$(eval $(call gb_Library_add_exception_objects,xof,\ + xmloff/source/transform/OOo2Oasis \ + xmloff/source/transform/StyleOOoTContext \ + xmloff/source/transform/EventOOoTContext \ + xmloff/source/transform/DocumentTContext \ + xmloff/source/transform/NotesTContext \ + xmloff/source/transform/Oasis2OOo \ + xmloff/source/transform/TransformerContext \ + xmloff/source/transform/ChartOASISTContext \ + xmloff/source/transform/PropertyActionsOASIS \ + xmloff/source/transform/DeepTContext \ + xmloff/source/transform/DlgOASISTContext \ + xmloff/source/transform/FormPropOOoTContext \ + xmloff/source/transform/TransformerBase \ + xmloff/source/transform/FormPropOASISTContext \ + xmloff/source/transform/RenameElemTContext \ + xmloff/source/transform/ControlOOoTContext \ + xmloff/source/transform/FrameOASISTContext \ + xmloff/source/transform/EventOASISTContext \ + xmloff/source/transform/TransformerTokenMap \ + xmloff/source/transform/PersMixedContentTContext \ + xmloff/source/transform/ProcAttrTContext \ + xmloff/source/transform/MetaTContext \ + xmloff/source/transform/TransformerActions \ + xmloff/source/transform/ControlOASISTContext \ + xmloff/source/transform/ChartPlotAreaOOoTContext \ + xmloff/source/transform/MutableAttrList \ + xmloff/source/transform/PropertyActionsOOo \ + xmloff/source/transform/ChartOOoTContext \ + xmloff/source/transform/EventMap \ + xmloff/source/transform/FlatTContext \ + xmloff/source/transform/CreateElemTContext \ + xmloff/source/transform/ProcAddAttrTContext \ + xmloff/source/transform/XMLFilterRegistration \ + xmloff/source/transform/MergeElemTContext \ + xmloff/source/transform/PersAttrListTContext \ + xmloff/source/transform/FrameOOoTContext \ + xmloff/source/transform/ChartPlotAreaOASISTContext \ + xmloff/source/transform/StyleOASISTContext \ + xmloff/source/transform/IgnoreTContext \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,xof,\ + icuuc \ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,xof,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet ts=4 sw=4: diff --git a/xmloff/prj/target_module_xmloff.mk b/xmloff/prj/target_module_xmloff.mk new file mode 100644 index 000000000000..4d4d82412fab --- /dev/null +++ b/xmloff/prj/target_module_xmloff.mk @@ -0,0 +1,42 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,xmloff,\ + $(call gb_Library_get_target,xo) \ + $(call gb_Library_get_target,xof) \ + $(call gb_Package_get_target,xmloff_inc) \ +)) + +$(eval $(call gb_Module_read_includes,xmloff,\ + lib_xo \ + lib_xof \ + package_inc \ +)) + +#todo: map file +#todo: xmlkywd.lib - built, but never used?! + diff --git a/xmloff/prj/target_package_inc.mk b/xmloff/prj/target_package_inc.mk new file mode 100644 index 000000000000..76e9b485cb22 --- /dev/null +++ b/xmloff/prj/target_package_inc.mk @@ -0,0 +1,129 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,xmloff_inc,$(SRCDIR)/xmloff/inc)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/dllapi.h,xmloff/dllapi.h)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFilterServiceNames.h,xmloff/XMLFilterServiceNames.h)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEmbeddedObjectExportFilter.hxx,xmloff/XMLEmbeddedObjectExportFilter.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DocumentSettingsContext.hxx,xmloff/DocumentSettingsContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/contextid.hxx,xmloff/contextid.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetai.hxx,xmloff/xmlmetai.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprmap.hxx,xmloff/xmlprmap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumi.hxx,xmloff/xmlnumi.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlement.hxx,xmloff/xmlement.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/nmspmap.hxx,xmloff/nmspmap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/functional.hxx,xmloff/functional.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyle.hxx,xmloff/txtstyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyli.hxx,xmloff/txtstyli.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SinglePropertySetInfoCache.hxx,xmloff/SinglePropertySetInfoCache.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaContext.hxx,xmloff/VisAreaContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontStylesContext.hxx,xmloff/XMLFontStylesContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoHash.hxx,xmloff/PropertySetInfoHash.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltkmap.hxx,xmloff/xmltkmap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/NamedBoolPropertyHdl.hxx,xmloff/NamedBoolPropertyHdl.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLConstantsPropertyHandler.hxx,xmloff/XMLConstantsPropertyHandler.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnmspe.hxx,xmloff/xmlnmspe.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprhdl.hxx,xmloff/xmlprhdl.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeimport.hxx,xmloff/shapeimport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/EnumPropertyHdl.hxx,xmloff/EnumPropertyHdl.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLCharContext.hxx,xmloff/XMLCharContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaExport.hxx,xmloff/VisAreaExport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/unoatrcn.hxx,xmloff/unoatrcn.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/controlpropertyhdl.hxx,xmloff/controlpropertyhdl.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimppr.hxx,xmloff/xmlimppr.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltabe.hxx,xmloff/xmltabe.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventsImportContext.hxx,xmloff/XMLEventsImportContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PageMasterStyleMap.hxx,xmloff/PageMasterStyleMap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/families.hxx,xmloff/families.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/attrlist.hxx,xmloff/attrlist.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlreg.hxx,xmloff/xmlreg.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prstylei.hxx,xmloff/prstylei.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlerror.hxx,xmloff/xmlerror.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltoken.hxx,xmloff/xmltoken.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetae.hxx,xmloff/xmlmetae.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageExport.hxx,xmloff/XMLTextMasterPageExport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeexport.hxx,xmloff/shapeexport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimppr.hxx,xmloff/txtimppr.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLImportHelper.hxx,xmloff/SchXMLImportHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formsimp.hxx,xmloff/formsimp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ImageStyle.hxx,xmloff/ImageStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfi.hxx,xmloff/xmlnumfi.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/WordWrapPropertyHdl.hxx,xmloff/WordWrapPropertyHdl.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLStringVector.hxx,xmloff/XMLStringVector.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/styleexp.hxx,xmloff/styleexp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterStylesContext.hxx,xmloff/XMLTextMasterStylesContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlkywd.hxx,xmloff/xmlkywd.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnume.hxx,xmloff/xmlnume.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventExport.hxx,xmloff/XMLEventExport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerexport.hxx,xmloff/formlayerexport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtparae.hxx,xmloff/txtparae.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ProgressBarHelper.hxx,xmloff/ProgressBarHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnitm.hxx,xmloff/xmlcnitm.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmluconv.hxx,xmloff/xmluconv.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlscripti.hxx,xmloff/xmlscripti.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlaustp.hxx,xmloff/xmlaustp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfe.hxx,xmloff/xmlnumfe.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlevent.hxx,xmloff/xmlevent.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimp.hxx,xmloff/xmlimp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoKey.hxx,xmloff/PropertySetInfoKey.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerimport.hxx,xmloff/formlayerimport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/i18nmap.hxx,xmloff/i18nmap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DashStyle.hxx,xmloff/DashStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLShapeStyleContext.hxx,xmloff/XMLShapeStyleContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prhdlfac.hxx,xmloff/prhdlfac.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLPageExport.hxx,xmloff/XMLPageExport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/MarkerStyle.hxx,xmloff/MarkerStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLBase64ImportContext.hxx,xmloff/XMLBase64ImportContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsexport.hxx,xmloff/xformsexport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/uniref.hxx,xmloff/uniref.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimp.hxx,xmloff/txtimp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprcon.hxx,xmloff/xmlprcon.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtprmap.hxx,xmloff/txtprmap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontAutoStylePool.hxx,xmloff/XMLFontAutoStylePool.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexp.hxx,xmloff/xmlexp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/GradientStyle.hxx,xmloff/GradientStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/HatchStyle.hxx,xmloff/HatchStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/animexp.hxx,xmloff/animexp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnimp.hxx,xmloff/xmlcnimp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageContext.hxx,xmloff/XMLTextMasterPageContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextListAutoStylePool.hxx,xmloff/XMLTextListAutoStylePool.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextTableContext.hxx,xmloff/XMLTextTableContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/maptype.hxx,xmloff/maptype.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/numehelp.hxx,xmloff/numehelp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexppr.hxx,xmloff/xmlexppr.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlstyle.hxx,xmloff/xmlstyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeStyleContext.hxx,xmloff/XMLTextShapeStyleContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltypes.hxx,xmloff/xmltypes.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLExportHelper.hxx,xmloff/SchXMLExportHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsimport.hxx,xmloff/xformsimport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLGraphicsDefaultStyle.hxx,xmloff/XMLGraphicsDefaultStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SettingsExportHelper.hxx,xmloff/SettingsExportHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlictxt.hxx,xmloff/xmlictxt.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableExport.hxx,xmloff/table/XMLTableExport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableImport.hxx,xmloff/table/XMLTableImport.hxx)) + -- cgit v1.2.3 From 3c7e8d23ffa624bd54f2817d0e6dcc317106edd8 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 19 Apr 2010 15:02:20 +0200 Subject: CWS gnumake2: made resource location in default_images customizable for nonconforming modules (toolkit,framework,sfx2) --- framework/prj/target_res_fwe.mk | 2 ++ sfx2/prj/target_res_sfx2.mk | 2 ++ 2 files changed, 4 insertions(+) (limited to 'sfx2') diff --git a/framework/prj/target_res_fwe.mk b/framework/prj/target_res_fwe.mk index aa7e93c4095b..031cb24117d7 100644 --- a/framework/prj/target_res_fwe.mk +++ b/framework/prj/target_res_fwe.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,fwe)) +$(eval $(call gb_AllLangResTarget_set_reslocation,fwe,framework)) + $(eval $(call gb_AllLangResTarget_add_srs,fwe,\ fwe/fwk_classes \ fwe/fwk_services \ diff --git a/sfx2/prj/target_res_sfx2.mk b/sfx2/prj/target_res_sfx2.mk index 3feb0e2b9f6d..b51079559e82 100644 --- a/sfx2/prj/target_res_sfx2.mk +++ b/sfx2/prj/target_res_sfx2.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,sfx)) +$(eval $(call gb_AllLangResTarget_set_reslocation,sfx,sfx2)) + $(eval $(call gb_AllLangResTarget_add_srs,sfx,\ sfx/res \ )) -- cgit v1.2.3 From d10ed4290570c12220c8fbdf1603a0ee4e1d1471 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Apr 2010 17:54:47 +0200 Subject: CWS gnumake2: removed files in svl; typo in svtools makefile; missing include in sfx2 makefile --- editeng/inc/pch/precompiled_editeng.hxx | 1 - sfx2/prj/target_module_sfx2.mk | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2') diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index d82ecc6cb6b5..d2a8837911ad 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -694,7 +694,6 @@ #include "svtools/apearcfg.hxx" #include "svl/brdcst.hxx" #include "unotools/cacheoptions.hxx" -#include "svl/cancel.hxx" #include "svl/cjkoptions.hxx" #include "unotools/cmdoptions.hxx" #include "svl/cntwall.hxx" diff --git a/sfx2/prj/target_module_sfx2.mk b/sfx2/prj/target_module_sfx2.mk index d3a1996bab05..37281b059595 100644 --- a/sfx2/prj/target_module_sfx2.mk +++ b/sfx2/prj/target_module_sfx2.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_Module,sfx2,\ $(call gb_AllLangResTarget_get_target,sfx) \ $(call gb_Library_get_target,sfx) \ + $(call gb_Package_get_target,sfx2_inc) \ )) $(eval $(call gb_Module_read_includes,sfx2,\ -- cgit v1.2.3 From 9bc2851f0eefd96d06385410c4a0a7ed419acb0d Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:09:27 +0200 Subject: CWS gnumake2: various fixes after merging with DEV300_m76 --- framework/prj/build.lst | 34 ++----------- framework/prj/d.lst | 56 -------------------- sfx2/prj/build.lst | 23 +-------- sfx2/prj/d.lst | 31 ------------ sfx2/prj/target_lib_sfx2.mk | 31 ++++++------ sfx2/prj/target_module_sfx2.mk | 5 ++ sfx2/prj/target_package_inc.mk | 101 ++++++++++++++++++------------------- sfx2/prj/target_package_sdi.mk | 30 +++++++++++ xmloff/prj/build.lst | 16 +----- xmloff/prj/d.lst | 53 ------------------- xmloff/prj/target_module_xmloff.mk | 2 + xmloff/prj/target_package_dtd.mk | 45 +++++++++++++++++ xmloff/prj/target_package_inc.mk | 4 +- 13 files changed, 156 insertions(+), 275 deletions(-) create mode 100644 sfx2/prj/target_package_sdi.mk create mode 100644 xmloff/prj/target_package_dtd.mk (limited to 'sfx2') diff --git a/framework/prj/build.lst b/framework/prj/build.lst index 12e597204710..3591f5b29a63 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -1,31 +1,3 @@ -fr framework : l10n svtools NULL -fr framework usr1 - all fr_mkout NULL -fr framework\inc nmake - all fr_inc NULL -fr framework\source\accelerators nmake - all fr_accelerators fr_threadhelp fr_inc NULL -fr framework\source\classes nmake - all fr_classes fr_threadhelp fr_constant fr_inc NULL -fr framework\source\constant nmake - all fr_constant fr_inc NULL -fr framework\source\dispatch nmake - all fr_dispatch fr_threadhelp fr_constant fr_inc NULL -fr framework\source\fwe\classes nmake - all fr_fweclasses fr_threadhelp fr_constant fr_inc NULL -fr framework\source\fwe\dispatch nmake - all fr_fwedispatch fr_threadhelp fr_constant fr_inc NULL -fr framework\source\fwe\helper nmake - all fr_fwehelper fr_threadhelp fr_constant fr_inc NULL -fr framework\source\fwe\interaction nmake - all fr_fweinteraction fr_threadhelp fr_constant fr_inc NULL -fr framework\source\fwe\xml nmake - all fr_fwexml fr_threadhelp fr_inc NULL -fr framework\source\fwi\classes nmake - all fr_fwiclasses fr_threadhelp fr_constant fr_inc NULL -fr framework\source\fwi\helper nmake - all fr_fwihelper fr_threadhelp fr_constant fr_inc NULL -fr framework\source\fwi\jobs nmake - all fr_fwijobs fr_threadhelp fr_constant fr_inc NULL -fr framework\source\fwi\threadhelp nmake - all fr_threadhelp fr_constant fr_inc NULL -fr framework\source\fwi\uielement nmake - all fr_fwiuielement fr_threadhelp fr_inc NULL -fr framework\source\helper nmake - all fr_helper fr_threadhelp fr_constant fr_inc NULL -fr framework\source\interaction nmake - all fr_interaction fr_threadhelp fr_constant fr_inc NULL -fr framework\source\jobs nmake - all fr_jobs fr_threadhelp fr_constant fr_inc NULL -fr framework\source\layoutmanager nmake - all fr_layoutmanager fr_threadhelp fr_inc NULL -fr framework\source\loadenv nmake - all fr_loadenv fr_threadhelp fr_constant fr_inc NULL -fr framework\source\recording nmake - all fr_recording fr_threadhelp fr_constant fr_inc NULL -fr framework\source\register nmake - all fr_register fr_threadhelp fr_constant fr_inc NULL -fr framework\source\services nmake - all fr_services fr_threadhelp fr_constant fr_inc NULL -fr framework\source\tabwin nmake - all fr_tabwin fr_threadhelp fr_inc NULL -fr framework\source\uiconfiguration nmake - all fr_uiconfiguration fr_threadhelp fr_inc NULL -fr framework\source\uielement nmake - all fr_uielement fr_threadhelp fr_inc NULL -fr framework\source\uifactory nmake - all fr_uifactory fr_threadhelp fr_inc NULL -fr framework\source\xml nmake - all fr_xml fr_threadhelp fr_inc NULL -fr framework\util nmake - all fr_util fr_constant fr_threadhelp fr_classes fr_loadenv fr_jobs fr_interaction fr_helper fr_dispatch fr_services fr_register fr_recording fr_layoutmanager fr_uielement fr_uifactory fr_xml fr_uiconfiguration fr_accelerators fr_tabwin fr_fweclasses fr_fwedispatch fr_fwehelper fr_fweinteraction fr_fwexml fr_fwiclasses fr_fwihelper fr_fwijobs fr_fwiuielement NULL +fr framework : l10n svtools NULL +fr framework usr1 - all fr_mkout NULL +fr framework\prj nmake - all fr_all NULL diff --git a/framework/prj/d.lst b/framework/prj/d.lst index bf17da0a7164..8b137891791f 100644 --- a/framework/prj/d.lst +++ b/framework/prj/d.lst @@ -1,57 +1 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %_DEST%\inc%_EXT%\framework -mkdir: %_DEST%\xml%_EXT%\uiconfig -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator\en-US -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\* -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\* -..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% - -..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd -..\dtd\toolbar.dtd %_DEST%\bin%_EXT%\toolbar.dtd -..\dtd\statusbar.dtd %_DEST%\bin%_EXT%\statusbar.dtd -..\dtd\event.dtd %_DEST%\bin%_EXT%\event.dtd -..\dtd\accelerator.dtd %_DEST%\bin%_EXT%\accelerator.dtd -..\dtd\image.dtd %_DEST%\bin%_EXT%\image.dtd -..\dtd\groupuinames.dtd %_DEST%\bin%_EXT%\groupuinames.dtd - -..\%__SRC%\lib\ifwe.lib %_DEST%\lib%_EXT%\ifwe.lib -..\%__SRC%\lib\ifwi.lib %_DEST%\lib%_EXT%\ifwi.lib -..\inc\fwedllapi.h %_DEST%\inc%_EXT%\fwedllapi.h -..\inc\fwidllapi.h %_DEST%\inc%_EXT%\fwidllapi.h -..\inc\fwkdllapi.h %_DEST%\inc%_EXT%\fwkdllapi.h -..\inc\helper\imageproducer.hxx %_DEST%\inc%_EXT%\framework\imageproducer.hxx -..\inc\helper\acceleratorinfo.hxx %_DEST%\inc%_EXT%\framework\acceleratorinfo.hxx -..\inc\helper\actiontriggerhelper.hxx %_DEST%\inc%_EXT%\framework\actiontriggerhelper.hxx -..\inc\xml\menuconfiguration.hxx %_DEST%\inc%_EXT%\framework\menuconfiguration.hxx -..\inc\classes\bmkmenu.hxx %_DEST%\inc%_EXT%\framework\bmkmenu.hxx -..\inc\xml\toolboxconfiguration.hxx %_DEST%\inc%_EXT%\framework\toolboxconfiguration.hxx -..\inc\xml\statusbarconfiguration.hxx %_DEST%\inc%_EXT%\framework\statusbarconfiguration.hxx -..\inc\xml\eventsconfiguration.hxx %_DEST%\inc%_EXT%\framework\eventsconfiguration.hxx -..\inc\xml\imagesconfiguration.hxx %_DEST%\inc%_EXT%\framework\imagesconfiguration.hxx -..\inc\classes\addonsoptions.hxx %_DEST%\inc%_EXT%\framework\addonsoptions.hxx -..\inc\dispatch\interaction.hxx %_DEST%\inc%_EXT%\framework\interaction.hxx -..\inc\classes\addonmenu.hxx %_DEST%\inc%_EXT%\framework\addonmenu.hxx -..\inc\classes\sfxhelperfunctions.hxx %_DEST%\inc%_EXT%\framework\sfxhelperfunctions.hxx -..\inc\helper\configimporter.hxx %_DEST%\inc%_EXT%\framework\configimporter.hxx -..\inc\classes\menuextensionsupplier.hxx %_DEST%\inc%_EXT%\framework\menuextensionsupplier.hxx -..\inc\interaction\preventduplicateinteraction.hxx %_DEST%\inc%_EXT%\framework\preventduplicateinteraction.hxx -..\inc\helper\titlehelper.hxx %_DEST%\inc%_EXT%\framework\titlehelper.hxx - -..\uiconfig\startmodule\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar\*.xml -..\uiconfig\startmodule\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar\*.xml -..\uiconfig\startmodule\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator\en-US\*.xml -..\uiconfig\startmodule\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar\*.xml - -..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 89e618e8fc12..7dc2a95cb994 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,23 +1,4 @@ sf sfx2 : l10n idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL sf sfx2 usr1 - all sf_mkout NULL -sf sfx2\inc nmake - all sf_inc NULL -sf sfx2\prj get - all sf_prj NULL -sf sfx2\win\res get - all sf_wres NULL -sf sfx2\mac\res get - all sf_mres NULL -sf sfx2\source\inc get - all sf_sinc NULL -sf sfx2\sdi nmake - all sf_sdi NULL -sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL -sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL -sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL -sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL -sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL -sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL -sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL -sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL -sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL -sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL -sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL -sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL -sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL -sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL -sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL +sf sfx2\prj nmake - all sf_prj NULL + diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index 2b956707606a..8b137891791f 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -1,32 +1 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %COMMON_DEST%\res%_EXT% -mkdir: %_DEST%\inc%_EXT%\sfx2 - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\lib\sfx.lib %_DEST%\lib%_EXT%\sfx.lib -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\slb\sfx.lib %_DEST%\lib%_EXT%\xsfx.lib -..\%__SRC%\lib\isfx.lib %_DEST%\lib%_EXT%\isfx.lib -..\%__SRC%\lib\debug.lib %_DEST%\lib%_EXT%\sfxdebug.lib -..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym -..\%__SRC%\bin\sfx?????.dll %_DEST%\bin%_EXT%\sfx?????.dll -..\%__SRC%\bin\sfx*.res %_DEST%\bin%_EXT%\sfx*.res -..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym -..\%__SRC%\misc\sfx?????.map %_DEST%\bin%_EXT%\sfx?????.map -..\%__SRC%\bin\elc?????.dll %_DEST%\bin%_EXT%\elc?????.dll -..\%__SRC%\srs\sfx.srs %_DEST%\res%_EXT%\sfx.srs -..\%COMMON_OUTDIR%\srs\sfx_srs.hid %COMMON_DEST%\res%_EXT%\sfx_srs.hid -..\%__SRC%\srs\sfxslots.srs %_DEST%\res%_EXT%\sfxslots.srs -..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid -..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml -..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv - -..\inc\sfx2\*.h %_DEST%\inc%_EXT%\sfx2\*.h -..\inc\sfx2\*.hxx %_DEST%\inc%_EXT%\sfx2\*.hxx -..\inc\sfx2\*.hrc %_DEST%\inc%_EXT%\sfx2\*.hrc - -..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi -..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index c08f563d2827..9d39fd1c0d50 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_Library,sfx)) $(call gb_Library_get_headers_target,sfx) : $(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) +$(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) :| $(call gb_Library_get_external_headers_target,sfx) $(call gb_Library_get_clean_target,sfx) : $(call gb_SdiTarget_get_clean_target,sfx2/sdi/sfxslots) $(eval $(call gb_Library_set_include,sfx,\ @@ -59,24 +60,24 @@ endif $(eval $(call gb_Library_add_linked_libs,sfx,\ comphelper \ + cppu \ + cppuhelper \ + fwe \ i18nisolang1 \ + sal \ + sax \ sb \ sot \ + stl \ svl \ svt \ tk \ tl \ ucbhelper \ - cppu \ - cppuhelper \ - sal \ utl \ vcl \ vos3 \ - fwe \ - sax \ xml2 \ - stl \ )) $(eval $(call gb_Library_add_linked_system_libs,sfx,\ @@ -155,8 +156,8 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/dialog/about \ sfx2/source/dialog/alienwarn \ sfx2/source/dialog/basedlgs \ - sfx2/source/dialog/dinfedt \ sfx2/source/dialog/dinfdlg \ + sfx2/source/dialog/dinfedt \ sfx2/source/dialog/dockwin \ sfx2/source/dialog/filedlghelper \ sfx2/source/dialog/filtergrouping \ @@ -181,6 +182,10 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/dialog/tplcitem \ sfx2/source/dialog/tplpitem \ sfx2/source/dialog/versdlg \ + sfx2/source/doc/DocumentMetadataAccess \ + sfx2/source/doc/Metadatable \ + sfx2/source/doc/QuerySaveDocument \ + sfx2/source/doc/SfxDocumentMetaData \ sfx2/source/doc/docfac \ sfx2/source/doc/docfile \ sfx2/source/doc/docfilt \ @@ -188,17 +193,15 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/docinsert \ sfx2/source/doc/docmacromode \ sfx2/source/doc/docstoragemodifylistener \ + sfx2/source/doc/doctdlg \ sfx2/source/doc/doctempl \ sfx2/source/doc/doctemplates \ sfx2/source/doc/doctemplateslocal \ - sfx2/source/doc/doctdlg \ - sfx2/source/doc/DocumentMetadataAccess \ sfx2/source/doc/docvor \ sfx2/source/doc/frmdescr \ sfx2/source/doc/graphhelp \ sfx2/source/doc/guisaveas \ sfx2/source/doc/iframe \ - sfx2/source/doc/Metadatable \ sfx2/source/doc/new \ sfx2/source/doc/objcont \ sfx2/source/doc/objembed \ @@ -213,16 +216,14 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/ownsubfilterservice \ sfx2/source/doc/plugin \ sfx2/source/doc/printhelper \ - sfx2/source/doc/QuerySaveDocument \ sfx2/source/doc/querytemplate \ sfx2/source/doc/sfxacldetect \ sfx2/source/doc/sfxbasemodel \ - sfx2/source/doc/SfxDocumentMetaData \ sfx2/source/doc/sfxmodelfactory \ sfx2/source/explorer/nochaos \ sfx2/source/inet/inettbc \ - sfx2/source/menu/mnumgr \ sfx2/source/menu/mnuitem \ + sfx2/source/menu/mnumgr \ sfx2/source/menu/objmnctl \ sfx2/source/menu/virtmenu \ sfx2/source/notify/eventsupplier \ @@ -239,10 +240,10 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/view/sfxbasecontroller \ sfx2/source/view/userinputinterception \ sfx2/source/view/viewfac \ - sfx2/source/view/viewprn \ - sfx2/source/view/viewsh \ sfx2/source/view/viewfrm \ sfx2/source/view/viewfrm2 \ + sfx2/source/view/viewprn \ + sfx2/source/view/viewsh \ )) $(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx)) diff --git a/sfx2/prj/target_module_sfx2.mk b/sfx2/prj/target_module_sfx2.mk index d3a1996bab05..3ec4e606795f 100644 --- a/sfx2/prj/target_module_sfx2.mk +++ b/sfx2/prj/target_module_sfx2.mk @@ -28,13 +28,18 @@ $(eval $(call gb_Module_Module,sfx2,\ $(call gb_AllLangResTarget_get_target,sfx) \ $(call gb_Library_get_target,sfx) \ + $(call gb_Package_get_target,sfx2_inc) \ + $(call gb_Package_get_target,sfx2_sdi) \ )) +# $(call gb_Library_get_target,qstart) \ $(eval $(call gb_Module_read_includes,sfx2,\ lib_sfx2 \ package_inc \ + package_sdi \ res_sfx2 \ )) +# lib_qstart \ #todo: map file? #todo: source/appl ohne Optimierung? diff --git a/sfx2/prj/target_package_inc.mk b/sfx2/prj/target_package_inc.mk index aa369dde5e0b..dd836b286f8b 100644 --- a/sfx2/prj/target_package_inc.mk +++ b/sfx2/prj/target_package_inc.mk @@ -26,74 +26,100 @@ #************************************************************************* $(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) - -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/topfrm.hxx,sfx2/topfrm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx)) @@ -101,42 +127,11 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/srchitem.hxx,sfx2/srchitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/srchdefs.hxx,sfx2/srchdefs.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx)) - - - diff --git a/sfx2/prj/target_package_sdi.mk b/sfx2/prj/target_package_sdi.mk new file mode 100644 index 000000000000..63f2138adf4f --- /dev/null +++ b/sfx2/prj/target_package_sdi.mk @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sfx2_sdi,$(SRCDIR)/sfx2/sdi)) +$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfx.sdi,sfx.sdi)) +$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfxitems.sdi,sfxitems.sdi)) diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst index 8817d4590715..4dcebafb0386 100644 --- a/xmloff/prj/build.lst +++ b/xmloff/prj/build.lst @@ -1,16 +1,4 @@ xo xmloff : offapi svl vos NULL xo xmloff usr1 - all xo_mkout NULL -xo xmloff\prj get - all xo_prj NULL -xo xmloff\inc nmake - all xo_inc NULL -xo xmloff\source\core nmake - all xo_core xo_inc NULL -xo xmloff\source\meta nmake - all xo_meta xo_inc NULL -xo xmloff\source\style nmake - all xo_style xo_inc NULL -xo xmloff\source\text nmake - all xo_text xo_inc NULL -xo xmloff\source\draw nmake - all xo_draw xo_inc NULL -xo xmloff\source\chart nmake - all xo_chart xo_inc NULL -xo xmloff\source\forms nmake - all xo_forms xo_inc NULL -xo xmloff\source\script nmake - all xo_script xo_inc NULL -xo xmloff\source\transform nmake - all xo_transform xo_util xo_inc NULL -xo xmloff\source\xforms nmake - all xo_xforms xo_inc NULL -xo xmloff\source\table nmake - all xo_table xo_inc NULL -xo xmloff\util nmake - all xo_util xo_chart xo_core xo_draw xo_forms xo_meta xo_script xo_style xo_text xo_xforms xo_table NULL +xo xmloff\prj nmake - all xo_prj NULL + diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst index 658ce7454d5b..8b137891791f 100644 --- a/xmloff/prj/d.lst +++ b/xmloff/prj/d.lst @@ -1,54 +1 @@ -mkdir: %_DEST%\inc%_EXT%\xmloff -..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map -..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib -..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib -..\%__SRC%\lib\libxol.a %_DEST%\lib%_EXT%\libxol.a -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib - -..\dtd\* %_DEST%\bin%_EXT% - -..\inc\xmloff\odffields.hxx %_DEST%\inc%_EXT%\xmloff\odffields.hxx -..\inc\xmloff\dllapi.h %_DEST%\inc%_EXT%\xmloff\dllapi.h -..\inc\xmloff\attrlist.hxx %_DEST%\inc%_EXT%\xmloff\attrlist.hxx -..\inc\i18nmap.hxx %_DEST%\inc%_EXT%\xmloff\i18nmap.hxx -..\inc\unoatrcn.hxx %_DEST%\inc%_EXT%\xmloff\unoatrcn.hxx -..\inc\xmlkywd.hxx %_DEST%\inc%_EXT%\xmloff\xmlkywd.hxx -..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnitm.hxx -..\inc\xmlnmspe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnmspe.hxx -..\inc\xmlreg.hxx %_DEST%\inc%_EXT%\xmloff\xmlreg.hxx -..\inc\xmltabe.hxx %_DEST%\inc%_EXT%\xmloff\xmltabe.hxx -..\inc\numehelp.hxx %_DEST%\inc%_EXT%\xmloff\numehelp.hxx -..\inc\XMLTextListAutoStylePool.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextListAutoStylePool.hxx -..\inc\functional.hxx %_DEST%\inc%_EXT%\xmloff\functional.hxx -..\inc\VisAreaExport.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaExport.hxx -..\inc\VisAreaContext.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaContext.hxx -..\inc\DashStyle.hxx %_DEST%\inc%_EXT%\xmloff\DashStyle.hxx -..\inc\GradientStyle.hxx %_DEST%\inc%_EXT%\xmloff\GradientStyle.hxx -..\inc\MarkerStyle.hxx %_DEST%\inc%_EXT%\xmloff\MarkerStyle.hxx -..\inc\HatchStyle.hxx %_DEST%\inc%_EXT%\xmloff\HatchStyle.hxx -..\inc\ImageStyle.hxx %_DEST%\inc%_EXT%\xmloff\ImageStyle.hxx -..\source\text\XMLTextShapeImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeImportHelper.hxx -..\inc\xmloff\SettingsExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SettingsExportHelper.hxx -..\inc\xmloff\XMLSettingsExportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLSettingsExportContext.hxx -..\inc\xmloff\DocumentSettingsContext.hxx %_DEST%\inc%_EXT%\xmloff\DocumentSettingsContext.hxx -..\inc\xmloff\XMLGraphicsDefaultStyle.hxx %_DEST%\inc%_EXT%\xmloff\XMLGraphicsDefaultStyle.hxx -..\inc\XMLEmbeddedObjectExportFilter.hxx %_DEST%\inc%_EXT%\xmloff\XMLEmbeddedObjectExportFilter.hxx -..\inc\XMLFilterServiceNames.h %_DEST%\inc%_EXT%\xmloff\XMLFilterServiceNames.h -..\inc\xmlerror.hxx %_DEST%\inc%_EXT%\xmloff\xmlerror.hxx -..\inc\xformsimport.hxx %_DEST%\inc%_EXT%\xmloff\xformsimport.hxx -..\inc\xformsexport.hxx %_DEST%\inc%_EXT%\xmloff\xformsexport.hxx -..\inc\txtimppr.hxx %_DEST%\inc%_EXT%\xmloff\txtimppr.hxx - -..\inc\xmloff\*.hxx %_DEST%\inc%_EXT%\xmloff\*.hxx -..\inc\xmloff\*.h %_DEST%\inc%_EXT%\xmloff\*.h - -..\xml\components.xml %_DEST%\xml%_EXT%\components.xml - -mkdir: %_DEST%\inc%_EXT%\xmloff\table -..\inc\xmloff\table\XMLTableExport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableExport.hxx -..\inc\xmloff\table\XMLTableImport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableImport.hxx - -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib diff --git a/xmloff/prj/target_module_xmloff.mk b/xmloff/prj/target_module_xmloff.mk index 4d4d82412fab..6a90531db467 100644 --- a/xmloff/prj/target_module_xmloff.mk +++ b/xmloff/prj/target_module_xmloff.mk @@ -28,12 +28,14 @@ $(eval $(call gb_Module_Module,xmloff,\ $(call gb_Library_get_target,xo) \ $(call gb_Library_get_target,xof) \ + $(call gb_Package_get_target,xmloff_dtd) \ $(call gb_Package_get_target,xmloff_inc) \ )) $(eval $(call gb_Module_read_includes,xmloff,\ lib_xo \ lib_xof \ + package_dtd \ package_inc \ )) diff --git a/xmloff/prj/target_package_dtd.mk b/xmloff/prj/target_package_dtd.mk new file mode 100644 index 000000000000..fbfbe4a1400d --- /dev/null +++ b/xmloff/prj/target_package_dtd.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,xmloff_dtd,$(SRCDIR)/xmloff/dtd)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/Blocklist.dtd,Blocklist.dtd)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/chart.mod,chart.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/datastyl.mod,datastyl.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/defs.mod,defs.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/drawing.mod,drawing.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/dtypes.mod,dtypes.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/form.mod,form.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/meta.mod,meta.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/nmspace.mod,nmspace.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.dtd,office.dtd)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.mod,office.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/openoffice-2.0-schema.rng,openoffice-2.0-schema.rng)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/script.mod,script.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/settings.mod,settings.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/style.mod,style.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/table.mod,table.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/text.mod,text.mod)) diff --git a/xmloff/prj/target_package_inc.mk b/xmloff/prj/target_package_inc.mk index 76e9b485cb22..cd0500c6b55d 100644 --- a/xmloff/prj/target_package_inc.mk +++ b/xmloff/prj/target_package_inc.mk @@ -126,4 +126,6 @@ $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SettingsExportHelper.hxx $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlictxt.hxx,xmloff/xmlictxt.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableExport.hxx,xmloff/table/XMLTableExport.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableImport.hxx,xmloff/table/XMLTableImport.hxx)) - +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLSettingsExportContext.hxx,xmloff/XMLSettingsExportContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/odffields.hxx,xmloff/odffields.hxx)) -- cgit v1.2.3 From 1aeb4427c8b6f174fd0f5280f4023209ab07af0a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:55:42 +0200 Subject: CWS gnumake2: not using implicit rules --- framework/prj/makefile.mk | 2 +- sfx2/prj/makefile.mk | 2 +- xmloff/prj/makefile.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sfx2') diff --git a/framework/prj/makefile.mk b/framework/prj/makefile.mk index a5f9aa9d8248..2a0b99e72fd5 100644 --- a/framework/prj/makefile.mk +++ b/framework/prj/makefile.mk @@ -1,2 +1,2 @@ all: - cd .. && make -sj9 + cd .. && make -srj9 diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index a5f9aa9d8248..2a0b99e72fd5 100644 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -1,2 +1,2 @@ all: - cd .. && make -sj9 + cd .. && make -srj9 diff --git a/xmloff/prj/makefile.mk b/xmloff/prj/makefile.mk index a5f9aa9d8248..2a0b99e72fd5 100644 --- a/xmloff/prj/makefile.mk +++ b/xmloff/prj/makefile.mk @@ -1,2 +1,2 @@ all: - cd .. && make -sj9 + cd .. && make -srj9 -- cgit v1.2.3 From b8f0e80d0e60345015e99a4d93d5bef7ff05f82a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 22 Apr 2010 18:36:39 +0200 Subject: CWS gnumake2: Sdi deps should work now --- sfx2/prj/target_lib_sfx2.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sfx2') diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index 9d39fd1c0d50..a9b97e84e172 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,sfx)) +$(call gb_Library_get_headers_target,sfx) : $(call gb_Package_get_target,sfx2_inc) +$(call gb_Library_get_headers_target,sfx) : $(call gb_Package_get_target,sfx2_sdi) $(call gb_Library_get_headers_target,sfx) : $(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) $(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) :| $(call gb_Library_get_external_headers_target,sfx) $(call gb_Library_get_clean_target,sfx) : $(call gb_SdiTarget_get_clean_target,sfx2/sdi/sfxslots) -- cgit v1.2.3 From 44b27fb699c6541f9c85091983d1faa23079217a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 23 Apr 2010 15:15:43 +0200 Subject: CWS gnumake2: added cnvenience methods for adding package and sdi headers --- sfx2/prj/target_lib_sfx2.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sfx2') diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index a9b97e84e172..0a93faf16f15 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -27,11 +27,12 @@ $(eval $(call gb_Library_Library,sfx)) -$(call gb_Library_get_headers_target,sfx) : $(call gb_Package_get_target,sfx2_inc) -$(call gb_Library_get_headers_target,sfx) : $(call gb_Package_get_target,sfx2_sdi) -$(call gb_Library_get_headers_target,sfx) : $(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) -$(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) :| $(call gb_Library_get_external_headers_target,sfx) -$(call gb_Library_get_clean_target,sfx) : $(call gb_SdiTarget_get_clean_target,sfx2/sdi/sfxslots) +$(eval $(call gb_Library_add_package_headers,sfx,\ + sfx2_inc \ + sfx2_sdi \ +)) + +$(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_include,sfx,\ $$(INCLUDE) \ -- cgit v1.2.3 From 661e2cc1a5a7bb3d679d57538878c79aab311b2f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 24 Apr 2010 00:09:05 +0200 Subject: CWS gnumake2: avoid export of template symbols --- basic/source/uno/modsizeexceeded.cxx | 14 +- framework/inc/framework/fwedllapi.h | 4 +- framework/inc/framework/interaction.hxx | 242 +++----------------------- framework/source/fwe/dispatch/interaction.cxx | 220 +++++++++++++++++++---- framework/source/loadenv/loadenv.cxx | 14 +- sfx2/inc/sfx2/brokenpackageint.hxx | 56 ++---- sfx2/source/appl/appuno.cxx | 105 +++++++++-- sfx2/source/doc/docfile.cxx | 11 +- sfx2/source/doc/objmisc.cxx | 15 +- sfx2/source/doc/sfxbasemodel.cxx | 14 +- sfx2/source/inc/fltoptint.hxx | 10 +- sfx2/source/view/frmload.cxx | 9 +- svx/source/unodraw/UnoGraphicExporter.cxx | 7 +- 13 files changed, 359 insertions(+), 362 deletions(-) (limited to 'sfx2') diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx index 95c5b0ac2a83..3efc7f2d230b 100644 --- a/basic/source/uno/modsizeexceeded.cxx +++ b/basic/source/uno/modsizeexceeded.cxx @@ -29,7 +29,7 @@ #include "precompiled_basic.hxx" #include "basic/modsizeexceeded.hxx" -#include +#include #include using namespace com::sun::star; @@ -44,8 +44,8 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >& m_aRequest <<= aReq; - m_xAbort.set( uno::Reference< task::XInteractionAbort >(new framework::ContinuationAbort), uno::UNO_QUERY ); - m_xApprove.set( uno::Reference< task::XInteractionApprove >(new framework::ContinuationApprove ), uno::UNO_QUERY ); + m_xAbort.set( uno::Reference< task::XInteractionAbort >(new comphelper::OInteractionAbort), uno::UNO_QUERY ); + m_xApprove.set( uno::Reference< task::XInteractionApprove >(new comphelper::OInteractionApprove ), uno::UNO_QUERY ); m_lContinuations.realloc( 2 ); m_lContinuations[0] = m_xApprove; m_lContinuations[1] = m_xAbort; @@ -54,15 +54,15 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >& sal_Bool ModuleSizeExceeded::isAbort() const { - framework::ContinuationAbort* pBase = static_cast< framework::ContinuationAbort* >( m_xAbort.get() ); - return pBase->isSelected(); + comphelper::OInteractionAbort* pBase = static_cast< comphelper::OInteractionAbort* >( m_xAbort.get() ); + return pBase->wasSelected(); } sal_Bool ModuleSizeExceeded::isApprove() const { - framework::ContinuationApprove* pBase = static_cast< framework::ContinuationApprove* >( m_xApprove.get() ); - return pBase->isSelected(); + comphelper::OInteractionApprove* pBase = static_cast< comphelper::OInteractionApprove* >( m_xApprove.get() ); + return pBase->wasSelected(); } diff --git a/framework/inc/framework/fwedllapi.h b/framework/inc/framework/fwedllapi.h index 2742d09ab134..2d818876a0ac 100644 --- a/framework/inc/framework/fwedllapi.h +++ b/framework/inc/framework/fwedllapi.h @@ -5,8 +5,8 @@ #if defined(FWE_DLLIMPLEMENTATION) #define FWE_DLLPUBLIC SAL_DLLPUBLIC_EXPORT -#include -template struct FWE_DLLPUBLIC cppu::OBroadcastHelperVar; +//#include +//template struct FWE_DLLPUBLIC cppu::OBroadcastHelperVar; //class FWE_DLLPUBLIC SvPtrarr; #else #define FWE_DLLPUBLIC SAL_DLLPUBLIC_IMPORT diff --git a/framework/inc/framework/interaction.hxx b/framework/inc/framework/interaction.hxx index 05c4303f4b8e..03c8fde19736 100644 --- a/framework/inc/framework/interaction.hxx +++ b/framework/inc/framework/interaction.hxx @@ -28,14 +28,6 @@ #ifndef __FRAMEWORK_DISPATCH_INTERACTION_HXX_ #define __FRAMEWORK_DISPATCH_INTERACTION_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include #include #include @@ -56,147 +48,8 @@ #include #include -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - -/*-************************************************************************************************************//** - @short base for continuation classes - @descr An interaction continuation could be used on XInteractionHandler/XInteractionRequest - to abort or react for it. - Base functionality is everytime the same - handler mark right continuation by calling - interface method "select()". User of interaction can detect it by testing c++ method "isSelected()"! - Superclasses can add additional interfaces or methods to support additional features ... - but selection of it is supported here! - - @implements XInterface - XTypeProvider (supported by WeakImplHelper!) - XInteractionContinuation - - @base WeakImplHelper1 - - @devstatus ready to use - @threadsafe no (used on once position only!) -*//*-*************************************************************************************************************/ -template< class TContinuationType > -class ContinuationBase : public ::cppu::WeakImplHelper1< TContinuationType > -{ - // c++ interface - public: - - //--------------------------------------------------------------------------------------------------------- - // initialize continuation with right start values - //--------------------------------------------------------------------------------------------------------- - ContinuationBase() - : m_bSelected( sal_False ) - { - } - - //--------------------------------------------------------------------------------------------------------- - // was continuation selected by handler? - //--------------------------------------------------------------------------------------------------------- - sal_Bool isSelected() const - { - return m_bSelected; - } - - //--------------------------------------------------------------------------------------------------------- - // make using more then once possible - //--------------------------------------------------------------------------------------------------------- - void reset() - { - m_bSelected = sal_False; - } - - // uno interface - public: - - //--------------------------------------------------------------------------------------------------------- - // called by handler to mark continuation as the only possible solution for started interaction - //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL select() throw( ::com::sun::star::uno::RuntimeException ) - { - m_bSelected = sal_True; - } - - // member - private: - - sal_Bool m_bSelected; - -}; // class ContinuationBase - -//template class FWE_DLLEXPORT ContinuationBase; - -/*-************************************************************************************************************//** - @short declaration of some simple continuations - @descr These derived classes implements some simple continuations, which doesnt need and additional - interfaces or methods. Her selected state is the only neccessary feature. User of it can - distinguish by type between different functionality! - - @implements - - - @base ContinuationBase - - @devstatus ready to use - @threadsafe no (used on once position only!) -*//*-*************************************************************************************************************/ -typedef ContinuationBase< ::com::sun::star::task::XInteractionAbort > ContinuationAbort; -typedef ContinuationBase< ::com::sun::star::task::XInteractionApprove > ContinuationApprove; -typedef ContinuationBase< ::com::sun::star::task::XInteractionDisapprove > ContinuationDisapprove; -typedef ContinuationBase< ::com::sun::star::task::XInteractionRetry > ContinuationRetry; - -/*-************************************************************************************************************//** - @short declaration of special continuation for filter selection - @descr Sometimes filter detection during loading document failed. Then we need a possibility - to ask user for his decision. These continuation transport selected filter by user to - code user of interaction. - - @attention This implementation could be used one times only. We don't support a resetable continuation yet! - Why? Normaly interaction should show a filter selection dialog and ask user for his decision. - He can select any filter - then instances of these class will be called by handler ... or user - close dialog without any selection. Then another continuation should be slected by handler to - abort continuations ... Retrying isn't very usefull here ... I think. - - @implements XInteractionFilterSelect - - @base ImplInheritanceHelper1 - ContinuationBase - - @devstatus ready to use - @threadsafe no (used on once position only!) -*//*-*************************************************************************************************************/ -class FWE_DLLPUBLIC ContinuationFilterSelect : public ContinuationBase< ::com::sun::star::document::XInteractionFilterSelect > -{ - // c++ interface - public: - ContinuationFilterSelect(); - - // uno interface - public: - virtual void SAL_CALL setFilter( const ::rtl::OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException ); - - // member - private: - ::rtl::OUString m_sFilter; - -}; // class ContinuationFilterSelect - /*-************************************************************************************************************//** @short special request for interaction to ask user for right filter @descr These helper can be used to ask user for right filter, if filter detection failed. @@ -219,27 +72,18 @@ class FWE_DLLPUBLIC ContinuationFilterSelect : public ContinuationBase< ::com::s @devstatus ready to use @threadsafe no (used on once position only!) *//*-*************************************************************************************************************/ -class FWE_DLLPUBLIC RequestFilterSelect : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +class RequestFilterSelect_Impl; +class FWE_DLLPUBLIC RequestFilterSelect { - // c++ interface + RequestFilterSelect_Impl* pImp; + public: RequestFilterSelect( const ::rtl::OUString& sURL ); + ~RequestFilterSelect(); sal_Bool isAbort () const; ::rtl::OUString getFilter() const; - - // uno interface - public: - virtual ::com::sun::star::uno::Any SAL_CALL getRequest () throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException ); - - // member - private: - ::com::sun::star::uno::Any m_aRequest ; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; - ContinuationAbort* m_pAbort ; - ContinuationFilterSelect* m_pFilter ; - -}; // class RequestFilterSelect + com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); +}; /*-************************************************************************************************************//** @short special request for interaction @@ -254,29 +98,13 @@ class FWE_DLLPUBLIC RequestFilterSelect : public ::cppu::WeakImplHelper1< ::com: @devstatus ready to use @threadsafe no (used on once position only!) *//*-*************************************************************************************************************/ -class FWE_DLLPUBLIC RequestAmbigousFilter : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +class FWE_DLLPUBLIC InteractionRequest { - // c++ interface - public: - RequestAmbigousFilter( const ::rtl::OUString& sURL , - const ::rtl::OUString& sSelectedFilter , - const ::rtl::OUString& sDetectedFilter ); - sal_Bool isAbort () const; - ::rtl::OUString getFilter() const; - - // uno interface - public: - virtual ::com::sun::star::uno::Any SAL_CALL getRequest () throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException ); - - // member - private: - ::com::sun::star::uno::Any m_aRequest ; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; - ContinuationAbort* m_pAbort ; - ContinuationFilterSelect* m_pFilter ; - -}; // class RequestFilterSelect +public: + static com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > + CreateRequest( const ::com::sun::star::uno::Any& aRequest, + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations ); +}; /*-************************************************************************************************************//** @short special request for interaction @@ -291,37 +119,23 @@ class FWE_DLLPUBLIC RequestAmbigousFilter : public ::cppu::WeakImplHelper1< ::co @devstatus ready to use @threadsafe no (used on once position only!) *//*-*************************************************************************************************************/ -class FWE_DLLPUBLIC InteractionRequest : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +/* +class RequestAmbigousFilter_Impl; +class RequestAmbigousFilter // seems to be unused currently { - // c++ interface - public: - InteractionRequest( const ::com::sun::star::uno::Any& aRequest , - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations ) - { - m_aRequest = aRequest ; - m_lContinuations = lContinuations; - } + RequestAmbigousFilter_Impl* pImp; - // uno interface - public: - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() - throw( ::com::sun::star::uno::RuntimeException ) - { - return m_aRequest; - } - - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( ::com::sun::star::uno::RuntimeException ) - { - return m_lContinuations; - } - - // member - private: - ::com::sun::star::uno::Any m_aRequest ; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; - -}; // class RequestFilterSelect + // c++ interface +public: + RequestAmbigousFilter( const ::rtl::OUString& sURL, + const ::rtl::OUString& sSelectedFilter , + const ::rtl::OUString& sDetectedFilter ); + ~RequestAmbigousFilter(); + sal_Bool isAbort () const; + ::rtl::OUString getFilter() const; + com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); +}; + */ } // namespace framework diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 528bf855ab58..9b3d4f4c69d8 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -31,35 +31,51 @@ //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ +#include #include #include -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ +using namespace ::com::sun::star; -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ +namespace framework{ -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ +/*-************************************************************************************************************//** + @short declaration of special continuation for filter selection + @descr Sometimes filter detection during loading document failed. Then we need a possibility + to ask user for his decision. These continuation transport selected filter by user to + code user of interaction. -namespace framework{ + @attention This implementation could be used one times only. We don't support a resetable continuation yet! + Why? Normaly interaction should show a filter selection dialog and ask user for his decision. + He can select any filter - then instances of these class will be called by handler ... or user + close dialog without any selection. Then another continuation should be slected by handler to + abort continuations ... Retrying isn't very usefull here ... I think. -//template class FWE_DLLEXPORT ContinuationBase; -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ + @implements XInteractionFilterSelect -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ + @base ImplInheritanceHelper1 + ContinuationBase + + @devstatus ready to use + @threadsafe no (used on once position only!) +*//*-*************************************************************************************************************/ +class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterSelect > +{ + // c++ interface + public: + ContinuationFilterSelect(); + + // uno interface + public: + virtual void SAL_CALL setFilter( const ::rtl::OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::rtl::OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException ); + + // member + private: + ::rtl::OUString m_sFilter; + +}; // class ContinuationFilterSelect -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ //--------------------------------------------------------------------------------------------------------- // initialize continuation with right start values @@ -85,11 +101,29 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilte return m_sFilter; } +class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +{ +public: + RequestFilterSelect_Impl( const ::rtl::OUString& sURL ); + sal_Bool isAbort () const; + ::rtl::OUString getFilter() const; + +public: + virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException ); + +private: + ::com::sun::star::uno::Any m_aRequest ; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; + comphelper::OInteractionAbort* m_pAbort; + ContinuationFilterSelect* m_pFilter; +}; + //--------------------------------------------------------------------------------------------------------- // initialize instance with all neccessary informations // We use it without any further checks on our member then ...! //--------------------------------------------------------------------------------------------------------- -RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL ) +RequestFilterSelect_Impl::RequestFilterSelect_Impl( const ::rtl::OUString& sURL ) { ::rtl::OUString temp; css::uno::Reference< css::uno::XInterface > temp2; @@ -98,7 +132,7 @@ RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL ) sURL ); m_aRequest <<= aFilterRequest; - m_pAbort = new ContinuationAbort ; + m_pAbort = new comphelper::OInteractionAbort; m_pFilter = new ContinuationFilterSelect; m_lContinuations.realloc( 2 ); @@ -110,16 +144,16 @@ RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL ) // return abort state of interaction // If it is true, return value of method "getFilter()" will be unspecified then! //--------------------------------------------------------------------------------------------------------- -sal_Bool RequestFilterSelect::isAbort() const +sal_Bool RequestFilterSelect_Impl::isAbort() const { - return m_pAbort->isSelected(); + return m_pAbort->wasSelected(); } //--------------------------------------------------------------------------------------------------------- // return user selected filter // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! //--------------------------------------------------------------------------------------------------------- -::rtl::OUString RequestFilterSelect::getFilter() const +::rtl::OUString RequestFilterSelect_Impl::getFilter() const { return m_pFilter->getFilter(); } @@ -128,7 +162,7 @@ sal_Bool RequestFilterSelect::isAbort() const // handler call it to get type of request // Is hard coded to "please select filter" here. see ctor for further informations. //--------------------------------------------------------------------------------------------------------- -css::uno::Any SAL_CALL RequestFilterSelect::getRequest() throw( css::uno::RuntimeException ) +css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException ) { return m_aRequest; } @@ -139,16 +173,102 @@ css::uno::Any SAL_CALL RequestFilterSelect::getRequest() throw( css::uno::Runtim // After interaction we support read access on these continuations on our c++ interface to // return user decision. //--------------------------------------------------------------------------------------------------------- -css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect::getContinuations() throw( css::uno::RuntimeException ) +css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException ) { return m_lContinuations; } + +RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL ) +{ + pImp = new RequestFilterSelect_Impl( sURL ); + pImp->acquire(); +} + +RequestFilterSelect::~RequestFilterSelect() +{ + pImp->release(); +} + + +//--------------------------------------------------------------------------------------------------------- +// return abort state of interaction +// If it is true, return value of method "getFilter()" will be unspecified then! +//--------------------------------------------------------------------------------------------------------- +sal_Bool RequestFilterSelect::isAbort() const +{ + return pImp->isAbort(); +} + +//--------------------------------------------------------------------------------------------------------- +// return user selected filter +// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! +//--------------------------------------------------------------------------------------------------------- +::rtl::OUString RequestFilterSelect::getFilter() const +{ + return pImp->getFilter(); +} + +uno::Reference < task::XInteractionRequest > RequestFilterSelect::GetRequest() +{ + return uno::Reference < task::XInteractionRequest > (pImp); +} + +/* +class RequestAmbigousFilter_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +{ +public: + RequestAmbigousFilter_Impl( const ::rtl::OUString& sURL , + const ::rtl::OUString& sSelectedFilter , + const ::rtl::OUString& sDetectedFilter ); + sal_Bool isAbort () const; + ::rtl::OUString getFilter() const; + + virtual ::com::sun::star::uno::Any SAL_CALL getRequest () throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException ); + + ::com::sun::star::uno::Any m_aRequest ; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; + ContinuationAbort* m_pAbort ; + ContinuationFilterSelect* m_pFilter ; +}; + +RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL, const ::rtl::OUString& sSelectedFilter, + const ::rtl::OUString& sDetectedFilter ) +{ + pImp = new RequestAmbigousFilter_Impl( sURL, sSelectedFilter, sDetectedFilter ); + pImp->acquire(); +} + +RequestAmbigousFilter::~RequestAmbigousFilter() +{ + pImp->release(); +} + +sal_Bool RequestAmbigousFilter::isAbort() const +{ + return pImp->isAbort(); +} + +//--------------------------------------------------------------------------------------------------------- +// return user selected filter +// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! +//--------------------------------------------------------------------------------------------------------- +::rtl::OUString RequestAmbigousFilter::getFilter() const +{ + return pImp->getFilter(); +} + +uno::Reference < task::XInteractionRequest > RequestAmbigousFilter::GetRequest() +{ + return uno::Reference < task::XInteractionRequest > (pImp); +} + //--------------------------------------------------------------------------------------------------------- // initialize instance with all neccessary informations // We use it without any further checks on our member then ...! //--------------------------------------------------------------------------------------------------------- -RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL , +RequestAmbigousFilter_Impl::RequestAmbigousFilter_Impl( const ::rtl::OUString& sURL , const ::rtl::OUString& sSelectedFilter , const ::rtl::OUString& sDetectedFilter ) { @@ -173,7 +293,7 @@ RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL // return abort state of interaction // If it is true, return value of method "getFilter()" will be unspecified then! //--------------------------------------------------------------------------------------------------------- -sal_Bool RequestAmbigousFilter::isAbort() const +sal_Bool RequestAmbigousFilter_Impl::isAbort() const { return m_pAbort->isSelected(); } @@ -182,7 +302,7 @@ sal_Bool RequestAmbigousFilter::isAbort() const // return user selected filter // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! //--------------------------------------------------------------------------------------------------------- -::rtl::OUString RequestAmbigousFilter::getFilter() const +::rtl::OUString RequestAmbigousFilter_Impl::getFilter() const { return m_pFilter->getFilter(); } @@ -191,7 +311,7 @@ sal_Bool RequestAmbigousFilter::isAbort() const // handler call it to get type of request // Is hard coded to "please select filter" here. see ctor for further informations. //--------------------------------------------------------------------------------------------------------- -css::uno::Any SAL_CALL RequestAmbigousFilter::getRequest() throw( css::uno::RuntimeException ) +css::uno::Any SAL_CALL RequestAmbigousFilter_Impl::getRequest() throw( css::uno::RuntimeException ) { return m_aRequest; } @@ -202,9 +322,45 @@ css::uno::Any SAL_CALL RequestAmbigousFilter::getRequest() throw( css::uno::Runt // After interaction we support read access on these continuations on our c++ interface to // return user decision. //--------------------------------------------------------------------------------------------------------- -css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestAmbigousFilter::getContinuations() throw( css::uno::RuntimeException ) +css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestAmbigousFilter_Impl::getContinuations() throw( css::uno::RuntimeException ) +{ + return m_lContinuations; +} +*/ + +class InteractionRequest_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +{ + uno::Any m_aRequest; + uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; + +public: + InteractionRequest_Impl( const ::com::sun::star::uno::Any& aRequest, + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations ) + { + m_aRequest = aRequest; + m_lContinuations = lContinuations; + } + + virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException ); + virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() + throw( uno::RuntimeException ); +}; + +uno::Any SAL_CALL InteractionRequest_Impl::getRequest() throw( uno::RuntimeException ) +{ + return m_aRequest; +} + +uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL InteractionRequest_Impl::getContinuations() + throw( uno::RuntimeException ) { return m_lContinuations; } +uno::Reference < task::XInteractionRequest > InteractionRequest::CreateRequest( + const uno::Any& aRequest, const uno::Sequence< uno::Reference< task::XInteractionContinuation > > lContinuations ) +{ + return new InteractionRequest_Impl( aRequest, lContinuations ); +} + } // namespace framework diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 365ac2efacbc..07c8846bb3ce 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -39,6 +39,8 @@ #ifndef __FRAMEWORK_CONSTANT_FILTER_HXX_ #include #endif + +#include #include #ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_ @@ -1060,8 +1062,8 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed() css::uno::Any aInteraction; css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > lContinuations(2); - ContinuationAbort* pAbort = new ContinuationAbort(); - ContinuationApprove* pApprove = new ContinuationApprove(); + comphelper::OInteractionAbort* pAbort = new comphelper::OInteractionAbort(); + comphelper::OInteractionApprove* pApprove = new comphelper::OInteractionApprove(); lContinuations[0] = css::uno::Reference< css::task::XInteractionContinuation >( static_cast< css::task::XInteractionContinuation* >(pAbort), @@ -1073,13 +1075,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed() css::task::ErrorCodeRequest aErrorCode; aErrorCode.ErrCode = ERRCODE_SFX_NOMOREDOCUMENTSALLOWED; aInteraction <<= aErrorCode; - - InteractionRequest* pRequest = new InteractionRequest(aInteraction, lContinuations); - css::uno::Reference< css::task::XInteractionRequest > xRequest( - static_cast< css::task::XInteractionRequest* >(pRequest), - css::uno::UNO_QUERY_THROW); - - xInteraction->handle(xRequest); + xInteraction->handle( InteractionRequest::CreateRequest(aInteraction, lContinuations) ); } } diff --git a/sfx2/inc/sfx2/brokenpackageint.hxx b/sfx2/inc/sfx2/brokenpackageint.hxx index e39c92c599ae..5186e875a6ea 100644 --- a/sfx2/inc/sfx2/brokenpackageint.hxx +++ b/sfx2/inc/sfx2/brokenpackageint.hxx @@ -30,58 +30,26 @@ #include #include #include -#include -using namespace ::framework; -typedef ContinuationBase< ::com::sun::star::task::XInteractionApprove > SfxContinuationApprove; -typedef ContinuationBase< ::com::sun::star::task::XInteractionDisapprove > SfxContinuationDisapprove; - -class SFX2_DLLPUBLIC RequestPackageReparation : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +class RequestPackageReparation_Impl; +class SFX2_DLLPUBLIC RequestPackageReparation { - ::com::sun::star::uno::Any m_aRequest; - - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > m_lContinuations; - - SfxContinuationApprove* m_pApprove; - SfxContinuationDisapprove* m_pDisapprove; - + RequestPackageReparation_Impl* pImp; public: RequestPackageReparation( ::rtl::OUString aName ); - - sal_Bool isApproved() { return m_pApprove->isSelected(); } - - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() - throw( ::com::sun::star::uno::RuntimeException ); - - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > SAL_CALL getContinuations() - throw( ::com::sun::star::uno::RuntimeException ); + ~RequestPackageReparation(); + sal_Bool isApproved(); + com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); }; -class SFX2_DLLPUBLIC NotifyBrokenPackage : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +class NotifyBrokenPackage_Impl; +class SFX2_DLLPUBLIC NotifyBrokenPackage { - ::com::sun::star::uno::Any m_aRequest; - - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > m_lContinuations; - - ContinuationAbort* m_pAbort; - + NotifyBrokenPackage_Impl* pImp; public: NotifyBrokenPackage( ::rtl::OUString aName ); - - sal_Bool isAborted() { return m_pAbort->isSelected(); } - - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() - throw( ::com::sun::star::uno::RuntimeException ); - - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > SAL_CALL getContinuations() - throw( ::com::sun::star::uno::RuntimeException ); + ~NotifyBrokenPackage(); + sal_Bool isAborted(); + com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); }; diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 6498df6ca62a..24a1725aa99c 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -94,6 +94,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::ucb; @@ -2367,7 +2368,7 @@ RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< :: m_aRequest <<= aOptionsRequest; - m_pAbort = new ContinuationAbort; + m_pAbort = new comphelper::OInteractionAbort; m_pOptions = new FilterOptionsContinuation; m_lContinuations.realloc( 2 ); @@ -2389,67 +2390,139 @@ RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< :: } //========================================================================= +class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +{ + ::com::sun::star::uno::Any m_aRequest; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; + comphelper::OInteractionApprove* m_pApprove; + comphelper::OInteractionDisapprove* m_pDisapprove; -RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName ) +public: + RequestPackageReparation_Impl( ::rtl::OUString aName ); + sal_Bool isApproved(); + virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() + throw( ::com::sun::star::uno::RuntimeException ); +}; + +RequestPackageReparation_Impl::RequestPackageReparation_Impl( ::rtl::OUString aName ) { ::rtl::OUString temp; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2; ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp, temp2, aName ); - m_aRequest <<= aBrokenPackageRequest; - - m_pApprove = new ContinuationApprove; - m_pDisapprove = new ContinuationDisapprove; - + m_pApprove = new comphelper::OInteractionApprove; + m_pDisapprove = new comphelper::OInteractionDisapprove; m_lContinuations.realloc( 2 ); m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pApprove ); m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pDisapprove ); } -::com::sun::star::uno::Any SAL_CALL RequestPackageReparation::getRequest() +sal_Bool RequestPackageReparation_Impl::isApproved() +{ + return m_pApprove->wasSelected(); +} + +::com::sun::star::uno::Any SAL_CALL RequestPackageReparation_Impl::getRequest() throw( ::com::sun::star::uno::RuntimeException ) { return m_aRequest; } ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > - SAL_CALL RequestPackageReparation::getContinuations() + SAL_CALL RequestPackageReparation_Impl::getContinuations() throw( ::com::sun::star::uno::RuntimeException ) { return m_lContinuations; } +RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName ) +{ + pImp = new RequestPackageReparation_Impl( aName ); + pImp->acquire(); +} + +RequestPackageReparation::~RequestPackageReparation() +{ + pImp->release(); +} + +sal_Bool RequestPackageReparation::isApproved() +{ + return pImp->isApproved(); +} + +com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > RequestPackageReparation::GetRequest() +{ + return com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >(pImp); +} + //========================================================================= +class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +{ + ::com::sun::star::uno::Any m_aRequest; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; + comphelper::OInteractionAbort* m_pAbort; -NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName ) +public: + NotifyBrokenPackage_Impl( ::rtl::OUString aName ); + sal_Bool isAborted(); + virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() + throw( ::com::sun::star::uno::RuntimeException ); +}; + +NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( ::rtl::OUString aName ) { ::rtl::OUString temp; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2; ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp, temp2, aName ); - m_aRequest <<= aBrokenPackageRequest; - - m_pAbort = new ContinuationAbort; - + m_pAbort = new comphelper::OInteractionAbort; m_lContinuations.realloc( 1 ); m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort ); } -::com::sun::star::uno::Any SAL_CALL NotifyBrokenPackage::getRequest() +sal_Bool NotifyBrokenPackage_Impl::isAborted() +{ + return m_pAbort->wasSelected(); +} + +::com::sun::star::uno::Any SAL_CALL NotifyBrokenPackage_Impl::getRequest() throw( ::com::sun::star::uno::RuntimeException ) { return m_aRequest; } ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > - SAL_CALL NotifyBrokenPackage::getContinuations() + SAL_CALL NotifyBrokenPackage_Impl::getContinuations() throw( ::com::sun::star::uno::RuntimeException ) { return m_lContinuations; } +NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName ) +{ + pImp = new NotifyBrokenPackage_Impl( aName ); + pImp->acquire(); +} + +NotifyBrokenPackage::~NotifyBrokenPackage() +{ + pImp->release(); +} + +sal_Bool NotifyBrokenPackage::isAborted() +{ + return pImp->isAborted(); +} + +com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > NotifyBrokenPackage::GetRequest() +{ + return com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >(pImp); +} diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 7bc679fc94b2..c18ad2c7016c 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -81,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -3772,19 +3773,17 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction { uno::Sequence< uno::Reference< task::XInteractionContinuation > > aContinuations( bAllowAbort ? 2 : 1 ); - ::rtl::Reference< ::framework::ContinuationApprove > pApprove( new ::framework::ContinuationApprove() ); + ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove ); aContinuations[ 0 ] = pApprove.get(); if ( bAllowAbort ) { - ::rtl::Reference< ::framework::ContinuationAbort > pAbort( new ::framework::ContinuationAbort() ); + ::rtl::Reference< ::comphelper::OInteractionAbort > pAbort( new ::comphelper::OInteractionAbort ); aContinuations[ 1 ] = pAbort.get(); } - uno::Reference< task::XInteractionRequest > xRequest( new ::framework::InteractionRequest( aRequest, aContinuations ) ); - xHandler->handle( xRequest ); - - bResult = pApprove->isSelected(); + xHandler->handle(::framework::InteractionRequest::CreateRequest (aRequest,aContinuations)); + bResult = pApprove->wasSelected(); } catch( const Exception& ) { diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 7e5b69081f1b..692359ac4669 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -118,6 +118,7 @@ using namespace ::com::sun::star::container; #include #include #include +#include #include #include @@ -2257,8 +2258,8 @@ sal_Bool SfxObjectShell::UseInteractionToHandleError( { uno::Any aInteraction; uno::Sequence< uno::Reference< task::XInteractionContinuation > > lContinuations(2); - ::framework::ContinuationAbort* pAbort = new ::framework::ContinuationAbort(); - ::framework::ContinuationApprove* pApprove = new ::framework::ContinuationApprove(); + ::comphelper::OInteractionAbort* pAbort = new ::comphelper::OInteractionAbort(); + ::comphelper::OInteractionApprove* pApprove = new ::comphelper::OInteractionApprove(); lContinuations[0] = uno::Reference< task::XInteractionContinuation >( static_cast< task::XInteractionContinuation* >( pAbort ), uno::UNO_QUERY ); lContinuations[1] = uno::Reference< task::XInteractionContinuation >( @@ -2267,14 +2268,8 @@ sal_Bool SfxObjectShell::UseInteractionToHandleError( task::ErrorCodeRequest aErrorCode; aErrorCode.ErrCode = nError; aInteraction <<= aErrorCode; - - ::framework::InteractionRequest* pRequest = new ::framework::InteractionRequest(aInteraction,lContinuations); - uno::Reference< task::XInteractionRequest > xRequest( - static_cast< task::XInteractionRequest* >( pRequest ), - uno::UNO_QUERY); - - xHandler->handle(xRequest); - bResult = pAbort->isSelected(); + xHandler->handle(::framework::InteractionRequest::CreateRequest (aInteraction,lContinuations)); + bResult = pAbort->wasSelected(); } catch( uno::Exception& ) {} diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 38cd688b96f1..5c746736a9ae 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1790,10 +1790,9 @@ void SAL_CALL SfxBaseModel::load( const uno::Sequence< beans::PropertyValue >& SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, FALSE ); if ( !pRepairItem || !pRepairItem->GetValue() ) { - RequestPackageReparation* pRequest = new RequestPackageReparation( aDocName ); - com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > xRequest ( pRequest ); - xHandler->handle( xRequest ); - if( pRequest->isApproved() ) + RequestPackageReparation aRequest( aDocName ); + xHandler->handle( aRequest.GetRequest() ); + if( aRequest.isApproved() ) { // broken package: try second loading and allow repair pMedium->GetItemSet()->Put( SfxBoolItem( SID_REPAIRPACKAGE, sal_True ) ); @@ -1813,9 +1812,8 @@ void SAL_CALL SfxBaseModel::load( const uno::Sequence< beans::PropertyValue >& if ( nError == ERRCODE_IO_BROKENPACKAGE ) { // repair either not allowed or not successful - NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocName ); - com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > xRequest ( pNotifyRequest ); - xHandler->handle( xRequest ); + NotifyBrokenPackage aRequest( aDocName ); + xHandler->handle( aRequest.GetRequest() ); } } } @@ -3246,7 +3244,7 @@ uno::Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfig uno::Reference< lang::XMultiServiceFactory > xServiceMgr( ::comphelper::getProcessServiceFactory() ); uno::Sequence< uno::Reference< container::XIndexContainer > > rToolbars; - sal_Bool bImported = UIConfigurationImporterOOo1x::ImportCustomToolbars( + sal_Bool bImported = framework::UIConfigurationImporterOOo1x::ImportCustomToolbars( xNewUIConfMan, rToolbars, xServiceMgr, xOOo1ConfigStorage ); if ( bImported ) { diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx index b4aed7ccdd99..5cb3f162e6c8 100644 --- a/sfx2/source/inc/fltoptint.hxx +++ b/sfx2/source/inc/fltoptint.hxx @@ -28,11 +28,11 @@ #include #include #include -#include +#include -using namespace ::framework; +//using namespace ::framework; -class FilterOptionsContinuation : public ContinuationBase< ::com::sun::star::document::XInteractionFilterOptions > +class FilterOptionsContinuation : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterOptions > { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties; @@ -49,7 +49,7 @@ class RequestFilterOptions : public ::cppu::WeakImplHelper1< ::com::sun::star::t ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; - ContinuationAbort* m_pAbort; + comphelper::OInteractionAbort* m_pAbort; FilterOptionsContinuation* m_pOptions; @@ -57,7 +57,7 @@ public: RequestFilterOptions( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > rModel, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties ); - sal_Bool isAbort() { return m_pAbort->isSelected(); } + sal_Bool isAbort() { return m_pAbort->wasSelected(); } ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getFilterOptions() { diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index f30ed34f7846..592163f20f17 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -216,11 +216,10 @@ const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( con ::rtl::OUString sFilterName; try { - ::framework::RequestFilterSelect* pRequest = new ::framework::RequestFilterSelect( i_rDocumentURL ); - Reference< XInteractionRequest > xRequest ( pRequest ); - i_rxHandler->handle( xRequest ); - if( !pRequest->isAbort() ) - sFilterName = pRequest->getFilter(); + ::framework::RequestFilterSelect aRequest( i_rDocumentURL ); + i_rxHandler->handle( aRequest.GetRequest() ); + if( !aRequest.isAbort() ) + sFilterName = aRequest.getFilter(); } catch( const Exception& ) { diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index a2cb2fa29ca4..986942ffaecf 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -1060,15 +1061,13 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes { Any aInteraction; Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations(1); - ::framework::ContinuationApprove* pApprove = new ::framework::ContinuationApprove(); + ::comphelper::OInteractionApprove* pApprove = new ::comphelper::OInteractionApprove(); lContinuations[0] = Reference< XInteractionContinuation >(static_cast< XInteractionContinuation* >(pApprove), UNO_QUERY); GraphicFilterRequest aErrorCode; aErrorCode.ErrCode = nStatus; aInteraction <<= aErrorCode; - framework::InteractionRequest* pRequest = new framework::InteractionRequest( aInteraction, lContinuations ); - Reference< XInteractionRequest >xRequest( static_cast< XInteractionRequest* >(pRequest), UNO_QUERY ); - aSettings.mxInteractionHandler->handle( xRequest ); + aSettings.mxInteractionHandler->handle( framework::InteractionRequest::CreateRequest( aInteraction, lContinuations ) ); } return nStatus == GRFILTER_OK; } -- cgit v1.2.3 From 847276934a43760b2cc9822a37b6ca00ec20469f Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 27 Apr 2010 11:39:42 +0200 Subject: CWS gnumake2: refactoring --- framework/Makefile | 10 ++++++++-- sfx2/Makefile | 10 ++++++++-- xmloff/Makefile | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) (limited to 'sfx2') diff --git a/framework/Makefile b/framework/Makefile index d020b04dba7c..9ab4b8ba83f4 100644 --- a/framework/Makefile +++ b/framework/Makefile @@ -25,6 +25,12 @@ # #************************************************************************* -include ../solenv/inc/gbuild.mk +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) + +gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) + +$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) + +# vim: set noet sw=4 ts=4: diff --git a/sfx2/Makefile b/sfx2/Makefile index d020b04dba7c..9ab4b8ba83f4 100644 --- a/sfx2/Makefile +++ b/sfx2/Makefile @@ -25,6 +25,12 @@ # #************************************************************************* -include ../solenv/inc/gbuild.mk +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) + +gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) + +$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) + +# vim: set noet sw=4 ts=4: diff --git a/xmloff/Makefile b/xmloff/Makefile index d020b04dba7c..9ab4b8ba83f4 100644 --- a/xmloff/Makefile +++ b/xmloff/Makefile @@ -25,6 +25,12 @@ # #************************************************************************* -include ../solenv/inc/gbuild.mk +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) + +gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) + +$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) + +# vim: set noet sw=4 ts=4: -- cgit v1.2.3 From a406648e74b01e304b1371044d3d4fb00105604a Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 30 Apr 2010 19:46:04 +0200 Subject: gnumake2: sfx2: fix quickstarter build on MacOSX --- sfx2/prj/target_lib_sfx2.mk | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'sfx2') diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index 0a93faf16f15..d9b8c52e3736 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -54,13 +54,6 @@ $(eval $(call gb_Library_set_defs,sfx,\ -DABOUTBMPNAMES="$(ABOUTBITMAPS)" \ )) -ifneq ($(OS),UNX) -$(eval $(call gb_Library_set_defs,sfx,\ - $$(DEFS) \ - -DENABLE_QUICKSTART_APPLET \ -)) -endif - $(eval $(call gb_Library_add_linked_libs,sfx,\ comphelper \ cppu \ @@ -258,14 +251,25 @@ $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\ -I$(SRCDIR)/sfx2/sdi \ )) +ifeq ($(OS),$(filter WNT MACOSX,$(OS))) +$(eval $(call gb_Library_set_defs,sfx,\ + $$(DEFS) \ + -DENABLE_QUICKSTART_APPLET \ +)) +endif + ifeq ($(OS),OS2) $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/appl/shutdowniconOs2.ob \ )) endif -ifeq ($(OS),OSX) -$(eval $(call gb_Library_add_exception_objects,sfx,\ - sfx2/source/appl/shutdowniconaqua.ob \ +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_objcxxobjects,sfx,\ + sfx2/source/appl/shutdowniconaqua \ +)) +$(eval $(call gb_Library_add_linked_libs,sfx,\ + objc \ + Cocoa \ )) endif ifeq ($(OS),WNT) -- cgit v1.2.3 From abb3fd0f277363a870a6e441f0d0c2ce8ced5e5f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 6 May 2010 14:56:47 +0200 Subject: CWS gnumake2: found missing return statement by accident --- sfx2/source/control/unoctitm.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2') diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index d2ad8c645eb7..114db6385b76 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -463,7 +463,7 @@ void SfxOfficeDispatch::SetMasterUnoCommand( sal_Bool bSet ) sal_Bool SfxOfficeDispatch::IsMasterUnoCommand() const { if ( pControllerItem ) - pControllerItem->isMasterSlaveCommand(); + return pControllerItem->isMasterSlaveCommand(); return sal_False; } -- cgit v1.2.3 From 137b283deb31f38a25d9996dc1a0c2057d39998a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 1 Jun 2010 17:28:33 +0200 Subject: CWS gnumake2: fitting sdi into the workdir structure --- sfx2/prj/target_lib_sfx2.mk | 7 +++---- svx/prj/target_lib_svxcore.mk | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'sfx2') diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index d9b8c52e3736..952fb9ce05f5 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -35,14 +35,13 @@ $(eval $(call gb_Library_add_package_headers,sfx,\ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_include,sfx,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/sfx2/sdi \ - -I$(WORKDIR)/inc/sfx2 \ - -I$(WORKDIR)/inc/ \ -I$(SRCDIR)/sfx2/inc \ -I$(SRCDIR)/sfx2/inc/sfx2 \ -I$(SRCDIR)/sfx2/source/inc \ -I$(SRCDIR)/sfx2/inc/pch \ + -I$(WORKDIR)/SdiTarget/sfx2/sdi \ + -I$(WORKDIR)/inc/ \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ $(LIBXML_CFLAGS) \ diff --git a/svx/prj/target_lib_svxcore.mk b/svx/prj/target_lib_svxcore.mk index d268c7e91f68..f337588232fb 100644 --- a/svx/prj/target_lib_svxcore.mk +++ b/svx/prj/target_lib_svxcore.mk @@ -30,14 +30,13 @@ $(eval $(call gb_Library_Library,svxcore)) $(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots)) $(eval $(call gb_Library_set_include,svxcore,\ - $$(SOLARINC) \ - -I$(WORKDIR)/inc/svx/ \ -I$(SRCDIR)/svx/inc \ -I$(SRCDIR)/svx/source/inc \ -I$(SRCDIR)/svx/inc/pch \ + -I$(WORKDIR)/SdiTarget/svx/sdi \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ - -I$(WORKDIR)/inc/svx/sdi \ )) $(eval $(call gb_Library_set_defs,svxcore,\ -- cgit v1.2.3 From 70d60072ed2b8d6a8a50b5a433954e67d32f5f6a Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Thu, 10 Jun 2010 14:30:42 +0200 Subject: sb123:#i111449# cleanups in sfx2 qa/complex tests --- sfx2/prj/build.lst | 49 +- .../CheckGlobalEventBroadcaster_writer1.java | 243 ---- sfx2/qa/complex/DocHelper/DialogThread.java | 95 -- sfx2/qa/complex/DocHelper/WriterHelper.java | 296 ----- sfx2/qa/complex/DocHelper/makefile.mk | 46 - sfx2/qa/complex/DocumentMetaData.java | 546 --------- sfx2/qa/complex/DocumentMetadataAccessTest.java | 1275 ------------------- sfx2/qa/complex/docinfo/DocumentProperties.java | 436 ++++--- sfx2/qa/complex/docinfo/makefile.mk | 41 +- .../CheckGlobalEventBroadcaster_writer1.java | 281 +++++ .../complex/framework/DocHelper/DialogThread.java | 95 ++ .../complex/framework/DocHelper/WriterHelper.java | 287 +++++ sfx2/qa/complex/framework/DocHelper/makefile.mk | 49 + sfx2/qa/complex/framework/DocumentMetaData.java | 565 +++++++++ .../framework/DocumentMetadataAccessTest.java | 1293 ++++++++++++++++++++ sfx2/qa/complex/framework/TestDocument.java | 39 + sfx2/qa/complex/framework/makefile.mk | 65 + sfx2/qa/complex/framework/testdocuments/CUSTOM.odt | Bin 0 -> 1021 bytes sfx2/qa/complex/framework/testdocuments/TEST.odt | Bin 0 -> 13803 bytes .../complex/framework/testdocuments/TESTRDFA.odt | Bin 0 -> 7540 bytes sfx2/qa/complex/framework/testdocuments/empty.rdf | 13 + sfx2/qa/complex/makefile.mk | 61 - .../StandaloneDocumentInfoUnitTest.java | 66 +- sfx2/qa/complex/standalonedocumentinfo/Test01.java | 37 +- .../complex/standalonedocumentinfo/TestHelper.java | 14 +- sfx2/qa/complex/standalonedocumentinfo/makefile.mk | 69 +- sfx2/qa/complex/testdocuments/CUSTOM.odt | Bin 1021 -> 0 bytes sfx2/qa/complex/testdocuments/TEST.odt | Bin 13803 -> 0 bytes sfx2/qa/complex/testdocuments/TESTRDFA.odt | Bin 7540 -> 0 bytes 29 files changed, 3088 insertions(+), 2873 deletions(-) delete mode 100644 sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java delete mode 100644 sfx2/qa/complex/DocHelper/DialogThread.java delete mode 100644 sfx2/qa/complex/DocHelper/WriterHelper.java delete mode 100644 sfx2/qa/complex/DocHelper/makefile.mk delete mode 100644 sfx2/qa/complex/DocumentMetaData.java delete mode 100644 sfx2/qa/complex/DocumentMetadataAccessTest.java create mode 100644 sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java create mode 100644 sfx2/qa/complex/framework/DocHelper/DialogThread.java create mode 100644 sfx2/qa/complex/framework/DocHelper/WriterHelper.java create mode 100644 sfx2/qa/complex/framework/DocHelper/makefile.mk create mode 100644 sfx2/qa/complex/framework/DocumentMetaData.java create mode 100644 sfx2/qa/complex/framework/DocumentMetadataAccessTest.java create mode 100644 sfx2/qa/complex/framework/TestDocument.java create mode 100644 sfx2/qa/complex/framework/makefile.mk create mode 100644 sfx2/qa/complex/framework/testdocuments/CUSTOM.odt create mode 100644 sfx2/qa/complex/framework/testdocuments/TEST.odt create mode 100644 sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt create mode 100644 sfx2/qa/complex/framework/testdocuments/empty.rdf delete mode 100644 sfx2/qa/complex/makefile.mk delete mode 100644 sfx2/qa/complex/testdocuments/CUSTOM.odt delete mode 100644 sfx2/qa/complex/testdocuments/TEST.odt delete mode 100644 sfx2/qa/complex/testdocuments/TESTRDFA.odt (limited to 'sfx2') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 3e791fbc2000..de63edf7dd37 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,24 +1,29 @@ sf sfx2 : l10n idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL -sf sfx2 usr1 - all sf_mkout NULL -sf sfx2\inc nmake - all sf_inc NULL -sf sfx2\prj get - all sf_prj NULL -sf sfx2\win\res get - all sf_wres NULL -sf sfx2\mac\res get - all sf_mres NULL -sf sfx2\source\inc get - all sf_sinc NULL -sf sfx2\sdi nmake - all sf_sdi NULL -sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL -sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL -sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL -sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL -sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL -sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL -sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL -sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL -sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL -sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL -sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL -sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL -sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL -sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL -sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL +sf sfx2 usr1 - all sf_mkout NULL +sf sfx2\inc nmake - all sf_inc NULL +sf sfx2\prj get - all sf_prj NULL +sf sfx2\win\res get - all sf_wres NULL +sf sfx2\mac\res get - all sf_mres NULL +sf sfx2\source\inc get - all sf_sinc NULL +sf sfx2\sdi nmake - all sf_sdi NULL +sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL +sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL +sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL +sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL +sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL +sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL +sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL +sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL +sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL +sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL +sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL +sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL +sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL +sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL +sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL + sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL + +sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL +sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_util NULL +sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL diff --git a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java deleted file mode 100644 index d5dc17e183eb..000000000000 --- a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java +++ /dev/null @@ -1,243 +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. - * - ************************************************************************/ -package complex.framework; - -import com.sun.star.awt.XWindow; -import com.sun.star.document.XEventBroadcaster; -import com.sun.star.document.XEventListener; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.text.XTextDocument; -import com.sun.star.uno.UnoRuntime; -import complex.framework.DocHelper.WriterHelper; -import complexlib.ComplexTestCase; -import java.util.ArrayList; -import com.sun.star.task.XJobExecutor; -import com.sun.star.util.URL; -import util.UITools; - -/** - * This testcase checks the GlobalEventBroadcaster - * it will add an XEventListener and verify the Events - * raised when opening/changing and closing Office Documents - */ -public class CheckGlobalEventBroadcaster_writer1 extends ComplexTestCase { - XMultiServiceFactory m_xMSF = null; - XEventBroadcaster m_xEventBroadcaster = null; - ArrayList notifyEvents = new ArrayList(); - XTextDocument xTextDoc; - XSpreadsheetDocument xSheetDoc; - XEventListener m_xEventListener = new EventListenerImpl(); - - public String[] getTestMethodNames() { - return new String[] { - "initialize", "checkWriter", "cleanup" - }; - } - - public void initialize() { - m_xMSF = (XMultiServiceFactory) param.getMSF(); - log.println("check wether there is a valid MultiServiceFactory"); - - if (m_xMSF == null) { - assure("## Couldn't get MultiServiceFactory make sure your Office is started", - true); - } - - log.println("... done"); - - log.println( - "Create an instance of com.sun.star.frame.GlobalEventBroadcaster"); - - Object GlobalEventBroadcaster = null; - Object dispatcher = null; - - try { - GlobalEventBroadcaster = m_xMSF.createInstance( - "com.sun.star.frame.GlobalEventBroadcaster"); - } catch (com.sun.star.uno.Exception e) { - assure("## Exception while creating instance", false); - } - - log.println("... done"); - - log.println("check wether the created instance is valid"); - - if (GlobalEventBroadcaster == null) { - assure("couldn't create service", false); - } - - log.println("... done"); - - log.println( - "try to query the XEventBroadcaster from the gained Object"); - m_xEventBroadcaster = (XEventBroadcaster) UnoRuntime.queryInterface( - XEventBroadcaster.class, - GlobalEventBroadcaster); - - if (util.utils.isVoid(m_xEventBroadcaster)) { - assure("couldn't get XEventBroadcaster", false); - } - - log.println("... done"); - - log.println("adding Listener"); - m_xEventBroadcaster.addEventListener(m_xEventListener); - log.println("... done"); - } - - public void checkWriter() { - log.println("-- Checking Writer --"); - - WriterHelper wHelper = new WriterHelper(m_xMSF); - String[] expected; - boolean locRes = true; - log.println("opening an empty writer doc"); - notifyEvents.clear(); - xTextDoc = wHelper.openEmptyDoc(); - shortWait(); - expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus" }; - - assure("Wrong events fired when opening empty doc", - proveExpectation(expected)); - log.println("... done"); - - log.println("changing the writer doc"); - notifyEvents.clear(); - xTextDoc.getText().setString("GlobalEventBroadcaster"); - shortWait(); - expected = new String[] { "OnModifyChanged" }; - - assure("Wrong events fired when changing doc", - proveExpectation(expected)); - log.println("... done"); - - log.println("closing the empty writer doc"); - notifyEvents.clear(); - wHelper.closeDoc(xTextDoc); - shortWait(); - expected = new String[] { "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; - - assure("Wrong events fired when closing empty doc", - proveExpectation(expected)); - log.println("... done"); - - log.println("opening an writer doc via Window-New Window"); - notifyEvents.clear(); - xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false); - shortWait(); - expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", }; - - assure("Wrong events fired when opening an writer doc via Window-New Window", - proveExpectation(expected)); - log.println("... done"); - - log.println("closing the created writer doc"); - notifyEvents.clear(); - - wHelper.closeDoc(xTextDoc); - shortWait(); - expected = new String[] { "OnViewClosed", "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; - - assure("Wrong events fired when closing Window-New Window", - proveExpectation(expected)); - - log.println("... done"); - - log.println("Opening document with label wizard"); - xTextDoc = wHelper.openFromDialog("private:factory/swriter?slot=21051", "", false); - shortWait(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, wHelper.getToolkit ().getActiveTopWindow ()); - UITools ut = new UITools(m_xMSF,xWindow); - notifyEvents.clear(); - log.println("pressing button 'New Document'"); - try{ - ut.clickButton ("New Document"); - } catch (Exception e) { - log.println("Couldn't press Button"); - } - log.println("... done"); - shortWait(); - shortWait(); - shortWait(); - expected = new String[] { "OnViewClosed", "OnCreate", "OnFocus", "OnModifyChanged" }; - - assure("Wrong events fired when starting labels wizard", - proveExpectation(expected)); - - log.println("-- Done Writer --"); - } - - public void cleanup() { - log.println("removing Listener"); - m_xEventBroadcaster.removeEventListener(m_xEventListener); - log.println("... done"); - } - - /** - * Sleeps for 0.5 sec. to allow StarOffice to react on - * reset call. - */ - private void shortWait() { - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - log.println("While waiting :" + e); - } - } - - private boolean proveExpectation(String[] expected) { - boolean locRes = true; - boolean failure = false; - - log.println("Fired Events:"); - for (int k=0;k - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.framework.DocHelper; - -import com.sun.star.beans.PropertyValue; -import com.sun.star.frame.XController; -import com.sun.star.frame.XDispatch; -import com.sun.star.frame.XDispatchProvider; -import com.sun.star.frame.XModel; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.util.URL; -import com.sun.star.util.XURLTransformer; - -import java.lang.Thread; - - -/** - * This class opens a given dialog in a separate Thread by dispatching an url - * - */ -public class DialogThread extends Thread { - public XComponent m_xDoc = null; - public XMultiServiceFactory m_xMSF = null; - public String m_url = ""; - - public DialogThread(XComponent xDoc, XMultiServiceFactory msf, String url) { - this.m_xDoc = xDoc; - this.m_xMSF = msf; - this.m_url = url; - } - - public void run() { - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, - m_xDoc); - - XController xController = aModel.getCurrentController(); - - //Opening Dialog - try { - XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, - xController.getFrame()); - XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( - XURLTransformer.class, - m_xMSF.createInstance( - "com.sun.star.util.URLTransformer")); - - // Because it's an in/out parameter - // we must use an array of URL objects. - URL[] aParseURL = new URL[1]; - aParseURL[0] = new URL(); - aParseURL[0].Complete = m_url; - xParser.parseStrict(aParseURL); - - URL aURL = aParseURL[0]; - XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", com.sun.star.frame.FrameSearchFlag.SELF | - com.sun.star.frame.FrameSearchFlag.CHILDREN); - PropertyValue[] dispatchArguments = new PropertyValue[0]; - - if (xDispatcher != null) { - xDispatcher.dispatch(aURL, dispatchArguments); - } else { - System.out.println("xDispatcher is null"); - } - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't open dialog"); - } - } -} \ No newline at end of file diff --git a/sfx2/qa/complex/DocHelper/WriterHelper.java b/sfx2/qa/complex/DocHelper/WriterHelper.java deleted file mode 100644 index b65e8e915423..000000000000 --- a/sfx2/qa/complex/DocHelper/WriterHelper.java +++ /dev/null @@ -1,296 +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. - * - ************************************************************************/ -package complex.framework.DocHelper; - -import com.sun.star.accessibility.AccessibleRole; -import com.sun.star.accessibility.XAccessible; -import com.sun.star.accessibility.XAccessibleAction; -import com.sun.star.accessibility.XAccessibleContext; -import com.sun.star.accessibility.XAccessibleSelection; -import com.sun.star.awt.XExtendedToolkit; -import com.sun.star.awt.XWindow; -import com.sun.star.frame.XDesktop; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.text.XTextDocument; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.util.XCloseable; - -import complex.framework.DocHelper.DialogThread; -import java.io.PrintWriter; - -import util.AccessibilityTools; -import util.WriterTools; - - -/** - * Methods to open Writer docs - * - */ -public class WriterHelper { - XMultiServiceFactory m_xMSF = null; - - /** Creates a new instance of WriterHelper - * @param m_xMSF The MultiServiceFactory gained from the office - */ - public WriterHelper(XMultiServiceFactory m_xMSF) { - this.m_xMSF = m_xMSF; - } - - /** Opens an empty document - * @return a reference to the opened document is returned - */ - public XTextDocument openEmptyDoc() { - return WriterTools.createTextDoc(m_xMSF); - } - - /** Closes a given XTextDocument - * @param xTextDoc the text document to be closed - * @return if an error occurs the errormessage is returned and an empty String if not - */ - public String closeDoc(XTextDocument xTextDoc) { - XCloseable closer = (XCloseable) UnoRuntime.queryInterface( - XCloseable.class, xTextDoc); - String err = ""; - - try { - closer.close(true); - } catch (com.sun.star.util.CloseVetoException e) { - err = "couldn't close document " + e; - } - - return err; - } - - /** a TextDocument is opened by pressing a button in a dialog given by uno-URL - * @param url the uno-URL of the dialog to be opened - * @param createButton the language dependend label of the button to be pressed - * @param destroyLocal if true the document that has been opened to dispatch the dialog is closed before the method returns, - * otherwise this document remains open - * @return returns the created Textdocument - */ - public XTextDocument openFromDialog(String url, String createButton, - boolean destroyLocal) { - XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF); - XComponent comp = (XComponent) UnoRuntime.queryInterface( - XComponent.class, xLocalDoc); - DialogThread diagThread = new DialogThread(comp, m_xMSF, url); - diagThread.start(); - shortWait(); - - if (createButton.length() > 1) { - XExtendedToolkit tk = getToolkit(); - AccessibilityTools at = new AccessibilityTools(); - Object atw = tk.getActiveTopWindow(); - - XWindow xWindow = (XWindow) UnoRuntime.queryInterface( - XWindow.class, atw); - - XAccessible xRoot = at.getAccessibleObject(xWindow); - XAccessibleContext buttonContext = at.getAccessibleObjectForRole( - xRoot, - AccessibleRole.PUSH_BUTTON, - createButton); - - XAccessibleAction buttonAction = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, - buttonContext); - - try { - System.out.println("Name: " + - buttonContext.getAccessibleName()); - buttonAction.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - System.out.println("Couldn't press button"); - } - - shortWait(); - } - - XDesktop xDesktop = getDesktop(); - - XTextDocument returnDoc = (XTextDocument) UnoRuntime.queryInterface( - XTextDocument.class, - xDesktop.getCurrentComponent()); - - if (destroyLocal) { - closeDoc(xLocalDoc); - } - - return returnDoc; - } - - public XTextDocument DocByAutopilot(XMultiServiceFactory msf, - int[] indexes, boolean destroyLocal, - String bName) { - XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF); - Object toolkit = null; - - try { - toolkit = msf.createInstance("com.sun.star.awt.Toolkit"); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( - XExtendedToolkit.class, toolkit); - - shortWait(); - - AccessibilityTools at = new AccessibilityTools(); - - Object atw = tk.getActiveTopWindow(); - - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, - atw); - - XAccessible xRoot = at.getAccessibleObject(xWindow); - - XAccessibleContext ARoot = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.MENU_BAR); - XAccessibleSelection sel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, ARoot); - - for (int k = 0; k < indexes.length; k++) { - try { - sel.selectAccessibleChild(indexes[k]); - shortWait(); - ARoot = ARoot.getAccessibleChild(indexes[k]) - .getAccessibleContext(); - sel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, ARoot); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - } - - shortWait(); - - atw = tk.getActiveTopWindow(); - - xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); - - xRoot = at.getAccessibleObject(xWindow); - - //at.printAccessibleTree(new PrintWriter(System.out),xRoot); - - XAccessibleAction action = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, - at.getAccessibleObjectForRole(xRoot, - AccessibleRole.PUSH_BUTTON, - bName)); - - try { - action.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - - shortWait(); - - atw = tk.getActiveTopWindow(); - - xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); - - xRoot = at.getAccessibleObject(xWindow); - - at.printAccessibleTree(new PrintWriter(System.out),xRoot); - - action = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, - at.getAccessibleObjectForRole(xRoot, - AccessibleRole.PUSH_BUTTON, - "Yes")); - - try { - if (action != null) action.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - - shortWait(); - - XDesktop xDesktop = getDesktop(); - - XTextDocument returnDoc = (XTextDocument) UnoRuntime.queryInterface( - XTextDocument.class, - xDesktop.getCurrentComponent()); - - if (destroyLocal) { - closeDoc(xLocalDoc); - } - - return returnDoc; - } - - /** - * Sleeps for 2 sec. to allow StarOffice to react - */ - private void shortWait() { - try { - Thread.sleep(4000); - } catch (InterruptedException e) { - System.out.println("While waiting :" + e); - } - } - - /** creates an instance of com.sun.star.awt.Toolkit to query the XExtendedToolkit - * interface - * @return returns the gained XExtendedToolkit Interface - */ - public XExtendedToolkit getToolkit() { - Object toolkit = null; - - try { - toolkit = m_xMSF.createInstance("com.sun.star.awt.Toolkit"); - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't get toolkit"); - e.printStackTrace(); - } - - XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( - XExtendedToolkit.class, toolkit); - - return tk; - } - - /** creates an instance of com.sun.star.frame.Desktop to query the XDesktop interface - * @return returns the gained XDesktop interface - */ - protected XDesktop getDesktop() { - Object desk = null; - - try { - desk = m_xMSF.createInstance("com.sun.star.frame.Desktop"); - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't get desktop"); - e.printStackTrace(); - } - - XDesktop xDesktop = (XDesktop) UnoRuntime.queryInterface( - XDesktop.class, desk); - - return xDesktop; - } -} \ No newline at end of file diff --git a/sfx2/qa/complex/DocHelper/makefile.mk b/sfx2/qa/complex/DocHelper/makefile.mk deleted file mode 100644 index 6b6ac9191cdb..000000000000 --- a/sfx2/qa/complex/DocHelper/makefile.mk +++ /dev/null @@ -1,46 +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. -# -#************************************************************************* - -PRJ = ..$/..$/.. -TARGET = DocHelper -PRJNAME = $(TARGET) -PACKAGE = complex$/framework$/dochelper - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = DialogThread.java WriterHelper.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/sfx2/qa/complex/DocumentMetaData.java b/sfx2/qa/complex/DocumentMetaData.java deleted file mode 100644 index ae7970227c75..000000000000 --- a/sfx2/qa/complex/DocumentMetaData.java +++ /dev/null @@ -1,546 +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. - * - ************************************************************************/ - -package complex.framework; - -import complexlib.ComplexTestCase; -import helper.StreamSimulator; - -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.Any; -import com.sun.star.lang.XInitialization; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.Locale; -import com.sun.star.lang.EventObject; -import com.sun.star.util.Date; -import com.sun.star.util.DateTime; -import com.sun.star.util.Time; -import com.sun.star.util.Duration; -import com.sun.star.util.XModifyListener; -import com.sun.star.util.XModifyBroadcaster; -import com.sun.star.beans.XPropertyContainer; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.NamedValue; -import com.sun.star.beans.PropertyAttribute; -import com.sun.star.beans.UnknownPropertyException; -import com.sun.star.beans.IllegalTypeException; -import com.sun.star.embed.XStorage; -import com.sun.star.io.XInputStream; -import com.sun.star.document.XDocumentProperties; - - -/** - * Test case for the service com.sun.star.document.DocumentProperties. - * Currently, this service is implemented in - * sfx2/source/doc/SfxDocumentMetaData.cxx. - * - * @author mst - */ -public class DocumentMetaData extends ComplexTestCase -{ - public String[] getTestMethodNames () { - return new String[] { "check", "cleanup" }; - } - - public void cleanup() { - // nothing to do - } - - // for testing modifications - class Listener implements XModifyListener { - private boolean m_Called; - - public Listener() { - m_Called = false; - } - - public boolean reset() { - boolean oldCalled = m_Called; - m_Called = false; - return oldCalled; - } - - public void modified(EventObject e) { - m_Called = true; - } - - public void disposing(EventObject e) { - } - } - - public void check() { - try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF(); - assure("could not create MultiServiceFactory.", xMSF != null); - XPropertySet xPropertySet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xMSF); - Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); - XComponentContext xContext = (XComponentContext) - UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); - assure("could not get component context.", xContext != null); - - String temp = util.utils.getOfficeTemp/*Dir*/(xMSF); - log.println("tempdir: " + temp); - - PropertyValue[] noArgs = { }; - PropertyValue mimetype = new PropertyValue(); - mimetype.Name = "MediaType"; - mimetype.Value = "application/vnd.oasis.opendocument.text"; - PropertyValue[] mimeArgs = { mimetype }; -// new Any("application/vnd.oasis.opendocument.text")) }; - PropertyValue cfile = new PropertyValue(); - cfile.Name = "URL"; - cfile.Value = temp + "EMPTY.odt"; - PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; - - log.println("Creating service DocumentProperties..."); - - Object oDP = -// xMSF.createInstanceWithContext( -// "com.sun.star.document.DocumentProperties", xContext); - xMSF.createInstance("com.sun.star.document.DocumentProperties"); - XDocumentProperties xDP = (XDocumentProperties) - UnoRuntime.queryInterface(XDocumentProperties.class, oDP); - - log.println("...done"); - - - log.println("Checking initialize ..."); - - XDocumentProperties xDP2 = (XDocumentProperties) - UnoRuntime.queryInterface(XDocumentProperties.class, - xMSF.createInstance( - "com.sun.star.document.DocumentProperties")); - XInitialization xInit = (XInitialization) - UnoRuntime.queryInterface(XInitialization.class, xDP2); - xInit.initialize(new Object[] { }); - - log.println("...done"); - - log.println("Checking storing default-initialized meta data ..."); - -// xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); - xDP2.storeToMedium("", mimeEmptyArgs); - - log.println("...done"); - - log.println("Checking loading default-initialized meta data ..."); - -// xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); - xDP2.loadFromMedium("", mimeEmptyArgs); - assure ("Author", "".equals(xDP2.getAuthor())); - - log.println("...done"); - - log.println("(Not) Checking preservation of custom meta data ..."); - - xDP2.loadFromMedium(util.utils.getFullTestURL("CUSTOM.odt"), - noArgs); - assure ("Author", "".equals(xDP2.getAuthor())); - xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs); - - //FIXME: now what? comparing for binary equality seems useless - // we could unzip the written file and grep for the custom stuff - // but would that work on windows... - - log.println("...done"); - - log.println("Checking loading from test document..."); - - String file = util.utils.getFullTestURL("TEST.odt"); - xDP.loadFromMedium(file, noArgs); -/* XInputStream xStream = - new StreamSimulator("./testdocuments/TEST.odt", true, param); - Object oSF = - xMSF.createInstance("com.sun.star.embed.StorageFactory"); - XSingleServiceFactory xSF = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class, oSF); - Object oStor = xSF.createInstanceWithArguments( - new Object[] { xStream }); - XStorage xStor = (XStorage) UnoRuntime.queryInterface( - XStorage.class, oStor); - xDP.loadFromStorage(xStor);*/ - - log.println("...done"); - - log.println("Checking meta-data import..."); - - assure ("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); - assure ("Generator", - "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227" - .equals(xDP.getGenerator())); - assure ("CreationDate", 2007 == xDP.getCreationDate().Year); - assure ("Title", "Urgent Memo".equals(xDP.getTitle())); - assure ("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); - assure ("Description", - "Modern internal company memorandum in full-blocked style" - .equals(xDP.getDescription())); -// assure ("Language", "".equals(xDP.getLanguage())); - assure ("ModifiedBy", - "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); - assure ("ModificationDate", 10 == xDP.getModificationDate().Month); - assure ("PrintedBy", - "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); - assure ("PrintDate", 29 == xDP.getPrintDate().Day); - assure ("TemplateName", - "Modern Memo".equals(xDP.getTemplateName())); - assure ("TemplateURL", - xDP.getTemplateURL().endsWith("memmodern.ott")); - assure ("TemplateDate", 17 == xDP.getTemplateDate().Hours); - assure ("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); - assure ("AutoloadSecs", 0 == xDP.getAutoloadSecs()); - assure ("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); - assure ("EditingCycles", 3 == xDP.getEditingCycles()); - assure ("EditingDuration", 320 == xDP.getEditingDuration()); - - String[] kws = xDP.getKeywords(); - assure ("Keywords", fromArray(kws).containsAll( - fromArray(new Object[] { "Asien", "Memo", "Reis" }))); - - NamedValue[] ds = xDP.getDocumentStatistics(); -/* for (int i = 0; i < ds.length; ++i) { - log.println("nv: " + ds[i].Name + " " + ds[i].Value); - } - NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); - NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); - log.println("eq: " + nv1.equals(nv2)); // grrr, this is false... -*/ - assure ("DocumentStatistics:WordCount", containsNV(ds, - new NamedValue("WordCount", new Integer(23)))); - assure ("DocumentStatistics:PageCount", containsNV(ds, - new NamedValue("PageCount", new Integer(1)))); - - XPropertyContainer udpc = xDP.getUserDefinedProperties(); - XPropertySet udps = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, udpc); - assure ("UserDefined 1", "Dies ist ein wichtiger Hinweis" - .equals(udps.getPropertyValue("Hinweis"))); - assure ("UserDefined 2", ("Kann Spuren von N" - + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8") - + "ssen enthalten") - .equals(udps.getPropertyValue("Warnung"))); - - log.println("...done"); - - log.println("Checking meta-data updates..."); - - String str; - DateTime dt = new DateTime(); - Locale l = new Locale(); - int i; - - str = "me"; - xDP.setAuthor(str); - assure ("setAuthor", str.equals(xDP.getAuthor())); - str = "the computa"; - xDP.setGenerator(str); - assure ("setGenerator", str.equals(xDP.getGenerator())); - dt.Year = 2038; - dt.Month = 1; - dt.Day = 1; - xDP.setCreationDate(dt); - assure ("setCreationDate", dt.Year == xDP.getCreationDate().Year); - str = "El t'itulo"; - xDP.setTitle(str); - assure ("setTitle", str.equals(xDP.getTitle())); - str = "Ein verkommenes Subjekt"; - xDP.setSubject(str); - assure ("setSubject", str.equals(xDP.getSubject())); - str = "Este descripci'on no es importante"; - xDP.setDescription(str); - assure ("setDescription", str.equals(xDP.getDescription())); - l.Language = "en"; - l.Country = "GB"; - xDP.setLanguage(l); - Locale l2 = xDP.getLanguage(); - assure ("setLanguage Lang", l.Language.equals(l2.Language)); - assure ("setLanguage Cty", l.Country.equals(l2.Country)); - str = "myself"; - xDP.setModifiedBy(str); - assure ("setModifiedBy", str.equals(xDP.getModifiedBy())); - dt.Year = 2042; - xDP.setModificationDate(dt); - assure ("setModificationDate", - dt.Year == xDP.getModificationDate().Year); - str = "i didnt do it"; - xDP.setPrintedBy(str); - assure ("setPrintedBy", str.equals(xDP.getPrintedBy())); - dt.Year = 2024; - xDP.setPrintDate(dt); - assure ("setPrintDate", dt.Year == xDP.getPrintDate().Year); - str = "blah"; - xDP.setTemplateName(str); - assure ("setTemplateName", str.equals(xDP.getTemplateName())); - str = "gopher://some-hole-in-the-ground/"; - xDP.setTemplateURL(str); - assure ("setTemplateURL", str.equals(xDP.getTemplateURL())); - dt.Year = 2043; - xDP.setTemplateDate(dt); - assure ("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); - str = "http://nowhere/"; - xDP.setAutoloadURL(str); - assure ("setAutoloadURL", str.equals(xDP.getAutoloadURL())); - i = 3661; // this might not work (due to conversion via double...) - xDP.setAutoloadSecs(i); -// log.println("set: " + i + " get: " + xDP.getAutoloadSecs()); - assure ("setAutoloadSecs", i == xDP.getAutoloadSecs()); - str = "_blank"; - xDP.setDefaultTarget(str); - assure ("setDefaultTarget", str.equals(xDP.getDefaultTarget())); - i = 42; - xDP.setEditingCycles((short) i); - assure ("setEditingCycles", i == xDP.getEditingCycles()); - i = 84; - xDP.setEditingDuration(i); - assure ("setEditingDuration", i == xDP.getEditingDuration()); - str = ""; - - String[] kws2 = new String[] { - "keywordly", "keywordlike", "keywordalicious" }; - xDP.setKeywords(kws2); - kws = xDP.getKeywords(); - assure ("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); - - NamedValue[] ds2 = new NamedValue[] { - new NamedValue("SyllableCount", new Integer(9)), - new NamedValue("FrameCount", new Integer(2)), - new NamedValue("SentenceCount", new Integer(7)) }; - xDP.setDocumentStatistics(ds2); - ds = xDP.getDocumentStatistics(); - assure ("setDocumentStatistics:SyllableCount", containsNV(ds, - new NamedValue("SyllableCount", new Integer(9)))); - assure ("setDocumentStatistics:FrameCount", containsNV(ds, - new NamedValue("FrameCount", new Integer(2)))); - assure ("setDocumentStatistics:SentenceCount", containsNV(ds, - new NamedValue("SentenceCount", new Integer(7)))); - - log.println("...done"); - - log.println("Checking user-defined meta-data updates..."); - - // actually, this tests the PropertyBag service - // but maybe the DocumentProperties service will be implemented - // differently some day... - boolean b = true; - double d = 3.1415; - // note that Time is only supported for backward compatibilty! - Time t = new Time(); - t.Hours = 1; - t.Minutes = 16; - Date date = new Date(); - date.Year = 2071; - date.Month = 2; - date.Day = 3; - dt.Year = 2065; - Duration dur = new Duration(); - dur.Negative = true; - dur.Years = 1001; - dur.Months = 999; - dur.Days = 888; - dur.Hours = 777; - dur.Minutes = 666; - dur.Seconds = 555; - dur.MilliSeconds = 444; - - udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, - new Boolean(b)); - udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur); - udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t); - udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date); - udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE, dt); - udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new Double(d)); - udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar"); - udpc.addProperty("Removed", PropertyAttribute.REMOVEABLE, "bar"); - // #i94175#: empty property name is valid ODF 1.1 - udpc.addProperty("", PropertyAttribute.REMOVEABLE, "eeeeek"); - try { - udpc.removeProperty("Info 1"); - udpc.removeProperty("Removed"); - } catch (UnknownPropertyException e) { - assure("removeProperty failed", false); - } - - try { - udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, - new String[] { "foo", "bar" }); - assure("inserting value of non-supported type did not fail", - false); - } catch (IllegalTypeException e) { - // ignore - } - - assure ("UserDefined bool", new Boolean(b).equals( - udps.getPropertyValue("Frobnicate"))); - assure ("UserDefined duration", eqDuration(dur, (Duration) - udps.getPropertyValue("FrobDuration"))); - assure ("UserDefined time", eqTime(t, (Time) - udps.getPropertyValue("FrobDuration2"))); - assure ("UserDefined date", eqDate(date, (Date) - udps.getPropertyValue("FrobEndDate"))); - assure ("UserDefined datetime", eqDateTime(dt, (DateTime) - udps.getPropertyValue("FrobStartTime"))); - assure ("UserDefined float", new Double(d).equals( - udps.getPropertyValue("Pi"))); - assure ("UserDefined string", "bar".equals( - udps.getPropertyValue("Foo"))); - assure ("UserDefined empty name", "eeeeek".equals( - udps.getPropertyValue(""))); - - try { - udps.getPropertyValue("Removed"); - assure("UserDefined remove didn't", false); - } catch (UnknownPropertyException e) { - // ok - } - - log.println("...done"); - - log.println("Checking storing meta-data to file..."); - - xDP.storeToMedium(temp + "TEST.odt", mimeArgs); - - log.println("...done"); - - log.println("Checking loading meta-data from stored file..."); - - xDP.loadFromMedium(temp + "TEST.odt", noArgs); - - log.println("...done"); - - log.println("Checking user-defined meta-data from stored file..."); - - udpc = xDP.getUserDefinedProperties(); - udps = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, udpc); - - assure ("UserDefined bool", new Boolean(b).equals( - udps.getPropertyValue("Frobnicate"))); - assure ("UserDefined duration", eqDuration(dur, (Duration) - udps.getPropertyValue("FrobDuration"))); - // this is now a Duration! - Duration t_dur = new Duration(false, (short)0, (short)0, (short)0, - t.Hours, t.Minutes, t.Seconds, - (short)(10 * t.HundredthSeconds)); - assure ("UserDefined time", eqDuration(t_dur, (Duration) - udps.getPropertyValue("FrobDuration2"))); - assure ("UserDefined date", eqDate(date, (Date) - udps.getPropertyValue("FrobEndDate"))); - assure ("UserDefined datetime", eqDateTime(dt, (DateTime) - udps.getPropertyValue("FrobStartTime"))); - assure ("UserDefined float", new Double(d).equals( - udps.getPropertyValue("Pi"))); - assure ("UserDefined string", "bar".equals( - udps.getPropertyValue("Foo"))); - - try { - udps.getPropertyValue("Removed"); - assure("UserDefined remove didn't", false); - } catch (UnknownPropertyException e) { - // ok - } - - log.println("...done"); - - log.println("Checking notification listener interface..."); - - Listener listener = new Listener(); - XModifyBroadcaster xMB = (XModifyBroadcaster) - UnoRuntime.queryInterface(XModifyBroadcaster.class, xDP); - xMB.addModifyListener(listener); - xDP.setAuthor("not me"); - assure ("Listener Author", listener.reset()); - udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); - assure ("Listener UserDefined Add", listener.reset()); - udps.setPropertyValue("Listener", "bar"); - assure ("Listener UserDefined Set", listener.reset()); - udpc.removeProperty("Listener"); - assure ("Listener UserDefined Remove", listener.reset()); - xMB.removeModifyListener(listener); - udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); - assure ("Removed Listener UserDefined Add", !listener.reset()); - - log.println("...done"); - - } catch (Exception e) { - report(e); - } - } - - // grrr... - boolean eqDateTime(DateTime a, DateTime b) { - return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day - && a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.HundredthSeconds == b.HundredthSeconds; - } - - boolean eqDate(Date a, Date b) { - return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day; - } - - boolean eqTime(Time a, Time b) { - return a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.HundredthSeconds == b.HundredthSeconds; - } - - boolean eqDuration(Duration a, Duration b) { - return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days - && a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.MilliSeconds == b.MilliSeconds - && a.Negative == b.Negative; - } - - java.util.Collection fromArray(Object[] os) { - java.util.Collection ret = new java.util.HashSet(); - for (int i = 0; i < os.length; ++i) { - ret.add(os[i]); - } - return ret; - } - - // bah, structs do not have proper equals(), and uno.Type is not comparable - public static boolean containsNV (NamedValue[] nvs, NamedValue nv) { - for (int i = 0; i < nvs.length; ++i) { - if (nvs[i].Name.equals(nv.Name) && nvs[i].Value.equals(nv.Value)) { - return true; - } - } - return false; - } - - public void report(Exception e) { - log.println("Exception occurred:"); - e.printStackTrace((java.io.PrintWriter) log); - failed(); - } -} - diff --git a/sfx2/qa/complex/DocumentMetadataAccessTest.java b/sfx2/qa/complex/DocumentMetadataAccessTest.java deleted file mode 100644 index a61280c45fe5..000000000000 --- a/sfx2/qa/complex/DocumentMetadataAccessTest.java +++ /dev/null @@ -1,1275 +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. - * - ************************************************************************/ - -package complex.framework; - -import complexlib.ComplexTestCase; -import helper.StreamSimulator; - -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.Any; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XInitialization; -import com.sun.star.lang.XServiceInfo; -import com.sun.star.lang.IllegalArgumentException; -import com.sun.star.lang.WrappedTargetException; -import com.sun.star.lang.WrappedTargetRuntimeException; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.Pair; -import com.sun.star.beans.StringPair; -import com.sun.star.container.XEnumerationAccess; -import com.sun.star.container.XEnumeration; -import com.sun.star.container.ElementExistException; -import com.sun.star.container.NoSuchElementException; -import com.sun.star.io.XInputStream; -import com.sun.star.io.XOutputStream; -import com.sun.star.util.XCloseable; -import com.sun.star.frame.XStorable; -import com.sun.star.frame.XLoadable; -import com.sun.star.text.XTextDocument; -import com.sun.star.text.XTextRange; -import com.sun.star.text.XText; -import com.sun.star.rdf.*; - -/** - * Test case for interface com.sun.star.rdf.XDocumentMetadataAccess - * Currently, this service is implemented in - * sfx2/source/doc/DocumentMetadataAccess.cxx - * - * Actually, this is not a service, so we need to create a document and - * go from there... - * - * @author mst - */ -public class DocumentMetadataAccessTest extends ComplexTestCase -{ - XMultiServiceFactory xMSF; - XComponentContext xContext; - String tempDir; - - String nsRDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - String nsRDFS = "http://www.w3.org/2000/01/rdf-schema#"; - String nsPkg="http://docs.oasis-open.org/opendocument/meta/package/common#"; - String nsODF ="http://docs.oasis-open.org/opendocument/meta/package/odf#"; - - XURI foo; - XURI bar; - XURI baz; - - static XURI rdf_type; - static XURI rdfs_label; - static XURI pkg_Document; - static XURI pkg_hasPart; - static XURI pkg_MetadataFile; - static XURI odf_ContentFile; - static XURI odf_StylesFile; - static XURI odf_Element; - static XBlankNode blank1; - static XBlankNode blank2; - static XBlankNode blank3; - static XBlankNode blank4; - static String manifestPath = "manifest.rdf"; - static String contentPath = "content.xml"; - static String stylesPath = "styles.xml"; - static String fooPath = "foo.rdf"; - static String fooBarPath = "meta/foo/bar.rdf"; - - XRepository xRep; - XRepositorySupplier xRS; - XDocumentMetadataAccess xDMA; - - public String[] getTestMethodNames () - { - return new String[] { "check", "checkRDFa" }; - } - - public void before() - { - try { - - xMSF = (XMultiServiceFactory) param.getMSF(); - assure("could not create MultiServiceFactory.", xMSF != null); - XPropertySet xPropertySet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xMSF); - Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); - xContext = (XComponentContext) - UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); - assure("could not get component context.", xContext != null); - - tempDir = util.utils.getOfficeTemp/*Dir*/(xMSF); - log.println("tempdir: " + tempDir); - - foo = URI.create(xContext, "uri:foo"); - assure("foo", null != foo); - bar = URI.create(xContext, "uri:bar"); - assure("bar", null != bar); - baz = URI.create(xContext, "uri:baz"); - assure("baz", null != baz); - - blank1 = BlankNode.create(xContext, "_:1"); - assure("blank1", null != blank1); - blank2 = BlankNode.create(xContext, "_:2"); - assure("blank2", null != blank2); - blank3 = BlankNode.create(xContext, "_:3"); - assure("blank3", null != blank3); - blank4 = BlankNode.create(xContext, "_:4"); - assure("blank4", null != blank4); - rdf_type = URI.createKnown(xContext, URIs.RDF_TYPE); - assure("rdf_type", null != rdf_type); - rdfs_label = URI.createKnown(xContext, URIs.RDFS_LABEL); - assure("rdfs_label", null != rdfs_label); - pkg_Document = URI.createKnown(xContext, URIs.PKG_DOCUMENT); - assure("pkg_Document", null != pkg_Document); - pkg_hasPart = URI.createKnown(xContext, URIs.PKG_HASPART); - assure("pkg_hasPart", null != pkg_hasPart); - pkg_MetadataFile = URI.createKnown(xContext, URIs.PKG_METADATAFILE); - assure("pkg_MetadataFile", null != pkg_MetadataFile); - odf_ContentFile = URI.createKnown(xContext, URIs.ODF_CONTENTFILE); - assure("odf_ContentFile", null != odf_ContentFile); - odf_StylesFile = URI.createKnown(xContext, URIs.ODF_STYLESFILE); - assure("odf_StylesFile", null != odf_StylesFile); - odf_Element = URI.createKnown(xContext, URIs.ODF_ELEMENT); - assure("odf_Element", null != odf_Element); - - } catch (Exception e) { - report(e); - } - } - - public void after() - { - xRep = null; - xRS = null; - xDMA = null; - } - - public void check() - { - XComponent xComp = null; - XComponent xComp2 = null; - try { - XEnumeration xStmtsEnum; - XNamedGraph xManifest; - - log.println("Creating document with Repository..."); - - // we cannot create a XDMA directly, we must create - // a document and get it from there :( - // create document - PropertyValue[] loadProps = new PropertyValue[1]; - loadProps[0] = new PropertyValue(); - loadProps[0].Name = "Hidden"; - loadProps[0].Value = new Boolean(true); - xComp = util.DesktopTools.openNewDoc(xMSF, "swriter", loadProps); - XTextDocument xText = (XTextDocument) UnoRuntime.queryInterface( - XTextDocument.class, xComp); - - XRepositorySupplier xRS = (XRepositorySupplier) - UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); - assure("xRS null", null != xRS); - XDocumentMetadataAccess xDMA = (XDocumentMetadataAccess) - UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xRS); - assure("xDMA null", null != xDMA); - xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); - - log.println("...done"); - - log.println("Checking that new repository is initialized..."); - - XURI xBaseURI = (XURI) xDMA; - String baseURI = xBaseURI.getStringValue(); - assure("new: baseURI", - null != xBaseURI && !xBaseURI.getStringValue().equals("")); - - assure("new: # graphs", 1 == xRep.getGraphNames().length); - XURI manifest = URI.createNS(xContext, xBaseURI.getStringValue(), - manifestPath); - xManifest = xRep.getGraph(manifest); - assure("new: manifest graph", null != xManifest); - - Statement[] manifestStmts = getManifestStmts(xBaseURI); - xStmtsEnum = xRep.getStatements(null, null, null); - assure("new: manifest graph", eq(xStmtsEnum, manifestStmts)); - - log.println("...done"); - - log.println("Checking some invalid args..."); - - String content = "behold, for i am the content."; - XTextRange xTR = new TestRange(content); - XMetadatable xM = (XMetadatable) xTR; - - try { - xDMA.getElementByURI(null); - assure("getElementByURI: null allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.getMetadataGraphsWithType(null); - assure("getMetadataGraphsWithType: null URI allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("", new XURI[0]); - assure("addMetadataFile: empty filename allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("/foo", new XURI[0]); - assure("addMetadataFile: absolute filename allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("fo\"o", new XURI[0]); - assure("addMetadataFile: invalid filename allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("../foo", new XURI[0]); - assure("addMetadataFile: filename with .. allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("foo/../../bar", new XURI[0]); - assure("addMetadataFile: filename with nest .. allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("foo/././bar", new XURI[0]); - assure("addMetadataFile: filename with nest . allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("content.xml", new XURI[0]); - assure("addMetadataFile: content.xml allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("styles.xml", new XURI[0]); - assure("addMetadataFile: styles.xml allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("meta.xml", new XURI[0]); - assure("addMetadataFile: meta.xml allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("settings.xml", new XURI[0]); - assure("addMetadataFile: settings.xml allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.importMetadataFile(FileFormat.RDF_XML, null, "foo", - foo, new XURI[0]); - assure("importMetadataFile: null stream allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "", - foo, new XURI[0]); - assure("importMetadataFile: empty filename allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "meta.xml", - foo, new XURI[0]); - assure("importMetadataFile: meta.xml filename allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, - xFooIn, "foo", null, new XURI[0]); - assure("importMetadataFile: null base URI allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, - xFooIn, "foo", rdf_type, new XURI[0]); - assure("importMetadataFile: non-absolute base URI allowed", - false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.removeMetadataFile(null); - assure("removeMetadataFile: null URI allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addContentOrStylesFile(""); - assure("addContentOrStylesFile: empty filename allowed", - false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addContentOrStylesFile("/content.xml"); - assure("addContentOrStylesFile: absolute filename allowed", - false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addContentOrStylesFile("foo.rdf"); - assure("addContentOrStylesFile: invalid filename allowed", - false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.removeContentOrStylesFile(""); - assure("removeContentOrStylesFile: empty filename allowed", - false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.loadMetadataFromStorage(null, foo, null); - assure("loadMetadataFromStorage: null storage allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.storeMetadataToStorage(null/*, base*/); - assure("storeMetadataToStorage: null storage allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.loadMetadataFromMedium(new PropertyValue[0]); - assure("loadMetadataFromMedium: empty medium allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.storeMetadataToMedium(new PropertyValue[0]); - assure("storeMetadataToMedium: empty medium allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - - log.println("...done"); - - log.println("Checking file addition/removal..."); - - xDMA.removeContentOrStylesFile(contentPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeContentOrStylesFile (content)", - eq(xStmtsEnum, new Statement[] { - manifestStmts[0], manifestStmts[2], manifestStmts[4] - })); - - xDMA.addContentOrStylesFile(contentPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addContentOrStylesFile (content)", - eq(xStmtsEnum, manifestStmts)); - - xDMA.removeContentOrStylesFile(stylesPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeContentOrStylesFile (styles)", - eq(xStmtsEnum, new Statement[] { - manifestStmts[0], manifestStmts[1], manifestStmts[3] - })); - - xDMA.addContentOrStylesFile(stylesPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addContentOrStylesFile (styles)", - eq(xStmtsEnum, manifestStmts)); - - XURI xFoo = URI.createNS(xContext, xBaseURI.getStringValue(), - fooPath); - Statement xM_BaseHaspartFoo = - new Statement(xBaseURI, pkg_hasPart, xFoo, manifest); - Statement xM_FooTypeMetadata = - new Statement(xFoo, rdf_type, pkg_MetadataFile, manifest); - Statement xM_FooTypeBar = - new Statement(xFoo, rdf_type, bar, manifest); - xDMA.addMetadataFile(fooPath, new XURI[] { bar }); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addMetadataFile", - eq(xStmtsEnum, merge(manifestStmts, new Statement[] { - xM_BaseHaspartFoo, xM_FooTypeMetadata, xM_FooTypeBar - }))); - - XURI[] graphsBar = xDMA.getMetadataGraphsWithType(bar); - assure("getMetadataGraphsWithType", - graphsBar.length == 1 && eq(graphsBar[0], xFoo)); - - - xDMA.removeMetadataFile(xFoo); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeMetadataFile", - eq(xStmtsEnum, manifestStmts)); - - log.println("...done"); - - log.println("Checking mapping..."); - - XEnumerationAccess xTextEnum = (XEnumerationAccess) - UnoRuntime.queryInterface(XEnumerationAccess.class, - xText.getText()); - Object o = xTextEnum.createEnumeration().nextElement(); - XMetadatable xMeta1 = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, o); - - XURI uri; - XMetadatable xMeta; - xMeta = xDMA.getElementByURI(xMeta1); - assure("getElementByURI: null", null != xMeta); - String XmlId = xMeta.getMetadataReference().Second; - String XmlId1 = xMeta1.getMetadataReference().Second; - assure("getElementByURI: no xml id", !XmlId.equals("")); - assure("getElementByURI: different xml id", XmlId.equals(XmlId1)); - - log.println("...done"); - - log.println("Checking storing and loading..."); - - XURI xFoobar = URI.createNS(xContext, xBaseURI.getStringValue(), - fooBarPath); - Statement[] metadataStmts = getMetadataFileStmts(xBaseURI, - fooBarPath); - xDMA.addMetadataFile(fooBarPath, new XURI[0]); - xStmtsEnum = xRep.getStatements(null, null, null); - assure("addMetadataFile", - eq(xStmtsEnum, merge(manifestStmts, metadataStmts ))); - - Statement xFoobar_FooBarFoo = - new Statement(foo, bar, foo, xFoobar); - xRep.getGraph(xFoobar).addStatement(foo, bar, foo); - xStmtsEnum = xRep.getStatements(null, null, null); - assure("addStatement", - eq(xStmtsEnum, merge(manifestStmts, merge(metadataStmts, - new Statement[] { xFoobar_FooBarFoo })))); - - PropertyValue noMDNoContentFile = new PropertyValue(); - noMDNoContentFile.Name = "URL"; - noMDNoContentFile.Value = util.utils.getFullTestURL("CUSTOM.odt"); - PropertyValue noMDFile = new PropertyValue(); - noMDFile.Name = "URL"; - noMDFile.Value = util.utils.getFullTestURL("TEST.odt"); - PropertyValue file = new PropertyValue(); - file.Name = "URL"; - file.Value = tempDir + "TESTDMA.odt"; - /* - PropertyValue baseURL = new PropertyValue(); - baseURL.Name = "DocumentBaseURL"; - baseURL.Value = tempDir + "TMP.odt"; - */ - PropertyValue mimetype = new PropertyValue(); - mimetype.Name = "MediaType"; - mimetype.Value = "application/vnd.oasis.opendocument.text"; - PropertyValue[] argsEmptyNoContent = { mimetype, noMDNoContentFile}; - PropertyValue[] argsEmpty = { mimetype, noMDFile }; - PropertyValue[] args = { mimetype, file }; - - xStmtsEnum = xRep.getStatements(null, null, null); - XURI[] graphs = xRep.getGraphNames(); - - xDMA.storeMetadataToMedium(args); - - // this should re-init - xDMA.loadMetadataFromMedium(argsEmptyNoContent); - xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); - assure("baseURI still tdoc?", - !baseURI.equals(xDMA.getStringValue())); - Statement[] manifestStmts2 = getManifestStmts((XURI) xDMA); - xStmtsEnum = xRep.getStatements(null, null, null); - // there is no content or styles file in here, so we have just - // the package stmt - assure("loadMetadataFromMedium (no metadata, no content)", - eq(xStmtsEnum, new Statement[] { manifestStmts2[0] })); - - // this should re-init - xDMA.loadMetadataFromMedium(argsEmpty); - xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); - assure("baseURI still tdoc?", - !baseURI.equals(xDMA.getStringValue())); - Statement[] manifestStmts3 = getManifestStmts((XURI) xDMA); - - xStmtsEnum = xRep.getStatements(null, null, null); - assure("loadMetadataFromMedium (no metadata)", - eq(xStmtsEnum, manifestStmts3)); - - xDMA.loadMetadataFromMedium(args); - xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); - Statement[] manifestStmts4 = getManifestStmts((XURI) xDMA); - Statement[] metadataStmts4 = getMetadataFileStmts((XURI) xDMA, - fooBarPath); - - xStmtsEnum = xRep.getStatements(null, null, null); - assure("some graph(s) not reloaded", - graphs.length == xRep.getGraphNames().length); - - XURI xFoobar4 = URI.createNS(xContext, xDMA.getStringValue(), - fooBarPath); - Statement xFoobar_FooBarFoo4 = - new Statement(foo, bar, foo, xFoobar4); - assure("loadMetadataFromMedium (re-load)", - eq(xStmtsEnum, merge(manifestStmts4, merge(metadataStmts4, - new Statement[] { xFoobar_FooBarFoo4 })))); - - log.println("...done"); - - log.println("Checking storing and loading via model..."); - - String f = tempDir + "TESTPARA.odt"; - - XStorable xStor = (XStorable) UnoRuntime.queryInterface( - XStorable.class, xRS); - - xStor.storeToURL(f, new PropertyValue[0]); - - xComp2 = util.DesktopTools.loadDoc(xMSF, f, loadProps); - - XDocumentMetadataAccess xDMA2 = (XDocumentMetadataAccess) - UnoRuntime.queryInterface(XDocumentMetadataAccess.class, - xComp2); - assure("xDMA2 null", null != xDMA2); - - XRepositorySupplier xRS2 = (XRepositorySupplier) - UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2); - assure("xRS2 null", null != xRS2); - - XRepository xRep2 = xRS2.getRDFRepository(); - assure("xRep2 null", null != xRep2); - - Statement[] manifestStmts5 = getManifestStmts((XURI) xDMA2); - Statement[] metadataStmts5 = getMetadataFileStmts((XURI) xDMA2, - fooBarPath); - XURI xFoobar5 = URI.createNS(xContext, xDMA2.getStringValue(), - fooBarPath); - Statement xFoobar_FooBarFoo5 = - new Statement(foo, bar, foo, xFoobar5); - xStmtsEnum = xRep.getStatements(null, null, null); - XEnumeration xStmtsEnum2 = xRep2.getStatements(null, null, null); - assure("load: repository differs", - eq(xStmtsEnum2, merge(manifestStmts5, merge(metadataStmts5, - new Statement[] { xFoobar_FooBarFoo5 })))); - - log.println("...done"); - - } catch (Exception e) { - report(e); - } finally { - close(xComp); - close(xComp2); - } - } - - public void checkRDFa() - { - XComponent xComp = null; - String file; - try { - file = util.utils.getFullTestURL("TESTRDFA.odt"); - xComp = loadRDFa(file); - if (xComp != null) - { - file = tempDir + "TESTRDFA.odt"; - storeRDFa(xComp, file); - close(xComp); - xComp = loadRDFa(file); - } - } finally { - close(xComp); - } - } - - public void storeRDFa(XComponent xComp, String file) - { - try { - - log.println("Storing test document..."); - - XStorable xStor = (XStorable) UnoRuntime.queryInterface( - XStorable.class, xComp); - - xStor.storeToURL(file, new PropertyValue[0]); - - log.println("...done"); - - } catch (Exception e) { - report(e); - } - } - - public XComponent loadRDFa(String file) - { - XComponent xComp = null; - try { - - log.println("Loading test document..."); - - PropertyValue[] loadProps = new PropertyValue[1]; - loadProps[0] = new PropertyValue(); - loadProps[0].Name = "Hidden"; - loadProps[0].Value = new Boolean(true); - - - - xComp = util.DesktopTools.loadDoc(xMSF, file, loadProps); - - XRepositorySupplier xRS = (XRepositorySupplier) - UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); - assure("xRS null", null != xRS); - - XDocumentRepository xRep = (XDocumentRepository) - UnoRuntime.queryInterface(XDocumentRepository.class, - xRS.getRDFRepository()); - assure("xRep null", null != xRep); - - XTextDocument xTextDoc = (XTextDocument) - UnoRuntime.queryInterface(XTextDocument.class, xComp); - - XText xText = xTextDoc.getText(); - - XEnumerationAccess xEA = (XEnumerationAccess) - UnoRuntime.queryInterface(XEnumerationAccess.class, xText); - XEnumeration xEnum = xEA.createEnumeration(); - - log.println("...done"); - - log.println("Checking RDFa in loaded test document..."); - - XMetadatable xPara; - Pair result; - - Statement x_FooBarLit1 = new Statement(foo, bar, mkLit("1"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 1", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit1 - })); - - Statement x_FooBarLit2 = new Statement(foo, bar, mkLit("2"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 2", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit2 - })); - - Statement x_BlankBarLit3 = - new Statement(blank1, bar, mkLit("3"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 3", - !result.Second && - eq(result.First, new Statement[] { - x_BlankBarLit3 - })); - XBlankNode b3 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); - - Statement x_BlankBarLit4 = - new Statement(blank2, bar, mkLit("4"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 4", - !result.Second && - eq(result.First, new Statement[] { - x_BlankBarLit4 - })); - XBlankNode b4 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); - - Statement x_BlankBarLit5 = - new Statement(blank1, bar, mkLit("5"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 5", - !result.Second && - eq(result.First, new Statement[] { - x_BlankBarLit5 - })); - XBlankNode b5 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); - - assure("RDFa: 3 != 4", - !b3.getStringValue().equals(b4.getStringValue())); - assure("RDFa: 3 == 5", - b3.getStringValue().equals(b5.getStringValue())); - - Statement x_FooBarLit6 = new Statement(foo, bar, mkLit("6"), null); - Statement x_FooBazLit6 = new Statement(foo, baz, mkLit("6"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 6", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit6, x_FooBazLit6 - })); - - Statement x_FooBarLit7 = new Statement(foo, bar, mkLit("7"), null); - Statement x_FooBazLit7 = new Statement(foo, baz, mkLit("7"), null); - Statement x_FooFooLit7 = new Statement(foo, foo, mkLit("7"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 7", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit7, x_FooBazLit7, x_FooFooLit7 - })); - - XNode lit = mkLit("a fooish bar"); - XNode lit_type= mkLit("a fooish bar", bar); - Statement x_FooBarLit = new Statement(foo, bar, lit, null); - Statement x_FooBarLittype = new Statement(foo, bar, lit_type, null); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 8", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLit - })); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 9", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLit - })); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 10", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLittype - })); - - Statement x_FooBarLit11 - = new Statement(foo, bar, mkLit("11", bar), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 11", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit11 - })); - - XURI xFile = URI.createNS(xContext, file, "/" + contentPath); - Statement x_FileBarLit12 = - new Statement(xFile, bar, mkLit("12"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 12", - !result.Second && - eq(result.First, new Statement[] { - x_FileBarLit12 - })); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 13", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLit - })); - - Statement x_FooLabelLit14 = - new Statement(foo, rdfs_label, mkLit("14"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 14", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLit - })); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 15", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 16", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 17", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 18", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 19", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 20", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 21", eq(result.First, new Statement[] { } )); - - log.println("...done"); - - } catch (Exception e) { - report(e); - close(xComp); - } - return xComp; - } - - -// utilities ------------------------------------------------------------- - - public void report2(Exception e) - { - if (e instanceof WrappedTargetException) - { - log.println("Cause:"); - Exception cause = (Exception) - (((WrappedTargetException)e).TargetException); - log.println(cause.toString()); - report2(cause); - } else if (e instanceof WrappedTargetRuntimeException) { - log.println("Cause:"); - Exception cause = (Exception) - (((WrappedTargetRuntimeException)e).TargetException); - log.println(cause.toString()); - report2(cause); - } - } - - public void report(Exception e) { - log.println("Exception occurred:"); - e.printStackTrace((java.io.PrintWriter) log); - report2(e); - failed(); - } - - static void close(XComponent i_comp) - { - try { - XCloseable xClos = (XCloseable) UnoRuntime.queryInterface( - XCloseable.class, i_comp); - if (xClos != null) xClos.close(true); - } catch (Exception e) { - } - } - - XLiteral mkLit(String i_content) - { - return Literal.create(xContext, i_content); - } - - XLiteral mkLit(String i_content, XURI i_uri) - { - return Literal.createWithType(xContext, i_content, i_uri); - } - - static Statement[] merge(Statement[] i_A1, Statement[] i_A2) - { - // bah, java sucks... - Statement[] ret = new Statement[i_A1.length + i_A2.length]; - for (int i = 0; i < i_A1.length; ++i) { - ret[i] = i_A1[i]; - } - for (int i = 0; i < i_A2.length; ++i) { - ret[i+i_A1.length] = i_A2[i]; - } - return ret; - } - - public static String toS(XNode n) { - if (null == n) return "< null >"; - return n.getStringValue(); - } - - static boolean isBlank(XNode i_node) - { - XBlankNode blank = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, i_node); - return blank != null; - } - -/* - static class Statement implements XStatement - { - XResource m_Subject; - XResource m_Predicate; - XNode m_Object; - XURI m_Graph; - - Statement(XResource i_Subject, XResource i_Predicate, XNode i_Object, - XURI i_Graph) - { - m_Subject = i_Subject; - m_Predicate = i_Predicate; - m_Object = i_Object; - m_Graph = i_Graph; - } - - public XResource getSubject() { return m_Subject; } - public XResource getPredicate() { return m_Predicate; } - public XNode getObject() { return m_Object; } - public XURI getGraph() { return m_Graph; } - } -*/ - - static Statement[] toSeq(XEnumeration i_Enum) throws Exception - { - java.util.Collection c = new java.util.Vector(); - while (i_Enum.hasMoreElements()) { - Statement s = (Statement) i_Enum.nextElement(); -//log.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); - c.add(s); - } -// return (Statement[]) c.toArray(); - // java sucks - Object[] arr = c.toArray(); - Statement[] ret = new Statement[arr.length]; - for (int i = 0; i < arr.length; ++i) { - ret[i] = (Statement) arr[i]; - } - return ret; - } - - static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception - { - java.util.Collection c = new java.util.Vector(); - while (i_Enum.hasMoreElements()) { - XNode[] s = (XNode[]) i_Enum.nextElement(); - c.add(s); - } -// return (XNode[][]) c.toArray(); - Object[] arr = c.toArray(); - XNode[][] ret = new XNode[arr.length][]; - for (int i = 0; i < arr.length; ++i) { - ret[i] = (XNode[]) arr[i]; - } - return ret; - } - - static class BindingComp implements java.util.Comparator - { - public int compare(Object i_Left, Object i_Right) - { - XNode[] left = (XNode[]) i_Left; - XNode[] right = (XNode[]) i_Right; - if (left.length != right.length) throw new RuntimeException(); - for (int i = 0; i < left.length; ++i) { - int eq = (left[i].getStringValue().compareTo( - right[i].getStringValue())); - if (eq != 0) return eq; - } - return 0; - } - } - - static class StmtComp implements java.util.Comparator - { - public int compare(Object i_Left, Object i_Right) - { - int eq; - Statement left = (Statement) i_Left; - Statement right = (Statement) i_Right; - if ((eq = cmp(left.Graph, right.Graph )) != 0) return eq; - if ((eq = cmp(left.Subject, right.Subject )) != 0) return eq; - if ((eq = cmp(left.Predicate, right.Predicate)) != 0) return eq; - if ((eq = cmp(left.Object, right.Object )) != 0) return eq; - return 0; - } - - public int cmp(XNode i_Left, XNode i_Right) - { - if (isBlank(i_Left)) { - return isBlank(i_Right) ? 0 : 1; - } else { - if (isBlank(i_Right)) { - return -1; - } else { - return toS(i_Left).compareTo(toS(i_Right)); - } - } - } - } - - static boolean eq(Statement i_Left, Statement i_Right) - { - XURI lG = i_Left.Graph; - XURI rG = i_Right.Graph; - if (!eq(lG, rG)) { - log.println("Graphs differ: " + toS(lG) + " != " + toS(rG)); - return false; - } - if (!eq(i_Left.Subject, i_Right.Subject)) { - log.println("Subjects differ: " + - i_Left.Subject.getStringValue() + " != " + - i_Right.Subject.getStringValue()); - return false; - } - if (!eq(i_Left.Predicate, i_Right.Predicate)) { - log.println("Predicates differ: " + - i_Left.Predicate.getStringValue() + " != " + - i_Right.Predicate.getStringValue()); - return false; - } - if (!eq(i_Left.Object, i_Right.Object)) { - log.println("Objects differ: " + - i_Left.Object.getStringValue() + " != " + - i_Right.Object.getStringValue()); - return false; - } - return true; - } - - static boolean eq(Statement[] i_Result, Statement[] i_Expected) - { - if (i_Result.length != i_Expected.length) { - log.println("eq: different lengths: " + i_Result.length + " " + - i_Expected.length); - return false; - } - Statement[] expected = (Statement[]) - java.util.Arrays.asList(i_Expected).toArray(); - java.util.Arrays.sort(i_Result, new StmtComp()); - java.util.Arrays.sort(expected, new StmtComp()); - for (int i = 0; i < expected.length; ++i) { - if (!eq(i_Result[i], expected[i])) return false; - } - return true; - } - - static boolean eq(XEnumeration i_Enum, Statement[] i_Expected) - throws Exception - { - Statement[] current = toSeq(i_Enum); - return eq(current, i_Expected); - } - - static boolean eq(XNode i_Left, XNode i_Right) - { - if (i_Left == null) { - return (i_Right == null); - } else { - return (i_Right != null) && - (i_Left.getStringValue().equals(i_Right.getStringValue()) - // FIXME: hack: blank nodes considered equal - || (isBlank(i_Left) && isBlank(i_Right))); - } - } - - static boolean eq(XQuerySelectResult i_Result, - String[] i_Vars, XNode[][] i_Bindings) throws Exception - { - String[] vars = (String[]) i_Result.getBindingNames(); - XEnumeration iter = (XEnumeration) i_Result; - XNode[][] bindings = toSeqs(iter); - if (vars.length != i_Vars.length) { - log.println("var lengths differ"); - return false; - } - if (bindings.length != i_Bindings.length) { - log.println("binding lengths differ: " + i_Bindings.length + - " vs " + bindings.length ); - return false; - } - java.util.Arrays.sort(bindings, new BindingComp()); - java.util.Arrays.sort(i_Bindings, new BindingComp()); - for (int i = 0; i < i_Bindings.length; ++i) { - if (i_Bindings[i].length != i_Vars.length) { - log.println("TEST ERROR!"); - throw new Exception(); - } - if (bindings[i].length != i_Vars.length) { - log.println("binding length and var length differ"); - return false; - } - for (int j = 0; j < i_Vars.length; ++j) { - if (!eq(bindings[i][j], i_Bindings[i][j])) { - log.println("bindings differ: " + - toS(bindings[i][j]) + " != " + toS(i_Bindings[i][j])); - return false; - } - } - } - for (int i = 0; i < i_Vars.length; ++i) { - if (!vars[i].equals(i_Vars[i])) { - log.println("variable names differ: " + - vars[i] + " != " + i_Vars[i]); - return false; - } - } - return true; - } - - static boolean eq(StringPair i_Left, StringPair i_Right) - { - return ((i_Left.First).equals(i_Right.First)) && - ((i_Left.Second).equals(i_Right.Second)); - } - - static String mkNamespace(String i_prefix, String i_namespace) - { - return "PREFIX " + i_prefix + ": <" + i_namespace + ">\n"; - } - - static String mkNss() - { - String namespaces = mkNamespace("rdf", - "http://www.w3.org/1999/02/22-rdf-syntax-ns#"); - namespaces += mkNamespace("pkg", - "http://docs.oasis-open.org/opendocument/meta/package/common#"); - namespaces += mkNamespace("odf", - "http://docs.oasis-open.org/opendocument/meta/package/odf#"); - return namespaces; - } - - Statement[] getManifestStmts(XURI xBaseURI) throws Exception - { - XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), - manifestPath); - XURI xContent = URI.createNS(xContext, xBaseURI.getStringValue(), - contentPath); - XURI xStyles = URI.createNS(xContext, xBaseURI.getStringValue(), - stylesPath); - Statement xM_BaseTypeDoc = - new Statement(xBaseURI, rdf_type, pkg_Document, xManifest); - Statement xM_BaseHaspartContent = - new Statement(xBaseURI, pkg_hasPart, xContent, xManifest); - Statement xM_BaseHaspartStyles = - new Statement(xBaseURI, pkg_hasPart, xStyles, xManifest); - Statement xM_ContentTypeContent = - new Statement(xContent, rdf_type, odf_ContentFile, xManifest); - Statement xM_StylesTypeStyles = - new Statement(xStyles, rdf_type, odf_StylesFile, xManifest); - return new Statement[] { - xM_BaseTypeDoc, xM_BaseHaspartContent, xM_BaseHaspartStyles, - xM_ContentTypeContent, xM_StylesTypeStyles - }; - } - - Statement[] getMetadataFileStmts(XURI xBaseURI, String Path) - throws Exception - { - XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), - manifestPath); - XURI xGraph = URI.createNS(xContext, xBaseURI.getStringValue(), Path); - Statement xM_BaseHaspartGraph = - new Statement(xBaseURI, pkg_hasPart, xGraph, xManifest); - Statement xM_GraphTypeMetadata = - new Statement(xGraph, rdf_type, pkg_MetadataFile, xManifest); - return new Statement[] { xM_BaseHaspartGraph, xM_GraphTypeMetadata }; - } - - class TestRange implements XTextRange, XMetadatable, XServiceInfo - { - String m_Stream; - String m_XmlId; - String m_Text; - TestRange(String i_Str) { m_Text = i_Str; } - - public String getStringValue() { return ""; } - public String getNamespace() { return ""; } - public String getLocalName() { return ""; } - - public StringPair getMetadataReference() - { return new StringPair(m_Stream, m_XmlId); } - public void setMetadataReference(StringPair i_Ref) - throws IllegalArgumentException - { m_Stream = (String)i_Ref.First; m_XmlId = (String)i_Ref.Second; } - public void ensureMetadataReference() - { m_Stream = "content.xml"; m_XmlId = "42"; } - - public String getImplementationName() { return null; } - public String[] getSupportedServiceNames() { return null; } - public boolean supportsService(String i_Svc) - { return i_Svc.equals("com.sun.star.text.Paragraph"); } - - public XText getText() { return null; } - public XTextRange getStart() { return null; } - public XTextRange getEnd() { return null; } - public String getString() { return m_Text; } - public void setString(String i_Str) { m_Text = i_Str; } - } -} - diff --git a/sfx2/qa/complex/docinfo/DocumentProperties.java b/sfx2/qa/complex/docinfo/DocumentProperties.java index cff1dd341d48..afa188e20901 100644 --- a/sfx2/qa/complex/docinfo/DocumentProperties.java +++ b/sfx2/qa/complex/docinfo/DocumentProperties.java @@ -26,9 +26,12 @@ ************************************************************************/ package complex.docinfo; +import com.sun.star.beans.*; +import com.sun.star.beans.Property; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertyContainer; import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.XPropertySetInfo; import com.sun.star.document.XDocumentInfo; import com.sun.star.document.XDocumentInfoSupplier; import com.sun.star.frame.XComponentLoader; @@ -37,233 +40,324 @@ import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.text.XTextDocument; import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; import com.sun.star.util.Date; -import complexlib.ComplexTestCase; + import util.DesktopTools; import util.WriterTools; +import org.junit.After; +import org.junit.AfterClass; +// import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +public class DocumentProperties +{ -public class DocumentProperties extends ComplexTestCase { XMultiServiceFactory m_xMSF = null; XTextDocument xTextDoc = null; + XTextDocument xTextDocSecond = null; - public String[] getTestMethodNames() { - return new String[] {"checkDocInfo", "cleanup"}; - } - - public void checkDocInfo() { - m_xMSF = (XMultiServiceFactory) param.getMSF(); - - log.println( - "check wether there is a valid MultiServiceFactory"); +// public String[] getTestMethodNames() { +// return new String[] {"checkDocInfo", "cleanup"}; +// } + @Test public void checkDocInfo() + { + m_xMSF = getMSF(); - if (m_xMSF == null) { - assure("## Couldn't get MultiServiceFactory make sure your Office is started", - true); - } + System.out.println("check wether there is a valid MultiServiceFactory"); - log.println("... done"); - - log.println("Opening a Writer document"); - xTextDoc = WriterTools.createTextDoc(m_xMSF); - log.println("... done"); - - XDocumentInfoSupplier xDocInfoSup = - (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, - xTextDoc); - XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); - XPropertyContainer xPropContainer = - (XPropertyContainer) UnoRuntime.queryInterface(XPropertyContainer.class, - xDocInfo); - - log.println("Trying to add a existing property"); - - boolean worked = - addProperty(xPropContainer, "Author", (short) 0, ""); - assure("Could set an existing property", !worked); - log.println("...done"); - - log.println("Trying to add a integer property"); - worked = - addProperty(xPropContainer, "intValue", com.sun.star.beans.PropertyAttribute.READONLY, - new Integer(17)); - assure("Couldn't set an integer property", worked); - log.println("...done"); - - log.println("Trying to add a double property"); - worked = - addProperty(xPropContainer, "doubleValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE , - new Double(17.7)); - assure("Couldn't set an double property", worked); - log.println("...done"); - - log.println("Trying to add a boolean property"); - worked = - addProperty(xPropContainer, "booleanValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, - Boolean.TRUE); - assure("Couldn't set an boolean property", worked); - log.println("...done"); - - log.println("Trying to add a date property"); - worked = - addProperty(xPropContainer, "dateValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, - new Date()); - assure("Couldn't set an date property", worked); - log.println("...done"); - - log.println("trying to remove a read only Property"); - try { - xPropContainer.removeProperty ("intValue"); - assure("Could remove read only property", false); - } catch (Exception e) { - log.println("\tException was thrown "+e); - log.println("\t...OK"); - } - log.println("...done"); + assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); String tempdir = System.getProperty("java.io.tmpdir"); String fs = System.getProperty("file.separator"); - if (!tempdir.endsWith(fs)) { + if (!tempdir.endsWith(fs)) + { tempdir += fs; } - tempdir = util.utils.getFullURL(tempdir); - - log.println("Storing the document"); - - try { - XStorable store = - (XStorable) UnoRuntime.queryInterface(XStorable.class, - xTextDoc); - store.storeToURL(tempdir + "DocInfo.oot", - new PropertyValue[] {}); - DesktopTools.closeDoc(xTextDoc); - } catch (Exception e) { - assure("Couldn't store document", false); + final String sTempDocument = tempdir + "DocInfo.oot"; + + if (true) + { + System.out.println("... done"); + + + System.out.println("Opening a Writer document"); + xTextDoc = WriterTools.createTextDoc(m_xMSF); + System.out.println("... done"); + + XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDoc); + XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); + XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + System.out.println("Trying to add a existing property"); + + boolean worked = addProperty(xPropContainer, "Author", (short) 0, ""); + assertTrue("Could set an existing property", !worked); + System.out.println("...done"); + + System.out.println("Trying to add a integer property"); + worked = addProperty(xPropContainer, "intValue", com.sun.star.beans.PropertyAttribute.READONLY, new Integer(17)); + assertTrue("Couldn't set an integer property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a double property"); + worked = addProperty(xPropContainer, "doubleValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Double(17.7)); + assertTrue("Couldn't set an double property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a boolean property"); + worked = addProperty(xPropContainer, "booleanValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, Boolean.TRUE); + assertTrue("Couldn't set an boolean property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a date property"); + worked = addProperty(xPropContainer, "dateValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Date()); + assertTrue("Couldn't set an date property", worked); + System.out.println("...done"); + + System.out.println("trying to remove a read only Property"); + try + { + xPropContainer.removeProperty("intValue"); + fail("Could remove read only property"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...OK"); + } + System.out.println("...done"); + + XPropertySet xProps2 = UnoRuntime.queryInterface(XPropertySet.class, xPropContainer); + showPropertySet(xProps2); + + + System.out.println("Storing the document"); + try + { + XStorable store = UnoRuntime.queryInterface(XStorable.class, xTextDoc); + store.storeToURL(sTempDocument, new PropertyValue[] {}); + DesktopTools.closeDoc(xTextDoc); + } + catch (Exception e) + { + fail("Couldn't store document"); + } + + System.out.println("...done"); } - log.println("...done"); - - log.println("loading the document"); - - try { - XComponentLoader xCL = - (XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class, - m_xMSF.createInstance( - "com.sun.star.frame.Desktop")); - XComponent xComp = - xCL.loadComponentFromURL(tempdir + "DocInfo.oot", - "_blank", 0, new PropertyValue[] {}); - xTextDoc = - (XTextDocument) UnoRuntime.queryInterface(XTextDocument.class, - xComp); - } catch (Exception e) { - assure("Couldn't load document", false); - } - log.println("...done"); - - xDocInfoSup = - (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, - xTextDoc); - xDocInfo = xDocInfoSup.getDocumentInfo(); - - XPropertySet xProps = - (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, - xDocInfo); - - assure("Integer doesn't work", - checkType(xProps, "intValue", "java.lang.Integer")); - assure("Double doesn't work", - checkType(xProps, "doubleValue", "java.lang.Double")); - assure("Boolean doesn't work", - checkType(xProps, "booleanValue", "java.lang.Boolean")); - assure("Date doesn't work", - checkType(xProps, "dateValue", - "com.sun.star.util.DateTime")); - - xPropContainer = - (XPropertyContainer) UnoRuntime.queryInterface(XPropertyContainer.class, - xDocInfo); - - log.println("trying to remove a not user defined Property"); - try { - xPropContainer.removeProperty ("Author"); - assure("Could remove non user defined property", false); - } catch (Exception e) { - log.println("\tException was thrown "+e); - log.println("\t...OK"); - } - log.println("...done"); - - log.println("Trying to remove a user defined property"); - try { - xPropContainer.removeProperty ("dateValue"); - log.println("\t...OK"); - } catch (Exception e) { - log.println("\tException was thrown "+e); - log.println("\t...FAILED"); - assure("Could not remove user defined property", false); + if (true) + { + System.out.println("loading the document"); + + try + { + XComponentLoader xCL = UnoRuntime.queryInterface(XComponentLoader.class, m_xMSF.createInstance("com.sun.star.frame.Desktop")); + XComponent xComp = xCL.loadComponentFromURL(sTempDocument, "_blank", 0, new PropertyValue[] {}); + xTextDocSecond = UnoRuntime.queryInterface(XTextDocument.class, xComp); + } + catch (Exception e) + { + fail("Couldn't load document"); + } + + System.out.println("...done"); + + XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocSecond); + XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); + XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class, xDocInfo); + showPropertySet(xProps); + + assertTrue("Double doesn't work", checkType(xProps, "doubleValue", "java.lang.Double")); + assertTrue("Boolean doesn't work", checkType(xProps, "booleanValue", "java.lang.Boolean")); + + // TODO: dateValue does not exist. + // assertTrue("Date doesn't work", checkType(xProps, "dateValue", "com.sun.star.util.DateTime")); + + // TODO: is java.lang.Double + // assertTrue("Integer doesn't work", checkType(xProps, "intValue", "java.lang.Integer")); + + xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + System.out.println("trying to remove a not user defined Property"); + try + { + xPropContainer.removeProperty("Author"); + fail("Could remove non user defined property"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...OK"); + } + System.out.println("...done"); + + + System.out.println("Trying to remove a user defined property"); + try + { + xPropContainer.removeProperty("booleanValue"); + System.out.println("\t...OK"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...FAILED"); + fail("Could not remove user defined property"); + } + showPropertySet(xProps); + System.out.println("...done"); } - log.println("...done"); - } - public void cleanup() { + @After public void cleanup() + { + DesktopTools.closeDoc(xTextDocSecond); DesktopTools.closeDoc(xTextDoc); } + private void showPropertySet(XPropertySet xProps) + { + try + { + // get an XPropertySet, here the one of a text cursor + // XPropertySet xCursorProps = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, mxDocCursor); + + // get the property info interface of this XPropertySet + XPropertySetInfo xPropsInfo = xProps.getPropertySetInfo(); + + // get all properties (NOT the values) from XPropertySetInfo + Property[] aProps = xPropsInfo.getProperties(); + int i; + for (i = 0; i < aProps.length; ++i) { + // number of property within this info object + System.out.print("Property #" + i); + + // name of property + System.out.print(": Name<" + aProps[i].Name); + + // handle of property (only for XFastPropertySet) + System.out.print("> Handle<" + aProps[i].Handle); + + // type of property + System.out.print("> " + aProps[i].Type.toString()); + + // attributes (flags) + System.out.print(" Attributes<"); + short nAttribs = aProps[i].Attributes; + if ((nAttribs & PropertyAttribute.MAYBEVOID) != 0) + System.out.print("MAYBEVOID|"); + if ((nAttribs & PropertyAttribute.BOUND) != 0) + System.out.print("BOUND|"); + if ((nAttribs & PropertyAttribute.CONSTRAINED) != 0) + System.out.print("CONSTRAINED|"); + if ((nAttribs & PropertyAttribute.READONLY) != 0) + System.out.print("READONLY|"); + if ((nAttribs & PropertyAttribute.TRANSIENT) != 0) + System.out.print("TRANSIENT|"); + if ((nAttribs & PropertyAttribute.MAYBEAMBIGUOUS ) != 0) + System.out.print("MAYBEAMBIGUOUS|"); + if ((nAttribs & PropertyAttribute.MAYBEDEFAULT) != 0) + System.out.print("MAYBEDEFAULT|"); + if ((nAttribs & PropertyAttribute.REMOVEABLE) != 0) + System.out.print("REMOVEABLE|"); + System.out.println("0>"); + } + } catch (Exception e) { + // If anything goes wrong, give the user a stack trace + e.printStackTrace(System.out); + } + } + private boolean checkType(XPropertySet xProps, String aName, - String expected) { + String expected) + { boolean ret = true; - log.println("Checking " + expected); + System.out.println("Checking " + expected); String getting = - getPropertyByName(xProps, aName).getClass().getName(); + getPropertyByName(xProps, aName).getClass().getName(); - if (!getting.equals(expected)) { - log.println("\t Expected: " + expected); - log.println("\t Detting: " + getting); + if (!getting.equals(expected)) + { + System.out.println("\t Expected: " + expected); + System.out.println("\t Getting: " + getting); ret = false; } - if (ret) { - log.println("...OK"); + if (ret) + { + System.out.println("...OK"); } - return ret; } - private Object getPropertyByName(XPropertySet xProps, String aName) { + private Object getPropertyByName(XPropertySet xProps, String aName) + { Object ret = null; - try { + try + { ret = xProps.getPropertyValue(aName); - } catch (Exception e) { - log.println("\tCouldn't get Property " + aName); - log.println("\tMessage " + e); + } + catch (Exception e) + { + System.out.println("\tCouldn't get Property " + aName); + System.out.println("\tMessage " + e); } return ret; } private boolean addProperty(XPropertyContainer xPropContainer, - String aName, short attr, Object defaults) { + String aName, short attr, Object defaults) + { boolean ret = true; - try { + try + { xPropContainer.addProperty(aName, attr, defaults); - } catch (Exception e) { + } + catch (Exception e) + { ret = false; - log.println("\tCouldn't get Property " + aName); - log.println("\tMessage " + e); + System.out.println("\tCouldn't get Property " + aName); + System.out.println("\tMessage " + e); } return ret; } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk index 8c3525541062..51f2ddd02597 100644 --- a/sfx2/qa/complex/docinfo/makefile.mk +++ b/sfx2/qa/complex/docinfo/makefile.mk @@ -25,32 +25,39 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = DocumentProperties +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ = ../../.. PRJNAME = sfx2 -PACKAGE = complex$/docinfo +TARGET = qa_complex_docinfo -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/docinfo +JAVATESTFILES = \ + DocumentProperties.java + +JAVAFILES = $(JAVATESTFILES) -#----- compile .java files ----------------------------------------- +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = DocumentProperties.java +# Sample how to debug +JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y + +.END + +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -#----- make a jar from compiled files ------------------------------ +ALLTAR : javatest -MAXLINELENGTH = 100000 +.END -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk -run: - $(JAVAI) $(JAVAIFLAGS) -cp $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b) diff --git a/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java new file mode 100644 index 000000000000..c6dc073095b1 --- /dev/null +++ b/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java @@ -0,0 +1,281 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ +package complex.framework; + +import com.sun.star.awt.XWindow; +import com.sun.star.document.XEventBroadcaster; +import com.sun.star.document.XEventListener; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.sheet.XSpreadsheetDocument; +import com.sun.star.text.XTextDocument; +import com.sun.star.uno.UnoRuntime; +import complex.framework.DocHelper.WriterHelper; + +import java.util.ArrayList; + +import util.UITools; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + + +/** + * This testcase checks the GlobalEventBroadcaster + * it will add an XEventListener and verify the Events + * raised when opening/changing and closing Office Documents + */ +public class CheckGlobalEventBroadcaster_writer1 { + XMultiServiceFactory m_xMSF = null; + XEventBroadcaster m_xEventBroadcaster = null; + ArrayList notifyEvents = new ArrayList(); + // XTextDocument xTextDoc; + XSpreadsheetDocument xSheetDoc; + XEventListener m_xEventListener = new EventListenerImpl(); + +// public String[] getTestMethodNames() { +// return new String[] { +// "initialize", "checkWriter", "cleanup" +// }; +// } + + @Before public void initialize() { + m_xMSF = getMSF(); + System.out.println("check wether there is a valid MultiServiceFactory"); + + assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); + + System.out.println("... done"); + + System.out.println( + "Create an instance of com.sun.star.frame.GlobalEventBroadcaster"); + + Object GlobalEventBroadcaster = null; + Object dispatcher = null; + + try { + GlobalEventBroadcaster = m_xMSF.createInstance( + "com.sun.star.frame.GlobalEventBroadcaster"); + } catch (com.sun.star.uno.Exception e) { + fail("## Exception while creating instance"); + } + + System.out.println("... done"); + + System.out.println("check wether the created instance is valid"); + + assertNotNull("couldn't create service", GlobalEventBroadcaster); + + System.out.println("... done"); + + System.out.println( + "try to query the XEventBroadcaster from the gained Object"); + m_xEventBroadcaster = UnoRuntime.queryInterface(XEventBroadcaster.class, GlobalEventBroadcaster); + + if (util.utils.isVoid(m_xEventBroadcaster)) { + fail("couldn't get XEventBroadcaster"); + } + + System.out.println("... done"); + + System.out.println("adding Listener"); + m_xEventBroadcaster.addEventListener(m_xEventListener); + System.out.println("... done"); + } + + @Test public void checkWriter() { + System.out.println("-- Checking Writer --"); + + WriterHelper wHelper = new WriterHelper(m_xMSF); + String[] expected; + boolean locRes = true; + System.out.println("opening an empty writer doc"); + notifyEvents.clear(); + { + XTextDocument xTextDoc = wHelper.openEmptyDoc(); + shortWait(); + expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus" }; + + assertTrue("Wrong events fired when opening empty doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("changing the writer doc"); + notifyEvents.clear(); + xTextDoc.getText().setString("GlobalEventBroadcaster"); + shortWait(); + expected = new String[] { "OnModifyChanged" }; + + assertTrue("Wrong events fired when changing doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("closing the empty writer doc"); + notifyEvents.clear(); + wHelper.closeDoc(xTextDoc); + shortWait(); + } + expected = new String[] { "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; + + assertTrue("Wrong events fired when closing empty doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("opening an writer doc via Window-New Window"); + notifyEvents.clear(); + { + XTextDocument xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false); + + shortWait(); + expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", }; + + assertTrue("Wrong events fired when opening an writer doc via Window-New Window", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("closing the created writer doc"); + notifyEvents.clear(); + + wHelper.closeDoc(xTextDoc); + shortWait(); + } + expected = new String[] { "OnViewClosed", "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; + + assertTrue("Wrong events fired when closing Window-New Window", + proveExpectation(expected)); + + System.out.println("... done"); + // TODO: It seems not possible to close the document without interactiv question + // there the follow test will not be execute + if (false) { + System.out.println("Opening document with label wizard"); + XTextDocument xTextDoc = wHelper.openFromDialog("private:factory/swriter?slot=21051", "", false); + shortWait(); + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, wHelper.getToolkit().getActiveTopWindow()); + UITools ut = new UITools(m_xMSF,xWindow); + notifyEvents.clear(); + System.out.println("pressing button 'New Document'"); + try{ + ut.clickButton ("New Document"); + } catch (Exception e) { + System.out.println("Couldn't press Button"); + } + System.out.println("... done"); + shortWait(); + shortWait(); + shortWait(); + expected = new String[] { "OnViewClosed", "OnCreate", "OnFocus", "OnModifyChanged" }; + + assertTrue("Wrong events fired when starting labels wizard", + proveExpectation(expected)); + + System.out.println("Try to close document..."); + wHelper.closeDoc(xTextDoc); + shortWait(); + wHelper.closeFromDialog(); + shortWait(); + xTextDoc = null; + } + + System.out.println("-- Done Writer --"); + } + + @After public void cleanup() { + System.out.println("removing Listener"); + m_xEventBroadcaster.removeEventListener(m_xEventListener); + System.out.println("... done"); + } + + /** + * Sleeps for 0.5 sec. to allow StarOffice to react on + * reset call. + */ + private void shortWait() { + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + System.out.println("While waiting :" + e); + } + } + + private boolean proveExpectation(String[] expected) { + boolean locRes = true; + boolean failure = false; + + System.out.println("Fired Events:"); + for (int k=0;k + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.framework.DocHelper; + +import com.sun.star.beans.PropertyValue; +import com.sun.star.frame.XController; +import com.sun.star.frame.XDispatch; +import com.sun.star.frame.XDispatchProvider; +import com.sun.star.frame.XModel; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.URL; +import com.sun.star.util.XURLTransformer; + +import java.lang.Thread; + + +/** + * This class opens a given dialog in a separate Thread by dispatching an url + * + */ +public class DialogThread extends Thread { + public XComponent m_xDoc = null; + public XMultiServiceFactory m_xMSF = null; + public String m_url = ""; + + public DialogThread(XComponent xDoc, XMultiServiceFactory msf, String url) { + this.m_xDoc = xDoc; + this.m_xMSF = msf; + this.m_url = url; + } + + public void run() { + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + m_xDoc); + + XController xController = aModel.getCurrentController(); + + //Opening Dialog + try { + XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( + XDispatchProvider.class, + xController.getFrame()); + XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( + XURLTransformer.class, + m_xMSF.createInstance( + "com.sun.star.util.URLTransformer")); + + // Because it's an in/out parameter + // we must use an array of URL objects. + URL[] aParseURL = new URL[1]; + aParseURL[0] = new URL(); + aParseURL[0].Complete = m_url; + xParser.parseStrict(aParseURL); + + URL aURL = aParseURL[0]; + XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", com.sun.star.frame.FrameSearchFlag.SELF | + com.sun.star.frame.FrameSearchFlag.CHILDREN); + PropertyValue[] dispatchArguments = new PropertyValue[0]; + + if (xDispatcher != null) { + xDispatcher.dispatch(aURL, dispatchArguments); + } else { + System.out.println("xDispatcher is null"); + } + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't open dialog"); + } + } +} \ No newline at end of file diff --git a/sfx2/qa/complex/framework/DocHelper/WriterHelper.java b/sfx2/qa/complex/framework/DocHelper/WriterHelper.java new file mode 100644 index 000000000000..d3f19703bb9d --- /dev/null +++ b/sfx2/qa/complex/framework/DocHelper/WriterHelper.java @@ -0,0 +1,287 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ +package complex.framework.DocHelper; + +import com.sun.star.accessibility.AccessibleRole; +import com.sun.star.accessibility.XAccessible; +import com.sun.star.accessibility.XAccessibleAction; +import com.sun.star.accessibility.XAccessibleContext; +import com.sun.star.accessibility.XAccessibleSelection; +import com.sun.star.awt.XExtendedToolkit; +import com.sun.star.awt.XWindow; +import com.sun.star.frame.XDesktop; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.text.XTextDocument; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.XCloseable; + +import complex.framework.DocHelper.DialogThread; +import java.io.PrintWriter; + +import util.AccessibilityTools; +import util.WriterTools; + + +/** + * Methods to open Writer docs + * + */ +public class WriterHelper { + XMultiServiceFactory m_xMSF = null; + + /** Creates a new instance of WriterHelper + * @param m_xMSF The MultiServiceFactory gained from the office + */ + public WriterHelper(XMultiServiceFactory m_xMSF) { + this.m_xMSF = m_xMSF; + } + + /** Opens an empty document + * @return a reference to the opened document is returned + */ + public XTextDocument openEmptyDoc() { + return WriterTools.createTextDoc(m_xMSF); + } + + /** Closes a given XTextDocument + * @param xTextDoc the text document to be closed + * @return if an error occurs the errormessage is returned and an empty String if not + */ + public String closeDoc(XTextDocument xTextDoc) { + XCloseable closer = UnoRuntime.queryInterface(XCloseable.class, xTextDoc); + String err = ""; + + try { + closer.close(true); + } catch (com.sun.star.util.CloseVetoException e) { + err = "couldn't close document " + e; + System.out.println(err); + } + + return err; + } + + private XTextDocument xLocalDoc = null; + /** a TextDocument is opened by pressing a button in a dialog given by uno-URL + * @param url the uno-URL of the dialog to be opened + * @param createButton the language dependend label of the button to be pressed + * @param destroyLocal if true the document that has been opened to dispatch the dialog is closed before the method returns, + * otherwise this document remains open + * @return returns the created Textdocument + */ + public XTextDocument openFromDialog(String url, String createButton, + boolean destroyLocal) { + xLocalDoc = WriterTools.createTextDoc(m_xMSF); + XComponent comp = UnoRuntime.queryInterface(XComponent.class, xLocalDoc); + DialogThread diagThread = new DialogThread(comp, m_xMSF, url); + diagThread.start(); + shortWait(); + + if (createButton.length() > 1) { + XExtendedToolkit tk = getToolkit(); + AccessibilityTools at = new AccessibilityTools(); + Object atw = tk.getActiveTopWindow(); + + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessibleContext buttonContext = at.getAccessibleObjectForRole( + xRoot, + AccessibleRole.PUSH_BUTTON, + createButton); + + XAccessibleAction buttonAction = UnoRuntime.queryInterface(XAccessibleAction.class, buttonContext); + + try { + System.out.println("Name: " + + buttonContext.getAccessibleName()); + buttonAction.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + System.out.println("Couldn't press button"); + } + + shortWait(); + } + + XDesktop xDesktop = getDesktop(); + + XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); + + if (destroyLocal) { + closeDoc(xLocalDoc); + xLocalDoc = null; + } + + return returnDoc; + } + public void closeFromDialog() + { + closeDoc(xLocalDoc); + xLocalDoc = null; + } + public void kill() + { + XDesktop xDesktop = getDesktop(); + xDesktop.terminate(); + } + + + public XTextDocument DocByAutopilot(XMultiServiceFactory msf, + int[] indexes, boolean destroyLocal, + String bName) { + XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF); + Object toolkit = null; + + try { + toolkit = msf.createInstance("com.sun.star.awt.Toolkit"); + } catch (com.sun.star.uno.Exception e) { + e.printStackTrace(); + } + + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); + + shortWait(); + + AccessibilityTools at = new AccessibilityTools(); + + Object atw = tk.getActiveTopWindow(); + + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + XAccessible xRoot = at.getAccessibleObject(xWindow); + + XAccessibleContext ARoot = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.MENU_BAR); + XAccessibleSelection sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); + + for (int k = 0; k < indexes.length; k++) { + try { + sel.selectAccessibleChild(indexes[k]); + shortWait(); + ARoot = ARoot.getAccessibleChild(indexes[k]) + .getAccessibleContext(); + sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + } + + shortWait(); + + atw = tk.getActiveTopWindow(); + + xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + xRoot = at.getAccessibleObject(xWindow); + + //at.printAccessibleTree(new PrintWriter(System.out),xRoot); + + XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName)); + + try { + action.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + + shortWait(); + + atw = tk.getActiveTopWindow(); + + xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + xRoot = at.getAccessibleObject(xWindow); + + at.printAccessibleTree(new PrintWriter(System.out),xRoot); + + action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Yes")); + + try { + if (action != null) action.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + + shortWait(); + + XDesktop xDesktop = getDesktop(); + + XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); + + if (destroyLocal) { + closeDoc(xLocalDoc); + } + + return returnDoc; + } + + /** + * Sleeps for 2 sec. to allow StarOffice to react + */ + private void shortWait() { + try { + Thread.sleep(4000); + } catch (InterruptedException e) { + System.out.println("While waiting :" + e); + } + } + + /** creates an instance of com.sun.star.awt.Toolkit to query the XExtendedToolkit + * interface + * @return returns the gained XExtendedToolkit Interface + */ + public XExtendedToolkit getToolkit() { + Object toolkit = null; + + try { + toolkit = m_xMSF.createInstance("com.sun.star.awt.Toolkit"); + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't get toolkit"); + e.printStackTrace(); + } + + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); + + return tk; + } + + /** creates an instance of com.sun.star.frame.Desktop to query the XDesktop interface + * @return returns the gained XDesktop interface + */ + protected XDesktop getDesktop() { + Object desk = null; + + try { + desk = m_xMSF.createInstance("com.sun.star.frame.Desktop"); + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't get desktop"); + e.printStackTrace(); + } + + XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, desk); + + return xDesktop; + } +} \ No newline at end of file diff --git a/sfx2/qa/complex/framework/DocHelper/makefile.mk b/sfx2/qa/complex/framework/DocHelper/makefile.mk new file mode 100644 index 000000000000..ad614cfca3f8 --- /dev/null +++ b/sfx2/qa/complex/framework/DocHelper/makefile.mk @@ -0,0 +1,49 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +PRJ = ../../../.. +TARGET = DocHelper +PRJNAME = $(TARGET) +PACKAGE = complex/framework/dochelper + +# --- Settings ----------------------------------------------------- +.INCLUDE: settings.mk + + +#----- compile .java files ----------------------------------------- + +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +JAVAFILES = \ + DialogThread.java \ + WriterHelper.java + +JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) + +# --- Targets ------------------------------------------------------ + +.INCLUDE : target.mk + diff --git a/sfx2/qa/complex/framework/DocumentMetaData.java b/sfx2/qa/complex/framework/DocumentMetaData.java new file mode 100644 index 000000000000..c94d2f64e768 --- /dev/null +++ b/sfx2/qa/complex/framework/DocumentMetaData.java @@ -0,0 +1,565 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +package complex.framework; + + +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XComponentContext; +import com.sun.star.lang.XInitialization; + +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.lang.Locale; +import com.sun.star.lang.EventObject; +import com.sun.star.util.Date; +import com.sun.star.util.DateTime; +import com.sun.star.util.Time; +import com.sun.star.util.Duration; +import com.sun.star.util.XModifyListener; +import com.sun.star.util.XModifyBroadcaster; +import com.sun.star.beans.XPropertyContainer; +import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.NamedValue; +import com.sun.star.beans.PropertyAttribute; +import com.sun.star.beans.UnknownPropertyException; +import com.sun.star.beans.IllegalTypeException; + +import com.sun.star.document.XDocumentProperties; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +/** + * Test case for the service com.sun.star.document.DocumentProperties. + * Currently, this service is implemented in + * sfx2/source/doc/SfxDocumentMetaData.cxx. + * + * @author mst + */ +public class DocumentMetaData +{ +// public String[] getTestMethodNames () { +// return new String[] { "check", "cleanup" }; +// } + + @After public void cleanup() { + // nothing to do + } + + // for testing modifications + class Listener implements XModifyListener { + private boolean m_Called; + + public Listener() { + m_Called = false; + } + + public boolean reset() { + boolean oldCalled = m_Called; + m_Called = false; + return oldCalled; + } + + public void modified(EventObject e) { + m_Called = true; + } + + public void disposing(EventObject e) { + } + } + + @Test public void check() { + try { + XMultiServiceFactory xMSF = getMSF(); + assertNotNull("could not create MultiServiceFactory.", xMSF); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); + Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); + XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); + assertNotNull("could not get component context.", xContext); + + // TODO: Path to temp + String temp = util.utils.getOfficeTemp/*Dir*/(xMSF); + System.out.println("tempdir: " + temp); + + PropertyValue[] noArgs = { }; + PropertyValue mimetype = new PropertyValue(); + mimetype.Name = "MediaType"; + mimetype.Value = "application/vnd.oasis.opendocument.text"; + PropertyValue[] mimeArgs = { mimetype }; +// new Any("application/vnd.oasis.opendocument.text")) }; + PropertyValue cfile = new PropertyValue(); + cfile.Name = "URL"; + cfile.Value = temp + "EMPTY.odt"; + PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; + + System.out.println("Creating service DocumentProperties..."); + + Object oDP = +// xMSF.createInstanceWithContext( +// "com.sun.star.document.DocumentProperties", xContext); + xMSF.createInstance("com.sun.star.document.DocumentProperties"); + XDocumentProperties xDP = UnoRuntime.queryInterface(XDocumentProperties.class, oDP); + + System.out.println("...done"); + + + System.out.println("Checking initialize ..."); + + XDocumentProperties xDP2 = UnoRuntime.queryInterface(XDocumentProperties.class, xMSF.createInstance("com.sun.star.document.DocumentProperties")); + XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xDP2); + xInit.initialize(new Object[] { }); + + System.out.println("...done"); + + System.out.println("Checking storing default-initialized meta data ..."); + +// xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); + xDP2.storeToMedium("", mimeEmptyArgs); + + System.out.println("...done"); + + System.out.println("Checking loading default-initialized meta data ..."); + +// xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); + xDP2.loadFromMedium("", mimeEmptyArgs); + assertTrue ("Author", "".equals(xDP2.getAuthor())); + + System.out.println("...done"); + + System.out.println("(Not) Checking preservation of custom meta data ..."); + + xDP2.loadFromMedium(TestDocument.getUrl("CUSTOM.odt"), + noArgs); + assertTrue ("Author", "".equals(xDP2.getAuthor())); + xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs); + + //FIXME: now what? comparing for binary equality seems useless + // we could unzip the written file and grep for the custom stuff + // but would that work on windows... + + System.out.println("...done"); + + System.out.println("Checking loading from test document..."); + + String file = TestDocument.getUrl("TEST.odt"); + xDP.loadFromMedium(file, noArgs); +/* XInputStream xStream = + new StreamSimulator("./testdocuments/TEST.odt", true, param); + Object oSF = + xMSF.createInstance("com.sun.star.embed.StorageFactory"); + XSingleServiceFactory xSF = (XSingleServiceFactory) + UnoRuntime.queryInterface(XSingleServiceFactory.class, oSF); + Object oStor = xSF.createInstanceWithArguments( + new Object[] { xStream }); + XStorage xStor = (XStorage) UnoRuntime.queryInterface( + XStorage.class, oStor); + xDP.loadFromStorage(xStor);*/ + + System.out.println("...done"); + + System.out.println("Checking meta-data import..."); + + assertTrue("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); + assertTrue("Generator", + "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227" + .equals(xDP.getGenerator())); + assertTrue("CreationDate", 2007 == xDP.getCreationDate().Year); + assertTrue("Title", "Urgent Memo".equals(xDP.getTitle())); + assertTrue("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); + assertTrue("Description", + "Modern internal company memorandum in full-blocked style" + .equals(xDP.getDescription())); +// assertTrue("Language", "".equals(xDP.getLanguage())); + assertTrue("ModifiedBy", + "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); + assertTrue("ModificationDate", 10 == xDP.getModificationDate().Month); + assertTrue("PrintedBy", + "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); + assertTrue("PrintDate", 29 == xDP.getPrintDate().Day); + assertTrue("TemplateName", + "Modern Memo".equals(xDP.getTemplateName())); + assertTrue("TemplateURL", + xDP.getTemplateURL().endsWith("memmodern.ott")); + assertTrue("TemplateDate", 17 == xDP.getTemplateDate().Hours); + assertTrue("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); + assertTrue("AutoloadSecs", 0 == xDP.getAutoloadSecs()); + assertTrue("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); + assertTrue("EditingCycles", 3 == xDP.getEditingCycles()); + assertTrue("EditingDuration", 320 == xDP.getEditingDuration()); + + String[] kws = xDP.getKeywords(); + assertTrue("Keywords", fromArray(kws).containsAll( + fromArray(new Object[] { "Asien", "Memo", "Reis" }))); + + NamedValue[] ds = xDP.getDocumentStatistics(); +/* for (int i = 0; i < ds.length; ++i) { + System.out.println("nv: " + ds[i].Name + " " + ds[i].Value); + } + NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); + NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); + System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false... +*/ + assertTrue("DocumentStatistics:WordCount", containsNV(ds, + new NamedValue("WordCount", new Integer(23)))); + assertTrue("DocumentStatistics:PageCount", containsNV(ds, + new NamedValue("PageCount", new Integer(1)))); + + XPropertyContainer udpc = xDP.getUserDefinedProperties(); + XPropertySet udps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet.class, udpc); + assertTrue("UserDefined 1", "Dies ist ein wichtiger Hinweis" + .equals(udps.getPropertyValue("Hinweis"))); + assertTrue("UserDefined 2", ("Kann Spuren von N" + + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8") + + "ssen enthalten") + .equals(udps.getPropertyValue("Warnung"))); + + System.out.println("...done"); + + System.out.println("Checking meta-data updates..."); + + String str; + DateTime dt = new DateTime(); + Locale l = new Locale(); + int i; + + str = "me"; + xDP.setAuthor(str); + assertTrue("setAuthor", str.equals(xDP.getAuthor())); + str = "the computa"; + xDP.setGenerator(str); + assertTrue("setGenerator", str.equals(xDP.getGenerator())); + dt.Year = 2038; + dt.Month = 1; + dt.Day = 1; + xDP.setCreationDate(dt); + assertTrue("setCreationDate", dt.Year == xDP.getCreationDate().Year); + str = "El t'itulo"; + xDP.setTitle(str); + assertTrue("setTitle", str.equals(xDP.getTitle())); + str = "Ein verkommenes Subjekt"; + xDP.setSubject(str); + assertTrue("setSubject", str.equals(xDP.getSubject())); + str = "Este descripci'on no es importante"; + xDP.setDescription(str); + assertTrue("setDescription", str.equals(xDP.getDescription())); + l.Language = "en"; + l.Country = "GB"; + xDP.setLanguage(l); + Locale l2 = xDP.getLanguage(); + assertTrue("setLanguage Lang", l.Language.equals(l2.Language)); + assertTrue("setLanguage Cty", l.Country.equals(l2.Country)); + str = "myself"; + xDP.setModifiedBy(str); + assertTrue("setModifiedBy", str.equals(xDP.getModifiedBy())); + dt.Year = 2042; + xDP.setModificationDate(dt); + assertTrue("setModificationDate", + dt.Year == xDP.getModificationDate().Year); + str = "i didnt do it"; + xDP.setPrintedBy(str); + assertTrue("setPrintedBy", str.equals(xDP.getPrintedBy())); + dt.Year = 2024; + xDP.setPrintDate(dt); + assertTrue("setPrintDate", dt.Year == xDP.getPrintDate().Year); + str = "blah"; + xDP.setTemplateName(str); + assertTrue("setTemplateName", str.equals(xDP.getTemplateName())); + str = "gopher://some-hole-in-the-ground/"; + xDP.setTemplateURL(str); + assertTrue("setTemplateURL", str.equals(xDP.getTemplateURL())); + dt.Year = 2043; + xDP.setTemplateDate(dt); + assertTrue("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); + str = "http://nowhere/"; + xDP.setAutoloadURL(str); + assertTrue("setAutoloadURL", str.equals(xDP.getAutoloadURL())); + i = 3661; // this might not work (due to conversion via double...) + xDP.setAutoloadSecs(i); +// System.out.println("set: " + i + " get: " + xDP.getAutoloadSecs()); + assertTrue("setAutoloadSecs", i == xDP.getAutoloadSecs()); + str = "_blank"; + xDP.setDefaultTarget(str); + assertTrue("setDefaultTarget", str.equals(xDP.getDefaultTarget())); + i = 42; + xDP.setEditingCycles((short) i); + assertTrue("setEditingCycles", i == xDP.getEditingCycles()); + i = 84; + xDP.setEditingDuration(i); + assertTrue("setEditingDuration", i == xDP.getEditingDuration()); + str = ""; + + String[] kws2 = new String[] { + "keywordly", "keywordlike", "keywordalicious" }; + xDP.setKeywords(kws2); + kws = xDP.getKeywords(); + assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); + + NamedValue[] ds2 = new NamedValue[] { + new NamedValue("SyllableCount", new Integer(9)), + new NamedValue("FrameCount", new Integer(2)), + new NamedValue("SentenceCount", new Integer(7)) }; + xDP.setDocumentStatistics(ds2); + ds = xDP.getDocumentStatistics(); + assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds, + new NamedValue("SyllableCount", new Integer(9)))); + assertTrue("setDocumentStatistics:FrameCount", containsNV(ds, + new NamedValue("FrameCount", new Integer(2)))); + assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds, + new NamedValue("SentenceCount", new Integer(7)))); + + System.out.println("...done"); + + System.out.println("Checking user-defined meta-data updates..."); + + // actually, this tests the PropertyBag service + // but maybe the DocumentProperties service will be implemented + // differently some day... + boolean b = true; + double d = 3.1415; + // note that Time is only supported for backward compatibilty! + Time t = new Time(); + t.Hours = 1; + t.Minutes = 16; + Date date = new Date(); + date.Year = 2071; + date.Month = 2; + date.Day = 3; + dt.Year = 2065; + Duration dur = new Duration(); + dur.Negative = true; + dur.Years = 1001; + dur.Months = 999; + dur.Days = 888; + dur.Hours = 777; + dur.Minutes = 666; + dur.Seconds = 555; + dur.MilliSeconds = 444; + + udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, + new Boolean(b)); + udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur); + udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t); + udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date); + udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE, dt); + udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new Double(d)); + udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar"); + udpc.addProperty("Removed", PropertyAttribute.REMOVEABLE, "bar"); + // #i94175#: empty property name is valid ODF 1.1 + udpc.addProperty("", PropertyAttribute.REMOVEABLE, "eeeeek"); + try { + udpc.removeProperty("Info 1"); + udpc.removeProperty("Removed"); + } catch (UnknownPropertyException e) { + fail("removeProperty failed"); + } + + try { + udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, + new String[] { "foo", "bar" }); + fail("inserting value of non-supported type did not fail"); + } catch (IllegalTypeException e) { + // ignore + } + + assertTrue("UserDefined bool", new Boolean(b).equals( + udps.getPropertyValue("Frobnicate"))); + assertTrue("UserDefined duration", eqDuration(dur, (Duration) + udps.getPropertyValue("FrobDuration"))); + assertTrue("UserDefined time", eqTime(t, (Time) + udps.getPropertyValue("FrobDuration2"))); + assertTrue("UserDefined date", eqDate(date, (Date) + udps.getPropertyValue("FrobEndDate"))); + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) + udps.getPropertyValue("FrobStartTime"))); + assertTrue("UserDefined float", new Double(d).equals( + udps.getPropertyValue("Pi"))); + assertTrue("UserDefined string", "bar".equals( + udps.getPropertyValue("Foo"))); + assertTrue("UserDefined empty name", "eeeeek".equals( + udps.getPropertyValue(""))); + + try { + udps.getPropertyValue("Removed"); + fail("UserDefined remove didn't"); + } catch (UnknownPropertyException e) { + // ok + } + + System.out.println("...done"); + + System.out.println("Checking storing meta-data to file..."); + + xDP.storeToMedium(temp + "TEST.odt", mimeArgs); + + System.out.println("...done"); + + System.out.println("Checking loading meta-data from stored file..."); + + xDP.loadFromMedium(temp + "TEST.odt", noArgs); + + System.out.println("...done"); + + System.out.println("Checking user-defined meta-data from stored file..."); + + udpc = xDP.getUserDefinedProperties(); + udps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet.class, udpc); + + assertTrue("UserDefined bool", new Boolean(b).equals( + udps.getPropertyValue("Frobnicate"))); + assertTrue("UserDefined duration", eqDuration(dur, (Duration) + udps.getPropertyValue("FrobDuration"))); + // this is now a Duration! + Duration t_dur = new Duration(false, (short)0, (short)0, (short)0, + t.Hours, t.Minutes, t.Seconds, + (short)(10 * t.HundredthSeconds)); + assertTrue("UserDefined time", eqDuration(t_dur, (Duration) + udps.getPropertyValue("FrobDuration2"))); + assertTrue("UserDefined date", eqDate(date, (Date) + udps.getPropertyValue("FrobEndDate"))); + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) + udps.getPropertyValue("FrobStartTime"))); + assertTrue("UserDefined float", new Double(d).equals( + udps.getPropertyValue("Pi"))); + assertTrue("UserDefined string", "bar".equals( + udps.getPropertyValue("Foo"))); + + try { + udps.getPropertyValue("Removed"); + fail("UserDefined remove didn't"); + } catch (UnknownPropertyException e) { + // ok + } + + System.out.println("...done"); + + System.out.println("Checking notification listener interface..."); + + Listener listener = new Listener(); + XModifyBroadcaster xMB = (XModifyBroadcaster) + UnoRuntime.queryInterface(XModifyBroadcaster.class, xDP); + xMB.addModifyListener(listener); + xDP.setAuthor("not me"); + assertTrue("Listener Author", listener.reset()); + udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); + assertTrue("Listener UserDefined Add", listener.reset()); + udps.setPropertyValue("Listener", "bar"); + assertTrue("Listener UserDefined Set", listener.reset()); + udpc.removeProperty("Listener"); + assertTrue("Listener UserDefined Remove", listener.reset()); + xMB.removeModifyListener(listener); + udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); + assertTrue("Removed Listener UserDefined Add", !listener.reset()); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + } + } + + // grrr... + boolean eqDateTime(DateTime a, DateTime b) { + return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day + && a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.HundredthSeconds == b.HundredthSeconds; + } + + boolean eqDate(Date a, Date b) { + return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day; + } + + boolean eqTime(Time a, Time b) { + return a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.HundredthSeconds == b.HundredthSeconds; + } + + boolean eqDuration(Duration a, Duration b) { + return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days + && a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.MilliSeconds == b.MilliSeconds + && a.Negative == b.Negative; + } + + java.util.Collection fromArray(Object[] os) { + java.util.Collection ret = new java.util.HashSet(); + for (int i = 0; i < os.length; ++i) { + ret.add(os[i]); + } + return ret; + } + + // bah, structs do not have proper equals(), and uno.Type is not comparable + public static boolean containsNV (NamedValue[] nvs, NamedValue nv) { + for (int i = 0; i < nvs.length; ++i) { + if (nvs[i].Name.equals(nv.Name) && nvs[i].Value.equals(nv.Value)) { + return true; + } + } + return false; + } + + public void report(Exception e) { + System.out.println("Exception occurred:"); + e.printStackTrace(); + fail(); + } + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection() DocumentMetaData"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} + diff --git a/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java new file mode 100644 index 000000000000..0ebbbc25da59 --- /dev/null +++ b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java @@ -0,0 +1,1293 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +package complex.framework; + +// import complexlib.ComplexTestCase; +import helper.StreamSimulator; + +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XComponentContext; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.lang.XComponent; + +import com.sun.star.lang.XServiceInfo; +import com.sun.star.lang.IllegalArgumentException; +import com.sun.star.lang.WrappedTargetException; +import com.sun.star.lang.WrappedTargetRuntimeException; +import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.Pair; +import com.sun.star.beans.StringPair; +import com.sun.star.container.XEnumerationAccess; +import com.sun.star.container.XEnumeration; +import com.sun.star.io.XInputStream; +import com.sun.star.util.XCloseable; +import com.sun.star.frame.XStorable; +import com.sun.star.text.XTextDocument; +import com.sun.star.text.XTextRange; +import com.sun.star.text.XText; +import com.sun.star.rdf.*; +import lib.TestParameters; + + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +/** + * Test case for interface com.sun.star.rdf.XDocumentMetadataAccess + * Currently, this service is implemented in + * sfx2/source/doc/DocumentMetadataAccess.cxx + * + * Actually, this is not a service, so we need to create a document and + * go from there... + * + * @author mst + */ +public class DocumentMetadataAccessTest +{ + XMultiServiceFactory xMSF; + XComponentContext xContext; + String tempDir; + + String nsRDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + String nsRDFS = "http://www.w3.org/2000/01/rdf-schema#"; + String nsPkg="http://docs.oasis-open.org/opendocument/meta/package/common#"; + String nsODF ="http://docs.oasis-open.org/opendocument/meta/package/odf#"; + + XURI foo; + XURI bar; + XURI baz; + + static XURI rdf_type; + static XURI rdfs_label; + static XURI pkg_Document; + static XURI pkg_hasPart; + static XURI pkg_MetadataFile; + static XURI odf_ContentFile; + static XURI odf_StylesFile; + static XURI odf_Element; + static XBlankNode blank1; + static XBlankNode blank2; + static XBlankNode blank3; + static XBlankNode blank4; + static String manifestPath = "manifest.rdf"; + static String contentPath = "content.xml"; + static String stylesPath = "styles.xml"; + static String fooPath = "foo.rdf"; + static String fooBarPath = "meta/foo/bar.rdf"; + + XRepository xRep; + XRepositorySupplier xRS; + XDocumentMetadataAccess xDMA; + +// public String[] getTestMethodNames () +// { +// return new String[] { "check", "checkRDFa" }; +// } + /** + * The test parameters + */ + private static TestParameters param = null; + + @Before public void before() + { + try { + + xMSF = getMSF(); + param = new TestParameters(); + param.put("ServiceFactory", xMSF); // important for param.getMSF() + + assertNotNull("could not create MultiServiceFactory.", xMSF); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); + Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); + xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); + assertNotNull("could not get component context.", xContext); + + tempDir = util.utils.getOfficeTemp/*Dir*/(xMSF); + System.out.println("tempdir: " + tempDir); + + foo = URI.create(xContext, "uri:foo"); + assertNotNull("foo", foo); + bar = URI.create(xContext, "uri:bar"); + assertNotNull("bar", bar); + baz = URI.create(xContext, "uri:baz"); + assertNotNull("baz", baz); + + blank1 = BlankNode.create(xContext, "_:1"); + assertNotNull("blank1", blank1); + blank2 = BlankNode.create(xContext, "_:2"); + assertNotNull("blank2", blank2); + blank3 = BlankNode.create(xContext, "_:3"); + assertNotNull("blank3", blank3); + blank4 = BlankNode.create(xContext, "_:4"); + assertNotNull("blank4", blank4); + rdf_type = URI.createKnown(xContext, URIs.RDF_TYPE); + assertNotNull("rdf_type", rdf_type); + rdfs_label = URI.createKnown(xContext, URIs.RDFS_LABEL); + assertNotNull("rdfs_label", rdfs_label); + pkg_Document = URI.createKnown(xContext, URIs.PKG_DOCUMENT); + assertNotNull("pkg_Document", pkg_Document); + pkg_hasPart = URI.createKnown(xContext, URIs.PKG_HASPART); + assertNotNull("pkg_hasPart", pkg_hasPart); + pkg_MetadataFile = URI.createKnown(xContext, URIs.PKG_METADATAFILE); + assertNotNull("pkg_MetadataFile", pkg_MetadataFile); + odf_ContentFile = URI.createKnown(xContext, URIs.ODF_CONTENTFILE); + assertNotNull("odf_ContentFile", odf_ContentFile); + odf_StylesFile = URI.createKnown(xContext, URIs.ODF_STYLESFILE); + assertNotNull("odf_StylesFile", odf_StylesFile); + odf_Element = URI.createKnown(xContext, URIs.ODF_ELEMENT); + assertNotNull("odf_Element", odf_Element); + + } catch (Exception e) { + report(e); + } + } + + @After public void after() + { + xRep = null; + xRS = null; + xDMA = null; + } + + @Test public void check() + { + XComponent xComp = null; + XComponent xComp2 = null; + try { + XEnumeration xStmtsEnum; + XNamedGraph xManifest; + + System.out.println("Creating document with Repository..."); + + // we cannot create a XDMA directly, we must create + // a document and get it from there :( + // create document + PropertyValue[] loadProps = new PropertyValue[1]; + loadProps[0] = new PropertyValue(); + loadProps[0].Name = "Hidden"; + loadProps[0].Value = new Boolean(true); + xComp = util.DesktopTools.openNewDoc(xMSF, "swriter", loadProps); + XTextDocument xText = UnoRuntime.queryInterface(XTextDocument.class, xComp); + + XRepositorySupplier xRS = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); + assertNotNull("xRS null", xRS); + XDocumentMetadataAccess xDMA = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xRS); + assertNotNull("xDMA null", xDMA); + xRep = xRS.getRDFRepository(); + assertNotNull("xRep null", xRep); + + System.out.println("...done"); + + System.out.println("Checking that new repository is initialized..."); + + XURI xBaseURI = (XURI) xDMA; + String baseURI = xBaseURI.getStringValue(); + assertNotNull("new: baseURI", xBaseURI ); + assertTrue("new: baseURI", !xBaseURI.getStringValue().equals("")); + + assertTrue("new: # graphs", 1 == xRep.getGraphNames().length); + XURI manifest = URI.createNS(xContext, xBaseURI.getStringValue(), + manifestPath); + xManifest = xRep.getGraph(manifest); + assertTrue("new: manifest graph", null != xManifest); + + Statement[] manifestStmts = getManifestStmts(xBaseURI); + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("new: manifest graph", eq(xStmtsEnum, manifestStmts)); + + System.out.println("...done"); + + System.out.println("Checking some invalid args..."); + + String content = "behold, for i am the content."; + XTextRange xTR = new TestRange(content); + XMetadatable xM = (XMetadatable) xTR; + + try { + xDMA.getElementByURI(null); + fail("getElementByURI: null allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.getMetadataGraphsWithType(null); + fail("getMetadataGraphsWithType: null URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("", new XURI[0]); + fail("addMetadataFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("/foo", new XURI[0]); + fail("addMetadataFile: absolute filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("fo\"o", new XURI[0]); + fail("addMetadataFile: invalid filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("../foo", new XURI[0]); + fail("addMetadataFile: filename with .. allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("foo/../../bar", new XURI[0]); + fail("addMetadataFile: filename with nest .. allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("foo/././bar", new XURI[0]); + fail("addMetadataFile: filename with nest . allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("content.xml", new XURI[0]); + fail("addMetadataFile: content.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("styles.xml", new XURI[0]); + fail("addMetadataFile: styles.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("meta.xml", new XURI[0]); + fail("addMetadataFile: meta.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("settings.xml", new XURI[0]); + fail("addMetadataFile: settings.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.importMetadataFile(FileFormat.RDF_XML, null, "foo", + foo, new XURI[0]); + fail("importMetadataFile: null stream allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + + final String sEmptyRDF = TestDocument.getUrl("empty.rdf"); + try { + XInputStream xFooIn = new StreamSimulator(sEmptyRDF, true, param); + xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "", + foo, new XURI[0]); + fail("importMetadataFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + XInputStream xFooIn = + new StreamSimulator(sEmptyRDF, true, param); + xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "meta.xml", + foo, new XURI[0]); + fail("importMetadataFile: meta.xml filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + XInputStream xFooIn = + new StreamSimulator(sEmptyRDF, true, param); + xDMA.importMetadataFile(FileFormat.RDF_XML, + xFooIn, "foo", null, new XURI[0]); + fail("importMetadataFile: null base URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + XInputStream xFooIn = + new StreamSimulator(sEmptyRDF, true, param); + xDMA.importMetadataFile(FileFormat.RDF_XML, + xFooIn, "foo", rdf_type, new XURI[0]); + fail("importMetadataFile: non-absolute base URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.removeMetadataFile(null); + fail("removeMetadataFile: null URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addContentOrStylesFile(""); + fail("addContentOrStylesFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addContentOrStylesFile("/content.xml"); + fail("addContentOrStylesFile: absolute filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addContentOrStylesFile("foo.rdf"); + fail("addContentOrStylesFile: invalid filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.removeContentOrStylesFile(""); + fail("removeContentOrStylesFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.loadMetadataFromStorage(null, foo, null); + fail("loadMetadataFromStorage: null storage allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.storeMetadataToStorage(null/*, base*/); + fail("storeMetadataToStorage: null storage allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.loadMetadataFromMedium(new PropertyValue[0]); + fail("loadMetadataFromMedium: empty medium allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.storeMetadataToMedium(new PropertyValue[0]); + fail("storeMetadataToMedium: empty medium allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + + System.out.println("...done"); + + System.out.println("Checking file addition/removal..."); + + xDMA.removeContentOrStylesFile(contentPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("removeContentOrStylesFile (content)", + eq(xStmtsEnum, new Statement[] { + manifestStmts[0], manifestStmts[2], manifestStmts[4] + })); + + xDMA.addContentOrStylesFile(contentPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("addContentOrStylesFile (content)", + eq(xStmtsEnum, manifestStmts)); + + xDMA.removeContentOrStylesFile(stylesPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("removeContentOrStylesFile (styles)", + eq(xStmtsEnum, new Statement[] { + manifestStmts[0], manifestStmts[1], manifestStmts[3] + })); + + xDMA.addContentOrStylesFile(stylesPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("addContentOrStylesFile (styles)", + eq(xStmtsEnum, manifestStmts)); + + XURI xFoo = URI.createNS(xContext, xBaseURI.getStringValue(), + fooPath); + Statement xM_BaseHaspartFoo = + new Statement(xBaseURI, pkg_hasPart, xFoo, manifest); + Statement xM_FooTypeMetadata = + new Statement(xFoo, rdf_type, pkg_MetadataFile, manifest); + Statement xM_FooTypeBar = + new Statement(xFoo, rdf_type, bar, manifest); + xDMA.addMetadataFile(fooPath, new XURI[] { bar }); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("addMetadataFile", + eq(xStmtsEnum, merge(manifestStmts, new Statement[] { + xM_BaseHaspartFoo, xM_FooTypeMetadata, xM_FooTypeBar + }))); + + XURI[] graphsBar = xDMA.getMetadataGraphsWithType(bar); + assertTrue("getMetadataGraphsWithType", + graphsBar.length == 1 && eq(graphsBar[0], xFoo)); + + + xDMA.removeMetadataFile(xFoo); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("removeMetadataFile", + eq(xStmtsEnum, manifestStmts)); + + System.out.println("...done"); + + System.out.println("Checking mapping..."); + + XEnumerationAccess xTextEnum = UnoRuntime.queryInterface(XEnumerationAccess.class, xText.getText()); + Object o = xTextEnum.createEnumeration().nextElement(); + XMetadatable xMeta1 = UnoRuntime.queryInterface(XMetadatable.class, o); + + XURI uri; + XMetadatable xMeta; + xMeta = xDMA.getElementByURI(xMeta1); + assertTrue("getElementByURI: null", null != xMeta); + String XmlId = xMeta.getMetadataReference().Second; + String XmlId1 = xMeta1.getMetadataReference().Second; + assertTrue("getElementByURI: no xml id", !XmlId.equals("")); + assertTrue("getElementByURI: different xml id", XmlId.equals(XmlId1)); + + System.out.println("...done"); + + System.out.println("Checking storing and loading..."); + + XURI xFoobar = URI.createNS(xContext, xBaseURI.getStringValue(), + fooBarPath); + Statement[] metadataStmts = getMetadataFileStmts(xBaseURI, + fooBarPath); + xDMA.addMetadataFile(fooBarPath, new XURI[0]); + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("addMetadataFile", + eq(xStmtsEnum, merge(manifestStmts, metadataStmts ))); + + Statement xFoobar_FooBarFoo = + new Statement(foo, bar, foo, xFoobar); + xRep.getGraph(xFoobar).addStatement(foo, bar, foo); + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("addStatement", + eq(xStmtsEnum, merge(manifestStmts, merge(metadataStmts, + new Statement[] { xFoobar_FooBarFoo })))); + + PropertyValue noMDNoContentFile = new PropertyValue(); + noMDNoContentFile.Name = "URL"; + noMDNoContentFile.Value = TestDocument.getUrl("CUSTOM.odt"); + PropertyValue noMDFile = new PropertyValue(); + noMDFile.Name = "URL"; + noMDFile.Value = TestDocument.getUrl("TEST.odt"); + PropertyValue file = new PropertyValue(); + file.Name = "URL"; + file.Value = tempDir + "TESTDMA.odt"; + /* + PropertyValue baseURL = new PropertyValue(); + baseURL.Name = "DocumentBaseURL"; + baseURL.Value = tempDir + "TMP.odt"; + */ + PropertyValue mimetype = new PropertyValue(); + mimetype.Name = "MediaType"; + mimetype.Value = "application/vnd.oasis.opendocument.text"; + PropertyValue[] argsEmptyNoContent = { mimetype, noMDNoContentFile}; + PropertyValue[] argsEmpty = { mimetype, noMDFile }; + PropertyValue[] args = { mimetype, file }; + + xStmtsEnum = xRep.getStatements(null, null, null); + XURI[] graphs = xRep.getGraphNames(); + + xDMA.storeMetadataToMedium(args); + + // this should re-init + xDMA.loadMetadataFromMedium(argsEmptyNoContent); + xRep = xRS.getRDFRepository(); + assertTrue("xRep null", null != xRep); + assertTrue("baseURI still tdoc?", + !baseURI.equals(xDMA.getStringValue())); + Statement[] manifestStmts2 = getManifestStmts((XURI) xDMA); + xStmtsEnum = xRep.getStatements(null, null, null); + // there is no content or styles file in here, so we have just + // the package stmt + assertTrue("loadMetadataFromMedium (no metadata, no content)", + eq(xStmtsEnum, new Statement[] { manifestStmts2[0] })); + + // this should re-init + xDMA.loadMetadataFromMedium(argsEmpty); + xRep = xRS.getRDFRepository(); + assertTrue("xRep null", null != xRep); + assertTrue("baseURI still tdoc?", + !baseURI.equals(xDMA.getStringValue())); + Statement[] manifestStmts3 = getManifestStmts((XURI) xDMA); + + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("loadMetadataFromMedium (no metadata)", + eq(xStmtsEnum, manifestStmts3)); + + xDMA.loadMetadataFromMedium(args); + xRep = xRS.getRDFRepository(); + assertTrue("xRep null", null != xRep); + Statement[] manifestStmts4 = getManifestStmts((XURI) xDMA); + Statement[] metadataStmts4 = getMetadataFileStmts((XURI) xDMA, + fooBarPath); + + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("some graph(s) not reloaded", + graphs.length == xRep.getGraphNames().length); + + XURI xFoobar4 = URI.createNS(xContext, xDMA.getStringValue(), + fooBarPath); + Statement xFoobar_FooBarFoo4 = + new Statement(foo, bar, foo, xFoobar4); + assertTrue("loadMetadataFromMedium (re-load)", + eq(xStmtsEnum, merge(manifestStmts4, merge(metadataStmts4, + new Statement[] { xFoobar_FooBarFoo4 })))); + + System.out.println("...done"); + + System.out.println("Checking storing and loading via model..."); + + String f = tempDir + "TESTPARA.odt"; + + XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xRS); + + xStor.storeToURL(f, new PropertyValue[0]); + + xComp2 = util.DesktopTools.loadDoc(xMSF, f, loadProps); + + XDocumentMetadataAccess xDMA2 = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xComp2); + assertTrue("xDMA2 null", null != xDMA2); + + XRepositorySupplier xRS2 = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2); + assertTrue("xRS2 null", null != xRS2); + + XRepository xRep2 = xRS2.getRDFRepository(); + assertTrue("xRep2 null", null != xRep2); + + Statement[] manifestStmts5 = getManifestStmts((XURI) xDMA2); + Statement[] metadataStmts5 = getMetadataFileStmts((XURI) xDMA2, + fooBarPath); + XURI xFoobar5 = URI.createNS(xContext, xDMA2.getStringValue(), + fooBarPath); + Statement xFoobar_FooBarFoo5 = + new Statement(foo, bar, foo, xFoobar5); + xStmtsEnum = xRep.getStatements(null, null, null); + XEnumeration xStmtsEnum2 = xRep2.getStatements(null, null, null); + assertTrue("load: repository differs", + eq(xStmtsEnum2, merge(manifestStmts5, merge(metadataStmts5, + new Statement[] { xFoobar_FooBarFoo5 })))); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + } finally { + close(xComp); + close(xComp2); + } + } + + @Test public void checkRDFa() + { + XComponent xComp = null; + try { + final String file = TestDocument.getUrl("TESTRDFA.odt"); + xComp = loadRDFa(file); + if (xComp != null) + { + final String sNewFile = tempDir + "TESTRDFA.odt"; + storeRDFa(xComp, sNewFile); + close(xComp); + + xComp = loadRDFa(sNewFile); + } + } finally { + close(xComp); + } + } + + private void storeRDFa(XComponent xComp, String file) + { + try { + + System.out.println("Storing test document..."); + + XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xComp); + + xStor.storeToURL(file, new PropertyValue[0]); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + } + } + + private XComponent loadRDFa(String file) + { + XComponent xComp = null; + try { + + System.out.println("Loading test document..."); + + PropertyValue[] loadProps = new PropertyValue[1]; + loadProps[0] = new PropertyValue(); + loadProps[0].Name = "Hidden"; + loadProps[0].Value = new Boolean(true); + + + + xComp = util.DesktopTools.loadDoc(xMSF, file, loadProps); + + XRepositorySupplier xRS = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); + assertTrue("xRS null", null != xRS); + + XDocumentRepository xRep = UnoRuntime.queryInterface(XDocumentRepository.class, xRS.getRDFRepository()); + assertTrue("xRep null", null != xRep); + + XTextDocument xTextDoc = UnoRuntime.queryInterface(XTextDocument.class, xComp); + + XText xText = xTextDoc.getText(); + + XEnumerationAccess xEA = UnoRuntime.queryInterface(XEnumerationAccess.class, xText); + XEnumeration xEnum = xEA.createEnumeration(); + + System.out.println("...done"); + + System.out.println("Checking RDFa in loaded test document..."); + + XMetadatable xPara; + Pair result; + + Statement x_FooBarLit1 = new Statement(foo, bar, mkLit("1"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 1", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit1 + })); + + Statement x_FooBarLit2 = new Statement(foo, bar, mkLit("2"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 2", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit2 + })); + + Statement x_BlankBarLit3 = + new Statement(blank1, bar, mkLit("3"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 3", + !result.Second && + eq(result.First, new Statement[] { + x_BlankBarLit3 + })); + XBlankNode b3 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); + + Statement x_BlankBarLit4 = + new Statement(blank2, bar, mkLit("4"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 4", + !result.Second && + eq(result.First, new Statement[] { + x_BlankBarLit4 + })); + XBlankNode b4 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); + + Statement x_BlankBarLit5 = + new Statement(blank1, bar, mkLit("5"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 5", + !result.Second && + eq(result.First, new Statement[] { + x_BlankBarLit5 + })); + XBlankNode b5 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); + + assertTrue("RDFa: 3 != 4", + !b3.getStringValue().equals(b4.getStringValue())); + assertTrue("RDFa: 3 == 5", + b3.getStringValue().equals(b5.getStringValue())); + + Statement x_FooBarLit6 = new Statement(foo, bar, mkLit("6"), null); + Statement x_FooBazLit6 = new Statement(foo, baz, mkLit("6"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 6", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit6, x_FooBazLit6 + })); + + Statement x_FooBarLit7 = new Statement(foo, bar, mkLit("7"), null); + Statement x_FooBazLit7 = new Statement(foo, baz, mkLit("7"), null); + Statement x_FooFooLit7 = new Statement(foo, foo, mkLit("7"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 7", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit7, x_FooBazLit7, x_FooFooLit7 + })); + + XNode lit = mkLit("a fooish bar"); + XNode lit_type= mkLit("a fooish bar", bar); + Statement x_FooBarLit = new Statement(foo, bar, lit, null); + Statement x_FooBarLittype = new Statement(foo, bar, lit_type, null); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 8", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLit + })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 9", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLit + })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 10", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLittype + })); + + Statement x_FooBarLit11 + = new Statement(foo, bar, mkLit("11", bar), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 11", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit11 + })); + +// differ in file names, which is right in the new test environment +// XURI xFile = URI.createNS(xContext, file, "/" + contentPath); +// Statement x_FileBarLit12 = +// new Statement(xFile, bar, mkLit("12"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); +// result = xRep.getStatementRDFa(xPara); +// assertTrue("RDFa: 12", +// !result.Second && +// eq(result.First, new Statement[] { +// x_FileBarLit12 +// })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 13", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLit + })); + + Statement x_FooLabelLit14 = + new Statement(foo, rdfs_label, mkLit("14"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 14", + result.Second && + eq(result.First, new Statement[] { + /* x_FooLabelLit14 */ x_FooBarLit + })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 15", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 16", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 17", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 18", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 19", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface( + XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 20", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface( + XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 21", eq(result.First, new Statement[] { } )); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + close(xComp); + } + return xComp; + } + + +// utilities ------------------------------------------------------------- + + public void report2(Exception e) + { + if (e instanceof WrappedTargetException) + { + System.out.println("Cause:"); + Exception cause = (Exception) + (((WrappedTargetException)e).TargetException); + System.out.println(cause.toString()); + report2(cause); + } else if (e instanceof WrappedTargetRuntimeException) { + System.out.println("Cause:"); + Exception cause = (Exception) + (((WrappedTargetRuntimeException)e).TargetException); + System.out.println(cause.toString()); + report2(cause); + } + } + + public void report(Exception e) { + System.out.println("Exception occurred:"); + e.printStackTrace(); + report2(e); + fail(); + } + + static void close(XComponent i_comp) + { + try { + XCloseable xClos = UnoRuntime.queryInterface(XCloseable.class, i_comp); + if (xClos != null) + { + xClos.close(true); + } + } catch (Exception e) { + } + } + + XLiteral mkLit(String i_content) + { + return Literal.create(xContext, i_content); + } + + XLiteral mkLit(String i_content, XURI i_uri) + { + return Literal.createWithType(xContext, i_content, i_uri); + } + + static Statement[] merge(Statement[] i_A1, Statement[] i_A2) + { + // bah, java sucks... + Statement[] ret = new Statement[i_A1.length + i_A2.length]; + for (int i = 0; i < i_A1.length; ++i) { + ret[i] = i_A1[i]; + } + for (int i = 0; i < i_A2.length; ++i) { + ret[i+i_A1.length] = i_A2[i]; + } + return ret; + } + + public static String toS(XNode n) { + if (null == n) + { + return "< null >"; + } + return n.getStringValue(); + } + + static boolean isBlank(XNode i_node) + { + XBlankNode blank = UnoRuntime.queryInterface(XBlankNode.class, i_node); + return blank != null; + } + +/* + static class Statement implements XStatement + { + XResource m_Subject; + XResource m_Predicate; + XNode m_Object; + XURI m_Graph; + + Statement(XResource i_Subject, XResource i_Predicate, XNode i_Object, + XURI i_Graph) + { + m_Subject = i_Subject; + m_Predicate = i_Predicate; + m_Object = i_Object; + m_Graph = i_Graph; + } + + public XResource getSubject() { return m_Subject; } + public XResource getPredicate() { return m_Predicate; } + public XNode getObject() { return m_Object; } + public XURI getGraph() { return m_Graph; } + } +*/ + + static Statement[] toSeq(XEnumeration i_Enum) throws Exception + { + java.util.Collection c = new java.util.Vector(); + while (i_Enum.hasMoreElements()) { + Statement s = (Statement) i_Enum.nextElement(); +//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); + c.add(s); + } +// return (Statement[]) c.toArray(); + // java sucks + Object[] arr = c.toArray(); + Statement[] ret = new Statement[arr.length]; + for (int i = 0; i < arr.length; ++i) { + ret[i] = (Statement) arr[i]; + } + return ret; + } + + static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception + { + java.util.Collection c = new java.util.Vector(); + while (i_Enum.hasMoreElements()) { + XNode[] s = (XNode[]) i_Enum.nextElement(); + c.add(s); + } +// return (XNode[][]) c.toArray(); + Object[] arr = c.toArray(); + XNode[][] ret = new XNode[arr.length][]; + for (int i = 0; i < arr.length; ++i) { + ret[i] = (XNode[]) arr[i]; + } + return ret; + } + + static class BindingComp implements java.util.Comparator + { + public int compare(Object i_Left, Object i_Right) + { + XNode[] left = (XNode[]) i_Left; + XNode[] right = (XNode[]) i_Right; + if (left.length != right.length) + { + throw new RuntimeException(); + } + for (int i = 0; i < left.length; ++i) { + int eq = (left[i].getStringValue().compareTo( + right[i].getStringValue())); + if (eq != 0) + { + return eq; + } + } + return 0; + } + } + + static class StmtComp implements java.util.Comparator + { + public int compare(Object i_Left, Object i_Right) + { + int eq; + Statement left = (Statement) i_Left; + Statement right = (Statement) i_Right; + if ((eq = cmp(left.Graph, right.Graph )) != 0) return eq; + if ((eq = cmp(left.Subject, right.Subject )) != 0) return eq; + if ((eq = cmp(left.Predicate, right.Predicate)) != 0) return eq; + if ((eq = cmp(left.Object, right.Object )) != 0) return eq; + return 0; + } + + public int cmp(XNode i_Left, XNode i_Right) + { + if (isBlank(i_Left)) { + return isBlank(i_Right) ? 0 : 1; + } else { + if (isBlank(i_Right)) { + return -1; + } else { + return toS(i_Left).compareTo(toS(i_Right)); + } + } + } + } + + static boolean eq(Statement i_Left, Statement i_Right) + { + XURI lG = i_Left.Graph; + XURI rG = i_Right.Graph; + if (!eq(lG, rG)) { + System.out.println("Graphs differ: " + toS(lG) + " != " + toS(rG)); + return false; + } + if (!eq(i_Left.Subject, i_Right.Subject)) { + System.out.println("Subjects differ: " + + i_Left.Subject.getStringValue() + " != " + + i_Right.Subject.getStringValue()); + return false; + } + if (!eq(i_Left.Predicate, i_Right.Predicate)) { + System.out.println("Predicates differ: " + + i_Left.Predicate.getStringValue() + " != " + + i_Right.Predicate.getStringValue()); + return false; + } + if (!eq(i_Left.Object, i_Right.Object)) { + System.out.println("Objects differ: " + + i_Left.Object.getStringValue() + " != " + + i_Right.Object.getStringValue()); + return false; + } + return true; + } + + static boolean eq(Statement[] i_Result, Statement[] i_Expected) + { + if (i_Result.length != i_Expected.length) { + System.out.println("eq: different lengths: " + i_Result.length + " " + + i_Expected.length); + return false; + } + Statement[] expected = (Statement[]) + java.util.Arrays.asList(i_Expected).toArray(); + java.util.Arrays.sort(i_Result, new StmtComp()); + java.util.Arrays.sort(expected, new StmtComp()); + for (int i = 0; i < expected.length; ++i) + { + // This is better for debug! + final Statement a = i_Result[i]; + final Statement b = expected[i]; + final boolean cond = eq(a, b); + if (!cond) return false; + } + return true; + } + + static boolean eq(XEnumeration i_Enum, Statement[] i_Expected) + throws Exception + { + Statement[] current = toSeq(i_Enum); + return eq(current, i_Expected); + } + + static boolean eq(XNode i_Left, XNode i_Right) + { + if (i_Left == null) { + return (i_Right == null); + } else { + return (i_Right != null) && + (i_Left.getStringValue().equals(i_Right.getStringValue()) + // FIXME: hack: blank nodes considered equal + || (isBlank(i_Left) && isBlank(i_Right))); + } + } + + static boolean eq(XQuerySelectResult i_Result, + String[] i_Vars, XNode[][] i_Bindings) throws Exception + { + String[] vars = i_Result.getBindingNames(); + XEnumeration iter = (XEnumeration) i_Result; + XNode[][] bindings = toSeqs(iter); + if (vars.length != i_Vars.length) { + System.out.println("var lengths differ"); + return false; + } + if (bindings.length != i_Bindings.length) { + System.out.println("binding lengths differ: " + i_Bindings.length + + " vs " + bindings.length ); + return false; + } + java.util.Arrays.sort(bindings, new BindingComp()); + java.util.Arrays.sort(i_Bindings, new BindingComp()); + for (int i = 0; i < i_Bindings.length; ++i) { + if (i_Bindings[i].length != i_Vars.length) { + System.out.println("TEST ERROR!"); + throw new Exception(); + } + if (bindings[i].length != i_Vars.length) { + System.out.println("binding length and var length differ"); + return false; + } + for (int j = 0; j < i_Vars.length; ++j) { + if (!eq(bindings[i][j], i_Bindings[i][j])) { + System.out.println("bindings differ: " + + toS(bindings[i][j]) + " != " + toS(i_Bindings[i][j])); + return false; + } + } + } + for (int i = 0; i < i_Vars.length; ++i) { + if (!vars[i].equals(i_Vars[i])) { + System.out.println("variable names differ: " + + vars[i] + " != " + i_Vars[i]); + return false; + } + } + return true; + } + + static boolean eq(StringPair i_Left, StringPair i_Right) + { + return ((i_Left.First).equals(i_Right.First)) && + ((i_Left.Second).equals(i_Right.Second)); + } + + static String mkNamespace(String i_prefix, String i_namespace) + { + return "PREFIX " + i_prefix + ": <" + i_namespace + ">\n"; + } + + static String mkNss() + { + String namespaces = mkNamespace("rdf", + "http://www.w3.org/1999/02/22-rdf-syntax-ns#"); + namespaces += mkNamespace("pkg", + "http://docs.oasis-open.org/opendocument/meta/package/common#"); + namespaces += mkNamespace("odf", + "http://docs.oasis-open.org/opendocument/meta/package/odf#"); + return namespaces; + } + + Statement[] getManifestStmts(XURI xBaseURI) throws Exception + { + XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), + manifestPath); + XURI xContent = URI.createNS(xContext, xBaseURI.getStringValue(), + contentPath); + XURI xStyles = URI.createNS(xContext, xBaseURI.getStringValue(), + stylesPath); + Statement xM_BaseTypeDoc = + new Statement(xBaseURI, rdf_type, pkg_Document, xManifest); + Statement xM_BaseHaspartContent = + new Statement(xBaseURI, pkg_hasPart, xContent, xManifest); + Statement xM_BaseHaspartStyles = + new Statement(xBaseURI, pkg_hasPart, xStyles, xManifest); + Statement xM_ContentTypeContent = + new Statement(xContent, rdf_type, odf_ContentFile, xManifest); + Statement xM_StylesTypeStyles = + new Statement(xStyles, rdf_type, odf_StylesFile, xManifest); + return new Statement[] { + xM_BaseTypeDoc, xM_BaseHaspartContent, xM_BaseHaspartStyles, + xM_ContentTypeContent, xM_StylesTypeStyles + }; + } + + Statement[] getMetadataFileStmts(XURI xBaseURI, String Path) + throws Exception + { + XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), + manifestPath); + XURI xGraph = URI.createNS(xContext, xBaseURI.getStringValue(), Path); + Statement xM_BaseHaspartGraph = + new Statement(xBaseURI, pkg_hasPart, xGraph, xManifest); + Statement xM_GraphTypeMetadata = + new Statement(xGraph, rdf_type, pkg_MetadataFile, xManifest); + return new Statement[] { xM_BaseHaspartGraph, xM_GraphTypeMetadata }; + } + + class TestRange implements XTextRange, XMetadatable, XServiceInfo + { + String m_Stream; + String m_XmlId; + String m_Text; + TestRange(String i_Str) { m_Text = i_Str; } + + public String getStringValue() { return ""; } + public String getNamespace() { return ""; } + public String getLocalName() { return ""; } + + public StringPair getMetadataReference() + { + return new StringPair(m_Stream, m_XmlId); + } + public void setMetadataReference(StringPair i_Ref) + throws IllegalArgumentException + { + m_Stream = i_Ref.First; + m_XmlId = i_Ref.Second; + } + public void ensureMetadataReference() + { + m_Stream = "content.xml"; + m_XmlId = "42"; + } + + public String getImplementationName() { return null; } + public String[] getSupportedServiceNames() { return null; } + public boolean supportsService(String i_Svc) + { + return i_Svc.equals("com.sun.star.text.Paragraph"); + } + + public XText getText() { return null; } + public XTextRange getStart() { return null; } + public XTextRange getEnd() { return null; } + public String getString() { return m_Text; } + public void setString(String i_Str) { m_Text = i_Str; } + } + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection() DocumentMetadataAccessTest"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} + diff --git a/sfx2/qa/complex/framework/TestDocument.java b/sfx2/qa/complex/framework/TestDocument.java new file mode 100644 index 000000000000..8cc6ef7756b1 --- /dev/null +++ b/sfx2/qa/complex/framework/TestDocument.java @@ -0,0 +1,39 @@ +/************************************************************************* +* +* 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. +* +************************************************************************/ + +package complex.framework; + +import java.io.File; +import org.openoffice.test.OfficeFileUrl; + +final class TestDocument { + public static String getUrl(String name) { + return OfficeFileUrl.getAbsolute(new File("testdocuments", name)); + } + + private TestDocument() {} +} diff --git a/sfx2/qa/complex/framework/makefile.mk b/sfx2/qa/complex/framework/makefile.mk new file mode 100644 index 000000000000..1b74cad15ea8 --- /dev/null +++ b/sfx2/qa/complex/framework/makefile.mk @@ -0,0 +1,65 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ = ../../.. +PRJNAME = sfx2 +TARGET = qa_complex_framework + +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/framework +JAVATESTFILES = \ + DocumentMetadataAccessTest.java \ + DocumentMetaData.java \ + CheckGlobalEventBroadcaster_writer1.java + +JAVAFILES = $(JAVATESTFILES) \ + TestDocument.java + + +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) + +SUBDIRS = DocHelper + +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y + +.END + +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk + +ALLTAR : javatest + +.END + + diff --git a/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt b/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt new file mode 100644 index 000000000000..831a8f451dfd Binary files /dev/null and b/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt differ diff --git a/sfx2/qa/complex/framework/testdocuments/TEST.odt b/sfx2/qa/complex/framework/testdocuments/TEST.odt new file mode 100644 index 000000000000..7c6f0b60f7b0 Binary files /dev/null and b/sfx2/qa/complex/framework/testdocuments/TEST.odt differ diff --git a/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt b/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt new file mode 100644 index 000000000000..d59739142df6 Binary files /dev/null and b/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt differ diff --git a/sfx2/qa/complex/framework/testdocuments/empty.rdf b/sfx2/qa/complex/framework/testdocuments/empty.rdf new file mode 100644 index 000000000000..af62bab39dfa --- /dev/null +++ b/sfx2/qa/complex/framework/testdocuments/empty.rdf @@ -0,0 +1,13 @@ + + + + + + + diff --git a/sfx2/qa/complex/makefile.mk b/sfx2/qa/complex/makefile.mk deleted file mode 100644 index b8bc897fccf7..000000000000 --- a/sfx2/qa/complex/makefile.mk +++ /dev/null @@ -1,61 +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. -# -#************************************************************************* - -PRJ = ..$/.. -TARGET = CheckGlobalEventBroadcaster_writer1 -PRJNAME = $(TARGET) -PACKAGE = complex$/framework - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = CheckGlobalEventBroadcaster_writer1.java \ - DocumentMetaData.java \ - DocumentMetadataAccessTest.java - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -SUBDIRS = DocHelper -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - -run: - +java -cp $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -sce tests.sce -tdoc $(PWD)$/testdocuments diff --git a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java index 0136f8941df5..29fcaba8cb7a 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java +++ b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java @@ -26,44 +26,76 @@ ************************************************************************/ package complex.standalonedocumentinfo; -import complexlib.ComplexTestCase; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + /* Document here */ -public class StandaloneDocumentInfoUnitTest extends ComplexTestCase { +public class StandaloneDocumentInfoUnitTest { private XMultiServiceFactory m_xMSF = null; - public String[] getTestMethodNames() { - return new String[] { - "ExecuteTest01"}; - } +// public String[] getTestMethodNames() { +// return new String[] { +// "ExecuteTest01"}; +// } - public String[] getTestObjectNames() { - return new String[] {"StandaloneDocumentInfoUnitTest"}; - } +// public String[] getTestObjectNames() { +// return new String[] {"StandaloneDocumentInfoUnitTest"}; +// } - public void before() { + @Before public void before() { try { - m_xMSF = (XMultiServiceFactory)param.getMSF(); + m_xMSF = getMSF(); } catch(Exception e) { - failed( "Failed to create service factory!" ); + fail( "Failed to create service factory!" ); } if( m_xMSF ==null ) { - failed( "Failed to create service factory!" ); + fail( "Failed to create service factory!" ); } } - public void after() { + @After public void after() { m_xMSF = null; } - public void ExecuteTest01() { - StandaloneDocumentInfoTest aTest = new Test01 (m_xMSF, log); - assure( "Test01 failed!", aTest.test() ); + @Test public void ExecuteTest01() { + StandaloneDocumentInfoTest aTest = new Test01 (m_xMSF); + assertTrue( "Test01 failed!", aTest.test() ); + } + + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/sfx2/qa/complex/standalonedocumentinfo/Test01.java b/sfx2/qa/complex/standalonedocumentinfo/Test01.java index 92c59d81e1c4..2f9a6266b4e2 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/Test01.java +++ b/sfx2/qa/complex/standalonedocumentinfo/Test01.java @@ -26,14 +26,6 @@ ************************************************************************/ package complex.standalonedocumentinfo; -import com.sun.star.beans.Property; -import com.sun.star.beans.XProperty; -import com.sun.star.beans.XPropertySetInfo; -import com.sun.star.io.IOException; -import com.sun.star.io.XInputStream; -import com.sun.star.io.XOutputStream; -import complexlib.ComplexTestCase; - import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.document.XStandaloneDocumentInfo; import com.sun.star.io.XTempFile; @@ -43,19 +35,15 @@ import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertySet; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.AnyConverter; -import com.sun.star.task.ErrorCodeIOException; -import java.util.Properties; -import java.util.Random; -import share.LogWriter; public class Test01 implements StandaloneDocumentInfoTest { XMultiServiceFactory m_xMSF = null; TestHelper m_aTestHelper = null; - public Test01 ( XMultiServiceFactory xMSF, LogWriter aLogWriter ) { + public Test01 ( XMultiServiceFactory xMSF ) { m_xMSF = xMSF; - m_aTestHelper = new TestHelper( aLogWriter, "Test01: " ); + m_aTestHelper = new TestHelper( "Test01: " ); } public boolean test() { @@ -71,19 +59,16 @@ public class Test01 implements StandaloneDocumentInfoTest { m_aTestHelper.Message ( "==============================" ); //create a new temporary file Object oTempFile = m_xMSF.createInstance ( "com.sun.star.io.TempFile" ); - XTempFile xTempFile = (XTempFile) UnoRuntime.queryInterface ( - XTempFile.class, oTempFile ); + XTempFile xTempFile = UnoRuntime.queryInterface(XTempFile.class, oTempFile); //create a text document and initiallize it Object oTextDocument = m_xMSF.createInstance ( "com.sun.star.text.TextDocument" ); - XLoadable xLoadable = (XLoadable) UnoRuntime.queryInterface ( - XLoadable.class, oTextDocument ); + XLoadable xLoadable = UnoRuntime.queryInterface(XLoadable.class, oTextDocument); xLoadable.initNew(); m_aTestHelper.Message ( "New document initialized." ); //store the instance to the temporary file URL - XStorable xStorable = (XStorable) UnoRuntime.queryInterface ( - XStorable.class, oTextDocument ); + XStorable xStorable = UnoRuntime.queryInterface(XStorable.class, oTextDocument); String sURL = AnyConverter.toString ( xTempFile.getUri () ); PropertyValue aProps[] = new PropertyValue[2]; aProps[0] = new PropertyValue(); @@ -101,15 +86,13 @@ public class Test01 implements StandaloneDocumentInfoTest { Object oStandaloneDocInfo = m_xMSF.createInstance ( "com.sun.star.document.StandaloneDocumentInfo" ); XStandaloneDocumentInfo xStandaloneDocInfo = - (XStandaloneDocumentInfo) UnoRuntime.queryInterface ( - XStandaloneDocumentInfo.class, oStandaloneDocInfo ); + UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo); xStandaloneDocInfo.loadFromURL ( sURL ); m_aTestHelper.Message ( "StandaloneDocumentInfo loaded." ); //get the title from the object and check it XPropertySet xPropSet = - (XPropertySet)UnoRuntime.queryInterface ( - XPropertySet.class, oStandaloneDocInfo ); + UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo); String sTitle = xPropSet.getPropertyValue ( "Title" ).toString (); m_aTestHelper.Message ( "Get title: " + sTitle ); if ( sTitle.compareTo ( sDocTitle[i] ) != 0 ) { @@ -134,14 +117,12 @@ public class Test01 implements StandaloneDocumentInfoTest { Object oStandaloneDocInfo_ = m_xMSF.createInstance ( "com.sun.star.document.StandaloneDocumentInfo" ); XStandaloneDocumentInfo xStandaloneDocInfo_ = - (XStandaloneDocumentInfo)UnoRuntime.queryInterface ( - XStandaloneDocumentInfo.class, oStandaloneDocInfo_ ); + UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo_); xStandaloneDocInfo_.loadFromURL ( sURL ); m_aTestHelper.Message ( "New StandaloneDocumentInfo loaded." ); //get the title and check it - XPropertySet xPropSet_ = (XPropertySet)UnoRuntime.queryInterface ( - XPropertySet.class, oStandaloneDocInfo_ ); + XPropertySet xPropSet_ = UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo_); String sTitle_ = xPropSet_.getPropertyValue ( "Title" ).toString (); m_aTestHelper.Message ( "Get new title: " + sTitle_ ); if ( sTitle_.compareTo ( sTitle ) != 0 ) { diff --git a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java b/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java index f319fe412227..f6d63e1b7793 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java +++ b/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java @@ -26,23 +26,23 @@ ************************************************************************/ package complex.standalonedocumentinfo; -import share.LogWriter; public class TestHelper { - LogWriter m_aLogWriter; + String m_sTestPrefix; - /** Creates a new instance of TestHelper */ - public TestHelper ( LogWriter aLogWriter, String sTestPrefix ) { - m_aLogWriter = aLogWriter; + /** Creates a new instance of TestHelper + * @param sTestPrefix + */ + public TestHelper ( String sTestPrefix ) { m_sTestPrefix = sTestPrefix; } public void Error ( String sError ) { - m_aLogWriter.println ( m_sTestPrefix + "Error: " + sError ); + System.out.println ( m_sTestPrefix + "Error: " + sError ); } public void Message ( String sMessage ) { - m_aLogWriter.println ( m_sTestPrefix + sMessage ); + System.out.println ( m_sTestPrefix + sMessage ); } } diff --git a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk index c65556aeb763..aade48dbd789 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk +++ b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk @@ -25,61 +25,32 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = StandaloneDocumentInfoUnitTest -PRJNAME = binfilter -PACKAGE = complex$/standalonedocumentinfo - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar - -JAVAFILES =\ - StandaloneDocumentInfoUnitTest.java\ - StandaloneDocumentInfoTest.java\ - Test01.java\ - TestHelper.java\ - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Parameters for the test -------------------------------------- - -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: .ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF -# test base is java complex -CT_TESTBASE = -TestBase java_complex +PRJ = ../../.. +PRJNAME = sfx2 +TARGET = qa_complex_standalonedocumentinfo -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/standalonedocumentinfo +JAVATESTFILES = \ + StandaloneDocumentInfoUnitTest.java -# start the runner application -CT_APP = org.openoffice.Runner +JAVAFILES = $(JAVATESTFILES) \ + StandaloneDocumentInfoTest.java \ + Test01.java \ + TestHelper.java -# --- Targets ------------------------------------------------------ +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) +.END +.INCLUDE: settings.mk .INCLUDE: target.mk +.INCLUDE: installationtest.mk -RUN: run - -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) - - +ALLTAR : javatest +.END diff --git a/sfx2/qa/complex/testdocuments/CUSTOM.odt b/sfx2/qa/complex/testdocuments/CUSTOM.odt deleted file mode 100644 index 831a8f451dfd..000000000000 Binary files a/sfx2/qa/complex/testdocuments/CUSTOM.odt and /dev/null differ diff --git a/sfx2/qa/complex/testdocuments/TEST.odt b/sfx2/qa/complex/testdocuments/TEST.odt deleted file mode 100644 index 7c6f0b60f7b0..000000000000 Binary files a/sfx2/qa/complex/testdocuments/TEST.odt and /dev/null differ diff --git a/sfx2/qa/complex/testdocuments/TESTRDFA.odt b/sfx2/qa/complex/testdocuments/TESTRDFA.odt deleted file mode 100644 index d59739142df6..000000000000 Binary files a/sfx2/qa/complex/testdocuments/TESTRDFA.odt and /dev/null differ -- cgit v1.2.3 From 380197840a23e7930a7223ddfa5b6546c54fc479 Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Mon, 14 Jun 2010 13:40:46 +0200 Subject: sb123:#i111449# add TODO --- sfx2/qa/complex/docinfo/DocumentProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2') diff --git a/sfx2/qa/complex/docinfo/DocumentProperties.java b/sfx2/qa/complex/docinfo/DocumentProperties.java index afa188e20901..0c4eb44c4a35 100644 --- a/sfx2/qa/complex/docinfo/DocumentProperties.java +++ b/sfx2/qa/complex/docinfo/DocumentProperties.java @@ -73,7 +73,7 @@ public class DocumentProperties assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); - + // TODO: need other temp directory! String tempdir = System.getProperty("java.io.tmpdir"); String fs = System.getProperty("file.separator"); -- cgit v1.2.3 From 973a452d8a84412ffed3380e4e9f51b5bf9f0e66 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 18 Jun 2010 16:44:10 +0200 Subject: sb123: #i112473#: DocumentMetadataAccessTest.java: re-activate disabled test --- .../complex/framework/DocumentMetadataAccessTest.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'sfx2') diff --git a/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java index 0ebbbc25da59..3f61cb21b3dd 100644 --- a/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java +++ b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java @@ -798,17 +798,16 @@ public class DocumentMetadataAccessTest x_FooBarLit11 })); -// differ in file names, which is right in the new test environment -// XURI xFile = URI.createNS(xContext, file, "/" + contentPath); -// Statement x_FileBarLit12 = -// new Statement(xFile, bar, mkLit("12"), null); + XURI xFile = URI.createNS(xContext, file, "/" + contentPath); + Statement x_FileBarLit12 = + new Statement(xFile, bar, mkLit("12"), null); xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); -// result = xRep.getStatementRDFa(xPara); -// assertTrue("RDFa: 12", -// !result.Second && -// eq(result.First, new Statement[] { -// x_FileBarLit12 -// })); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 12", + !result.Second && + eq(result.First, new Statement[] { + x_FileBarLit12 + })); xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); -- cgit v1.2.3 From a5b90aef59991be1c4436ce8bafdc7b1bf45f949 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 18 Jun 2010 17:07:20 +0200 Subject: sb123: rename DocumentMetaData.java to DocumentPropertiesTest.java --- sfx2/qa/complex/framework/DocumentMetaData.java | 565 --------------------- .../complex/framework/DocumentPropertiesTest.java | 565 +++++++++++++++++++++ sfx2/qa/complex/framework/makefile.mk | 2 +- 3 files changed, 566 insertions(+), 566 deletions(-) delete mode 100644 sfx2/qa/complex/framework/DocumentMetaData.java create mode 100644 sfx2/qa/complex/framework/DocumentPropertiesTest.java (limited to 'sfx2') diff --git a/sfx2/qa/complex/framework/DocumentMetaData.java b/sfx2/qa/complex/framework/DocumentMetaData.java deleted file mode 100644 index c94d2f64e768..000000000000 --- a/sfx2/qa/complex/framework/DocumentMetaData.java +++ /dev/null @@ -1,565 +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. - * - ************************************************************************/ - -package complex.framework; - - -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.lang.XInitialization; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.Locale; -import com.sun.star.lang.EventObject; -import com.sun.star.util.Date; -import com.sun.star.util.DateTime; -import com.sun.star.util.Time; -import com.sun.star.util.Duration; -import com.sun.star.util.XModifyListener; -import com.sun.star.util.XModifyBroadcaster; -import com.sun.star.beans.XPropertyContainer; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.NamedValue; -import com.sun.star.beans.PropertyAttribute; -import com.sun.star.beans.UnknownPropertyException; -import com.sun.star.beans.IllegalTypeException; - -import com.sun.star.document.XDocumentProperties; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.openoffice.test.OfficeConnection; -import static org.junit.Assert.*; - -/** - * Test case for the service com.sun.star.document.DocumentProperties. - * Currently, this service is implemented in - * sfx2/source/doc/SfxDocumentMetaData.cxx. - * - * @author mst - */ -public class DocumentMetaData -{ -// public String[] getTestMethodNames () { -// return new String[] { "check", "cleanup" }; -// } - - @After public void cleanup() { - // nothing to do - } - - // for testing modifications - class Listener implements XModifyListener { - private boolean m_Called; - - public Listener() { - m_Called = false; - } - - public boolean reset() { - boolean oldCalled = m_Called; - m_Called = false; - return oldCalled; - } - - public void modified(EventObject e) { - m_Called = true; - } - - public void disposing(EventObject e) { - } - } - - @Test public void check() { - try { - XMultiServiceFactory xMSF = getMSF(); - assertNotNull("could not create MultiServiceFactory.", xMSF); - XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); - Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); - XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); - assertNotNull("could not get component context.", xContext); - - // TODO: Path to temp - String temp = util.utils.getOfficeTemp/*Dir*/(xMSF); - System.out.println("tempdir: " + temp); - - PropertyValue[] noArgs = { }; - PropertyValue mimetype = new PropertyValue(); - mimetype.Name = "MediaType"; - mimetype.Value = "application/vnd.oasis.opendocument.text"; - PropertyValue[] mimeArgs = { mimetype }; -// new Any("application/vnd.oasis.opendocument.text")) }; - PropertyValue cfile = new PropertyValue(); - cfile.Name = "URL"; - cfile.Value = temp + "EMPTY.odt"; - PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; - - System.out.println("Creating service DocumentProperties..."); - - Object oDP = -// xMSF.createInstanceWithContext( -// "com.sun.star.document.DocumentProperties", xContext); - xMSF.createInstance("com.sun.star.document.DocumentProperties"); - XDocumentProperties xDP = UnoRuntime.queryInterface(XDocumentProperties.class, oDP); - - System.out.println("...done"); - - - System.out.println("Checking initialize ..."); - - XDocumentProperties xDP2 = UnoRuntime.queryInterface(XDocumentProperties.class, xMSF.createInstance("com.sun.star.document.DocumentProperties")); - XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xDP2); - xInit.initialize(new Object[] { }); - - System.out.println("...done"); - - System.out.println("Checking storing default-initialized meta data ..."); - -// xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); - xDP2.storeToMedium("", mimeEmptyArgs); - - System.out.println("...done"); - - System.out.println("Checking loading default-initialized meta data ..."); - -// xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); - xDP2.loadFromMedium("", mimeEmptyArgs); - assertTrue ("Author", "".equals(xDP2.getAuthor())); - - System.out.println("...done"); - - System.out.println("(Not) Checking preservation of custom meta data ..."); - - xDP2.loadFromMedium(TestDocument.getUrl("CUSTOM.odt"), - noArgs); - assertTrue ("Author", "".equals(xDP2.getAuthor())); - xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs); - - //FIXME: now what? comparing for binary equality seems useless - // we could unzip the written file and grep for the custom stuff - // but would that work on windows... - - System.out.println("...done"); - - System.out.println("Checking loading from test document..."); - - String file = TestDocument.getUrl("TEST.odt"); - xDP.loadFromMedium(file, noArgs); -/* XInputStream xStream = - new StreamSimulator("./testdocuments/TEST.odt", true, param); - Object oSF = - xMSF.createInstance("com.sun.star.embed.StorageFactory"); - XSingleServiceFactory xSF = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class, oSF); - Object oStor = xSF.createInstanceWithArguments( - new Object[] { xStream }); - XStorage xStor = (XStorage) UnoRuntime.queryInterface( - XStorage.class, oStor); - xDP.loadFromStorage(xStor);*/ - - System.out.println("...done"); - - System.out.println("Checking meta-data import..."); - - assertTrue("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); - assertTrue("Generator", - "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227" - .equals(xDP.getGenerator())); - assertTrue("CreationDate", 2007 == xDP.getCreationDate().Year); - assertTrue("Title", "Urgent Memo".equals(xDP.getTitle())); - assertTrue("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); - assertTrue("Description", - "Modern internal company memorandum in full-blocked style" - .equals(xDP.getDescription())); -// assertTrue("Language", "".equals(xDP.getLanguage())); - assertTrue("ModifiedBy", - "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); - assertTrue("ModificationDate", 10 == xDP.getModificationDate().Month); - assertTrue("PrintedBy", - "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); - assertTrue("PrintDate", 29 == xDP.getPrintDate().Day); - assertTrue("TemplateName", - "Modern Memo".equals(xDP.getTemplateName())); - assertTrue("TemplateURL", - xDP.getTemplateURL().endsWith("memmodern.ott")); - assertTrue("TemplateDate", 17 == xDP.getTemplateDate().Hours); - assertTrue("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); - assertTrue("AutoloadSecs", 0 == xDP.getAutoloadSecs()); - assertTrue("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); - assertTrue("EditingCycles", 3 == xDP.getEditingCycles()); - assertTrue("EditingDuration", 320 == xDP.getEditingDuration()); - - String[] kws = xDP.getKeywords(); - assertTrue("Keywords", fromArray(kws).containsAll( - fromArray(new Object[] { "Asien", "Memo", "Reis" }))); - - NamedValue[] ds = xDP.getDocumentStatistics(); -/* for (int i = 0; i < ds.length; ++i) { - System.out.println("nv: " + ds[i].Name + " " + ds[i].Value); - } - NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); - NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); - System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false... -*/ - assertTrue("DocumentStatistics:WordCount", containsNV(ds, - new NamedValue("WordCount", new Integer(23)))); - assertTrue("DocumentStatistics:PageCount", containsNV(ds, - new NamedValue("PageCount", new Integer(1)))); - - XPropertyContainer udpc = xDP.getUserDefinedProperties(); - XPropertySet udps = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, udpc); - assertTrue("UserDefined 1", "Dies ist ein wichtiger Hinweis" - .equals(udps.getPropertyValue("Hinweis"))); - assertTrue("UserDefined 2", ("Kann Spuren von N" - + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8") - + "ssen enthalten") - .equals(udps.getPropertyValue("Warnung"))); - - System.out.println("...done"); - - System.out.println("Checking meta-data updates..."); - - String str; - DateTime dt = new DateTime(); - Locale l = new Locale(); - int i; - - str = "me"; - xDP.setAuthor(str); - assertTrue("setAuthor", str.equals(xDP.getAuthor())); - str = "the computa"; - xDP.setGenerator(str); - assertTrue("setGenerator", str.equals(xDP.getGenerator())); - dt.Year = 2038; - dt.Month = 1; - dt.Day = 1; - xDP.setCreationDate(dt); - assertTrue("setCreationDate", dt.Year == xDP.getCreationDate().Year); - str = "El t'itulo"; - xDP.setTitle(str); - assertTrue("setTitle", str.equals(xDP.getTitle())); - str = "Ein verkommenes Subjekt"; - xDP.setSubject(str); - assertTrue("setSubject", str.equals(xDP.getSubject())); - str = "Este descripci'on no es importante"; - xDP.setDescription(str); - assertTrue("setDescription", str.equals(xDP.getDescription())); - l.Language = "en"; - l.Country = "GB"; - xDP.setLanguage(l); - Locale l2 = xDP.getLanguage(); - assertTrue("setLanguage Lang", l.Language.equals(l2.Language)); - assertTrue("setLanguage Cty", l.Country.equals(l2.Country)); - str = "myself"; - xDP.setModifiedBy(str); - assertTrue("setModifiedBy", str.equals(xDP.getModifiedBy())); - dt.Year = 2042; - xDP.setModificationDate(dt); - assertTrue("setModificationDate", - dt.Year == xDP.getModificationDate().Year); - str = "i didnt do it"; - xDP.setPrintedBy(str); - assertTrue("setPrintedBy", str.equals(xDP.getPrintedBy())); - dt.Year = 2024; - xDP.setPrintDate(dt); - assertTrue("setPrintDate", dt.Year == xDP.getPrintDate().Year); - str = "blah"; - xDP.setTemplateName(str); - assertTrue("setTemplateName", str.equals(xDP.getTemplateName())); - str = "gopher://some-hole-in-the-ground/"; - xDP.setTemplateURL(str); - assertTrue("setTemplateURL", str.equals(xDP.getTemplateURL())); - dt.Year = 2043; - xDP.setTemplateDate(dt); - assertTrue("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); - str = "http://nowhere/"; - xDP.setAutoloadURL(str); - assertTrue("setAutoloadURL", str.equals(xDP.getAutoloadURL())); - i = 3661; // this might not work (due to conversion via double...) - xDP.setAutoloadSecs(i); -// System.out.println("set: " + i + " get: " + xDP.getAutoloadSecs()); - assertTrue("setAutoloadSecs", i == xDP.getAutoloadSecs()); - str = "_blank"; - xDP.setDefaultTarget(str); - assertTrue("setDefaultTarget", str.equals(xDP.getDefaultTarget())); - i = 42; - xDP.setEditingCycles((short) i); - assertTrue("setEditingCycles", i == xDP.getEditingCycles()); - i = 84; - xDP.setEditingDuration(i); - assertTrue("setEditingDuration", i == xDP.getEditingDuration()); - str = ""; - - String[] kws2 = new String[] { - "keywordly", "keywordlike", "keywordalicious" }; - xDP.setKeywords(kws2); - kws = xDP.getKeywords(); - assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); - - NamedValue[] ds2 = new NamedValue[] { - new NamedValue("SyllableCount", new Integer(9)), - new NamedValue("FrameCount", new Integer(2)), - new NamedValue("SentenceCount", new Integer(7)) }; - xDP.setDocumentStatistics(ds2); - ds = xDP.getDocumentStatistics(); - assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds, - new NamedValue("SyllableCount", new Integer(9)))); - assertTrue("setDocumentStatistics:FrameCount", containsNV(ds, - new NamedValue("FrameCount", new Integer(2)))); - assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds, - new NamedValue("SentenceCount", new Integer(7)))); - - System.out.println("...done"); - - System.out.println("Checking user-defined meta-data updates..."); - - // actually, this tests the PropertyBag service - // but maybe the DocumentProperties service will be implemented - // differently some day... - boolean b = true; - double d = 3.1415; - // note that Time is only supported for backward compatibilty! - Time t = new Time(); - t.Hours = 1; - t.Minutes = 16; - Date date = new Date(); - date.Year = 2071; - date.Month = 2; - date.Day = 3; - dt.Year = 2065; - Duration dur = new Duration(); - dur.Negative = true; - dur.Years = 1001; - dur.Months = 999; - dur.Days = 888; - dur.Hours = 777; - dur.Minutes = 666; - dur.Seconds = 555; - dur.MilliSeconds = 444; - - udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, - new Boolean(b)); - udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur); - udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t); - udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date); - udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE, dt); - udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new Double(d)); - udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar"); - udpc.addProperty("Removed", PropertyAttribute.REMOVEABLE, "bar"); - // #i94175#: empty property name is valid ODF 1.1 - udpc.addProperty("", PropertyAttribute.REMOVEABLE, "eeeeek"); - try { - udpc.removeProperty("Info 1"); - udpc.removeProperty("Removed"); - } catch (UnknownPropertyException e) { - fail("removeProperty failed"); - } - - try { - udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, - new String[] { "foo", "bar" }); - fail("inserting value of non-supported type did not fail"); - } catch (IllegalTypeException e) { - // ignore - } - - assertTrue("UserDefined bool", new Boolean(b).equals( - udps.getPropertyValue("Frobnicate"))); - assertTrue("UserDefined duration", eqDuration(dur, (Duration) - udps.getPropertyValue("FrobDuration"))); - assertTrue("UserDefined time", eqTime(t, (Time) - udps.getPropertyValue("FrobDuration2"))); - assertTrue("UserDefined date", eqDate(date, (Date) - udps.getPropertyValue("FrobEndDate"))); - assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) - udps.getPropertyValue("FrobStartTime"))); - assertTrue("UserDefined float", new Double(d).equals( - udps.getPropertyValue("Pi"))); - assertTrue("UserDefined string", "bar".equals( - udps.getPropertyValue("Foo"))); - assertTrue("UserDefined empty name", "eeeeek".equals( - udps.getPropertyValue(""))); - - try { - udps.getPropertyValue("Removed"); - fail("UserDefined remove didn't"); - } catch (UnknownPropertyException e) { - // ok - } - - System.out.println("...done"); - - System.out.println("Checking storing meta-data to file..."); - - xDP.storeToMedium(temp + "TEST.odt", mimeArgs); - - System.out.println("...done"); - - System.out.println("Checking loading meta-data from stored file..."); - - xDP.loadFromMedium(temp + "TEST.odt", noArgs); - - System.out.println("...done"); - - System.out.println("Checking user-defined meta-data from stored file..."); - - udpc = xDP.getUserDefinedProperties(); - udps = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, udpc); - - assertTrue("UserDefined bool", new Boolean(b).equals( - udps.getPropertyValue("Frobnicate"))); - assertTrue("UserDefined duration", eqDuration(dur, (Duration) - udps.getPropertyValue("FrobDuration"))); - // this is now a Duration! - Duration t_dur = new Duration(false, (short)0, (short)0, (short)0, - t.Hours, t.Minutes, t.Seconds, - (short)(10 * t.HundredthSeconds)); - assertTrue("UserDefined time", eqDuration(t_dur, (Duration) - udps.getPropertyValue("FrobDuration2"))); - assertTrue("UserDefined date", eqDate(date, (Date) - udps.getPropertyValue("FrobEndDate"))); - assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) - udps.getPropertyValue("FrobStartTime"))); - assertTrue("UserDefined float", new Double(d).equals( - udps.getPropertyValue("Pi"))); - assertTrue("UserDefined string", "bar".equals( - udps.getPropertyValue("Foo"))); - - try { - udps.getPropertyValue("Removed"); - fail("UserDefined remove didn't"); - } catch (UnknownPropertyException e) { - // ok - } - - System.out.println("...done"); - - System.out.println("Checking notification listener interface..."); - - Listener listener = new Listener(); - XModifyBroadcaster xMB = (XModifyBroadcaster) - UnoRuntime.queryInterface(XModifyBroadcaster.class, xDP); - xMB.addModifyListener(listener); - xDP.setAuthor("not me"); - assertTrue("Listener Author", listener.reset()); - udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); - assertTrue("Listener UserDefined Add", listener.reset()); - udps.setPropertyValue("Listener", "bar"); - assertTrue("Listener UserDefined Set", listener.reset()); - udpc.removeProperty("Listener"); - assertTrue("Listener UserDefined Remove", listener.reset()); - xMB.removeModifyListener(listener); - udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); - assertTrue("Removed Listener UserDefined Add", !listener.reset()); - - System.out.println("...done"); - - } catch (Exception e) { - report(e); - } - } - - // grrr... - boolean eqDateTime(DateTime a, DateTime b) { - return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day - && a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.HundredthSeconds == b.HundredthSeconds; - } - - boolean eqDate(Date a, Date b) { - return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day; - } - - boolean eqTime(Time a, Time b) { - return a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.HundredthSeconds == b.HundredthSeconds; - } - - boolean eqDuration(Duration a, Duration b) { - return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days - && a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.MilliSeconds == b.MilliSeconds - && a.Negative == b.Negative; - } - - java.util.Collection fromArray(Object[] os) { - java.util.Collection ret = new java.util.HashSet(); - for (int i = 0; i < os.length; ++i) { - ret.add(os[i]); - } - return ret; - } - - // bah, structs do not have proper equals(), and uno.Type is not comparable - public static boolean containsNV (NamedValue[] nvs, NamedValue nv) { - for (int i = 0; i < nvs.length; ++i) { - if (nvs[i].Name.equals(nv.Name) && nvs[i].Value.equals(nv.Value)) { - return true; - } - } - return false; - } - - public void report(Exception e) { - System.out.println("Exception occurred:"); - e.printStackTrace(); - fail(); - } - - - private XMultiServiceFactory getMSF() - { - final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); - return xMSF1; - } - - // setup and close connections - @BeforeClass public static void setUpConnection() throws Exception { - System.out.println("setUpConnection()"); - connection.setUp(); - } - - @AfterClass public static void tearDownConnection() - throws InterruptedException, com.sun.star.uno.Exception - { - System.out.println("tearDownConnection() DocumentMetaData"); - connection.tearDown(); - } - - private static final OfficeConnection connection = new OfficeConnection(); - -} - diff --git a/sfx2/qa/complex/framework/DocumentPropertiesTest.java b/sfx2/qa/complex/framework/DocumentPropertiesTest.java new file mode 100644 index 000000000000..20a0746c8322 --- /dev/null +++ b/sfx2/qa/complex/framework/DocumentPropertiesTest.java @@ -0,0 +1,565 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +package complex.framework; + + +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XComponentContext; +import com.sun.star.lang.XInitialization; + +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.lang.Locale; +import com.sun.star.lang.EventObject; +import com.sun.star.util.Date; +import com.sun.star.util.DateTime; +import com.sun.star.util.Time; +import com.sun.star.util.Duration; +import com.sun.star.util.XModifyListener; +import com.sun.star.util.XModifyBroadcaster; +import com.sun.star.beans.XPropertyContainer; +import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.NamedValue; +import com.sun.star.beans.PropertyAttribute; +import com.sun.star.beans.UnknownPropertyException; +import com.sun.star.beans.IllegalTypeException; + +import com.sun.star.document.XDocumentProperties; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +/** + * Test case for the service com.sun.star.document.DocumentProperties. + * Currently, this service is implemented in + * sfx2/source/doc/SfxDocumentMetaData.cxx. + * + * @author mst + */ +public class DocumentPropertiesTest +{ +// public String[] getTestMethodNames () { +// return new String[] { "check", "cleanup" }; +// } + + @After public void cleanup() { + // nothing to do + } + + // for testing modifications + class Listener implements XModifyListener { + private boolean m_Called; + + public Listener() { + m_Called = false; + } + + public boolean reset() { + boolean oldCalled = m_Called; + m_Called = false; + return oldCalled; + } + + public void modified(EventObject e) { + m_Called = true; + } + + public void disposing(EventObject e) { + } + } + + @Test public void check() { + try { + XMultiServiceFactory xMSF = getMSF(); + assertNotNull("could not create MultiServiceFactory.", xMSF); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); + Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); + XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); + assertNotNull("could not get component context.", xContext); + + // TODO: Path to temp + String temp = util.utils.getOfficeTemp/*Dir*/(xMSF); + System.out.println("tempdir: " + temp); + + PropertyValue[] noArgs = { }; + PropertyValue mimetype = new PropertyValue(); + mimetype.Name = "MediaType"; + mimetype.Value = "application/vnd.oasis.opendocument.text"; + PropertyValue[] mimeArgs = { mimetype }; +// new Any("application/vnd.oasis.opendocument.text")) }; + PropertyValue cfile = new PropertyValue(); + cfile.Name = "URL"; + cfile.Value = temp + "EMPTY.odt"; + PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; + + System.out.println("Creating service DocumentProperties..."); + + Object oDP = +// xMSF.createInstanceWithContext( +// "com.sun.star.document.DocumentProperties", xContext); + xMSF.createInstance("com.sun.star.document.DocumentProperties"); + XDocumentProperties xDP = UnoRuntime.queryInterface(XDocumentProperties.class, oDP); + + System.out.println("...done"); + + + System.out.println("Checking initialize ..."); + + XDocumentProperties xDP2 = UnoRuntime.queryInterface(XDocumentProperties.class, xMSF.createInstance("com.sun.star.document.DocumentProperties")); + XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xDP2); + xInit.initialize(new Object[] { }); + + System.out.println("...done"); + + System.out.println("Checking storing default-initialized meta data ..."); + +// xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); + xDP2.storeToMedium("", mimeEmptyArgs); + + System.out.println("...done"); + + System.out.println("Checking loading default-initialized meta data ..."); + +// xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); + xDP2.loadFromMedium("", mimeEmptyArgs); + assertTrue ("Author", "".equals(xDP2.getAuthor())); + + System.out.println("...done"); + + System.out.println("(Not) Checking preservation of custom meta data ..."); + + xDP2.loadFromMedium(TestDocument.getUrl("CUSTOM.odt"), + noArgs); + assertTrue ("Author", "".equals(xDP2.getAuthor())); + xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs); + + //FIXME: now what? comparing for binary equality seems useless + // we could unzip the written file and grep for the custom stuff + // but would that work on windows... + + System.out.println("...done"); + + System.out.println("Checking loading from test document..."); + + String file = TestDocument.getUrl("TEST.odt"); + xDP.loadFromMedium(file, noArgs); +/* XInputStream xStream = + new StreamSimulator("./testdocuments/TEST.odt", true, param); + Object oSF = + xMSF.createInstance("com.sun.star.embed.StorageFactory"); + XSingleServiceFactory xSF = (XSingleServiceFactory) + UnoRuntime.queryInterface(XSingleServiceFactory.class, oSF); + Object oStor = xSF.createInstanceWithArguments( + new Object[] { xStream }); + XStorage xStor = (XStorage) UnoRuntime.queryInterface( + XStorage.class, oStor); + xDP.loadFromStorage(xStor);*/ + + System.out.println("...done"); + + System.out.println("Checking meta-data import..."); + + assertTrue("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); + assertTrue("Generator", + "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227" + .equals(xDP.getGenerator())); + assertTrue("CreationDate", 2007 == xDP.getCreationDate().Year); + assertTrue("Title", "Urgent Memo".equals(xDP.getTitle())); + assertTrue("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); + assertTrue("Description", + "Modern internal company memorandum in full-blocked style" + .equals(xDP.getDescription())); +// assertTrue("Language", "".equals(xDP.getLanguage())); + assertTrue("ModifiedBy", + "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); + assertTrue("ModificationDate", 10 == xDP.getModificationDate().Month); + assertTrue("PrintedBy", + "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); + assertTrue("PrintDate", 29 == xDP.getPrintDate().Day); + assertTrue("TemplateName", + "Modern Memo".equals(xDP.getTemplateName())); + assertTrue("TemplateURL", + xDP.getTemplateURL().endsWith("memmodern.ott")); + assertTrue("TemplateDate", 17 == xDP.getTemplateDate().Hours); + assertTrue("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); + assertTrue("AutoloadSecs", 0 == xDP.getAutoloadSecs()); + assertTrue("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); + assertTrue("EditingCycles", 3 == xDP.getEditingCycles()); + assertTrue("EditingDuration", 320 == xDP.getEditingDuration()); + + String[] kws = xDP.getKeywords(); + assertTrue("Keywords", fromArray(kws).containsAll( + fromArray(new Object[] { "Asien", "Memo", "Reis" }))); + + NamedValue[] ds = xDP.getDocumentStatistics(); +/* for (int i = 0; i < ds.length; ++i) { + System.out.println("nv: " + ds[i].Name + " " + ds[i].Value); + } + NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); + NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); + System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false... +*/ + assertTrue("DocumentStatistics:WordCount", containsNV(ds, + new NamedValue("WordCount", new Integer(23)))); + assertTrue("DocumentStatistics:PageCount", containsNV(ds, + new NamedValue("PageCount", new Integer(1)))); + + XPropertyContainer udpc = xDP.getUserDefinedProperties(); + XPropertySet udps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet.class, udpc); + assertTrue("UserDefined 1", "Dies ist ein wichtiger Hinweis" + .equals(udps.getPropertyValue("Hinweis"))); + assertTrue("UserDefined 2", ("Kann Spuren von N" + + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8") + + "ssen enthalten") + .equals(udps.getPropertyValue("Warnung"))); + + System.out.println("...done"); + + System.out.println("Checking meta-data updates..."); + + String str; + DateTime dt = new DateTime(); + Locale l = new Locale(); + int i; + + str = "me"; + xDP.setAuthor(str); + assertTrue("setAuthor", str.equals(xDP.getAuthor())); + str = "the computa"; + xDP.setGenerator(str); + assertTrue("setGenerator", str.equals(xDP.getGenerator())); + dt.Year = 2038; + dt.Month = 1; + dt.Day = 1; + xDP.setCreationDate(dt); + assertTrue("setCreationDate", dt.Year == xDP.getCreationDate().Year); + str = "El t'itulo"; + xDP.setTitle(str); + assertTrue("setTitle", str.equals(xDP.getTitle())); + str = "Ein verkommenes Subjekt"; + xDP.setSubject(str); + assertTrue("setSubject", str.equals(xDP.getSubject())); + str = "Este descripci'on no es importante"; + xDP.setDescription(str); + assertTrue("setDescription", str.equals(xDP.getDescription())); + l.Language = "en"; + l.Country = "GB"; + xDP.setLanguage(l); + Locale l2 = xDP.getLanguage(); + assertTrue("setLanguage Lang", l.Language.equals(l2.Language)); + assertTrue("setLanguage Cty", l.Country.equals(l2.Country)); + str = "myself"; + xDP.setModifiedBy(str); + assertTrue("setModifiedBy", str.equals(xDP.getModifiedBy())); + dt.Year = 2042; + xDP.setModificationDate(dt); + assertTrue("setModificationDate", + dt.Year == xDP.getModificationDate().Year); + str = "i didnt do it"; + xDP.setPrintedBy(str); + assertTrue("setPrintedBy", str.equals(xDP.getPrintedBy())); + dt.Year = 2024; + xDP.setPrintDate(dt); + assertTrue("setPrintDate", dt.Year == xDP.getPrintDate().Year); + str = "blah"; + xDP.setTemplateName(str); + assertTrue("setTemplateName", str.equals(xDP.getTemplateName())); + str = "gopher://some-hole-in-the-ground/"; + xDP.setTemplateURL(str); + assertTrue("setTemplateURL", str.equals(xDP.getTemplateURL())); + dt.Year = 2043; + xDP.setTemplateDate(dt); + assertTrue("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); + str = "http://nowhere/"; + xDP.setAutoloadURL(str); + assertTrue("setAutoloadURL", str.equals(xDP.getAutoloadURL())); + i = 3661; // this might not work (due to conversion via double...) + xDP.setAutoloadSecs(i); +// System.out.println("set: " + i + " get: " + xDP.getAutoloadSecs()); + assertTrue("setAutoloadSecs", i == xDP.getAutoloadSecs()); + str = "_blank"; + xDP.setDefaultTarget(str); + assertTrue("setDefaultTarget", str.equals(xDP.getDefaultTarget())); + i = 42; + xDP.setEditingCycles((short) i); + assertTrue("setEditingCycles", i == xDP.getEditingCycles()); + i = 84; + xDP.setEditingDuration(i); + assertTrue("setEditingDuration", i == xDP.getEditingDuration()); + str = ""; + + String[] kws2 = new String[] { + "keywordly", "keywordlike", "keywordalicious" }; + xDP.setKeywords(kws2); + kws = xDP.getKeywords(); + assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); + + NamedValue[] ds2 = new NamedValue[] { + new NamedValue("SyllableCount", new Integer(9)), + new NamedValue("FrameCount", new Integer(2)), + new NamedValue("SentenceCount", new Integer(7)) }; + xDP.setDocumentStatistics(ds2); + ds = xDP.getDocumentStatistics(); + assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds, + new NamedValue("SyllableCount", new Integer(9)))); + assertTrue("setDocumentStatistics:FrameCount", containsNV(ds, + new NamedValue("FrameCount", new Integer(2)))); + assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds, + new NamedValue("SentenceCount", new Integer(7)))); + + System.out.println("...done"); + + System.out.println("Checking user-defined meta-data updates..."); + + // actually, this tests the PropertyBag service + // but maybe the DocumentProperties service will be implemented + // differently some day... + boolean b = true; + double d = 3.1415; + // note that Time is only supported for backward compatibilty! + Time t = new Time(); + t.Hours = 1; + t.Minutes = 16; + Date date = new Date(); + date.Year = 2071; + date.Month = 2; + date.Day = 3; + dt.Year = 2065; + Duration dur = new Duration(); + dur.Negative = true; + dur.Years = 1001; + dur.Months = 999; + dur.Days = 888; + dur.Hours = 777; + dur.Minutes = 666; + dur.Seconds = 555; + dur.MilliSeconds = 444; + + udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, + new Boolean(b)); + udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur); + udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t); + udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date); + udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE, dt); + udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new Double(d)); + udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar"); + udpc.addProperty("Removed", PropertyAttribute.REMOVEABLE, "bar"); + // #i94175#: empty property name is valid ODF 1.1 + udpc.addProperty("", PropertyAttribute.REMOVEABLE, "eeeeek"); + try { + udpc.removeProperty("Info 1"); + udpc.removeProperty("Removed"); + } catch (UnknownPropertyException e) { + fail("removeProperty failed"); + } + + try { + udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, + new String[] { "foo", "bar" }); + fail("inserting value of non-supported type did not fail"); + } catch (IllegalTypeException e) { + // ignore + } + + assertTrue("UserDefined bool", new Boolean(b).equals( + udps.getPropertyValue("Frobnicate"))); + assertTrue("UserDefined duration", eqDuration(dur, (Duration) + udps.getPropertyValue("FrobDuration"))); + assertTrue("UserDefined time", eqTime(t, (Time) + udps.getPropertyValue("FrobDuration2"))); + assertTrue("UserDefined date", eqDate(date, (Date) + udps.getPropertyValue("FrobEndDate"))); + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) + udps.getPropertyValue("FrobStartTime"))); + assertTrue("UserDefined float", new Double(d).equals( + udps.getPropertyValue("Pi"))); + assertTrue("UserDefined string", "bar".equals( + udps.getPropertyValue("Foo"))); + assertTrue("UserDefined empty name", "eeeeek".equals( + udps.getPropertyValue(""))); + + try { + udps.getPropertyValue("Removed"); + fail("UserDefined remove didn't"); + } catch (UnknownPropertyException e) { + // ok + } + + System.out.println("...done"); + + System.out.println("Checking storing meta-data to file..."); + + xDP.storeToMedium(temp + "TEST.odt", mimeArgs); + + System.out.println("...done"); + + System.out.println("Checking loading meta-data from stored file..."); + + xDP.loadFromMedium(temp + "TEST.odt", noArgs); + + System.out.println("...done"); + + System.out.println("Checking user-defined meta-data from stored file..."); + + udpc = xDP.getUserDefinedProperties(); + udps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet.class, udpc); + + assertTrue("UserDefined bool", new Boolean(b).equals( + udps.getPropertyValue("Frobnicate"))); + assertTrue("UserDefined duration", eqDuration(dur, (Duration) + udps.getPropertyValue("FrobDuration"))); + // this is now a Duration! + Duration t_dur = new Duration(false, (short)0, (short)0, (short)0, + t.Hours, t.Minutes, t.Seconds, + (short)(10 * t.HundredthSeconds)); + assertTrue("UserDefined time", eqDuration(t_dur, (Duration) + udps.getPropertyValue("FrobDuration2"))); + assertTrue("UserDefined date", eqDate(date, (Date) + udps.getPropertyValue("FrobEndDate"))); + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) + udps.getPropertyValue("FrobStartTime"))); + assertTrue("UserDefined float", new Double(d).equals( + udps.getPropertyValue("Pi"))); + assertTrue("UserDefined string", "bar".equals( + udps.getPropertyValue("Foo"))); + + try { + udps.getPropertyValue("Removed"); + fail("UserDefined remove didn't"); + } catch (UnknownPropertyException e) { + // ok + } + + System.out.println("...done"); + + System.out.println("Checking notification listener interface..."); + + Listener listener = new Listener(); + XModifyBroadcaster xMB = (XModifyBroadcaster) + UnoRuntime.queryInterface(XModifyBroadcaster.class, xDP); + xMB.addModifyListener(listener); + xDP.setAuthor("not me"); + assertTrue("Listener Author", listener.reset()); + udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); + assertTrue("Listener UserDefined Add", listener.reset()); + udps.setPropertyValue("Listener", "bar"); + assertTrue("Listener UserDefined Set", listener.reset()); + udpc.removeProperty("Listener"); + assertTrue("Listener UserDefined Remove", listener.reset()); + xMB.removeModifyListener(listener); + udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); + assertTrue("Removed Listener UserDefined Add", !listener.reset()); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + } + } + + // grrr... + boolean eqDateTime(DateTime a, DateTime b) { + return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day + && a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.HundredthSeconds == b.HundredthSeconds; + } + + boolean eqDate(Date a, Date b) { + return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day; + } + + boolean eqTime(Time a, Time b) { + return a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.HundredthSeconds == b.HundredthSeconds; + } + + boolean eqDuration(Duration a, Duration b) { + return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days + && a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.MilliSeconds == b.MilliSeconds + && a.Negative == b.Negative; + } + + java.util.Collection fromArray(Object[] os) { + java.util.Collection ret = new java.util.HashSet(); + for (int i = 0; i < os.length; ++i) { + ret.add(os[i]); + } + return ret; + } + + // bah, structs do not have proper equals(), and uno.Type is not comparable + public static boolean containsNV (NamedValue[] nvs, NamedValue nv) { + for (int i = 0; i < nvs.length; ++i) { + if (nvs[i].Name.equals(nv.Name) && nvs[i].Value.equals(nv.Value)) { + return true; + } + } + return false; + } + + public void report(Exception e) { + System.out.println("Exception occurred:"); + e.printStackTrace(); + fail(); + } + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection() DocumentPropertiesTest"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} + diff --git a/sfx2/qa/complex/framework/makefile.mk b/sfx2/qa/complex/framework/makefile.mk index 1b74cad15ea8..093bc828d4ef 100644 --- a/sfx2/qa/complex/framework/makefile.mk +++ b/sfx2/qa/complex/framework/makefile.mk @@ -36,8 +36,8 @@ TARGET = qa_complex_framework .IF "$(OOO_JUNIT_JAR)" != "" PACKAGE = complex/framework JAVATESTFILES = \ + DocumentPropertiesTest.java \ DocumentMetadataAccessTest.java \ - DocumentMetaData.java \ CheckGlobalEventBroadcaster_writer1.java JAVAFILES = $(JAVATESTFILES) \ -- cgit v1.2.3 From b25e198437049b3db6d70a4fb81713fd937b6f5a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 18 Jun 2010 19:03:40 +0200 Subject: CWS gnumake2: enabling precompiled headers where possible --- framework/prj/target_lib_fwe.mk | 2 +- framework/prj/target_lib_fwi.mk | 2 +- framework/prj/target_lib_fwk.mk | 8 +++++--- framework/prj/target_lib_fwl.mk | 2 +- framework/prj/target_lib_fwm.mk | 2 +- sfx2/prj/target_lib_sfx2.mk | 2 ++ xmloff/prj/target_lib_xo.mk | 4 +++- xmloff/prj/target_lib_xof.mk | 8 ++++---- 8 files changed, 18 insertions(+), 12 deletions(-) (limited to 'sfx2') diff --git a/framework/prj/target_lib_fwe.mk b/framework/prj/target_lib_fwe.mk index 9387cad85a67..1cd47b05cb24 100644 --- a/framework/prj/target_lib_fwe.mk +++ b/framework/prj/target_lib_fwe.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,fwe)) -$(call gb_Library_get_headers_target,fwe) : $(call gb_Package_get_target,framework_inc) +$(eval $(call gb_Library_add_package_headers,fwe,framework_inc)) $(eval $(call gb_Library_set_include,fwe,\ $$(INCLUDE) \ diff --git a/framework/prj/target_lib_fwi.mk b/framework/prj/target_lib_fwi.mk index 0c1d9a63fedf..1d53d9b1ab6e 100644 --- a/framework/prj/target_lib_fwi.mk +++ b/framework/prj/target_lib_fwi.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,fwi)) -$(call gb_Library_get_headers_target,fwi) : $(call gb_Package_get_target,framework_inc) +$(eval $(call gb_Library_add_package_headers,fwi,framework_inc)) $(eval $(call gb_Library_set_defs,fwi,\ $$(DEFS) \ diff --git a/framework/prj/target_lib_fwk.mk b/framework/prj/target_lib_fwk.mk index 272f57e7df36..37b5fbcb586e 100644 --- a/framework/prj/target_lib_fwk.mk +++ b/framework/prj/target_lib_fwk.mk @@ -27,14 +27,16 @@ $(eval $(call gb_Library_Library,fwk)) -$(call gb_Library_get_headers_target,fwk) : $(call gb_Package_get_target,framework_inc) +$(eval $(call gb_Library_add_package_headers,fwk,framework_inc)) + +$(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_framework)) $(eval $(call gb_Library_set_include,fwk,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/framework/ \ -I$(SRCDIR)/framework/inc \ -I$(SRCDIR)/framework/inc/pch \ -I$(SRCDIR)/framework/source/inc \ + -I$(WORKDIR)/inc/framework/ \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/framework \ -I$(OUTDIR)/inc/offuh \ )) diff --git a/framework/prj/target_lib_fwl.mk b/framework/prj/target_lib_fwl.mk index 8e549041cae3..a43ab9544493 100644 --- a/framework/prj/target_lib_fwl.mk +++ b/framework/prj/target_lib_fwl.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,fwl)) -$(call gb_Library_get_headers_target,fwl) : $(call gb_Package_get_target,framework_inc) +$(eval $(call gb_Library_add_package_headers,fwl,framework_inc)) $(eval $(call gb_Library_set_include,fwl,\ $$(INCLUDE) \ diff --git a/framework/prj/target_lib_fwm.mk b/framework/prj/target_lib_fwm.mk index e0b4df3ef2c8..0c84ab2de2a4 100644 --- a/framework/prj/target_lib_fwm.mk +++ b/framework/prj/target_lib_fwm.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,fwm)) -$(call gb_Library_get_headers_target,fwm) : $(call gb_Package_get_target,framework_inc) +$(eval $(call gb_Library_add_package_headers,fwm,framework_inc)) $(eval $(call gb_Library_set_include,fwm,\ $$(INCLUDE) \ diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index 952fb9ce05f5..9c1dc852e69c 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_add_package_headers,sfx,\ sfx2_sdi \ )) +#$(eval $(call gb_Library_add_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/precompiled_sfx2)) + $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_include,sfx,\ diff --git a/xmloff/prj/target_lib_xo.mk b/xmloff/prj/target_lib_xo.mk index d503388be383..5a13d5053f93 100644 --- a/xmloff/prj/target_lib_xo.mk +++ b/xmloff/prj/target_lib_xo.mk @@ -27,7 +27,9 @@ $(eval $(call gb_Library_Library,xo)) -$(call gb_Library_get_headers_target,xo) : $(call gb_Package_get_target,xo_inc) +$(eval $(call gb_Library_add_package_headers,xo,xmloff_inc)) + +$(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xmloff)) $(eval $(call gb_Library_set_include,xo,\ $$(SOLARINC) \ diff --git a/xmloff/prj/target_lib_xof.mk b/xmloff/prj/target_lib_xof.mk index a414106da31e..320aafbf12fe 100644 --- a/xmloff/prj/target_lib_xof.mk +++ b/xmloff/prj/target_lib_xof.mk @@ -28,13 +28,13 @@ $(eval $(call gb_Library_Library,xof)) $(eval $(call gb_Library_set_include,xof,\ - $$(SOLARINC) \ - -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/xmloff/inc/pch \ -I$(SRCDIR)/xmloff/inc \ -I$(SRCDIR)/xmloff/source/inc \ - -I$(SRCDIR)/xmloff/inc/pch \ - -I$(OUTDIR)/inc/offuh \ + -I$(WORKDIR)/inc/ \ + $$(INCLUDE) \ -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_add_linked_libs,xof,\ -- cgit v1.2.3 From bb30c0a24baa2bc671daae588b523386470984c7 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 'sfx2') diff --git a/basic/source/runtime/dllmgr.cxx b/basic/source/runtime/dllmgr.cxx index 22014763bb29..18ab61b37ef9 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 36fbda5c9097..dbeb7c619b9d 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 b25c213a493d..fae3a7d1854a 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 39af5ea4adc3..437145613737 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 e9a0798761b9..8e36597b3e5c 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 3a57e4818e88..6d58c030a578 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 8544e4affda7..7cc0cee80109 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 265084be697f..3462422b99e6 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 afb4d0da2640..0b1ec85697fa 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 b0757a201844..37562fa57d57 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 d84c55787635..148c79ebadd4 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 36c2a2f722da..25884342bf89 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 a1d4a66b8fb1..81e211988a09 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 2bc219e9b69c..61e4a5253ced 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 06bd9305adeb..0c5be0d237c9 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 0c7985e05ec3..4d5427f3875c 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 e8c5bf1f0470..06e7e2d7c69c 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 607cc91e1bf6..000000000000 --- 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 3e0a55a7fd05..c33d2e9f3d7a 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 6e13894feb49..7e4e9921573a 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 4da32cf9f566..8c2709a649be 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 10e3c9b1a04a..20b7abb5d087 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 72ac94a9b38e..30f74355077a 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 956a61b3e247..000000000000 --- 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 45ebfeac69f9..7b320742f33b 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 7d177d0bbfd8..d56c36bfd5ea 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 189c9a8aae0e..9b4fff98493c 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 3d43e5fb9aac..ba10f76b01f9 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 98e76bf28969..83429ae6c58e 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 fc8d401f94e7..61edcd5c7fe7 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 409d957cae84..28b7e3dcdd3e 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 036f700e6e96..0b06a74c280d 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 5eae04dbbc87..26966a543f1c 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 4c600cba821f..31582d652dc4 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 bad1401c2305..03e3dc31a94f 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 a59ef4b90a74..b8f6b92b38db 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 774bcf5f6323..cf9da3a2b942 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 95f3d4c562939999afe323aca72ac070b466e15f Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 01:29:37 +0200 Subject: CWS gnumake2: module reorg --- framework/AllLangResTarget_fwe.mk | 63 +++++ framework/Library_fwe.mk | 115 +++++++++ framework/Library_fwi.mk | 96 ++++++++ framework/Library_fwk.mk | 188 +++++++++++++++ framework/Library_fwl.mk | 98 ++++++++ framework/Library_fwm.mk | 79 +++++++ framework/Makefile | 9 +- framework/Module_framework.mk | 43 ++++ framework/Package_dtd.mk | 35 +++ framework/Package_inc.mk | 47 ++++ framework/Package_uiconfig.mk | 32 +++ framework/Package_unotypes.mk | 30 +++ framework/prj/target_lib_fwe.mk | 115 --------- framework/prj/target_lib_fwi.mk | 96 -------- framework/prj/target_lib_fwk.mk | 188 --------------- framework/prj/target_lib_fwl.mk | 98 -------- framework/prj/target_lib_fwm.mk | 79 ------- framework/prj/target_module_framework.mk | 55 ----- framework/prj/target_package_dtd.mk | 35 --- framework/prj/target_package_inc.mk | 47 ---- framework/prj/target_package_uiconfig.mk | 32 --- framework/prj/target_package_unotypes.mk | 30 --- framework/prj/target_res_fwe.mk | 63 ----- sfx2/AllLangResTarget_sfx2.mk | 78 ++++++ sfx2/Library_qstart.mk | 80 +++++++ sfx2/Library_sfx2.mk | 291 +++++++++++++++++++++++ sfx2/Makefile | 9 +- sfx2/Module_sfx2.mk | 46 ++++ sfx2/Package_inc.mk | 154 ++++++++++++ sfx2/Package_sdi.mk | 30 +++ sfx2/prj/target_lib_qstart.mk | 80 ------- sfx2/prj/target_lib_sfx2.mk | 291 ----------------------- sfx2/prj/target_module_sfx2.mk | 52 ---- sfx2/prj/target_package_inc.mk | 154 ------------ sfx2/prj/target_package_sdi.mk | 30 --- sfx2/prj/target_res_sfx2.mk | 78 ------ xmloff/Library_xo.mk | 395 +++++++++++++++++++++++++++++++ xmloff/Library_xof.mk | 110 +++++++++ xmloff/Makefile | 9 +- xmloff/Module_xmloff.mk | 40 ++++ xmloff/Package_dtd.mk | 45 ++++ xmloff/Package_inc.mk | 131 ++++++++++ xmloff/prj/target_lib_xo.mk | 395 ------------------------------- xmloff/prj/target_lib_xof.mk | 110 --------- xmloff/prj/target_module_xmloff.mk | 44 ---- xmloff/prj/target_package_dtd.mk | 45 ---- xmloff/prj/target_package_inc.mk | 131 ---------- 47 files changed, 2241 insertions(+), 2260 deletions(-) create mode 100644 framework/AllLangResTarget_fwe.mk create mode 100644 framework/Library_fwe.mk create mode 100644 framework/Library_fwi.mk create mode 100644 framework/Library_fwk.mk create mode 100644 framework/Library_fwl.mk create mode 100644 framework/Library_fwm.mk create mode 100644 framework/Module_framework.mk create mode 100644 framework/Package_dtd.mk create mode 100644 framework/Package_inc.mk create mode 100644 framework/Package_uiconfig.mk create mode 100644 framework/Package_unotypes.mk delete mode 100644 framework/prj/target_lib_fwe.mk delete mode 100644 framework/prj/target_lib_fwi.mk delete mode 100644 framework/prj/target_lib_fwk.mk delete mode 100644 framework/prj/target_lib_fwl.mk delete mode 100644 framework/prj/target_lib_fwm.mk delete mode 100644 framework/prj/target_module_framework.mk delete mode 100644 framework/prj/target_package_dtd.mk delete mode 100644 framework/prj/target_package_inc.mk delete mode 100644 framework/prj/target_package_uiconfig.mk delete mode 100644 framework/prj/target_package_unotypes.mk delete mode 100644 framework/prj/target_res_fwe.mk create mode 100644 sfx2/AllLangResTarget_sfx2.mk create mode 100644 sfx2/Library_qstart.mk create mode 100644 sfx2/Library_sfx2.mk create mode 100644 sfx2/Module_sfx2.mk create mode 100644 sfx2/Package_inc.mk create mode 100644 sfx2/Package_sdi.mk delete mode 100644 sfx2/prj/target_lib_qstart.mk delete mode 100644 sfx2/prj/target_lib_sfx2.mk delete mode 100644 sfx2/prj/target_module_sfx2.mk delete mode 100644 sfx2/prj/target_package_inc.mk delete mode 100644 sfx2/prj/target_package_sdi.mk delete mode 100644 sfx2/prj/target_res_sfx2.mk create mode 100644 xmloff/Library_xo.mk create mode 100644 xmloff/Library_xof.mk create mode 100644 xmloff/Module_xmloff.mk create mode 100644 xmloff/Package_dtd.mk create mode 100644 xmloff/Package_inc.mk delete mode 100644 xmloff/prj/target_lib_xo.mk delete mode 100644 xmloff/prj/target_lib_xof.mk delete mode 100644 xmloff/prj/target_module_xmloff.mk delete mode 100644 xmloff/prj/target_package_dtd.mk delete mode 100644 xmloff/prj/target_package_inc.mk (limited to 'sfx2') diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk new file mode 100644 index 000000000000..031cb24117d7 --- /dev/null +++ b/framework/AllLangResTarget_fwe.mk @@ -0,0 +1,63 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,fwe)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,fwe,framework)) + +$(eval $(call gb_AllLangResTarget_add_srs,fwe,\ + fwe/fwk_classes \ + fwe/fwk_services \ +)) + + +$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_classes)) + +$(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\ + $$(INCLUDE) \ + -I$(SRCDIR)/framework/inc \ + -I$(SRCDIR)/framework/inc/classes \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\ + framework/source/classes/resource.src \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services)) + +$(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\ + $$(INCLUDE) \ + -I$(SRCDIR)/framework/inc \ + -I$(SRCDIR)/framework/inc/services \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,fwe/fwk_services,\ + framework/source/services/fwk_services.src \ +)) +# vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk new file mode 100644 index 000000000000..718e9c38ea22 --- /dev/null +++ b/framework/Library_fwe.mk @@ -0,0 +1,115 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fwe)) + +$(eval $(call gb_Library_set_include,fwe,\ + -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/source/inc \ + -I$(SRCDIR)/framework/inc \ + -I$(WORKDIR)/inc/framework/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/framework \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,fwe,\ + $$(DEFS) \ + -DFWE_DLLIMPLEMENTATION\ +)) + +$(eval $(call gb_Library_add_linked_libs,fwe,\ + comphelper \ + cppu \ + cppuhelper \ + fwi \ + sal \ + stl \ + svl \ + svt \ + tl \ + utl \ + vcl \ + vos3 \ +)) + +$(eval $(call gb_Library_add_exception_objects,fwe,\ + framework/source/fwe/classes/actiontriggercontainer \ + framework/source/fwe/classes/actiontriggerpropertyset \ + framework/source/fwe/classes/actiontriggerseparatorpropertyset \ + framework/source/fwe/classes/addonmenu \ + framework/source/fwe/classes/addonsoptions \ + framework/source/fwe/classes/bmkmenu \ + framework/source/fwe/classes/fwkresid \ + framework/source/fwe/classes/imagewrapper \ + framework/source/fwe/classes/menuextensionsupplier \ + framework/source/fwe/classes/rootactiontriggercontainer \ + framework/source/fwe/classes/sfxhelperfunctions \ + framework/source/fwe/dispatch/interaction \ + framework/source/fwe/helper/acceleratorinfo \ + framework/source/fwe/helper/actiontriggerhelper \ + framework/source/fwe/helper/configimporter \ + framework/source/fwe/helper/imageproducer \ + framework/source/fwe/helper/propertysetcontainer \ + framework/source/fwe/helper/titlehelper \ + framework/source/fwe/helper/uiconfigelementwrapperbase \ + framework/source/fwe/helper/uielementwrapperbase \ + framework/source/fwe/interaction/preventduplicateinteraction \ + framework/source/fwe/xml/eventsconfiguration \ + framework/source/fwe/xml/eventsdocumenthandler \ + framework/source/fwe/xml/imagesconfiguration \ + framework/source/fwe/xml/imagesdocumenthandler \ + framework/source/fwe/xml/menuconfiguration \ + framework/source/fwe/xml/menudocumenthandler \ + framework/source/fwe/xml/saxnamespacefilter \ + framework/source/fwe/xml/statusbarconfiguration \ + framework/source/fwe/xml/statusbardocumenthandler \ + framework/source/fwe/xml/toolboxconfiguration \ + framework/source/fwe/xml/toolboxdocumenthandler \ + framework/source/fwe/xml/toolboxlayoutdocumenthandler \ + framework/source/fwe/xml/xmlnamespaces \ +)) + +ifeq ($(OS),LINUX) + +$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS)))) + +$(eval $(call gb_Library_add_linked_libs,fwe,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fwe,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# TODO: visibility +# vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk new file mode 100644 index 000000000000..0e00df9d8300 --- /dev/null +++ b/framework/Library_fwi.mk @@ -0,0 +1,96 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fwi)) + +$(eval $(call gb_Library_add_package_headers,fwi,framework_inc)) + +$(eval $(call gb_Library_set_defs,fwi,\ + $$(DEFS) \ + -DFWI_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_set_include,fwi,\ + -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/source/inc \ + -I$(SRCDIR)/framework/inc \ + -I$(WORKDIR)/inc/framework/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/framework \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,fwi,\ + comphelper \ + stl \ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ + vos3 \ +)) + +$(eval $(call gb_Library_add_exception_objects,fwi,\ + framework/source/fwi/classes/converter \ + framework/source/fwi/classes/framelistanalyzer \ + framework/source/fwi/classes/propertysethelper \ + framework/source/fwi/classes/protocolhandlercache \ + framework/source/fwi/helper/mischelper \ + framework/source/fwi/helper/networkdomain \ + framework/source/fwi/helper/popupmenucontrollerbase \ + framework/source/fwi/helper/shareablemutex \ + framework/source/fwi/jobs/configaccess \ + framework/source/fwi/jobs/jobconst \ + framework/source/fwi/threadhelp/lockhelper \ + framework/source/fwi/threadhelp/transactionmanager \ + framework/source/fwi/uielement/constitemcontainer \ + framework/source/fwi/uielement/itemcontainer \ + framework/source/fwi/uielement/rootitemcontainer \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,fwi,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fwi,\ + advapi32 \ + kernel32 \ + msvcrt \ + stl \ + unicows \ + uwinapi \ +)) +endif +# TODO: visibility +# vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk new file mode 100644 index 000000000000..8ff8adb4e5fb --- /dev/null +++ b/framework/Library_fwk.mk @@ -0,0 +1,188 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fwk)) + +$(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_framework)) + +$(eval $(call gb_Library_set_include,fwk,\ + -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/source/inc \ + -I$(SRCDIR)/framework/inc \ + -I$(WORKDIR)/inc/framework/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/framework \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,fwk,\ + comphelper \ + fwe \ + fwi \ + i18nisolang1 \ + sot \ + stl \ + svl \ + svt \ + tk \ + tl \ + ucbhelper \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,fwk,\ + framework/source/accelerators/acceleratorcache \ + framework/source/accelerators/acceleratorconfiguration \ + framework/source/accelerators/documentacceleratorconfiguration \ + framework/source/accelerators/globalacceleratorconfiguration \ + framework/source/accelerators/keymapping \ + framework/source/accelerators/moduleacceleratorconfiguration \ + framework/source/accelerators/presethandler \ + framework/source/accelerators/storageholder \ + framework/source/classes/droptargetlistener \ + framework/source/classes/framecontainer \ + framework/source/classes/menumanager \ + framework/source/classes/taskcreator \ + framework/source/constant/containerquery \ + framework/source/constant/contenthandler \ + framework/source/constant/filter \ + framework/source/constant/frameloader \ + framework/source/dispatch/closedispatcher \ + framework/source/dispatch/dispatchinformationprovider \ + framework/source/dispatch/dispatchprovider \ + framework/source/dispatch/helpagentdispatcher \ + framework/source/dispatch/interceptionhelper \ + framework/source/dispatch/loaddispatcher \ + framework/source/dispatch/menudispatcher \ + framework/source/dispatch/startmoduledispatcher \ + framework/source/dispatch/windowcommanddispatch \ + framework/source/helper/dockingareadefaultacceptor \ + framework/source/helper/ocomponentaccess \ + framework/source/helper/ocomponentenumeration \ + framework/source/helper/oframes \ + framework/source/helper/persistentwindowstate \ + framework/source/helper/statusindicator \ + framework/source/helper/statusindicatorfactory \ + framework/source/helper/tagwindowasmodified \ + framework/source/helper/titlebarupdate \ + framework/source/helper/vclstatusindicator \ + framework/source/helper/wakeupthread \ + framework/source/interaction/quietinteraction \ + framework/source/jobs/job \ + framework/source/jobs/jobdata \ + framework/source/jobs/jobdispatch \ + framework/source/jobs/jobexecutor \ + framework/source/jobs/jobresult \ + framework/source/jobs/joburl \ + framework/source/layoutmanager/layoutmanager \ + framework/source/loadenv/loadenv \ + framework/source/loadenv/targethelper \ + framework/source/register/registerservices \ + framework/source/services/autorecovery \ + framework/source/services/backingcomp \ + framework/source/services/backingwindow \ + framework/source/services/desktop \ + framework/source/services/frame \ + framework/source/services/modulemanager \ + framework/source/services/pathsettings \ + framework/source/services/sessionlistener \ + framework/source/services/substitutepathvars \ + framework/source/services/taskcreatorsrv \ + framework/source/services/uriabbreviation \ + framework/source/services/urltransformer \ + framework/source/uiconfiguration/globalsettings \ + framework/source/uiconfiguration/graphicnameaccess \ + framework/source/uiconfiguration/imagemanager \ + framework/source/uiconfiguration/imagemanagerimpl \ + framework/source/uiconfiguration/moduleimagemanager \ + framework/source/uiconfiguration/moduleuicfgsupplier \ + framework/source/uiconfiguration/moduleuiconfigurationmanager \ + framework/source/uiconfiguration/uicategorydescription \ + framework/source/uiconfiguration/uiconfigurationmanager \ + framework/source/uiconfiguration/uiconfigurationmanagerimpl \ + framework/source/uiconfiguration/windowstateconfiguration \ + framework/source/uielement/addonstoolbarmanager \ + framework/source/uielement/addonstoolbarwrapper \ + framework/source/uielement/buttontoolbarcontroller \ + framework/source/uielement/comboboxtoolbarcontroller \ + framework/source/uielement/complextoolbarcontroller \ + framework/source/uielement/controlmenucontroller \ + framework/source/uielement/dropdownboxtoolbarcontroller \ + framework/source/uielement/edittoolbarcontroller \ + framework/source/uielement/generictoolbarcontroller \ + framework/source/uielement/imagebuttontoolbarcontroller \ + framework/source/uielement/langselectionstatusbarcontroller \ + framework/source/uielement/menubarmanager \ + framework/source/uielement/menubarmerger \ + framework/source/uielement/menubarwrapper \ + framework/source/uielement/objectmenucontroller \ + framework/source/uielement/progressbarwrapper \ + framework/source/uielement/recentfilesmenucontroller \ + framework/source/uielement/spinfieldtoolbarcontroller \ + framework/source/uielement/statusbar \ + framework/source/uielement/statusbarmanager \ + framework/source/uielement/statusbarwrapper \ + framework/source/uielement/statusindicatorinterfacewrapper \ + framework/source/uielement/togglebuttontoolbarcontroller \ + framework/source/uielement/toolbar \ + framework/source/uielement/toolbarmanager \ + framework/source/uielement/toolbarmerger \ + framework/source/uielement/toolbarwrapper \ + framework/source/uielement/uicommanddescription \ + framework/source/uifactory/addonstoolboxfactory \ + framework/source/uifactory/factoryconfiguration \ + framework/source/uifactory/menubarfactory \ + framework/source/uifactory/popupmenucontrollerfactory \ + framework/source/uifactory/statusbarcontrollerfactory \ + framework/source/uifactory/statusbarfactory \ + framework/source/uifactory/toolbarcontrollerfactory \ + framework/source/uifactory/toolboxfactory \ + framework/source/uifactory/uielementfactorymanager \ + framework/source/uifactory/windowcontentfactorymanager \ + framework/source/xml/acceleratorconfigurationreader \ + framework/source/xml/acceleratorconfigurationwriter \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,fwk,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fwk,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk new file mode 100644 index 000000000000..f3ec59fd6c61 --- /dev/null +++ b/framework/Library_fwl.mk @@ -0,0 +1,98 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fwl)) + +$(eval $(call gb_Library_set_include,fwl,\ + -I$(SRCDIR)/framework/inc \ + -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/source/inc \ + -I$(WORKDIR)/inc/framework/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/framework \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,fwl,\ + comphelper \ + fwe \ + fwi \ + i18nisolang1 \ + stl \ + svl \ + svt \ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,fwl,\ + framework/source/register/registertemp \ + framework/source/services/mediatypedetectionhelper \ + framework/source/dispatch/mailtodispatcher \ + framework/source/dispatch/oxt_handler \ + framework/source/uielement/toolbarsmenucontroller \ + framework/source/uielement/newmenucontroller \ + framework/source/uielement/macrosmenucontroller \ + framework/source/uielement/langselectionmenucontroller \ + framework/source/uielement/headermenucontroller \ + framework/source/uielement/footermenucontroller \ + framework/source/uielement/fontsizemenucontroller \ + framework/source/uielement/fontmenucontroller \ + framework/source/services/tabwindowservice \ + framework/source/classes/fwktabwindow \ + framework/source/uielement/logotextstatusbarcontroller \ + framework/source/classes/fwlresid \ + framework/source/uielement/logoimagestatusbarcontroller \ + framework/source/uielement/simpletextstatusbarcontroller \ + framework/source/services/uriabbreviation \ + framework/source/dispatch/servicehandler \ + framework/source/services/license \ + framework/source/recording/dispatchrecorder \ + framework/source/recording/dispatchrecordersupplier \ + framework/source/services/dispatchhelper \ + framework/source/dispatch/popupmenudispatcher \ +)) +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,fwl,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fwl,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk new file mode 100644 index 000000000000..56a6a9f74f6b --- /dev/null +++ b/framework/Library_fwm.mk @@ -0,0 +1,79 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fwm)) + +$(eval $(call gb_Library_set_include,fwm,\ + -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/inc \ + -I$(SRCDIR)/framework/source/inc \ + -I$(WORKDIR)/inc/framework/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/framework \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,fwm,\ + comphelper \ + fwi \ + stl \ + svl \ + svt \ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ + vos3 \ +)) + +$(eval $(call gb_Library_add_exception_objects,fwm,\ + framework/source/dispatch/systemexec \ + framework/source/jobs/helponstartup \ + framework/source/jobs/shelljob \ + framework/source/register/register3rdcomponents \ + framework/source/tabwin/tabwindow \ + framework/source/tabwin/tabwinfactory \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,fwm,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fwm,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/framework/Makefile b/framework/Makefile index 9ab4b8ba83f4..60d34122e271 100644 --- a/framework/Makefile +++ b/framework/Makefile @@ -25,12 +25,13 @@ # #************************************************************************* +ifeq ($(strip $(SOLARENV)),) +$(error No environment set) +endif + GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk - -gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) - -$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) +$(eval $(call gb_Module_make_global_targets)) # vim: set noet sw=4 ts=4: diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk new file mode 100644 index 000000000000..28b2e087b60f --- /dev/null +++ b/framework/Module_framework.mk @@ -0,0 +1,43 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,framework)) + +$(eval $(call gb_Module_add_targets,framework,\ + AllLangResTarget_fwe \ + Library_fwe \ + Library_fwi \ + Library_fwk \ + Library_fwl \ + Library_fwm \ + Package_dtd \ + Package_inc \ + Package_uiconfig \ + Package_unotypes \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/framework/Package_dtd.mk b/framework/Package_dtd.mk new file mode 100644 index 000000000000..db23783c4ef9 --- /dev/null +++ b/framework/Package_dtd.mk @@ -0,0 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,framework_dtd,$(SRCDIR)/framework/dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/accelerator.dtd,accelerator.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/event.dtd,event.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/groupuinames.dtd,groupuinames.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/image.dtd,image.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/menubar.dtd,menubar.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/statusbar.dtd,statusbar.dtd)) +$(eval $(call gb_Package_add_file,framework_dtd,bin/toolbar.dtd,toolbar.dtd)) diff --git a/framework/Package_inc.mk b/framework/Package_inc.mk new file mode 100644 index 000000000000..8cb41e542265 --- /dev/null +++ b/framework/Package_inc.mk @@ -0,0 +1,47 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,framework_inc,$(SRCDIR)/framework/inc)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/acceleratorinfo.hxx,framework/acceleratorinfo.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/actiontriggerhelper.hxx,framework/actiontriggerhelper.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonmenu.hxx,framework/addonmenu.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx,framework/addonsoptions.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,framework/bmkmenu.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,framework/configimporter.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,framework/eventsconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,framework/imageproducer.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,framework/imagesconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,framework/interaction.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuconfiguration.hxx,framework/menuconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuextensionsupplier.hxx,framework/menuextensionsupplier.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/preventduplicateinteraction.hxx,framework/preventduplicateinteraction.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/sfxhelperfunctions.hxx,framework/sfxhelperfunctions.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/titlehelper.hxx,framework/titlehelper.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/toolboxconfiguration.hxx,framework/toolboxconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/fwedllapi.h,framework/fwedllapi.h)) +$(eval $(call gb_Package_add_file,framework_inc,inc/fwkdllapi.h,fwkdllapi.h)) +$(eval $(call gb_Package_add_file,framework_inc,inc/fwidllapi.h,fwidllapi.h)) diff --git a/framework/Package_uiconfig.mk b/framework/Package_uiconfig.mk new file mode 100644 index 000000000000..c92344a153f5 --- /dev/null +++ b/framework/Package_uiconfig.mk @@ -0,0 +1,32 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,framework_uiconfig,$(SRCDIR)/framework/uiconfig)) +$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/accelerator/en-US/default.xml,startmodule/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/menubar/menubar.xml,startmodule/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/statusbar/statusbar.xml,startmodule/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/toolbar/standardbar.xml,startmodule/toolbar/standardbar.xml)) diff --git a/framework/Package_unotypes.mk b/framework/Package_unotypes.mk new file mode 100644 index 000000000000..01069ae93dc4 --- /dev/null +++ b/framework/Package_unotypes.mk @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,framework_unotypes,$(SRCDIR)/framework/source/unotypes)) +$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwk.xml,fwk.xml)) +$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwl.xml,fwl.xml)) diff --git a/framework/prj/target_lib_fwe.mk b/framework/prj/target_lib_fwe.mk deleted file mode 100644 index 718e9c38ea22..000000000000 --- a/framework/prj/target_lib_fwe.mk +++ /dev/null @@ -1,115 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,fwe)) - -$(eval $(call gb_Library_set_include,fwe,\ - -I$(SRCDIR)/framework/inc/pch \ - -I$(SRCDIR)/framework/source/inc \ - -I$(SRCDIR)/framework/inc \ - -I$(WORKDIR)/inc/framework/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/framework \ - -I$(OUTDIR)/inc/offuh \ -)) - -$(eval $(call gb_Library_set_defs,fwe,\ - $$(DEFS) \ - -DFWE_DLLIMPLEMENTATION\ -)) - -$(eval $(call gb_Library_add_linked_libs,fwe,\ - comphelper \ - cppu \ - cppuhelper \ - fwi \ - sal \ - stl \ - svl \ - svt \ - tl \ - utl \ - vcl \ - vos3 \ -)) - -$(eval $(call gb_Library_add_exception_objects,fwe,\ - framework/source/fwe/classes/actiontriggercontainer \ - framework/source/fwe/classes/actiontriggerpropertyset \ - framework/source/fwe/classes/actiontriggerseparatorpropertyset \ - framework/source/fwe/classes/addonmenu \ - framework/source/fwe/classes/addonsoptions \ - framework/source/fwe/classes/bmkmenu \ - framework/source/fwe/classes/fwkresid \ - framework/source/fwe/classes/imagewrapper \ - framework/source/fwe/classes/menuextensionsupplier \ - framework/source/fwe/classes/rootactiontriggercontainer \ - framework/source/fwe/classes/sfxhelperfunctions \ - framework/source/fwe/dispatch/interaction \ - framework/source/fwe/helper/acceleratorinfo \ - framework/source/fwe/helper/actiontriggerhelper \ - framework/source/fwe/helper/configimporter \ - framework/source/fwe/helper/imageproducer \ - framework/source/fwe/helper/propertysetcontainer \ - framework/source/fwe/helper/titlehelper \ - framework/source/fwe/helper/uiconfigelementwrapperbase \ - framework/source/fwe/helper/uielementwrapperbase \ - framework/source/fwe/interaction/preventduplicateinteraction \ - framework/source/fwe/xml/eventsconfiguration \ - framework/source/fwe/xml/eventsdocumenthandler \ - framework/source/fwe/xml/imagesconfiguration \ - framework/source/fwe/xml/imagesdocumenthandler \ - framework/source/fwe/xml/menuconfiguration \ - framework/source/fwe/xml/menudocumenthandler \ - framework/source/fwe/xml/saxnamespacefilter \ - framework/source/fwe/xml/statusbarconfiguration \ - framework/source/fwe/xml/statusbardocumenthandler \ - framework/source/fwe/xml/toolboxconfiguration \ - framework/source/fwe/xml/toolboxdocumenthandler \ - framework/source/fwe/xml/toolboxlayoutdocumenthandler \ - framework/source/fwe/xml/xmlnamespaces \ -)) - -ifeq ($(OS),LINUX) - -$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS)))) - -$(eval $(call gb_Library_add_linked_libs,fwe,\ - dl \ - m \ - pthread \ -)) -endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,fwe,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif -# TODO: visibility -# vim: set noet sw=4 ts=4: diff --git a/framework/prj/target_lib_fwi.mk b/framework/prj/target_lib_fwi.mk deleted file mode 100644 index 0e00df9d8300..000000000000 --- a/framework/prj/target_lib_fwi.mk +++ /dev/null @@ -1,96 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,fwi)) - -$(eval $(call gb_Library_add_package_headers,fwi,framework_inc)) - -$(eval $(call gb_Library_set_defs,fwi,\ - $$(DEFS) \ - -DFWI_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_set_include,fwi,\ - -I$(SRCDIR)/framework/inc/pch \ - -I$(SRCDIR)/framework/source/inc \ - -I$(SRCDIR)/framework/inc \ - -I$(WORKDIR)/inc/framework/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/framework \ - -I$(OUTDIR)/inc/offuh \ -)) - -$(eval $(call gb_Library_add_linked_libs,fwi,\ - comphelper \ - stl \ - tk \ - tl \ - cppu \ - cppuhelper \ - sal \ - utl \ - vcl \ - vos3 \ -)) - -$(eval $(call gb_Library_add_exception_objects,fwi,\ - framework/source/fwi/classes/converter \ - framework/source/fwi/classes/framelistanalyzer \ - framework/source/fwi/classes/propertysethelper \ - framework/source/fwi/classes/protocolhandlercache \ - framework/source/fwi/helper/mischelper \ - framework/source/fwi/helper/networkdomain \ - framework/source/fwi/helper/popupmenucontrollerbase \ - framework/source/fwi/helper/shareablemutex \ - framework/source/fwi/jobs/configaccess \ - framework/source/fwi/jobs/jobconst \ - framework/source/fwi/threadhelp/lockhelper \ - framework/source/fwi/threadhelp/transactionmanager \ - framework/source/fwi/uielement/constitemcontainer \ - framework/source/fwi/uielement/itemcontainer \ - framework/source/fwi/uielement/rootitemcontainer \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwi,\ - dl \ - m \ - pthread \ -)) -endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,fwi,\ - advapi32 \ - kernel32 \ - msvcrt \ - stl \ - unicows \ - uwinapi \ -)) -endif -# TODO: visibility -# vim: set noet sw=4 ts=4: diff --git a/framework/prj/target_lib_fwk.mk b/framework/prj/target_lib_fwk.mk deleted file mode 100644 index 8ff8adb4e5fb..000000000000 --- a/framework/prj/target_lib_fwk.mk +++ /dev/null @@ -1,188 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,fwk)) - -$(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_framework)) - -$(eval $(call gb_Library_set_include,fwk,\ - -I$(SRCDIR)/framework/inc/pch \ - -I$(SRCDIR)/framework/source/inc \ - -I$(SRCDIR)/framework/inc \ - -I$(WORKDIR)/inc/framework/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/framework \ - -I$(OUTDIR)/inc/offuh \ -)) - -$(eval $(call gb_Library_add_linked_libs,fwk,\ - comphelper \ - fwe \ - fwi \ - i18nisolang1 \ - sot \ - stl \ - svl \ - svt \ - tk \ - tl \ - ucbhelper \ - cppu \ - cppuhelper \ - sal \ - utl \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,fwk,\ - framework/source/accelerators/acceleratorcache \ - framework/source/accelerators/acceleratorconfiguration \ - framework/source/accelerators/documentacceleratorconfiguration \ - framework/source/accelerators/globalacceleratorconfiguration \ - framework/source/accelerators/keymapping \ - framework/source/accelerators/moduleacceleratorconfiguration \ - framework/source/accelerators/presethandler \ - framework/source/accelerators/storageholder \ - framework/source/classes/droptargetlistener \ - framework/source/classes/framecontainer \ - framework/source/classes/menumanager \ - framework/source/classes/taskcreator \ - framework/source/constant/containerquery \ - framework/source/constant/contenthandler \ - framework/source/constant/filter \ - framework/source/constant/frameloader \ - framework/source/dispatch/closedispatcher \ - framework/source/dispatch/dispatchinformationprovider \ - framework/source/dispatch/dispatchprovider \ - framework/source/dispatch/helpagentdispatcher \ - framework/source/dispatch/interceptionhelper \ - framework/source/dispatch/loaddispatcher \ - framework/source/dispatch/menudispatcher \ - framework/source/dispatch/startmoduledispatcher \ - framework/source/dispatch/windowcommanddispatch \ - framework/source/helper/dockingareadefaultacceptor \ - framework/source/helper/ocomponentaccess \ - framework/source/helper/ocomponentenumeration \ - framework/source/helper/oframes \ - framework/source/helper/persistentwindowstate \ - framework/source/helper/statusindicator \ - framework/source/helper/statusindicatorfactory \ - framework/source/helper/tagwindowasmodified \ - framework/source/helper/titlebarupdate \ - framework/source/helper/vclstatusindicator \ - framework/source/helper/wakeupthread \ - framework/source/interaction/quietinteraction \ - framework/source/jobs/job \ - framework/source/jobs/jobdata \ - framework/source/jobs/jobdispatch \ - framework/source/jobs/jobexecutor \ - framework/source/jobs/jobresult \ - framework/source/jobs/joburl \ - framework/source/layoutmanager/layoutmanager \ - framework/source/loadenv/loadenv \ - framework/source/loadenv/targethelper \ - framework/source/register/registerservices \ - framework/source/services/autorecovery \ - framework/source/services/backingcomp \ - framework/source/services/backingwindow \ - framework/source/services/desktop \ - framework/source/services/frame \ - framework/source/services/modulemanager \ - framework/source/services/pathsettings \ - framework/source/services/sessionlistener \ - framework/source/services/substitutepathvars \ - framework/source/services/taskcreatorsrv \ - framework/source/services/uriabbreviation \ - framework/source/services/urltransformer \ - framework/source/uiconfiguration/globalsettings \ - framework/source/uiconfiguration/graphicnameaccess \ - framework/source/uiconfiguration/imagemanager \ - framework/source/uiconfiguration/imagemanagerimpl \ - framework/source/uiconfiguration/moduleimagemanager \ - framework/source/uiconfiguration/moduleuicfgsupplier \ - framework/source/uiconfiguration/moduleuiconfigurationmanager \ - framework/source/uiconfiguration/uicategorydescription \ - framework/source/uiconfiguration/uiconfigurationmanager \ - framework/source/uiconfiguration/uiconfigurationmanagerimpl \ - framework/source/uiconfiguration/windowstateconfiguration \ - framework/source/uielement/addonstoolbarmanager \ - framework/source/uielement/addonstoolbarwrapper \ - framework/source/uielement/buttontoolbarcontroller \ - framework/source/uielement/comboboxtoolbarcontroller \ - framework/source/uielement/complextoolbarcontroller \ - framework/source/uielement/controlmenucontroller \ - framework/source/uielement/dropdownboxtoolbarcontroller \ - framework/source/uielement/edittoolbarcontroller \ - framework/source/uielement/generictoolbarcontroller \ - framework/source/uielement/imagebuttontoolbarcontroller \ - framework/source/uielement/langselectionstatusbarcontroller \ - framework/source/uielement/menubarmanager \ - framework/source/uielement/menubarmerger \ - framework/source/uielement/menubarwrapper \ - framework/source/uielement/objectmenucontroller \ - framework/source/uielement/progressbarwrapper \ - framework/source/uielement/recentfilesmenucontroller \ - framework/source/uielement/spinfieldtoolbarcontroller \ - framework/source/uielement/statusbar \ - framework/source/uielement/statusbarmanager \ - framework/source/uielement/statusbarwrapper \ - framework/source/uielement/statusindicatorinterfacewrapper \ - framework/source/uielement/togglebuttontoolbarcontroller \ - framework/source/uielement/toolbar \ - framework/source/uielement/toolbarmanager \ - framework/source/uielement/toolbarmerger \ - framework/source/uielement/toolbarwrapper \ - framework/source/uielement/uicommanddescription \ - framework/source/uifactory/addonstoolboxfactory \ - framework/source/uifactory/factoryconfiguration \ - framework/source/uifactory/menubarfactory \ - framework/source/uifactory/popupmenucontrollerfactory \ - framework/source/uifactory/statusbarcontrollerfactory \ - framework/source/uifactory/statusbarfactory \ - framework/source/uifactory/toolbarcontrollerfactory \ - framework/source/uifactory/toolboxfactory \ - framework/source/uifactory/uielementfactorymanager \ - framework/source/uifactory/windowcontentfactorymanager \ - framework/source/xml/acceleratorconfigurationreader \ - framework/source/xml/acceleratorconfigurationwriter \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwk,\ - dl \ - m \ - pthread \ -)) -endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,fwk,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/framework/prj/target_lib_fwl.mk b/framework/prj/target_lib_fwl.mk deleted file mode 100644 index f3ec59fd6c61..000000000000 --- a/framework/prj/target_lib_fwl.mk +++ /dev/null @@ -1,98 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,fwl)) - -$(eval $(call gb_Library_set_include,fwl,\ - -I$(SRCDIR)/framework/inc \ - -I$(SRCDIR)/framework/inc/pch \ - -I$(SRCDIR)/framework/source/inc \ - -I$(WORKDIR)/inc/framework/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/framework \ - -I$(OUTDIR)/inc/offuh \ -)) - -$(eval $(call gb_Library_add_linked_libs,fwl,\ - comphelper \ - fwe \ - fwi \ - i18nisolang1 \ - stl \ - svl \ - svt \ - tk \ - tl \ - cppu \ - cppuhelper \ - sal \ - utl \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,fwl,\ - framework/source/register/registertemp \ - framework/source/services/mediatypedetectionhelper \ - framework/source/dispatch/mailtodispatcher \ - framework/source/dispatch/oxt_handler \ - framework/source/uielement/toolbarsmenucontroller \ - framework/source/uielement/newmenucontroller \ - framework/source/uielement/macrosmenucontroller \ - framework/source/uielement/langselectionmenucontroller \ - framework/source/uielement/headermenucontroller \ - framework/source/uielement/footermenucontroller \ - framework/source/uielement/fontsizemenucontroller \ - framework/source/uielement/fontmenucontroller \ - framework/source/services/tabwindowservice \ - framework/source/classes/fwktabwindow \ - framework/source/uielement/logotextstatusbarcontroller \ - framework/source/classes/fwlresid \ - framework/source/uielement/logoimagestatusbarcontroller \ - framework/source/uielement/simpletextstatusbarcontroller \ - framework/source/services/uriabbreviation \ - framework/source/dispatch/servicehandler \ - framework/source/services/license \ - framework/source/recording/dispatchrecorder \ - framework/source/recording/dispatchrecordersupplier \ - framework/source/services/dispatchhelper \ - framework/source/dispatch/popupmenudispatcher \ -)) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwl,\ - dl \ - m \ - pthread \ -)) -endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,fwl,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/framework/prj/target_lib_fwm.mk b/framework/prj/target_lib_fwm.mk deleted file mode 100644 index 56a6a9f74f6b..000000000000 --- a/framework/prj/target_lib_fwm.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,fwm)) - -$(eval $(call gb_Library_set_include,fwm,\ - -I$(SRCDIR)/framework/inc/pch \ - -I$(SRCDIR)/framework/inc \ - -I$(SRCDIR)/framework/source/inc \ - -I$(WORKDIR)/inc/framework/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/framework \ - -I$(OUTDIR)/inc/offuh \ -)) - -$(eval $(call gb_Library_add_linked_libs,fwm,\ - comphelper \ - fwi \ - stl \ - svl \ - svt \ - tk \ - tl \ - cppu \ - cppuhelper \ - sal \ - utl \ - vcl \ - vos3 \ -)) - -$(eval $(call gb_Library_add_exception_objects,fwm,\ - framework/source/dispatch/systemexec \ - framework/source/jobs/helponstartup \ - framework/source/jobs/shelljob \ - framework/source/register/register3rdcomponents \ - framework/source/tabwin/tabwindow \ - framework/source/tabwin/tabwinfactory \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwm,\ - dl \ - m \ - pthread \ -)) -endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,fwm,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/framework/prj/target_module_framework.mk b/framework/prj/target_module_framework.mk deleted file mode 100644 index 86a30a0b3e45..000000000000 --- a/framework/prj/target_module_framework.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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 $(foreach targetdef,\ - lib_fwe \ - lib_fwi \ - lib_fwk \ - lib_fwl \ - lib_fwm \ - package_dtd \ - package_inc \ - package_uiconfig \ - package_unotypes \ - res_fwe \ -,$(SRCDIR)/framework/prj/target_$(targetdef).mk) - - -$(eval $(call gb_Module_Module,framework,\ - $(call gb_AllLangResTarget_get_target,fwe) \ - $(call gb_Library_get_target,fwe) \ - $(call gb_Library_get_target,fwi) \ - $(call gb_Library_get_target,fwk) \ - $(call gb_Library_get_target,fwl) \ - $(call gb_Library_get_target,fwm) \ - $(call gb_Library_get_target,fwe) \ - $(call gb_Package_get_target,framework_dtd) \ - $(call gb_Package_get_target,framework_inc) \ - $(call gb_Package_get_target,framework_uiconfig) \ - $(call gb_Package_get_target,framework_unotypes) \ -)) -# vim: set noet ts=4 sw=4: diff --git a/framework/prj/target_package_dtd.mk b/framework/prj/target_package_dtd.mk deleted file mode 100644 index db23783c4ef9..000000000000 --- a/framework/prj/target_package_dtd.mk +++ /dev/null @@ -1,35 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,framework_dtd,$(SRCDIR)/framework/dtd)) -$(eval $(call gb_Package_add_file,framework_dtd,bin/accelerator.dtd,accelerator.dtd)) -$(eval $(call gb_Package_add_file,framework_dtd,bin/event.dtd,event.dtd)) -$(eval $(call gb_Package_add_file,framework_dtd,bin/groupuinames.dtd,groupuinames.dtd)) -$(eval $(call gb_Package_add_file,framework_dtd,bin/image.dtd,image.dtd)) -$(eval $(call gb_Package_add_file,framework_dtd,bin/menubar.dtd,menubar.dtd)) -$(eval $(call gb_Package_add_file,framework_dtd,bin/statusbar.dtd,statusbar.dtd)) -$(eval $(call gb_Package_add_file,framework_dtd,bin/toolbar.dtd,toolbar.dtd)) diff --git a/framework/prj/target_package_inc.mk b/framework/prj/target_package_inc.mk deleted file mode 100644 index 8cb41e542265..000000000000 --- a/framework/prj/target_package_inc.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,framework_inc,$(SRCDIR)/framework/inc)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/acceleratorinfo.hxx,framework/acceleratorinfo.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/actiontriggerhelper.hxx,framework/actiontriggerhelper.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonmenu.hxx,framework/addonmenu.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx,framework/addonsoptions.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,framework/bmkmenu.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,framework/configimporter.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,framework/eventsconfiguration.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,framework/imageproducer.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,framework/imagesconfiguration.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,framework/interaction.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuconfiguration.hxx,framework/menuconfiguration.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuextensionsupplier.hxx,framework/menuextensionsupplier.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/preventduplicateinteraction.hxx,framework/preventduplicateinteraction.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/sfxhelperfunctions.hxx,framework/sfxhelperfunctions.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/titlehelper.hxx,framework/titlehelper.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/toolboxconfiguration.hxx,framework/toolboxconfiguration.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/fwedllapi.h,framework/fwedllapi.h)) -$(eval $(call gb_Package_add_file,framework_inc,inc/fwkdllapi.h,fwkdllapi.h)) -$(eval $(call gb_Package_add_file,framework_inc,inc/fwidllapi.h,fwidllapi.h)) diff --git a/framework/prj/target_package_uiconfig.mk b/framework/prj/target_package_uiconfig.mk deleted file mode 100644 index c92344a153f5..000000000000 --- a/framework/prj/target_package_uiconfig.mk +++ /dev/null @@ -1,32 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,framework_uiconfig,$(SRCDIR)/framework/uiconfig)) -$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/accelerator/en-US/default.xml,startmodule/accelerator/en-US/default.xml)) -$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/menubar/menubar.xml,startmodule/menubar/menubar.xml)) -$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/statusbar/statusbar.xml,startmodule/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/toolbar/standardbar.xml,startmodule/toolbar/standardbar.xml)) diff --git a/framework/prj/target_package_unotypes.mk b/framework/prj/target_package_unotypes.mk deleted file mode 100644 index 01069ae93dc4..000000000000 --- a/framework/prj/target_package_unotypes.mk +++ /dev/null @@ -1,30 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,framework_unotypes,$(SRCDIR)/framework/source/unotypes)) -$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwk.xml,fwk.xml)) -$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwl.xml,fwl.xml)) diff --git a/framework/prj/target_res_fwe.mk b/framework/prj/target_res_fwe.mk deleted file mode 100644 index 031cb24117d7..000000000000 --- a/framework/prj/target_res_fwe.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,fwe)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,fwe,framework)) - -$(eval $(call gb_AllLangResTarget_add_srs,fwe,\ - fwe/fwk_classes \ - fwe/fwk_services \ -)) - - -$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_classes)) - -$(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\ - $$(INCLUDE) \ - -I$(SRCDIR)/framework/inc \ - -I$(SRCDIR)/framework/inc/classes \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\ - framework/source/classes/resource.src \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services)) - -$(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\ - $$(INCLUDE) \ - -I$(SRCDIR)/framework/inc \ - -I$(SRCDIR)/framework/inc/services \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,fwe/fwk_services,\ - framework/source/services/fwk_services.src \ -)) -# vim: set noet sw=4 ts=4: diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk new file mode 100644 index 000000000000..b51079559e82 --- /dev/null +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -0,0 +1,78 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,sfx)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,sfx,sfx2)) + +$(eval $(call gb_AllLangResTarget_add_srs,sfx,\ + sfx/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,sfx/res)) + +$(eval $(call gb_SrsTarget_set_include,sfx/res,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/sfx2/source/dialog \ + -I$(SRCDIR)/sfx2/source/inc \ + -I$(SRCDIR)/sfx2/inc/ \ + -I$(SRCDIR)/sfx2/inc/sfx \ +)) + +$(eval $(call gb_SrsTarget_add_files,sfx/res,\ + sfx2/source/appl/app.src \ + sfx2/source/appl/newhelp.src \ + sfx2/source/appl/dde.src \ + sfx2/source/appl/sfx.src \ + sfx2/source/doc/doc.src \ + sfx2/source/doc/new.src \ + sfx2/source/doc/doctdlg.src \ + sfx2/source/doc/doctempl.src \ + sfx2/source/doc/graphhelp.src \ + sfx2/source/menu/menu.src \ + sfx2/source/view/view.src \ + sfx2/source/dialog/alienwarn.src \ + sfx2/source/dialog/dialog.src \ + sfx2/source/dialog/dinfdlg.src \ + sfx2/source/dialog/dinfedt.src \ + sfx2/source/dialog/filedlghelper.src \ + sfx2/source/dialog/mailwindow.src \ + sfx2/source/dialog/mgetempl.src \ + sfx2/source/dialog/newstyle.src \ + sfx2/source/dialog/passwd.src \ + sfx2/source/dialog/printopt.src \ + sfx2/source/dialog/recfloat.src \ + sfx2/source/dialog/srchdlg.src \ + sfx2/source/dialog/templdlg.src \ + sfx2/source/dialog/versdlg.src \ + sfx2/source/bastyp/bastyp.src \ + sfx2/source/bastyp/fltfnc.src \ +)) + + diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk new file mode 100644 index 000000000000..2da2ada42db3 --- /dev/null +++ b/sfx2/Library_qstart.mk @@ -0,0 +1,80 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +#ifeq ($(OS),UNX) +$(eval $(call gb_Library_Library,qstart)) + +$(eval $(call gb_Library_set_include,qstart,\ + $$(INCLUDE) \ + -I$(SRCDIR)/sfx2/inc \ + -I$(SRCDIR)/sfx2/inc/sfx2 \ + -I$(SRCDIR)/sfx2/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +#WTF: this nice code is currently found in the makefile.mk (unix part only) +# PKGCONFIG_MODULES=gtk+-2.0 +# .IF "$(PKGCONFIG_ROOT)"!="" +# PKG_CONFIG=$(PKGCONFIG_ROOT)/bin/pkg-config +# PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)/lib/pkgconfig +# .EXPORT : PKG_CONFIG_PATH +# PKGCONFIG_PREFIX=--define-variable=prefix=$(PKGCONFIG_ROOT) +# .ELSE +# PKG_CONFIG*=pkg-config +# .ENDIF +# PKGCONFIG_CFLAGS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --cflags $(PKGCONFIG_MODULES)) +# PKGCONFIG_LIBS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --libs $(PKGCONFIG_MODULES)) +# CFLAGS+=$(PKGCONFIG_CFLAGS + +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Library_set_defs,qstart,\ + $$(DEFS) \ + -DDLL_NAME=libsfx$(DLLPOSTFIX)$(DLLPOST) \ + -DENABLE_QUICKSTART_APPLET \ +)) +endif + +#todo: add libs +$(eval $(call gb_Library_add_linked_libs,qstart,\ + sfx \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,qstart,\ + icuuc \ + dl \ + m \ + pthread \ +)) + +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Library_add_exception_objects,qstart,\ + sfx2/source/appl/shutdowniconunx.ob \ +)) +endif + +endif diff --git a/sfx2/Library_sfx2.mk b/sfx2/Library_sfx2.mk new file mode 100644 index 000000000000..9c1dc852e69c --- /dev/null +++ b/sfx2/Library_sfx2.mk @@ -0,0 +1,291 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,sfx)) + +$(eval $(call gb_Library_add_package_headers,sfx,\ + sfx2_inc \ + sfx2_sdi \ +)) + +#$(eval $(call gb_Library_add_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/precompiled_sfx2)) + +$(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) + +$(eval $(call gb_Library_set_include,sfx,\ + -I$(SRCDIR)/sfx2/inc \ + -I$(SRCDIR)/sfx2/inc/sfx2 \ + -I$(SRCDIR)/sfx2/source/inc \ + -I$(SRCDIR)/sfx2/inc/pch \ + -I$(WORKDIR)/SdiTarget/sfx2/sdi \ + -I$(WORKDIR)/inc/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ + $(LIBXML_CFLAGS) \ +)) + +$(eval $(call gb_Library_set_defs,sfx,\ + $$(DEFS) \ + -DSFX2_DLLIMPLEMENTATION \ + -DABOUTBMPNAMES="$(ABOUTBITMAPS)" \ +)) + +$(eval $(call gb_Library_add_linked_libs,sfx,\ + comphelper \ + cppu \ + cppuhelper \ + fwe \ + i18nisolang1 \ + sal \ + sax \ + sb \ + sot \ + stl \ + svl \ + svt \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + vos3 \ + xml2 \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,sfx,\ + icuuc \ + dl \ + m \ + pthread \ +)) + +$(eval $(call gb_Library_add_exception_objects,sfx,\ + sfx2/source/appl/app \ + sfx2/source/appl/appbas \ + sfx2/source/appl/appbaslib \ + sfx2/source/appl/appcfg \ + sfx2/source/appl/appchild \ + sfx2/source/appl/appdata \ + sfx2/source/appl/appdde \ + sfx2/source/appl/appinit \ + sfx2/source/appl/appmain \ + sfx2/source/appl/appmisc \ + sfx2/source/appl/appopen \ + sfx2/source/appl/appquit \ + sfx2/source/appl/appreg \ + sfx2/source/appl/appserv \ + sfx2/source/appl/appuno \ + sfx2/source/appl/childwin \ + sfx2/source/appl/fileobj \ + sfx2/source/appl/fwkhelper \ + sfx2/source/appl/helpdispatch \ + sfx2/source/appl/helpinterceptor \ + sfx2/source/appl/imagemgr \ + sfx2/source/appl/imestatuswindow \ + sfx2/source/appl/impldde \ + sfx2/source/appl/linkmgr2 \ + sfx2/source/appl/linksrc \ + sfx2/source/appl/lnkbase2 \ + sfx2/source/appl/module \ + sfx2/source/appl/newhelp \ + sfx2/source/appl/opengrf \ + sfx2/source/appl/sfxdll \ + sfx2/source/appl/sfxhelp \ + sfx2/source/appl/sfxpicklist \ + sfx2/source/appl/shutdownicon \ + sfx2/source/appl/shutdowniconw32 \ + sfx2/source/appl/workwin \ + sfx2/source/appl/xpackcreator \ + sfx2/source/bastyp/bitset \ + sfx2/source/bastyp/fltfnc \ + sfx2/source/bastyp/fltlst \ + sfx2/source/bastyp/frmhtml \ + sfx2/source/bastyp/frmhtmlw \ + sfx2/source/bastyp/helper \ + sfx2/source/bastyp/mieclip \ + sfx2/source/bastyp/minarray \ + sfx2/source/bastyp/misc \ + sfx2/source/bastyp/progress \ + sfx2/source/bastyp/sfxhtml \ + sfx2/source/bastyp/sfxresid \ + sfx2/source/config/evntconf \ + sfx2/source/control/bindings \ + sfx2/source/control/ctrlitem \ + sfx2/source/control/dispatch \ + sfx2/source/control/macrconf \ + sfx2/source/control/macro \ + sfx2/source/control/minfitem \ + sfx2/source/control/msg \ + sfx2/source/control/msgpool \ + sfx2/source/control/objface \ + sfx2/source/control/querystatus \ + sfx2/source/control/request \ + sfx2/source/control/sfxstatuslistener \ + sfx2/source/control/shell \ + sfx2/source/control/sorgitm \ + sfx2/source/control/statcach \ + sfx2/source/control/unoctitm \ + sfx2/source/dialog/about \ + sfx2/source/dialog/alienwarn \ + sfx2/source/dialog/basedlgs \ + sfx2/source/dialog/dinfdlg \ + sfx2/source/dialog/dinfedt \ + sfx2/source/dialog/dockwin \ + sfx2/source/dialog/filedlghelper \ + sfx2/source/dialog/filtergrouping \ + sfx2/source/dialog/intro \ + sfx2/source/dialog/itemconnect \ + sfx2/source/dialog/mailmodel \ + sfx2/source/dialog/mgetempl \ + sfx2/source/dialog/navigat \ + sfx2/source/dialog/newstyle \ + sfx2/source/dialog/partwnd \ + sfx2/source/dialog/passwd \ + sfx2/source/dialog/printopt \ + sfx2/source/dialog/recfloat \ + sfx2/source/dialog/sfxdlg \ + sfx2/source/dialog/sfxurl \ + sfx2/source/dialog/splitwin \ + sfx2/source/dialog/srchdlg \ + sfx2/source/dialog/styfitem \ + sfx2/source/dialog/styledlg \ + sfx2/source/dialog/tabdlg \ + sfx2/source/dialog/templdlg \ + sfx2/source/dialog/tplcitem \ + sfx2/source/dialog/tplpitem \ + sfx2/source/dialog/versdlg \ + sfx2/source/doc/DocumentMetadataAccess \ + sfx2/source/doc/Metadatable \ + sfx2/source/doc/QuerySaveDocument \ + sfx2/source/doc/SfxDocumentMetaData \ + sfx2/source/doc/docfac \ + sfx2/source/doc/docfile \ + sfx2/source/doc/docfilt \ + sfx2/source/doc/docinf \ + sfx2/source/doc/docinsert \ + sfx2/source/doc/docmacromode \ + sfx2/source/doc/docstoragemodifylistener \ + sfx2/source/doc/doctdlg \ + sfx2/source/doc/doctempl \ + sfx2/source/doc/doctemplates \ + sfx2/source/doc/doctemplateslocal \ + sfx2/source/doc/docvor \ + sfx2/source/doc/frmdescr \ + sfx2/source/doc/graphhelp \ + sfx2/source/doc/guisaveas \ + sfx2/source/doc/iframe \ + sfx2/source/doc/new \ + sfx2/source/doc/objcont \ + sfx2/source/doc/objembed \ + sfx2/source/doc/objitem \ + sfx2/source/doc/objmisc \ + sfx2/source/doc/objserv \ + sfx2/source/doc/objstor \ + sfx2/source/doc/objuno \ + sfx2/source/doc/objxtor \ + sfx2/source/doc/oleprops \ + sfx2/source/doc/opostponedtruncationstream \ + sfx2/source/doc/ownsubfilterservice \ + sfx2/source/doc/plugin \ + sfx2/source/doc/printhelper \ + sfx2/source/doc/querytemplate \ + sfx2/source/doc/sfxacldetect \ + sfx2/source/doc/sfxbasemodel \ + sfx2/source/doc/sfxmodelfactory \ + sfx2/source/explorer/nochaos \ + sfx2/source/inet/inettbc \ + sfx2/source/menu/mnuitem \ + sfx2/source/menu/mnumgr \ + sfx2/source/menu/objmnctl \ + sfx2/source/menu/virtmenu \ + sfx2/source/notify/eventsupplier \ + sfx2/source/notify/hintpost \ + sfx2/source/statbar/stbitem \ + sfx2/source/toolbox/imgmgr \ + sfx2/source/toolbox/tbxitem \ + sfx2/source/view/frame \ + sfx2/source/view/frame2 \ + sfx2/source/view/frmload \ + sfx2/source/view/ipclient \ + sfx2/source/view/orgmgr \ + sfx2/source/view/printer \ + sfx2/source/view/sfxbasecontroller \ + sfx2/source/view/userinputinterception \ + sfx2/source/view/viewfac \ + sfx2/source/view/viewfrm \ + sfx2/source/view/viewfrm2 \ + sfx2/source/view/viewprn \ + sfx2/source/view/viewsh \ +)) + +$(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx)) + +$(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\ + $$(INCLUDE) \ + -I$(SRCDIR)/sfx2/inc/sfx2 \ + -I$(SRCDIR)/sfx2/inc \ + -I$(SRCDIR)/sfx2/sdi \ +)) + +ifeq ($(OS),$(filter WNT MACOSX,$(OS))) +$(eval $(call gb_Library_set_defs,sfx,\ + $$(DEFS) \ + -DENABLE_QUICKSTART_APPLET \ +)) +endif + +ifeq ($(OS),OS2) +$(eval $(call gb_Library_add_exception_objects,sfx,\ + sfx2/source/appl/shutdowniconOs2.ob \ +)) +endif +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_objcxxobjects,sfx,\ + sfx2/source/appl/shutdowniconaqua \ +)) +$(eval $(call gb_Library_add_linked_libs,sfx,\ + objc \ + Cocoa \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,sfx,\ + advapi32 \ + gdi32 \ + kernel32 \ + msvcrt \ + oldnames \ + ole32 \ + shell32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: + diff --git a/sfx2/Makefile b/sfx2/Makefile index 9ab4b8ba83f4..60d34122e271 100644 --- a/sfx2/Makefile +++ b/sfx2/Makefile @@ -25,12 +25,13 @@ # #************************************************************************* +ifeq ($(strip $(SOLARENV)),) +$(error No environment set) +endif + GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk - -gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) - -$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) +$(eval $(call gb_Module_make_global_targets)) # vim: set noet sw=4 ts=4: diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk new file mode 100644 index 000000000000..087c87bed797 --- /dev/null +++ b/sfx2/Module_sfx2.mk @@ -0,0 +1,46 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,sfx2)) + +$(eval $(call gb_Module_add_targets,sfx2,\ + AllLangResTarget_sfx2 \ + Library_sfx2 \ + Package_inc \ + Package_sdi \ +)) +# lib_qstart \ + +#todo: map file? +#todo: source/appl ohne Optimierung? +#todo: source/control ohne Optimierung? +#todo: source/dialog BUILD_VER_STRING +#todo: source/doc SYSTEM_LIBXML2 +#todo: noopt for acldetect.cxx? +#todo: ENABLE_LAYOUT +#todo: quickstarter +#todo: link against cocoa on Mac diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk new file mode 100644 index 000000000000..dd836b286f8b --- /dev/null +++ b/sfx2/Package_inc.mk @@ -0,0 +1,154 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx)) + + + + + + + + + + + + + + + + + + + + diff --git a/sfx2/Package_sdi.mk b/sfx2/Package_sdi.mk new file mode 100644 index 000000000000..63f2138adf4f --- /dev/null +++ b/sfx2/Package_sdi.mk @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sfx2_sdi,$(SRCDIR)/sfx2/sdi)) +$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfx.sdi,sfx.sdi)) +$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfxitems.sdi,sfxitems.sdi)) diff --git a/sfx2/prj/target_lib_qstart.mk b/sfx2/prj/target_lib_qstart.mk deleted file mode 100644 index 2da2ada42db3..000000000000 --- a/sfx2/prj/target_lib_qstart.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -#ifeq ($(OS),UNX) -$(eval $(call gb_Library_Library,qstart)) - -$(eval $(call gb_Library_set_include,qstart,\ - $$(INCLUDE) \ - -I$(SRCDIR)/sfx2/inc \ - -I$(SRCDIR)/sfx2/inc/sfx2 \ - -I$(SRCDIR)/sfx2/inc/pch \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -#WTF: this nice code is currently found in the makefile.mk (unix part only) -# PKGCONFIG_MODULES=gtk+-2.0 -# .IF "$(PKGCONFIG_ROOT)"!="" -# PKG_CONFIG=$(PKGCONFIG_ROOT)/bin/pkg-config -# PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)/lib/pkgconfig -# .EXPORT : PKG_CONFIG_PATH -# PKGCONFIG_PREFIX=--define-variable=prefix=$(PKGCONFIG_ROOT) -# .ELSE -# PKG_CONFIG*=pkg-config -# .ENDIF -# PKGCONFIG_CFLAGS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --cflags $(PKGCONFIG_MODULES)) -# PKGCONFIG_LIBS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --libs $(PKGCONFIG_MODULES)) -# CFLAGS+=$(PKGCONFIG_CFLAGS - -ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) -$(eval $(call gb_Library_set_defs,qstart,\ - $$(DEFS) \ - -DDLL_NAME=libsfx$(DLLPOSTFIX)$(DLLPOST) \ - -DENABLE_QUICKSTART_APPLET \ -)) -endif - -#todo: add libs -$(eval $(call gb_Library_add_linked_libs,qstart,\ - sfx \ -)) - -$(eval $(call gb_Library_add_linked_system_libs,qstart,\ - icuuc \ - dl \ - m \ - pthread \ -)) - -ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) -$(eval $(call gb_Library_add_exception_objects,qstart,\ - sfx2/source/appl/shutdowniconunx.ob \ -)) -endif - -endif diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk deleted file mode 100644 index 9c1dc852e69c..000000000000 --- a/sfx2/prj/target_lib_sfx2.mk +++ /dev/null @@ -1,291 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,sfx)) - -$(eval $(call gb_Library_add_package_headers,sfx,\ - sfx2_inc \ - sfx2_sdi \ -)) - -#$(eval $(call gb_Library_add_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/precompiled_sfx2)) - -$(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) - -$(eval $(call gb_Library_set_include,sfx,\ - -I$(SRCDIR)/sfx2/inc \ - -I$(SRCDIR)/sfx2/inc/sfx2 \ - -I$(SRCDIR)/sfx2/source/inc \ - -I$(SRCDIR)/sfx2/inc/pch \ - -I$(WORKDIR)/SdiTarget/sfx2/sdi \ - -I$(WORKDIR)/inc/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ - $(LIBXML_CFLAGS) \ -)) - -$(eval $(call gb_Library_set_defs,sfx,\ - $$(DEFS) \ - -DSFX2_DLLIMPLEMENTATION \ - -DABOUTBMPNAMES="$(ABOUTBITMAPS)" \ -)) - -$(eval $(call gb_Library_add_linked_libs,sfx,\ - comphelper \ - cppu \ - cppuhelper \ - fwe \ - i18nisolang1 \ - sal \ - sax \ - sb \ - sot \ - stl \ - svl \ - svt \ - tk \ - tl \ - ucbhelper \ - utl \ - vcl \ - vos3 \ - xml2 \ -)) - -$(eval $(call gb_Library_add_linked_system_libs,sfx,\ - icuuc \ - dl \ - m \ - pthread \ -)) - -$(eval $(call gb_Library_add_exception_objects,sfx,\ - sfx2/source/appl/app \ - sfx2/source/appl/appbas \ - sfx2/source/appl/appbaslib \ - sfx2/source/appl/appcfg \ - sfx2/source/appl/appchild \ - sfx2/source/appl/appdata \ - sfx2/source/appl/appdde \ - sfx2/source/appl/appinit \ - sfx2/source/appl/appmain \ - sfx2/source/appl/appmisc \ - sfx2/source/appl/appopen \ - sfx2/source/appl/appquit \ - sfx2/source/appl/appreg \ - sfx2/source/appl/appserv \ - sfx2/source/appl/appuno \ - sfx2/source/appl/childwin \ - sfx2/source/appl/fileobj \ - sfx2/source/appl/fwkhelper \ - sfx2/source/appl/helpdispatch \ - sfx2/source/appl/helpinterceptor \ - sfx2/source/appl/imagemgr \ - sfx2/source/appl/imestatuswindow \ - sfx2/source/appl/impldde \ - sfx2/source/appl/linkmgr2 \ - sfx2/source/appl/linksrc \ - sfx2/source/appl/lnkbase2 \ - sfx2/source/appl/module \ - sfx2/source/appl/newhelp \ - sfx2/source/appl/opengrf \ - sfx2/source/appl/sfxdll \ - sfx2/source/appl/sfxhelp \ - sfx2/source/appl/sfxpicklist \ - sfx2/source/appl/shutdownicon \ - sfx2/source/appl/shutdowniconw32 \ - sfx2/source/appl/workwin \ - sfx2/source/appl/xpackcreator \ - sfx2/source/bastyp/bitset \ - sfx2/source/bastyp/fltfnc \ - sfx2/source/bastyp/fltlst \ - sfx2/source/bastyp/frmhtml \ - sfx2/source/bastyp/frmhtmlw \ - sfx2/source/bastyp/helper \ - sfx2/source/bastyp/mieclip \ - sfx2/source/bastyp/minarray \ - sfx2/source/bastyp/misc \ - sfx2/source/bastyp/progress \ - sfx2/source/bastyp/sfxhtml \ - sfx2/source/bastyp/sfxresid \ - sfx2/source/config/evntconf \ - sfx2/source/control/bindings \ - sfx2/source/control/ctrlitem \ - sfx2/source/control/dispatch \ - sfx2/source/control/macrconf \ - sfx2/source/control/macro \ - sfx2/source/control/minfitem \ - sfx2/source/control/msg \ - sfx2/source/control/msgpool \ - sfx2/source/control/objface \ - sfx2/source/control/querystatus \ - sfx2/source/control/request \ - sfx2/source/control/sfxstatuslistener \ - sfx2/source/control/shell \ - sfx2/source/control/sorgitm \ - sfx2/source/control/statcach \ - sfx2/source/control/unoctitm \ - sfx2/source/dialog/about \ - sfx2/source/dialog/alienwarn \ - sfx2/source/dialog/basedlgs \ - sfx2/source/dialog/dinfdlg \ - sfx2/source/dialog/dinfedt \ - sfx2/source/dialog/dockwin \ - sfx2/source/dialog/filedlghelper \ - sfx2/source/dialog/filtergrouping \ - sfx2/source/dialog/intro \ - sfx2/source/dialog/itemconnect \ - sfx2/source/dialog/mailmodel \ - sfx2/source/dialog/mgetempl \ - sfx2/source/dialog/navigat \ - sfx2/source/dialog/newstyle \ - sfx2/source/dialog/partwnd \ - sfx2/source/dialog/passwd \ - sfx2/source/dialog/printopt \ - sfx2/source/dialog/recfloat \ - sfx2/source/dialog/sfxdlg \ - sfx2/source/dialog/sfxurl \ - sfx2/source/dialog/splitwin \ - sfx2/source/dialog/srchdlg \ - sfx2/source/dialog/styfitem \ - sfx2/source/dialog/styledlg \ - sfx2/source/dialog/tabdlg \ - sfx2/source/dialog/templdlg \ - sfx2/source/dialog/tplcitem \ - sfx2/source/dialog/tplpitem \ - sfx2/source/dialog/versdlg \ - sfx2/source/doc/DocumentMetadataAccess \ - sfx2/source/doc/Metadatable \ - sfx2/source/doc/QuerySaveDocument \ - sfx2/source/doc/SfxDocumentMetaData \ - sfx2/source/doc/docfac \ - sfx2/source/doc/docfile \ - sfx2/source/doc/docfilt \ - sfx2/source/doc/docinf \ - sfx2/source/doc/docinsert \ - sfx2/source/doc/docmacromode \ - sfx2/source/doc/docstoragemodifylistener \ - sfx2/source/doc/doctdlg \ - sfx2/source/doc/doctempl \ - sfx2/source/doc/doctemplates \ - sfx2/source/doc/doctemplateslocal \ - sfx2/source/doc/docvor \ - sfx2/source/doc/frmdescr \ - sfx2/source/doc/graphhelp \ - sfx2/source/doc/guisaveas \ - sfx2/source/doc/iframe \ - sfx2/source/doc/new \ - sfx2/source/doc/objcont \ - sfx2/source/doc/objembed \ - sfx2/source/doc/objitem \ - sfx2/source/doc/objmisc \ - sfx2/source/doc/objserv \ - sfx2/source/doc/objstor \ - sfx2/source/doc/objuno \ - sfx2/source/doc/objxtor \ - sfx2/source/doc/oleprops \ - sfx2/source/doc/opostponedtruncationstream \ - sfx2/source/doc/ownsubfilterservice \ - sfx2/source/doc/plugin \ - sfx2/source/doc/printhelper \ - sfx2/source/doc/querytemplate \ - sfx2/source/doc/sfxacldetect \ - sfx2/source/doc/sfxbasemodel \ - sfx2/source/doc/sfxmodelfactory \ - sfx2/source/explorer/nochaos \ - sfx2/source/inet/inettbc \ - sfx2/source/menu/mnuitem \ - sfx2/source/menu/mnumgr \ - sfx2/source/menu/objmnctl \ - sfx2/source/menu/virtmenu \ - sfx2/source/notify/eventsupplier \ - sfx2/source/notify/hintpost \ - sfx2/source/statbar/stbitem \ - sfx2/source/toolbox/imgmgr \ - sfx2/source/toolbox/tbxitem \ - sfx2/source/view/frame \ - sfx2/source/view/frame2 \ - sfx2/source/view/frmload \ - sfx2/source/view/ipclient \ - sfx2/source/view/orgmgr \ - sfx2/source/view/printer \ - sfx2/source/view/sfxbasecontroller \ - sfx2/source/view/userinputinterception \ - sfx2/source/view/viewfac \ - sfx2/source/view/viewfrm \ - sfx2/source/view/viewfrm2 \ - sfx2/source/view/viewprn \ - sfx2/source/view/viewsh \ -)) - -$(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx)) - -$(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\ - $$(INCLUDE) \ - -I$(SRCDIR)/sfx2/inc/sfx2 \ - -I$(SRCDIR)/sfx2/inc \ - -I$(SRCDIR)/sfx2/sdi \ -)) - -ifeq ($(OS),$(filter WNT MACOSX,$(OS))) -$(eval $(call gb_Library_set_defs,sfx,\ - $$(DEFS) \ - -DENABLE_QUICKSTART_APPLET \ -)) -endif - -ifeq ($(OS),OS2) -$(eval $(call gb_Library_add_exception_objects,sfx,\ - sfx2/source/appl/shutdowniconOs2.ob \ -)) -endif -ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_objcxxobjects,sfx,\ - sfx2/source/appl/shutdowniconaqua \ -)) -$(eval $(call gb_Library_add_linked_libs,sfx,\ - objc \ - Cocoa \ -)) -endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,sfx,\ - advapi32 \ - gdi32 \ - kernel32 \ - msvcrt \ - oldnames \ - ole32 \ - shell32 \ - user32 \ - uuid \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: - diff --git a/sfx2/prj/target_module_sfx2.mk b/sfx2/prj/target_module_sfx2.mk deleted file mode 100644 index 3ec4e606795f..000000000000 --- a/sfx2/prj/target_module_sfx2.mk +++ /dev/null @@ -1,52 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Module_Module,sfx2,\ - $(call gb_AllLangResTarget_get_target,sfx) \ - $(call gb_Library_get_target,sfx) \ - $(call gb_Package_get_target,sfx2_inc) \ - $(call gb_Package_get_target,sfx2_sdi) \ -)) -# $(call gb_Library_get_target,qstart) \ - -$(eval $(call gb_Module_read_includes,sfx2,\ - lib_sfx2 \ - package_inc \ - package_sdi \ - res_sfx2 \ -)) -# lib_qstart \ - -#todo: map file? -#todo: source/appl ohne Optimierung? -#todo: source/control ohne Optimierung? -#todo: source/dialog BUILD_VER_STRING -#todo: source/doc SYSTEM_LIBXML2 -#todo: noopt for acldetect.cxx? -#todo: ENABLE_LAYOUT -#todo: quickstarter -#todo: link against cocoa on Mac diff --git a/sfx2/prj/target_package_inc.mk b/sfx2/prj/target_package_inc.mk deleted file mode 100644 index dd836b286f8b..000000000000 --- a/sfx2/prj/target_package_inc.mk +++ /dev/null @@ -1,154 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx)) - - - - - - - - - - - - - - - - - - - - diff --git a/sfx2/prj/target_package_sdi.mk b/sfx2/prj/target_package_sdi.mk deleted file mode 100644 index 63f2138adf4f..000000000000 --- a/sfx2/prj/target_package_sdi.mk +++ /dev/null @@ -1,30 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,sfx2_sdi,$(SRCDIR)/sfx2/sdi)) -$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfx.sdi,sfx.sdi)) -$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfxitems.sdi,sfxitems.sdi)) diff --git a/sfx2/prj/target_res_sfx2.mk b/sfx2/prj/target_res_sfx2.mk deleted file mode 100644 index b51079559e82..000000000000 --- a/sfx2/prj/target_res_sfx2.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,sfx)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,sfx,sfx2)) - -$(eval $(call gb_AllLangResTarget_add_srs,sfx,\ - sfx/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,sfx/res)) - -$(eval $(call gb_SrsTarget_set_include,sfx/res,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc \ - -I$(WORKDIR)/inc \ - -I$(SRCDIR)/sfx2/source/dialog \ - -I$(SRCDIR)/sfx2/source/inc \ - -I$(SRCDIR)/sfx2/inc/ \ - -I$(SRCDIR)/sfx2/inc/sfx \ -)) - -$(eval $(call gb_SrsTarget_add_files,sfx/res,\ - sfx2/source/appl/app.src \ - sfx2/source/appl/newhelp.src \ - sfx2/source/appl/dde.src \ - sfx2/source/appl/sfx.src \ - sfx2/source/doc/doc.src \ - sfx2/source/doc/new.src \ - sfx2/source/doc/doctdlg.src \ - sfx2/source/doc/doctempl.src \ - sfx2/source/doc/graphhelp.src \ - sfx2/source/menu/menu.src \ - sfx2/source/view/view.src \ - sfx2/source/dialog/alienwarn.src \ - sfx2/source/dialog/dialog.src \ - sfx2/source/dialog/dinfdlg.src \ - sfx2/source/dialog/dinfedt.src \ - sfx2/source/dialog/filedlghelper.src \ - sfx2/source/dialog/mailwindow.src \ - sfx2/source/dialog/mgetempl.src \ - sfx2/source/dialog/newstyle.src \ - sfx2/source/dialog/passwd.src \ - sfx2/source/dialog/printopt.src \ - sfx2/source/dialog/recfloat.src \ - sfx2/source/dialog/srchdlg.src \ - sfx2/source/dialog/templdlg.src \ - sfx2/source/dialog/versdlg.src \ - sfx2/source/bastyp/bastyp.src \ - sfx2/source/bastyp/fltfnc.src \ -)) - - diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk new file mode 100644 index 000000000000..5a13d5053f93 --- /dev/null +++ b/xmloff/Library_xo.mk @@ -0,0 +1,395 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,xo)) + +$(eval $(call gb_Library_add_package_headers,xo,xmloff_inc)) + +$(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xmloff)) + +$(eval $(call gb_Library_set_include,xo,\ + $$(SOLARINC) \ + -I. \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/xmloff/inc \ + -I$(SRCDIR)/xmloff/source/inc \ + -I$(SRCDIR)/xmloff/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,xo,\ + $$(DEFS) \ + -DXMLOFF_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,xo,\ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + sal \ + stl \ + svl \ + tl \ + utl \ + vos3 \ +)) + +$(eval $(call gb_Library_add_exception_objects,xo,\ + xmloff/source/draw/ximpshap \ + xmloff/source/draw/ximppage \ + xmloff/source/draw/ximpstyl \ + xmloff/source/draw/XMLShapeStyleContext \ + xmloff/source/draw/sdxmlimp \ + xmloff/source/draw/shapeimport \ + xmloff/source/draw/ximplink \ + xmloff/source/draw/propimp0 \ + xmloff/source/draw/ximpbody \ + xmloff/source/draw/eventimp \ + xmloff/source/draw/layerimp \ + xmloff/source/draw/shapeexport2 \ + xmloff/source/draw/animimp \ + xmloff/source/draw/ximp3dscene \ + xmloff/source/draw/ximpgrp \ + xmloff/source/draw/XMLImageMapExport \ + xmloff/source/draw/numithdl \ + xmloff/source/draw/XMLReplacementImageContext \ + xmloff/source/draw/ximpshow \ + xmloff/source/draw/descriptionimp \ + xmloff/source/draw/xexptran \ + xmloff/source/draw/animationexport \ + xmloff/source/draw/viewcontext \ + xmloff/source/draw/sdpropls \ + xmloff/source/draw/shapeexport3 \ + xmloff/source/draw/ximp3dobject \ + xmloff/source/draw/EnhancedCustomShapeToken \ + xmloff/source/draw/ximpcustomshape \ + xmloff/source/draw/shapeexport4 \ + xmloff/source/draw/animationimport \ + xmloff/source/draw/XMLGraphicsDefaultStyle \ + xmloff/source/draw/ximpnote \ + xmloff/source/draw/shapeexport \ + xmloff/source/draw/XMLImageMapContext \ + xmloff/source/draw/sdxmlexp \ + xmloff/source/draw/animexp \ + xmloff/source/draw/layerexp \ + xmloff/source/draw/XMLNumberStyles \ + xmloff/source/draw/XMLShapePropertySetContext \ + xmloff/source/chart/SchXMLImport \ + xmloff/source/chart/XMLErrorIndicatorPropertyHdl \ + xmloff/source/chart/PropertyMaps \ + xmloff/source/chart/ColorPropertySet \ + xmloff/source/chart/transporttypes \ + xmloff/source/chart/XMLSymbolImageContext \ + xmloff/source/chart/SchXMLTextListContext \ + xmloff/source/chart/SchXMLTools \ + xmloff/source/chart/XMLLabelSeparatorContext \ + xmloff/source/chart/XMLChartPropertyContext \ + xmloff/source/chart/SchXMLSeriesHelper \ + xmloff/source/chart/SchXMLSeries2Context \ + xmloff/source/chart/SchXMLPlotAreaContext \ + xmloff/source/chart/contexts \ + xmloff/source/chart/XMLErrorBarStylePropertyHdl \ + xmloff/source/chart/XMLAxisPositionPropertyHdl \ + xmloff/source/chart/SchXMLParagraphContext \ + xmloff/source/chart/XMLTextOrientationHdl \ + xmloff/source/chart/XMLSymbolTypePropertyHdl \ + xmloff/source/chart/SchXMLChartContext \ + xmloff/source/chart/XMLChartStyleContext \ + xmloff/source/chart/SchXMLAutoStylePoolP \ + xmloff/source/chart/SchXMLTableContext \ + xmloff/source/chart/SchXMLCalculationSettingsContext \ + xmloff/source/chart/SchXMLExport \ + xmloff/source/text/XMLChangedRegionImportContext \ + xmloff/source/text/XMLIndexUserSourceContext \ + xmloff/source/text/txtfldi \ + xmloff/source/text/XMLTextShapeImportHelper \ + xmloff/source/text/XMLIndexTOCStylesContext \ + xmloff/source/text/XMLIndexSimpleEntryContext \ + xmloff/source/text/txtftne \ + xmloff/source/text/XMLTextColumnsExport \ + xmloff/source/text/XMLChangeImportContext \ + xmloff/source/text/XMLSectionSourceImportContext \ + xmloff/source/text/XMLIndexAlphabeticalSourceContext \ + xmloff/source/text/txtparae \ + xmloff/source/text/XMLIndexTabStopEntryContext \ + xmloff/source/text/XMLTextMasterPageContext \ + xmloff/source/text/XMLTextHeaderFooterContext \ + xmloff/source/text/XMLIndexBibliographyEntryContext \ + xmloff/source/text/XMLIndexTOCContext \ + xmloff/source/text/XMLSectionImportContext \ + xmloff/source/text/XMLStringBufferImportContext \ + xmloff/source/text/XMLTextShapeStyleContext \ + xmloff/source/text/XMLSectionFootnoteConfigImport \ + xmloff/source/text/txtparai \ + xmloff/source/text/XMLIndexIllustrationSourceContext \ + xmloff/source/text/txtprmap \ + xmloff/source/text/XMLRedlineExport \ + xmloff/source/text/XMLTextMasterPageExport \ + xmloff/source/text/XMLIndexTableSourceContext \ + xmloff/source/text/XMLLineNumberingExport \ + xmloff/source/text/XMLSectionExport \ + xmloff/source/text/XMLTextMasterStylesContext \ + xmloff/source/text/XMLTextFrameContext \ + xmloff/source/text/XMLFootnoteImportContext \ + xmloff/source/text/txtvfldi \ + xmloff/source/text/txtdropi \ + xmloff/source/text/XMLTextListAutoStylePool \ + xmloff/source/text/XMLIndexTitleTemplateContext \ + xmloff/source/text/XMLChangeElementImportContext \ + xmloff/source/text/XMLIndexSourceBaseContext \ + xmloff/source/text/XMLTextNumRuleInfo \ + xmloff/source/text/XMLSectionFootnoteConfigExport \ + xmloff/source/text/XMLFootnoteConfigurationImportContext \ + xmloff/source/text/XMLIndexTOCSourceContext \ + xmloff/source/text/txtlists \ + xmloff/source/text/XMLLineNumberingSeparatorImportContext \ + xmloff/source/text/XMLLineNumberingImportContext \ + xmloff/source/text/XMLIndexMarkExport \ + xmloff/source/text/XMLSectionSourceDDEImportContext \ + xmloff/source/text/XMLFootnoteBodyImportContext \ + xmloff/source/text/XMLTextColumnsContext \ + xmloff/source/text/XMLAutoTextContainerEventImport \ + xmloff/source/text/XMLAutoMarkFileContext \ + xmloff/source/text/txtflde \ + xmloff/source/text/txtstyli \ + xmloff/source/text/txtsecte \ + xmloff/source/text/XMLPropertyBackpatcher \ + xmloff/source/text/XMLChangeInfoContext \ + xmloff/source/text/XMLCalculationSettingsContext \ + xmloff/source/text/XMLIndexBodyContext \ + xmloff/source/text/XMLTextFrameHyperlinkContext \ + xmloff/source/text/txtexppr \ + xmloff/source/text/XMLTextCharStyleNamesElementExport \ + xmloff/source/text/XMLAutoTextEventExport \ + xmloff/source/text/txtdrope \ + xmloff/source/text/XMLIndexSpanEntryContext \ + xmloff/source/text/XMLIndexChapterInfoEntryContext \ + xmloff/source/text/XMLTextListItemContext \ + xmloff/source/text/XMLIndexTemplateContext \ + xmloff/source/text/XMLAutoTextEventImport \ + xmloff/source/text/txtstyle \ + xmloff/source/text/XMLTrackedChangesImportContext \ + xmloff/source/text/XMLTextTableContext \ + xmloff/source/text/XMLIndexBibliographyConfigurationContext \ + xmloff/source/text/txtprhdl \ + xmloff/source/text/txtimppr \ + xmloff/source/text/XMLTextMarkImportContext \ + xmloff/source/text/XMLIndexBibliographySourceContext \ + xmloff/source/text/txtimp \ + xmloff/source/text/XMLIndexObjectSourceContext \ + xmloff/source/text/XMLTextPropertySetContext \ + xmloff/source/text/XMLTextListBlockContext \ + xmloff/source/script/XMLEventImportHelper \ + xmloff/source/script/xmlscripti \ + xmloff/source/script/XMLStarBasicExportHandler \ + xmloff/source/script/XMLScriptExportHandler \ + xmloff/source/script/XMLEventsImportContext \ + xmloff/source/script/xmlbasici \ + xmloff/source/script/XMLEventExport \ + xmloff/source/script/XMLScriptContextFactory \ + xmloff/source/script/XMLStarBasicContextFactory \ + xmloff/source/table/XMLTableImport \ + xmloff/source/table/XMLTableExport \ + xmloff/source/xforms/XFormsSubmissionContext \ + xmloff/source/xforms/SchemaRestrictionContext \ + xmloff/source/xforms/XFormsInstanceContext \ + xmloff/source/xforms/SchemaContext \ + xmloff/source/xforms/XFormsBindContext \ + xmloff/source/xforms/xformsexport \ + xmloff/source/xforms/xformsimport \ + xmloff/source/xforms/SchemaSimpleTypeContext \ + xmloff/source/xforms/TokenContext \ + xmloff/source/xforms/XFormsModelContext \ + xmloff/source/xforms/xformsapi \ + xmloff/source/forms/controlelement \ + xmloff/source/forms/formcellbinding \ + xmloff/source/forms/elementexport \ + xmloff/source/forms/eventimport \ + xmloff/source/forms/layerimport \ + xmloff/source/forms/elementimport \ + xmloff/source/forms/formattributes \ + xmloff/source/forms/formlayerimport \ + xmloff/source/forms/officeforms \ + xmloff/source/forms/layerexport \ + xmloff/source/forms/formlayerexport \ + xmloff/source/forms/eventexport \ + xmloff/source/forms/formenums \ + xmloff/source/forms/valueproperties \ + xmloff/source/forms/formstyles \ + xmloff/source/forms/controlpropertyhdl \ + xmloff/source/forms/propertyexport \ + xmloff/source/forms/gridcolumnproptranslator \ + xmloff/source/forms/propertyimport \ + xmloff/source/forms/controlpropertymap \ + xmloff/source/forms/formevents \ + xmloff/source/forms/strings \ + xmloff/source/forms/attriblistmerge \ + xmloff/source/forms/logging \ + xmloff/source/forms/formsimp \ + xmloff/source/style/opaquhdl \ + xmloff/source/style/impastp4 \ + xmloff/source/style/PageMasterImportContext \ + xmloff/source/style/DashStyle \ + xmloff/source/style/MultiPropertySetHelper \ + xmloff/source/style/PageMasterStyleMap \ + xmloff/source/style/WordWrapPropertyHdl \ + xmloff/source/style/XMLConstantsPropertyHandler \ + xmloff/source/style/xmltabi \ + xmloff/source/style/MarkerStyle \ + xmloff/source/style/XMLElementPropertyContext \ + xmloff/source/style/VisAreaExport \ + xmloff/source/style/undlihdl \ + xmloff/source/style/XMLIsPercentagePropertyHandler \ + xmloff/source/style/EnumPropertyHdl \ + xmloff/source/style/durationhdl \ + xmloff/source/style/XMLFontAutoStylePool \ + xmloff/source/style/shadwhdl \ + xmloff/source/style/xmlaustp \ + xmloff/source/style/numehelp \ + xmloff/source/style/adjushdl \ + xmloff/source/style/PageMasterExportPropMapper \ + xmloff/source/style/postuhdl \ + xmloff/source/style/TransGradientStyle \ + xmloff/source/style/XMLRectangleMembersHandler \ + xmloff/source/style/xmlbahdl \ + xmloff/source/style/xmlprcon \ + xmloff/source/style/ImageStyle \ + xmloff/source/style/xmlnumi \ + xmloff/source/style/kernihdl \ + xmloff/source/style/XMLBitmapLogicalSizePropertyHandler \ + xmloff/source/style/impastp1 \ + xmloff/source/style/xmlnumfi \ + xmloff/source/style/VisAreaContext \ + xmloff/source/style/bordrhdl \ + xmloff/source/style/prhdlfac \ + xmloff/source/style/xmlnumfe \ + xmloff/source/style/xmlimppr \ + xmloff/source/style/cdouthdl \ + xmloff/source/style/styleexp \ + xmloff/source/style/AttributeContainerHandler \ + xmloff/source/style/PageMasterPropHdl \ + xmloff/source/style/XMLBackgroundImageExport \ + xmloff/source/style/PageMasterPropMapper \ + xmloff/source/style/PagePropertySetContext \ + xmloff/source/style/XMLPercentOrMeasurePropertyHandler \ + xmloff/source/style/XMLBackgroundImageContext \ + xmloff/source/style/prstylei \ + xmloff/source/style/csmaphdl \ + xmloff/source/style/PageHeaderFooterContext \ + xmloff/source/style/XMLFontStylesContext \ + xmloff/source/style/PageMasterImportPropMapper \ + xmloff/source/style/lspachdl \ + xmloff/source/style/StyleMap \ + xmloff/source/style/XMLClipPropertyHandler \ + xmloff/source/style/XMLPageExport \ + xmloff/source/style/PageMasterPropHdlFactory \ + xmloff/source/style/xmlnume \ + xmloff/source/style/NamedBoolPropertyHdl \ + xmloff/source/style/xmlexppr \ + xmloff/source/style/xmltabe \ + xmloff/source/style/chrhghdl \ + xmloff/source/style/FillStyleContext \ + xmloff/source/style/breakhdl \ + xmloff/source/style/fonthdl \ + xmloff/source/style/escphdl \ + xmloff/source/style/xmlstyle \ + xmloff/source/style/HatchStyle \ + xmloff/source/style/chrlohdl \ + xmloff/source/style/xmlprhdl \ + xmloff/source/style/GradientStyle \ + xmloff/source/style/uniref \ + xmloff/source/style/impastp2 \ + xmloff/source/style/impastp3 \ + xmloff/source/style/XMLFootnoteSeparatorExport \ + xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler \ + xmloff/source/style/DrawAspectHdl \ + xmloff/source/style/tabsthdl \ + xmloff/source/style/xmlprmap \ + xmloff/source/style/XMLFillBitmapSizePropertyHandler \ + xmloff/source/style/XMLFootnoteSeparatorImport \ + xmloff/source/style/backhdl \ + xmloff/source/style/weighhdl \ + xmloff/source/style/SinglePropertySetInfoCache \ + xmloff/source/style/shdwdhdl \ + xmloff/source/core/i18nmap \ + xmloff/source/core/xmlimp \ + xmloff/source/core/unointerfacetouniqueidentifiermapper \ + xmloff/source/core/xmlexp \ + xmloff/source/core/XMLEmbeddedObjectExportFilter \ + xmloff/source/core/PropertySetMerger \ + xmloff/source/core/xmltoken \ + xmloff/source/core/xmlerror \ + xmloff/source/core/nmspmap \ + xmloff/source/core/xmlkywd \ + xmloff/source/core/xmluconv \ + xmloff/source/core/XMLBase64Export \ + xmloff/source/core/DomExport \ + xmloff/source/core/RDFaExportHelper \ + xmloff/source/core/xmltkmap \ + xmloff/source/core/DocumentSettingsContext \ + xmloff/source/core/xmlictxt \ + xmloff/source/core/XMLBase64ImportContext \ + xmloff/source/core/xmlehelp \ + xmloff/source/core/XMLEmbeddedObjectImportContext \ + xmloff/source/core/xmlcnitm \ + xmloff/source/core/ProgressBarHelper \ + xmloff/source/core/XMLBasicExportFilter \ + xmloff/source/core/facreg \ + xmloff/source/core/unoatrcn \ + xmloff/source/core/SettingsExportHelper \ + xmloff/source/core/DomBuilderContext \ + xmloff/source/core/attrlist \ + xmloff/source/core/RDFaImportHelper \ + xmloff/source/meta/xmlmetae \ + xmloff/source/meta/xmlversion \ + xmloff/source/meta/MetaImportComponent \ + xmloff/source/meta/xmlmetai \ + xmloff/source/meta/MetaExportComponent \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,xo,\ + icuuc \ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,xo,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet ts=4 sw=4: diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk new file mode 100644 index 000000000000..320aafbf12fe --- /dev/null +++ b/xmloff/Library_xof.mk @@ -0,0 +1,110 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,xof)) + +$(eval $(call gb_Library_set_include,xof,\ + -I$(SRCDIR)/xmloff/inc/pch \ + -I$(SRCDIR)/xmloff/inc \ + -I$(SRCDIR)/xmloff/source/inc \ + -I$(WORKDIR)/inc/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,xof,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + salhelper \ + stl \ + xo \ +)) + +$(eval $(call gb_Library_add_exception_objects,xof,\ + xmloff/source/transform/OOo2Oasis \ + xmloff/source/transform/StyleOOoTContext \ + xmloff/source/transform/EventOOoTContext \ + xmloff/source/transform/DocumentTContext \ + xmloff/source/transform/NotesTContext \ + xmloff/source/transform/Oasis2OOo \ + xmloff/source/transform/TransformerContext \ + xmloff/source/transform/ChartOASISTContext \ + xmloff/source/transform/PropertyActionsOASIS \ + xmloff/source/transform/DeepTContext \ + xmloff/source/transform/DlgOASISTContext \ + xmloff/source/transform/FormPropOOoTContext \ + xmloff/source/transform/TransformerBase \ + xmloff/source/transform/FormPropOASISTContext \ + xmloff/source/transform/RenameElemTContext \ + xmloff/source/transform/ControlOOoTContext \ + xmloff/source/transform/FrameOASISTContext \ + xmloff/source/transform/EventOASISTContext \ + xmloff/source/transform/TransformerTokenMap \ + xmloff/source/transform/PersMixedContentTContext \ + xmloff/source/transform/ProcAttrTContext \ + xmloff/source/transform/MetaTContext \ + xmloff/source/transform/TransformerActions \ + xmloff/source/transform/ControlOASISTContext \ + xmloff/source/transform/ChartPlotAreaOOoTContext \ + xmloff/source/transform/MutableAttrList \ + xmloff/source/transform/PropertyActionsOOo \ + xmloff/source/transform/ChartOOoTContext \ + xmloff/source/transform/EventMap \ + xmloff/source/transform/FlatTContext \ + xmloff/source/transform/CreateElemTContext \ + xmloff/source/transform/ProcAddAttrTContext \ + xmloff/source/transform/XMLFilterRegistration \ + xmloff/source/transform/MergeElemTContext \ + xmloff/source/transform/PersAttrListTContext \ + xmloff/source/transform/FrameOOoTContext \ + xmloff/source/transform/ChartPlotAreaOASISTContext \ + xmloff/source/transform/StyleOASISTContext \ + xmloff/source/transform/IgnoreTContext \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,xof,\ + icuuc \ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,xof,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet ts=4 sw=4: diff --git a/xmloff/Makefile b/xmloff/Makefile index 9ab4b8ba83f4..60d34122e271 100644 --- a/xmloff/Makefile +++ b/xmloff/Makefile @@ -25,12 +25,13 @@ # #************************************************************************* +ifeq ($(strip $(SOLARENV)),) +$(error No environment set) +endif + GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk - -gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) - -$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) +$(eval $(call gb_Module_make_global_targets)) # vim: set noet sw=4 ts=4: diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk new file mode 100644 index 000000000000..eacc83068dad --- /dev/null +++ b/xmloff/Module_xmloff.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,xmloff)) + +$(eval $(call gb_Module_add_targets,xmloff,\ + Library_xo \ + Library_xof \ + Package_dtd \ + Package_inc \ +)) + +#todo: map file +#todo: xmlkywd.lib - built, but never used?! + +# vim: set noet ts=4 sw=4: diff --git a/xmloff/Package_dtd.mk b/xmloff/Package_dtd.mk new file mode 100644 index 000000000000..fbfbe4a1400d --- /dev/null +++ b/xmloff/Package_dtd.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,xmloff_dtd,$(SRCDIR)/xmloff/dtd)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/Blocklist.dtd,Blocklist.dtd)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/chart.mod,chart.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/datastyl.mod,datastyl.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/defs.mod,defs.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/drawing.mod,drawing.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/dtypes.mod,dtypes.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/form.mod,form.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/meta.mod,meta.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/nmspace.mod,nmspace.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.dtd,office.dtd)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.mod,office.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/openoffice-2.0-schema.rng,openoffice-2.0-schema.rng)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/script.mod,script.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/settings.mod,settings.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/style.mod,style.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/table.mod,table.mod)) +$(eval $(call gb_Package_add_file,xmloff_dtd,bin/text.mod,text.mod)) diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk new file mode 100644 index 000000000000..cd0500c6b55d --- /dev/null +++ b/xmloff/Package_inc.mk @@ -0,0 +1,131 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,xmloff_inc,$(SRCDIR)/xmloff/inc)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/dllapi.h,xmloff/dllapi.h)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFilterServiceNames.h,xmloff/XMLFilterServiceNames.h)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEmbeddedObjectExportFilter.hxx,xmloff/XMLEmbeddedObjectExportFilter.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DocumentSettingsContext.hxx,xmloff/DocumentSettingsContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/contextid.hxx,xmloff/contextid.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetai.hxx,xmloff/xmlmetai.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprmap.hxx,xmloff/xmlprmap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumi.hxx,xmloff/xmlnumi.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlement.hxx,xmloff/xmlement.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/nmspmap.hxx,xmloff/nmspmap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/functional.hxx,xmloff/functional.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyle.hxx,xmloff/txtstyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyli.hxx,xmloff/txtstyli.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SinglePropertySetInfoCache.hxx,xmloff/SinglePropertySetInfoCache.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaContext.hxx,xmloff/VisAreaContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontStylesContext.hxx,xmloff/XMLFontStylesContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoHash.hxx,xmloff/PropertySetInfoHash.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltkmap.hxx,xmloff/xmltkmap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/NamedBoolPropertyHdl.hxx,xmloff/NamedBoolPropertyHdl.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLConstantsPropertyHandler.hxx,xmloff/XMLConstantsPropertyHandler.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnmspe.hxx,xmloff/xmlnmspe.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprhdl.hxx,xmloff/xmlprhdl.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeimport.hxx,xmloff/shapeimport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/EnumPropertyHdl.hxx,xmloff/EnumPropertyHdl.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLCharContext.hxx,xmloff/XMLCharContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaExport.hxx,xmloff/VisAreaExport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/unoatrcn.hxx,xmloff/unoatrcn.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/controlpropertyhdl.hxx,xmloff/controlpropertyhdl.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimppr.hxx,xmloff/xmlimppr.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltabe.hxx,xmloff/xmltabe.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventsImportContext.hxx,xmloff/XMLEventsImportContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PageMasterStyleMap.hxx,xmloff/PageMasterStyleMap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/families.hxx,xmloff/families.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/attrlist.hxx,xmloff/attrlist.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlreg.hxx,xmloff/xmlreg.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prstylei.hxx,xmloff/prstylei.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlerror.hxx,xmloff/xmlerror.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltoken.hxx,xmloff/xmltoken.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetae.hxx,xmloff/xmlmetae.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageExport.hxx,xmloff/XMLTextMasterPageExport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeexport.hxx,xmloff/shapeexport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimppr.hxx,xmloff/txtimppr.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLImportHelper.hxx,xmloff/SchXMLImportHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formsimp.hxx,xmloff/formsimp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ImageStyle.hxx,xmloff/ImageStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfi.hxx,xmloff/xmlnumfi.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/WordWrapPropertyHdl.hxx,xmloff/WordWrapPropertyHdl.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLStringVector.hxx,xmloff/XMLStringVector.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/styleexp.hxx,xmloff/styleexp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterStylesContext.hxx,xmloff/XMLTextMasterStylesContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlkywd.hxx,xmloff/xmlkywd.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnume.hxx,xmloff/xmlnume.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventExport.hxx,xmloff/XMLEventExport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerexport.hxx,xmloff/formlayerexport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtparae.hxx,xmloff/txtparae.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ProgressBarHelper.hxx,xmloff/ProgressBarHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnitm.hxx,xmloff/xmlcnitm.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmluconv.hxx,xmloff/xmluconv.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlscripti.hxx,xmloff/xmlscripti.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlaustp.hxx,xmloff/xmlaustp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfe.hxx,xmloff/xmlnumfe.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlevent.hxx,xmloff/xmlevent.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimp.hxx,xmloff/xmlimp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoKey.hxx,xmloff/PropertySetInfoKey.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerimport.hxx,xmloff/formlayerimport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/i18nmap.hxx,xmloff/i18nmap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DashStyle.hxx,xmloff/DashStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLShapeStyleContext.hxx,xmloff/XMLShapeStyleContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prhdlfac.hxx,xmloff/prhdlfac.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLPageExport.hxx,xmloff/XMLPageExport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/MarkerStyle.hxx,xmloff/MarkerStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLBase64ImportContext.hxx,xmloff/XMLBase64ImportContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsexport.hxx,xmloff/xformsexport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/uniref.hxx,xmloff/uniref.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimp.hxx,xmloff/txtimp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprcon.hxx,xmloff/xmlprcon.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtprmap.hxx,xmloff/txtprmap.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontAutoStylePool.hxx,xmloff/XMLFontAutoStylePool.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexp.hxx,xmloff/xmlexp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/GradientStyle.hxx,xmloff/GradientStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/HatchStyle.hxx,xmloff/HatchStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/animexp.hxx,xmloff/animexp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnimp.hxx,xmloff/xmlcnimp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageContext.hxx,xmloff/XMLTextMasterPageContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextListAutoStylePool.hxx,xmloff/XMLTextListAutoStylePool.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextTableContext.hxx,xmloff/XMLTextTableContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/maptype.hxx,xmloff/maptype.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/numehelp.hxx,xmloff/numehelp.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexppr.hxx,xmloff/xmlexppr.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlstyle.hxx,xmloff/xmlstyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeStyleContext.hxx,xmloff/XMLTextShapeStyleContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltypes.hxx,xmloff/xmltypes.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLExportHelper.hxx,xmloff/SchXMLExportHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsimport.hxx,xmloff/xformsimport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLGraphicsDefaultStyle.hxx,xmloff/XMLGraphicsDefaultStyle.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SettingsExportHelper.hxx,xmloff/SettingsExportHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlictxt.hxx,xmloff/xmlictxt.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableExport.hxx,xmloff/table/XMLTableExport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableImport.hxx,xmloff/table/XMLTableImport.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLSettingsExportContext.hxx,xmloff/XMLSettingsExportContext.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/odffields.hxx,xmloff/odffields.hxx)) diff --git a/xmloff/prj/target_lib_xo.mk b/xmloff/prj/target_lib_xo.mk deleted file mode 100644 index 5a13d5053f93..000000000000 --- a/xmloff/prj/target_lib_xo.mk +++ /dev/null @@ -1,395 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,xo)) - -$(eval $(call gb_Library_add_package_headers,xo,xmloff_inc)) - -$(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xmloff)) - -$(eval $(call gb_Library_set_include,xo,\ - $$(SOLARINC) \ - -I. \ - -I$(WORKDIR)/inc/ \ - -I$(SRCDIR)/xmloff/inc \ - -I$(SRCDIR)/xmloff/source/inc \ - -I$(SRCDIR)/xmloff/inc/pch \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_set_defs,xo,\ - $$(DEFS) \ - -DXMLOFF_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_add_linked_libs,xo,\ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - i18nisolang1 \ - sal \ - stl \ - svl \ - tl \ - utl \ - vos3 \ -)) - -$(eval $(call gb_Library_add_exception_objects,xo,\ - xmloff/source/draw/ximpshap \ - xmloff/source/draw/ximppage \ - xmloff/source/draw/ximpstyl \ - xmloff/source/draw/XMLShapeStyleContext \ - xmloff/source/draw/sdxmlimp \ - xmloff/source/draw/shapeimport \ - xmloff/source/draw/ximplink \ - xmloff/source/draw/propimp0 \ - xmloff/source/draw/ximpbody \ - xmloff/source/draw/eventimp \ - xmloff/source/draw/layerimp \ - xmloff/source/draw/shapeexport2 \ - xmloff/source/draw/animimp \ - xmloff/source/draw/ximp3dscene \ - xmloff/source/draw/ximpgrp \ - xmloff/source/draw/XMLImageMapExport \ - xmloff/source/draw/numithdl \ - xmloff/source/draw/XMLReplacementImageContext \ - xmloff/source/draw/ximpshow \ - xmloff/source/draw/descriptionimp \ - xmloff/source/draw/xexptran \ - xmloff/source/draw/animationexport \ - xmloff/source/draw/viewcontext \ - xmloff/source/draw/sdpropls \ - xmloff/source/draw/shapeexport3 \ - xmloff/source/draw/ximp3dobject \ - xmloff/source/draw/EnhancedCustomShapeToken \ - xmloff/source/draw/ximpcustomshape \ - xmloff/source/draw/shapeexport4 \ - xmloff/source/draw/animationimport \ - xmloff/source/draw/XMLGraphicsDefaultStyle \ - xmloff/source/draw/ximpnote \ - xmloff/source/draw/shapeexport \ - xmloff/source/draw/XMLImageMapContext \ - xmloff/source/draw/sdxmlexp \ - xmloff/source/draw/animexp \ - xmloff/source/draw/layerexp \ - xmloff/source/draw/XMLNumberStyles \ - xmloff/source/draw/XMLShapePropertySetContext \ - xmloff/source/chart/SchXMLImport \ - xmloff/source/chart/XMLErrorIndicatorPropertyHdl \ - xmloff/source/chart/PropertyMaps \ - xmloff/source/chart/ColorPropertySet \ - xmloff/source/chart/transporttypes \ - xmloff/source/chart/XMLSymbolImageContext \ - xmloff/source/chart/SchXMLTextListContext \ - xmloff/source/chart/SchXMLTools \ - xmloff/source/chart/XMLLabelSeparatorContext \ - xmloff/source/chart/XMLChartPropertyContext \ - xmloff/source/chart/SchXMLSeriesHelper \ - xmloff/source/chart/SchXMLSeries2Context \ - xmloff/source/chart/SchXMLPlotAreaContext \ - xmloff/source/chart/contexts \ - xmloff/source/chart/XMLErrorBarStylePropertyHdl \ - xmloff/source/chart/XMLAxisPositionPropertyHdl \ - xmloff/source/chart/SchXMLParagraphContext \ - xmloff/source/chart/XMLTextOrientationHdl \ - xmloff/source/chart/XMLSymbolTypePropertyHdl \ - xmloff/source/chart/SchXMLChartContext \ - xmloff/source/chart/XMLChartStyleContext \ - xmloff/source/chart/SchXMLAutoStylePoolP \ - xmloff/source/chart/SchXMLTableContext \ - xmloff/source/chart/SchXMLCalculationSettingsContext \ - xmloff/source/chart/SchXMLExport \ - xmloff/source/text/XMLChangedRegionImportContext \ - xmloff/source/text/XMLIndexUserSourceContext \ - xmloff/source/text/txtfldi \ - xmloff/source/text/XMLTextShapeImportHelper \ - xmloff/source/text/XMLIndexTOCStylesContext \ - xmloff/source/text/XMLIndexSimpleEntryContext \ - xmloff/source/text/txtftne \ - xmloff/source/text/XMLTextColumnsExport \ - xmloff/source/text/XMLChangeImportContext \ - xmloff/source/text/XMLSectionSourceImportContext \ - xmloff/source/text/XMLIndexAlphabeticalSourceContext \ - xmloff/source/text/txtparae \ - xmloff/source/text/XMLIndexTabStopEntryContext \ - xmloff/source/text/XMLTextMasterPageContext \ - xmloff/source/text/XMLTextHeaderFooterContext \ - xmloff/source/text/XMLIndexBibliographyEntryContext \ - xmloff/source/text/XMLIndexTOCContext \ - xmloff/source/text/XMLSectionImportContext \ - xmloff/source/text/XMLStringBufferImportContext \ - xmloff/source/text/XMLTextShapeStyleContext \ - xmloff/source/text/XMLSectionFootnoteConfigImport \ - xmloff/source/text/txtparai \ - xmloff/source/text/XMLIndexIllustrationSourceContext \ - xmloff/source/text/txtprmap \ - xmloff/source/text/XMLRedlineExport \ - xmloff/source/text/XMLTextMasterPageExport \ - xmloff/source/text/XMLIndexTableSourceContext \ - xmloff/source/text/XMLLineNumberingExport \ - xmloff/source/text/XMLSectionExport \ - xmloff/source/text/XMLTextMasterStylesContext \ - xmloff/source/text/XMLTextFrameContext \ - xmloff/source/text/XMLFootnoteImportContext \ - xmloff/source/text/txtvfldi \ - xmloff/source/text/txtdropi \ - xmloff/source/text/XMLTextListAutoStylePool \ - xmloff/source/text/XMLIndexTitleTemplateContext \ - xmloff/source/text/XMLChangeElementImportContext \ - xmloff/source/text/XMLIndexSourceBaseContext \ - xmloff/source/text/XMLTextNumRuleInfo \ - xmloff/source/text/XMLSectionFootnoteConfigExport \ - xmloff/source/text/XMLFootnoteConfigurationImportContext \ - xmloff/source/text/XMLIndexTOCSourceContext \ - xmloff/source/text/txtlists \ - xmloff/source/text/XMLLineNumberingSeparatorImportContext \ - xmloff/source/text/XMLLineNumberingImportContext \ - xmloff/source/text/XMLIndexMarkExport \ - xmloff/source/text/XMLSectionSourceDDEImportContext \ - xmloff/source/text/XMLFootnoteBodyImportContext \ - xmloff/source/text/XMLTextColumnsContext \ - xmloff/source/text/XMLAutoTextContainerEventImport \ - xmloff/source/text/XMLAutoMarkFileContext \ - xmloff/source/text/txtflde \ - xmloff/source/text/txtstyli \ - xmloff/source/text/txtsecte \ - xmloff/source/text/XMLPropertyBackpatcher \ - xmloff/source/text/XMLChangeInfoContext \ - xmloff/source/text/XMLCalculationSettingsContext \ - xmloff/source/text/XMLIndexBodyContext \ - xmloff/source/text/XMLTextFrameHyperlinkContext \ - xmloff/source/text/txtexppr \ - xmloff/source/text/XMLTextCharStyleNamesElementExport \ - xmloff/source/text/XMLAutoTextEventExport \ - xmloff/source/text/txtdrope \ - xmloff/source/text/XMLIndexSpanEntryContext \ - xmloff/source/text/XMLIndexChapterInfoEntryContext \ - xmloff/source/text/XMLTextListItemContext \ - xmloff/source/text/XMLIndexTemplateContext \ - xmloff/source/text/XMLAutoTextEventImport \ - xmloff/source/text/txtstyle \ - xmloff/source/text/XMLTrackedChangesImportContext \ - xmloff/source/text/XMLTextTableContext \ - xmloff/source/text/XMLIndexBibliographyConfigurationContext \ - xmloff/source/text/txtprhdl \ - xmloff/source/text/txtimppr \ - xmloff/source/text/XMLTextMarkImportContext \ - xmloff/source/text/XMLIndexBibliographySourceContext \ - xmloff/source/text/txtimp \ - xmloff/source/text/XMLIndexObjectSourceContext \ - xmloff/source/text/XMLTextPropertySetContext \ - xmloff/source/text/XMLTextListBlockContext \ - xmloff/source/script/XMLEventImportHelper \ - xmloff/source/script/xmlscripti \ - xmloff/source/script/XMLStarBasicExportHandler \ - xmloff/source/script/XMLScriptExportHandler \ - xmloff/source/script/XMLEventsImportContext \ - xmloff/source/script/xmlbasici \ - xmloff/source/script/XMLEventExport \ - xmloff/source/script/XMLScriptContextFactory \ - xmloff/source/script/XMLStarBasicContextFactory \ - xmloff/source/table/XMLTableImport \ - xmloff/source/table/XMLTableExport \ - xmloff/source/xforms/XFormsSubmissionContext \ - xmloff/source/xforms/SchemaRestrictionContext \ - xmloff/source/xforms/XFormsInstanceContext \ - xmloff/source/xforms/SchemaContext \ - xmloff/source/xforms/XFormsBindContext \ - xmloff/source/xforms/xformsexport \ - xmloff/source/xforms/xformsimport \ - xmloff/source/xforms/SchemaSimpleTypeContext \ - xmloff/source/xforms/TokenContext \ - xmloff/source/xforms/XFormsModelContext \ - xmloff/source/xforms/xformsapi \ - xmloff/source/forms/controlelement \ - xmloff/source/forms/formcellbinding \ - xmloff/source/forms/elementexport \ - xmloff/source/forms/eventimport \ - xmloff/source/forms/layerimport \ - xmloff/source/forms/elementimport \ - xmloff/source/forms/formattributes \ - xmloff/source/forms/formlayerimport \ - xmloff/source/forms/officeforms \ - xmloff/source/forms/layerexport \ - xmloff/source/forms/formlayerexport \ - xmloff/source/forms/eventexport \ - xmloff/source/forms/formenums \ - xmloff/source/forms/valueproperties \ - xmloff/source/forms/formstyles \ - xmloff/source/forms/controlpropertyhdl \ - xmloff/source/forms/propertyexport \ - xmloff/source/forms/gridcolumnproptranslator \ - xmloff/source/forms/propertyimport \ - xmloff/source/forms/controlpropertymap \ - xmloff/source/forms/formevents \ - xmloff/source/forms/strings \ - xmloff/source/forms/attriblistmerge \ - xmloff/source/forms/logging \ - xmloff/source/forms/formsimp \ - xmloff/source/style/opaquhdl \ - xmloff/source/style/impastp4 \ - xmloff/source/style/PageMasterImportContext \ - xmloff/source/style/DashStyle \ - xmloff/source/style/MultiPropertySetHelper \ - xmloff/source/style/PageMasterStyleMap \ - xmloff/source/style/WordWrapPropertyHdl \ - xmloff/source/style/XMLConstantsPropertyHandler \ - xmloff/source/style/xmltabi \ - xmloff/source/style/MarkerStyle \ - xmloff/source/style/XMLElementPropertyContext \ - xmloff/source/style/VisAreaExport \ - xmloff/source/style/undlihdl \ - xmloff/source/style/XMLIsPercentagePropertyHandler \ - xmloff/source/style/EnumPropertyHdl \ - xmloff/source/style/durationhdl \ - xmloff/source/style/XMLFontAutoStylePool \ - xmloff/source/style/shadwhdl \ - xmloff/source/style/xmlaustp \ - xmloff/source/style/numehelp \ - xmloff/source/style/adjushdl \ - xmloff/source/style/PageMasterExportPropMapper \ - xmloff/source/style/postuhdl \ - xmloff/source/style/TransGradientStyle \ - xmloff/source/style/XMLRectangleMembersHandler \ - xmloff/source/style/xmlbahdl \ - xmloff/source/style/xmlprcon \ - xmloff/source/style/ImageStyle \ - xmloff/source/style/xmlnumi \ - xmloff/source/style/kernihdl \ - xmloff/source/style/XMLBitmapLogicalSizePropertyHandler \ - xmloff/source/style/impastp1 \ - xmloff/source/style/xmlnumfi \ - xmloff/source/style/VisAreaContext \ - xmloff/source/style/bordrhdl \ - xmloff/source/style/prhdlfac \ - xmloff/source/style/xmlnumfe \ - xmloff/source/style/xmlimppr \ - xmloff/source/style/cdouthdl \ - xmloff/source/style/styleexp \ - xmloff/source/style/AttributeContainerHandler \ - xmloff/source/style/PageMasterPropHdl \ - xmloff/source/style/XMLBackgroundImageExport \ - xmloff/source/style/PageMasterPropMapper \ - xmloff/source/style/PagePropertySetContext \ - xmloff/source/style/XMLPercentOrMeasurePropertyHandler \ - xmloff/source/style/XMLBackgroundImageContext \ - xmloff/source/style/prstylei \ - xmloff/source/style/csmaphdl \ - xmloff/source/style/PageHeaderFooterContext \ - xmloff/source/style/XMLFontStylesContext \ - xmloff/source/style/PageMasterImportPropMapper \ - xmloff/source/style/lspachdl \ - xmloff/source/style/StyleMap \ - xmloff/source/style/XMLClipPropertyHandler \ - xmloff/source/style/XMLPageExport \ - xmloff/source/style/PageMasterPropHdlFactory \ - xmloff/source/style/xmlnume \ - xmloff/source/style/NamedBoolPropertyHdl \ - xmloff/source/style/xmlexppr \ - xmloff/source/style/xmltabe \ - xmloff/source/style/chrhghdl \ - xmloff/source/style/FillStyleContext \ - xmloff/source/style/breakhdl \ - xmloff/source/style/fonthdl \ - xmloff/source/style/escphdl \ - xmloff/source/style/xmlstyle \ - xmloff/source/style/HatchStyle \ - xmloff/source/style/chrlohdl \ - xmloff/source/style/xmlprhdl \ - xmloff/source/style/GradientStyle \ - xmloff/source/style/uniref \ - xmloff/source/style/impastp2 \ - xmloff/source/style/impastp3 \ - xmloff/source/style/XMLFootnoteSeparatorExport \ - xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler \ - xmloff/source/style/DrawAspectHdl \ - xmloff/source/style/tabsthdl \ - xmloff/source/style/xmlprmap \ - xmloff/source/style/XMLFillBitmapSizePropertyHandler \ - xmloff/source/style/XMLFootnoteSeparatorImport \ - xmloff/source/style/backhdl \ - xmloff/source/style/weighhdl \ - xmloff/source/style/SinglePropertySetInfoCache \ - xmloff/source/style/shdwdhdl \ - xmloff/source/core/i18nmap \ - xmloff/source/core/xmlimp \ - xmloff/source/core/unointerfacetouniqueidentifiermapper \ - xmloff/source/core/xmlexp \ - xmloff/source/core/XMLEmbeddedObjectExportFilter \ - xmloff/source/core/PropertySetMerger \ - xmloff/source/core/xmltoken \ - xmloff/source/core/xmlerror \ - xmloff/source/core/nmspmap \ - xmloff/source/core/xmlkywd \ - xmloff/source/core/xmluconv \ - xmloff/source/core/XMLBase64Export \ - xmloff/source/core/DomExport \ - xmloff/source/core/RDFaExportHelper \ - xmloff/source/core/xmltkmap \ - xmloff/source/core/DocumentSettingsContext \ - xmloff/source/core/xmlictxt \ - xmloff/source/core/XMLBase64ImportContext \ - xmloff/source/core/xmlehelp \ - xmloff/source/core/XMLEmbeddedObjectImportContext \ - xmloff/source/core/xmlcnitm \ - xmloff/source/core/ProgressBarHelper \ - xmloff/source/core/XMLBasicExportFilter \ - xmloff/source/core/facreg \ - xmloff/source/core/unoatrcn \ - xmloff/source/core/SettingsExportHelper \ - xmloff/source/core/DomBuilderContext \ - xmloff/source/core/attrlist \ - xmloff/source/core/RDFaImportHelper \ - xmloff/source/meta/xmlmetae \ - xmloff/source/meta/xmlversion \ - xmloff/source/meta/MetaImportComponent \ - xmloff/source/meta/xmlmetai \ - xmloff/source/meta/MetaExportComponent \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,xo,\ - icuuc \ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,xo,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -# vim: set noet ts=4 sw=4: diff --git a/xmloff/prj/target_lib_xof.mk b/xmloff/prj/target_lib_xof.mk deleted file mode 100644 index 320aafbf12fe..000000000000 --- a/xmloff/prj/target_lib_xof.mk +++ /dev/null @@ -1,110 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,xof)) - -$(eval $(call gb_Library_set_include,xof,\ - -I$(SRCDIR)/xmloff/inc/pch \ - -I$(SRCDIR)/xmloff/inc \ - -I$(SRCDIR)/xmloff/source/inc \ - -I$(WORKDIR)/inc/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ -)) - -$(eval $(call gb_Library_add_linked_libs,xof,\ - comphelper \ - cppu \ - cppuhelper \ - sal \ - salhelper \ - stl \ - xo \ -)) - -$(eval $(call gb_Library_add_exception_objects,xof,\ - xmloff/source/transform/OOo2Oasis \ - xmloff/source/transform/StyleOOoTContext \ - xmloff/source/transform/EventOOoTContext \ - xmloff/source/transform/DocumentTContext \ - xmloff/source/transform/NotesTContext \ - xmloff/source/transform/Oasis2OOo \ - xmloff/source/transform/TransformerContext \ - xmloff/source/transform/ChartOASISTContext \ - xmloff/source/transform/PropertyActionsOASIS \ - xmloff/source/transform/DeepTContext \ - xmloff/source/transform/DlgOASISTContext \ - xmloff/source/transform/FormPropOOoTContext \ - xmloff/source/transform/TransformerBase \ - xmloff/source/transform/FormPropOASISTContext \ - xmloff/source/transform/RenameElemTContext \ - xmloff/source/transform/ControlOOoTContext \ - xmloff/source/transform/FrameOASISTContext \ - xmloff/source/transform/EventOASISTContext \ - xmloff/source/transform/TransformerTokenMap \ - xmloff/source/transform/PersMixedContentTContext \ - xmloff/source/transform/ProcAttrTContext \ - xmloff/source/transform/MetaTContext \ - xmloff/source/transform/TransformerActions \ - xmloff/source/transform/ControlOASISTContext \ - xmloff/source/transform/ChartPlotAreaOOoTContext \ - xmloff/source/transform/MutableAttrList \ - xmloff/source/transform/PropertyActionsOOo \ - xmloff/source/transform/ChartOOoTContext \ - xmloff/source/transform/EventMap \ - xmloff/source/transform/FlatTContext \ - xmloff/source/transform/CreateElemTContext \ - xmloff/source/transform/ProcAddAttrTContext \ - xmloff/source/transform/XMLFilterRegistration \ - xmloff/source/transform/MergeElemTContext \ - xmloff/source/transform/PersAttrListTContext \ - xmloff/source/transform/FrameOOoTContext \ - xmloff/source/transform/ChartPlotAreaOASISTContext \ - xmloff/source/transform/StyleOASISTContext \ - xmloff/source/transform/IgnoreTContext \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,xof,\ - icuuc \ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,xof,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -# vim: set noet ts=4 sw=4: diff --git a/xmloff/prj/target_module_xmloff.mk b/xmloff/prj/target_module_xmloff.mk deleted file mode 100644 index 6a90531db467..000000000000 --- a/xmloff/prj/target_module_xmloff.mk +++ /dev/null @@ -1,44 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Module_Module,xmloff,\ - $(call gb_Library_get_target,xo) \ - $(call gb_Library_get_target,xof) \ - $(call gb_Package_get_target,xmloff_dtd) \ - $(call gb_Package_get_target,xmloff_inc) \ -)) - -$(eval $(call gb_Module_read_includes,xmloff,\ - lib_xo \ - lib_xof \ - package_dtd \ - package_inc \ -)) - -#todo: map file -#todo: xmlkywd.lib - built, but never used?! - diff --git a/xmloff/prj/target_package_dtd.mk b/xmloff/prj/target_package_dtd.mk deleted file mode 100644 index fbfbe4a1400d..000000000000 --- a/xmloff/prj/target_package_dtd.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,xmloff_dtd,$(SRCDIR)/xmloff/dtd)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/Blocklist.dtd,Blocklist.dtd)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/chart.mod,chart.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/datastyl.mod,datastyl.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/defs.mod,defs.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/drawing.mod,drawing.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/dtypes.mod,dtypes.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/form.mod,form.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/meta.mod,meta.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/nmspace.mod,nmspace.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.dtd,office.dtd)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.mod,office.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/openoffice-2.0-schema.rng,openoffice-2.0-schema.rng)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/script.mod,script.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/settings.mod,settings.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/style.mod,style.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/table.mod,table.mod)) -$(eval $(call gb_Package_add_file,xmloff_dtd,bin/text.mod,text.mod)) diff --git a/xmloff/prj/target_package_inc.mk b/xmloff/prj/target_package_inc.mk deleted file mode 100644 index cd0500c6b55d..000000000000 --- a/xmloff/prj/target_package_inc.mk +++ /dev/null @@ -1,131 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,xmloff_inc,$(SRCDIR)/xmloff/inc)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/dllapi.h,xmloff/dllapi.h)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFilterServiceNames.h,xmloff/XMLFilterServiceNames.h)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEmbeddedObjectExportFilter.hxx,xmloff/XMLEmbeddedObjectExportFilter.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DocumentSettingsContext.hxx,xmloff/DocumentSettingsContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/contextid.hxx,xmloff/contextid.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetai.hxx,xmloff/xmlmetai.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprmap.hxx,xmloff/xmlprmap.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumi.hxx,xmloff/xmlnumi.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlement.hxx,xmloff/xmlement.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/nmspmap.hxx,xmloff/nmspmap.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/functional.hxx,xmloff/functional.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyle.hxx,xmloff/txtstyle.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyli.hxx,xmloff/txtstyli.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SinglePropertySetInfoCache.hxx,xmloff/SinglePropertySetInfoCache.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaContext.hxx,xmloff/VisAreaContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontStylesContext.hxx,xmloff/XMLFontStylesContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoHash.hxx,xmloff/PropertySetInfoHash.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltkmap.hxx,xmloff/xmltkmap.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/NamedBoolPropertyHdl.hxx,xmloff/NamedBoolPropertyHdl.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLConstantsPropertyHandler.hxx,xmloff/XMLConstantsPropertyHandler.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnmspe.hxx,xmloff/xmlnmspe.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprhdl.hxx,xmloff/xmlprhdl.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeimport.hxx,xmloff/shapeimport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/EnumPropertyHdl.hxx,xmloff/EnumPropertyHdl.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLCharContext.hxx,xmloff/XMLCharContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaExport.hxx,xmloff/VisAreaExport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/unoatrcn.hxx,xmloff/unoatrcn.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/controlpropertyhdl.hxx,xmloff/controlpropertyhdl.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimppr.hxx,xmloff/xmlimppr.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltabe.hxx,xmloff/xmltabe.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventsImportContext.hxx,xmloff/XMLEventsImportContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PageMasterStyleMap.hxx,xmloff/PageMasterStyleMap.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/families.hxx,xmloff/families.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/attrlist.hxx,xmloff/attrlist.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlreg.hxx,xmloff/xmlreg.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prstylei.hxx,xmloff/prstylei.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlerror.hxx,xmloff/xmlerror.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltoken.hxx,xmloff/xmltoken.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetae.hxx,xmloff/xmlmetae.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageExport.hxx,xmloff/XMLTextMasterPageExport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeexport.hxx,xmloff/shapeexport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimppr.hxx,xmloff/txtimppr.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLImportHelper.hxx,xmloff/SchXMLImportHelper.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formsimp.hxx,xmloff/formsimp.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ImageStyle.hxx,xmloff/ImageStyle.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfi.hxx,xmloff/xmlnumfi.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/WordWrapPropertyHdl.hxx,xmloff/WordWrapPropertyHdl.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLStringVector.hxx,xmloff/XMLStringVector.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/styleexp.hxx,xmloff/styleexp.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterStylesContext.hxx,xmloff/XMLTextMasterStylesContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlkywd.hxx,xmloff/xmlkywd.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnume.hxx,xmloff/xmlnume.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventExport.hxx,xmloff/XMLEventExport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerexport.hxx,xmloff/formlayerexport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtparae.hxx,xmloff/txtparae.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ProgressBarHelper.hxx,xmloff/ProgressBarHelper.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnitm.hxx,xmloff/xmlcnitm.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmluconv.hxx,xmloff/xmluconv.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlscripti.hxx,xmloff/xmlscripti.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlaustp.hxx,xmloff/xmlaustp.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfe.hxx,xmloff/xmlnumfe.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlevent.hxx,xmloff/xmlevent.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimp.hxx,xmloff/xmlimp.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoKey.hxx,xmloff/PropertySetInfoKey.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerimport.hxx,xmloff/formlayerimport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/i18nmap.hxx,xmloff/i18nmap.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DashStyle.hxx,xmloff/DashStyle.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLShapeStyleContext.hxx,xmloff/XMLShapeStyleContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prhdlfac.hxx,xmloff/prhdlfac.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLPageExport.hxx,xmloff/XMLPageExport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/MarkerStyle.hxx,xmloff/MarkerStyle.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLBase64ImportContext.hxx,xmloff/XMLBase64ImportContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsexport.hxx,xmloff/xformsexport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/uniref.hxx,xmloff/uniref.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimp.hxx,xmloff/txtimp.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprcon.hxx,xmloff/xmlprcon.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtprmap.hxx,xmloff/txtprmap.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontAutoStylePool.hxx,xmloff/XMLFontAutoStylePool.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexp.hxx,xmloff/xmlexp.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/GradientStyle.hxx,xmloff/GradientStyle.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/HatchStyle.hxx,xmloff/HatchStyle.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/animexp.hxx,xmloff/animexp.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnimp.hxx,xmloff/xmlcnimp.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageContext.hxx,xmloff/XMLTextMasterPageContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextListAutoStylePool.hxx,xmloff/XMLTextListAutoStylePool.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextTableContext.hxx,xmloff/XMLTextTableContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/maptype.hxx,xmloff/maptype.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/numehelp.hxx,xmloff/numehelp.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexppr.hxx,xmloff/xmlexppr.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlstyle.hxx,xmloff/xmlstyle.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeStyleContext.hxx,xmloff/XMLTextShapeStyleContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltypes.hxx,xmloff/xmltypes.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLExportHelper.hxx,xmloff/SchXMLExportHelper.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsimport.hxx,xmloff/xformsimport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLGraphicsDefaultStyle.hxx,xmloff/XMLGraphicsDefaultStyle.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SettingsExportHelper.hxx,xmloff/SettingsExportHelper.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlictxt.hxx,xmloff/xmlictxt.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableExport.hxx,xmloff/table/XMLTableExport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableImport.hxx,xmloff/table/XMLTableImport.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLSettingsExportContext.hxx,xmloff/XMLSettingsExportContext.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/odffields.hxx,xmloff/odffields.hxx)) -- cgit v1.2.3 From aba206910970f804423bebb27a07c47004e9a127 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 02:05:52 +0200 Subject: CWS gnumake2: reaching through verbosity and max processes --- framework/prj/makefile.mk | 35 ++++++++++++++++++++++++++++++++++- sfx2/prj/makefile.mk | 35 ++++++++++++++++++++++++++++++++++- xmloff/prj/makefile.mk | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 102 insertions(+), 3 deletions(-) (limited to 'sfx2') diff --git a/framework/prj/makefile.mk b/framework/prj/makefile.mk index 2a0b99e72fd5..967bfea90d3c 100644 --- a/framework/prj/makefile.mk +++ b/framework/prj/makefile.mk @@ -1,2 +1,35 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +.IF $(VERBOSE) +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + all: - cd .. && make -srj9 + @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index 2a0b99e72fd5..967bfea90d3c 100644 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -1,2 +1,35 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +.IF $(VERBOSE) +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + all: - cd .. && make -srj9 + @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) diff --git a/xmloff/prj/makefile.mk b/xmloff/prj/makefile.mk index 2a0b99e72fd5..967bfea90d3c 100644 --- a/xmloff/prj/makefile.mk +++ b/xmloff/prj/makefile.mk @@ -1,2 +1,35 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +.IF $(VERBOSE) +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + all: - cd .. && make -srj9 + @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit v1.2.3 From 305193791e7143970687ea4c0dc47dca02022b2c Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Tue, 29 Jun 2010 13:43:23 +0200 Subject: sb123:#i111449# makefile cleanups for qa/complex tests --- linguistic/qa/complex/linguistic/makefile.mk | 1 - sfx2/qa/complex/docinfo/makefile.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'sfx2') diff --git a/linguistic/qa/complex/linguistic/makefile.mk b/linguistic/qa/complex/linguistic/makefile.mk index b0d274167b98..2d10ec4c832d 100644 --- a/linguistic/qa/complex/linguistic/makefile.mk +++ b/linguistic/qa/complex/linguistic/makefile.mk @@ -27,7 +27,6 @@ .IF "$(OOO_SUBSEQUENT_TESTS)" == "" nothing .PHONY: - @echo "OOO_SUBSEQUENT_TESTS not set, do nothing." .ELSE PRJ = ../../.. diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk index 51f2ddd02597..626b648a6d06 100644 --- a/sfx2/qa/complex/docinfo/makefile.mk +++ b/sfx2/qa/complex/docinfo/makefile.mk @@ -45,7 +45,7 @@ JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) # Sample how to debug -JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y .END -- cgit v1.2.3 From 5a55565739b5a13d395c690b871d108d11f419cd Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Thu, 1 Jul 2010 13:19:11 +0200 Subject: sb123:#i111449# cleanups in build.lst for qa/complex tests --- sfx2/prj/build.lst | 3 ++- ucb/prj/build.lst | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sfx2') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index fdc2999a781e..3a99e7fae347 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -25,5 +25,6 @@ sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL -sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_util NULL +sf sfx2\qa\complex\framework\DocHelper nmake - all sf_qa_complex_framework_dochelper sf_util NULL +sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst index cc40077674e0..fc66b41b74b2 100644 --- a/ucb/prj/build.lst +++ b/ucb/prj/build.lst @@ -19,4 +19,5 @@ uc ucb\qa\unoapi nmake - all uc_qa_unoapi NULL uc ucb\qa\complex\ucb nmake - all uc_complex_ucb uc_inc NULL # fails, please fix -# uc ucb\qa\complex\tdoc nmake - all uc_complex_tdoc uc_inc NULL +# uc ucb\qa\complex\tdoc\interfaces nmake - all uc_complex_tdoc_interfaces uc_inc NULL +# uc ucb\qa\complex\tdoc nmake - all uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL -- cgit v1.2.3 From b7c1a7a78bcf1c1824e893e2b4f4620def043c9c Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Fri, 23 Jul 2010 12:20:26 +0200 Subject: sb123:#i111449# fix all run through problems for qa/complex tests --- framework/prj/build.lst | 30 ++++++++++++++-------- .../qa/complex/XUserInputInterception/makefile.mk | 7 +++++ linguistic/prj/build.lst | 2 +- sfx2/prj/build.lst | 9 ++++--- 4 files changed, 33 insertions(+), 15 deletions(-) (limited to 'sfx2') diff --git a/framework/prj/build.lst b/framework/prj/build.lst index 69bfe22833ab..9c1feb3e8f5b 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -23,19 +23,25 @@ fr framework\util nmake - all fr_util fr_constant fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL # complex tests -fr framework\qa\complex\ModuleManager nmake - all fr_qa_complex_modulemanager NULL -fr framework\qa\complex\XUserInputInterception nmake - all fr_qa_complex_xuserinputinterception NULL -fr framework\qa\complex\accelerators\helper nmake - all fr_qa_complex_accel_helper NULL -fr framework\qa\complex\accelerators nmake - all fr_qa_complex_accel fr_qa_complex_accel_helper NULL +# fails on unxsoli4 +# fr framework\qa\complex\ModuleManager nmake - all fr_qa_complex_modulemanager NULL +# fr framework\qa\complex\XUserInputInterception nmake - all fr_qa_complex_xuserinputinterception NULL + +# subdir has to remove +# fr framework\qa\complex\accelerators\helper nmake - all fr_qa_complex_accel_helper NULL +# fr framework\qa\complex\accelerators nmake - all fr_qa_complex_accel fr_qa_complex_accel_helper NULL # unclear should be remove # fr framework\qa\complex\api_internal nmake - all fr_qa_complex_api_internal NULL + # BUG! opens an error box # fr framework\qa\complex\broken_document nmake - all fr_qa_complex_broken_doc NULL fr framework\qa\complex\desktop nmake - all fr_qa_complex_desktop NULL -fr framework\qa\complex\dispatches\helper nmake - all fr_qa_complex_dispatches_helper NULL -fr framework\qa\complex\dispatches nmake - all fr_qa_complex_dispatches fr_qa_complex_dispatches_helper NULL -fr framework\qa\complex\disposing nmake - all fr_qa_complex_disposing NULL + +# subdir has to remove +# fr framework\qa\complex\dispatches\helper nmake - all fr_qa_complex_dispatches_helper NULL +# fr framework\qa\complex\dispatches nmake - all fr_qa_complex_dispatches fr_qa_complex_dispatches_helper NULL +# fr framework\qa\complex\disposing nmake - all fr_qa_complex_disposing NULL # GPF # fr framework\qa\complex\framework\autosave nmake - all fr_qa_complex_framework_autosave NULL @@ -43,11 +49,13 @@ fr framework\qa\complex\disposing nmake - all fr_qa_complex_dispo # much too complex, will not change to new junit # fr framework\qa\complex\framework\recovery nmake - all fr_qa_complex_framework_recovery NULL -fr framework\qa\complex\imageManager\interfaces nmake - all fr_qa_complex_imageManager_interfaces NULL -fr framework\qa\complex\imageManager nmake - all fr_qa_complex_imageManager fr_qa_complex_imageManager_interfaces NULL +# subdir has to remove +# fr framework\qa\complex\imageManager\interfaces nmake - all fr_qa_complex_imageManager_interfaces NULL +# fr framework\qa\complex\imageManager nmake - all fr_qa_complex_imageManager fr_qa_complex_imageManager_interfaces NULL -fr framework\qa\complex\loadAllDocuments\helper nmake - all fr_qa_complex_loadAllDocuments_helper NULL -fr framework\qa\complex\loadAllDocuments nmake - all fr_qa_complex_loadAllDocuments fr_qa_complex_loadAllDocuments_helper NULL +# subdir has to remove +# fr framework\qa\complex\loadAllDocuments\helper nmake - all fr_qa_complex_loadAllDocuments_helper NULL +# fr framework\qa\complex\loadAllDocuments nmake - all fr_qa_complex_loadAllDocuments fr_qa_complex_loadAllDocuments_helper NULL # need cleanups # fr framework\qa\complex\path_settings nmake - all fr_qa_complex_path_settings NULL diff --git a/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk index fff9ea938f6b..d25ec9b4f6f7 100644 --- a/framework/qa/complex/XUserInputInterception/makefile.mk +++ b/framework/qa/complex/XUserInputInterception/makefile.mk @@ -24,10 +24,17 @@ # for a copy of the LGPLv3 License. # #************************************************************************* + .IF "$(OOO_SUBSEQUENT_TESTS)" == "" nothing .PHONY: .ELSE +# we don't want something like this. +# .IF "$(OS)"=="LINUX" +# nothing .PHONY: +# @echo "Test marked as failed on this platform" +# .END + PRJ = ../../.. PRJNAME = framework TARGET = qa_complex_xuserinputinterception diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst index d36b5d11cfcc..b85d4cfd9d73 100644 --- a/linguistic/prj/build.lst +++ b/linguistic/prj/build.lst @@ -7,4 +7,4 @@ lg linguistic\source nmake - all lg_src lg_inc NULL lg linguistic\qa\unoapi nmake - all lg_qa_unoapi NULL # could be we need a Japanese office version -lg linguistic\qa\complex\linguistic nmake - all lg_qa_complex NULL +# lg linguistic\qa\complex\linguistic nmake - all lg_qa_complex NULL diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 3a99e7fae347..7d2b52e3a9e7 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -24,7 +24,10 @@ sf sfx2\util sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL -sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL -sf sfx2\qa\complex\framework\DocHelper nmake - all sf_qa_complex_framework_dochelper sf_util NULL -sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL +# fails on unxsoli4 +# sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL + +# subdir has to remove +# sf sfx2\qa\complex\framework\DocHelper nmake - all sf_qa_complex_framework_dochelper sf_util NULL +# sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL -- cgit v1.2.3 From 9899711e43c99d81b9472c61c1190ab57230371d Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 27 Jul 2010 14:23:19 +0200 Subject: sb123: #i111449# disabled sfx2/qa/complex/docinfo again for now --- sfx2/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 7d2b52e3a9e7..d2964afdc3ee 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -30,4 +30,4 @@ sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL # subdir has to remove # sf sfx2\qa\complex\framework\DocHelper nmake - all sf_qa_complex_framework_dochelper sf_util NULL # sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL -sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL +# sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL -- cgit v1.2.3 From b5ff94fde0cc506d9c3c17c2762101a0c7a657e4 Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Mon, 23 Aug 2010 10:38:44 +0200 Subject: sb123:#i111449# remove all subdirs in complex tests --- framework/prj/build.lst | 8 - framework/qa/complex/ModuleManager/makefile.mk | 3 - .../qa/complex/XUserInputInterception/makefile.mk | 3 - .../AcceleratorsConfigurationTest.java | 2 +- framework/qa/complex/accelerators/KeyMapping.java | 168 ++++++++ .../qa/complex/accelerators/helper/KeyMapping.java | 168 -------- framework/qa/complex/accelerators/makefile.mk | 6 +- framework/qa/complex/api_internal/makefile.mk | 3 - framework/qa/complex/broken_document/makefile.mk | 3 - .../qa/complex/contextMenuInterceptor/makefile.mk | 3 - framework/qa/complex/desktop/makefile.mk | 3 - framework/qa/complex/dispatches/Interceptor.java | 345 +++++++++++++++ .../qa/complex/dispatches/checkdispatchapi.java | 2 +- .../qa/complex/dispatches/helper/Interceptor.java | 345 --------------- framework/qa/complex/dispatches/makefile.mk | 6 +- framework/qa/complex/disposing/makefile.mk | 3 - .../qa/complex/framework/autosave/makefile.mk | 3 - .../qa/complex/imageManager/CheckImageManager.java | 12 +- framework/qa/complex/imageManager/_XComponent.java | 187 ++++++++ .../qa/complex/imageManager/_XImageManager.java | 117 +++++ .../qa/complex/imageManager/_XInitialization.java | 94 ++++ .../qa/complex/imageManager/_XTypeProvider.java | 102 +++++ .../qa/complex/imageManager/_XUIConfiguration.java | 82 ++++ .../imageManager/_XUIConfigurationPersistence.java | 93 ++++ .../imageManager/interfaces/_XComponent.java | 187 -------- .../imageManager/interfaces/_XImageManager.java | 117 ----- .../imageManager/interfaces/_XInitialization.java | 94 ---- .../imageManager/interfaces/_XTypeProvider.java | 102 ----- .../imageManager/interfaces/_XUIConfiguration.java | 82 ---- .../interfaces/_XUIConfigurationPersistence.java | 93 ---- framework/qa/complex/imageManager/makefile.mk | 11 +- .../loadAllDocuments/CheckXComponentLoader.java | 2 - .../loadAllDocuments/InteractionHandler.java | 155 +++++++ .../complex/loadAllDocuments/StatusIndicator.java | 237 +++++++++++ .../complex/loadAllDocuments/StreamSimulator.java | 474 +++++++++++++++++++++ .../helper/InteractionHandler.java | 155 ------- .../loadAllDocuments/helper/StatusIndicator.java | 237 ----------- .../loadAllDocuments/helper/StreamSimulator.java | 474 --------------------- framework/qa/complex/loadAllDocuments/makefile.mk | 9 +- framework/qa/complex/path_settings/makefile.mk | 3 - framework/qa/complex/path_substitution/makefile.mk | 3 - linguistic/qa/complex/linguistic/makefile.mk | 3 - sfx2/prj/build.lst | 2 - sfx2/qa/complex/framework/DialogThread.java | 95 +++++ .../complex/framework/DocHelper/DialogThread.java | 95 ----- .../complex/framework/DocHelper/WriterHelper.java | 287 ------------- sfx2/qa/complex/framework/WriterHelper.java | 287 +++++++++++++ sfx2/qa/complex/framework/makefile.mk | 6 +- ucb/prj/build.lst | 1 - ucb/qa/complex/tdoc/CheckContentProvider.java | 10 - .../tdoc/CheckTransientDocumentsContent.java | 1 + .../CheckTransientDocumentsContentProvider.java | 3 +- .../CheckTransientDocumentsDocumentContent.java | 1 + ucb/qa/complex/tdoc/_XChild.java | 104 +++++ .../complex/tdoc/_XCommandInfoChangeNotifier.java | 64 +++ ucb/qa/complex/tdoc/_XCommandProcessor.java | 286 +++++++++++++ ucb/qa/complex/tdoc/_XComponent.java | 171 ++++++++ ucb/qa/complex/tdoc/_XContent.java | 86 ++++ .../complex/tdoc/_XPropertiesChangeNotifier.java | 67 +++ ucb/qa/complex/tdoc/_XPropertyContainer.java | 102 +++++ .../tdoc/_XPropertySetInfoChangeNotifier.java | 67 +++ ucb/qa/complex/tdoc/_XServiceInfo.java | 99 +++++ ucb/qa/complex/tdoc/_XTypeProvider.java | 95 +++++ ucb/qa/complex/tdoc/interfaces/_XChild.java | 104 ----- .../interfaces/_XCommandInfoChangeNotifier.java | 64 --- .../tdoc/interfaces/_XCommandProcessor.java | 286 ------------- ucb/qa/complex/tdoc/interfaces/_XComponent.java | 171 -------- ucb/qa/complex/tdoc/interfaces/_XContent.java | 86 ---- .../interfaces/_XPropertiesChangeNotifier.java | 67 --- .../tdoc/interfaces/_XPropertyContainer.java | 102 ----- .../_XPropertySetInfoChangeNotifier.java | 67 --- ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java | 99 ----- ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java | 95 ----- ucb/qa/complex/tdoc/makefile.mk | 16 +- 74 files changed, 3616 insertions(+), 3669 deletions(-) create mode 100644 framework/qa/complex/accelerators/KeyMapping.java delete mode 100644 framework/qa/complex/accelerators/helper/KeyMapping.java create mode 100644 framework/qa/complex/dispatches/Interceptor.java delete mode 100644 framework/qa/complex/dispatches/helper/Interceptor.java create mode 100755 framework/qa/complex/imageManager/_XComponent.java create mode 100755 framework/qa/complex/imageManager/_XImageManager.java create mode 100755 framework/qa/complex/imageManager/_XInitialization.java create mode 100755 framework/qa/complex/imageManager/_XTypeProvider.java create mode 100755 framework/qa/complex/imageManager/_XUIConfiguration.java create mode 100755 framework/qa/complex/imageManager/_XUIConfigurationPersistence.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XComponent.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XImageManager.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XInitialization.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XTypeProvider.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java create mode 100644 framework/qa/complex/loadAllDocuments/InteractionHandler.java create mode 100644 framework/qa/complex/loadAllDocuments/StatusIndicator.java create mode 100644 framework/qa/complex/loadAllDocuments/StreamSimulator.java delete mode 100644 framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java delete mode 100644 framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java delete mode 100644 framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java create mode 100644 sfx2/qa/complex/framework/DialogThread.java delete mode 100644 sfx2/qa/complex/framework/DocHelper/DialogThread.java delete mode 100644 sfx2/qa/complex/framework/DocHelper/WriterHelper.java create mode 100644 sfx2/qa/complex/framework/WriterHelper.java create mode 100755 ucb/qa/complex/tdoc/_XChild.java create mode 100755 ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java create mode 100755 ucb/qa/complex/tdoc/_XCommandProcessor.java create mode 100755 ucb/qa/complex/tdoc/_XComponent.java create mode 100755 ucb/qa/complex/tdoc/_XContent.java create mode 100755 ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java create mode 100755 ucb/qa/complex/tdoc/_XPropertyContainer.java create mode 100755 ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java create mode 100755 ucb/qa/complex/tdoc/_XServiceInfo.java create mode 100755 ucb/qa/complex/tdoc/_XTypeProvider.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XChild.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XComponent.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XContent.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java (limited to 'sfx2') diff --git a/framework/prj/build.lst b/framework/prj/build.lst index 9c1feb3e8f5b..153dea29af2c 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -27,8 +27,6 @@ fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL # fr framework\qa\complex\ModuleManager nmake - all fr_qa_complex_modulemanager NULL # fr framework\qa\complex\XUserInputInterception nmake - all fr_qa_complex_xuserinputinterception NULL -# subdir has to remove -# fr framework\qa\complex\accelerators\helper nmake - all fr_qa_complex_accel_helper NULL # fr framework\qa\complex\accelerators nmake - all fr_qa_complex_accel fr_qa_complex_accel_helper NULL # unclear should be remove @@ -38,8 +36,6 @@ fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL # fr framework\qa\complex\broken_document nmake - all fr_qa_complex_broken_doc NULL fr framework\qa\complex\desktop nmake - all fr_qa_complex_desktop NULL -# subdir has to remove -# fr framework\qa\complex\dispatches\helper nmake - all fr_qa_complex_dispatches_helper NULL # fr framework\qa\complex\dispatches nmake - all fr_qa_complex_dispatches fr_qa_complex_dispatches_helper NULL # fr framework\qa\complex\disposing nmake - all fr_qa_complex_disposing NULL @@ -49,12 +45,8 @@ fr framework\qa\complex\desktop nmake - all fr_qa_complex_deskt # much too complex, will not change to new junit # fr framework\qa\complex\framework\recovery nmake - all fr_qa_complex_framework_recovery NULL -# subdir has to remove -# fr framework\qa\complex\imageManager\interfaces nmake - all fr_qa_complex_imageManager_interfaces NULL # fr framework\qa\complex\imageManager nmake - all fr_qa_complex_imageManager fr_qa_complex_imageManager_interfaces NULL -# subdir has to remove -# fr framework\qa\complex\loadAllDocuments\helper nmake - all fr_qa_complex_loadAllDocuments_helper NULL # fr framework\qa\complex\loadAllDocuments nmake - all fr_qa_complex_loadAllDocuments fr_qa_complex_loadAllDocuments_helper NULL # need cleanups diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk index a27f0bcc36b4..4ad6d8929030 100644 --- a/framework/qa/complex/ModuleManager/makefile.mk +++ b/framework/qa/complex/ModuleManager/makefile.mk @@ -45,9 +45,6 @@ JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk index d25ec9b4f6f7..8b08bec171ee 100644 --- a/framework/qa/complex/XUserInputInterception/makefile.mk +++ b/framework/qa/complex/XUserInputInterception/makefile.mk @@ -52,9 +52,6 @@ JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java index 98e73189ea7e..b0d89ad81858 100644 --- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java +++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java @@ -46,7 +46,7 @@ import com.sun.star.uno.XInterface; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.XChangesBatch; -import complex.accelerators.helper.KeyMapping; +// import complex.accelerators.KeyMapping; // ---------- junit imports ----------------- diff --git a/framework/qa/complex/accelerators/KeyMapping.java b/framework/qa/complex/accelerators/KeyMapping.java new file mode 100644 index 000000000000..d09a51162e7c --- /dev/null +++ b/framework/qa/complex/accelerators/KeyMapping.java @@ -0,0 +1,168 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +package complex.accelerators; + +import java.util.HashMap; + +class KeyIdentifierInfo +{ + protected String sIdentifier; + protected Short nCode; + + KeyIdentifierInfo(String sID, Short nC) + { + sIdentifier = sID; + nCode = nC; + } +} + +class IdentifierHashMap extends HashMap +{ + public void put(String sIdentifier, Short nCode) + { + super.put(sIdentifier, nCode); + } + public Short get(String sIdentifier) + { + return (Short)super.get(sIdentifier); + } +} + +class CodeHashMap extends HashMap +{ + public void put(Short nCode, String sIdentifier) + { + super.put(nCode, sIdentifier); + } + public String get(Short nCode) + { + return (String)super.get(nCode); + } +} + +public class KeyMapping +{ + private IdentifierHashMap aIdentifierHashMap; + private CodeHashMap aCodeHashMap; + + public KeyMapping() + { + KeyIdentifierInfo[] aInfoMap = { + new KeyIdentifierInfo("0", new Short(com.sun.star.awt.Key.NUM0)), + new KeyIdentifierInfo("1", new Short(com.sun.star.awt.Key.NUM1)), + new KeyIdentifierInfo("2", new Short(com.sun.star.awt.Key.NUM2)), + new KeyIdentifierInfo("3", new Short(com.sun.star.awt.Key.NUM3)), + new KeyIdentifierInfo("4", new Short(com.sun.star.awt.Key.NUM4)), + new KeyIdentifierInfo("5", new Short(com.sun.star.awt.Key.NUM5)), + new KeyIdentifierInfo("6", new Short(com.sun.star.awt.Key.NUM6)), + new KeyIdentifierInfo("7", new Short(com.sun.star.awt.Key.NUM7)), + new KeyIdentifierInfo("8", new Short(com.sun.star.awt.Key.NUM8)), + new KeyIdentifierInfo("9", new Short(com.sun.star.awt.Key.NUM9)), + new KeyIdentifierInfo("A", new Short(com.sun.star.awt.Key.A)), + new KeyIdentifierInfo("B", new Short(com.sun.star.awt.Key.B)), + new KeyIdentifierInfo("C", new Short(com.sun.star.awt.Key.C)), + new KeyIdentifierInfo("D", new Short(com.sun.star.awt.Key.D)), + new KeyIdentifierInfo("E", new Short(com.sun.star.awt.Key.E)), + new KeyIdentifierInfo("F", new Short(com.sun.star.awt.Key.F)), + new KeyIdentifierInfo("G", new Short(com.sun.star.awt.Key.G)), + new KeyIdentifierInfo("H", new Short(com.sun.star.awt.Key.H)), + new KeyIdentifierInfo("I", new Short(com.sun.star.awt.Key.I)), + new KeyIdentifierInfo("J", new Short(com.sun.star.awt.Key.J)), + new KeyIdentifierInfo("K", new Short(com.sun.star.awt.Key.K)), + new KeyIdentifierInfo("L", new Short(com.sun.star.awt.Key.L)), + new KeyIdentifierInfo("M", new Short(com.sun.star.awt.Key.M)), + new KeyIdentifierInfo("N", new Short(com.sun.star.awt.Key.N)), + new KeyIdentifierInfo("O", new Short(com.sun.star.awt.Key.O)), + new KeyIdentifierInfo("P", new Short(com.sun.star.awt.Key.P)), + new KeyIdentifierInfo("Q", new Short(com.sun.star.awt.Key.Q)), + new KeyIdentifierInfo("R", new Short(com.sun.star.awt.Key.R)), + new KeyIdentifierInfo("S", new Short(com.sun.star.awt.Key.S)), + new KeyIdentifierInfo("T", new Short(com.sun.star.awt.Key.T)), + new KeyIdentifierInfo("U", new Short(com.sun.star.awt.Key.U)), + new KeyIdentifierInfo("V", new Short(com.sun.star.awt.Key.V)), + new KeyIdentifierInfo("W", new Short(com.sun.star.awt.Key.W)), + new KeyIdentifierInfo("X", new Short(com.sun.star.awt.Key.X)), + new KeyIdentifierInfo("Y", new Short(com.sun.star.awt.Key.Y)), + new KeyIdentifierInfo("Z", new Short(com.sun.star.awt.Key.Z)), + new KeyIdentifierInfo("F1", new Short(com.sun.star.awt.Key.F1)), + new KeyIdentifierInfo("F2", new Short(com.sun.star.awt.Key.F2)), + new KeyIdentifierInfo("F3", new Short(com.sun.star.awt.Key.F3)), + new KeyIdentifierInfo("F4", new Short(com.sun.star.awt.Key.F4)), + new KeyIdentifierInfo("F5", new Short(com.sun.star.awt.Key.F5)), + new KeyIdentifierInfo("F6", new Short(com.sun.star.awt.Key.F6)), + new KeyIdentifierInfo("F7", new Short(com.sun.star.awt.Key.F7)), + new KeyIdentifierInfo("F8", new Short(com.sun.star.awt.Key.F8)), + new KeyIdentifierInfo("F9", new Short(com.sun.star.awt.Key.F9)), + new KeyIdentifierInfo("F10", new Short(com.sun.star.awt.Key.F10)), + new KeyIdentifierInfo("F11", new Short(com.sun.star.awt.Key.F11)), + new KeyIdentifierInfo("F12", new Short(com.sun.star.awt.Key.F12)), + new KeyIdentifierInfo("DOWN", new Short(com.sun.star.awt.Key.DOWN)), + new KeyIdentifierInfo("UP", new Short(com.sun.star.awt.Key.UP)), + new KeyIdentifierInfo("LEFT", new Short(com.sun.star.awt.Key.LEFT)), + new KeyIdentifierInfo("RIGHT", new Short(com.sun.star.awt.Key.RIGHT)), + new KeyIdentifierInfo("HOME", new Short(com.sun.star.awt.Key.HOME)), + new KeyIdentifierInfo("END", new Short(com.sun.star.awt.Key.END)), + new KeyIdentifierInfo("PAGEUP", new Short(com.sun.star.awt.Key.PAGEUP)), + new KeyIdentifierInfo("PAGEDOWN", new Short(com.sun.star.awt.Key.PAGEDOWN)), + new KeyIdentifierInfo("RETURN", new Short(com.sun.star.awt.Key.RETURN)), + new KeyIdentifierInfo("ESCAPE", new Short(com.sun.star.awt.Key.ESCAPE)), + new KeyIdentifierInfo("TAB", new Short(com.sun.star.awt.Key.TAB)), + new KeyIdentifierInfo("BACKSPACE", new Short(com.sun.star.awt.Key.BACKSPACE)), + new KeyIdentifierInfo("SPACE", new Short(com.sun.star.awt.Key.SPACE)), + new KeyIdentifierInfo("INSERT", new Short(com.sun.star.awt.Key.INSERT)), + new KeyIdentifierInfo("DELETE", new Short(com.sun.star.awt.Key.DELETE)), + new KeyIdentifierInfo("ADD", new Short(com.sun.star.awt.Key.ADD)), + new KeyIdentifierInfo("SUBTRACT", new Short(com.sun.star.awt.Key.SUBTRACT)), + new KeyIdentifierInfo("MULTIPLY", new Short(com.sun.star.awt.Key.MULTIPLY)), + new KeyIdentifierInfo("DIVIDE", new Short(com.sun.star.awt.Key.DIVIDE)), + new KeyIdentifierInfo("CUT", new Short(com.sun.star.awt.Key.CUT)), + new KeyIdentifierInfo("COPY", new Short(com.sun.star.awt.Key.COPY)), + new KeyIdentifierInfo("PASTE", new Short(com.sun.star.awt.Key.PASTE)), + new KeyIdentifierInfo("UNDO", new Short(com.sun.star.awt.Key.UNDO)), + new KeyIdentifierInfo("REPEAT", new Short(com.sun.star.awt.Key.REPEAT)) + }; + + aIdentifierHashMap = new IdentifierHashMap(); + aCodeHashMap = new CodeHashMap(); + for (int i = 0; i - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.accelerators.helper; - -import java.util.HashMap; - -class KeyIdentifierInfo -{ - protected String sIdentifier; - protected Short nCode; - - KeyIdentifierInfo(String sID, Short nC) - { - sIdentifier = sID; - nCode = nC; - } -} - -class IdentifierHashMap extends HashMap -{ - public void put(String sIdentifier, Short nCode) - { - super.put(sIdentifier, nCode); - } - public Short get(String sIdentifier) - { - return (Short)super.get(sIdentifier); - } -} - -class CodeHashMap extends HashMap -{ - public void put(Short nCode, String sIdentifier) - { - super.put(nCode, sIdentifier); - } - public String get(Short nCode) - { - return (String)super.get(nCode); - } -} - -public class KeyMapping -{ - private IdentifierHashMap aIdentifierHashMap; - private CodeHashMap aCodeHashMap; - - public KeyMapping() - { - KeyIdentifierInfo[] aInfoMap = { - new KeyIdentifierInfo("0", new Short(com.sun.star.awt.Key.NUM0)), - new KeyIdentifierInfo("1", new Short(com.sun.star.awt.Key.NUM1)), - new KeyIdentifierInfo("2", new Short(com.sun.star.awt.Key.NUM2)), - new KeyIdentifierInfo("3", new Short(com.sun.star.awt.Key.NUM3)), - new KeyIdentifierInfo("4", new Short(com.sun.star.awt.Key.NUM4)), - new KeyIdentifierInfo("5", new Short(com.sun.star.awt.Key.NUM5)), - new KeyIdentifierInfo("6", new Short(com.sun.star.awt.Key.NUM6)), - new KeyIdentifierInfo("7", new Short(com.sun.star.awt.Key.NUM7)), - new KeyIdentifierInfo("8", new Short(com.sun.star.awt.Key.NUM8)), - new KeyIdentifierInfo("9", new Short(com.sun.star.awt.Key.NUM9)), - new KeyIdentifierInfo("A", new Short(com.sun.star.awt.Key.A)), - new KeyIdentifierInfo("B", new Short(com.sun.star.awt.Key.B)), - new KeyIdentifierInfo("C", new Short(com.sun.star.awt.Key.C)), - new KeyIdentifierInfo("D", new Short(com.sun.star.awt.Key.D)), - new KeyIdentifierInfo("E", new Short(com.sun.star.awt.Key.E)), - new KeyIdentifierInfo("F", new Short(com.sun.star.awt.Key.F)), - new KeyIdentifierInfo("G", new Short(com.sun.star.awt.Key.G)), - new KeyIdentifierInfo("H", new Short(com.sun.star.awt.Key.H)), - new KeyIdentifierInfo("I", new Short(com.sun.star.awt.Key.I)), - new KeyIdentifierInfo("J", new Short(com.sun.star.awt.Key.J)), - new KeyIdentifierInfo("K", new Short(com.sun.star.awt.Key.K)), - new KeyIdentifierInfo("L", new Short(com.sun.star.awt.Key.L)), - new KeyIdentifierInfo("M", new Short(com.sun.star.awt.Key.M)), - new KeyIdentifierInfo("N", new Short(com.sun.star.awt.Key.N)), - new KeyIdentifierInfo("O", new Short(com.sun.star.awt.Key.O)), - new KeyIdentifierInfo("P", new Short(com.sun.star.awt.Key.P)), - new KeyIdentifierInfo("Q", new Short(com.sun.star.awt.Key.Q)), - new KeyIdentifierInfo("R", new Short(com.sun.star.awt.Key.R)), - new KeyIdentifierInfo("S", new Short(com.sun.star.awt.Key.S)), - new KeyIdentifierInfo("T", new Short(com.sun.star.awt.Key.T)), - new KeyIdentifierInfo("U", new Short(com.sun.star.awt.Key.U)), - new KeyIdentifierInfo("V", new Short(com.sun.star.awt.Key.V)), - new KeyIdentifierInfo("W", new Short(com.sun.star.awt.Key.W)), - new KeyIdentifierInfo("X", new Short(com.sun.star.awt.Key.X)), - new KeyIdentifierInfo("Y", new Short(com.sun.star.awt.Key.Y)), - new KeyIdentifierInfo("Z", new Short(com.sun.star.awt.Key.Z)), - new KeyIdentifierInfo("F1", new Short(com.sun.star.awt.Key.F1)), - new KeyIdentifierInfo("F2", new Short(com.sun.star.awt.Key.F2)), - new KeyIdentifierInfo("F3", new Short(com.sun.star.awt.Key.F3)), - new KeyIdentifierInfo("F4", new Short(com.sun.star.awt.Key.F4)), - new KeyIdentifierInfo("F5", new Short(com.sun.star.awt.Key.F5)), - new KeyIdentifierInfo("F6", new Short(com.sun.star.awt.Key.F6)), - new KeyIdentifierInfo("F7", new Short(com.sun.star.awt.Key.F7)), - new KeyIdentifierInfo("F8", new Short(com.sun.star.awt.Key.F8)), - new KeyIdentifierInfo("F9", new Short(com.sun.star.awt.Key.F9)), - new KeyIdentifierInfo("F10", new Short(com.sun.star.awt.Key.F10)), - new KeyIdentifierInfo("F11", new Short(com.sun.star.awt.Key.F11)), - new KeyIdentifierInfo("F12", new Short(com.sun.star.awt.Key.F12)), - new KeyIdentifierInfo("DOWN", new Short(com.sun.star.awt.Key.DOWN)), - new KeyIdentifierInfo("UP", new Short(com.sun.star.awt.Key.UP)), - new KeyIdentifierInfo("LEFT", new Short(com.sun.star.awt.Key.LEFT)), - new KeyIdentifierInfo("RIGHT", new Short(com.sun.star.awt.Key.RIGHT)), - new KeyIdentifierInfo("HOME", new Short(com.sun.star.awt.Key.HOME)), - new KeyIdentifierInfo("END", new Short(com.sun.star.awt.Key.END)), - new KeyIdentifierInfo("PAGEUP", new Short(com.sun.star.awt.Key.PAGEUP)), - new KeyIdentifierInfo("PAGEDOWN", new Short(com.sun.star.awt.Key.PAGEDOWN)), - new KeyIdentifierInfo("RETURN", new Short(com.sun.star.awt.Key.RETURN)), - new KeyIdentifierInfo("ESCAPE", new Short(com.sun.star.awt.Key.ESCAPE)), - new KeyIdentifierInfo("TAB", new Short(com.sun.star.awt.Key.TAB)), - new KeyIdentifierInfo("BACKSPACE", new Short(com.sun.star.awt.Key.BACKSPACE)), - new KeyIdentifierInfo("SPACE", new Short(com.sun.star.awt.Key.SPACE)), - new KeyIdentifierInfo("INSERT", new Short(com.sun.star.awt.Key.INSERT)), - new KeyIdentifierInfo("DELETE", new Short(com.sun.star.awt.Key.DELETE)), - new KeyIdentifierInfo("ADD", new Short(com.sun.star.awt.Key.ADD)), - new KeyIdentifierInfo("SUBTRACT", new Short(com.sun.star.awt.Key.SUBTRACT)), - new KeyIdentifierInfo("MULTIPLY", new Short(com.sun.star.awt.Key.MULTIPLY)), - new KeyIdentifierInfo("DIVIDE", new Short(com.sun.star.awt.Key.DIVIDE)), - new KeyIdentifierInfo("CUT", new Short(com.sun.star.awt.Key.CUT)), - new KeyIdentifierInfo("COPY", new Short(com.sun.star.awt.Key.COPY)), - new KeyIdentifierInfo("PASTE", new Short(com.sun.star.awt.Key.PASTE)), - new KeyIdentifierInfo("UNDO", new Short(com.sun.star.awt.Key.UNDO)), - new KeyIdentifierInfo("REPEAT", new Short(com.sun.star.awt.Key.REPEAT)) - }; - - aIdentifierHashMap = new IdentifierHashMap(); - aCodeHashMap = new CodeHashMap(); - for (int i = 0; i + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.dispatches; + +// __________ Imports __________ + +// structs, const, ... +import com.sun.star.beans.PropertyValue; + +// exceptions +import com.sun.star.frame.DispatchDescriptor; +import com.sun.star.frame.XDispatch; +import com.sun.star.frame.XDispatchProvider; +import com.sun.star.frame.XDispatchProviderInterceptor; +import com.sun.star.frame.XInterceptorInfo; +import com.sun.star.frame.XStatusListener; + +// interfaces + + +// helper +import com.sun.star.util.URL; + +// others +//import java.lang.*; + +// __________ Implementation __________ + +/** + * implements a configurable interceptor for dispatch events. + */ +public class Interceptor implements XDispatchProvider, + XDispatch, + XDispatchProviderInterceptor, + XInterceptorInfo +{ + // ____________________ + + /** contains the list of interception URL schema's (wildcards are allowed there!) + supported by this interceptor. It can be set from outside. + If no external URLs are set, the default "*" is used instead. + That would have the same effect as if this implementation would not support the + interface XInterceptorInfo ! + */ + private String[] m_lURLs4InterceptionInfo = null; + + // ____________________ + + /** These URL's will be blocked by this interceptor. + Can be set from outside. Every queryDispatch() for these + set of URL's will be answered with an empty dispatch object! + If no external URLs are set the default "*" is used instead. + So every incoming URL will be blocked .-) + */ + private String[] m_lURLs4Blocking = null; + + // ____________________ + + /** Every dispatch interceptor knows it's master and slave interceptor + of the dispatch chain. These values must be stupid handled .-) + They have to be set and reset in case the right interface methods are called. + Nothing more. It's not allowed to dispose() it. + The slave can be used inside queryDispatch() to forward requests, + which are not handled by this interceptor instance. + */ + private XDispatchProvider m_xSlave = null; + private XDispatchProvider m_xMaster = null; + + // ____________________ + + /** counts calls of setSlave...(). + So the outside API test can use this value to know if this interceptor + was realy added to the interceptor chain of OOo. + */ + private int m_nRegistrationCount = 0; + + // ____________________ + + /** indicates if this interceptor object is currently part of the interceptor + chain of OOo. Only true if a valid slave or master dispatch is set on this + instance. + */ + private boolean m_bIsRegistered = false; + + + // ____________________ + + /** ctor + * It's initialize an object of this class with default values. + */ + public Interceptor() + { + } + + // ____________________ + + /** XInterceptorInfo */ + public synchronized String[] getInterceptedURLs() + { + return impl_getURLs4InterceptionInfo(); + } + + // ____________________ + + /** XDispatchProviderInterceptor */ + public synchronized XDispatchProvider getSlaveDispatchProvider() + { + System.out.println("Interceptor.getSlaveDispatchProvider() called"); + return m_xSlave; + } + + // ____________________ + + /** XDispatchProviderInterceptor */ + public synchronized XDispatchProvider getMasterDispatchProvider() + { + System.out.println("Interceptor.getMasterDispatchProvider() called"); + return m_xMaster; + } + + // ____________________ + + /** XDispatchProviderInterceptor */ + public synchronized void setSlaveDispatchProvider(XDispatchProvider xSlave) + { + System.out.println("Interceptor.setSlaveDispatchProvider("+xSlave+") called"); + + if (xSlave != null) + { + ++m_nRegistrationCount; + m_bIsRegistered = true; + } + else + { + m_bIsRegistered = false; + } + + m_xSlave = xSlave; + } + + // ____________________ + + /** XDispatchProviderInterceptor */ + public synchronized void setMasterDispatchProvider(XDispatchProvider xMaster) + { + System.out.println("Interceptor.setMasterDispatchProvider("+xMaster+") called"); + m_xMaster = xMaster; + } + + // ____________________ + + /** XDispatchProvider + */ + public synchronized XDispatch queryDispatch(URL aURL , + String sTargetFrameName, + int nSearchFlags ) + { + System.out.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sTargetFrameName+"', "+nSearchFlags+") called"); + + if (impl_isBlockedURL(aURL.Complete)) + { + System.out.println("Interceptor.queryDispatch(): URL blocked => returns NULL"); + return null; + } + + if (m_xSlave != null) + { + System.out.println("Interceptor.queryDispatch(): ask slave ..."); + return m_xSlave.queryDispatch(aURL, sTargetFrameName, nSearchFlags); + } + + System.out.println("Interceptor.queryDispatch(): no idea => returns this"); + return this; + } + + // ____________________ + + /** XDispatchProvider + */ + public XDispatch[] queryDispatches(DispatchDescriptor[] lRequests) + { + int i = 0; + int c = lRequests.length; + + XDispatch[] lResults = new XDispatch[c]; + for (i=0; i - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.dispatches.helper; - -// __________ Imports __________ - -// structs, const, ... -import com.sun.star.beans.PropertyValue; - -// exceptions -import com.sun.star.frame.DispatchDescriptor; -import com.sun.star.frame.XDispatch; -import com.sun.star.frame.XDispatchProvider; -import com.sun.star.frame.XDispatchProviderInterceptor; -import com.sun.star.frame.XInterceptorInfo; -import com.sun.star.frame.XStatusListener; - -// interfaces - - -// helper -import com.sun.star.util.URL; - -// others -//import java.lang.*; - -// __________ Implementation __________ - -/** - * implements a configurable interceptor for dispatch events. - */ -public class Interceptor implements XDispatchProvider, - XDispatch, - XDispatchProviderInterceptor, - XInterceptorInfo -{ - // ____________________ - - /** contains the list of interception URL schema's (wildcards are allowed there!) - supported by this interceptor. It can be set from outside. - If no external URLs are set, the default "*" is used instead. - That would have the same effect as if this implementation would not support the - interface XInterceptorInfo ! - */ - private String[] m_lURLs4InterceptionInfo = null; - - // ____________________ - - /** These URL's will be blocked by this interceptor. - Can be set from outside. Every queryDispatch() for these - set of URL's will be answered with an empty dispatch object! - If no external URLs are set the default "*" is used instead. - So every incoming URL will be blocked .-) - */ - private String[] m_lURLs4Blocking = null; - - // ____________________ - - /** Every dispatch interceptor knows it's master and slave interceptor - of the dispatch chain. These values must be stupid handled .-) - They have to be set and reset in case the right interface methods are called. - Nothing more. It's not allowed to dispose() it. - The slave can be used inside queryDispatch() to forward requests, - which are not handled by this interceptor instance. - */ - private XDispatchProvider m_xSlave = null; - private XDispatchProvider m_xMaster = null; - - // ____________________ - - /** counts calls of setSlave...(). - So the outside API test can use this value to know if this interceptor - was realy added to the interceptor chain of OOo. - */ - private int m_nRegistrationCount = 0; - - // ____________________ - - /** indicates if this interceptor object is currently part of the interceptor - chain of OOo. Only true if a valid slave or master dispatch is set on this - instance. - */ - private boolean m_bIsRegistered = false; - - - // ____________________ - - /** ctor - * It's initialize an object of this class with default values. - */ - public Interceptor() - { - } - - // ____________________ - - /** XInterceptorInfo */ - public synchronized String[] getInterceptedURLs() - { - return impl_getURLs4InterceptionInfo(); - } - - // ____________________ - - /** XDispatchProviderInterceptor */ - public synchronized XDispatchProvider getSlaveDispatchProvider() - { - System.out.println("Interceptor.getSlaveDispatchProvider() called"); - return m_xSlave; - } - - // ____________________ - - /** XDispatchProviderInterceptor */ - public synchronized XDispatchProvider getMasterDispatchProvider() - { - System.out.println("Interceptor.getMasterDispatchProvider() called"); - return m_xMaster; - } - - // ____________________ - - /** XDispatchProviderInterceptor */ - public synchronized void setSlaveDispatchProvider(XDispatchProvider xSlave) - { - System.out.println("Interceptor.setSlaveDispatchProvider("+xSlave+") called"); - - if (xSlave != null) - { - ++m_nRegistrationCount; - m_bIsRegistered = true; - } - else - { - m_bIsRegistered = false; - } - - m_xSlave = xSlave; - } - - // ____________________ - - /** XDispatchProviderInterceptor */ - public synchronized void setMasterDispatchProvider(XDispatchProvider xMaster) - { - System.out.println("Interceptor.setMasterDispatchProvider("+xMaster+") called"); - m_xMaster = xMaster; - } - - // ____________________ - - /** XDispatchProvider - */ - public synchronized XDispatch queryDispatch(URL aURL , - String sTargetFrameName, - int nSearchFlags ) - { - System.out.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sTargetFrameName+"', "+nSearchFlags+") called"); - - if (impl_isBlockedURL(aURL.Complete)) - { - System.out.println("Interceptor.queryDispatch(): URL blocked => returns NULL"); - return null; - } - - if (m_xSlave != null) - { - System.out.println("Interceptor.queryDispatch(): ask slave ..."); - return m_xSlave.queryDispatch(aURL, sTargetFrameName, nSearchFlags); - } - - System.out.println("Interceptor.queryDispatch(): no idea => returns this"); - return this; - } - - // ____________________ - - /** XDispatchProvider - */ - public XDispatch[] queryDispatches(DispatchDescriptor[] lRequests) - { - int i = 0; - int c = lRequests.length; - - XDispatch[] lResults = new XDispatch[c]; - for (i=0; i + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.imageManager; + +import com.sun.star.container.XNameContainer; +import com.sun.star.frame.XDesktop; +import com.sun.star.lang.EventObject; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XEventListener; +import lib.TestParameters; + +/** +* Testing com.sun.star.lang.XComponent +* interface methods : +*
    +*
  • dispose()
    • +*
  • addEventListener()
    • +*
  • removeEventListener()
    • +*
+* After this interface test object must be recreated.

+* Multithreaded test ability not implemented yet. +* @see com.sun.star.lang.XComponent +*/ +public class _XComponent { + + public static XComponent oObj = null; + private XNameContainer xContainer = null; + private XComponent altDispose = null; + TestParameters tEnv = null; + boolean listenerDisposed[] = new boolean[2]; + String[] Loutput = new String[2]; + + /** + * Listener which added but not removed, and its method must be called + * on dispose call. + */ + public class MyEventListener implements XEventListener { + int number = 0; + String message = null; + public MyEventListener(int number, String message) { + this.message = message; + this.number = number; + } + public void disposing ( EventObject oEvent ) { + Loutput[number] = Thread.currentThread() + " is DISPOSING " + message + this; + listenerDisposed[number] = true; + } + }; + + XEventListener listener1 = new MyEventListener(0, "EV1"); + XEventListener listener2 = new MyEventListener(1, "EV2"); + + public _XComponent(TestParameters tEnv, XComponent oObj) { + this.tEnv = tEnv; + this.oObj = oObj; + } + + /** + * For the cfgmgr2.OSetElement tests: dispose the owner element. + */ + public void before() { + // do not dispose this component, but parent instead + altDispose = (XComponent)tEnv.get("XComponent.DisposeThis"); + + } + + /** + * Adds two listeners.

+ * Has OK status if then the first listener will receive an event + * on dispose method call. + */ + public boolean _addEventListener() { + + listenerDisposed[0] = false; + listenerDisposed[1] = false; + + oObj.addEventListener( listener1 ); + oObj.addEventListener( listener2 ); + + return true; + } // finished _addEventListener() + + /** + * Removes the second of two added listeners.

+ * Method tests to be completed successfully : + *

    + *
  • addEventListener : method must add two listeners.
    • + *

+ * Has OK status if no events will be sent to the second listener on + * dispose method call. + */ + public boolean _removeEventListener() { + if (disposed) + { + System.out.println("Hint: already disposed."); + return false; + } + // the second listener should not be called + oObj.removeEventListener( listener2 ); + System.out.println(Thread.currentThread() + " is removing EL " + listener2); + return true; + } // finished _removeEventListener() + + static boolean disposed = false; + + /** + * Disposes the object and then check appropriate listeners were + * called or not.

+ * Method tests to be completed successfully : + *

    + *
  • removeEventListener : method must remove one of two + * listeners.
    • + *

+ * Has OK status if liseter removed wasn't called and other listener + * was. + */ + public boolean _dispose() { + disposed = false; + + System.out.println( "begin dispose" + Thread.currentThread()); + XDesktop oDesk = (XDesktop) tEnv.get("Desktop"); + if (oDesk !=null) { + oDesk.terminate(); + } + else { + if (altDispose == null) + { + oObj.dispose(); + } + else + { + altDispose.dispose(); + } + } + + try { + Thread.sleep(500) ; + } catch (InterruptedException e) {} + if (Loutput[0]!=null){ + System.out.println(Loutput[0]); + } + if (Loutput[1]!=null) { + System.out.println(Loutput[1]); + } + System.out.println( "end dispose" + Thread.currentThread()); + disposed = true; + + // check that dispose() works OK. + return listenerDisposed[0] && !listenerDisposed[1]; + + } // finished _dispose() + + /** + * Forces object recreation. + */ + protected void after() { +// disposeEnvironment(); + } + +} // finished class _XComponent + + diff --git a/framework/qa/complex/imageManager/_XImageManager.java b/framework/qa/complex/imageManager/_XImageManager.java new file mode 100755 index 000000000000..5887fd8fa0d8 --- /dev/null +++ b/framework/qa/complex/imageManager/_XImageManager.java @@ -0,0 +1,117 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ +package complex.imageManager; + +import com.sun.star.graphic.XGraphic; +import com.sun.star.ui.ImageType; +import com.sun.star.ui.XImageManager; +import lib.TestParameters; + + +/** + * + */ +public class _XImageManager { + + TestParameters tEnv = null; + String[]imageNames = null; + XGraphic[] xGraphicArray = null; + public XImageManager oObj; + + public _XImageManager( TestParameters tEnv, XImageManager oObj) { + + this.tEnv = tEnv; + this.oObj = oObj; + } + + public boolean _getAllImageNames() { + short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; + imageNames = oObj.getAllImageNames(s); + for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++) + { + System.out.println("###### Image: " + imageNames[i]); + } + return imageNames != null; + } + + public boolean _getImages() { + short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; + try { + xGraphicArray = oObj.getImages(s, imageNames); + } + catch(com.sun.star.lang.IllegalArgumentException e) { + } + return xGraphicArray != null; + } + + public boolean _hasImage() { + boolean result = true; + short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; + try { // check the first image names, 10 at max + for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++) + { + result &= oObj.hasImage(s, imageNames[i]); + } + } + catch(com.sun.star.lang.IllegalArgumentException e) { + result = false; + } + return result; + } + + public boolean _insertImages() { + try { + oObj.insertImages((short)imageNames.length, imageNames, xGraphicArray); + } + catch(com.sun.star.container.ElementExistException e) { + } + catch(com.sun.star.lang.IllegalArgumentException e) { + } + catch(com.sun.star.lang.IllegalAccessException e) { + } + return true; + } + + public boolean _removeImages() { + try { + oObj.removeImages((short)(imageNames.length-1), imageNames); + } + catch(com.sun.star.lang.IllegalArgumentException e) { + } + catch(com.sun.star.lang.IllegalAccessException e) { + } + return true; + } + + public boolean _replaceImages() { + return true; + } + + public boolean _reset() { + return true; + } +} diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java new file mode 100755 index 000000000000..fcfaf5f981d3 --- /dev/null +++ b/framework/qa/complex/imageManager/_XInitialization.java @@ -0,0 +1,94 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +package complex.imageManager; + + + + +import com.sun.star.lang.XInitialization; +import lib.TestParameters; + +/** +* Testing com.sun.star.lang.XInitialization +* interface methods.

+* This test needs the following object relations : +*