[Libreoffice-commits] core.git: connectivity/source dbaccess/source include/svx xmloff/source

Michael Stahl mstahl at redhat.com
Fri Jun 28 09:12:54 PDT 2013


 connectivity/source/commontools/dbconversion.cxx  |    2 --
 connectivity/source/parse/sqlflex.l               |    2 --
 dbaccess/source/ui/querydesign/ConnectionLine.cxx |    2 --
 include/svx/def3d.hxx                             |    2 --
 xmloff/source/style/weighhdl.cxx                  |    2 --
 5 files changed, 10 deletions(-)

New commits:
commit 4296394d5c54be51b36a0cddb2f8a8f62a226867
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jun 28 18:09:41 2013 +0200

    remove pointless external guards for standard headers
    
    Change-Id: I509984a6029b6a86fd1ee3f947394af9cdf71c6a

diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index bf36c93..651c8f0 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -20,9 +20,7 @@
 #include <connectivity/dbconversion.hxx>
 #include <connectivity/dbcharset.hxx>
 #include <osl/diagnose.h>
-#ifndef _INC_STDIO
 #include <stdio.h>
-#endif
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 0f7c3b5..7f8cf3e 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -26,9 +26,7 @@
 #include <cstdarg>      // std::va_list
 #endif
 
-#ifndef _INC_STRING
 #include <string.h>
-#endif
 
 #include "internalnode.hxx"
 
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index 3319f63..05ca77a 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -23,9 +23,7 @@
 #include "TableWindowListBox.hxx"
 #include "TableConnection.hxx"
 #include <vcl/svapp.hxx>
-#ifndef _INC_MATH
 #include <math.h>
-#endif
 #include <osl/diagnose.h>
 #include <vcl/lineinfo.hxx>
 
diff --git a/include/svx/def3d.hxx b/include/svx/def3d.hxx
index 565f396..c96d7f5 100644
--- a/include/svx/def3d.hxx
+++ b/include/svx/def3d.hxx
@@ -20,9 +20,7 @@
 #ifndef _SVX_DEF3D_HXX
 #define _SVX_DEF3D_HXX
 
-#ifndef _INC_MATH
 #include <math.h>
-#endif
 #include <tools/solar.h>
 
 const double fPiDiv180 = 0.01745329251994;
diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index 0ef9c84..7c8d31b 100644
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -26,9 +26,7 @@
 #include <tools/fontenum.hxx>
 #include <tools/solar.h>
 
-#ifndef _INC_LIMITS
 #include <limits.h>
-#endif
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 


More information about the Libreoffice-commits mailing list