summaryrefslogtreecommitdiff
path: root/svx/source/form
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/form')
-rw-r--r--svx/source/form/fmcontrolbordermanager.cxx4
-rw-r--r--svx/source/form/fmdocumentclassification.cxx2
-rw-r--r--svx/source/form/fmexch.cxx2
-rw-r--r--svx/source/form/fmexpl.cxx12
-rw-r--r--svx/source/form/fmobjfac.cxx14
-rw-r--r--svx/source/form/fmpage.cxx12
-rw-r--r--svx/source/form/fmshell.cxx10
-rw-r--r--svx/source/form/fmsrcimp.cxx6
-rw-r--r--svx/source/form/fmtextcontroldialogs.cxx2
-rw-r--r--svx/source/form/formtoolbars.cxx2
-rw-r--r--svx/source/form/tabwin.cxx8
-rw-r--r--svx/source/form/tbxform.cxx6
-rw-r--r--svx/source/form/typemap.cxx4
-rw-r--r--svx/source/form/xfm_addcondition.cxx2
14 files changed, 0 insertions, 86 deletions
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index a4f3ed9c16..972c96718b 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -28,13 +28,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#ifndef SVX_SOURCE_FORM_FMCONTROLBORDERMANAGER_HXX
#include "fmcontrolbordermanager.hxx"
-#endif
-#ifndef _SVX_FMPROP_HRC
#include "fmprop.hrc"
-#endif
/** === begin UNO includes === **/
#include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index 40e3b2b3a3..937bbc922d 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#ifndef SVX_SOURCE_FORM_FMDOCUMENTCLASSIFICATION_HXX
#include "fmdocumentclassification.hxx"
-#endif
#include "svx/dbtoolsclient.hxx"
/** === begin UNO includes === **/
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index b16af664c5..b46cfe7a56 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -32,9 +32,7 @@
#include <sot/storage.hxx>
#include <svl/itempool.hxx>
-#ifndef _SVX_DBEXCH_HRC
#include <dbexch.hrc>
-#endif
#include <sot/formats.hxx>
#include <svtools/svtreebx.hxx>
#include <tools/diagnose_ex.h>
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 52393a6e34..4b352af3bc 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -28,17 +28,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#ifndef _SVX_FMRESIDS_HRC
#include "fmresids.hrc"
-#endif
-#ifndef _SVX_FMEXPL_HRC
#include "fmexpl.hrc"
-#endif
#include "fmexpl.hxx"
-#ifndef _SVX_FMHELP_HRC
#include "fmhelp.hrc"
-#endif
#include <svx/fmglob.hxx>
#include "fmservs.hxx"
#include <svx/fmmodel.hxx>
@@ -46,13 +40,9 @@
#include "fmundo.hxx"
#include "fmpgeimp.hxx"
-#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
-#ifndef _SVX_FMPROP_HRC
#include "fmprop.hrc"
-#endif
#include <svx/dialmgr.hxx>
#include "svditer.hxx"
#include <svx/svdouno.hxx>
@@ -71,9 +61,7 @@
#include <sfx2/request.hxx>
#include <tools/shl.hxx>
-#ifndef _WRKWIN_HXX //autogen
#include <vcl/wrkwin.hxx>
-#endif
#include <vcl/sound.hxx>
#include <svx/fmshell.hxx>
#include "fmshimp.hxx"
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 282dbd757e..fa4b4fc8b0 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -32,32 +32,20 @@
#include "svx/fmtools.hxx"
#include "fmservs.hxx"
-#ifndef _FM_FMOBJFAC_HXX
#include "fmobjfac.hxx"
-#endif
-#ifndef _FM_FMGLOB_HXX
#include <svx/fmglob.hxx>
-#endif
-#ifndef _FM_FMOBJ_HXX
#include "fmobj.hxx"
-#endif
#include "fmshimp.hxx"
-#ifndef _FM_FMSHELL_HXX
#include <svx/fmshell.hxx>
-#endif
-#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include "tbxform.hxx"
#include <tools/resid.hxx>
-#ifndef _SVX_FMRESIDS_HRC
#include "fmresids.hrc"
-#endif
#include <tools/shl.hxx>
#include <svx/dialmgr.hxx>
#include "fmservs.hxx"
@@ -65,9 +53,7 @@
#include "fmexpl.hxx"
#include "filtnav.hxx"
-#ifndef _SVX_FMPROP_HRC
#include "fmprop.hrc"
-#endif
#include "fmPropBrw.hxx"
#include "datanavi.hxx"
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 90be1794a8..7cbdc8d27d 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -37,30 +37,22 @@
#include <svx/fmmodel.hxx>
#ifndef SVX_LIGHT
-#ifndef _SVX_FMOBJ_HXX
#include "fmobj.hxx"
#endif
-#endif
#ifndef SVX_LIGHT
-#ifndef _SVX_FMRESIDS_HRC
#include "fmresids.hrc"
#endif
-#endif
#include <tools/shl.hxx>
#include <svx/dialmgr.hxx>
#ifndef SVX_LIGHT
-#ifndef _SVX_FMPGEIMP_HXX
#include "fmpgeimp.hxx"
#endif
-#endif
#ifndef SVX_LIGHT
-#ifndef _SFX_OBJSH_HXX //autogen
#include <sfx2/objsh.hxx>
#endif
-#endif
#include "svditer.hxx"
#include <svx/svdview.hxx>
#include <tools/urlobj.hxx>
@@ -68,12 +60,8 @@
#ifndef SVX_LIGHT
-#ifndef _SVX_FMGLOB_HXX
#include <svx/fmglob.hxx>
-#endif
-#ifndef _SVX_FMPROP_HRC
#include "fmprop.hrc"
-#endif
#include "fmundo.hxx"
#include "svx/fmtools.hxx"
using namespace ::svxform;
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 4a9a859c0e..4a6f8ad8ab 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -31,18 +31,14 @@
#include <svx/fmshell.hxx>
#include "svx/fmtools.hxx"
#include "fmservs.hxx"
-#ifndef _SVX_FMPROP_HRC
#include "fmprop.hrc"
-#endif
#include "fmpgeimp.hxx"
#include "fmitems.hxx"
#include "fmundo.hxx"
#include <vcl/waitobj.hxx>
#include <com/sun/star/form/XLoadable.hpp>
#include <com/sun/star/container/XNamed.hpp>
-#ifndef _COM_SUN_STAR_SDDB_PRIVILEGE_HPP_
#include <com/sun/star/sdbcx/Privilege.hpp>
-#endif
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XFastPropertySet.hpp>
@@ -67,13 +63,9 @@
#include "svditer.hxx"
#include "fmobj.hxx"
-#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
-#ifndef _SVX_FMRESIDS_HRC
#include "fmresids.hrc"
-#endif
#include "fmexch.hxx"
#include <svx/fmglob.hxx>
#include <svl/eitem.hxx>
@@ -125,9 +117,7 @@
#define FmFormShell
#include "svxslots.hxx"
-#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include "tbxform.hxx"
#include <comphelper/property.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 85f6a79b97..3aaa3d5118 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#ifndef _SVX_FMRESIDS_HRC
#include "fmresids.hrc"
-#endif
#include "svx/fmtools.hxx"
#include "fmsrccfg.hxx"
#include <tools/debug.hxx>
@@ -50,18 +48,14 @@
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <com/sun/star/i18n/CollatorOptions.hpp>
-#ifndef _COM_SUN_STAR_SDDB_XCOLUMNSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#endif
#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/XNumberFormats.hpp>
#include <comphelper/processfactory.hxx>
-#ifndef _SVX_FMPROP_HRC
#include "fmprop.hrc"
-#endif
#include "fmservs.hxx"
#include "fmsrcimp.hxx"
#include <svx/fmsearch.hxx>
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index 751f699a32..433f6c09f9 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -29,9 +29,7 @@
#include "precompiled_svx.hxx"
#include "fmtextcontroldialogs.hxx"
#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
#include <svx/dialogs.hrc>
-#endif
#ifndef _SVX_CHARDLG_HXX
//#include "chardlg.hxx"
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index 6a7c738fde..e2fe70fd16 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -33,9 +33,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
/** === end UNO includes === **/
-#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
//........................................................................
namespace svxform
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 8ecaa916ea..0b0657cd73 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -44,25 +44,17 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/stl_types.hxx>
-#ifndef _SVX_FMHELP_HRC
#include "fmhelp.hrc"
-#endif
#include <svx/fmshell.hxx>
#include "fmshimp.hxx"
#include "svx/dbtoolsclient.hxx"
#include <svx/fmpage.hxx>
-#ifndef _SVX_FMPGEIMP_HXX
#include "fmpgeimp.hxx"
-#endif
-#ifndef _SVX_FMPROP_HRC
#include "fmprop.hrc"
-#endif
-#ifndef _SVX_FMRESIDS_HRC
#include "fmresids.hrc"
-#endif
#include <svx/dialmgr.hxx>
#include <tools/shl.hxx>
#include <svx/svdpagv.hxx>
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 2548b7a901..e442f779a7 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -42,19 +42,13 @@
#include <vcl/sound.hxx>
#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
#include <svx/dialogs.hrc>
-#endif
#include "tbxctl.hxx"
#include "tbxdraw.hxx"
#include "tbxform.hxx"
-#ifndef _SVX_FMRESIDS_HRC
#include "fmresids.hrc"
-#endif
#include "fmitems.hxx"
-#ifndef _SVX_FMHELP_HRC
#include "fmhelp.hrc"
-#endif
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/imagemgr.hxx>
diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx
index ae2d45ca76..2d560e42a6 100644
--- a/svx/source/form/typemap.cxx
+++ b/svx/source/form/typemap.cxx
@@ -37,9 +37,7 @@
#include <editeng/cntritem.hxx>
#include <editeng/shdditem.hxx>
#include <editeng/postitem.hxx>
-#ifndef _SVX_CLIPBOARDCTL_HXX_
#include "clipfmtitem.hxx"
-#endif
#include <editeng/fhgtitem.hxx>
#include "editeng/fontitem.hxx"
#include <editeng/charreliefitem.hxx>
@@ -55,9 +53,7 @@
#include <editeng/kernitem.hxx>
#include <editeng/tstpitem.hxx>
#include <editeng/adjitem.hxx>
-#ifndef _SVX_EMPHITEM_HXX
#include <editeng/emphitem.hxx>
-#endif
#include <editeng/memberids.hrc>
#define SFX_TYPEMAP
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index 5c8e50b212..3e19ae9842 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#ifndef SVX_SOURCE_FORM_XFM_ADDCONDITION_HXX
#include "xfm_addcondition.hxx"
-#endif
/** === begin UNO includes === **/
/** === end UNO includes === **/
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 22:20:18 +0000