diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-13 14:33:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-21 09:14:45 +0200 |
| commit | 841e1a6f3619054ecc9240e061cd83d4e41d1ca9 (patch) | |
| tree | 2ee3989b2d3291c9b276205492d43369827ca3cf /framework | |
| parent | 4354f0e9ef4a5538729a2a6f2d1745e247f6c5cd (diff) | |
remove some old MSVC workarounds
Change-Id: I6abd8aaffb27b3c85df7c0518f7f576be4e32222
Reviewed-on: https://gerrit.libreoffice.org/36660
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/xml/acceleratorconfigurationreader.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/xml/imagesdocumenthandler.hxx | 1 | ||||
| -rw-r--r-- | framework/qa/cppunit/dispatchtest.cxx | 5 | ||||
| -rw-r--r-- | framework/source/xml/acceleratorconfigurationreader.cxx | 1 | ||||
| -rw-r--r-- | framework/source/xml/imagesdocumenthandler.cxx | 1 |
5 files changed, 4 insertions, 6 deletions
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx index ae0fb9019451..f5e2cedacad9 100644 --- a/framework/inc/xml/acceleratorconfigurationreader.hxx +++ b/framework/inc/xml/acceleratorconfigurationreader.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONREADER_HXX #define INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONREADER_HXX -#include <xml/saxnamespacefilter.hxx> // HACK: needed for MSVC 2013 ENABLE_LTO build: WeakImplHelper<XDocumentHandler> - #include <accelerators/acceleratorcache.hxx> #include <macros/xinterface.hxx> #include <general.h> diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 8fc1636e6dc0..2058a215e2d1 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <xml/saxnamespacefilter.hxx> // HACK: needed for MSVC 2013 ENABLE_LTO build: WeakImplHelper<XDocumentHandler> #include <xml/imagesconfiguration.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> diff --git a/framework/qa/cppunit/dispatchtest.cxx b/framework/qa/cppunit/dispatchtest.cxx index 554581debe55..040313dad31a 100644 --- a/framework/qa/cppunit/dispatchtest.cxx +++ b/framework/qa/cppunit/dispatchtest.cxx @@ -59,11 +59,10 @@ public: }; MyInterceptor::MyInterceptor() - : m_nExpected(0), + : m_aDisabledCommands {".uno:Bold"}, + m_nExpected(0), m_nUnexpected(0) { - // Not part of the initializer list as MSVC 2013 would not handle that. - m_aDisabledCommands = {".uno:Bold"}; } int MyInterceptor::getExpected() diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index ac0afbc4980f..88213168e24c 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -25,6 +25,7 @@ #include <acceleratorconst.h> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> +#include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/awt/Key.hpp> diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 5a7e002446f9..0389cf1887a8 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -22,6 +22,7 @@ #include <xml/imagesdocumenthandler.hxx> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> +#include <com/sun/star/xml/sax/SAXException.hpp> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> |