diff options
-rw-r--r-- | framework/UIConfig_startmodule.mk | 4 | ||||
-rw-r--r-- | sfx2/UIConfig_sfx.mk | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 2 | ||||
-rw-r--r-- | sfx2/uiconfig/ui/startcenter.ui (renamed from framework/uiconfig/startmodule/ui/startcenter.ui) | 0 |
4 files changed, 2 insertions, 5 deletions
diff --git a/framework/UIConfig_startmodule.mk b/framework/UIConfig_startmodule.mk index 7447b998c143..6bbb68d93798 100644 --- a/framework/UIConfig_startmodule.mk +++ b/framework/UIConfig_startmodule.mk @@ -21,8 +21,4 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/StartModule,\ framework/uiconfig/startmodule/toolbar/standardbar \ )) -$(eval $(call gb_UIConfig_add_uifiles,modules/StartModule,\ - framework/uiconfig/startmodule/ui/startcenter \ -)) - # vim: set noet sw=4 ts=4: diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk index f2cc39d50927..bda13f50472d 100644 --- a/sfx2/UIConfig_sfx.mk +++ b/sfx2/UIConfig_sfx.mk @@ -26,6 +26,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\ sfx2/uiconfig/ui/singletabdialog \ sfx2/uiconfig/ui/versionsofdialog \ sfx2/uiconfig/ui/versioncommentdialog \ + sfx2/uiconfig/ui/startcenter \ )) # vim: set noet sw=4 ts=4: diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index be49bd2cf463..8d6781a53b77 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -80,7 +80,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) : mpAccExec( NULL ) { m_pUIBuilder = new VclBuilder(this, getUIRootDir(), - "modules/StartModule/ui/startcenter.ui", + "sfx/ui/startcenter.ui", "StartCenter" ); get(mpWriterButton, "writer"); get(mpCalcButton, "calc"); diff --git a/framework/uiconfig/startmodule/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 33c6e17dce0d..33c6e17dce0d 100644 --- a/framework/uiconfig/startmodule/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui |