fix 'Childwindow slot missing' warning

and rename SID_INFOBARCONTAINER to SID_INFOBAR

Change-Id: Ibe8a2925f62b43bd96d1092c98e500c8d433ac80
This commit is contained in:
Caolán McNamara
2014-11-26 11:32:42 +00:00
parent 0aa25403cb
commit 993deeae29
4 changed files with 31 additions and 3 deletions

View File

@@ -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)

View File

@@ -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 ;

View File

@@ -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
[

View File

@@ -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 ),