move some headers inside basic

Change-Id: If711825c36bd4f9836fcd3ba26e5d4f38a5f3e36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88166 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-07 11:26:22 +02:00
parent 110a49b41c
commit a2f62a861b
14 changed files with 21 additions and 32 deletions
--- a/basic/inc/pch/precompiled_sb.hxx
+++ b/basic/inc/pch/precompiled_sb.hxx
@@ -109,11 +109,11 @@
 #include <basic/sbstar.hxx>
 #include <basic/sbuno.hxx>
 #include <basic/sbx.hxx>
-#include <basic/sbxfac.hxx>
-#include <basic/sbxform.hxx>
+#include <sbxfac.hxx>
+#include <sbxform.hxx>
 #include <basic/sbxmeth.hxx>
 #include <basic/sbxobj.hxx>
-#include <basic/sbxprop.hxx>
+#include <sbxprop.hxx>
 #include <basic/sbxvar.hxx>
 #include <date.hxx>
 #include <iosys.hxx>
--- a/basic/inc/sbprop.hxx
+++ b/basic/inc/sbprop.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_BASIC_INC_SBPROP_HXX
 #define INCLUDED_BASIC_INC_SBPROP_HXX

-#include <basic/sbxprop.hxx>
+#include "sbxprop.hxx"
 #include <basic/sbdef.hxx>

 class SbModule;
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -22,7 +22,7 @@

 #include <basic/sbxobj.hxx>
 #include <vcl/graph.hxx>
-#include <basic/sbxfac.hxx>
+#include "sbxfac.hxx"
 #include <basic/basicdllapi.h>

 class SbStdFactory final : public SbxFactory
--- a/include/basic/sbxfac.hxx
+++ b/include/basic/sbxfac.hxx
@@ -17,8 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#ifndef INCLUDED_BASIC_SBXFAC_HXX
-#define INCLUDED_BASIC_SBXFAC_HXX
+#pragma once

 #include <rtl/ustring.hxx>
 #include <basic/basicdllapi.h>
@@ -35,6 +34,4 @@ public:
    virtual SbxObject* CreateObject( const OUString& );
 };

-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/include/basic/sbxform.hxx
+++ b/include/basic/sbxform.hxx
@@ -17,8 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#ifndef INCLUDED_BASIC_SBXFORM_HXX
-#define INCLUDED_BASIC_SBXFORM_HXX
+#pragma once


 // Implementation class for Basic command: Format$( d,formatStr )
@@ -69,7 +68,6 @@

 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <basic/basicdllapi.h>

 class SbxBasicFormater {
  public:
@@ -153,6 +151,4 @@ class SbxBasicFormater {
    short   nExpExp;        // the number of digits in the exponent
 };

-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/include/basic/sbxprop.hxx
+++ b/include/basic/sbxprop.hxx
@@ -17,11 +17,9 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#ifndef INCLUDED_BASIC_SBXPROP_HXX
-#define INCLUDED_BASIC_SBXPROP_HXX
+#pragma once

 #include <basic/sbxvar.hxx>
-#include <basic/basicdllapi.h>

 class SbxProperty : public SbxVariable
 {
@@ -36,6 +34,4 @@ public:
 };


-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -23,7 +23,7 @@
 #include <sal/log.hxx>
 #include <basic/sbx.hxx>
 #include <sb.hxx>
-#include <basic/sbxprop.hxx>
+#include <sbxprop.hxx>
 #include <string.h>
 #include <image.hxx>
 #include <codegen.hxx>
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -22,7 +22,7 @@

 #include <basic/basicdllapi.h>
 #include <basic/sbstar.hxx>
-#include <basic/sbxfac.hxx>
+#include <sbxfac.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <vcl/errcode.hxx>

--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -21,8 +21,8 @@

 #include <basic/sbxobj.hxx>
 #include <basic/sbxmeth.hxx>
-#include <basic/sbxprop.hxx>
-#include <basic/sbxfac.hxx>
+#include <sbxprop.hxx>
+#include <sbxfac.hxx>
 #include <basic/sbx.hxx>
 #include <com/sun/star/beans/XMaterialHolder.hpp>
 #include <com/sun/star/beans/XExactName.hpp>
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -23,10 +23,10 @@
 #include <vcl/svapp.hxx>

 #include <basic/sbx.hxx>
-#include <basic/sbxfac.hxx>
-#include <basic/sbxform.hxx>
+#include <sbxfac.hxx>
+#include <sbxform.hxx>
 #include <basic/sbxmeth.hxx>
-#include <basic/sbxprop.hxx>
+#include <sbxprop.hxx>
 #include <sbxbase.hxx>

 #include <rtl/ustring.hxx>
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -20,7 +20,7 @@

 #include <stdlib.h>

-#include <basic/sbxform.hxx>
+#include <sbxform.hxx>
 #include <rtl/ustrbuf.hxx>

 #include <rtl/character.hxx>
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -27,7 +27,7 @@
 #include <basic/sbx.hxx>
 #include <basic/sberrors.hxx>
 #include <basic/sbxmeth.hxx>
-#include <basic/sbxprop.hxx>
+#include <sbxprop.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include "sbxres.hxx"

--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -33,7 +33,7 @@

 #include <sbxbase.hxx>
 #include <sbintern.hxx>
-#include <basic/sbxform.hxx>
+#include <sbxform.hxx>

 #include <date.hxx>
 #include <runtime.hxx>
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -375,6 +375,9 @@ basic/inc/sbobjmod.hxx
 basic/inc/sbprop.hxx
 basic/inc/sbstdobj.hxx
 basic/inc/sbxbase.hxx
+basic/inc/sbxfac.hxx
+basic/inc/sbxform.hxx
+basic/inc/sbxprop.hxx
 basic/qa/cppunit/basic_coverage.cxx
 basic/qa/cppunit/basictest.cxx
 basic/qa/cppunit/basictest.hxx
@@ -5581,11 +5584,8 @@ include/basic/sbuno.hxx
 include/basic/sbx.hxx
 include/basic/sbxcore.hxx
 include/basic/sbxdef.hxx
-include/basic/sbxfac.hxx
-include/basic/sbxform.hxx
 include/basic/sbxmeth.hxx
 include/basic/sbxobj.hxx
-include/basic/sbxprop.hxx
 include/basic/sbxvar.hxx
 include/basic/vbahelper.hxx
 include/canvas/base/basemutexhelper.hxx