diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/attrib.hxx | 13 | ||||
-rw-r--r-- | sc/inc/chartarr.hxx | 1 | ||||
-rw-r--r-- | sc/inc/formulacell.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/formulacell.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/chartarr.cxx | 9 | ||||
-rw-r--r-- | sc/source/filter/inc/orcusinterface.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/orcus/interface.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexprt.hxx | 1 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlimprt.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleText.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/tpusrlst.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpusrlst.cxx | 2 |
15 files changed, 12 insertions, 47 deletions
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 070f1f04a7de..7bab719aadc3 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -154,8 +154,7 @@ public: inline ScRangeItem( const sal_uInt16 nWhich ); inline ScRangeItem( const sal_uInt16 nWhich, - const ScRange& rRange, - const sal_uInt16 nNewFlags = 0 ); + const ScRange& rRange ); inline ScRangeItem( const ScRangeItem& rCpy ); inline ScRangeItem& operator=( const ScRangeItem &rCpy ); @@ -171,23 +170,21 @@ public: private: ScRange aRange; - sal_uInt16 nFlags; }; inline ScRangeItem::ScRangeItem( const sal_uInt16 nWhichP ) - : SfxPoolItem( nWhichP ), nFlags( SCR_INVALID ) // == invalid area + : SfxPoolItem( nWhichP ) { } inline ScRangeItem::ScRangeItem( const sal_uInt16 nWhichP, - const ScRange& rRange, - const sal_uInt16 nNew ) - : SfxPoolItem( nWhichP ), aRange( rRange ), nFlags( nNew ) + const ScRange& rRange ) + : SfxPoolItem( nWhichP ), aRange( rRange ) { } inline ScRangeItem::ScRangeItem( const ScRangeItem& rCpy ) - : SfxPoolItem( rCpy.Which() ), aRange( rCpy.aRange ), nFlags( rCpy.nFlags ) + : SfxPoolItem( rCpy.Which() ), aRange( rCpy.aRange ) {} inline ScRangeItem& ScRangeItem::operator=( const ScRangeItem &rCpy ) diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index d91e49266156..6165290ee5b2 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -61,7 +61,6 @@ class SC_DLLPUBLIC ScChartArray // only parameter-struct OUString aName; ScDocument* pDocument; ScChartPositioner aPositioner; - bool bValid; // for creation out of SchMemChart private: ScMemChart* CreateMemChartSingle(); diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index b98be9677039..d2c8c70d19fb 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -64,7 +64,6 @@ public: mutable size_t mnRefCount; ScTokenArray* mpCode; - sc::CompiledFormula* mpCompiledFormula; ScFormulaCell *mpTopCell; SCROW mnLength; // How many of these do we have ? short mnFormatType; diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 983ebeb1372c..0393b997560b 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -567,7 +567,6 @@ ScFormulaCellGroup::ScFormulaCellGroup() : mpImpl(new Impl), mnRefCount(0), mpCode(nullptr), - mpCompiledFormula(nullptr), mpTopCell(nullptr), mnLength(0), mnFormatType(css::util::NumberFormat::NUMBER), @@ -582,7 +581,6 @@ ScFormulaCellGroup::~ScFormulaCellGroup() { SAL_INFO( "sc.core.formulacell", "ScFormulaCellGroup dtor this " << this); delete mpCode; - delete mpCompiledFormula; } void ScFormulaCellGroup::setCode( const ScTokenArray& rCode ) diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index 780537933e63..4d1cccb4c34b 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -64,8 +64,7 @@ ScChartArray::ScChartArray( ScDocument* pDoc, SCTAB nTab, const OUString& rChartName ) : aName( rChartName ), pDocument( pDoc ), - aPositioner(pDoc, nTab, nStartColP, nStartRowP, nEndColP, nEndRowP), - bValid( true ) + aPositioner(pDoc, nTab, nStartColP, nStartRowP, nEndColP, nEndRowP) { } @@ -73,14 +72,12 @@ ScChartArray::ScChartArray( ScDocument* pDoc, const ScRangeListRef& rRangeList, const OUString& rChartName ) : aName( rChartName ), pDocument( pDoc ), - aPositioner(pDoc, rRangeList), - bValid( true ) {} + aPositioner(pDoc, rRangeList) {} ScChartArray::ScChartArray( const ScChartArray& rArr ) : aName(rArr.aName), pDocument(rArr.pDocument), - aPositioner(rArr.aPositioner), - bValid(rArr.bValid) {} + aPositioner(rArr.aPositioner) {} ScChartArray::~ScChartArray() {} diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index 1f34a720d76c..63b36ef5ab49 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -161,8 +161,6 @@ public: virtual void commit() override; private: - ScDocument& mrDoc; - ScRange maRange; }; diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index dbe1f5abf269..e50b8bf428fa 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -1207,10 +1207,8 @@ size_t ScOrcusStyles::commit_cell_style() // auto filter import -ScOrcusAutoFilter::ScOrcusAutoFilter(ScDocument& rDoc): - mrDoc(rDoc) +ScOrcusAutoFilter::ScOrcusAutoFilter(ScDocument&) { - (void)mrDoc; } ScOrcusAutoFilter::~ScOrcusAutoFilter() diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 17c7c0ccd356..508f8c2f5a95 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -353,7 +353,6 @@ ScXMLExport::ScXMLExport( pGroupColumns (nullptr), pGroupRows (nullptr), pDefaults(nullptr), - pChartListener(nullptr), pCurrentCell(nullptr), pMergedRangesContainer(nullptr), pValidationsContainer(nullptr), @@ -435,7 +434,6 @@ ScXMLExport::~ScXMLExport() delete pMergedRangesContainer; delete pValidationsContainer; delete pChangeTrackingExportHelper; - delete pChartListener; delete pDefaults; delete pNumberFormatAttributesExportHelper; } diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 259e373322a1..1b87b1d04408 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -104,7 +104,6 @@ class ScXMLExport : public SvXMLExport ScMyOpenCloseColumnRowGroup* pGroupColumns; ScMyOpenCloseColumnRowGroup* pGroupRows; ScMyDefaultStyles* pDefaults; - ScChartListener* pChartListener; const ScMyCell* pCurrentCell; ScMyMergedRangesContainer* pMergedRangesContainer; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index f03a13a322dc..dff739d015b3 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1986,9 +1986,6 @@ ScXMLImport::ScXMLImport( sLocale(SC_LOCALE), sCellStyle(SC_UNONAME_CELLSTYL), pDocElemTokenMap( nullptr ), - pStylesElemTokenMap( nullptr ), - pStylesAttrTokenMap( nullptr ), - pStyleElemTokenMap( nullptr ), pBodyElemTokenMap( nullptr ), pContentValidationsElemTokenMap( nullptr ), pContentValidationElemTokenMap( nullptr ), @@ -2131,9 +2128,6 @@ ScXMLImport::~ScXMLImport() throw() { // delete pI18NMap; delete pDocElemTokenMap; - delete pStylesElemTokenMap; - delete pStylesAttrTokenMap; - delete pStyleElemTokenMap; delete pBodyElemTokenMap; delete pContentValidationsElemTokenMap; delete pContentValidationElemTokenMap; diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 043230143506..52cfb9da58d8 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -847,9 +847,6 @@ class ScXMLImport: public SvXMLImport, private boost::noncopyable rtl::Reference < XMLPropertySetMapper > xTableStylesPropertySetMapper; SvXMLTokenMap *pDocElemTokenMap; - SvXMLTokenMap *pStylesElemTokenMap; - SvXMLTokenMap *pStylesAttrTokenMap; - SvXMLTokenMap *pStyleElemTokenMap; SvXMLTokenMap *pBodyElemTokenMap; SvXMLTokenMap *pContentValidationsElemTokenMap; SvXMLTokenMap *pContentValidationElemTokenMap; diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 81f06b2588c6..15a784e64058 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -497,11 +497,10 @@ private: ScPreviewShell* mpViewShell; ScAccessibleDocumentPagePreview* mpAccDoc; MapMode maMapMode; - bool mbValid; }; ScIAccessibleViewForwarder::ScIAccessibleViewForwarder() - : mpViewShell(nullptr), mpAccDoc(nullptr), mbValid(false) + : mpViewShell(nullptr), mpAccDoc(nullptr) { } @@ -510,8 +509,7 @@ ScIAccessibleViewForwarder::ScIAccessibleViewForwarder(ScPreviewShell* pViewShel const MapMode& aMapMode) : mpViewShell(pViewShell), mpAccDoc(pAccDoc), - maMapMode(aMapMode), - mbValid(true) + maMapMode(aMapMode) { } diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 4edcec97bbed..5ff874ef21bf 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -244,7 +244,6 @@ class ScPreviewViewForwarder : public SvxViewForwarder { protected: ScPreviewShell* mpViewShell; - mutable ScPreviewTableInfo* mpTableInfo; public: explicit ScPreviewViewForwarder(ScPreviewShell* pViewShell); virtual ~ScPreviewViewForwarder(); @@ -263,15 +262,12 @@ public: }; ScPreviewViewForwarder::ScPreviewViewForwarder(ScPreviewShell* pViewShell) - : - mpViewShell(pViewShell), - mpTableInfo(nullptr) + : mpViewShell(pViewShell) { } ScPreviewViewForwarder::~ScPreviewViewForwarder() { - delete mpTableInfo; } bool ScPreviewViewForwarder::IsValid() const diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 912de9102ce3..93cdd3f74522 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -75,7 +75,6 @@ private: ScDocument* pDoc; ScViewData* pViewData; - ScRangeUtil* pRangeUtil; OUString aStrSelectedArea; bool bModifyMode; diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index cc998cb08c56..1de9b59f7cf9 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -56,7 +56,6 @@ ScTpUserLists::ScTpUserLists( vcl::Window* pParent, pUserLists ( nullptr ), pDoc ( nullptr ), pViewData ( nullptr ), - pRangeUtil ( new ScRangeUtil ), bModifyMode ( false ), bCancelMode ( false ), bCopyDone ( false ), @@ -88,7 +87,6 @@ ScTpUserLists::~ScTpUserLists() void ScTpUserLists::dispose() { delete pUserLists; - delete pRangeUtil; mpFtLists.clear(); mpLbLists.clear(); mpFtEntries.clear(); |