diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-11 11:18:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-11 17:11:11 +0200 |
| commit | f34f7b65035f0afe1ceac6f5b5d8ddfac824bde9 (patch) | |
| tree | 959554cb932a5273c5804760462ff21246265a78 | |
| parent | d6500b19afc6a15e63e679765317690eac0d4207 (diff) | |
-Werror,-Wunused-private-field (various sc)
Change-Id: Ia30a2bb6b1f36304a3c420db1d28d177d429a19b
104 files changed, 66 insertions, 257 deletions
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx index 2b90ceea645a..a73842e53cbb 100644 --- a/sc/inc/AccessibleFilterMenu.hxx +++ b/sc/inc/AccessibleFilterMenu.hxx @@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star { } }}} -class ScDocument; class ScMenuFloatingWindow; typedef ::cppu::ImplHelper1< @@ -50,7 +49,7 @@ public: explicit ScAccessibleFilterMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - ScMenuFloatingWindow* pWin, const ::rtl::OUString& rName, size_t nMenuPos, ScDocument* pDoc); + ScMenuFloatingWindow* pWin, const ::rtl::OUString& rName, size_t nMenuPos); virtual ~ScAccessibleFilterMenu(); // XAccessibleComponent @@ -175,7 +174,6 @@ private: size_t mnMenuPos; ScMenuFloatingWindow* mpWindow; - ScDocument* mpDoc; bool mbEnabled:1; }; diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx index ec4afb6a0b5d..bb7c0ef9b5ff 100644 --- a/sc/inc/AccessibleFilterTopWindow.hxx +++ b/sc/inc/AccessibleFilterTopWindow.hxx @@ -33,7 +33,6 @@ #include "cppuhelper/implbase1.hxx" class ScCheckListMenuWindow; -class ScDocument; class ScAccessibleFilterTopWindow : public ScAccessibleFilterMenu { @@ -41,7 +40,7 @@ public: ScAccessibleFilterTopWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - ScCheckListMenuWindow* pWin, const ::rtl::OUString& rName, ScDocument* pDoc); + ScCheckListMenuWindow* pWin, const ::rtl::OUString& rName); virtual ~ScAccessibleFilterTopWindow(); // XAccessibleContext @@ -90,9 +89,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccCancelBtn; - - ScCheckListMenuWindow* mpWindow; - ScDocument* mpDoc; }; #endif diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx index f56a4a521435..5cb341d802d0 100644 --- a/sc/inc/consoli.hxx +++ b/sc/inc/consoli.hxx @@ -82,7 +82,6 @@ private: sal_Bool bReference; sal_Bool bColByName; sal_Bool bRowByName; - sal_Bool bSubTitles; SCSIZE nColCount; SCSIZE nRowCount; sal_Bool** ppUsed; diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx index 3a852ef2d3e7..943bf8d94179 100644 --- a/sc/inc/dpsdbtab.hxx +++ b/sc/inc/dpsdbtab.hxx @@ -68,10 +68,9 @@ struct ScImportSourceDesc class ScDatabaseDPData : public ScDPTableData { private: - const ScImportSourceDesc& mrImport; ScDPCacheTable aCacheTable; public: - ScDatabaseDPData(ScDocument* pDoc, const ScImportSourceDesc& rImport, const ScDPCache* pCache); + ScDatabaseDPData(ScDocument* pDoc, const ScDPCache* pCache); virtual ~ScDatabaseDPData(); virtual long GetColumnCount(); diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index dc1ce1ad1cd1..0374123f2c68 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -104,7 +104,6 @@ private: bool bIgnoreEmptyRows; bool bRepeatIfEmpty; - const ScSheetSourceDesc& mrDesc; ScDPCacheTable aCacheTable; public: diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index dc9818554bd2..9f7bc566f84a 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -78,7 +78,6 @@ private: ScAddress aOldEnd; ScAddress aNewStt; ScAddress aNewEnd; - sal_Bool bHasNew; public: ScUndoObjData( SdrObject* pObj, const ScAddress& rOS, const ScAddress& rOE, const ScAddress& rNS, const ScAddress& rNE ); diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx index 108785cde231..86e0cb3ea951 100644 --- a/sc/inc/olinetab.hxx +++ b/sc/inc/olinetab.hxx @@ -182,7 +182,6 @@ private: SCCOLROW nEnd; size_t nSubLevel; size_t nSubEntry; - size_t nCount; size_t nDepth; public: diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 2dca713940ce..7081ddb5b4b0 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -367,7 +367,7 @@ public: const ScRangeList& rList, const ScAddress& rPos, int nId ) = 0; //add for ScCondFormatDlg virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - const ScRangeList& rList, const ScAddress& rPos, int nId ) = 0; + const ScAddress& rPos, int nId ) = 0; virtual AbstractScDataBarSettingsDlg* CreateScDataBarSetttingsDlg (Window* pParent, ScDocument* pDoc, int nId ) = 0; //add for ScDataBarSettingsDlg diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 78b1e0398405..a9462b6465e1 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -595,7 +595,7 @@ ScDPTableData* ScDPObject::GetTableData() if (pCache) { pCache->AddReference(this); - pData.reset(new ScDatabaseDPData(pDoc, *pImpDesc, pCache)); + pData.reset(new ScDatabaseDPData(pDoc, pCache)); } } else diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index a3c3a999ce82..7bf593661610 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -127,8 +127,6 @@ class ScDPOutputImpl SCCOL mnTabStartCol; SCROW mnTabStartRow; - SCCOL mnMemberStartCol; - SCROW mnMemberStartRow; SCCOL mnDataStartCol; SCROW mnDataStartRow; @@ -139,8 +137,6 @@ public: ScDPOutputImpl( ScDocument* pDoc, sal_uInt16 nTab, SCCOL nTabStartCol, SCROW nTabStartRow, - SCCOL nMemberStartCol, - SCROW nMemberStartRow, SCCOL nDataStartCol, SCROW nDataStartRow, SCCOL nTabEndCol, @@ -200,8 +196,6 @@ void ScDPOutputImpl::OutputDataArea() ScDPOutputImpl::ScDPOutputImpl( ScDocument* pDoc, sal_uInt16 nTab, SCCOL nTabStartCol, SCROW nTabStartRow, - SCCOL nMemberStartCol, - SCROW nMemberStartRow, SCCOL nDataStartCol, SCROW nDataStartRow, SCCOL nTabEndCol, @@ -210,8 +204,6 @@ ScDPOutputImpl::ScDPOutputImpl( ScDocument* pDoc, sal_uInt16 nTab, mnTab( nTab ), mnTabStartCol( nTabStartCol ), mnTabStartRow( nTabStartRow ), - mnMemberStartCol( nMemberStartCol), - mnMemberStartRow( nMemberStartRow), mnDataStartCol ( nDataStartCol ), mnDataStartRow ( nDataStartRow ), mnTabEndCol( nTabEndCol ), @@ -805,7 +797,7 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( nFlags & sheet::MemberResultFlags::SUBTOTAL ) { ScDPOutputImpl outputimp( pDoc, nTab, - nTabStartCol, nTabStartRow, nMemberStartCol, nMemberStartRow, + nTabStartCol, nTabStartRow, nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow ); //! limit frames to horizontal or vertical? if (bColHeader) @@ -1030,7 +1022,7 @@ void ScDPOutput::Output() // output column headers: ScDPOutputImpl outputimp( pDoc, nTab, - nTabStartCol, nTabStartRow, nMemberStartCol, nMemberStartRow, + nTabStartCol, nTabStartRow, nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow ); for (nField=0; nField<nColFieldCount; nField++) { diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index edec6e3993f7..4cd86ca778ef 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -72,9 +72,8 @@ const ScDPCache* ScImportSourceDesc::CreateCache(const ScDPDimensionSaveData* pD } ScDatabaseDPData::ScDatabaseDPData( - ScDocument* pDoc, const ScImportSourceDesc& rImport, const ScDPCache* pCache) : + ScDocument* pDoc, const ScDPCache* pCache) : ScDPTableData(pDoc), - mrImport(rImport), aCacheTable(pCache) { } diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 13f198037550..e2f680119f1a 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -56,7 +56,6 @@ ScSheetDPData::ScSheetDPData(ScDocument* pD, const ScSheetSourceDesc& rDesc, con aQuery ( rDesc.GetQueryParam() ), bIgnoreEmptyRows( false ), bRepeatIfEmpty(false), - mrDesc(rDesc), aCacheTable(pCache) { SCSIZE nEntryCount( aQuery.GetEntryCount()); diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx index babcbcbbfcc6..f475d5df6071 100644 --- a/sc/source/core/tool/consoli.cxx +++ b/sc/source/core/tool/consoli.cxx @@ -101,7 +101,6 @@ ScConsData::ScConsData() : bReference(false), bColByName(false), bRowByName(false), - bSubTitles(false), nColCount(0), nRowCount(0), ppUsed(NULL), diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 905073eadf09..6bef29b1f5ce 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -1043,7 +1043,6 @@ void XclExpCondfmt::SaveXml( XclExpXmlStream& rStrm ) XclExpColorScale::XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleFormat& rFormat, sal_Int32 nPriority ): XclExpRecord(), XclExpRoot( rRoot ), - mrFormat( rFormat ), mnPriority( nPriority ) { const ScRange* pRange = rFormat.GetRange().front(); diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 67df56f12c91..fe96d7554043 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -483,7 +483,6 @@ void XclExpStream::WriteRawZeroBytes( sal_Size nBytes ) // ============================================================================ XclExpBiff8Encrypter::XclExpBiff8Encrypter( const XclExpRoot& rRoot ) : - mrRoot(rRoot), mnOldPos(STREAM_SEEK_TO_END), mbValid(false) { diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index d6d83de45573..e38aea37d269 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -92,7 +92,6 @@ private: XclImpCrnList maCrnList; /// List of CRN records (cached cell values). String maTabName; /// Name of the external sheet. - SCTAB mnScTab; /// New sheet index in Calc document. }; // External document (SUPBOOK) ================================================ @@ -222,7 +221,6 @@ private: XclImpXtiVector maXtiList; /// List of all XTI structures. XclImpSupbookList maSupbookList; /// List of external documents. - bool mbCreated; /// true = Calc sheets already created. }; // ============================================================================ @@ -564,8 +562,7 @@ const XclAddress& XclImpCrn::GetAddress() const // Sheet in an external document ============================================== XclImpSupbookTab::XclImpSupbookTab( const String& rTabName ) : - maTabName( rTabName ), - mnScTab( SCTAB_INVALID ) + maTabName( rTabName ) { } @@ -749,8 +746,7 @@ void XclImpSupbook::LoadCachedValues() // Import link manager ======================================================== XclImpLinkManagerImpl::XclImpLinkManagerImpl( const XclImpRoot& rRoot ) : - XclImpRoot( rRoot ), - mbCreated( false ) + XclImpRoot( rRoot ) { } diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 4034d033c84a..41eef6610442 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -238,7 +238,6 @@ ScHTMLLayoutParser::ScHTMLLayoutParser( nTableWidth(0), nColOffset(0), nColOffsetStart(0), - nMetaCnt(0), nOffsetTolerance( SC_HTML_OFFSET_TOLERANCE_SMALL ), bTabInTabCell( false ), bFirstRow( true ), diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 4997f0ead6a8..e12f2187c412 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -613,7 +613,6 @@ private: ScDocument* pTempDoc; // empty document - sal_uInt32 nNewAction; // action number, 1-based XclExpChTrHeader* pHeader; // header record for last GUID sal_uInt8 aGUID[ 16 ]; // GUID for action info records sal_Bool bValidGUID; diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index 188a0aff8538..91521c6e83d6 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -110,7 +110,6 @@ public: void AddEntries( ScColorScaleFormat* pFormat, ScDocument* pDoc, const ScAddress& rAddr ); private: - const CondFormat& mrCondFormat; std::vector< ColorScaleRuleModelEntry > maColorScaleRuleEntries; sal_uInt32 mnCfvo; @@ -130,7 +129,6 @@ public: ScDataBarFormatData* getDataBarFormatData() { return mpFormat; } private: - const CondFormat& mrCondFormat; ScDataBarFormatData* mpFormat; boost::scoped_ptr<ColorScaleRuleModelEntry> mpUpperLimit; diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index d3269a4ae79d..b9012fbad867 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -212,7 +212,6 @@ private: DefNameNameMap maModelNameMap; /// Maps all defined names by sheet index and model name. DefNameBuiltinMap maBuiltinMap; /// Maps all defined names by sheet index and built-in identifier. DefNameTokenIdMap maTokenIdMap; /// Maps all defined names by API token index. - sal_Int16 mnCalcSheet; /// Current sheet index for BIFF2-BIFF4 names (always sheet-local). }; // ============================================================================ diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index 4b397557b35a..7a784c960cf6 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -158,16 +158,12 @@ private: ::rtl::OUString maObjName; /// Name of the object. ::rtl::OUString maMacroName; /// Name of an attached macro. ::rtl::OUString maHyperlink; /// On-click hyperlink URL. - sal_uInt32 mnDffShapeId; /// Shape identifier from DFF stream (BIFF8 only). - sal_uInt32 mnDffFlags; /// Shape flags from DFF stream. sal_uInt16 mnObjId; /// The object identifier (unique per drawing). sal_uInt16 mnObjType; /// The object type from OBJ record. - bool mbHasAnchor; /// True = anchor has been initialized. bool mbHidden; /// True = object is hidden. bool mbVisible; /// True = object is visible (form controls). bool mbPrintable; /// True = object is printable. bool mbAreaObj; /// True = width and height must be greater than 0. - bool mbAutoMargin; /// True = set automatic text margin. bool mbSimpleMacro; /// True = create simple macro link and hyperlink. bool mbProcessShape; /// True = object is valid, do processing and insertion. bool mbInsertShape; /// True = insert the UNO shape into the draw page. diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx index 4c74f1fd00cc..7477052bc486 100644 --- a/sc/source/filter/inc/excdoc.hxx +++ b/sc/source/filter/inc/excdoc.hxx @@ -62,8 +62,6 @@ private: SCTAB mnScTab; // table number SC document sal_uInt16 nExcTab; // table number Excel document - sal_uInt16 nAktRow; // fuer'n Iterator - sal_uInt16 nAktCol; NameBuffer* pTabNames; diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index 72c3297bd464..59014b34b83d 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -128,7 +128,6 @@ private: ExternalNameModel maExtNameModel; /// Additional name data. ResultMatrix maResults; /// DDE/OLE link results. ResultMatrix::iterator maCurrIt; /// Current position in result matrix. - sal_uInt32 mnStorageId; /// OLE storage identifier (BIFF). ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDDELink > mxDdeLink; /// Interface of a DDE link. bool mbDdeLinkCreated; /// True = already tried to create the DDE link. diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index fbae497014bf..db93a76fc62e 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -190,7 +190,6 @@ private: sal_uInt16 nTableWidth; // je Table sal_uInt16 nColOffset; // aktuell, Pixel sal_uInt16 nColOffsetStart; // Startwert je Table, in Pixel - sal_uInt16 nMetaCnt; // fuer ParseMetaOptions sal_uInt16 nOffsetTolerance; // for use with SeekOffset and related bool bTabInTabCell:1; bool bFirstRow:1; // je Table, ob in erster Zeile diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index ac9a63bf94b5..e5b7eeebe1cc 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -129,7 +129,6 @@ private: NumberFormatMap maNumFmts; /// List of number formats. ::rtl::OUString maLocaleStr; /// Current office locale. - sal_Int32 mnNextBiffIndex; /// Format id counter for BIFF2-BIFF4. }; // ============================================================================ diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 8439a25bc597..0073ae632116 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -721,7 +721,6 @@ class Sc10Import Sc10PatternCollection* pPatternCollection; Sc10DataBaseCollection* pDataBaseCollection; sal_uLong nError; - SCTAB TabCount; SCTAB nShowTab; ScViewOptions aSc30ViewOpt; ScfStreamProgressBar* pPrgrsBar; diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 668641b06877..23ca6e40750b 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -257,7 +257,6 @@ private: XclExpCfvoList maCfvoList; XclExpColScaleColList maColList; - const ScColorScaleFormat& mrFormat; sal_Int32 mnPriority; }; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 7abb5b3a2f31..3c22bda1c096 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -236,7 +236,6 @@ private: sal_uInt8 mpnSalt[16]; sal_uInt8 mpnSaltDigest[16]; - const XclExpRoot& mrRoot; sal_Size mnOldPos; /// Last known stream position bool mbValid; }; diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 681f47b4f2e6..598dcde8fc2f 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -239,7 +239,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ); private: - SCTAB mnScTab; /// Sheet index of this record. sal_uInt16 mnLastAppXclCol;/// Column index of last appended cell. sal_uInt16 mnColInpXclCol; /// Column index of column input cell. sal_uInt32 mnColInpXclRow; /// Row index of column input cell. diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 105dc06658a3..7df532120e31 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -148,7 +148,6 @@ void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString& ColorScaleRule::ColorScaleRule( const CondFormat& rFormat ): WorksheetHelper( rFormat ), - mrCondFormat( rFormat ), mnCfvo(0), mnCol(0) { @@ -267,7 +266,6 @@ void ColorScaleRule::AddEntries( ScColorScaleFormat* pFormat, ScDocument* pDoc, // DataBarRule::DataBarRule( const CondFormat& rFormat ): WorksheetHelper( rFormat ), - mrCondFormat( rFormat ), mpFormat(new ScDataBarFormatData) { mpFormat->meAxisPosition = databar::NONE; diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 4eafab759461..b31b5fb16a3c 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -485,8 +485,7 @@ bool DefinedName::getAbsoluteRange( CellRangeAddress& orRange ) const // ============================================================================ DefinedNamesBuffer::DefinedNamesBuffer( const WorkbookHelper& rHelper ) : - WorkbookHelper( rHelper ), - mnCalcSheet( -1 ) + WorkbookHelper( rHelper ) { } diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index 37eecb328e3c..9739880fdd9c 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -229,16 +229,12 @@ void BiffDrawingObjectContainer::convertAndInsert( BiffDrawingBase& rDrawing, co BiffDrawingObjectBase::BiffDrawingObjectBase( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), maAnchor( rHelper ), - mnDffShapeId( 0 ), - mnDffFlags( 0 ), mnObjId( BIFF_OBJ_INVALID_ID ), mnObjType( BIFF_OBJTYPE_UNKNOWN ), - mbHasAnchor( false ), mbHidden( false ), mbVisible( true ), mbPrintable( true ), mbAreaObj( false ), - mbAutoMargin( true ), mbSimpleMacro( true ), mbProcessShape( true ), mbInsertShape( true ), diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index d6b758794c22..cb0e608d66ae 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -105,7 +105,6 @@ ExternalNameModel::ExternalNameModel() : ExternalName::ExternalName( const ExternalLink& rParentLink ) : DefinedNameBase( rParentLink ), mrParentLink( rParentLink ), - mnStorageId( 0 ), mbDdeLinkCreated( false ) { } diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 83755ec164e7..2c3c42156a8b 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -1961,8 +1961,7 @@ void NumberFormat::writeToPropertyMap( PropertyMap& rPropMap ) const // ============================================================================ NumberFormatsBuffer::NumberFormatsBuffer( const WorkbookHelper& rHelper ) : - WorkbookHelper( rHelper ), - mnNextBiffIndex( 0 ) + WorkbookHelper( rHelper ) { // get the current locale // try user-defined locale setting diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index f18e824ea776..66359f2ddc3a 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -1416,7 +1416,6 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) : aActionStack(), pTabIdBuffer( NULL ), pTempDoc( NULL ), - nNewAction( 1 ), pHeader( NULL ), bValidGUID( false ) { diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index e848619db5cf..92208d4dd50f 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -60,7 +60,6 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport, sContent( bFooter ? OUString(SC_UNO_PAGE_RIGHTFTRCON) : OUString(SC_UNO_PAGE_RIGHTHDRCON) ), sContentLeft( bFooter ? OUString(SC_UNO_PAGE_LEFTFTRCONT) : OUString(SC_UNO_PAGE_LEFTHDRCONT) ), bDisplay( true ), - bInsertContent( true ), bLeft( bLft ), bContainsLeft(false), bContainsRight(false), diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index 9863df922769..ee4199d91bdf 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -57,7 +57,6 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext rtl::OUString sCont; bool bDisplay; - bool bInsertContent; bool bLeft; bool bContainsLeft; bool bContainsRight; diff --git a/sc/source/filter/xml/XMLTextPContext.cxx b/sc/source/filter/xml/XMLTextPContext.cxx index 4763fbc0683c..b14253e37fb4 100644 --- a/sc/source/filter/xml/XMLTextPContext.cxx +++ b/sc/source/filter/xml/XMLTextPContext.cxx @@ -97,8 +97,7 @@ ScXMLTextPContext::ScXMLTextPContext( ScXMLImport& rImport, sLName(rLName), sSimpleContent(), pContentBuffer(NULL), - nPrefix(nPrfx), - bIsOwn(sal_True) + nPrefix(nPrfx) { // here are no attributes } diff --git a/sc/source/filter/xml/XMLTextPContext.hxx b/sc/source/filter/xml/XMLTextPContext.hxx index 093b360aab4b..23b4caa5494a 100644 --- a/sc/source/filter/xml/XMLTextPContext.hxx +++ b/sc/source/filter/xml/XMLTextPContext.hxx @@ -35,7 +35,6 @@ class ScXMLTextPContext : public SvXMLImportContext rtl::OUString sSimpleContent; // copy of the first Character call's argument rtl::OUStringBuffer* pContentBuffer; // used if there's more than one string sal_uInt16 nPrefix; - sal_Bool bIsOwn; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index cc0b374e6540..0e70695accb3 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -61,7 +61,6 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, ScXMLTableRowCellContext* pTempCellContext) : SvXMLImportContext( rImport, nPrfx, rLName ), mrAnnotationData( rAnnotationData ), - nParagraphCount(0), pCellContext(pTempCellContext), pShapeContext(NULL) { diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index 62b871303b99..e9418b074ca3 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -109,7 +109,6 @@ private: rtl::OUStringBuffer maAuthorBuffer; rtl::OUStringBuffer maCreateDateBuffer; rtl::OUStringBuffer maCreateDateStringBuffer; - sal_Int32 nParagraphCount; ScXMLTableRowCellContext* pCellContext; SvXMLImportContext* pShapeContext; diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 5fc9051a8509..c53e77fffcb6 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -457,7 +457,6 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), - mpFormat( pFormat ), mpFormatEntry( NULL ) { double nVal = 0; diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 8d84a15f574a..a31bdff6d2d7 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -149,7 +149,6 @@ public: private: - ScColorScaleFormat* mpFormat; ScColorScaleEntry* mpFormatEntry; }; diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 20ba1078e0f9..d9dde8cb855d 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -337,7 +337,6 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext sal_Int32 nGroupPart; sal_Int16 nFunction; sal_Int16 nOrientation; - sal_Bool bShowEmpty:1; sal_Bool bSelectedPage:1; sal_Bool bIsGroupField:1; sal_Bool bDateValue:1; diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index b035bc50e089..fc98b6de1c17 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -89,7 +89,6 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext com::sun::star::sheet::DataImportMode nSourceType; sal_Int32 nRefresh; sal_Int16 nSubTotalsUserListIndex; - sal_Int16 nSubTotalRuleGroupFieldNumber; bool mbValidRange; bool bContainsSort; bool bContainsSubTotal; diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index 0244c57c249e..7f643adb4a9f 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -408,7 +408,6 @@ ScXMLExternalRefCellTextContext::ScXMLExternalRefCellTextContext( const Reference<XAttributeList>& /*xAttrList*/, ScXMLExternalRefCellContext& rParent ) : SvXMLImportContext( rImport, nPrefix, rLName ), - mrScImport(rImport), mrParent(rParent) { } diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 397df401be1d..3d29610cd500 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -159,7 +159,6 @@ public: virtual void EndElement(); private: - ScXMLImport& mrScImport; ScXMLExternalRefCellContext& mrParent; ::rtl::OUStringBuffer maCellStrBuf; diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 052829ecdc8b..3642e609d0f2 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -59,10 +59,8 @@ class ScXMLFilterContext : public SvXMLImportContext com::sun::star::table::CellAddress aOutputPosition; com::sun::star::table::CellRangeAddress aConditionSourceRangeAddress; - sal_Int16 nUserListIndex; bool bSkipDuplicates; bool bCopyOutputData; - bool bEnabledUserList; bool bConditionSourceRange; std::vector<ConnStackItem> maConnStack; @@ -215,12 +213,10 @@ class ScXMLDPFilterContext : public SvXMLImportContext ScAddress aOutputPosition; ScRange aConditionSourceRangeAddress; sal_uInt8 nFilterFieldCount; - sal_Int16 nUserListIndex; bool bSkipDuplicates:1; bool bCopyOutputData:1; bool bUseRegularExpressions:1; bool bIsCaseSensitive:1; - bool bEnabledUserList:1; bool bConnectionOr:1; bool bNextConnectionOr:1; bool bConditionSourceRange:1; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index 369bfab53e4e..860760b062f6 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -31,7 +31,6 @@ #include "AccessibleFilterMenu.hxx" #include "AccessibleFilterMenuItem.hxx" #include "global.hxx" -#include "document.hxx" #include "docpool.hxx" #include "tools/gen.hxx" @@ -95,11 +94,10 @@ private: // ============================================================================ -ScAccessibleFilterMenu::ScAccessibleFilterMenu(const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos, ScDocument* pDoc) : +ScAccessibleFilterMenu::ScAccessibleFilterMenu(const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) : ScAccessibleContextBase(rxParent, AccessibleRole::MENU), mnMenuPos(nMenuPos), mpWindow(pWin), - mpDoc(pDoc), mbEnabled(true) { SetName(rName); diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index 776f8b66f0dc..341ea2b60f28 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx @@ -41,10 +41,8 @@ using ::com::sun::star::uno::RuntimeException; using ::rtl::OUString; ScAccessibleFilterTopWindow::ScAccessibleFilterTopWindow( - const Reference<XAccessible>& rxParent, ScCheckListMenuWindow* pWin, const OUString& rName, ScDocument* pDoc) : - ScAccessibleFilterMenu(rxParent, pWin, rName, ScMenuFloatingWindow::MENU_NOT_SELECTED, pDoc), - mpWindow(pWin), - mpDoc(pDoc) + const Reference<XAccessible>& rxParent, ScCheckListMenuWindow* pWin, const OUString& rName) : + ScAccessibleFilterMenu(rxParent, pWin, rName, ScMenuFloatingWindow::MENU_NOT_SELECTED) { SetName(rName); } diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 9d55c9772803..5347763e9fd8 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -473,11 +473,10 @@ class ScPreviewHeaderCellViewForwarder : public ScPreviewViewForwarder { ScAddress maCellPos; sal_Bool mbColHeader; - sal_Bool mbRowHeader; public: ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell, ScAddress aCellPos, - sal_Bool bColHeader, sal_Bool bRowHeader); + sal_Bool bColHeader); virtual ~ScPreviewHeaderCellViewForwarder(); virtual Rectangle GetVisArea() const; @@ -485,12 +484,11 @@ public: ScPreviewHeaderCellViewForwarder::ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell, ScAddress aCellPos, - sal_Bool bColHeader, sal_Bool bRowHeader) + sal_Bool bColHeader) : ScPreviewViewForwarder(pViewShell), maCellPos(aCellPos), - mbColHeader(bColHeader), - mbRowHeader(bRowHeader) + mbColHeader(bColHeader) { } @@ -735,7 +733,6 @@ ScAccessibleCellTextData::ScAccessibleCellTextData(ScTabViewShell* pViewShell, mpEditViewForwarder(NULL), mpViewShell(pViewShell), meSplitPos(eSplitPos), - mbViewEditEngine(false), mpAccessibleCell( pAccCell ) { } @@ -1429,7 +1426,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder() SvxViewForwarder* ScAccessiblePreviewHeaderCellTextData::GetViewForwarder() { if (!mpViewForwarder) - mpViewForwarder = new ScPreviewHeaderCellViewForwarder(mpViewShell, aCellPos, mbColHeader, mbRowHeader); + mpViewForwarder = new ScPreviewHeaderCellViewForwarder(mpViewShell, aCellPos, mbColHeader); return mpViewForwarder; } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 4e690630209b..37346de866a7 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -193,14 +193,12 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) : pRuntimeWindow ( lcl_chooseRuntimeImpl( this, pBind ) ), aTextWindow ( *pRuntimeWindow ), pInputHdl ( NULL ), - pBindings ( pBind ), aTextOk ( ScResId( SCSTR_QHELP_BTNOK ) ), // nicht immer neu aus Resource aTextCancel ( ScResId( SCSTR_QHELP_BTNCANCEL ) ), aTextSum ( ScResId( SCSTR_QHELP_BTNSUM ) ), aTextEqual ( ScResId( SCSTR_QHELP_BTNEQUAL ) ), mnMaxY (0), bIsOkCancelMode ( false ), - bIsMultiLine ( false ), bInResize ( false ), mbIsMultiLine ( lcl_isExperimentalMode() ) { diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index eb341068d6a8..4dd4bc38352e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -795,13 +795,13 @@ AbstractScCondFormatDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatDlg(Win } AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - const ScRangeList& rList, const ScAddress& rPos, int nId ) + const ScAddress& rPos, int nId ) { ScCondFormatManagerDlg* pDlg = NULL; switch( nId ) { case RID_SCDLG_COND_FORMAT_MANAGER: - pDlg = new ScCondFormatManagerDlg( pParent, pDoc, pFormatList, rList, rPos ); + pDlg = new ScCondFormatManagerDlg( pParent, pDoc, pFormatList, rPos ); break; default: break; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index a6a8ad5df709..b4c6ddcd0bca 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -437,7 +437,7 @@ public: const ScRangeList& rRange, const ScAddress& rPos, int nId ); //add for ScDataBarSettingsDlg virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - const ScRangeList& rList, const ScAddress& rPos, int nId ); + const ScAddress& rPos, int nId ); virtual AbstractScDataBarSettingsDlg* CreateScDataBarSetttingsDlg (Window* pParent, ScDocument* pDoc, int nId ); //add for ScDataBarSettingsDlg diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index ca85f70e9944..d82329d51296 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -91,8 +91,7 @@ ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sa mnSelectedMenu(MENU_NOT_SELECTED), mnClickedMenu(MENU_NOT_SELECTED), mpDoc(pDoc), - mpParentMenu(dynamic_cast<ScMenuFloatingWindow*>(pParent)), - mpActiveSubMenu(NULL) + mpParentMenu(dynamic_cast<ScMenuFloatingWindow*>(pParent)) { SetMenuStackLevel(nMenuStackLevel); @@ -282,7 +281,7 @@ Reference<XAccessible> ScMenuFloatingWindow::CreateAccessible() Reference<XAccessible> xAccParent = mpParentMenu ? mpParentMenu->GetAccessible() : GetAccessibleParentWindow()->GetAccessible(); - mxAccessible.set(new ScAccessibleFilterMenu(xAccParent, this, maName, 999, getDoc())); + mxAccessible.set(new ScAccessibleFilterMenu(xAccParent, this, maName, 999)); ScAccessibleFilterMenu* p = static_cast<ScAccessibleFilterMenu*>( mxAccessible.get()); @@ -1255,7 +1254,7 @@ Reference<XAccessible> ScCheckListMenuWindow::CreateAccessible() if (!mxAccessible.is()) { mxAccessible.set(new ScAccessibleFilterTopWindow( - GetAccessibleParentWindow()->GetAccessible(), this, getName(), getDoc())); + GetAccessibleParentWindow()->GetAccessible(), this, getName())); ScAccessibleFilterTopWindow* pAccTop = static_cast<ScAccessibleFilterTopWindow*>(mxAccessible.get()); fillMenuItemsToAccessible(pAccTop); diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 1f9d638599cd..2ed673803207 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -996,7 +996,6 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum Control(pParent, rResId), mbHasScrollBar(false), mpScrollBar(new ScrollBar(this, WB_VERT )), - mnTopIndex(0), mpDoc(pDoc), maPos(rPos), maRanges(rRanges) @@ -1094,8 +1093,6 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScCond maBtnOk( this, ScResId( BTN_OK ) ), maBtnCancel( this, ScResId( BTN_CANCEL ) ), maCondFormList( this, ScResId( CTRL_LIST ), pDoc, pFormat, rRange, rPos ), - mpDoc(pDoc), - mpFormat(pFormat), maPos(rPos) { diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index aee8b6f26dd4..ebaad9b8ba0a 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -163,7 +163,7 @@ void ScCondFormatManagerCtrl::Update() maWdManager.Update(); } -ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScRangeList& rList, const ScAddress& rPos): +ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos): ModalDialog(pParent, ScResId(RID_SCDLG_COND_FORMAT_MANAGER)), maBtnAdd(this, ScResId(BTN_ADD)), maBtnRemove(this, ScResId(BTN_REMOVE)), @@ -174,7 +174,6 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc mpFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) : NULL), maCtrlManager(this, pDoc, mpFormatList, rPos), mpDoc(pDoc), - mrRangeList(rList), maPos(rPos) { FreeResource(); diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index f0b40bd2c443..31a4e3070c85 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -266,7 +266,6 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) // Option initialization: pOptionsMgr = new ScFilterOptionsMgr( - this, pViewData, theQueryData, aBtnMore, diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 2490d7842999..068071106f1e 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -44,7 +44,6 @@ //---------------------------------------------------------------------------- ScFilterOptionsMgr::ScFilterOptionsMgr( - Dialog* ptrDlg, ScViewData* ptrViewData, const ScQueryParam& refQueryData, MoreButton& refBtnMore, @@ -62,8 +61,7 @@ ScFilterOptionsMgr::ScFilterOptionsMgr( FixedLine& refFlOptions, const String& refStrUndefined ) - : pDlg ( ptrDlg ), - pViewData ( ptrViewData ), + : pViewData ( ptrViewData ), pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ), rBtnMore ( refBtnMore ), rBtnCase ( refBtnCase ), diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 9db7a08e23d5..3c6bb5e3d17e 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -193,7 +193,6 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) // Optionen initialisieren lassen: pOptionsMgr = new ScFilterOptionsMgr( - this, pViewData, theQueryData, aBtnMore, diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 7f586db43186..d4f23032c388 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -103,7 +103,6 @@ ScTabPageSortFields::ScTabPageSortFields( Window* pParent, GetSortData() ), nFieldCount ( 0 ), nSortKeyCount ( DEFSORT ), - nCurrentOffset ( 0 ), bHasHeader ( false ), bSortByRows ( false ), maSortKeyCtrl ( this, ScResId( CTRL_MANAGESORTKEY ), maSortKeyItems ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index b8db869126c6..5fc701a72043 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -683,9 +683,7 @@ ScTPValidationHelp::ScTPValidationHelp( Window* pParent, aFtTitle ( this, ScResId( FT_TITLE ) ), aEdtTitle ( this, ScResId( EDT_TITLE ) ), aFtInputHelp ( this, ScResId( FT_INPUTHELP ) ), - aEdInputHelp ( this, ScResId( EDT_INPUTHELP ) ), - - mrArgSet ( rArgSet ) + aEdInputHelp ( this, ScResId( EDT_INPUTHELP ) ) { Init(); FreeResource(); @@ -770,9 +768,7 @@ ScTPValidationError::ScTPValidationError( Window* pParent, aFtTitle ( this, ScResId( FT_TITLE ) ), aEdtTitle ( this, ScResId( EDT_TITLE ) ), aFtError ( this, ScResId( FT_ERROR ) ), - aEdError ( this, ScResId( EDT_ERROR ) ), - - mrArgSet ( rArgSet ) + aEdError ( this, ScResId( EDT_ERROR ) ) { Init(); FreeResource(); diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 74674e6f5adb..b40eb3b59142 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -560,7 +560,7 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, if (!pDocDB->empty()) pUndoDB = new ScDBCollection( *pDocDB ); - pUndoAction = new ScUndoSort( &rDocShell, nTab, rSortParam, bRepeatQuery, pUndoDoc, pUndoDB, pR ); + pUndoAction = new ScUndoSort( &rDocShell, nTab, rSortParam, pUndoDoc, pUndoDB, pR ); rDocShell.GetUndoManager()->AddUndoAction( pUndoAction ); // #i59745# collect all drawing undo actions affecting cell note captions diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 04721455ac14..f44fcd5f76aa 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -863,7 +863,7 @@ sal_Bool ScDocFunc::PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, sal_Bo // wegen ChangeTracking darf UndoAction erst nach PutCell angelegt werden if (bUndo) rDocShell.GetUndoManager()->AddUndoAction( - new ScUndoPutCell( &rDocShell, rPos, pUndoCell, pRedoCell, bHeight ) ); + new ScUndoPutCell( &rDocShell, rPos, pUndoCell, pRedoCell ) ); if (bHeight) AdjustRowHeight( ScRange(rPos) ); diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index a17c92a6e275..dfa01e1749a5 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -229,7 +229,7 @@ void ScDocShell::UpdatePaintExt( sal_uInt16& rExtFlags, SCCOL nStartCol, SCROW n void ScDocShell::LockPaint_Impl(sal_Bool bDoc) { if ( !pPaintLockData ) - pPaintLockData = new ScPaintLockData(0); //! Modus... + pPaintLockData = new ScPaintLockData; pPaintLockData->IncLevel(bDoc); } @@ -304,7 +304,7 @@ void ScDocShell::SetLockCount(sal_uInt16 nNew) if (nNew) // setzen { if ( !pPaintLockData ) - pPaintLockData = new ScPaintLockData(0); //! Modus... + pPaintLockData = new ScPaintLockData; pPaintLockData->SetLevel(nNew-1, sal_True); LockDocument_Impl(nNew); } diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx index 7e71842b095e..1078f519888b 100644 --- a/sc/source/ui/docshell/pntlock.cxx +++ b/sc/source/ui/docshell/pntlock.cxx @@ -30,8 +30,7 @@ //------------------------------------------------------------------------ -ScPaintLockData::ScPaintLockData(sal_uInt16 nNewMode) : - nMode( nNewMode ), +ScPaintLockData::ScPaintLockData() : nLevel( 0 ), nDocLevel( 0 ), nParts( 0 ), diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 8453f08480ce..1f57bd490336 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -121,7 +121,6 @@ private: ScEditViewForwarder* mpEditViewForwarder; ScTabViewShell* mpViewShell; ScSplitPos meSplitPos; - sal_Bool mbViewEditEngine; ScAccessibleCell* mpAccessibleCell; // prevent the using of this method of the base class diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 657fb6f79af5..385c969f2ad6 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -81,15 +81,6 @@ public: void SetpData (void* pdata) {pData =pdata;} }; -class ScViewEntryPtrList -{ - ScViewEntryPtrList* pNext; - ScViewEntryPtrList* pLast; - - ScViewEntryPtr* pData; -}; - - class ScRedlinData : public RedlinData { public: diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 20968de33808..c35e5f9f1cee 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -203,7 +203,6 @@ private: ScDocument* mpDoc; ScMenuFloatingWindow* mpParentMenu; - ScMenuFloatingWindow* mpActiveSubMenu; }; /** diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index 92d6342e30b5..ccd168dbb2ca 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -34,7 +34,6 @@ class ScColBar : public ScHeaderControl ScViewData* pViewData; ScHSplitPos eWhich; ScHeaderFunctionSet* pFuncSet; - ScHeaderSelectionEngine* pSelEngine; public: ScColBar( Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, @@ -68,7 +67,6 @@ class ScRowBar : public ScHeaderControl ScViewData* pViewData; ScVSplitPos eWhich; ScHeaderFunctionSet* pFuncSet; - ScHeaderSelectionEngine* pSelEngine; public: ScRowBar( Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 98e59263298b..c5ea01dff4ea 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -151,7 +151,6 @@ private: bool mbHasScrollBar; boost::scoped_ptr<ScrollBar> mpScrollBar; - long mnTopIndex; ScDocument* mpDoc; ScAddress maPos; @@ -181,8 +180,6 @@ private: ScCondFormatList maCondFormList; - ScDocument* mpDoc; - const ScConditionalFormat* mpFormat; ScAddress maPos; public: diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 39bfe3bd0b59..2f75dde4b9d6 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -35,7 +35,6 @@ #include <svtools/headbar.hxx> #include "conditio.hxx" -#include "rangelst.hxx" #include "document.hxx" #include <map> @@ -80,7 +79,7 @@ private: class ScCondFormatManagerDlg : public ModalDialog { public: - ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScRangeList& rList, const ScAddress& rPos); + ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos); ~ScCondFormatManagerDlg(); ScConditionalFormatList* GetConditionalFormatList(); @@ -100,7 +99,6 @@ private: ScCondFormatManagerCtrl maCtrlManager; ScDocument* mpDoc; - const ScRangeList& mrRangeList; ScAddress maPos; DECL_LINK(RemoveBtnHdl, void*); diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 43ba45e4aa86..6da0c4b1099f 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -77,8 +77,6 @@ private: Point aSplitterInitPos; const ScFuncDesc* pFuncDesc; sal_uInt16 nArgs; - String** pArgArr; - ::std::vector< const formula::IFunctionDescription*> aLRUList; diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 1ae971f744da..04da7aeca19b 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -42,7 +42,6 @@ namespace formula class RefButton; } class MoreButton; -class Dialog; struct ScQueryParam; class ScDocument; class ScViewData; @@ -52,8 +51,7 @@ class ScViewData; class ScFilterOptionsMgr { public: - ScFilterOptionsMgr( Dialog* ptrDlg, - ScViewData* ptrViewData, + ScFilterOptionsMgr( ScViewData* ptrViewData, const ScQueryParam& refQueryData, MoreButton& refBtnMore, CheckBox& refBtnCase, @@ -74,7 +72,6 @@ public: sal_Bool VerifyPosStr ( const String& rPosStr ) const; private: - Dialog* pDlg; ScViewData* pViewData; ScDocument* pDoc; diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index bb1791c6390e..c4e76c198b06 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -24,12 +24,6 @@ #include <vcl/seleng.hxx> #include "address.hxx" -// --------------------------------------------------------------------------- - - -#define HDR_HORIZONTAL 0 -#define HDR_VERTICAL 1 - #define HDR_SIZE_OPTIMUM 0xFFFF @@ -44,7 +38,6 @@ private: Font aBoldFont; sal_Bool bBoldSet; - sal_uInt16 nFlags; sal_Bool bVertical; // Vertical = Row header long nWidth; @@ -110,7 +103,7 @@ protected: public: ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine, - SCCOLROW nNewSize, sal_uInt16 nNewFlags ); + SCCOLROW nNewSize, bool bNewVertical ); ~ScHeaderControl(); void SetIgnoreMove(sal_Bool bSet) { bIgnoreMove = bSet; } diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index ed94aed28f6c..8984381aff5e 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -147,7 +147,6 @@ private: Accelerator* pAccel; sal_uLong nTipVisible; sal_Bool bFormulaMode; - sal_Bool bTopHadFocus; public: ScPosWnd( Window* pParent ); @@ -303,14 +302,12 @@ private: std::auto_ptr<ScTextWndBase> pRuntimeWindow; ScTextWndBase& aTextWindow; ScInputHandler* pInputHdl; - SfxBindings* pBindings; String aTextOk; String aTextCancel; String aTextSum; String aTextEqual; long mnMaxY; sal_Bool bIsOkCancelMode; - bool bIsMultiLine; bool bInResize; bool mbIsMultiLine; }; diff --git a/sc/source/ui/inc/overlayobject.hxx b/sc/source/ui/inc/overlayobject.hxx index 4c13bb40258e..fe1a7a18503e 100644 --- a/sc/source/ui/inc/overlayobject.hxx +++ b/sc/source/ui/inc/overlayobject.hxx @@ -31,12 +31,10 @@ #include "svx/sdr/overlay/overlayobject.hxx" -class Window; - class ScOverlayDashedBorder : public ::sdr::overlay::OverlayObject { public: - ScOverlayDashedBorder(const ::basegfx::B2DRange& rRange, const Color& rColor, Window* pWin); + ScOverlayDashedBorder(const ::basegfx::B2DRange& rRange, const Color& rColor); virtual ~ScOverlayDashedBorder(); virtual void Trigger(sal_uInt32 nTime); @@ -48,7 +46,6 @@ protected: private: ::basegfx::B2DRange maRange; - Window* mpParent; bool mbToggle; }; diff --git a/sc/source/ui/inc/pntlock.hxx b/sc/source/ui/inc/pntlock.hxx index 6ffad34cb09f..c69291ab76c6 100644 --- a/sc/source/ui/inc/pntlock.hxx +++ b/sc/source/ui/inc/pntlock.hxx @@ -26,14 +26,13 @@ class ScPaintLockData { private: ScRangeListRef xRangeList; - sal_uInt16 nMode; sal_uInt16 nLevel; sal_uInt16 nDocLevel; sal_uInt16 nParts; sal_Bool bModified; public: - ScPaintLockData(sal_uInt16 nNewMode); + ScPaintLockData(); ~ScPaintLockData(); void AddRange( const ScRange& rRange, sal_uInt16 nP ); diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index b97d88cc7395..ff0a18ae9fe3 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -36,8 +36,6 @@ class ScPrivatSplit : public Control short nOldY; short nNewX; short nNewY; - short nMinPos; - short nMaxPos; Range aXMovingRange; Range aYMovingRange; short nDeltaX; diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index ba40483f5297..877b9ef99fec 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -178,8 +178,6 @@ private: ScDPFuncDataVec aRowArr; ScDPFuncDataVec aDataArr; - long mnFieldObjSpace; - ScDPObjectPtr xDlgDPObject; ScRange aOldRange; ScPivotParam thePivotData; diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index ceeb177fd6e4..dca6c8ba31c2 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -62,9 +62,7 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; - ScViewData* pViewData; ScDocument* pDoc; - sal_Bool bRefInputMode; ScRange theCurArea; sal_Bool bCloseFlag; diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx index 0d997c898a83..6919d5a369a4 100644 --- a/sc/source/ui/inc/textdlgs.hxx +++ b/sc/source/ui/inc/textdlgs.hxx @@ -27,7 +27,6 @@ class SfxObjectShell; class ScCharDlg : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; const SfxObjectShell& rDocShell; virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); @@ -41,8 +40,6 @@ public: class ScParagraphDlg : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); public: diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 3ba9c526b672..e8c208acdba6 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -88,7 +88,6 @@ private: std::vector<SCCOLROW> nFieldArr; sal_uInt16 nFieldCount; sal_uInt16 nSortKeyCount; - sal_uInt16 nCurrentOffset; SCCOL nFirstCol; SCROW nFirstRow; diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 2521d2e9afd3..52a6411dcc19 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -739,7 +739,6 @@ public: private: ScDocument* pUndoDoc; String aFormula; - formula::FormulaGrammar::AddressConvention eConv; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 29aeb6ff36ac..989ab88e5184 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -124,7 +124,7 @@ public: TYPEINFO(); ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos, - ScBaseCell* pUndoCell, double nVal, sal_Bool bHeight ); + ScBaseCell* pUndoCell, double nVal ); virtual ~ScUndoEnterValue(); virtual void Undo(); @@ -139,7 +139,6 @@ private: ScBaseCell* pOldCell; double nValue; sal_uLong nEndChangeAction; - sal_Bool bNeedHeight; void SetChangeTrack(); }; @@ -151,7 +150,7 @@ public: TYPEINFO(); ScUndoPutCell( ScDocShell* pNewDocShell, const ScAddress& rNewPos, - ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, sal_Bool bHeight ); + ScBaseCell* pUndoCell, ScBaseCell* pRedoCell ); virtual ~ScUndoPutCell(); virtual void Undo(); @@ -166,7 +165,6 @@ private: ScBaseCell* pOldCell; ScBaseCell* pEnteredCell; sal_uLong nEndChangeAction; - sal_Bool bNeedHeight; void SetChangeTrack(); }; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 989988f7d22d..f80bf52f8247 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -248,7 +248,7 @@ public: TYPEINFO(); ScUndoSort( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScSortParam& rParam, - sal_Bool bQuery, ScDocument* pNewUndoDoc, + ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB, const ScRange* pDest = NULL ); virtual ~ScUndoSort(); @@ -262,7 +262,6 @@ public: private: SCTAB nTab; ScSortParam aSortParam; - sal_Bool bRepeatQuery; ScDocument* pUndoDoc; ScDBCollection* pUndoDB; // due to source and target range sal_Bool bDestArea; diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index c2d55194e988..4ac6fc5ece40 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -88,7 +88,6 @@ public: ScUndoInsertTables( ScDocShell* pNewDocShell, SCTAB nTabNum, - sal_Bool bApp, std::vector<rtl::OUString>& newNameList); virtual ~ScUndoInsertTables(); @@ -106,7 +105,6 @@ private: sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; SCTAB nTab; - sal_Bool bAppend; void SetChangeTrack(); }; @@ -247,7 +245,6 @@ public: private: ScUndoTabColorInfo::List aTabColorList; - bool bIsMultipleUndo; void DoChange(bool bUndoType) const; }; @@ -289,8 +286,7 @@ public: TYPEINFO(); ScUndoImportTab( ScDocShell* pShell, - SCTAB nNewTab, SCTAB nNewCount, - sal_Bool bNewLink ); + SCTAB nNewTab, SCTAB nNewCount ); virtual ~ScUndoImportTab(); virtual void Undo(); @@ -303,7 +299,6 @@ public: private: SCTAB nTab; SCTAB nCount; - sal_Bool bLink; ScDocument* pRedoDoc; SdrUndoAction* pDrawUndo; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 9598f3caba4e..b397e2ca4244 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -259,8 +259,6 @@ private: FixedText aFtInputHelp; MultiLineEdit aEdInputHelp; - const SfxItemSet& mrArgSet; - void Init(); // Handler ------------------------ @@ -291,8 +289,6 @@ private: FixedText aFtError; MultiLineEdit aEdError; - const SfxItemSet& mrArgSet; - void Init(); // Handler ------------------------ diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index ccc9a459b414..643fd7966b1a 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -181,8 +181,6 @@ private: ScViewOptions* pOptions; EditView* pSpellingView; - long nEditMargin; - Size aScenButSize; Size aScrSize; diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx index 45cb947bc32d..8dd825a27e7e 100644 --- a/sc/source/ui/inc/viewutil.hxx +++ b/sc/source/ui/inc/viewutil.hxx @@ -96,10 +96,6 @@ private: SCROW nNewStartY; SCCOL nNewEndX; SCROW nNewEndY; - SCCOL nContX1; - SCROW nContY1; - SCCOL nContX2; - SCROW nContY2; public: ScUpdateRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); void SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index a47879613abc..75e6a69b8caa 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -70,9 +70,7 @@ ScSimpleRefDlg::ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP aBtnHelp ( this, ScResId( BTN_HELP ) ), // - pViewData ( ptrViewData ), pDoc ( ptrViewData->GetDocument() ), - bRefInputMode ( false ), bAutoReOpen ( sal_True ), bCloseOnButtonUp( false ), bSingleCell ( false ), diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 40e99ad261e0..2f329758ec19 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -44,7 +44,6 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) : SfxTabDialog ( pParent, ScResId( RID_SCDLG_CHAR ), pAttr ), - rOutAttrs ( *pAttr ), rDocShell ( *pDocShell ) { FreeResource(); @@ -84,8 +83,7 @@ void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) // ----------------------------------------------------------------------- ScParagraphDlg::ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) : - SfxTabDialog ( pParent, ScResId( RID_SCDLG_PARAGRAPH ), pAttr ), - rOutAttrs ( *pAttr ) + SfxTabDialog ( pParent, ScResId( RID_SCDLG_PARAGRAPH ), pAttr ) { FreeResource(); diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 19e950e7baff..140ddeab5947 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -346,12 +346,11 @@ sal_Bool ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const ScUndoEnterValue::ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos, - ScBaseCell* pUndoCell, double nVal, sal_Bool bHeight ) : + ScBaseCell* pUndoCell, double nVal ) : ScSimpleUndo( pNewDocShell ), aPos ( rNewPos ), pOldCell ( pUndoCell ), - nValue ( nVal ), - bNeedHeight ( bHeight ) + nValue ( nVal ) { SetChangeTrack(); } @@ -424,12 +423,11 @@ sal_Bool ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const } ScUndoPutCell::ScUndoPutCell( ScDocShell* pNewDocShell, const ScAddress& rNewPos, - ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, sal_Bool bHeight ) : + ScBaseCell* pUndoCell, ScBaseCell* pRedoCell ) : ScSimpleUndo( pNewDocShell ), aPos ( rNewPos ), pOldCell ( pUndoCell ), - pEnteredCell( pRedoCell ), - bNeedHeight ( bHeight ) + pEnteredCell( pRedoCell ) { SetChangeTrack(); } diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index ef2bf7a5ea98..62e10b8f4861 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -751,13 +751,12 @@ sal_Bool ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const ScUndoSort::ScUndoSort( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScSortParam& rParam, - sal_Bool bQuery, ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB, + ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB, const ScRange* pDest ) : ScDBFuncUndo( pNewDocShell, ScRange( rParam.nCol1, rParam.nRow1, nNewTab, rParam.nCol2, rParam.nRow2, nNewTab ) ), nTab( nNewTab ), aSortParam( rParam ), - bRepeatQuery( bQuery ), pUndoDoc( pNewUndoDoc ), pUndoDB( pNewUndoDB ), bDestArea( false ) diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 4818818738e6..00877a8d203d 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -179,12 +179,11 @@ sal_Bool ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell, SCTAB nTabNum, - sal_Bool bApp,std::vector<rtl::OUString>& newNameList) : + std::vector<rtl::OUString>& newNameList) : ScSimpleUndo( pNewDocShell ), pDrawUndo( NULL ), aNameList( newNameList ), - nTab( nTabNum ), - bAppend( bApp ) + nTab( nTabNum ) { pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() ); @@ -891,11 +890,10 @@ sal_Bool ScUndoMakeScenario::CanRepeat(SfxRepeatTarget& rTarget) const } ScUndoImportTab::ScUndoImportTab( ScDocShell* pShell, - SCTAB nNewTab, SCTAB nNewCount, sal_Bool bNewLink ) : + SCTAB nNewTab, SCTAB nNewCount ) : ScSimpleUndo( pShell ), nTab( nNewTab ), nCount( nNewCount ), - bLink( bNewLink ), pRedoDoc( NULL ), pDrawUndo( NULL ) { diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index ea03f5e0eda9..81ce27c70fd3 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -40,7 +40,6 @@ class ScVbaAxis : public ScVbaAxis_BASE css::uno::Reference< css::beans::XPropertySet > mxPropertySet; sal_Int32 mnType; sal_Int32 mnGroup; - sal_Int32 mnCrosses; sal_Bool bCrossesAreCustomized; ScVbaChart* getChartPtr() throw( css::uno::RuntimeException ); sal_Bool isValueAxis() throw( css::script::BasicErrorException ); diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index 16422845b7c5..2159b9ad63d0 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -36,8 +36,6 @@ #include <formula/grammar.hxx> -class ScDocument; - typedef InheritedHelperInterfaceImpl1< ov::excel::XName > NameImpl_BASE; class ScVbaName : public NameImpl_BASE @@ -46,8 +44,6 @@ class ScVbaName : public NameImpl_BASE css::uno::Reference< css::sheet::XNamedRange > mxNamedRange; css::uno::Reference< css::sheet::XNamedRanges > mxNames; - ScDocument * m_pDoc; - protected: virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } virtual css::uno::Reference< ov::excel::XWorksheet > getWorkSheet() throw (css::uno::RuntimeException); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index c7f0ef8d2724..a1cdc8c45766 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2085,9 +2085,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - ScRangeList aRangeList; ScViewData* pData = GetViewData(); - pData->GetMarkData().FillRangeListWithMarks(&aRangeList, false); ScDocument* pDoc = pData->GetDocument(); if(pDoc->IsTabProtected(pData->GetTabNo())) @@ -2097,14 +2095,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } ScAddress aPos(pData->GetCurX(), pData->GetCurY(), pData->GetTabNo()); - if(aRangeList.empty()) - { - ScRange* pRange = new ScRange(aPos); - aRangeList.push_back(pRange); - } ScConditionalFormatList* pList = pDoc->GetCondFormList( aPos.Tab() ); - AbstractScCondFormatManagerDlg* pDlg = pFact->CreateScCondFormatMgrDlg( pTabViewShell->GetDialogParent(), pDoc, pList, aRangeList, aPos, RID_SCDLG_COND_FORMAT_MANAGER); + AbstractScCondFormatManagerDlg* pDlg = pFact->CreateScCondFormatMgrDlg( pTabViewShell->GetDialogParent(), pDoc, pList, aPos, RID_SCDLG_COND_FORMAT_MANAGER); if(pDlg->Execute() == RET_OK) { pDoc->SetCondFormList(pDlg->GetConditionalFormatList(), aPos.Tab()); diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index 9f383fb80b53..890b05e98ca9 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -66,11 +66,10 @@ String lcl_MetricString( long nTwips, const String& rText ) ScColBar::ScColBar( Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : - ScHeaderControl( pParent, pEng, MAXCOL+1, HDR_HORIZONTAL ), + ScHeaderControl( pParent, pEng, MAXCOL+1, false ), pViewData( pData ), eWhich( eWhichPos ), - pFuncSet( pFunc ), - pSelEngine( pEng ) + pFuncSet( pFunc ) { Show(); } @@ -236,11 +235,10 @@ sal_Bool ScColBar::IsLayoutRTL() // overloaded only for columns ScRowBar::ScRowBar( Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : - ScHeaderControl( pParent, pEng, MAXROW+1, HDR_VERTICAL ), + ScHeaderControl( pParent, pEng, MAXROW+1, true ), pViewData( pData ), eWhich( eWhichPos ), - pFuncSet( pFunc ), - pSelEngine( pEng ) + pFuncSet( pFunc ) { Show(); } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 33926232166c..f4e317e10317 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -5431,7 +5431,7 @@ void ScGridWindow::UpdateCopySourceOverlay() Rectangle aLogic = PixelToLogic(aRect, aDrawMode); ::basegfx::B2DRange aRange(aLogic.Left(), aLogic.Top(), aLogic.Right(), aLogic.Bottom()); - ScOverlayDashedBorder* pDashedBorder = new ScOverlayDashedBorder(aRange, aHighlight, this); + ScOverlayDashedBorder* pDashedBorder = new ScOverlayDashedBorder(aRange, aHighlight); xOverlayManager->add(*pDashedBorder); mpOOSelectionBorder->append(*pDashedBorder); } diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 539e782c07af..a0fba138a916 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -61,11 +61,10 @@ //================================================================== ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine, - SCCOLROW nNewSize, sal_uInt16 nNewFlags ) : + SCCOLROW nNewSize, bool bNewVertical ) : Window ( pParent ), pSelEngine ( pSelectionEngine ), - nFlags ( nNewFlags ), - bVertical ( (nNewFlags & HDR_VERTICAL) != 0 ), + bVertical ( bNewVertical ), nSize ( nNewSize ), nMarkStart ( 0 ), nMarkEnd ( 0 ), diff --git a/sc/source/ui/view/overlayobject.cxx b/sc/source/ui/view/overlayobject.cxx index ed0ff36fc952..20430c2dbace 100644 --- a/sc/source/ui/view/overlayobject.cxx +++ b/sc/source/ui/view/overlayobject.cxx @@ -30,7 +30,6 @@ #include "overlayobject.hxx" #include "vcl/outdev.hxx" #include "vcl/lineinfo.hxx" -#include "vcl/window.hxx" #include "tools/fract.hxx" #include "basegfx/range/b2drange.hxx" #include "basegfx/polygon/b2dpolygon.hxx" @@ -45,9 +44,8 @@ using ::drawinglayer::primitive2d::Primitive2DSequence; #define DASH_UPDATE_INTERVAL 180 // in msec -ScOverlayDashedBorder::ScOverlayDashedBorder(const ::basegfx::B2DRange& rRange, const Color& rColor, Window* pWin) : +ScOverlayDashedBorder::ScOverlayDashedBorder(const ::basegfx::B2DRange& rRange, const Color& rColor) : OverlayObject(rColor), - mpParent(pWin), mbToggle(true) { mbAllowsAnimation = true; diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 4f1cbd98a2bf..a98936b3978d 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1984,7 +1984,7 @@ sal_Bool ScViewFunc::InsertTables(std::vector<rtl::OUString>& aNames, SCTAB nTab { if (bRecord) pDocSh->GetUndoManager()->AddUndoAction( - new ScUndoInsertTables( pDocSh, nTab, false, aNames)); + new ScUndoInsertTables( pDocSh, nTab, aNames)); // Update views @@ -2416,7 +2416,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, if (bUndo) { pDocSh->GetUndoManager()->AddUndoAction( - new ScUndoImportTab( pDocSh, nTab, nCount, bLink ) ); + new ScUndoImportTab( pDocSh, nTab, nCount ) ); } for (i=0; i<nInsCount; i++) @@ -2584,7 +2584,7 @@ void ScViewFunc::MoveTable( pDestDoc->GetName(nDestTab, sName); pDestShell->GetUndoManager()->AddUndoAction( new ScUndoImportTab( pDestShell, nDestTab, - static_cast<SCTAB>(TheTabs.size()), false)); + static_cast<SCTAB>(TheTabs.size()))); } else diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 888ff5c29f0f..f999b52d1a1e 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -597,9 +597,6 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r { ScAddress aPos( nCol, nRow, nTab ); ScBaseCell* pOldCell = pDoc->GetCell( aPos ); - sal_Bool bNeedHeight = ( pOldCell && pOldCell->GetCellType() == CELLTYPE_EDIT ) - || pDoc->HasAttrib( - nCol,nRow,nTab, nCol,nRow,nTab, HASATTR_NEEDHEIGHT ); // undo ScBaseCell* pUndoCell = (bUndo && pOldCell) ? pOldCell->Clone( *pDoc ) : 0; @@ -610,7 +607,7 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r if (bUndo) { pDocSh->GetUndoManager()->AddUndoAction( - new ScUndoEnterValue( pDocSh, aPos, pUndoCell, rValue, bNeedHeight ) ); + new ScUndoEnterValue( pDocSh, aPos, pUndoCell, rValue ) ); } pDocSh->PostPaintCell( aPos ); |