summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorFelix Zhang <fezhang@suse.com>2011-11-15 10:13:52 +0800
committerJan Holesovsky <kendy@suse.cz>2011-11-15 14:39:55 +0100
commiteacfa0f77c3d161f3e0c207120dcf3c2958acee4 (patch)
tree20252ab2bbb91255dc5ad35edc76ec21819111b8 /sw
parentcfc84011b3fb609ac78f35666d9aecda4ca34678 (diff)
removing obsolete layout code
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx10
-rw-r--r--sw/source/ui/dialog/wordcountwrapper.cxx1
-rw-r--r--sw/source/ui/inc/wordcountdialog.hxx3
3 files changed, 0 insertions, 14 deletions
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index ed34930b7677..c81749def414 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -35,7 +35,6 @@
#include <wordcountdialog.hxx>
#include <docstat.hxx>
#include <dialog.hrc>
-#include <layout/layout-pre.hxx>
#include <wordcountdialog.hrc>
#include <cmdid.h>
#include "vcl/msgbox.hxx" // RET_CANCEL
@@ -45,15 +44,6 @@
#include <swwait.hxx>
#include <wrtsh.hxx>
-#if ENABLE_LAYOUT
-#undef SW_RES
-#define SW_RES(x) #x
-#undef SfxModalDialog
-#define SfxModalDialog( parent, id ) Dialog( parent, "wordcount.xml", id )
-#define SW_WORDCOUNTDIALOG_HRC
-#include <helpid.h>
-#endif /* ENABLE_LAYOUT */
-
SwWordCountDialog::SwWordCountDialog(Window* pParent) :
#if defined _MSC_VER
#pragma warning (disable : 4355)
diff --git a/sw/source/ui/dialog/wordcountwrapper.cxx b/sw/source/ui/dialog/wordcountwrapper.cxx
index ddecf5a0e96c..5bf98ad2507b 100644
--- a/sw/source/ui/dialog/wordcountwrapper.cxx
+++ b/sw/source/ui/dialog/wordcountwrapper.cxx
@@ -30,7 +30,6 @@
#include <wordcountdialog.hxx>
#include <docstat.hxx>
#include <dialog.hrc>
-#include <layout/layout-pre.hxx>
#include <wordcountdialog.hrc>
#include <cmdid.h>
diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx
index 14b8be8e8255..4317e0b09cb0 100644
--- a/sw/source/ui/inc/wordcountdialog.hxx
+++ b/sw/source/ui/inc/wordcountdialog.hxx
@@ -31,7 +31,6 @@
#include <svtools/stdctrl.hxx>
#include <vcl/button.hxx>
#include <layout/layout.hxx>
-#include <layout/layout-pre.hxx>
struct SwDocStat;
#include <sfx2/childwin.hxx>
#include "swabstdlg.hxx"
@@ -99,8 +98,6 @@ public:
void UpdateCounts();
};
-#include <layout/layout-post.hxx>
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */