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 | |
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>
21 files changed, 4 insertions, 61 deletions
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 1e7de838735e..9078d61b8f79 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -79,8 +79,7 @@ PackageRegistryBackend::PackageRegistryBackend( Reference<XComponentContext> const & xContext ) : t_BackendBase( getMutex() ), m_xComponentContext( xContext ), - m_eContext( Context::Unknown ), - m_readOnly( false ) + m_eContext( Context::Unknown ) { assert(xContext.is()); boost::optional<OUString> cachePath; @@ -88,8 +87,6 @@ PackageRegistryBackend::PackageRegistryBackend( comphelper::unwrapArgs( args, m_context, cachePath, readOnly ); if (cachePath) m_cachePath = *cachePath; - if (readOnly) - m_readOnly = *readOnly; if ( m_context == "user" ) m_eContext = Context::User; diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 2fc4c81a52a7..33ea1e5a7a37 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -220,7 +220,6 @@ protected: enum class Context { Unknown, User, Shared, Bundled, Tmp, Document } m_eContext; - bool m_readOnly; struct StrCannotDetectMediaType : public ::dp_misc::StaticResourceString< StrCannotDetectMediaType, RID_STR_CANNOT_DETECT_MEDIA_TYPE> {}; diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx index e584c8d1177f..82ccfd00b7fe 100644 --- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx +++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx @@ -46,7 +46,6 @@ namespace drawinglayer maDiscreteHitPosition(), mfDiscreteHitTolerance(0.0), mbHit(false), - mbHitToleranceUsed(false), mbHitTextOnly(bHitTextOnly) { // init hit tolerance @@ -66,9 +65,6 @@ namespace drawinglayer // generate discrete hit position maDiscreteHitPosition = getViewInformation2D().getObjectToViewTransformation() * rLogicHitPosition; - - // check if HitTolerance is used - mbHitToleranceUsed = basegfx::fTools::more(getDiscreteHitTolerance(), 0.0); } HitTestProcessor2D::~HitTestProcessor2D() 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; } diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx index 237818694347..466bb948df49 100644 --- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx +++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx @@ -47,7 +47,6 @@ namespace drawinglayer double mfDiscreteHitTolerance; bool mbHit : 1; - bool mbHitToleranceUsed : 1; /// flag to concentrate on text hits only bool mbHitTextOnly : 1; diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx index 7d8e931268c2..6b86c4399002 100644 --- a/include/editeng/editdata.hxx +++ b/include/editeng/editdata.hxx @@ -227,8 +227,6 @@ struct HtmlImportInfo OUString aText; - SfxItemSet* pAttrs; - HtmlImportInfo( HtmlImportState eState, SvParser<HtmlTokenId>* pPrsrs, const ESelection& rSel ); ~HtmlImportInfo(); }; @@ -244,8 +242,6 @@ struct RtfImportInfo OUString aText; - SvxRTFItemStackType* pAttrs; - RtfImportInfo( RtfImportState eState, SvParser<int>* pPrsrs, const ESelection& rSel ); ~RtfImportInfo(); }; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index d5f5d7e3b9bc..80a16b518037 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -506,7 +506,6 @@ private: sal_Int32 nPara; sal_Int32 nPos; - bool bSimpleClick; EditFieldInfo( const EditFieldInfo& ) = delete; @@ -518,7 +517,7 @@ public: { pOutliner = pOutl; nPara = nPa; nPos = nPo; - pTxtColor = nullptr; pFldColor = nullptr; bSimpleClick = false; + pTxtColor = nullptr; pFldColor = nullptr; mpSdrPage = nullptr; } ~EditFieldInfo() @@ -544,8 +543,6 @@ public: sal_Int32 GetPara() const { return nPara; } sal_Int32 GetPos() const { return nPos; } - void SetSimpleClick( bool bSimple ) { bSimpleClick = bSimple; } - const OUString& GetRepresentation() const { return aRepresentation; } OUString& GetRepresentation() { return aRepresentation; } void SetRepresentation( const OUString& rStr ){ aRepresentation = rStr; } @@ -619,7 +616,6 @@ private: sal_Int32 nDepthChangedHdlPrevDepth; sal_Int16 nMaxDepth; const sal_Int16 nMinDepth; - sal_Int32 nFirstPage; OutlinerMode nOutlinerMode; @@ -808,8 +804,6 @@ public: const Size& GetPaperSize() const; void SetPaperSize( const Size& rSize ); - void SetFirstPageNumber( sal_Int32 n ) { nFirstPage = n; } - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); void ClearPolygon(); diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 2b1b01b91091..1ef5406bc4ec 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -54,9 +54,7 @@ private: css::uno::XInterface > xLast; // result of last spelling/hyphenation attempt css::uno::Reference< css::linguistic2::XHyphenator > xHyph; - SdrObject* mpTextObj; bool bOtherCntnt : 1; // set => Check special sections initially - bool bDialog : 1; // Is pWin the Svx...Dialog? bool bHyphen : 1; // Split instead of spell checking bool bReverse : 1; // Reverse spell check bool bStartDone : 1; // Beginning already corrected @@ -112,8 +110,6 @@ protected: GetAllRightDic(); virtual void SpellEnd(); // Finish area virtual void InsertHyphen( const sal_Int32 nPos ); // Insert hyphen - - void SetCurTextObj( SdrObject* pObj ) { mpTextObj = pObj; } }; #endif diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 5137d1085d6b..126c55a0378a 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -101,9 +101,7 @@ struct SvxRTFStyleType SfxItemSet aAttrSet; // the attributes of Style (+ derivate!) OUString sName; sal_uInt16 nBasedOn, nNext; - bool bBasedOnIsSet; sal_uInt8 nOutlineNo; - bool bIsCharFmt; SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRange ); }; @@ -205,7 +203,6 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser bool bIsSetDfltTab : 1; // sal_True - DefTab was loaded bool bChkStyleAttr : 1; // sal_True - StyleSheets are evaluated bool bCalcValue : 1; // sal_True - Twip values adapt to App - bool bPardTokenRead : 1; // sal_True - Token \pard was detected bool bReadDocInfo : 1; // sal_True - DocInfo to read bool bIsLeftToRightDef : 1; // sal_True - in LeftToRight char run def. // sal_False - in RightToLeft char run def. diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 3ebc5f6c3723..f649f3d3f778 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1639,7 +1639,6 @@ private: for (size_t nIndex = 0, nCount = aPages.size(); nIndex < nCount;) { pOutliner->Clear(); - pOutliner->SetFirstPageNumber(aPages[nIndex]+1); Paragraph* pPara = nullptr; long nH (0); |