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 | c63d5210fd85cf8ec41c29f8fc17d39c676726be (patch) | |
| tree | 5c174869845f6d9710bc5963c3e43ef56899e8cf /framework/source/xml | |
| parent | f06fca80cdf28e70839916e38bd08f7575b79a3e (diff) | |
add lots more missing sal/macros.h includes
Diffstat (limited to 'framework/source/xml')
| -rw-r--r-- | framework/source/xml/menudocumenthandler.cxx | 14 | ||||
| -rw-r--r-- | framework/source/xml/toolboxdocumenthandler.cxx | 12 |
2 files changed, 2 insertions, 24 deletions
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> |