mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:singlevalfields in editeng

Browse Source 
Change-Id: I99c7ab28be7853535674cd7fab975da4252441f1
Reviewed-on: https://gerrit.libreoffice.org/26600
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2016-06-23 14:45:22 +02:00
committed by Noel Grandin
parent f02c1ca61c
commit db12f068f8
5 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editeng/source/editeng/eertfpar.cxx
View File

@@ -57,11 +57,9 @@ EditRTFParser::EditRTFParser(
aRTFMapMode(MAP_TWIP) aRTFMapMode(MAP_TWIP)
{ {
aCurSel = aSel; aCurSel = aSel;
eDestCharSet = RTL_TEXTENCODING_DONTKNOW;
nDefFont = 0; nDefFont = 0;
nDefTab = 0; nDefTab = 0;
nLastAction = 0; nLastAction = 0;
nDefFontHeight = 0;
SetInsPos(EditPosition(mpEditEngine, &aCurSel)); SetInsPos(EditPosition(mpEditEngine, &aCurSel));

2
editeng/source/editeng/eertfpar.hxx
View File

@@ -34,13 +34,11 @@ class EditRTFParser : public SvxRTFParser
private: private:
EditSelection aCurSel; EditSelection aCurSel;
EditEngine* mpEditEngine; EditEngine* mpEditEngine;
rtl_TextEncoding eDestCharSet;
MapMode aRTFMapMode; MapMode aRTFMapMode;
MapMode aEditMapMode; MapMode aEditMapMode;
sal_uInt16 nDefFont; sal_uInt16 nDefFont;
sal_uInt16 nDefTab; sal_uInt16 nDefTab;
sal_uInt16 nDefFontHeight;
sal_uInt8 nLastAction; sal_uInt8 nLastAction;
protected: protected:

1
editeng/source/rtf/svxrtf.cxx
View File

@@ -1345,7 +1345,6 @@ RTFPlainAttrMapIds::RTFPlainAttrMapIds( const SfxItemPool& rPool )
nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, false ); nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, false );
nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, false ); nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, false );
nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, false ); nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, false );
nRuby = 0; //rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_RUBY, sal_False );
nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, false ); nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, false );
nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, false ); nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, false );
nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, false ); nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, false );

4
include/editeng/numitem.hxx
View File

@@ -317,7 +317,6 @@ class SvxNodeNum
sal_uInt16 nLevelVal[ SVX_MAX_NUM ]; // Numbers of all levels sal_uInt16 nLevelVal[ SVX_MAX_NUM ]; // Numbers of all levels
sal_uInt16 nSetValue; // predetermined number sal_uInt16 nSetValue; // predetermined number
sal_uInt8 nMyLevel; // Current Level sal_uInt8 nMyLevel; // Current Level
bool bStartNum; // Restart numbering
public: public:
explicit inline SvxNodeNum( sal_uInt16 nSetVal = USHRT_MAX ); explicit inline SvxNodeNum( sal_uInt16 nSetVal = USHRT_MAX );
@@ -331,7 +330,7 @@ public:
}; };
SvxNodeNum::SvxNodeNum( sal_uInt16 nSetVal ) SvxNodeNum::SvxNodeNum( sal_uInt16 nSetVal )
: nSetValue( nSetVal ), nMyLevel( 0 ), bStartNum( false ) : nSetValue( nSetVal ), nMyLevel( 0 )
{ {
memset( nLevelVal, 0, sizeof( nLevelVal ) ); memset( nLevelVal, 0, sizeof( nLevelVal ) );
} }
@@ -342,7 +341,6 @@ inline SvxNodeNum& SvxNodeNum::operator=( const SvxNodeNum& rCpy )
{ {
nSetValue = rCpy.nSetValue; nSetValue = rCpy.nSetValue;
nMyLevel = rCpy.nMyLevel; nMyLevel = rCpy.nMyLevel;
bStartNum = rCpy.bStartNum;
memcpy( nLevelVal, rCpy.nLevelVal, sizeof( nLevelVal ) ); memcpy( nLevelVal, rCpy.nLevelVal, sizeof( nLevelVal ) );
} }

1
include/editeng/svxrtf.hxx
View File

@@ -148,7 +148,6 @@ struct RTFPlainAttrMapIds
nTwoLines, nTwoLines,
nCharScaleX, nCharScaleX,
nHorzVert, nHorzVert,
nRuby,
nRelief, nRelief,
nHidden nHidden
; ;