summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-07-04 11:23:59 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-04 12:06:47 +0200
commitea1839853fbdc49ead92a7cd465e427f4167cea2 (patch)
tree7df5b34bf3c7be380cf13a7ddf5a48021dd1951a /editeng
parent9ad9c5183f348384b62ec88459a3a5922e423d83 (diff)
loplugin:unusedfields in editeng
Change-Id: I9806d87028a11a8103c35004c87b5098ca591409 Reviewed-on: https://gerrit.libreoffice.org/39495 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editeng.cxx9
-rw-r--r--editeng/source/editeng/editobj.cxx1
-rw-r--r--editeng/source/editeng/eehtml.cxx1
-rw-r--r--editeng/source/editeng/eertfpar.cxx1
-rw-r--r--editeng/source/editeng/impedit.cxx5
-rw-r--r--editeng/source/editeng/impedit.hxx1
-rw-r--r--editeng/source/editeng/impedit2.cxx5
-rw-r--r--editeng/source/editeng/impedit4.cxx2
-rw-r--r--editeng/source/editeng/impedit5.cxx1
-rw-r--r--editeng/source/misc/swafopt.cxx14
10 files changed, 1 insertions, 39 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 4c012022cbff..7b3040092e90 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1002,7 +1002,6 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
if ( GetNotifyHdl().IsSet() )
{
EENotify aNotify( EE_NOTIFY_INPUT_START );
- aNotify.pEditEngine = this;
pImpEditEngine->CallNotify( aNotify );
}
@@ -1403,7 +1402,6 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
if ( GetNotifyHdl().IsSet() )
{
EENotify aNotify( EE_NOTIFY_INPUT_END );
- aNotify.pEditEngine = this;
pImpEditEngine->CallNotify( aNotify );
}
@@ -2423,10 +2421,6 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara )
DBG_ASSERT( pParaPortion && pLine, "GetParagraphInfos - Paragraph out of range" );
if ( pParaPortion && pLine )
{
- aInfos.nParaHeight = (sal_uInt16)pParaPortion->GetHeight();
- aInfos.nLines = pParaPortion->GetLines().Count();
- aInfos.nFirstLineStartX = pLine->GetStartPosX();
- aInfos.nFirstLineOffset = pParaPortion->GetFirstLineOffset();
aInfos.nFirstLineHeight = pLine->GetHeight();
aInfos.nFirstLineTextHeight = pLine->GetTxtHeight();
aInfos.nFirstLineMaxAscent = pLine->GetMaxAscent();
@@ -2471,7 +2465,6 @@ void EditEngine::ParagraphInserted( sal_Int32 nPara )
if ( GetNotifyHdl().IsSet() )
{
EENotify aNotify( EE_NOTIFY_PARAGRAPHINSERTED );
- aNotify.pEditEngine = this;
aNotify.nParagraph = nPara;
pImpEditEngine->CallNotify( aNotify );
}
@@ -2483,7 +2476,6 @@ void EditEngine::ParagraphDeleted( sal_Int32 nPara )
if ( GetNotifyHdl().IsSet() )
{
EENotify aNotify( EE_NOTIFY_PARAGRAPHREMOVED );
- aNotify.pEditEngine = this;
aNotify.nParagraph = nPara;
pImpEditEngine->CallNotify( aNotify );
}
@@ -2506,7 +2498,6 @@ void EditEngine::ParagraphHeightChanged( sal_Int32 nPara )
if ( GetNotifyHdl().IsSet() )
{
EENotify aNotify( EE_NOTIFY_TextHeightChanged );
- aNotify.pEditEngine = this;
aNotify.nParagraph = nPara;
pImpEditEngine->CallNotify( aNotify );
}
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index f8358514f43a..34eacc474167 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -756,7 +756,6 @@ void EditTextObjectImpl::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttr
const XEditAttribute& rAttr = *aAttrib.get();
EECharAttrib aEEAttr;
aEEAttr.pAttr = rAttr.GetItem();
- aEEAttr.nPara = nPara;
aEEAttr.nStart = rAttr.GetStart();
aEEAttr.nEnd = rAttr.GetEnd();
rLst.push_back(aEEAttr);
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index c95392ebfe6b..4c38b5234610 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -495,7 +495,6 @@ void EditHTMLParser::NextToken( HtmlTokenId nToken )
{
HtmlImportInfo aImportInfo(HtmlImportState::NextToken, this, mpEditEngine->CreateESelection(aCurSel));
aImportInfo.nToken = nToken;
- aImportInfo.nTokenValue = (short)nTokenValue;
if ( nToken == HtmlTokenId::TEXTTOKEN )
aImportInfo.aText = aToken;
else if (nToken == HtmlTokenId::STYLE_OFF)
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 9c5d90bad034..abac78f78d4e 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -44,7 +44,6 @@ HtmlImportInfo::HtmlImportInfo( HtmlImportState eSt, SvParser<HtmlTokenId>* pPrs
pParser = pPrsrs;
eState = eSt;
nToken = HtmlTokenId::NONE;
- nTokenValue = 0;
}
HtmlImportInfo::~HtmlImportInfo()
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index be17edb0bc3d..bc0cfe7f2450 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -149,10 +149,7 @@ void ImpEditView::SetEditSelection( const EditSelection& rEditSelection )
{
eNotifyType = EE_NOTIFY_TEXTVIEWSELECTIONCHANGED;
}
- //EENotify aNotify( EE_NOTIFY_TEXTVIEWSELECTIONCHANGED );
EENotify aNotify( eNotifyType );
- aNotify.pEditEngine = pEditEngine;
- aNotify.pEditView = GetEditViewPtr();
pEditEngine->pImpEditEngine->CallNotify( aNotify );
}
}
@@ -1204,8 +1201,6 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck )
if ( pEditEngine->pImpEditEngine->GetNotifyHdl().IsSet() )
{
EENotify aNotify( EE_NOTIFY_TEXTVIEWSCROLLED );
- aNotify.pEditEngine = pEditEngine;
- aNotify.pEditView = GetEditViewPtr();
pEditEngine->pImpEditEngine->CallNotify( aNotify );
}
}
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index fb26e2f5f7ac..303920f6a3b0 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -512,7 +512,6 @@ private:
bool bUseAutoColor:1;
bool bForceAutoColor:1;
bool bCallParaInsertedOrDeleted:1;
- bool bImpConvertFirstCall:1; // specifies if ImpConvert is called the very first time after Convert was called
bool bFirstWordCapitalization:1; // specifies if auto-correction should capitalize the first word or not
bool mbLastTryMerge:1;
bool mbReplaceLeadingSingleQuotationMark:1;
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 3c2c82adab71..c9da3379184b 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -105,7 +105,6 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
bUseAutoColor(true),
bForceAutoColor(false),
bCallParaInsertedOrDeleted(false),
- bImpConvertFirstCall(false),
bFirstWordCapitalization(true),
mbLastTryMerge(false),
mbReplaceLeadingSingleQuotationMark(true)
@@ -724,7 +723,6 @@ void ImpEditEngine::TextModified()
if ( GetNotifyHdl().IsSet() )
{
EENotify aNotify( EE_NOTIFY_TEXTMODIFIED );
- aNotify.pEditEngine = GetEditEnginePtr();
CallNotify( aNotify );
}
}
@@ -2194,7 +2192,6 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_Int32 n
if ( GetNotifyHdl().IsSet() )
{
EENotify aNotify( EE_NOTIFY_PARAGRAPHSMOVED );
- aNotify.pEditEngine = GetEditEnginePtr();
aNotify.nParagraph = nNewPos;
aNotify.nParam1 = aOldPositions.Min();
aNotify.nParam2 = aOldPositions.Max();
@@ -4421,7 +4418,6 @@ void ImpEditEngine::EnterBlockNotifications()
// external, non-queued events to be captured as well from
// client side
EENotify aNotify( EE_NOTIFY_BLOCKNOTIFICATION_START );
- aNotify.pEditEngine = GetEditEnginePtr();
GetNotifyHdl().Call( aNotify );
}
@@ -4445,7 +4441,6 @@ void ImpEditEngine::LeaveBlockNotifications()
}
EENotify aNotify( EE_NOTIFY_BLOCKNOTIFICATION_END );
- aNotify.pEditEngine = GetEditEnginePtr();
GetNotifyHdl().Call( aNotify );
}
}
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 15de52f9517b..b31de7889ac3 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1596,8 +1596,6 @@ void ImpEditEngine::Convert( EditView* pEditView,
else if ( CreateEPaM( aEditDoc.GetStartPaM() ) == pConvInfo->aConvStart )
bIsStart = true;
- bImpConvertFirstCall = true; // next ImpConvert call is the very first in this conversion turn
-
TextConvWrapper aWrp( Application::GetDefDialogParent(),
::comphelper::getProcessComponentContext(),
LanguageTag::convertToLocale( nSrcLang ),
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 60d1d39865a2..702774511d86 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -746,7 +746,6 @@ void ImpEditEngine::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>&
const EditCharAttrib& rAttr = *i.get();
EECharAttrib aEEAttr;
aEEAttr.pAttr = rAttr.GetItem();
- aEEAttr.nPara = nPara;
aEEAttr.nStart = rAttr.GetStart();
aEEAttr.nEnd = rAttr.GetEnd();
rLst.push_back(aEEAttr);
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 21ed9698661b..a8e424a093a5 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -28,7 +28,6 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
bAutoCorrect =
bCapitalStartSentence =
bCapitalStartWord =
- bChkFontAttr =
bChgUserColl =
bChgEnumNum =
bAddNonBrkSpace =
@@ -39,8 +38,7 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
bAFormatDelSpacesAtSttEnd =
bAFormatDelSpacesBetweenLines =
bAFormatByInpDelSpacesAtSttEnd =
- bAFormatByInpDelSpacesBetweenLines =
- bDummy = true;
+ bAFormatByInpDelSpacesBetweenLines = true;
bReplaceStyles =
bDelEmptyNode =
@@ -58,9 +56,6 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
bAutoCmpltCollectWords =
bAutoCmpltKeepList = true;
- bDummy6 = bDummy7 = bDummy8 =
- false;
-
nRightMargin = 50; // default 50%
nAutoCmpltExpandKey = KEY_RETURN;
@@ -86,7 +81,6 @@ SvxSwAutoFormatFlags& SvxSwAutoFormatFlags::operator=( const SvxSwAutoFormatFlag
bAutoCorrect = rAFFlags.bAutoCorrect;
bCapitalStartSentence = rAFFlags.bCapitalStartSentence;
bCapitalStartWord = rAFFlags.bCapitalStartWord;
- bChkFontAttr = rAFFlags.bChkFontAttr;
bChgUserColl = rAFFlags.bChgUserColl;
bChgEnumNum = rAFFlags.bChgEnumNum;
@@ -107,12 +101,6 @@ SvxSwAutoFormatFlags& SvxSwAutoFormatFlags::operator=( const SvxSwAutoFormatFlag
bAFormatByInpDelSpacesAtSttEnd = rAFFlags.bAFormatByInpDelSpacesAtSttEnd;
bAFormatByInpDelSpacesBetweenLines = rAFFlags.bAFormatByInpDelSpacesBetweenLines;
- bDummy = rAFFlags.bDummy;
-
- bDummy6 = rAFFlags.bDummy6;
- bDummy7 = rAFFlags.bDummy7;
- bDummy8 = rAFFlags.bDummy8;
-
bWithRedlining = rAFFlags.bWithRedlining;
bRightMargin = rAFFlags.bRightMargin;