1 files changed, 3 insertions, 26 deletions
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 97455d9e2514..b44ee246ac41 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -33,15 +33,10 @@
 
 #include "dbinsdlg.hxx"
 
-#ifndef INCLUDED_MEMORY
 #include <memory>
-#define INCLUDED_MEMORY
-#endif
 
-#ifndef INCLUDED_FLOAT_H
 #include <float.h>
-#define INCLUDED_FLOAT_H
-#endif
+
 #include <hintids.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -65,9 +60,7 @@
 #include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
-#ifndef __SV_MNEMONIC_HXX
 #include <vcl/mnemonic.hxx>
-#endif
 #include <svl/style.hxx>
 #include <svl/zformat.hxx>
 #include <svx/htmlmode.hxx>
@@ -78,24 +71,16 @@
 #include <editeng/boxitem.hxx>
 #include <svx/rulritem.hxx>
 #include <swdbtoolsclient.hxx>
-#ifndef _SWTABLEREP_HXX //autogen
 #include <tabledlg.hxx>
-#endif
 #include <fmtclds.hxx>
 #include <tabcol.hxx>
 #include <uiitems.hxx>
 #include <viewopt.hxx>
 #include <uitool.hxx>
 #include <wrtsh.hxx>
-#ifndef _WVIEW_HXX
 #include <wview.hxx>
-#endif
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
-#ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
-#endif
 #include <tblafmt.hxx>
 #include <cellatr.hxx>
 #include <swtable.hxx>
@@ -108,19 +93,11 @@
 #include <poolfmt.hxx>
 #include <crsskip.hxx>
 
-#ifndef _DBINSDLG_HRC
 #include <dbinsdlg.hrc>
-#endif
-#ifndef _DBUI_HRC
 #include <dbui.hrc>
-#endif
 
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
-#ifndef _HELPID_H
 #include <helpid.h>
-#endif
 #include <cfgid.h>
 #include <SwStyleNameMapper.hxx>
 #include <comphelper/uno3.hxx>
@@ -1380,8 +1357,8 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
 
                     case _DB_Column::DB_COL_FIELD:
                         {
-                            SwDBField* pFld = (SwDBField*)pDBCol->DB_ColumnData.
-                                                pField->Copy();
+                            SwDBField *const pFld = static_cast<SwDBField *>(
+                                pDBCol->DB_ColumnData.pField->CopyField());
                             double nValue = DBL_MAX;
 
                             Reference< XPropertySet > xColumnProps;