[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source

[Caolán McNamara]

 sw/AllLangResTarget_sw.mk       |    1 +
 sw/inc/helpid.h                 |    2 +-
 sw/source/ui/misc/titlepage.src |   10 +++-------
 3 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 1349e0cf9ca3eb8c49849380d61299f62f3cc96f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 24 12:27:10 2011 +0000

    recover titlepage dialog post merge

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 20d6829..aac0fbc 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -158,6 +158,7 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/misc/pggrid.src \
     sw/source/ui/misc/redlndlg.src \
     sw/source/ui/misc/srtdlg.src \
+    sw/source/ui/misc/titlepage.src \
     sw/source/ui/ribbar/inputwin.src \
     sw/source/ui/ribbar/tbxanchr.src \
     sw/source/ui/ribbar/workctrl.src \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 00d9f99..f1c42e6 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -991,7 +991,7 @@
 #define HID_TBX_FORMULA_CANCEL                                  "SW_HID_TBX_FORMULA_CANCEL"
 #define HID_TBX_FORMULA_APPLY                                   "SW_HID_TBX_FORMULA_APPLY"
 
-#define HID_TITLEPAGE 						  		(HID_BASE + 2281)
+#define HID_TITLEPAGE 						  		            "SW_HID_TITLEPAGE"
 
 #define HID_NAVIGATION_TOOLBOX                      (HID_BASE + 2282)
 
diff --git a/sw/source/ui/misc/titlepage.src b/sw/source/ui/misc/titlepage.src
index 8e6aec6..1f61be1 100644
--- a/sw/source/ui/misc/titlepage.src
+++ b/sw/source/ui/misc/titlepage.src
@@ -24,17 +24,13 @@
  * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
  * instead of those above.
  */
-/* StarView ressource file */
 
-#include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
-#include "globals.hrc"
 #include "misc.hrc"
 #include "titlepage.hrc"
+#include "globals.hrc"
+#include "cmdid.h"
 #include "helpid.h"
-/**************************************************************************/
-/*                                                                        */
-/**************************************************************************/
+
 ModalDialog DLG_TITLEPAGE
 {
     HelpID = HID_TITLEPAGE ;