diff options
author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-10-11 14:14:48 +0200 |
---|---|---|
committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-10-11 17:31:18 +0200 |
commit | c767f82403635221af58998a3265e38e8d19e76d (patch) | |
tree | afaa73f1815ec9b55dfec569e12d4b62f897e0c8 /sd | |
parent | 0c0e5c82c7d9fb790d0894c28af5cff99d71a910 (diff) |
CMIS: Implemented the CheckOut button of the InfoBar
Implementing it needed:
+ Adding XCmisDocument::checkOut method and implement it in SfxBaseModel
+ Moving the CMIS properties loading into a SfxBaseModel private method to
factorize code.
+ Adding the SfxInfoBarContainerChild registration in all modules
Change-Id: I35bcb53cd2feff354aa5d9245897d0631cc924a0
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drvwshrg.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index e085f47a6d86..2cc9d30f8bf2 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -44,6 +44,7 @@ #include <toolkit/unohlp.hxx> +#include <sfx2/infobar.hxx> #include <sfx2/imagemgr.hxx> #include <sfx2/request.hxx> #include <sfx2/docfile.hxx> @@ -2570,7 +2571,8 @@ FncGetChildWindowId aShowChildren[] = &SvxIMapDlgChildWindow::GetChildWindowId, &SvxHlinkDlgWrapper::GetChildWindowId, &SfxTemplateDialogWrapper::GetChildWindowId, - &GalleryChildWindow::GetChildWindowId + &GalleryChildWindow::GetChildWindowId, + &SfxInfoBarContainerChild::GetChildWindowId }; #define NAVIGATOR_CHILD_MASK 0x80000000UL diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 6f21afefa53c..51b9e2773cee 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -29,6 +29,7 @@ #include "DrawViewShell.hxx" #include <sfx2/templdlg.hxx> +#include <sfx2/infobar.hxx> #include <svx/fontwork.hxx> #include <svx/bmpmask.hxx> @@ -77,6 +78,7 @@ SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) ); SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR ); SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); + SFX_CHILDWINDOW_REGISTRATION( SfxInfoBarContainerChild::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( AnimationChildWindow::GetChildWindowId() ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index fbf2b18b2720..2b93ed6213b9 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -36,6 +36,7 @@ #include <svx/hyperdlg.hxx> #include <svx/zoomslideritem.hxx> +#include <sfx2/infobar.hxx> #include <sfx2/objface.hxx> #include <sot/exchange.hxx> #include <svx/ruler.hxx> @@ -126,6 +127,7 @@ SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL)) SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC, SdResId(RID_DRAW_VIEWER_TOOLBOX) ); SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); + SFX_CHILDWINDOW_REGISTRATION( SfxInfoBarContainerChild::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxHlinkDlgWrapper::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( ::sd::SpellDialogChildWindow::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG ); |