[Libreoffice-commits] core.git: svtools/inc svtools/source

Andrea Gelmini (via logerrit) logerrit at kemper.freedesktop.org
Sat Dec 28 10:45:33 UTC 2019 

 svtools/inc/FltCallDialogParameter.hxx             |    4 +---
 svtools/inc/bitmaps.hlst                           |    4 +---
 svtools/inc/borderline.hrc                         |    4 +---
 svtools/inc/errtxt.hrc                             |    4 +---
 svtools/inc/langtab.hrc                            |    4 +---
 svtools/inc/strings.hxx                            |    4 +---
 svtools/inc/table/defaultinputhandler.hxx          |    4 +---
 svtools/inc/table/gridtablerenderer.hxx            |    4 +---
 svtools/inc/table/tablecontrol.hxx                 |    4 +---
 svtools/inc/table/tablecontrolinterface.hxx        |    4 +---
 svtools/inc/templwin.hrc                           |    4 +---
 svtools/source/brwbox/brwimpl.hxx                  |    4 +---
 svtools/source/brwbox/datwin.hxx                   |    4 +---
 svtools/source/brwbox/editbrowseboximpl.hxx        |    4 +---
 svtools/source/config/itemholder2.hxx              |    4 +---
 svtools/source/contnr/templwin.hxx                 |    4 +---
 svtools/source/control/toolbarmenuimp.hxx          |    4 +---
 svtools/source/control/valueimp.hxx                |    4 +---
 svtools/source/filter/exportdialog.hxx             |    4 +---
 svtools/source/hatchwindow/ipwin.hxx               |    4 +---
 svtools/source/inc/filectrl.hxx                    |    4 +---
 svtools/source/inc/hatchwindow.hxx                 |    4 +---
 svtools/source/inc/unoiface.hxx                    |    4 +---
 svtools/source/table/cellvalueconversion.hxx       |    4 +---
 svtools/source/table/mousefunction.hxx             |    4 +---
 svtools/source/table/tablecontrol_impl.hxx         |    4 +---
 svtools/source/table/tabledatawindow.hxx           |    4 +---
 svtools/source/table/tablegeometry.hxx             |    4 +---
 svtools/source/uno/fpicker.hxx                     |    4 +---
 svtools/source/uno/svtxgridcontrol.hxx             |    4 +---
 svtools/source/uno/treecontrolpeer.hxx             |    4 +---
 svtools/source/uno/unocontroltablemodel.hxx        |    4 +---
 svtools/source/uno/unogridcolumnfacade.hxx         |    4 +---
 svtools/source/uno/wizard/wizardpagecontroller.hxx |    4 +---
 svtools/source/uno/wizard/wizardshell.hxx          |    4 +---
 35 files changed, 35 insertions(+), 105 deletions(-)

New commits:
commit 08eccd9db6e7e2240a4053092967add4624a5f6c
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Sat Dec 28 10:15:19 2019 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sat Dec 28 11:44:56 2019 +0100

    tdf#124176: Use "pragma once" on svtools/*
    
    It passed "make check" on Linux
    
    Change-Id: I29c8f695c499652387ee2f0fffeccd46c3ec8e6e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85913
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/svtools/inc/FltCallDialogParameter.hxx b/svtools/inc/FltCallDialogParameter.hxx
index cd131fa2c235..c30744875ec8 100644
--- a/svtools/inc/FltCallDialogParameter.hxx
+++ b/svtools/inc/FltCallDialogParameter.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_INC_FTLCALLDIALOGPARAMETER_HXX
-#define INCLUDED_SVTOOLS_INC_FTLCALLDIALOGPARAMETER_HXX
+#pragma once
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -45,4 +44,3 @@ struct FltCallDialogParameter
         : pWindow(pW)
         , eFieldUnit(eFiUni){};
 };
