diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-15 14:36:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-16 06:19:38 +0000 |
| commit | 96e9ffa64706f523d67659a20a0ccce6fbd0cb91 (patch) | |
| tree | 81b9eaa904d20da4b6d3997a4cb69b29416c12c9 /filter | |
| parent | 7fc7fad400c619e518448ee521b2aba099dccf9b (diff) | |
loplogin:singlevalfields in include/
Change-Id: I27842162fcf82120ecb811ee8e89e187430931fc
Reviewed-on: https://gerrit.libreoffice.org/28931
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 22 |
2 files changed, 3 insertions, 21 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index eccd42a6e42b..6e2c7bda28c5 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -7280,7 +7280,6 @@ SvxMSDffImportRec::SvxMSDffImportRec() pYRelTo( nullptr ), // relative to paragraph nLayoutInTableCell( 0 ), // element is laid out in table cell nFlags( 0 ), - nTextRotationAngle( 0 ), nDxTextLeft( 144 ), nDyTextTop( 72 ), nDxTextRight( 144 ), @@ -7319,7 +7318,6 @@ SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy) pYRelTo( nullptr ), nLayoutInTableCell( rCopy.nLayoutInTableCell ), nFlags( rCopy.nFlags ), - nTextRotationAngle( rCopy.nTextRotationAngle ), nDxTextLeft( rCopy.nDxTextLeft ), nDyTextTop( rCopy.nDyTextTop ), nDxTextRight( rCopy.nDxTextRight ), diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 3cf9ee9f5672..f9a2c19e21db 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1464,7 +1464,6 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O ReadFontCollection(); // reading TxPF, TxSI - PPTTextCharacterStyleAtomInterpreter aTxCFStyle; // SJ: TODO, this atom needs to be interpreted, it contains character default styles for standard objects (instance4) PPTTextParagraphStyleAtomInterpreter aTxPFStyle; PPTTextSpecInfoAtomInterpreter aTxSIStyle; // styles (default language setting ... ) @@ -1607,7 +1606,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O if ( aTxSIStyle.bValid && !aTxSIStyle.aList.empty() ) aTxSI = *( aTxSIStyle.aList[ 0 ] ); - rE2.pStyleSheet = new PPTStyleSheet( aSlideHd, rStCtrl, *this, aTxCFStyle, aTxPFStyle, aTxSI ); + rE2.pStyleSheet = new PPTStyleSheet( aSlideHd, rStCtrl, *this, aTxPFStyle, aTxSI ); pDefaultSheet = rE2.pStyleSheet; } if ( SeekToRec( rStCtrl, PPT_PST_ColorSchemeAtom, aSlideHd.GetRecEndFilePos() ) ) @@ -4026,8 +4025,8 @@ void PPTParaSheet::UpdateBulletRelSize( sal_uInt32 nLevel, sal_uInt16 nFontHeig } PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, SdrPowerPointImport& rManager, - const PPTTextCharacterStyleAtomInterpreter& /*rTxCFStyle*/, const PPTTextParagraphStyleAtomInterpreter& rTxPFStyle, - const PPTTextSpecInfo& rTextSpecInfo ) : + const PPTTextParagraphStyleAtomInterpreter& rTxPFStyle, + const PPTTextSpecInfo& rTextSpecInfo ) : PPTNumberFormatCreator ( new PPTExtParaProv( rManager, rIn, &rSlideHd ) ), maTxSI ( rTextSpecInfo ) @@ -4638,21 +4637,6 @@ PPTTextRulerInterpreter::~PPTTextRulerInterpreter() delete mpImplRuler; } -PPTTextCharacterStyleAtomInterpreter::PPTTextCharacterStyleAtomInterpreter() - : nFlags1(0) - , nFlags2(0) - , nFlags3(0) - , n1(0) - , nFontHeight(0) - , nFontColor(0) -{ -} - - -PPTTextCharacterStyleAtomInterpreter::~PPTTextCharacterStyleAtomInterpreter() -{ -} - PPTTextParagraphStyleAtomInterpreter::PPTTextParagraphStyleAtomInterpreter() : bValid ( false ), bForbiddenRules ( false ), |