summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-30 11:08:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-30 19:50:30 +0200
commit979d58c9a96884e36d1585df0c04c89b1f53fa99 (patch)
treebce40aad53ac5123a2864da59b8d889b8a51e577 /vcl/source
parent3c1fc723ff622d8a541fa26a3397ca4258332e4a (diff)
loplugin:unusedfields in toolkit..xmloff
Change-Id: I4964ff97e0a1735dc08c6ad204cae0b08e9ffc2c Reviewed-on: https://gerrit.libreoffice.org/39406 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/fontsubset/cff.cxx3
-rw-r--r--vcl/source/fontsubset/sft.cxx5
-rw-r--r--vcl/source/outdev/map.cxx29
-rw-r--r--vcl/source/outdev/outdev.cxx4
4 files changed, 1 insertions, 40 deletions
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index d996ce7a1bcb..29e7cf7351c0 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -237,7 +237,6 @@ struct CffLocal
int mnPrivDictSize;
int mnLocalSubrOffs;
int mnLocalSubrBase;
- int mnLocalSubrCount;
int mnLocalSubrBias;
ValType maNominalWidth;
@@ -1285,7 +1284,6 @@ CffLocal::CffLocal()
, mnPrivDictSize( 0)
, mnLocalSubrOffs( 0)
, mnLocalSubrBase( 0)
-, mnLocalSubrCount( 0)
, mnLocalSubrBias( 0)
, maNominalWidth( 0)
, maDefaultWidth( 0)
@@ -1412,7 +1410,6 @@ bool CffSubsetterContext::initialCffRead()
mpCffLocal->mnLocalSubrBase = mpCffLocal->mnPrivDictBase + mpCffLocal->mnLocalSubrOffs;
mpReadPtr = mpBasePtr + mpCffLocal->mnLocalSubrBase;
const int nSubrCount = (mpReadPtr[0] << 8) + mpReadPtr[1];
- mpCffLocal->mnLocalSubrCount = nSubrCount;
mpCffLocal->mnLocalSubrBias = (nSubrCount<1240)?107:(nSubrCount<33900)?1131:32768;
// seekIndexEnd( mpCffLocal->mnLocalSubrBase);
}
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index d0a891b56a5b..e66716edf652 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -86,7 +86,6 @@ typedef struct {
sal_uInt16 aw; /*- Advance Width (horizontal writing mode) */
sal_Int16 lsb; /*- Left sidebearing (horizontal writing mode) */
sal_uInt16 ah; /*- advance height (vertical writing mode) */
- sal_Int16 tsb; /*- top sidebearing (vertical writing mode) */
} TTGlyphMetrics;
#define HFORMAT_LINELEN 64
@@ -343,7 +342,7 @@ static void GetMetrics(TrueTypeFont *ttf, sal_uInt32 glyphID, TTGlyphMetrics *me
{
const sal_uInt8* table = getTable( ttf, O_hmtx );
- metrics->aw = metrics->lsb = metrics->ah = metrics->tsb = 0;
+ metrics->aw = metrics->lsb = metrics->ah = 0;
if (!table || !ttf->numberOfHMetrics) return;
if (glyphID < ttf->numberOfHMetrics) {
@@ -360,10 +359,8 @@ static void GetMetrics(TrueTypeFont *ttf, sal_uInt32 glyphID, TTGlyphMetrics *me
if (glyphID < ttf->numOfLongVerMetrics) {
metrics->ah = GetUInt16(table, 4 * glyphID);
- metrics->tsb = GetInt16(table, 4 * glyphID + 2);
} else {
metrics->ah = GetUInt16(table, 4 * (ttf->numOfLongVerMetrics - 1));
- metrics->tsb = GetInt16(table + ttf->numOfLongVerMetrics * 4, (glyphID - ttf->numOfLongVerMetrics) * 2);
}
}
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index f37116748603..f7d82ac49134 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -145,8 +145,6 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY,
static void ImplCalcMapResolution( const MapMode& rMapMode,
long nDPIX, long nDPIY, ImplMapRes& rMapRes )
{
- rMapRes.mfScaleX = 1.0;
- rMapRes.mfScaleY = 1.0;
switch ( rMapMode.GetMapUnit() )
{
case MapUnit::MapRelative:
@@ -251,20 +249,12 @@ static void ImplCalcMapResolution( const MapMode& rMapMode,
{
rMapRes.mnMapOfsX = aOrigin.X();
rMapRes.mnMapOfsY = aOrigin.Y();
- rMapRes.mfOffsetX = aOrigin.X();
- rMapRes.mfOffsetY = aOrigin.Y();
}
else
{
auto nXNumerator = aScaleX.GetNumerator();
auto nYNumerator = aScaleY.GetNumerator();
assert(nXNumerator != 0 && nYNumerator != 0);
- rMapRes.mfOffsetX *= aScaleX.GetDenominator();
- rMapRes.mfOffsetX /= nXNumerator;
- rMapRes.mfOffsetX += aOrigin.X();
- rMapRes.mfOffsetY *= aScaleY.GetDenominator();
- rMapRes.mfOffsetY /= nYNumerator;
- rMapRes.mfOffsetY += aOrigin.Y();
BigInt aX( rMapRes.mnMapOfsX );
aX *= BigInt( aScaleX.GetDenominator() );
@@ -304,11 +294,6 @@ static void ImplCalcMapResolution( const MapMode& rMapMode,
rMapRes.mnMapOfsY = (long)aY + aOrigin.Y();
}
- rMapRes.mfScaleX *= (double)rMapRes.mnMapScNumX * (double)aScaleX.GetNumerator() /
- ((double)rMapRes.mnMapScDenomX * (double)aScaleX.GetDenominator());
- rMapRes.mfScaleY *= (double)rMapRes.mnMapScNumY * (double)aScaleY.GetNumerator() /
- ((double)rMapRes.mnMapScDenomY * (double)aScaleY.GetDenominator());
-
// calculate scaling factor according to MapMode
// aTemp? = rMapRes.mnMapSc? * aScale?
Fraction aTempX = ImplMakeFraction( rMapRes.mnMapScNumX,
@@ -729,8 +714,6 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
Point aOrigin = rNewMapMode.GetOrigin();
maMapRes.mnMapOfsX = aOrigin.X();
maMapRes.mnMapOfsY = aOrigin.Y();
- maMapRes.mfOffsetX = aOrigin.X();
- maMapRes.mfOffsetY = aOrigin.Y();
maMapMode = rNewMapMode;
// #i75163#
@@ -746,10 +729,6 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
maMapRes.mnMapScDenomY = mnDPIY;
maMapRes.mnMapOfsX = 0;
maMapRes.mnMapOfsY = 0;
- maMapRes.mfOffsetX = 0.0;
- maMapRes.mfOffsetY = 0.0;
- maMapRes.mfScaleX = (double)1/(double)mnDPIX;
- maMapRes.mfScaleY = (double)1/(double)mnDPIY;
}
// calculate new MapMode-resolution
@@ -1474,10 +1453,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo
aMapResSource.mnMapScNumY = 1; \
aMapResSource.mnMapScDenomX = 1; \
aMapResSource.mnMapScDenomY = 1; \
- aMapResSource.mfOffsetX = 0.0; \
- aMapResSource.mfOffsetY = 0.0; \
- aMapResSource.mfScaleX = 1.0; \
- aMapResSource.mfScaleY = 1.0; \
ImplMapRes aMapResDest(aMapResSource); \
\
if ( !mbMap || pMapModeSource != &maMapMode ) \
@@ -1542,10 +1517,6 @@ static void verifyUnitSourceDest( MapUnit eUnitSource, MapUnit eUnitDest )
aMapResSource.mnMapScNumY = 1; \
aMapResSource.mnMapScDenomX = 1; \
aMapResSource.mnMapScDenomY = 1; \
- aMapResSource.mfOffsetX = 0.0; \
- aMapResSource.mfOffsetY = 0.0; \
- aMapResSource.mfScaleX = 1.0; \
- aMapResSource.mfScaleY = 1.0; \
ImplMapRes aMapResDest(aMapResSource); \
\
ImplCalcMapResolution( rMapModeSource, 72, 72, aMapResSource ); \
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 8244f0b338f1..df1c7ee8c380 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -117,10 +117,6 @@ OutputDevice::OutputDevice() :
maMapRes.mnMapScNumY = 1;
maMapRes.mnMapScDenomX = 1;
maMapRes.mnMapScDenomY = 1;
- maMapRes.mfOffsetX = 0.0;
- maMapRes.mfOffsetY = 0.0;
- maMapRes.mfScaleX = 1.0;
- maMapRes.mfScaleY = 1.0;
// struct ImplThresholdRes
maThresRes.mnThresLogToPixX = 0;
maThresRes.mnThresLogToPixY = 0;