-#endif
diff --git a/svtools/inc/bitmaps.hlst b/svtools/inc/bitmaps.hlst
index 9d2e9feb4afb..842ec418ca0b 100644
--- a/svtools/inc/bitmaps.hlst
+++ b/svtools/inc/bitmaps.hlst
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SVTOOLS_INC_BITMAPS_HRC
-#define INCLUDED_SVTOOLS_INC_BITMAPS_HRC
+#pragma once
 
 #define BMP_IMPRESS_SC              "res/sx03123.png"
 #define BMP_BITMAP_SC               "res/sx03125.png"
@@ -115,6 +114,5 @@
 
 #define BMP_TAB_LOCK "cmd/sc_lock.png"
 
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svtools/inc/borderline.hrc b/svtools/inc/borderline.hrc
index 1b6ddcf4337a..05bb3c78f729 100644
--- a/svtools/inc/borderline.hrc
+++ b/svtools/inc/borderline.hrc
@@ -6,8 +6,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_CUI_INC_BORDERLINE_HRC
-#define INCLUDED_CUI_INC_BORDERLINE_HRC
+#pragma once
 
 #include <editeng/borderline.hxx>
 
@@ -36,6 +35,5 @@ const std::pair<const char*, SvxBorderLineStyle> RID_SVXSTR_BORDERLINE[] =
     { NC_("RID_SVXSTR_BORDERLINE", "Dash Dot Dot"), SvxBorderLineStyle::DASH_DOT_DOT }
 };
 
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/errtxt.hrc b/svtools/inc/errtxt.hrc
index e5694df18ffd..9847148d4c3d 100644
--- a/svtools/inc/errtxt.hrc
+++ b/svtools/inc/errtxt.hrc
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_STRINGS_HRC
-#define INCLUDED_VCL_INC_STRINGS_HRC
+#pragma once
 
 #include <svtools/sfxecode.hxx>
 #include <svtools/soerr.hxx>
@@ -154,6 +153,5 @@ const ErrMsgCode RID_SO_ERRCTX[] =
     { nullptr, ERRCODE_NONE }
 };
 
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index f40e9502a8e6..c00a58802b25 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_INC_LANGTAB_HRC
-#define INCLUDED_SVTOOLS_INC_LANGTAB_HRC
+#pragma once
 
 #include <i18nlangtag/lang.h>
 
@@ -424,6 +423,5 @@ const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Guadeloupean Creole French") , LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCH }
 };
 
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/strings.hxx b/svtools/inc/strings.hxx
index 7b5fc29ae95c..5e7199c4a872 100644
--- a/svtools/inc/strings.hxx
+++ b/svtools/inc/strings.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SVTOOLS_INC_STRINGS_HXX
-#define INCLUDED_SVTOOLS_INC_STRINGS_HXX
+#pragma once
 
 // no need to translate this
 // the items in this string have to be in the same order as the STR_FIELD_* strings are added to the
@@ -22,6 +21,5 @@
 #define STR_DESCRIPTION_SIMPRESS_DOC    "StarImpress 4.0 / 5.0"
 #define STR_DESCRIPTION_SWRITER_DOC     "StarWriter 3.0 - 5.0"
 
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svtools/inc/table/defaultinputhandler.hxx b/svtools/inc/table/defaultinputhandler.hxx
index ae92bf42fe77..69cd0bf45bed 100644
--- a/svtools/inc/table/defaultinputhandler.hxx
+++ b/svtools/inc/table/defaultinputhandler.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX
-#define INCLUDED_SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX
+#pragma once
 
 #include <svtools/table/tableinputhandler.hxx>
 
@@ -55,6 +54,5 @@ namespace svt { namespace table
 } } // namespace svt::table
 
 
-#endif // INCLUDED_SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx
index b19ed9dd25aa..a40485227755 100644
--- a/svtools/inc/table/gridtablerenderer.hxx
+++ b/svtools/inc/table/gridtablerenderer.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX
-#define INCLUDED_SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX
+#pragma once
 
 #include <svtools/table/tablemodel.hxx>
 #include <vcl/image.hxx>
