diff options
author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-10-20 09:42:35 -0700 |
---|---|---|
committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-10-31 12:03:29 +0100 |
commit | 23722506efd84a9b7b447578de32c0eef9bf8b98 (patch) | |
tree | bb2fcf1bc1d6e6b190163acaa6e72a084b2dd7af /sfx2/inc | |
parent | 793ea6fe90209dbf2b659a44a302306a05888011 (diff) |
CMIS: added CheckOut in the File menu
Change-Id: I5f003556065cff34cec38148bc3bb4da20692e54
Diffstat (limited to 'sfx2/inc')
-rw-r--r-- | sfx2/inc/sfx2/infobar.hxx | 7 | ||||
-rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxcommands.h | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxsids.hrc | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/viewfrm.hxx | 5 |
5 files changed, 11 insertions, 5 deletions
diff --git a/sfx2/inc/sfx2/infobar.hxx b/sfx2/inc/sfx2/infobar.hxx index 876764a8a896..b72dbbdb85f5 100644 --- a/sfx2/inc/sfx2/infobar.hxx +++ b/sfx2/inc/sfx2/infobar.hxx @@ -41,16 +41,18 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow class SfxInfoBarWindow : public Window { private: + rtl::OUString m_sId; FixedText* m_pMessage; Button* m_pCloseBtn; std::vector< PushButton* > m_aActionBtns; public: - SfxInfoBarWindow( Window* parent, + SfxInfoBarWindow( Window* parent, const rtl::OUString& sId, const rtl::OUString& sMessage, std::vector< PushButton* > aButtons ); ~SfxInfoBarWindow( ); + virtual const rtl::OUString& getId() const { return m_sId; } virtual void Paint( const Rectangle& ); virtual void Resize( ); @@ -68,7 +70,8 @@ class SfxInfoBarContainerWindow : public Window SfxInfoBarContainerWindow( SfxInfoBarContainerChild* pChildWin ); ~SfxInfoBarContainerWindow( ); - void appendInfoBar( const rtl::OUString& sMessage, std::vector< PushButton* > aButtons ); + void appendInfoBar( const rtl::OUString& sId, const rtl::OUString& sMessage, std::vector< PushButton* > aButtons ); + SfxInfoBarWindow* getInfoBar( const rtl::OUString& sId ); void removeInfoBar( SfxInfoBarWindow* pInfoBar ); virtual void Resize( ); diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 331553db46a4..88a2abe87a4b 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -732,6 +732,8 @@ public: SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = sal_False ); SAL_DLLPRIVATE sal_Bool QuerySaveSizeExceededModules_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ); + + SAL_DLLPRIVATE void CheckOut( ); }; #define SFX_GLOBAL_CLASSID \ diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h index fc075b299c64..46c7ebcac274 100644 --- a/sfx2/inc/sfx2/sfxcommands.h +++ b/sfx2/inc/sfx2/sfxcommands.h @@ -44,6 +44,7 @@ #define CMD_SID_OPENHYPERLINK ".uno:OpenHyperlink" #define CMD_SID_DOCINFO_TITLE ".uno:DocInfoTitle" #define CMD_SID_OPENTEMPLATE ".uno:OpenTemplate" +#define CMD_SID_CHECKOUT ".uno:CheckOut" #define CMD_SID_OPENURL ".uno:OpenUrl" #define CMD_SID_OPTIONS ".uno:Options" #define CMD_SID_ORGANIZER ".uno:Organizer" diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 0d3522bd7b14..9586dde26c50 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -143,6 +143,7 @@ #define SID_EXPORTDOCASPDF (SID_SFX_START + 1673) #define SID_DIRECTEXPORTDOCASPDF (SID_SFX_START + 1674) #define SID_UPDATEDOCMODE (SID_SFX_START + 1668) +#define SID_CHECKOUT (SID_SFX_START + 512) #define SID_FORCERELOAD (SID_SFX_START + 1502) #define SID_FILE_DIALOG (SID_SFX_START + 304) diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index c3d889364522..4373a52ae6c1 100644 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -23,7 +23,6 @@ #include "sfx2/dllapi.h" #include "sal/types.h" #include <svl/lstner.hxx> -#include <sfx2/infobar.hxx> #include <sfx2/module.hxx> #include <sfx2/frame.hxx> #include <sfx2/shell.hxx> @@ -191,8 +190,8 @@ public: The buttons will be added from Right to Left at the right of the info bar. The parent, size and position of each button will be changed: only the width will remain unchanged. */ - void AppendInfoBar( const rtl::OUString& sMessage, std::vector< PushButton* > aButtons ); - void RemoveInfoBar( SfxInfoBarWindow* pInfoBar ); + void AppendInfoBar( const rtl::OUString& sId, const rtl::OUString& sMessage, std::vector< PushButton* > aButtons ); + void RemoveInfoBar( const rtl::OUString& sId ); SAL_DLLPRIVATE void SetDowning_Impl(); SAL_DLLPRIVATE void GetDocNumber_Impl(); |