summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-10-14 22:33:33 +0100
committerMichael Meeks <michael.meeks@novell.com>2010-10-14 22:33:33 +0100
commitc63d5210fd85cf8ec41c29f8fc17d39c676726be (patch)
tree5c174869845f6d9710bc5963c3e43ef56899e8cf /framework
parentf06fca80cdf28e70839916e38bd08f7575b79a3e (diff)
add lots more missing sal/macros.h includes
Diffstat (limited to 'framework')
-rw-r--r--framework/source/services/backingwindow.cxx2
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx1
-rw-r--r--framework/source/xml/menudocumenthandler.cxx14
-rw-r--r--framework/source/xml/toolboxdocumenthandler.cxx12
4 files changed, 5 insertions, 24 deletions
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index d46a536d2433..82cc5d631911 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 ebcf9cc82a50..38c7807533f1 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 bfc4acd04450..271dcbf5eee5 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 fa799b4e2f57..a30c5a38b2ce 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>