@@ -113,6 +112,5 @@ namespace svt { namespace table
 } } // namespace svt::table
 
 
-#endif // INCLUDED_SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
index ec33b1ce1dd1..ae5db552b108 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROL_HXX
-#define INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROL_HXX
+#pragma once
 
 #include <svtools/svtdllapi.h>
 #include <svtools/table/tablemodel.hxx>
@@ -171,6 +170,5 @@ namespace svt { namespace table
 } } // namespace svt::table
 
 
-#endif // INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/table/tablecontrolinterface.hxx b/svtools/inc/table/tablecontrolinterface.hxx
index 6baff43ba2b7..3ceb5a8dbc60 100644
--- a/svtools/inc/table/tablecontrolinterface.hxx
+++ b/svtools/inc/table/tablecontrolinterface.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROLINTERFACE_HXX
-#define INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROLINTERFACE_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <vcl/seleng.hxx>
@@ -240,6 +239,5 @@ namespace svt { namespace table
 } } // namespace svt::table
 
 
-#endif // INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROLINTERFACE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/templwin.hrc b/svtools/inc/templwin.hrc
index d43e59a1f0ee..0147a694ff5b 100644
--- a/svtools/inc/templwin.hrc
+++ b/svtools/inc/templwin.hrc
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_INC_TEMPLWIN_HRC
-#define INCLUDED_SVTOOLS_INC_TEMPLWIN_HRC
+#pragma once
 
 #include <utility>
 
@@ -53,6 +52,5 @@ const std::pair<const char*, int> STRARY_SVT_DOCINFO[] =
     { NC_("STRARY_SVT_DOCINFO", "Size") , DI_SIZE }
 };
 
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx
index aae0a4dd9f25..95623570cff3 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SVTOOLS_SOURCE_BRWBOX_BRWIMPL_HXX
-#define INCLUDED_SVTOOLS_SOURCE_BRWBOX_BRWIMPL_HXX
+#pragma once
 
 #include <vcl/accessibletableprovider.hxx>
 #include <vcl/svtaccessiblefactory.hxx>
@@ -77,6 +76,5 @@ namespace svt
     };
 }
 
-#endif // INCLUDED_SVTOOLS_SOURCE_BRWBOX_BRWIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index 41d8d4c4827e..ade56223aa03 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_BRWBOX_DATWIN_HXX
-#define INCLUDED_SVTOOLS_SOURCE_BRWBOX_DATWIN_HXX
+#pragma once
 
 #include <svtools/brwbox.hxx>
 #include <svtools/brwhead.hxx>
@@ -187,6 +186,5 @@ public:
 void InitSettings_Impl( vcl::Window *pWin );
 
 
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/editbrowseboximpl.hxx b/svtools/source/brwbox/editbrowseboximpl.hxx
index e9055b393f80..f71aab9b7654 100644
--- a/svtools/source/brwbox/editbrowseboximpl.hxx
+++ b/svtools/source/brwbox/editbrowseboximpl.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SVTOOLS_SOURCE_BRWBOX_EDITBROWSEBOXIMPL_HXX
-#define INCLUDED_SVTOOLS_SOURCE_BRWBOX_EDITBROWSEBOXIMPL_HXX
+#pragma once
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
@@ -32,6 +31,5 @@ namespace svt
         void clearActiveCell();
     };
 }
-#endif // INCLUDED_SVTOOLS_SOURCE_BRWBOX_EDITBROWSEBOXIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx
index 110fbe254fd4..c4fd540cf2d3 100644
--- a/svtools/source/config/itemholder2.hxx
+++ b/svtools/source/config/itemholder2.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
-#define INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
+#pragma once
 
 #include <unotools/itemholderbase.hxx>
 #include <cppuhelper/implbase.hxx>
