diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-13 15:00:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-17 10:52:39 +0200 |
| commit | 05db125c57ea3c8f04a304561209c32cc5c45a67 (patch) | |
| tree | b145bc06aefb426e9b92fe9b4defea02a5ee4abe /writerfilter/source/dmapper/GraphicImport.cxx | |
| parent | be9b83445ec19346a4d5c830c955ed573469591a (diff) | |
loplugin:staticconstfield improvements
Change-Id: Ia0a19736dfd4500bb17b04c072710f8ee8744031
Reviewed-on: https://gerrit.libreoffice.org/60526
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter/source/dmapper/GraphicImport.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 2df49c4dbe57..d0dbb8fd4463 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -200,7 +200,7 @@ public: sal_Int32 nBrightness; double const fGamma; - sal_Int32 const nFillColor; + static constexpr sal_Int32 nFillColor = 0xffffffff; drawing::ColorMode eColorMode; @@ -260,7 +260,6 @@ public: ,nContrast(0) ,nBrightness(0) ,fGamma( -1.0 ) - ,nFillColor( 0xffffffff ) ,eColorMode( drawing::ColorMode_STANDARD ) ,nCurrentBorderLine(BORDER_TOP) ,bIsGraphic(false) @@ -388,6 +387,10 @@ 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, @@ -1276,7 +1279,7 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer uno::makeAny(m_pImpl->fGamma )); xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_BACK_COLOR ), - uno::makeAny( m_pImpl->nFillColor )); + uno::makeAny( GraphicImport_Impl::nFillColor )); m_pImpl->applyZOrder(xGraphicObjectProperties); |