diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2015-11-10 20:47:58 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-12 10:55:41 +0000 |
| commit | 1a494d9a00208eef790400bdbd8b3e5c7fed4886 (patch) | |
| tree | 9e305bbf11be0aacfa3af942a7c250f423b629a9 /framework | |
| parent | d7801c39826f2f24f7340e1b25809d3bb65d6099 (diff) | |
Windows header sanitization
Isolation of windows headers using prewin.h
and postwin.h headers and making headers
dependent on them more self contained.
Conversion of TCHAR to WCHAR and
LPCTSTR to LPCWSTR etc. and cleanup
of unnecessary casts.
Change-Id: I7eff5c477d9223a064bfb4d962ff6d61960ee69c
Reviewed-on: https://gerrit.libreoffice.org/19901
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/fwe/xml/menudocumenthandler.cxx | 4 | ||||
| -rw-r--r-- | framework/source/xml/imagesdocumenthandler.cxx | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index c393dd433403..1d7122e2b68c 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -33,6 +33,10 @@ #include <comphelper/processfactory.hxx> #include <comphelper/attributelist.hxx> +#ifdef ATTRIBUTE_HELPID +#undef ATTRIBUTE_HELPID +#endif + #define XMLNS_MENU "http://openoffice.org/2001/menu" #define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 0ba98b3d353d..295c72ec795f 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -32,6 +32,10 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; +#ifdef XMLNS_XLINK +#undef XMLNS_XLINK +#endif + #define ELEMENT_IMAGECONTAINER "imagescontainer" #define ELEMENT_IMAGES "images" #define ELEMENT_ENTRY "entry" |