@@ -61,6 +60,5 @@ class ItemHolder2 : private ItemHolderMutexBase
 
 } // namespace svtools
 
-#endif // INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index 84c5df986a50..1a3f435af272 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HXX
-#define INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HXX
+#pragma once
 
 #include <rtl/ustring.hxx>
 
@@ -26,6 +25,5 @@ namespace SvtDocInfoTable_Impl
     OUString GetString(int nId);
 };
 
-#endif // INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index 14f550011f56..7e3d4d0fddc5 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_CONTROL_TOOLBARMENUIMP_HXX
-#define INCLUDED_SVTOOLS_SOURCE_CONTROL_TOOLBARMENUIMP_HXX
+#pragma once
 
 #include <osl/mutex.hxx>
 #include <vcl/ctrl.hxx>
@@ -289,6 +288,5 @@ struct ToolbarMenu_Impl
 
 }
 
-#endif // INCLUDED_SVTOOLS_SOURCE_CONTROL_TOOLBARMENUIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index 8e53c2b44163..2e26f0c72d6f 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_CONTROL_VALUEIMP_HXX
-#define INCLUDED_SVTOOLS_SOURCE_CONTROL_VALUEIMP_HXX
+#pragma once
 
 #include <osl/mutex.hxx>
 #include <tools/color.hxx>
@@ -449,6 +448,5 @@ public:
     virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
 };
 
-#endif // INCLUDED_SVTOOLS_SOURCE_CONTROL_VALUEIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index 1ffe7c94892d..318c0bfa251e 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -18,8 +18,7 @@
  */
 
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_FILTER_EXPORTDIALOG_HXX
-#define INCLUDED_SVTOOLS_SOURCE_FILTER_EXPORTDIALOG_HXX
+#pragma once
 
 #include <FltCallDialogParameter.hxx>
 #include <vcl/weld.hxx>
@@ -179,6 +178,5 @@ public:
 };
 
 
-#endif // INCLUDED_SVTOOLS_SOURCE_FILTER_EXPORTDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx
index cacf743278dc..72567ce26895 100644
--- a/svtools/source/hatchwindow/ipwin.hxx
+++ b/svtools/source/hatchwindow/ipwin.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_HATCHWINDOW_IPWIN_HXX
-#define INCLUDED_SVTOOLS_SOURCE_HATCHWINDOW_IPWIN_HXX
+#pragma once
 
 #include <tools/gen.hxx>
 #include <vcl/window.hxx>
@@ -89,6 +88,5 @@ public:
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
 };
 
-#endif // INCLUDED_SVTOOLS_SOURCE_HATCHWINDOW_IPWIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/inc/filectrl.hxx b/svtools/source/inc/filectrl.hxx
index 87cd28a33645..cb01ff29b0fe 100644
--- a/svtools/source/inc/filectrl.hxx
+++ b/svtools/source/inc/filectrl.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_FILECTRL_HXX
-#define INCLUDED_SVTOOLS_FILECTRL_HXX
+#pragma once
 
 #include <vcl/window.hxx>
 #include <vcl/button.hxx>
@@ -67,6 +66,5 @@ public:
     void            SetEditModifyHdl( const Link<Edit&,void>& rLink );
 };
 
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/inc/hatchwindow.hxx b/svtools/source/inc/hatchwindow.hxx
index e86f0161d5f1..71e3d84f2dd4 100644
--- a/svtools/source/inc/hatchwindow.hxx
+++ b/svtools/source/inc/hatchwindow.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_INC_HATCHWINDOW_HXX
-#define INCLUDED_SVTOOLS_SOURCE_INC_HATCHWINDOW_HXX
+#pragma once
 
 #include <com/sun/star/embed/XHatchWindow.hpp>
 
@@ -66,6 +65,5 @@ public:
     virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 };
 
