From f7ce14298f2db668f1bef36d9dd9134cbaff1e2e Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 11 Jul 2008 17:19:17 +0200
Subject: [PATCH] Add layout includes to stringdlg and makefile.

---
 sc/source/ui/inc/strindlg.hxx      |    4 ++++
 sc/source/ui/miscdlgs/makefile.mk  |    4 ++++
 sc/source/ui/miscdlgs/strindlg.cxx |    8 ++++++++
 3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx
index 7ec9bc1..defc5ba 100644
--- a/sc/source/ui/inc/strindlg.hxx
+++ b/sc/source/ui/inc/strindlg.hxx
@@ -39,6 +39,9 @@
 
 //------------------------------------------------------------------------
 
+#include <layout/layout.hxx>
+#include <layout/layout-pre.hxx>
+
 class ScStringInputDlg : public ModalDialog
 {
 public:
@@ -59,6 +62,7 @@ private:
 	HelpButton		aBtnHelp;
 };
 
+#include <layout/layout-post.hxx>
 
 #endif // SC_STRINDLG_HXX
 
diff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mk
index aac2608..588b38b 100644
--- a/sc/source/ui/miscdlgs/makefile.mk
+++ b/sc/source/ui/miscdlgs/makefile.mk
@@ -42,6 +42,10 @@ LIBTARGET=no
 .INCLUDE :  sc.mk
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1
+.ENDIF # ENABLE_LAYOUT == TRUE
+
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx
index 8056bbb..958a0c1 100644
--- a/sc/source/ui/miscdlgs/strindlg.cxx
+++ b/sc/source/ui/miscdlgs/strindlg.cxx
@@ -43,6 +43,14 @@
 #include "scresid.hxx"
 #include "miscdlgs.hrc"
 
+#include <layout/layout-pre.hxx>
+
+#if ENABLE_LAYOUT
+#undef ScResId
+#define ScResId(x) #x
+#undef SfxTabPage
+#define ModalDialog( parent, id ) Dialog( parent, "string-input.xml", id )
+#endif /* ENABLE_LAYOUT */
 
 //==================================================================
 
-- 
1.5.6.3.317.g5d44c9.dirty