diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-22 12:30:23 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-23 09:00:18 +0200 |
commit | 222bc56e21356520a55a871c9cdfc26d2fc3fcb2 (patch) | |
tree | 8b68267dcac953d1b519c1fcb21441df2733da1b /editeng | |
parent | 6bbda13286c8f736f35ceb7a377ca15b3fd544b2 (diff) |
loplugin:unusedfields in desktop..editeng
Change-Id: Ieea12d0790a1034eba8975fe74fa205f02003b7d
Reviewed-on: https://gerrit.libreoffice.org/39134
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/edtspell.cxx | 1 | ||||
-rw-r--r-- | editeng/source/editeng/eehtml.cxx | 1 | ||||
-rw-r--r-- | editeng/source/editeng/eertfpar.cxx | 7 | ||||
-rw-r--r-- | editeng/source/editeng/eertfpar.hxx | 3 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 1 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 1 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 3 | ||||
-rw-r--r-- | editeng/source/editeng/impedit5.cxx | 1 | ||||
-rw-r--r-- | editeng/source/misc/splwrap.cxx | 6 | ||||
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 2 | ||||
-rw-r--r-- | editeng/source/rtf/rtfitem.cxx | 2 | ||||
-rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 6 |
12 files changed, 2 insertions, 32 deletions
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index aae0719e73d7..50dce80f5619 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -124,7 +124,6 @@ bool EditSpellWrapper::SpellMore() if ( pSpellInfo->bMultipleDoc ) { bMore = pEE->SpellNextDocument(); - SetCurTextObj( nullptr ); if ( bMore ) { // The text has been entered into the engine, when backwards then diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 0b6dfd182af0..c95392ebfe6b 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -531,7 +531,6 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems ) { EditSelection aSel( aStartPaM, aEndPaM ); HtmlImportInfo aImportInfo(HtmlImportState::SetAttr, this, mpEditEngine->CreateESelection(aSel)); - aImportInfo.pAttrs = const_cast<SfxItemSet *>(&rItems); mpEditEngine->CallHtmlImportHandler(aImportInfo); } diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index 43c093839e40..9c5d90bad034 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -45,7 +45,6 @@ HtmlImportInfo::HtmlImportInfo( HtmlImportState eSt, SvParser<HtmlTokenId>* pPrs eState = eSt; nToken = HtmlTokenId::NONE; nTokenValue = 0; - pAttrs = nullptr; } HtmlImportInfo::~HtmlImportInfo() @@ -59,7 +58,6 @@ RtfImportInfo::RtfImportInfo( RtfImportState eSt, SvParser<int>* pPrsrs, const E eState = eSt; nToken = 0; nTokenValue = 0; - pAttrs = nullptr; } RtfImportInfo::~RtfImportInfo() @@ -73,7 +71,6 @@ EditRTFParser::EditRTFParser( mpEditEngine(pEditEngine), aRTFMapMode(MapUnit::MapTwip), nDefFont(0), - nDefTab(0), bLastActionInsertParaBreak(false) { SetInsPos(EditPosition(mpEditEngine, &aCurSel)); @@ -190,9 +187,6 @@ void EditRTFParser::NextToken( int nToken ) } break; case RTF_DEFTAB: - { - nDefTab = sal_uInt16(nTokenValue); - } break; case RTF_CELL: { @@ -364,7 +358,6 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) { EditSelection aSel( aStartPaM, aEndPaM ); RtfImportInfo aImportInfo(RtfImportState::SetAttr, this, mpEditEngine->CreateESelection(aSel)); - aImportInfo.pAttrs = &rSet; mpEditEngine->CallRtfImportHandler(aImportInfo); } diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx index 16eff0da1d04..f2e6b7e37f59 100644 --- a/editeng/source/editeng/eertfpar.hxx +++ b/editeng/source/editeng/eertfpar.hxx @@ -34,8 +34,7 @@ private: MapMode aRTFMapMode; MapMode aEditMapMode; - sal_uInt16 nDefFont; - sal_uInt16 nDefTab; + sal_uInt16 nDefFont; bool bLastActionInsertParaBreak; protected: diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index e56b0ef25f61..ce505dcb8ef9 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -147,7 +147,6 @@ struct ImplIMEInfos std::unique_ptr<ExtTextInputAttr[]> pAttribs; EditPaM aPos; sal_Int32 nLen; - bool bCursor; bool bWasCursorOverwrite; ImplIMEInfos( const EditPaM& rPos, const OUString& rOldTextAfterStartPos ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index bd56b86f1ae5..3c2c82adab71 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -455,7 +455,6 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView ) if ( pData->GetTextAttr() ) { mpIMEInfos->CopyAttribs( pData->GetTextAttr(), pData->GetText().getLength() ); - mpIMEInfos->bCursor = pData->IsCursorVisible(); } else { diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 530b6f56f50e..3d0875993baa 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -92,14 +92,12 @@ struct TabInfo bool bValid; SvxTabStop aTabStop; - sal_Int32 nCharPos; sal_Int32 nTabPortion; long nStartPosX; long nTabPos; TabInfo() : bValid(false) - , nCharPos(0) , nTabPortion(0) , nStartPosX(0) , nTabPos(0) @@ -990,7 +988,6 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) // For LEFT / DEFAULT this tab is not considered. aCurrentTab.bValid = true; aCurrentTab.nStartPosX = nTmpWidth; - aCurrentTab.nCharPos = nTmpPos; aCurrentTab.nTabPortion = nTmpPortion; } diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index 057f72423da5..60d1d39865a2 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -822,7 +822,6 @@ ImplIMEInfos::ImplIMEInfos( const EditPaM& rPos, const OUString& rOldTextAfterSt pAttribs(nullptr), aPos(rPos), nLen(0), - bCursor(true), bWasCursorOverwrite(false) { } diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 197cfcdf13b5..ca006a885549 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -139,9 +139,7 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, const bool bStart, const bool bIsAllRight ) : pWin ( pWn ), - mpTextObj ( nullptr), bOtherCntnt ( false ), - bDialog ( false ), bHyphen ( false ), bStartChk ( false ), bRevAllowed ( true ), @@ -160,9 +158,7 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, const bool bStart, const bool bOther ) : pWin ( pWn ), xHyph ( xHyphenator ), - mpTextObj( nullptr), bOtherCntnt ( bOther ), - bDialog ( false ), bHyphen ( false ), bReverse ( false ), bStartDone ( bOther || ( !bReverse && bStart ) ), @@ -280,7 +276,6 @@ void SvxSpellWrapper::SpellDocument( ) Reference< XHyphenatedWord > xHyphWord( GetLast(), UNO_QUERY ); vcl::Window *pOld = pWin; - bDialog = true; if (xHyphWord.is()) { EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create(); @@ -291,7 +286,6 @@ void SvxSpellWrapper::SpellDocument( ) pWin = pDlg->GetWindow(); pDlg->Execute(); } - bDialog = false; pWin = pOld; } } diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 791212d2d602..9362efbbfb5d 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -638,7 +638,6 @@ void Outliner::FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_In if ( aFieldClickedHdl.IsSet() ) { EditFieldInfo aFldInfo( this, rField, nPara, nPos ); - aFldInfo.SetSimpleClick( true ); aFieldClickedHdl.Call( &aFldInfo ); } } @@ -1263,7 +1262,6 @@ Outliner::Outliner(SfxItemPool* pPool, OutlinerMode nMode) , nDepthChangedHdlPrevDepth(0) , nMaxDepth(9) , nMinDepth(-1) - , nFirstPage(1) , bFirstParaIsEmpty(true) , nBlockInsCallback(0) , bStrippingPortions(false) diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 6565cec52ddb..71a831752a24 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -207,7 +207,6 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) FontLineStyle eUnderline; FontLineStyle eOverline; FontEmphasisMark eEmphasis; - bPardTokenRead = false; RTF_CharTypeDef eCharType = NOTDEF_CHARTYPE; SvxParaVertAlignItem::Align nFontAlign; @@ -219,7 +218,6 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) { case RTF_PARD: RTFPardPlain( true, &pSet ); - bPardTokenRead = true; break; case RTF_PLAIN: diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index f1ea65fd69cc..bc3f25ff9fca 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -72,7 +72,6 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn, , bIsSetDfltTab( false) , bChkStyleAttr( false ) , bCalcValue( false ) - , bPardTokenRead( false) , bReadDocInfo( false ) , bIsLeftToRightDef( true) , bIsInReadStyleTab( false) @@ -334,7 +333,7 @@ void SvxRTFParser::ReadStyleTable() } break; - case RTF_SBASEDON: pStyle->nBasedOn = sal_uInt16(nTokenValue); pStyle->bBasedOnIsSet=true; break; + case RTF_SBASEDON: pStyle->nBasedOn = sal_uInt16(nTokenValue); break; case RTF_SNEXT: pStyle->nNext = sal_uInt16(nTokenValue); break; case RTF_OUTLINELEVEL: case RTF_SOUTLVL: pStyle->nOutlineNo = sal_uInt8(nTokenValue); break; @@ -343,7 +342,6 @@ void SvxRTFParser::ReadStyleTable() break; case RTF_CS: nStyleNo = (short)nTokenValue; bHasStyleNo = true; - pStyle->bIsCharFmt = true; break; case RTF_TEXTTOKEN: @@ -1099,9 +1097,7 @@ SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRa { nOutlineNo = sal_uInt8(-1); // not set nBasedOn = 0; - bBasedOnIsSet = false; //$flr #117411# nNext = 0; - bIsCharFmt = false; } |