diff options
author | Michael Meeks <michael.meeks@novell.com> | 2010-10-14 22:33:33 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-14 22:33:33 +0100 |
commit | 168acebb90f6bbdfe30079802c760da26c3f17aa (patch) | |
tree | 2a92431be591576d4f85c0ed147b97e6842a53ac /framework | |
parent | 9382c042573d431e071678df7827df7251a51f20 (diff) |
add lots more missing sal/macros.h includes
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/services/backingwindow.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 1 | ||||
-rw-r--r-- | framework/source/xml/menudocumenthandler.cxx | 14 | ||||
-rw-r--r-- | framework/source/xml/toolboxdocumenthandler.cxx | 12 |
4 files changed, 5 insertions, 24 deletions
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 35b51b4882..60df7d5696 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -34,6 +34,8 @@ #include "classes/fwkresid.hxx" #include <services.h> +#include <sal/macros.h> + #include "vcl/metric.hxx" #include "vcl/mnemonic.hxx" #include "vcl/menu.hxx" diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index cf5df76f46..4a82ba1ddf 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -28,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" +#include <sal/macros.h> #include <uielement/controlmenucontroller.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx index 4d1338ce87..df12789c4b 100644 --- a/framework/source/xml/menudocumenthandler.cxx +++ b/framework/source/xml/menudocumenthandler.cxx @@ -30,18 +30,12 @@ #include "precompiled_framework.hxx" #include <stdio.h> +#include <sal/macros.h> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <xml/menudocumenthandler.hxx> #include <xml/menuconfiguration.hxx> #include <classes/addonmenu.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/ui/ItemType.hpp> @@ -49,16 +43,10 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <rtl/logfile.hxx> #include <comphelper/attributelist.hxx> -//_________________________________________________________________________________________________________________ -// defines -//_________________________________________________________________________________________________________________ #define XMLNS_MENU "http://openoffice.org/2001/menu" #define XMLNS_PREFIX "menu:" diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx index 93f7e7ee69..7b012f343a 100644 --- a/framework/source/xml/toolboxdocumenthandler.cxx +++ b/framework/source/xml/toolboxdocumenthandler.cxx @@ -31,28 +31,18 @@ #include <stdio.h> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/resetableguard.hxx> #include <xml/toolboxdocumenthandler.hxx> #include <macros/debug.hxx> #include <xml/toolboxconfigurationdefines.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <sal/config.h> +#include <sal/macros.h> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <rtl/ustrbuf.hxx> |