diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-26 11:32:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-26 13:03:37 +0000 |
| commit | 993deeae29c12d14dbece467b207af3e65ef3ca8 (patch) | |
| tree | d5935f1425c296fffc1a9a51875037de7187babf | |
| parent | 0aa25403cbbbc1f54d9950ebca903267cb1de436 (diff) | |
fix 'Childwindow slot missing' warning
and rename SID_INFOBARCONTAINER to SID_INFOBAR
Change-Id: Ibe8a2925f62b43bd96d1092c98e500c8d433ac80
| -rw-r--r-- | include/sfx2/sfxsids.hrc | 2 | ||||
| -rw-r--r-- | sfx2/sdi/frmslots.sdi | 5 | ||||
| -rw-r--r-- | sfx2/sdi/sfx.sdi | 25 | ||||
| -rw-r--r-- | sfx2/source/dialog/infobar.cxx | 2 |
4 files changed, 31 insertions, 3 deletions
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 3dcfca974d8b..7ed255a5d805 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -572,7 +572,7 @@ #define SID_SIDEBAR (SID_SVX_START + 336) #define SID_HYPERLINK_GETLINK (SID_SVX_START + 361) #define SID_HYPERLINK_SETLINK (SID_SVX_START + 362) -#define SID_INFOBARCONTAINER (SID_SVX_START + 365) +#define SID_INFOBAR (SID_SVX_START + 365) #define SID_NAVIGATOR (SID_SVX_START + 366) #define SID_TASKPANE (SID_SVX_START + 370) #define SID_ZOOM_NEXT (SID_SVX_START + 402) diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi index 617f77f1d95f..2aa874adf32a 100644 --- a/sfx2/sdi/frmslots.sdi +++ b/sfx2/sdi/frmslots.sdi @@ -36,6 +36,11 @@ interface Window ExecMethod = ChildWindowExecute ; StateMethod = ChildWindowState ; ] + SID_INFOBAR // status(final|play) + [ + ExecMethod = ChildWindowExecute ; + StateMethod = ChildWindowState ; + ] SID_TASKPANE // status(final|play) [ ExecMethod = ChildWindowExecute ; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 2a64d6a9ac37..1656a6f76425 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -3497,7 +3497,6 @@ SfxVoidItem NameChangedOnTab SID_BASICIDE_NAMECHANGEDONTAB SfxBoolItem Navigator SID_NAVIGATOR - [ /* flags: */ AutoUpdate = TRUE, @@ -3522,6 +3521,30 @@ SfxBoolItem Navigator SID_NAVIGATOR GroupId = GID_NAVIGATOR; ] +SfxBoolItem InfoBar SID_INFOBAR +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_DOCUMENT; +] SfxBoolItem TaskPane SID_TASKPANE [ diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index f7b91518eeea..fdb37eb63612 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -315,7 +315,7 @@ void SfxInfoBarContainerWindow::Resize( ) } } -SFX_IMPL_POS_CHILDWINDOW_WITHID( SfxInfoBarContainerChild, SID_INFOBARCONTAINER, SFX_OBJECTBAR_OBJECT ); +SFX_IMPL_POS_CHILDWINDOW_WITHID( SfxInfoBarContainerChild, SID_INFOBAR, SFX_OBJECTBAR_OBJECT ); SfxInfoBarContainerChild::SfxInfoBarContainerChild( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) : SfxChildWindow( _pParent, nId ), |