-#endif // INCLUDED_SVTOOLS_SOURCE_INC_HATCHWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index d18d887c1075..11613d3c9852 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_INC_UNOIFACE_HXX
-#define INCLUDED_SVTOOLS_SOURCE_INC_UNOIFACE_HXX
+#pragma once
 
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/awt/vclxwindows.hxx>
@@ -297,6 +296,5 @@ public:
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
 };
 
-#endif // INCLUDED_SVTOOLS_SOURCE_INC_UNOIFACE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/cellvalueconversion.hxx b/svtools/source/table/cellvalueconversion.hxx
index 79b1ac8a0530..3a5bb924c914 100644
--- a/svtools/source/table/cellvalueconversion.hxx
+++ b/svtools/source/table/cellvalueconversion.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_TABLE_CELLVALUECONVERSION_HXX
-#define INCLUDED_SVTOOLS_SOURCE_TABLE_CELLVALUECONVERSION_HXX
+#pragma once
 
 #include <com/sun/star/uno/Any.hxx>
 
@@ -48,6 +47,5 @@ namespace svt
 } // namespace svt
 
 
-#endif // INCLUDED_SVTOOLS_SOURCE_TABLE_CELLVALUECONVERSION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/mousefunction.hxx b/svtools/source/table/mousefunction.hxx
index b719cf176079..ab6f6b8811bd 100644
--- a/svtools/source/table/mousefunction.hxx
+++ b/svtools/source/table/mousefunction.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_TABLE_MOUSEFUNCTION_HXX
-#define INCLUDED_SVTOOLS_SOURCE_TABLE_MOUSEFUNCTION_HXX
+#pragma once
 
 #include <svtools/table/tabletypes.hxx>
 
@@ -129,6 +128,5 @@ namespace svt { namespace table
 } } // namespace svt::table
 
 
-#endif // INCLUDED_SVTOOLS_SOURCE_TABLE_MOUSEFUNCTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 22834ddefba5..fa4dca72b81c 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_TABLE_TABLECONTROL_IMPL_HXX
-#define INCLUDED_SVTOOLS_SOURCE_TABLE_TABLECONTROL_IMPL_HXX
+#pragma once
 
 #include <svtools/table/tablemodel.hxx>
 #include <table/tablecontrolinterface.hxx>
@@ -476,6 +475,5 @@ namespace svt { namespace table
 } } // namespace svt::table
 
 
-#endif // INCLUDED_SVTOOLS_SOURCE_TABLE_TABLECONTROL_IMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx
index 5329c3405445..8a584dc6e8db 100644
--- a/svtools/source/table/tabledatawindow.hxx
+++ b/svtools/source/table/tabledatawindow.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX
-#define INCLUDED_SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX
+#pragma once
 
 #include <vcl/window.hxx>
 
@@ -63,6 +62,5 @@ namespace svt { namespace table
 } } // namespace svt::table
 
 
-#endif // INCLUDED_SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx
index 19939fe67c6a..6e197a778233 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_TABLE_TABLEGEOMETRY_HXX
-#define INCLUDED_SVTOOLS_SOURCE_TABLE_TABLEGEOMETRY_HXX
+#pragma once
 
 #include <svtools/table/tabletypes.hxx>
 
@@ -155,6 +154,5 @@ namespace svt { namespace table
 } } // namespace svt::table
 
 
-#endif // INCLUDED_SVTOOLS_SOURCE_TABLE_TABLEGEOMETRY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/fpicker.hxx b/svtools/source/uno/fpicker.hxx
index 6af6400972be..76a7d078fa61 100644
--- a/svtools/source/uno/fpicker.hxx
+++ b/svtools/source/uno/fpicker.hxx
@@ -17,8 +17,7 @@
  * the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_UNO_FPICKER_HXX
