diff options
35 files changed, 22 insertions, 127 deletions
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 40adee5e36e5..ccd6f814a0ab 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -89,11 +89,9 @@ class ScXMLCellContentDeletionContext : public ScXMLImportContext sal_uInt32 nID; sal_Int32 nMatrixCols; sal_Int32 nMatrixRows; - formula::FormulaGrammar::Grammar eGrammar; + formula::FormulaGrammar::Grammar eGrammar; sal_uInt16 nType; ScMatrixMode nMatrixFlag; - bool bBigRange; - bool bContainsCell; public: ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -629,9 +627,7 @@ ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport& nMatrixRows(0), eGrammar( formula::FormulaGrammar::GRAM_STORAGE_DEFAULT), nType(css::util::NumberFormat::ALL), - nMatrixFlag(ScMatrixMode::NONE), - bBigRange(false), - bContainsCell(false) + nMatrixFlag(ScMatrixMode::NONE) { sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) @@ -660,14 +656,12 @@ SvXMLImportContext *ScXMLCellContentDeletionContext::CreateChildContext( sal_uIn { if (IsXMLToken(rLocalName, XML_CHANGE_TRACK_TABLE_CELL)) { - bContainsCell = true; pContext = new ScXMLChangeCellContext(GetScImport(), nPrefix, rLocalName, xAttrList, maCell, sFormulaAddress, sFormula, sFormulaNmsp, eGrammar, sInputString, fValue, nType, nMatrixFlag, nMatrixCols, nMatrixRows ); } else if (IsXMLToken(rLocalName, XML_CELL_ADDRESS)) { OSL_ENSURE(!nID, "a action with a ID should not contain a BigRange"); - bBigRange = true; pContext = new ScXMLBigRangeContext(GetScImport(), nPrefix, rLocalName, xAttrList, aBigRange); } } diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 772b8b5a3088..07bbd197e348 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -290,7 +290,6 @@ void ScAccessibleSpreadsheet::ConstructScAccessibleSpreadsheet( mpAccCell.clear(); meSplitPos = eSplitPos; mnTab = nTab; - mbHasSelection = false; mbDelIns = false; mbIsFocusSend = false; maVisCells = GetVisCells(GetVisArea(mpViewShell, meSplitPos)); @@ -299,10 +298,7 @@ void ScAccessibleSpreadsheet::ConstructScAccessibleSpreadsheet( mpViewShell->AddAccessibilityObject(*this); const ScViewData& rViewData = mpViewShell->GetViewData(); - const ScMarkData& rMarkData = rViewData.GetMarkData(); maActiveCell = rViewData.GetCurPos(); - mbHasSelection = rMarkData.GetTableSelect(maActiveCell.Tab()) && - (rMarkData.IsMarked() || rMarkData.IsMultiMarked()); mpAccCell = GetAccessibleCellAt(maActiveCell.Row(), maActiveCell.Col()); ScDocument* pScDoc= GetDocument(mpViewShell); if (pScDoc) @@ -333,7 +329,6 @@ void ScAccessibleSpreadsheet::CompleteSelectionChanged(bool bNewState) } if (mpMarkedRanges) DELETEZ(mpMarkedRanges); - mbHasSelection = bNewState; AccessibleEventObject aEvent; aEvent.EventId = AccessibleEventId::STATE_CHANGED; diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 4f9cf7abe31b..ec5ee4ba36e0 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -41,8 +41,7 @@ using namespace com::sun::star; ScClient::ScClient( ScTabViewShell* pViewShell, vcl::Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ) : SfxInPlaceClient( pViewShell, pDraw, pObj->GetAspect() ), - pModel( pSdrModel ), - pGrafEdit( nullptr ) + pModel( pSdrModel ) { SetObject( pObj->GetObjRef() ); } diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index c13325c91bdb..27ffddae8336 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -84,7 +84,6 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain pDragSourceView( nullptr ), nDragSourceFlags( ScDragSrc::Undefined ), bDragWasInternal( false ), - nSourceDocID( 0 ), maShellID(SfxObjectShell::CreateShellID(pContainerShell)) { @@ -210,7 +209,6 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain if ( pContainerShell ) { ScDocument& rDoc = pContainerShell->GetDocument(); - nSourceDocID = rDoc.GetDocumentID(); if ( pPage ) { ScChartHelper::FillProtectedChartRangesVector( m_aProtectedChartRangesVector, &rDoc, pPage ); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 44fa974ee649..23d9d55099f6 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -41,7 +41,6 @@ ScCondFrmtEntry::ScCondFrmtEntry(vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos) : VclContainer(pParent, WB_CLIPCHILDREN | WB_BORDER) , mbActive(false) - , mnIndex(0) , maStrCondition(ScResId(SCSTR_CONDITION)) , mpDoc(pDoc) , maPos(rPos) @@ -106,10 +105,7 @@ bool ScCondFrmtEntry::EventNotify( NotifyEvent& rNEvt ) void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex) { - mnIndex = nIndex; - OUStringBuffer aBuffer(maStrCondition); - aBuffer.append(OUString::number(nIndex)); - maFtCondNr->SetText(aBuffer.makeStringAndClear()); + maFtCondNr->SetText(maStrCondition + OUString::number(nIndex)); } void ScCondFrmtEntry::SetHeight() diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 475137ee6fde..e45c2cb31b63 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -40,20 +40,17 @@ class ScAreaData { public: ScAreaData() - : bIsDbArea(false) { } - void Set( const OUString& rName, const OUString& rArea, bool bDb ) - { - aStrName = rName; - aStrArea = rArea; - bIsDbArea = bDb; - } + void Set( const OUString& rName, const OUString& rArea ) + { + aStrName = rName; + aStrArea = rArea; + } OUString aStrName; OUString aStrArea; - bool bIsDbArea; }; ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, @@ -218,7 +215,7 @@ void ScConsolidateDlg::Init() while ( aIter.Next( aStrName, aRange ) ) { OUString aStrArea(aRange.Format(ScRefFlags::ADDR_ABS_3D, pDoc, eConv)); - pAreaData[nAt++].Set( aStrName, aStrArea, aIter.WasDBName() ); + pAreaData[nAt++].Set( aStrName, aStrArea ); } } diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 209b7ceed17f..81839de0a414 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -55,8 +55,7 @@ ScPivotFilterDlg::ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgS pOutItem ( nullptr ), pViewData ( nullptr ), pDoc ( nullptr ), - nSrcTab ( nSourceTab ), // is not in QueryParam - nFieldCount ( 0 ) + nSrcTab ( nSourceTab ) // is not in QueryParam { get(m_pLbField1, "field1"); get(m_pLbCond1, "cond1"); @@ -285,7 +284,6 @@ void ScPivotFilterDlg::FillFieldLists() m_pLbField3->InsertEntry( aFieldName, i ); i++; } - nFieldCount = i; } } diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 58430ade823b..a153726e06a2 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -363,7 +363,6 @@ void DataStream::Decode(const OUString& rURL, const ScRange& rRange, sal_Int32 nLimit, MoveType eMove, const sal_uInt32 nSettings) { msURL = rURL; - mnLimit = nLimit; meMove = eMove; meOrigMove = eMove; mnSettings = nSettings; diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 892e4a29ee4b..4d0a21a976ce 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -103,8 +103,7 @@ static void lcl_UpdateHyphenator( Outliner& rOutliner, SdrObject* pObj ) FuText::FuText(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : - FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq), - pTextObj(nullptr) + FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq) { } @@ -566,8 +565,6 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, } } - pTextObj = nullptr; - if ( pObj ) { sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); @@ -606,7 +603,6 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, // EditEngine-UndoManager anmelden pViewShell->SetDrawTextUndo( &pO->GetUndoManager() ); - pTextObj = static_cast<SdrTextObj*>(pObj); pView->SetEditMode(); // set text cursor to click position or to end, diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 14eef752fc77..db7334a43b13 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -225,7 +225,6 @@ private: ScAddress maActiveCell; SCTAB mnTab; bool mbIsSpreadsheet; - bool mbHasSelection; bool mbDelIns; bool mbIsFocusSend; diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index f6917ed1f91e..61c8fecd2858 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -85,8 +85,6 @@ private: OUString aUnknown; sal_uLong nAcceptCount; sal_uLong nRejectCount; - bool bAcceptEnableFlag:1; - bool bRejectEnableFlag:1; bool bIgnoreMsg:1; bool bNoSelection:1; bool bHasFilterEntry:1; diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index 13d2a198c109..57a8a9c4fad7 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.hxx @@ -31,7 +31,6 @@ class ScClient : public SfxInPlaceClient { private: SdrModel* pModel; - SdrGrafObj* pGrafEdit; virtual void ObjectAreaChanged() override; virtual void RequestNewObjectArea( tools::Rectangle& ) override; @@ -41,7 +40,6 @@ public: ScClient( ScTabViewShell* pViewShell, vcl::Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ); virtual ~ScClient() override; - void SetGrafEdit(SdrGrafObj* pNew) { pGrafEdit = pNew; } SdrOle2Obj* GetDrawObj(); }; diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index ad40058ceeb2..87a468b5dea2 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -53,7 +53,6 @@ private: VclPtr<FixedText> maFtCondNr; VclPtr<FixedText> maFtCondition; - sal_Int32 mnIndex; OUString maStrCondition; protected: VclPtr<ListBox> maLbType; diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 20ac0b163259..2c6329e3ecd7 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -99,8 +99,6 @@ class ScContentTree : public SvTreeListBox DECL_LINK( ContentDoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK( ExecDragHdl, void*, void ); -public: - SvTreeListEntry* pTmpEntry; protected: diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 5ddf9ac7a55e..e70b5e47626e 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -105,7 +105,6 @@ private: ScDocShell* mpDocShell; DocumentStreamAccess maDocAccess; OUString msURL; - sal_Int32 mnLimit; sal_uInt32 mnSettings; MoveType meOrigMove; // Initial move setting. This one gets saved to file. MoveType meMove; // move setting during streaming, which may change in the middle. diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index 50761858b81e..5920e33351a9 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -59,8 +59,6 @@ private: ScDragSrc nDragSourceFlags; bool bDragWasInternal; - sal_uInt32 nSourceDocID; - ScRangeListVector m_aProtectedChartRangesVector; OUString maShellID; diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 1a913143c334..7e7c1f28d497 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -94,8 +94,6 @@ private: double fIncrement; double fEndVal; - bool bStartValFlag; - void Init( sal_uInt16 nPossDir ); bool CheckStartVal(); bool CheckIncrementVal(); diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index 9863fc987036..092a0ed45f1e 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -29,9 +29,6 @@ class SdrOutliner; /** Base class for Text functions */ class FuText : public FuConstruct { -protected: - SdrTextObj* pTextObj; - public: FuText(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index beb9b83c393f..c0c9b83490e2 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -193,7 +193,6 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou bool bRFSize:1; bool bPagebreakDrawn:1; bool bDragRect:1; - bool bIsInScroll:1; bool bIsInPaint:1; bool bNeedsRepaint:1; bool bAutoMarkVisible:1; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index fcc2351c987d..7e9ed521f2d2 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -201,7 +201,6 @@ private: sal_uInt16 nDownId; sal_uInt16 nUpId; sal_uInt16 nDataId; - sal_uInt16 nAreaId; ScArea* pMarkArea; ScViewData* pViewData; diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index c5bc27d82e86..8aeee70791e1 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -85,10 +85,8 @@ private: SvxCellOrientation meOrient; SCSIZE mnArrY; SCCOL mnX; - SCROW mnY; SCCOL mnCellX; SCROW mnCellY; - SCTAB mnTab; long mnPosX; long mnPosY; long mnInitPosX; @@ -168,8 +166,6 @@ private: Fraction aZoomX; Fraction aZoomY; - SdrObject* pEditObj; // Omit when painting - ScTabViewShell* pViewShell; // for connect from visible plug-ins FmFormView* pDrawView; // SdrView to paint to @@ -203,7 +199,6 @@ private: bool bAnyRotated; // internal bool bAnyClipped; // internal bool bTabProtected; - sal_uInt8 nTabTextDirection; // EEHorizontalTextDirection values bool bLayoutRTL; // #i74769# use SdrPaintWindow direct, remember it during BeginDrawLayers/EndDrawLayers @@ -266,12 +261,11 @@ public: ~ScOutputData(); - void SetSpellCheckContext( const sc::SpellCheckContext* pCxt ); + void SetSpellCheckContext( const sc::SpellCheckContext* pCxt ); void SetContentDevice( OutputDevice* pContentDev ); void SetRefDevice( OutputDevice* pRDev ) { mpRefDevice = pFmtDevice = pRDev; } void SetFmtDevice( OutputDevice* pRDev ) { pFmtDevice = pRDev; } - void SetEditObject( SdrObject* pObj ) { pEditObj = pObj; } void SetViewShell( ScTabViewShell* pSh ) { pViewShell = pSh; } void SetDrawView( FmFormView* pNew ) { pDrawView = pNew; } diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 230109f62052..d54468a15870 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -74,7 +74,6 @@ private: ScDocument* pDoc; SCTAB nSrcTab; - sal_uInt16 nFieldCount; VclPtr<ComboBox> aValueEdArr[3]; VclPtr<ListBox> aFieldLbArr[3]; VclPtr<ListBox> aCondLbArr[3]; diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index 1a94f71bb611..67f477df3596 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -40,16 +40,10 @@ private: sal_uInt16 m_nNumberId; sal_uInt16 m_nFontId; - sal_uInt16 m_nFontEffectId; - sal_uInt16 m_nAlignmentId; - sal_uInt16 m_nAsianId; - sal_uInt16 m_nBorderId; sal_uInt16 m_nBackgroundId; - sal_uInt16 m_nProtectId; sal_uInt16 m_nPageId; sal_uInt16 m_nHeaderId; sal_uInt16 m_nFooterId; - sal_uInt16 m_nSheetId; }; #endif // INCLUDED_SC_SOURCE_UI_INC_STYLEDLG_HXX diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index e138c35aca4c..5169f2e2db0e 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -135,8 +135,6 @@ private: bool bActiveDrawSh; bool bActiveDrawTextSh; - bool bActivePivotSh; - bool bActiveAuditingSh; bool bActiveDrawFormSh; bool bActiveOleObjectSh; bool bActiveChartSh; diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index e7f2c3964722..08b29b7611ec 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -98,8 +98,6 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window aStrChildOrgContent (ScResId(STR_CHG_CHILD_ORGCONTENT)), aStrEmpty (ScResId(STR_CHG_EMPTY)), aUnknown("Unknown"), - bAcceptEnableFlag(true), - bRejectEnableFlag(true), bIgnoreMsg(false), bNoSelection(false), bHasFilterEntry(false), @@ -182,8 +180,6 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData) bIgnoreMsg=false; nAcceptCount=0; nRejectCount=0; - bAcceptEnableFlag=true; - bRejectEnableFlag=true; // don't call Init here (switching between views), just set link below // (dialog is just hidden, not deleted anymore, when switching views) @@ -754,8 +750,6 @@ void ScAcceptChgDlg::UpdateView() SvTreeListEntry* pParent=nullptr; ScChangeTrack* pChanges=nullptr; const ScChangeAction* pScChangeAction=nullptr; - bAcceptEnableFlag=true; - bRejectEnableFlag=true; SetPointer(Pointer(PointerStyle::Wait)); pTheView->SetUpdateMode(false); bool bFilterFlag = pTPFilter->IsDate() || pTPFilter->IsRange() || @@ -1387,8 +1381,6 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartActio if(pChanges!=nullptr) { SvTreeListEntry* pParent=nullptr; - bAcceptEnableFlag=true; - bRejectEnableFlag=true; SetPointer(Pointer(PointerStyle::Wait)); pTheView->SetUpdateMode(false); @@ -1637,8 +1629,6 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl, Timer *, void) bAcceptFlag = false; bRejectFlag = false; } - bAcceptEnableFlag = bAcceptFlag; - bRejectEnableFlag = bRejectFlag; pEntry = pTheView->NextSelected( pEntry ); } diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index a984cb5a030f..4c8ca4c158fc 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -106,7 +106,6 @@ void ScFillSeriesDlg::dispose() void ScFillSeriesDlg::SetEdStartValEnabled(bool bFlag) { - bStartValFlag=bFlag; if(bFlag) { m_pFtStartVal->Enable(); @@ -201,8 +200,6 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) if ( fEndVal != MAXDOUBLE ) rDoc.GetFormatTable()->GetInputLineString( fEndVal, 0, aEndTxt ); m_pEdEndVal->SetText( aEndTxt ); - - bStartValFlag = false; } bool ScFillSeriesDlg::CheckStartVal() diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index a1dc66de7c38..cbca4cecc81b 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -141,8 +141,6 @@ ScContentTree::ScContentTree(vcl::Window* pParent, ScNavigatorDlg* pNavigatorDlg SetNodeDefaultImages(); SetDoubleClickHdl( LINK( this, ScContentTree, ContentDoubleClickHdl ) ); - - pTmpEntry= nullptr; } Size ScContentTree::GetOptimalSize() const diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 75e638a47837..138e4deb2df5 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -480,7 +480,7 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, vcl::Window* pParent) nScenarioId = aTbxCmd->GetItemId("scenarios"); nDownId = aTbxCmd->GetItemId("end"); nUpId = aTbxCmd->GetItemId("start"); - nAreaId = aTbxCmd->GetItemId("datarange"); + nDataId = aTbxCmd->GetItemId("datarange"); get(aContentBox, "contentbox"); aLbEntries = VclPtr<ScContentTree>::Create(aContentBox, this); aLbEntries->set_hexpand(true); diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index b706a374b399..55dab227d78c 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -54,16 +54,9 @@ ScStyleDlg::ScStyleDlg( vcl::Window* pParent, , nDlgRsc ( nRscId ) , m_nNumberId(0) , m_nFontId(0) - , m_nFontEffectId(0) - , m_nAlignmentId(0) - , m_nAsianId(0) - , m_nBorderId(0) , m_nBackgroundId(0) - , m_nProtectId(0) , m_nPageId(0) , m_nHeaderId(0) - , m_nFooterId(0) - , m_nSheetId(0) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialog creation failed!"); @@ -80,25 +73,25 @@ ScStyleDlg::ScStyleDlg( vcl::Window* pParent, m_nFontId = AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!"); - m_nFontEffectId = AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS )); + AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE( pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageRangesFunc fail!"); - m_nAlignmentId = AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT )); + AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT )); if ( aCJKOptions.IsAsianTypographyEnabled() ) { OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!"); - m_nAsianId = AddTabPage("asiantypo", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN)); + AddTabPage("asiantypo", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN)); } else RemoveTabPage("asiantypo"); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER )); + AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER )); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND )); - m_nProtectId = AddTabPage("protection", &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges); + AddTabPage("protection", &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges); } break; @@ -109,13 +102,13 @@ ScStyleDlg::ScStyleDlg( vcl::Window* pParent, m_nPageId = AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); + AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); m_nHeaderId = AddTabPage("header", &ScHeaderPage::Create, &ScHeaderPage::GetRanges ); m_nFooterId = AddTabPage("footer", &ScFooterPage::Create, &ScFooterPage::GetRanges ); - m_nSheetId = AddTabPage("sheet", &ScTablePage::Create, &ScTablePage::GetRanges ); + AddTabPage("sheet", &ScTablePage::Create, &ScTablePage::GetRanges ); } break; diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 79ef36164c89..bc79b8c87af4 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -452,7 +452,6 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos bRFSize( false ), bPagebreakDrawn( false ), bDragRect( false ), - bIsInScroll( false ), bIsInPaint( false ), bNeedsRepaint( false ), bAutoMarkVisible( false ), @@ -4416,8 +4415,6 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY ) ClickExtern(); HideNoteMarker(); - bIsInScroll = true; - SetMapMode(MapUnit::MapPixel); Scroll( nDifX, nDifY, ScrollFlags::Children ); SetMapMode( GetDrawMapMode() ); // generated shifted MapMode @@ -4425,7 +4422,6 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY ) UpdateEditViewPos(); DrawAfterScroll(); - bIsInScroll = false; } // Update Formulas ------------------------------------------------------ diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index a7d13afe54c6..5fea40a60d51 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -553,7 +553,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI aOutputData.SetUseStyleColor( true ); // always set in table view - aOutputData.SetEditObject( GetEditObject() ); aOutputData.SetViewShell( pViewData->GetViewShell() ); bool bGrid = rOpts.GetOption( VOPT_GRID ) && pViewData->GetShowGrid(); diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index f020a1849df8..a1d4db5e12e5 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -163,7 +163,6 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, eType( eNewType ), mnPPTX( nPixelPerTwipsX ), mnPPTY( nPixelPerTwipsY ), - pEditObj( nullptr ), pViewShell( nullptr ), pDrawView( nullptr ), bEditMode( false ), @@ -215,7 +214,6 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, nScrH += pRowInfo[nArrY].nHeight; bTabProtected = mpDoc->IsTabProtected( nTab ); - nTabTextDirection = mpDoc->GetEditTextDirection( nTab ); bLayoutRTL = mpDoc->IsLayoutRTL( nTab ); } diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index ab70337c5790..7191d2875910 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -95,7 +95,6 @@ class ScDrawStringsVars SvxCellHorJustify eAttrHorJust; SvxCellVerJustify eAttrVerJust; SvxCellJustifyMethod eAttrHorJustMethod; - SvxCellJustifyMethod eAttrVerJustMethod; const SvxMarginItem* pMargin; sal_uInt16 nIndent; bool bRotated; @@ -188,7 +187,6 @@ ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, bool bPTL) : eAttrHorJust( SvxCellHorJustify::Standard ), eAttrVerJust( SVX_VER_JUSTIFY_BOTTOM ), eAttrHorJustMethod( SvxCellJustifyMethod::Auto ), - eAttrVerJustMethod( SvxCellJustifyMethod::Auto ), pMargin ( nullptr ), nIndent ( 0 ), bRotated ( false ), @@ -334,7 +332,6 @@ void ScDrawStringsVars::SetPattern( // justification method eAttrHorJustMethod = lcl_GetValue<SvxJustifyMethodItem, SvxCellJustifyMethod>(*pPattern, ATTR_HOR_JUSTIFY_METHOD, pCondSet); - eAttrVerJustMethod = lcl_GetValue<SvxJustifyMethodItem, SvxCellJustifyMethod>(*pPattern, ATTR_VER_JUSTIFY_METHOD, pCondSet); // line break @@ -2331,7 +2328,7 @@ ScOutputData::DrawEditParam::DrawEditParam(const ScPatternAttr* pPattern, const meVerJustMethod( lcl_GetValue<SvxJustifyMethodItem, SvxCellJustifyMethod>(*pPattern, ATTR_VER_JUSTIFY_METHOD, pCondSet) ), meOrient( pPattern->GetCellOrientation(pCondSet) ), mnArrY(0), - mnX(0), mnY(0), mnCellX(0), mnCellY(0), mnTab(0), + mnX(0), mnCellX(0), mnCellY(0), mnPosX(0), mnPosY(0), mnInitPosX(0), mbBreak( (meHorJustAttr == SvxCellHorJustify::Block) || lcl_GetBoolValue(*pPattern, ATTR_LINEBREAK, pCondSet) ), mbCellIsValue(bCellIsValue), @@ -4586,10 +4583,8 @@ void ScOutputData::DrawEdit(bool bPixelToLogic) aParam.maCell = aCell; aParam.mnArrY = nArrY; aParam.mnX = nX; - aParam.mnY = nY; aParam.mnCellX = nCellX; aParam.mnCellY = nCellY; - aParam.mnTab = nTab; aParam.mnPosX = nPosX; aParam.mnPosY = nPosY; aParam.mnInitPosX = nInitPosX; diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index a38a87f1dd81..c43b968b7ab5 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -669,8 +669,6 @@ void ScTabViewShell::SetDrawTextShell( bool bActive ) void ScTabViewShell::SetPivotShell( bool bActive ) { - bActivePivotSh = bActive; - // SetPivotShell is called from CursorPosChanged every time // -> don't change anything except switching between cell and pivot shell @@ -693,7 +691,6 @@ void ScTabViewShell::SetPivotShell( bool bActive ) void ScTabViewShell::SetAuditShell( bool bActive ) { - bActiveAuditingSh = bActive; if ( bActive ) { bActiveDrawTextSh = bActiveDrawSh = false; @@ -1660,14 +1657,11 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, pNavSettings(nullptr), bActiveDrawSh(false), bActiveDrawTextSh(false), - bActivePivotSh(false), - bActiveAuditingSh(false), bActiveDrawFormSh(false), bActiveOleObjectSh(false), bActiveChartSh(false), bActiveGraphicSh(false), bActiveMediaSh(false), - bActiveEditSh(false), bFormShellAtTop(false), bDontSwitch(false), bInFormatDialog(false), diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 009afeb5b779..a9a46d5bd50a 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -97,8 +97,6 @@ void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj ) // the object area must be set after the scaling since it triggers the resizing aRect.SetSize( aOleSize ); pClient->SetObjArea( aRect ); - - static_cast<ScClient*>(pClient)->SetGrafEdit( nullptr ); } } @@ -207,8 +205,6 @@ void ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) aRect.SetSize( aOleSize ); pClient->SetObjArea( aRect ); - static_cast<ScClient*>(pClient)->SetGrafEdit( nullptr ); - nErr = pClient->DoVerb( nVerb ); bErrorShown = true; // SfxViewShell::DoVerb shows its error messages |