summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-07-24 09:41:01 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-24 13:47:52 +0200
commit604bc943655b88994faa7f307d1c48e914965e95 (patch)
tree51d09183f93c02371f764a5d1e68c7c54abcb0b5 /filter
parenta43187d9075c6347412a2584d764145127779df8 (diff)
loplugin:unusedfields readonly fields
Change-Id: I6629926df06f71ff86e9fb23ae4fc1ae73bc9406 Reviewed-on: https://gerrit.libreoffice.org/40360 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
-rw-r--r--filter/inc/gfxtypes.hxx4
-rw-r--r--filter/source/graphicfilter/icgm/cgm.cxx8
-rw-r--r--filter/source/graphicfilter/icgm/cgm.hxx2
3 files changed, 0 insertions, 14 deletions
diff --git a/filter/inc/gfxtypes.hxx b/filter/inc/gfxtypes.hxx
index e6404def6c98..135aa5fd4988 100644
--- a/filter/inc/gfxtypes.hxx
+++ b/filter/inc/gfxtypes.hxx
@@ -148,7 +148,6 @@ struct State
maFontVariant("normal"),
mnFontWeight(400.0),
meTextAnchor(BEFORE),
- meTextDisplayAlign(BEFORE),
maCurrentColor(0.0),
mbVisibility(true),
meFillType(SOLID),
@@ -188,7 +187,6 @@ struct State
double mnFontWeight;
TextAlign meTextAnchor; // text-anchor
- TextAlign meTextDisplayAlign; // display-align
ARGBColor maCurrentColor;
bool mbVisibility;
@@ -233,7 +231,6 @@ inline bool operator==(const State& rLHS, const State& rRHS )
rLHS.maFontVariant==rRHS.maFontVariant &&
rLHS.mnFontWeight==rRHS.mnFontWeight &&
rLHS.meTextAnchor==rRHS.meTextAnchor &&
- rLHS.meTextDisplayAlign==rRHS.meTextDisplayAlign &&
rLHS.maCurrentColor==rRHS.maCurrentColor &&
rLHS.mbVisibility==rRHS.mbVisibility &&
rLHS.meFillType==rRHS.meFillType &&
@@ -285,7 +282,6 @@ namespace std
^ size_t(rState.maFontVariant.hashCode())
^ std::hash<double>()(rState.mnFontWeight)
^ size_t(rState.meTextAnchor)
- ^ size_t(rState.meTextDisplayAlign)
^ size_t(rState.mbVisibility)
^ size_t(rState.meFillType)
^ std::hash<double>()(rState.mnFillOpacity)
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index c841f7234a19..758f4e0a2fa8 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -43,7 +43,6 @@ CGM::CGM(uno::Reference< frame::XModel > const & rModel)
, mnXFraction(0)
, mnYFraction(0)
, mbAngReverse(false)
- , mpGraphic(nullptr)
, mbStatus(true)
, mbMetaFile(false)
, mbIsFinished(false)
@@ -72,13 +71,6 @@ CGM::CGM(uno::Reference< frame::XModel > const & rModel)
CGM::~CGM()
{
- if ( mpGraphic )
- {
- mpGDIMetaFile->Stop();
- mpGDIMetaFile->SetPrefMapMode( MapMode() );
- mpGDIMetaFile->SetPrefSize( Size( static_cast< long >( mnOutdx ), static_cast< long >( mnOutdy ) ) );
- *mpGraphic = Graphic( *mpGDIMetaFile );
- }
for(sal_uInt8* i : maDefRepList)
delete [] i;
maDefRepList.clear();
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index fb335e09bc0e..2921ce726ca7 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -56,8 +56,6 @@ class CGM
double mnYFraction;
bool mbAngReverse; // AngularDirection
- Graphic* mpGraphic;
-
bool mbStatus;
bool mbMetaFile;
bool mbIsFinished;