diff options
17 files changed, 27 insertions, 39 deletions
diff --git a/include/framework/addonmenu.hxx b/framework/inc/addonmenu.hxx index 4e8c1f24f9d8..45d8d0948c89 100644 --- a/include/framework/addonmenu.hxx +++ b/framework/inc/addonmenu.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_FRAMEWORK_ADDONMENU_HXX -#define INCLUDED_FRAMEWORK_ADDONMENU_HXX +#pragma once #include <rtl/ustring.hxx> #include <vcl/vclptr.hxx> @@ -81,6 +80,4 @@ class FWE_DLLPUBLIC AddonMenuManager } // namespace framework -#endif // INCLUDED_FRAMEWORK_ADDONMENU_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/menuconfiguration.hxx b/framework/inc/menuconfiguration.hxx index b1a49249061b..312608a7ecc9 100644 --- a/include/framework/menuconfiguration.hxx +++ b/framework/inc/menuconfiguration.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX -#define INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX +#pragma once #include <framework/fwedllapi.h> @@ -105,6 +104,4 @@ private: } -#endif // INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/statusbarconfiguration.hxx b/framework/inc/statusbarconfiguration.hxx index ff201cfee448..b4d8ceecfc4c 100644 --- a/include/framework/statusbarconfiguration.hxx +++ b/framework/inc/statusbarconfiguration.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_FRAMEWORK_STATUSBARCONFIGURATION_HXX -#define INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX +#pragma once #include <framework/fwedllapi.h> @@ -47,6 +46,4 @@ class FWE_DLLPUBLIC StatusBarConfiguration } // namespace framework -#endif // INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/toolboxconfiguration.hxx b/framework/inc/toolboxconfiguration.hxx index 2362bcc60aba..a0a04ccaceba 100644 --- a/include/framework/toolboxconfiguration.hxx +++ b/framework/inc/toolboxconfiguration.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_FRAMEWORK_TOOLBOXCONFIGURATION_HXX -#define INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX +#pragma once #include <framework/fwedllapi.h> @@ -47,6 +46,4 @@ class FWE_DLLPUBLIC ToolBoxConfiguration } // namespace framework -#endif // INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index a5cd90c68c0f..9dea5b1452fc 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_INC_XML_STATUSBARDOCUMENTHANDLER_HXX #define INCLUDED_FRAMEWORK_INC_XML_STATUSBARDOCUMENTHANDLER_HXX -#include <framework/statusbarconfiguration.hxx> +#include <statusbarconfiguration.hxx> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index dccdac7bce47..db9184605a38 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_INC_XML_TOOLBOXDOCUMENTHANDLER_HXX #define INCLUDED_FRAMEWORK_INC_XML_TOOLBOXDOCUMENTHANDLER_HXX -#include <framework/toolboxconfiguration.hxx> +#include <toolboxconfiguration.hxx> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 859fac65efc9..6c7f5bcd627a 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <framework/addonmenu.hxx> +#include <addonmenu.hxx> #include <framework/addonsoptions.hxx> -#include <framework/menuconfiguration.hxx> +#include <menuconfiguration.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx index f50d0d7eb765..bc92d180b9ac 100644 --- a/framework/source/fwe/helper/configimporter.cxx +++ b/framework/source/fwe/helper/configimporter.cxx @@ -18,7 +18,7 @@ */ #include <framework/configimporter.hxx> -#include <framework/toolboxconfiguration.hxx> +#include <toolboxconfiguration.hxx> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/ui/XUIConfigurationManager2.hpp> diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 5cbd3fc06b68..e5a548640a58 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <framework/menuconfiguration.hxx> +#include <menuconfiguration.hxx> -#include <framework/addonmenu.hxx> +#include <addonmenu.hxx> #include <xml/menudocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 27db9ea27a2e..ce974237b286 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <framework/statusbarconfiguration.hxx> +#include <statusbarconfiguration.hxx> #include <xml/statusbardocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index bc04e9c4a23b..7eb068357ddc 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <framework/toolboxconfiguration.hxx> +#include <toolboxconfiguration.hxx> #include <xml/toolboxdocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 22fce3235fd1..b166fc79a47e 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -22,10 +22,10 @@ #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> #include <uielement/uielementtypenames.hxx> -#include <framework/menuconfiguration.hxx> -#include <framework/toolboxconfiguration.hxx> +#include <menuconfiguration.hxx> +#include <toolboxconfiguration.hxx> -#include <framework/statusbarconfiguration.hxx> +#include <statusbarconfiguration.hxx> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 0b809363316a..cf5def97aa4a 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -21,9 +21,9 @@ #include <uielement/rootitemcontainer.hxx> #include <uielement/constitemcontainer.hxx> #include <uielement/uielementtypenames.hxx> -#include <framework/menuconfiguration.hxx> -#include <framework/statusbarconfiguration.hxx> -#include <framework/toolboxconfiguration.hxx> +#include <menuconfiguration.hxx> +#include <statusbarconfiguration.hxx> +#include <toolboxconfiguration.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/ElementExistException.hpp> diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index b1cc795ad112..e0fbfe16c4e3 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -19,8 +19,8 @@ #include <uielement/menubarmanager.hxx> #include <uielement/styletoolbarcontroller.hxx> -#include <framework/menuconfiguration.hxx> -#include <framework/addonmenu.hxx> +#include <menuconfiguration.hxx> +#include <addonmenu.hxx> #include <framework/addonsoptions.hxx> #include <classes/fwkresid.hxx> #include <strings.hrc> diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 5387568e1304..5bb88b23842b 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -18,7 +18,7 @@ */ #include <uielement/newmenucontroller.hxx> -#include <framework/menuconfiguration.hxx> +#include <menuconfiguration.hxx> #include <services.h> diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index f5b6d5f31695..9520ae8fc5d7 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -22,7 +22,7 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/propertyvalue.hxx> -#include <framework/menuconfiguration.hxx> +#include <menuconfiguration.hxx> #include <svtools/imagemgr.hxx> #include <svtools/miscopt.hxx> #include <svtools/toolboxcontroller.hxx> diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 8637392a4b98..856c5b982c4e 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -4872,6 +4872,7 @@ fpicker/source/win32/vistatypes.h fpicker/source/win32/workbench/Test_fps.cxx fpicker/test/svdem.cxx framework/inc/acceleratorconst.h +framework/inc/addonmenu.hxx framework/inc/classes/actiontriggercontainer.hxx framework/inc/classes/actiontriggerpropertyset.hxx framework/inc/classes/actiontriggerseparatorpropertyset.hxx @@ -4922,6 +4923,7 @@ framework/inc/macros/registration.hxx framework/inc/macros/xinterface.hxx framework/inc/macros/xserviceinfo.hxx framework/inc/macros/xtypeprovider.hxx +framework/inc/menuconfiguration.hxx framework/inc/properties.h framework/inc/protocols.h framework/inc/recording/dispatchrecorder.hxx @@ -4931,11 +4933,13 @@ framework/inc/services/desktop.hxx framework/inc/services/layoutmanager.hxx framework/inc/services/mediatypedetectionhelper.hxx framework/inc/services/uriabbreviation.hxx +framework/inc/statusbarconfiguration.hxx framework/inc/stdtypes.h framework/inc/targets.h framework/inc/threadhelp/gate.hxx framework/inc/threadhelp/transactionguard.hxx framework/inc/threadhelp/transactionmanager.hxx +framework/inc/toolboxconfiguration.hxx framework/inc/uiconfiguration/globalsettings.hxx framework/inc/uiconfiguration/graphicnameaccess.hxx framework/inc/uiconfiguration/imagemanager.hxx @@ -6149,7 +6153,6 @@ include/formula/types.hxx include/formula/vectortoken.hxx include/framework/ContextChangeEventMultiplexerTunnel.hxx include/framework/actiontriggerhelper.hxx -include/framework/addonmenu.hxx include/framework/addonsoptions.hxx include/framework/configimporter.hxx include/framework/documentundoguard.hxx @@ -6157,11 +6160,8 @@ include/framework/framelistanalyzer.hxx include/framework/fwedllapi.h include/framework/imutex.hxx include/framework/interaction.hxx -include/framework/menuconfiguration.hxx include/framework/sfxhelperfunctions.hxx -include/framework/statusbarconfiguration.hxx include/framework/titlehelper.hxx -include/framework/toolboxconfiguration.hxx include/framework/undomanagerhelper.hxx include/helpcompiler/HelpIndexer.hxx include/helpcompiler/HelpSearch.hxx |