-#define INCLUDED_SVTOOLS_SOURCE_UNO_FPICKER_HXX
+#pragma once
 
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
@@ -42,6 +41,5 @@ css::uno::Reference<css::uno::XInterface> FolderPicker_CreateInstance(
 css::uno::Sequence<OUString> FolderPicker_getSupportedServiceNames();
 OUString FolderPicker_getImplementationName();
 
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index b51f753e1f38..a89c31113cb4 100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_UNO_SVTXGRIDCONTROL_HXX
-#define INCLUDED_SVTOOLS_SOURCE_UNO_SVTXGRIDCONTROL_HXX
+#pragma once
 
 #include "unocontroltablemodel.hxx"
 #include <table/tablecontrol.hxx>
@@ -107,6 +106,5 @@ private:
     bool                                                    m_bTableModelInitCompleted;
     SelectionListenerMultiplexer                            m_aSelectionListeners;
 };
-#endif // INCLUDED_SVTOOLS_SOURCE_UNO_SVTXGRIDCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index e433d8c2d0ea..fb547973283d 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_UNO_TREECONTROLPEER_HXX
-#define INCLUDED_SVTOOLS_SOURCE_UNO_TREECONTROLPEER_HXX
+#pragma once
 
 #include <com/sun/star/awt/tree/XTreeControl.hpp>
 #include <com/sun/star/awt/tree/XTreeDataModel.hpp>
@@ -167,6 +166,5 @@ private:
     css::uno::Reference< css::graphic::XGraphicProvider > mxGraphicProvider;
 };
 
-#endif // INCLUDED_SVTOOLS_SOURCE_UNO_TREECONTROLPEER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index feb63c1de647..607a77316bf0 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_UNO_UNOCONTROLTABLEMODEL_HXX
-#define INCLUDED_SVTOOLS_SOURCE_UNO_UNOCONTROLTABLEMODEL_HXX
+#pragma once
 
 #include <svtools/table/tablemodel.hxx>
 #include <svtools/table/tablesort.hxx>
@@ -152,6 +151,5 @@ namespace svt { namespace table
 } } // svt::table
 
 
-#endif // INCLUDED_SVTOOLS_SOURCE_UNO_UNOCONTROLTABLEMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx
index a2aa6a06f29b..72b84372ad94 100644
--- a/svtools/source/uno/unogridcolumnfacade.hxx
+++ b/svtools/source/uno/unogridcolumnfacade.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_UNO_UNOGRIDCOLUMNFACADE_HXX
-#define INCLUDED_SVTOOLS_SOURCE_UNO_UNOGRIDCOLUMNFACADE_HXX
+#pragma once
 
 #include <svtools/table/tablemodel.hxx>
 
@@ -86,6 +85,5 @@ namespace svt { namespace table
 } } // svt::table
 
 
-#endif // INCLUDED_SVTOOLS_SOURCE_UNO_UNOGRIDCOLUMNFACADE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx
index 1a0161084867..12cd900b49e2 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.hxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SOURCE_UNO_WIZARD_WIZARDPAGECONTROLLER_HXX
-#define INCLUDED_SVTOOLS_SOURCE_UNO_WIZARD_WIZARDPAGECONTROLLER_HXX
+#pragma once
 
 #include <vcl/wizardmachine.hxx>
 #include <com/sun/star/ui/dialogs/XWizardController.hpp>
@@ -59,6 +58,5 @@ namespace svt { namespace uno
 } } // namespace svt::uno
 
 
-#endif // INCLUDED_SVTOOLS_SOURCE_UNO_WIZARD_WIZARDPAGECONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index 391df0f7769e..29a7e9b3853b 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVT_UNO_WIZARD_SHELL
-#define SVT_UNO_WIZARD_SHELL
+#pragma once
 
 #include <com/sun/star/ui/dialogs/XWizardController.hpp>
 #include <com/sun/star/ui/dialogs/XWizard.hpp>
@@ -127,6 +126,5 @@ namespace svt { namespace uno
 } } // namespace svt::uno
 
 
-#endif // SVT_UNO_WIZARD_SHELL
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

More information about the Libreoffice-commits mailing list