diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-03 13:39:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-04 16:56:59 +0200 |
| commit | d70da0b9e24991f8d58e83f53dbbf5b58c721f43 (patch) | |
| tree | ba172e1e9e47926d0034877e926194b0a5b69e80 /framework/inc/xml | |
| parent | e6eeecbe72a1d0e305369b103f05da887ca99016 (diff) | |
reduce number of framework libraries
Change-Id: If2bf85301eb1523a636d031f6e5a9f78cb1ee06b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97871
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/inc/xml')
| -rw-r--r-- | framework/inc/xml/menudocumenthandler.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/xml/saxnamespacefilter.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/xml/statusbardocumenthandler.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/xml/toolboxdocumenthandler.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/xml/xmlnamespaces.hxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 236e8359139c..539232c97664 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -29,7 +29,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> -#include <framework/fwedllapi.h> +#include <framework/fwkdllapi.h> namespace framework{ diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index 620ebd03d28c..1af96555d4e0 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -27,7 +27,7 @@ #include <cppuhelper/implbase.hxx> #include <stack> -#include <framework/fwedllapi.h> +#include <framework/fwkdllapi.h> namespace framework { @@ -35,7 +35,7 @@ namespace framework // workaround for incremental linking bugs in MSVC2015 class SAL_DLLPUBLIC_TEMPLATE SaxNamespaceFilter_Base : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > {}; -class UNLESS_MERGELIBS(FWE_DLLPUBLIC) SaxNamespaceFilter final : public SaxNamespaceFilter_Base +class UNLESS_MERGELIBS(FWK_DLLPUBLIC) SaxNamespaceFilter final : public SaxNamespaceFilter_Base { public: SaxNamespaceFilter( css::uno::Reference< css::xml::sax::XDocumentHandler > const & rSax1DocumentHandler ); diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 9dea5b1452fc..4c61e56e8266 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -28,7 +28,7 @@ #include <cppuhelper/implbase.hxx> #include <unordered_map> -#include <framework/fwedllapi.h> +#include <framework/fwkdllapi.h> namespace framework{ diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index db9184605a38..39196fd4ddc6 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -26,7 +26,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> -#include <framework/fwedllapi.h> +#include <framework/fwkdllapi.h> #include <unordered_map> diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx index 5f0c9670e8cf..ed6bb61406e7 100644 --- a/framework/inc/xml/xmlnamespaces.hxx +++ b/framework/inc/xml/xmlnamespaces.hxx @@ -21,7 +21,7 @@ #define INCLUDED_FRAMEWORK_INC_XML_XMLNAMESPACES_HXX #include <map> -#include <framework/fwedllapi.h> +#include <framework/fwkdllapi.h> #include <rtl/ustring.hxx> |