diff options
| author | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-08-29 00:35:07 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-02-06 16:40:44 +0100 |
| commit | add80f5cce7d5d222b20e8c0237072a6a3601437 (patch) | |
| tree | 7c97fa385b7a86662b4f56be2c8ed3f4ec2c24f0 /include | |
| parent | 14afffdd80774efcf185a538b22e95ffcd85b117 (diff) | |
fdo#80538 Show an infobar when document is in read-only mode
and remove the Edit icon from the toolbar
Reviewed-on: https://gerrit.libreoffice.org/11182
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Conflicts:
include/sfx2/sfx.hrc
include/sfx2/viewfrm.hxx
Change-Id: I27d9506bd0fb76b3f1ad056a9866f7744674a3e2
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/sfx.hrc | 4 | ||||
| -rw-r--r-- | include/sfx2/viewfrm.hxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 0497f5256864..865912ca5b1f 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -155,7 +155,9 @@ #define STR_PASSWD_MIN_LEN (RID_SFX_START+124) #define STR_NONCHECKEDOUT_DOCUMENT (RID_SFX_START+125) #define BT_CHECKOUT (RID_SFX_START+126) -#define STR_PASSWD_MIN_LEN1 (RID_SFX_START+127) +#define BT_READONLY_EDIT (RID_SFX_START+127) +#define STR_READONLY_DOCUMENT (RID_SFX_START+128) +#define STR_PASSWD_MIN_LEN1 (RID_SFX_START+129) #define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157) #define SFX_THUMBNAIL_TEXT (RID_SFX_START+158) diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index af555152bf98..f2b0704c612c 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -79,9 +79,8 @@ private: protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; -#ifndef _SFX_HXX + DECL_LINK( SwitchReadOnlyHandler, void * ); SAL_DLLPRIVATE void KillDispatcher_Impl(); -#endif virtual ~SfxViewFrame(); |