diff options
19 files changed, 30 insertions, 45 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 7f3b2c1be6c1..8637392a4b98 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -6761,11 +6761,6 @@ include/svtools/svmedit.hxx include/svtools/svparser.hxx include/svtools/svtdllapi.h include/svtools/tabbar.hxx -include/svtools/table/tableinputhandler.hxx -include/svtools/table/tablemodel.hxx -include/svtools/table/tablerenderer.hxx -include/svtools/table/tablesort.hxx -include/svtools/table/tabletypes.hxx include/svtools/templatefoldercache.hxx include/svtools/textwindowpeer.hxx include/svtools/toolbarmenu.hxx @@ -13243,6 +13238,11 @@ svtools/inc/table/defaultinputhandler.hxx svtools/inc/table/gridtablerenderer.hxx svtools/inc/table/tablecontrol.hxx svtools/inc/table/tablecontrolinterface.hxx +svtools/inc/table/tableinputhandler.hxx +svtools/inc/table/tablemodel.hxx +svtools/inc/table/tablerenderer.hxx +svtools/inc/table/tablesort.hxx +svtools/inc/table/tabletypes.hxx svtools/langsupport/langsupport.cxx svtools/qa/unit/GraphicObjectTest.cxx svtools/qa/unit/svtools-dialogs-test.cxx diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 96af5282f59d..632affc2a513 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -392,7 +392,7 @@ #include <svtools/htmltokn.h> #include <svtools/svtdllapi.h> #include <svtools/svtresid.hxx> -#include <svtools/table/tabletypes.hxx> +#include <table/tabletypes.hxx> #include <svtools/valueset.hxx> #endif // PCH_LEVEL >= 4 diff --git a/svtools/inc/table/defaultinputhandler.hxx b/svtools/inc/table/defaultinputhandler.hxx index 3b27d86fc268..6bcf4ecd731f 100644 --- a/svtools/inc/table/defaultinputhandler.hxx +++ b/svtools/inc/table/defaultinputhandler.hxx @@ -19,7 +19,7 @@ #pragma once -#include <svtools/table/tableinputhandler.hxx> +#include <table/tableinputhandler.hxx> #include <memory> diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx index 3c92c340202f..21e354e767ab 100644 --- a/svtools/inc/table/gridtablerenderer.hxx +++ b/svtools/inc/table/gridtablerenderer.hxx @@ -19,7 +19,7 @@ #pragma once -#include <svtools/table/tablemodel.hxx> +#include <table/tablemodel.hxx> #include <vcl/image.hxx> #include <memory> diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 6f4d1c43cde2..62f1261069b3 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -20,7 +20,7 @@ #pragma once #include <svtools/svtdllapi.h> -#include <svtools/table/tablemodel.hxx> +#include <table/tablemodel.hxx> #include <vcl/accessibletable.hxx> #include <vcl/ctrl.hxx> diff --git a/svtools/inc/table/tablecontrolinterface.hxx b/svtools/inc/table/tablecontrolinterface.hxx index 3ceb5a8dbc60..bb8e8a701b96 100644 --- a/svtools/inc/table/tablecontrolinterface.hxx +++ b/svtools/inc/table/tablecontrolinterface.hxx @@ -22,8 +22,8 @@ #include <sal/types.h> #include <vcl/seleng.hxx> -#include <svtools/table/tabletypes.hxx> -#include <svtools/table/tablemodel.hxx> +#include <table/tabletypes.hxx> +#include <table/tablemodel.hxx> namespace svt { namespace table diff --git a/include/svtools/table/tableinputhandler.hxx b/svtools/inc/table/tableinputhandler.hxx index 0eba9b5069f0..fec472eeb2a5 100644 --- a/include/svtools/table/tableinputhandler.hxx +++ b/svtools/inc/table/tableinputhandler.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX -#define INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX +#pragma once #include <memory> @@ -61,6 +60,4 @@ namespace svt { namespace table } } // namespace svt::table -#endif // INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/tablemodel.hxx b/svtools/inc/table/tablemodel.hxx index 8fadf6f10c54..4f87580c7981 100644 --- a/include/svtools/table/tablemodel.hxx +++ b/svtools/inc/table/tablemodel.hxx @@ -17,13 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_TABLE_TABLEMODEL_HXX -#define INCLUDED_SVTOOLS_TABLE_TABLEMODEL_HXX +#pragma once #include <svtools/svtdllapi.h> -#include <svtools/table/tabletypes.hxx> -#include <svtools/table/tablerenderer.hxx> -#include <svtools/table/tableinputhandler.hxx> +#include <table/tabletypes.hxx> +#include <table/tablerenderer.hxx> +#include <table/tableinputhandler.hxx> #include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/style/HorizontalAlignment.hpp> @@ -452,6 +451,4 @@ namespace svt { namespace table } } // namespace svt::table -#endif // INCLUDED_SVTOOLS_TABLE_TABLEMODEL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/tablerenderer.hxx b/svtools/inc/table/tablerenderer.hxx index b5c99dca4433..564250155621 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/svtools/inc/table/tablerenderer.hxx @@ -17,10 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_TABLE_TABLERENDERER_HXX -#define INCLUDED_SVTOOLS_TABLE_TABLERENDERER_HXX +#pragma once -#include <svtools/table/tabletypes.hxx> +#include <table/tabletypes.hxx> #include <rtl/ustring.hxx> @@ -247,6 +246,4 @@ namespace svt { namespace table } } // namespace svt::table -#endif // INCLUDED_SVTOOLS_TABLE_TABLERENDERER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/tablesort.hxx b/svtools/inc/table/tablesort.hxx index 56a825f86347..c92011cb0d5f 100644 --- a/include/svtools/table/tablesort.hxx +++ b/svtools/inc/table/tablesort.hxx @@ -17,10 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_TABLE_TABLESORT_HXX -#define INCLUDED_SVTOOLS_TABLE_TABLESORT_HXX +#pragma once -#include <svtools/table/tabletypes.hxx> +#include <table/tabletypes.hxx> namespace svt { namespace table @@ -78,6 +77,4 @@ namespace svt { namespace table } } // namespace svt::table -#endif // INCLUDED_SVTOOLS_TABLE_TABLESORT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/table/tabletypes.hxx b/svtools/inc/table/tabletypes.hxx index 36765757a921..1e18786f7ff0 100644 --- a/include/svtools/table/tabletypes.hxx +++ b/svtools/inc/table/tabletypes.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_TABLE_TABLETYPES_HXX -#define INCLUDED_SVTOOLS_TABLE_TABLETYPES_HXX +#pragma once #include <sal/types.h> @@ -50,6 +49,4 @@ namespace svt { namespace table } } // namespace svt::table -#endif // INCLUDED_SVTOOLS_TABLE_TABLETYPES_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index 43257e3cbde6..5fb786cd13d3 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -20,7 +20,7 @@ #include "cellvalueconversion.hxx" #include <table/gridtablerenderer.hxx> -#include <svtools/table/tablesort.hxx> +#include <table/tablesort.hxx> #include <com/sun/star/graphic/XGraphic.hpp> diff --git a/svtools/source/table/mousefunction.cxx b/svtools/source/table/mousefunction.cxx index a21ee2644108..3d2986f1091f 100644 --- a/svtools/source/table/mousefunction.cxx +++ b/svtools/source/table/mousefunction.cxx @@ -20,7 +20,7 @@ #include "mousefunction.hxx" #include <table/tablecontrolinterface.hxx> -#include <svtools/table/tablesort.hxx> +#include <table/tablesort.hxx> #include <tools/diagnose_ex.h> #include <vcl/window.hxx> diff --git a/svtools/source/table/mousefunction.hxx b/svtools/source/table/mousefunction.hxx index ab6f6b8811bd..933c1f4b3277 100644 --- a/svtools/source/table/mousefunction.hxx +++ b/svtools/source/table/mousefunction.hxx @@ -19,7 +19,7 @@ #pragma once -#include <svtools/table/tabletypes.hxx> +#include <table/tabletypes.hxx> #include <salhelper/simplereferenceobject.hxx> diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index db1aa7d384fb..a0cc092a8c04 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -20,7 +20,7 @@ #include <table/tablecontrol.hxx> #include <table/defaultinputhandler.hxx> -#include <svtools/table/tablemodel.hxx> +#include <table/tablemodel.hxx> #include "tabledatawindow.hxx" #include "tablecontrol_impl.hxx" diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index fa4dca72b81c..7b756e1ed59e 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -19,7 +19,7 @@ #pragma once -#include <svtools/table/tablemodel.hxx> +#include <table/tablemodel.hxx> #include <table/tablecontrolinterface.hxx> #include <vcl/svtaccessiblefactory.hxx> diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx index 6e197a778233..a206c5063690 100644 --- a/svtools/source/table/tablegeometry.hxx +++ b/svtools/source/table/tablegeometry.hxx @@ -19,7 +19,7 @@ #pragma once -#include <svtools/table/tabletypes.hxx> +#include <table/tabletypes.hxx> #include <tools/gen.hxx> diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx index 607a77316bf0..8dddb1c27690 100644 --- a/svtools/source/uno/unocontroltablemodel.hxx +++ b/svtools/source/uno/unocontroltablemodel.hxx @@ -19,8 +19,8 @@ #pragma once -#include <svtools/table/tablemodel.hxx> -#include <svtools/table/tablesort.hxx> +#include <table/tablemodel.hxx> +#include <table/tablesort.hxx> #include <com/sun/star/awt/grid/GridDataEvent.hpp> #include <com/sun/star/awt/grid/XGridColumnModel.hpp> diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx index 72b84372ad94..0651a44ee24a 100644 --- a/svtools/source/uno/unogridcolumnfacade.hxx +++ b/svtools/source/uno/unogridcolumnfacade.hxx @@ -19,7 +19,7 @@ #pragma once -#include <svtools/table/tablemodel.hxx> +#include <table/tablemodel.hxx> #include <com/sun/star/awt/grid/XGridColumn.hpp> #include <com/sun/star/style/HorizontalAlignment.hpp> |