diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-07 14:19:22 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-03-07 14:55:55 +0200 |
commit | b2fb84499e1f75735e8fd90bc2eece3fed9af5f6 (patch) | |
tree | 186f3a6947b4d5feffe1326f66021102fac88c83 /filter | |
parent | c89f73a6033b28484f5e10054b542fa69a9fe475 (diff) |
loplugin:write only fields
Change-Id: Ia0fb487c5590e096659b81f76c4dc543e184c59c
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/icgm/chart.cxx | 6 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/chart.hxx | 136 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/class7.cxx | 31 |
3 files changed, 0 insertions, 173 deletions
diff --git a/filter/source/graphicfilter/icgm/chart.cxx b/filter/source/graphicfilter/icgm/chart.cxx index 5c9e2ce53252..29e300e76ae9 100644 --- a/filter/source/graphicfilter/icgm/chart.cxx +++ b/filter/source/graphicfilter/icgm/chart.cxx @@ -48,12 +48,6 @@ void CGMChart::DeleteTextEntry( TextEntry* pTextEntry ) if ( pTextEntry ) { delete pTextEntry->pText; - for ( TextAttribute* pTAttr = pTextEntry->pAttribute; pTAttr != nullptr ; ) - { - TextAttribute* pTempTAttr = pTAttr; - pTAttr = pTAttr->pNextAttribute; - delete pTempTAttr; - } ::std::vector< TextEntry* >::iterator it; for ( it = maTextEntryList.begin(); it != maTextEntryList.end(); ++it ) { diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx index 632ec0a13dc2..f22e526de86a 100644 --- a/filter/source/graphicfilter/icgm/chart.hxx +++ b/filter/source/graphicfilter/icgm/chart.hxx @@ -28,27 +28,6 @@ #define AUTOBULCHT 96 /* Autobuild BUL CHT */ #define AUTOTABCHT 97 /* Autobuild TAB CHT */ -typedef struct TextAttribute -{ - sal_uInt16 nTextAttribCount; - sal_Int8 nTextColorIndex; - sal_Int8 nTextColorRed; - sal_Int8 nTextColorGreen; - sal_Int8 nTextColorBlue; - sal_Int8 nShadowColorIndex; - sal_Int8 nShadowColorRed; - sal_Int8 nShadowColorGreen; - sal_Int8 nShadowColorBlue; - float nTextAttribSize; - sal_uInt16 nTextAttribBits; - sal_Int8 nTextFontType; // font identifiers - sal_Int8 nTextCharPage; - sal_uInt16 nTextFontFamily; - sal_Int8 nTextFontMemberID; - sal_Int8 nTextFontVendorID; - TextAttribute* pNextAttribute; // zero or pointer to next TextAttribute -} TextAttribute; - typedef struct TextEntry { sal_uInt16 nTypeOfText; @@ -58,99 +37,8 @@ typedef struct TextEntry sal_uInt16 nLineType; sal_uInt16 nAttributes; char* pText; // null terminated text - TextAttribute* pAttribute; } TextEntry; -struct ZoneOption -{ - char nOverTitle; - char nOverBody; - char nOverFoot; - char nFStyle_Title; - char nFStyle_Body; - char nFStyle_Foot; - char nFOutc_Title; - char nFOutc_Body; - char nFOutc_Foot; - char nFFillc_Title; - char nFFillc_Body; - char nFFillc_Foot; - ZoneOption() - : nOverTitle(0) - , nOverBody(0) - , nOverFoot(0) - , nFStyle_Title(0) - , nFStyle_Body(0) - , nFStyle_Foot(0) - , nFOutc_Title(0) - , nFOutc_Body(0) - , nFOutc_Foot(0) - , nFFillc_Title(0) - , nFFillc_Body(0) - , nFFillc_Foot(0) - { - } -}; - -struct BulletOption -{ - char nBType; - char nBSize; - char nBColor; - sal_Int16 nBStart; - double nTMargin; - double nBSpace; - char nCPlace; - BulletOption() - : nBType(0) - , nBSize(0) - , nBColor(0) - , nBStart(0) - , nTMargin(0) - , nBSpace(0) - , nCPlace(0) - { - } -}; - -struct IntSettings -{ - sal_uInt16 nCountry; - sal_uInt16 nDateFormat; - sal_uInt16 nDateSep; - sal_uInt16 nTimeFormat; - sal_uInt16 nTimeSep; - sal_uInt16 nNumSeps; - sal_uInt16 nCurrencyFormat; - char nCurrencySymbol[ 5 ]; - IntSettings() - : nCountry(0) - , nDateFormat(0) - , nDateSep(0) - , nTimeFormat(0) - , nTimeSep(0) - , nNumSeps(0) - , nCurrencyFormat(0) - { - memset (nCurrencySymbol, 0, sizeof(nCurrencySymbol)); - } -}; - -struct PageOrientDim -{ - char nOrientation; - char nDimension; - float nPageX; - float nPageY; - PageOrientDim() - : nOrientation(0) - , nDimension(0) - , nPageX(0.0) - , nPageY(0.0) - { - } -}; - struct DataNode { sal_Int16 nBoxX1; @@ -168,25 +56,6 @@ struct DataNode } }; -struct ChartZone -{ - sal_Int16 nMinX; - sal_Int16 nMinY; - sal_Int16 nMaxX; - sal_Int16 nMaxY; - char nUserDef; - char nPad1; - ChartZone() - : nMinX(0) - , nMinY(0) - , nMaxX(0) - , nMaxY(0) - , nUserDef(0) - , nPad1(0) - { - } -}; - class CGM; class CGMImpressOutAct; class CGMChart @@ -198,11 +67,6 @@ class CGMChart sal_Int8 mnCurrentFileType; ::std::vector< TextEntry* > maTextEntryList; DataNode mDataNode[ 7 ]; - ChartZone mChartZone; - PageOrientDim mPageOrientDim; - BulletOption mBulletOption; - ZoneOption mZoneOption; - IntSettings mIntSettings; public: CGMChart(); diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx index bdbdb866caaf..4042243fcd30 100644 --- a/filter/source/graphicfilter/icgm/class7.cxx +++ b/filter/source/graphicfilter/icgm/class7.cxx @@ -119,48 +119,20 @@ void CGM::ImplDoClass7() memcpy( pTextEntry->pText, pAppData, nLen ); pAppData += nLen; - TextAttribute* pTextOld = nullptr; - for ( sal_uInt16 i = 0; i < nAttributes; i++ ) - { - TextAttribute* pTextAttr = new TextAttribute; - - *pTextAttr = *reinterpret_cast<TextAttribute*>( pAppData ); - - pTextAttr->pNextAttribute = nullptr; - if ( i == 0 ) - pTextEntry->pAttribute = pTextAttr; - else - pTextOld->pNextAttribute = pTextAttr; - - pAppData += sizeof( TextAttribute ) - 4; - pTextOld = pTextAttr; - } mpChart->InsertTextEntry( pTextEntry ); } break; case 0x321 : /*AppData - IOC_TABS */break; case 0x322 : /*AppData - CHARTZONE*/ - { - mpChart->mChartZone = *reinterpret_cast<ChartZone*>( pAppData ); - } break; case 0x324 : /*AppData - TITLEZONE */break; case 0x328 : /*AppData - FOOTNOTEZONE */break; case 0x32A : /*AppData - LEGENDZONE */break; case 0x330 : /*AppData - PAGEORIENTDIM*/ - { - mpChart->mPageOrientDim = *reinterpret_cast<PageOrientDim*>( pAppData ); - } break; case 0x334 : /*AppData - CHTZONEOPTN*/ - { - mpChart->mZoneOption = *reinterpret_cast<ZoneOption*>( pAppData ); - } break; case 0x336 : /*AppData - CHTINTL*/ - { - mpChart->mIntSettings = *reinterpret_cast<IntSettings*>( pAppData ); - } break; case 0x338 : /*AppData - CHTLINESPC */break; case 0x384 : /*AppData - ORGGRIDSTATE */break; @@ -174,9 +146,6 @@ void CGM::ImplDoClass7() case 0x3EE : /*AppData - TTLAUTOBUILD */break; case 0x44E : /*AppData - BULTEXTOPTN */break; case 0x452 : /*AppData - BULLETOPTN*/ - { - mpChart->mBulletOption = *reinterpret_cast<BulletOption*>( pAppData ); - } break; case 0x454 : /*AppData - BULLETLINES*/break; case 0x456 : /*AppData - BULAUTOBUILD */break; |