[Libreoffice-commits] core.git: framework/uiconfig framework/UIConfig_startmodule.mk sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

[Krisztian Pinter]

 framework/UIConfig_startmodule.mk                |    4 
 framework/uiconfig/startmodule/ui/startcenter.ui |  306 -----------------------
 sfx2/UIConfig_sfx.mk                             |    1 
 sfx2/source/dialog/backingwindow.cxx             |    2 
 sfx2/uiconfig/ui/startcenter.ui                  |  306 +++++++++++++++++++++++
 5 files changed, 308 insertions(+), 311 deletions(-)

New commits:
commit c958a35bef2d123b3e45c80bd7d1cf8d48986a9a
Author: Krisztian Pinter <pin.terminator at gmail.com>
Date:   Thu Aug 8 17:00:57 2013 +0200

    Move startcenter.ui from framework to sfx2
    
    In a previos move BackingWindow was moved, but startcenter.ui was left
    behind by accident.
    
    Change-Id: I7d9669df9b2b65311e119640ba2a7a331b6336e9
    Reviewed-on: https://gerrit.libreoffice.org/5316
    Reviewed-by: Jan Holesovsky <kendy at suse.cz>
    Tested-by: Jan Holesovsky <kendy at suse.cz>

diff --git a/framework/UIConfig_startmodule.mk b/framework/UIConfig_startmodule.mk
index 7447b99..6bbb68d 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 f2cc39d..bda13f5 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 be49bd2..8d6781a 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
similarity index 100%
rename from framework/uiconfig/startmodule/ui/startcenter.ui
rename to sfx2/uiconfig/ui/startcenter.ui