diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 12:24:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 22:47:49 +0100 |
| commit | 66ef8ca217680095d8aaae025d82c2cbcd8ec1d2 (patch) | |
| tree | 2a7f4d2b5892c5fea9b89f0f27ccd6f771af5769 /writerfilter | |
| parent | 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b (diff) | |
HAVE_CPP_INLINE_VARIABLES is always true now
...but for safety, leave the configure.ac check in for some longer.
Also remove now-redundant SAL_INLINE_VARIABLE again (which was
LIBO_INTERNAL_ONLY).
Change-Id: Id049e0cb84b4f97f5859f1b16b867b39b448dec0
Reviewed-on: https://gerrit.libreoffice.org/64772
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 9f188d88b499..3241990b8061 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -399,10 +399,6 @@ public: } }; -#if !HAVE_CPP_INLINE_VARIABLES -constexpr sal_Int32 GraphicImport_Impl::nFillColor; -#endif - GraphicImport::GraphicImport(uno::Reference<uno::XComponentContext> const& xComponentContext, uno::Reference<lang::XMultiServiceFactory> const& xTextFactory, DomainMapper& rDMapper, |