summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-08-19 09:09:57 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-08-19 09:09:57 +0000
commit8d0e762376f5dc3b96b7104f4b479f8a4e46ceb4 (patch)
treeb02df0cd7f2bf9d32714f592a7c22a2688fb6c8c /reportdesign
parent1d15fbd91f93907d4a27f68d6f68e6c64f709237 (diff)
INTEGRATION: CWS dba31a (1.3.30); FILE MERGED
2008/07/10 06:59:49 oj 1.3.30.1: #i88727# new area prop for shapes and some model changes
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/ui/dlg/dlgpage.cxx15
1 files changed, 6 insertions, 9 deletions
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 62f34e0f6303..45ee50a1ee4f 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dlgpage.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
* This file is part of OpenOffice.org.
*
@@ -29,21 +29,18 @@
************************************************************************/
#include "precompiled_reportdesign.hxx"
-#include <svtools/intitem.hxx> //add CHINA001
-#ifndef _SVX_DIALOGS_HRC
+
#include <svx/dialogs.hrc>
-#endif
#include <svx/tabarea.hxx>
+#include <svx/flagsdef.hxx>
+#include <svx/svxdlg.hxx>
+#include <svx/svxenum.hxx>
#include "dlgpage.hxx"
#include "ModuleHelper.hxx"
-#ifndef _RPTUI_DLGRESID_HRC
#include "RptResId.hrc"
-#endif
+#include <svtools/intitem.hxx> //add CHINA001
#include <svtools/cjkoptions.hxx>
#include <svtools/aeitem.hxx>
-#include <svx/flagsdef.hxx>
-#include <svx/svxdlg.hxx>
-#include <svx/svxenum.hxx>
namespace rptui
{