diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-19 15:27:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-23 09:42:23 +0200 |
| commit | 468ff4b3b6e20cab284b5f6dbd7c8aa5a1ba1264 (patch) | |
| tree | c855aa8d55122a03c40815f24c6dcb64a1d4cac2 /sc | |
| parent | a84c07509d9051084684987ad5ec47631afd50e5 (diff) | |
loplugin:constantfunction: sc
Change-Id: Id3268114041575d7dbb84e8d963ead566c78b928
Diffstat (limited to 'sc')
63 files changed, 60 insertions, 340 deletions
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index 6bedada3aaf0..1d30cc5833f9 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -574,7 +574,6 @@ public: void setSubtotals(const com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction >& rFunctions); OUString getCurrentPage() const; void setCurrentPage(const OUString& sPage); - bool getUseCurrentPage() const; void setUseCurrentPage(bool bUse); const com::sun::star::sheet::DataPilotFieldAutoShowInfo* getAutoShowInfo(); void setAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo* pInfo); diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 4153340615f3..da1e88495be3 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -82,7 +82,7 @@ public: static void FillProperties( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rSeq, const ScImportParam& rParam ); - static long GetPropertyCount(); + static long GetPropertyCount() { return 4; } }; // SortDescriptor is not available as Uno-Objekt any longer, only Property-Sequence @@ -96,7 +96,12 @@ public: static void FillProperties( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rSeq, const ScSortParam& rParam ); - static long GetPropertyCount(); + //! SortAscending muss aus der SheetSortDescriptor service-Beschreibung raus + static long GetPropertyCount() + { + return 9; // TableSortDescriptor and SheetSortDescriptor + } + }; // ScSubTotalDescriptorBase - base class for SubTotalDescriptor stand alone and in DB area (context?) diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index c07a242a0208..11f071b7d803 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -415,7 +415,6 @@ public: sal_uInt16 getFunction() const { return nFunction;} void setFunction(sal_uInt16 nNew); // for data dimension long getUsedHierarchy() const { return nUsedHier;} - void setUsedHierarchy(long nNew); bool HasSelectedPage() const { return bHasSelectedPage; } const ScDPItemData& GetSelectedData(); diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index 69e623953cb6..4da7e9f42ba0 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -68,13 +68,6 @@ public: ScRefAddress* pEndPos = 0, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; - bool IsRefArea ( const OUString&, - ScDocument*, - SCTAB, - OUString* = 0, - ScRefAddress* = 0 ) const - { return false; } - bool IsAbsPos ( const OUString& rPosStr, ScDocument* pDoc, SCTAB nTab, diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 7d8131aa1e92..2b39aacf9544 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -202,9 +202,7 @@ private: void SetZoomType(sal_Int16 ZoomType); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > GetClickedObject(const Point& rPoint) const; - void StartMouseListening(); void EndMouseListening(); - void StartActivationListening(); void EndActivationListening(); bool mbLeftMousePressed; bool mbPendingSelectionChanged; diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index d98e43200355..7d27484b5459 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -72,7 +72,7 @@ std::ostream& operator<<(std::ostream& rStrm, const OpCode& rCode) return rStrm; } -FileFormat aFileFormats[] = { +const FileFormat ScBootstrapFixture::aFileFormats[] = { { "ods" , "calc8", "", ODS_FORMAT_TYPE }, { "xls" , "MS Excel 97", "calc_MS_EXCEL_97", XLS_FORMAT_TYPE }, { "xlsx", "Calc Office Open XML" , "Office Open XML Spreadsheet", XLSX_FORMAT_TYPE }, @@ -588,11 +588,6 @@ ScDocShellRef ScBootstrapFixture::loadDoc( return load(bReadWrite, aFileName, aFilterName, OUString(), aFilterType, nFormatType, nClipboardId, static_cast<sal_uIntPtr>(nFormatType)); } -const FileFormat* ScBootstrapFixture::getFileFormats() -{ - return aFileFormats; -} - ScBootstrapFixture::ScBootstrapFixture( const OUString& rsBaseString ) : m_aBaseString( rsBaseString ) {} ScBootstrapFixture::~ScBootstrapFixture() {} diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index e89745e1e910..460d0fca0be8 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -220,6 +220,7 @@ struct assertion_traits<ScRange> class SCQAHELPER_DLLPUBLIC ScBootstrapFixture : public test::BootstrapFixture { + static const FileFormat aFileFormats[]; protected: OUString m_aBaseString; @@ -236,7 +237,7 @@ protected: ScDocShellRef loadDoc(const OUString& rFileName, sal_Int32 nFormat, bool bReadWrite = false ); public: - static const FileFormat* getFileFormats(); + static const FileFormat* getFileFormats() { return aFileFormats; } ScBootstrapFixture( const OUString& rsBaseString ); virtual ~ScBootstrapFixture(); diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 58e7d70d8f2e..3e3cea0dc9c8 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1427,11 +1427,6 @@ void ScDPDimension::setFunction(sal_uInt16 nNew) nFunction = nNew; } -void ScDPDimension::setUsedHierarchy(long /* nNew */) -{ - // #i52547# don't use the incomplete date hierarchy implementation - ignore the call -} - ScDPDimension* ScDPDimension::CreateCloneObject() { OSL_ENSURE( nSourceDim < 0, "recursive duplicate - not implemented" ); @@ -1526,9 +1521,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const OUString& aPropertyName, co { if ( aPropertyName == SC_UNO_DP_USEDHIERARCHY ) { - sal_Int32 nInt = 0; - if (aValue >>= nInt) - setUsedHierarchy( nInt ); + // #i52547# don't use the incomplete date hierarchy implementation - ignore the call } else if ( aPropertyName == SC_UNO_DP_ORIENTATION ) { diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index ed4441d1ccf6..5b6bcd8426c0 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -668,10 +668,6 @@ void ImportExcel::DefColWidth( void ) pColRowBuff->SetDefWidth( nScWidth ); } -void ImportExcel::Builtinfmtcnt( void ) -{ -} - void ImportExcel::Colinfo( void ) {// Column Formatting Information sal_uInt16 nColFirst, nColLast, nColWidth, nXF; @@ -808,10 +804,6 @@ void ImportExcel::Hideobj( void ) pD->SetViewOptions( aOpts ); } -void ImportExcel::Bundleheader( void ) -{ -} - void ImportExcel::Standardwidth( void ) { sal_uInt16 nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(), GetCharWidth() ); @@ -1043,10 +1035,6 @@ void ImportExcel::Array34( void ) } } -void ImportExcel::Externname34( void ) -{ -} - void ImportExcel::Defrowheight345( void ) { sal_uInt16 nFlags, nDefHeight; diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 777088bc593f..dc7c74e9072a 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -315,7 +315,7 @@ FltError ImportExcel::Read( void ) case EXC_ID_FILESHARING: ReadFileSharing(); break; case 0x41: rTabViewSett.ReadPane( maStrm ); break; case 0x42: Codepage(); break; // CODEPAGE [ 2345] - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x56: break; // BUILTINFMTCNT[ 34 ] case 0x5D: GetCurrSheetDrawing().ReadObj( maStrm );break; case 0x7D: Colinfo(); break; // COLINFO [ 345] case 0x8C: Country(); break; // COUNTRY [ 345] @@ -324,7 +324,7 @@ FltError ImportExcel::Read( void ) case 0x0208: Row34(); break; // ROW [ 34 ] case 0x0218: rNameMgr.ReadName( maStrm ); break; case 0x0221: Array34(); break; // ARRAY [ 34 ] - case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ] + case 0x0223: break; // EXTERNNAME [ 34 ] case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345] case 0x0231: rFontBfr.ReadFont( maStrm ); break; case 0x023E: rTabViewSett.ReadWindow2( maStrm, false );break; @@ -387,7 +387,7 @@ FltError ImportExcel::Read( void ) case 0x41: rTabViewSett.ReadPane( maStrm ); break; case 0x42: Codepage(); break; // CODEPAGE [ 2345] case 0x55: DefColWidth(); break; - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x56: break; // BUILTINFMTCNT[ 34 ] case 0x5D: GetCurrSheetDrawing().ReadObj( maStrm );break; case 0x7D: Colinfo(); break; // COLINFO [ 345] case 0x8C: Country(); break; // COUNTRY [ 345] @@ -397,7 +397,7 @@ FltError ImportExcel::Read( void ) case 0x0208: Row34(); break; // ROW [ 34 ] case 0x0218: rNameMgr.ReadName( maStrm ); break; case 0x0221: Array34(); break; // ARRAY [ 34 ] - case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ] + case 0x0223: break; // EXTERNNAME [ 34 ] case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345] case 0x0231: rFontBfr.ReadFont( maStrm ); break; case 0x023E: rTabViewSett.ReadWindow2( maStrm, false );break; @@ -427,13 +427,13 @@ FltError ImportExcel::Read( void ) case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345] case 0x42: Codepage(); break; // CODEPAGE [ 2345] case 0x55: DefColWidth(); break; - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x56: break; // BUILTINFMTCNT[ 34 ] case 0x8C: Country(); break; // COUNTRY [ 345] - case 0x8F: Bundleheader(); break; // BUNDLEHEADER [ 4 ] + case 0x8F: break; // BUNDLEHEADER [ 4 ] case 0x92: rPal.ReadPalette( maStrm ); break; case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45] case 0x0218: rNameMgr.ReadName( maStrm ); break; - case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ] + case 0x0223: break; // EXTERNNAME [ 34 ] case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345] case 0x0231: rFontBfr.ReadFont( maStrm ); break; case 0x0409: // BOF [ 4 ] @@ -497,11 +497,11 @@ FltError ImportExcel::Read( void ) case 0x41: rTabViewSett.ReadPane( maStrm ); break; case 0x42: Codepage(); break; // CODEPAGE [ 2345] case 0x55: DefColWidth(); break; - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x56: break; // BUILTINFMTCNT[ 34 ] case 0x5D: GetCurrSheetDrawing().ReadObj( maStrm );break; case 0x7D: Colinfo(); break; // COLINFO [ 345] case 0x8C: Country(); break; // COUNTRY [ 345] - case 0x8F: Bundleheader(); break; // BUNDLEHEADER [ 4 ] + case 0x8F: break; // BUNDLEHEADER [ 4 ] case 0x92: rPal.ReadPalette( maStrm ); break; case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45] case 0xA1: rPageSett.ReadSetup( maStrm ); break; @@ -583,7 +583,7 @@ FltError ImportExcel::Read( void ) case 0x1E: rNumFmtBfr.ReadFormat( maStrm ); break; case 0x22: Rec1904(); break; // 1904 [ 2345] case 0x31: rFontBfr.ReadFont( maStrm ); break; - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x56: break; // BUILTINFMTCNT[ 34 ] case 0x8D: Hideobj(); break; // HIDEOBJ [ 345] case 0xDE: Olesize(); break; case 0xE0: rXFBfr.ReadXF( maStrm ); break; @@ -627,7 +627,7 @@ FltError ImportExcel::Read( void ) case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45] case 0x0208: Row34(); break; // ROW [ 34 ] case 0x0221: Array34(); break; // ARRAY [ 34 ] - case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ] + case 0x0223: break; // EXTERNNAME [ 34 ] case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345] case 0x023E: rTabViewSett.ReadWindow2( maStrm, false );break; } @@ -1042,7 +1042,7 @@ FltError ImportExcel8::Read( void ) break; case 0x0E: Precision(); break; // PRECISION case 0x22: Rec1904(); break; // 1904 [ 2345 ] - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x56: break; // BUILTINFMTCNT[ 34 ] case 0x8D: Hideobj(); break; // HIDEOBJ [ 345 ] case 0xD3: SetHasBasic(); break; case 0xDE: Olesize(); break; diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 5078d319501b..d4039c5feca3 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -738,7 +738,6 @@ void XclExpPivotCache::AddFields( const ScDPObject& rDPObj ) AddStdFields( rDPObj ); maPCInfo.mnStdFields = GetFieldCount(); AddGroupFields( rDPObj ); - AddCalcFields( rDPObj ); maPCInfo.mnTotalFields = GetFieldCount(); }; @@ -790,11 +789,6 @@ void XclExpPivotCache::AddGroupFields( const ScDPObject& rDPObj ) } } -void XclExpPivotCache::AddCalcFields( const ScDPObject& /*rDPObj*/ ) -{ - // not supported -} - void XclExpPivotCache::WriteDconref( XclExpStream& rStrm ) const { XclExpString aRef( XclExpUrlHelper::EncodeUrl( GetRoot(), EMPTY_OUSTRING, &maTabName ) ); diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 37baaee334b2..2c01e7f0bb5b 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -4337,7 +4337,7 @@ void XclImpChart::UpdateObjFrame( const XclObjLineData& rLineData, const XclObjF sal_Size XclImpChart::GetProgressSize() const { return - (mxChartData ? mxChartData->GetProgressSize() : 0) + + (mxChartData ? XclImpChChart::GetProgressSize() : 0) + (mxChartDrawing ? mxChartDrawing->GetProgressSize() : 0); } diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index b6e6ba485b97..0ca6fdd8e9c7 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -375,7 +375,7 @@ protected: // save header data, call SaveActionData() virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; - inline sal_Size GetHeaderByteCount() const { return 12; } + static inline sal_Size GetHeaderByteCount() { return 12; } // override to save action data without header, called by SaveCont() virtual void SaveActionData( XclExpStream& rStrm ) const = 0; diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index f05764b00a80..2d4b2161610a 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -161,13 +161,11 @@ protected: void Codepage( void ); // 0x42 void Ixfe( void ); // 0x44 void DefColWidth( void ); // 0x55 - void Builtinfmtcnt( void ); // 0x56 void Colinfo( void ); // 0x7D void Wsbool( void ); // 0x81 void Boundsheet( void ); // 0x85 void Country( void ); // 0x8C void Hideobj( void ); // 0x8D - void Bundleheader( void ); // 0x8F void Standardwidth( void ); // 0x99 void Shrfmla( void ); // 0xBC void Mulrk( void ); // 0xBD @@ -181,7 +179,6 @@ protected: void Row34( void ); // 0x0208 void Bof3( void ); // 0x0209 void Array34( void ); // 0x0221 - void Externname34( void ); // 0x0223 void Defrowheight345( void ); // 0x0225 void TableOp( void ); // 0x0236 //void Rk( void ); // 0x027E -> 0x7E diff --git a/sc/source/filter/inc/revisionfragment.hxx b/sc/source/filter/inc/revisionfragment.hxx index 473549ef6076..f16a9e996f65 100644 --- a/sc/source/filter/inc/revisionfragment.hxx +++ b/sc/source/filter/inc/revisionfragment.hxx @@ -38,7 +38,6 @@ protected: virtual void finalizeImport() SAL_OVERRIDE; private: - void importHeaders( const AttributeList& rAttribs ); void importHeader( const AttributeList& rAttribs ); }; diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 1c898142a726..9612e84b127f 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -82,9 +82,6 @@ public: /** Sets column span information for a row. */ void setColSpans( sal_Int32 nRow, const ValueRangeSet& rColSpans ); - /** Inserts all cells of all open cell blocks into the Calc document. */ - void finalizeImport(); - private: typedef ::std::map< sal_Int32, ValueRangeVector > ColSpanVectorMap; diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index 98a6756473a8..3e6e799c73d1 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -34,8 +34,6 @@ void PutFormString(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB void SetFormat(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt8 nFormat, sal_uInt8 nSt); -void InitPage( void ); - OUString DosToSystem( sal_Char *pSource ); double SnumToDouble( sal_Int16 nVal ); diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index eadfcc958583..952443814a0b 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -201,8 +201,6 @@ private: void AddStdFields( const ScDPObject& rDPObj ); /** Adds all grouping pivot cache fields. */ void AddGroupFields( const ScDPObject& rDPObj ); - /** Adds all calculated pivot cache fields. */ - void AddCalcFields( const ScDPObject& rDPObj ); /** Writes the DCONREF record containing the source range. */ void WriteDconref( XclExpStream& rStrm ) const; diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index f21f77b164fc..981899d36e36 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -1338,7 +1338,7 @@ public: /** Returns true, if the plot area has benn moved and/or resized manually. */ bool IsManualPlotArea() const; /** Returns the number of units on the progress bar needed for the chart. */ - inline sal_Size GetProgressSize() const { return 2 * EXC_CHART_PROGRESS_SIZE; } + static inline sal_Size GetProgressSize() { return 2 * EXC_CHART_PROGRESS_SIZE; } /** Converts and writes all properties to the passed chart. */ void Convert( diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx index 58555d8ff8c3..f0ad80ebadb0 100644 --- a/sc/source/filter/lotus/filter.cxx +++ b/sc/source/filter/lotus/filter.cxx @@ -174,9 +174,11 @@ FltError ScImportLotus123old(LotusContext& rContext, SvStream& aStream, ScDocume if( !MemNew(rContext) ) return eERR_NOMEM; - InitPage(); // initialize page format (only Tab 0!) + // initialize page format (only Tab 0!) + // initialize page format; meaning: get defaults from SC TODO: + //scGetPageFormat( 0, &aPage ); - // start progressbar + // start progressbar ScfStreamProgressBar aPrgrsBar( aStream, pDocument->GetDocumentShell() ); // detect file type diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index 65759ae78262..3d4081961e04 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -103,11 +103,6 @@ void SetFormat(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB nTab, sal_u rContext.pDoc->ApplyAttr( nCol, nRow, nTab, aAttr ); } -void InitPage( void ) -{ // initialize page format; meaning: get defaults from SC TODO: - //scGetPageFormat( 0, &aPage ); -} - double SnumToDouble( sal_Int16 nVal ) { const double pFacts[ 8 ] = { diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx index fd9195f910d9..e4ca60819958 100644 --- a/sc/source/filter/oox/revisionfragment.cxx +++ b/sc/source/filter/oox/revisionfragment.cxx @@ -215,7 +215,6 @@ void RevisionHeadersFragment::onStartElement( const AttributeList& rAttribs ) switch (getCurrentElement()) { case XLS_TOKEN(headers): - importHeaders(rAttribs); break; case XLS_TOKEN(header): importHeader(rAttribs); @@ -282,11 +281,6 @@ void RevisionHeadersFragment::finalizeImport() rDoc.SetChangeViewSettings(aSettings); } -void RevisionHeadersFragment::importHeaders( const AttributeList& /*rAttribs*/ ) -{ - // Nothing for now. -} - void RevisionHeadersFragment::importHeader( const AttributeList& rAttribs ) { OUString aRId = rAttribs.getString(R_TOKEN(id), OUString()); diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index c6df96f9c329..58fc26aa317a 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -117,10 +117,6 @@ void CellBlockBuffer::setColSpans( sal_Int32 nRow, const ValueRangeSet& rColSpan maColSpans[ nRow ] = rColSpans.getRanges(); } -void CellBlockBuffer::finalizeImport() -{ -} - SheetDataBuffer::SheetDataBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), maCellBlocks( rHelper ), @@ -421,9 +417,6 @@ void SheetDataBuffer::addColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId, const } void SheetDataBuffer::finalizeImport() { - // insert all cells of all open cell blocks - maCellBlocks.finalizeImport(); - // create all array formulas for( ArrayFormulaList::iterator aIt = maArrayFormulas.begin(), aEnd = maArrayFormulas.end(); aIt != aEnd; ++aIt ) finalizeArrayFormula( aIt->first, aIt->second ); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index b671c795d584..f58d2244e421 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1844,8 +1844,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL pStateSet->AddState(AccessibleStateType::DEFUNC); else { - if (IsEditable(xParentStates)) - pStateSet->AddState(AccessibleStateType::EDITABLE); + pStateSet->AddState(AccessibleStateType::EDITABLE); pStateSet->AddState(AccessibleStateType::ENABLED); pStateSet->AddState(AccessibleStateType::OPAQUE); if (isShowing()) @@ -2297,13 +2296,6 @@ bool ScAccessibleDocument::IsDefunc( (rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC)); } -bool ScAccessibleDocument::IsEditable( - const uno::Reference<XAccessibleStateSet>& /* rxParentStates */) -{ - // what is with document protection or readonly documents? - return true; -} - void ScAccessibleDocument::AddChild(const uno::Reference<XAccessible>& xAcc, bool bFireEvent) { OSL_ENSURE(!mxTempAcc.is(), "this object should be removed before"); diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 48931cf2b70f..a11a7309b66e 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -560,8 +560,6 @@ public: virtual bool Cut() SAL_OVERRIDE; virtual bool Paste() SAL_OVERRIDE; - void GrabFocus(); - void SetInvalid(); }; @@ -569,7 +567,6 @@ ScEditViewForwarder::ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin) : mpEditView(pEditView), mpWindow(pWin) { - GrabFocus(); } ScEditViewForwarder::~ScEditViewForwarder() @@ -694,10 +691,6 @@ bool ScEditViewForwarder::Paste() return bResult; } -void ScEditViewForwarder::GrabFocus() -{ -} - void ScEditViewForwarder::SetInvalid() { mpWindow = NULL; @@ -1050,8 +1043,6 @@ SvxEditViewForwarder* ScAccessibleEditObjectTextData::GetEditViewForwarder( bool { DELETEZ(mpEditViewForwarder); } - else if (mpEditViewForwarder) - mpEditViewForwarder->GrabFocus(); } return mpEditViewForwarder; } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 07c9a2149dc4..f47387bc66dc 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -145,7 +145,7 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const } #define IMAGE(id) pImgMgr->SeekImage(id) -static bool lcl_isExperimentalMode() +static inline bool lcl_isExperimentalMode() { // make inputbar feature on by default, leave the switch for the // moment in case we need to back it out easily diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 6acc11e70234..b48acb4c89df 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -163,13 +163,6 @@ ScSelectionTransferObj::~ScSelectionTransferObj() OSL_ENSURE( !pView, "ScSelectionTransferObj dtor: ForgetView not called" ); } -bool ScSelectionTransferObj::StillValid() -{ - //! check if view still has same cell selection - //! (but return sal_False if data has changed inbetween) - return false; -} - void ScSelectionTransferObj::ForgetView() { pView = NULL; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index d7c33a8e39cd..a8ca5903bb2c 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -487,7 +487,7 @@ std::vector<OUString> AbstractScNamePasteDlg_Impl::GetSelectedNames() const bool AbstractScNamePasteDlg_Impl::IsAllSelected() const { - return pDlg->IsAllSelected(); + return false; } const ScQueryItem& AbstractScPivotFilterDlg_Impl::GetOutputItem() diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index c6efd7884b66..ea485cbd6f14 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -29,7 +29,7 @@ // STATIC DATA ----------------------------------------------------------- -static const sal_uInt16 pProtectionRanges[] = +const sal_uInt16 ScTabPageProtection::pProtectionRanges[] = { SID_SCATTR_PROTECTION, SID_SCATTR_PROTECTION, @@ -59,11 +59,6 @@ ScTabPageProtection::ScTabPageProtection(vcl::Window* pParent, const SfxItemSet& m_pBtnHidePrint->SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) ); } -const sal_uInt16* ScTabPageProtection::GetRanges() -{ - return pProtectionRanges; -} - SfxTabPage* ScTabPageProtection::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new ScTabPageProtection( pParent, *rAttrSet ) ); diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index a46095f60c07..2a6ff24bc5b3 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -137,10 +137,6 @@ ScCondFormatManagerDlg::~ScCondFormatManagerDlg() delete mpFormatList; } -bool ScCondFormatManagerDlg::IsInRefMode() const -{ - return true; -} ScConditionalFormatList* ScCondFormatManagerDlg::GetConditionalFormatList() { diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 87dad5e369aa..5d52c71d4957 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -73,7 +73,7 @@ namespace ValidListType = css::sheet::TableValidationVisibility; -static const sal_uInt16 pValueRanges[] = +const sal_uInt16 ScTPValidationValue::pValueRanges[] = { FID_VALID_MODE, FID_VALID_ERRTEXT, FID_VALID_LISTTYPE, FID_VALID_LISTTYPE, @@ -371,11 +371,6 @@ SfxTabPage* ScTPValidationValue::Create( vcl::Window* pParent, const SfxItemSet* return( new ScTPValidationValue( pParent, *rArgSet ) ); } -const sal_uInt16* ScTPValidationValue::GetRanges() -{ - return pValueRanges; -} - void ScTPValidationValue::Reset( const SfxItemSet* rArgSet ) { const SfxPoolItem* pItem; diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 5fb76889ecda..056436dce9f5 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -450,9 +450,6 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { SdrMark* pMark = rMarkList.GetMark(0); pObj = pMark->GetMarkedSdrObj(); - FuPoor* pPoor = pViewShell->GetViewData().GetView()->GetDrawFuncPtr(); - FuText* pText = static_cast<FuText*>(pPoor); - pText->StopDragMode(pObj ); } bReturn = true; } diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 9f1a19598e44..69c1fb782ed2 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -434,15 +434,6 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) if ( pView->IsDragObj() ) { pView->EndDragObj( rMEvt.IsShift() ); - const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - if (rMarkList.GetMarkCount() == 1) - { - SdrMark* pMark = rMarkList.GetMark(0); - SdrObject* pObj = pMark->GetMarkedSdrObj(); - FuPoor* pPoor = pViewShell->GetViewData().GetView()->GetDrawFuncPtr(); - FuText* pText = static_cast<FuText*>(pPoor); - pText->StopDragMode(pObj ); - } pView->ForceMarkedToAnotherPage(); } else if ( pView->IsCreateObj() ) diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index c9aa6204415e..61f8d809eedb 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.cxx @@ -182,9 +182,4 @@ void FuText::StopEditMode(bool /*bTextDirection*/) } } -// Called following an EndDragObj() to update the new note rectangle position -void FuText::StopDragMode(SdrObject* /*pObject*/) -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 8865fcf8ec9f..a450fa38e836 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -307,9 +307,6 @@ private: bool IsDefunc( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); - bool IsEditable( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); void AddChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, bool bFireEvent); void RemoveChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, bool bFireEvent); diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index e6d65f7654ea..9be73428bd3b 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -61,8 +61,6 @@ public: private: mutable SfxBroadcaster maBroadcaster; - // prevent the using of this method of the base class - ScCellEditSource* GetOriginalSource() { return NULL; } }; class ScAccessibleCellBaseTextData : public ScAccessibleTextData, @@ -106,9 +104,6 @@ private: ScSplitPos meSplitPos; ScAccessibleCell* mpAccessibleCell; - // prevent the using of this method of the base class - ScCellEditSource* GetOriginalSource() { return NULL; } - using ScAccessibleCellBaseTextData::GetDocShell; ScDocShell* GetDocShell(ScTabViewShell* pViewShell); }; @@ -183,9 +178,6 @@ private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; - // prevent the using of this method of the base class - ScCellEditSource* GetOriginalSource() { return NULL; } - using ScAccessibleCellBaseTextData::GetDocShell; ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; @@ -212,9 +204,6 @@ private: bool mbColHeader; bool mbRowHeader; - // prevent the using of this method of the base class - ScCellEditSource* GetOriginalSource() { return NULL; } - using ScAccessibleCellBaseTextData::GetDocShell; ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 886528614b21..6f577e4cf5b1 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -55,8 +55,6 @@ public: bool CondFormatsChanged() { return mbModified;} - bool IsInRefMode() const; - private: PushButton *m_pBtnAdd; PushButton *m_pBtnRemove; diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index e948e2d8e67d..baf0fa89e295 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -44,7 +44,6 @@ class ScDrawView: public FmFormView bool bInConstruct; void Construct(); - void UpdateBrowser(); protected: virtual void ModelHasChanged() SAL_OVERRIDE; @@ -105,12 +104,9 @@ public: void SetCellAnchored(); ScAnchorType GetAnchorType() const; - void VCAddWin( vcl::Window* pWin ); - void VCRemoveWin( vcl::Window* pWin ); - void UpdateIMap( SdrObject* pObj ); - sal_uInt16 GetPopupMenuId(); + sal_uInt16 GetPopupMenuId(); void UpdateUserViewOptions(); void SetMarkedOriginalSize(); diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 9ad121f14dca..131edf61ed68 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -73,8 +73,6 @@ public: void SetMouseButtonCode(sal_uInt16 nNew) { if(nNew != mnCode) mnCode = nNew; } sal_uInt16 GetMouseButtonCode() const { return mnCode; } - void Paint(const Rectangle&, vcl::Window*) {} - // Mouse- & Key-Events; return value=TRUE: Event was processed virtual bool KeyInput(const KeyEvent& rKEvt); virtual bool MouseMove(const MouseEvent&) { return false; } diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index 330d628f557e..851d01082b26 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -53,7 +53,6 @@ public: void SetInEditMode( SdrObject* pObj = NULL, const Point* pMousePixel = NULL, bool bCursorToEnd = false, const KeyEvent* pInitialKey = NULL ); void StopEditMode(bool bTextDirection = false); - void StopDragMode(SdrObject* pObject); // Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 62d4a4d89061..866ffc79ee04 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -51,7 +51,6 @@ public: virtual ~ScNamePasteDlg(); std::vector<OUString> GetSelectedNames() const; - bool IsAllSelected() const; }; #endif // INCLUDED_SC_SOURCE_UI_INC_NAMEPAST_HXX diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 50b0a0f5ebf1..f966fba1b9ff 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -313,8 +313,6 @@ public: using Window::Notify; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - void CursorPosChanged(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxx index 3abfd11a8873..cfc8a1facc09 100644 --- a/sc/source/ui/inc/seltrans.hxx +++ b/sc/source/ui/inc/seltrans.hxx @@ -58,7 +58,6 @@ public: virtual ~ScSelectionTransferObj(); void ForgetView(); - bool StillValid(); ScTabView* GetView() const { return pView; } ScTransferObj* GetCellData(); diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index e13b70def98b..954232033c97 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -26,10 +26,11 @@ class ScTabPageProtection : public SfxTabPage { + static const sal_uInt16 pProtectionRanges[]; public: static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - static const sal_uInt16* GetRanges (); + static const sal_uInt16* GetRanges () { return pProtectionRanges; } virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 182c1fd530af..8c9aada2c7db 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -27,10 +27,11 @@ class ScTablePage : public SfxTabPage { + static const sal_uInt16 pPageTableRanges[]; public: static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); - static const sal_uInt16* GetRanges (); + static const sal_uInt16* GetRanges () { return pPageTableRanges; } virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index e00fa143d8b0..ebc6d92ffa37 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -82,11 +82,12 @@ class ScValidationDlg; /** The tab page "Criteria" from the Validation dialog. */ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage { + static const sal_uInt16 pValueRanges[]; public: explicit ScTPValidationValue( vcl::Window* pParent, const SfxItemSet& rArgSet ); static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rArgSet ); - static const sal_uInt16* GetRanges(); + static const sal_uInt16* GetRanges() { return pValueRanges; } virtual bool FillItemSet( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rArgSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 1a4407821d97..efabb35b024f 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -69,7 +69,6 @@ private: void SelectSourceFile(); void LoadSourceFileStructure(const OUString& rPath); void HandleGetFocus(Control* pCtrl); - void HandleLoseFocus(Control* pCtrl); void TreeItemSelected(); void DefaultElementSelected(SvTreeListEntry& rEntry); void RepeatElementSelected(SvTreeListEntry& rEntry); @@ -94,7 +93,6 @@ private: void RefEditModified(); DECL_LINK(GetFocusHdl, Control*); - DECL_LINK(LoseFocusHdl, Control*); DECL_LINK(BtnPressedHdl, Button*); DECL_LINK(TreeItemSelectHdl, void*); DECL_LINK(RefModifiedHdl, void*); diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index faf2acc87850..841781575ed4 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -96,9 +96,4 @@ std::vector<OUString> ScNamePasteDlg::GetSelectedNames() const return maSelectedNames; } -bool ScNamePasteDlg::IsAllSelected() const -{ - return false; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index 12dd5994acf6..5b64b02115f4 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -58,7 +58,6 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat rNavigatorDlg.UpdateColumn( &nCol ); rNavigatorDlg.UpdateRow ( &nRow ); - rNavigatorDlg.CursorPosChanged(); } } break; @@ -78,7 +77,6 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat rNavigatorDlg.UpdateTable( &nTab ); rNavigatorDlg.UpdateColumn(); rNavigatorDlg.UpdateRow(); - rNavigatorDlg.CursorPosChanged(); } } break; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index b31623c8852a..1a6178319f82 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -896,14 +896,6 @@ void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew) rCfg.SetDragMode(nDropMode); } -void ScNavigatorDlg::CursorPosChanged() -{ - //! select entries ??? - -// if ( GetDBAtCursor( aStrDbName ) ) -// if ( GetAreaAtCursor( aStrAreaName ) ) -} - void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo ) { if ( (nColNo+1 != nCurCol) || (nRowNo+1 != nCurRow) ) diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 50f3144be245..ed56d2ed9e6b 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -32,7 +32,7 @@ // Static Data -static const sal_uInt16 pPageTableRanges[] = +const sal_uInt16 ScTablePage::pPageTableRanges[] = { ATTR_PAGE_NOTES, ATTR_PAGE_FIRSTPAGENO, 0 @@ -127,11 +127,6 @@ ScTablePage::~ScTablePage() { } -const sal_uInt16* ScTablePage::GetRanges() -{ - return pPageTableRanges; -} - SfxTabPage* ScTablePage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScTablePage( pParent, *rCoreSet ) ); diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 83637c56a6db..7075731674ee 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -1979,7 +1979,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam else if ( aNameString == SC_UNONAME_SELPAGE ) aRet <<= getCurrentPage(); else if ( aNameString == SC_UNONAME_USESELPAGE ) - aRet <<= getUseCurrentPage(); + aRet <<= false; else if ( aNameString == SC_UNONAME_HASAUTOSHOW ) aRet <<= (getAutoShowInfo() != NULL); else if ( aNameString == SC_UNONAME_AUTOSHOW ) @@ -2227,11 +2227,6 @@ void ScDataPilotFieldObj::setCurrentPage( const OUString& rPage ) } } -bool ScDataPilotFieldObj::getUseCurrentPage() const -{ - return false; -} - void ScDataPilotFieldObj::setUseCurrentPage( bool bUse ) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 6b32203094e3..3e5f85422b31 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -158,13 +158,6 @@ sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc e return eGeneral; } -// ScImportDescriptor: alles static - -long ScImportDescriptor::GetPropertyCount() -{ - return 4; -} - void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq, const ScImportParam& rParam ) { OSL_ENSURE( rSeq.getLength() == GetPropertyCount(), "falscher Count" ); @@ -264,15 +257,6 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ } } -// ScSortDescriptor: alles static - -//! SortAscending muss aus der SheetSortDescriptor service-Beschreibung raus - -long ScSortDescriptor::GetPropertyCount() -{ - return 9; // TableSortDescriptor and SheetSortDescriptor -} - void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq, const ScSortParam& rParam ) { OSL_ENSURE( rSeq.getLength() == GetPropertyCount(), "falscher Count" ); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index c15c8cd4f920..7f7ac0def73d 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1332,10 +1332,6 @@ bool ScTabViewObj::MouseReleased( const awt::MouseEvent& e ) // XEnhancedMouseClickBroadcaster -void ScTabViewObj::StartMouseListening() -{ -} - void ScTabViewObj::EndMouseListening() { lang::EventObject aEvent; @@ -1353,10 +1349,6 @@ void ScTabViewObj::EndMouseListening() aMouseClickHandlers.clear(); } -void ScTabViewObj::StartActivationListening() -{ -} - void ScTabViewObj::EndActivationListening() { lang::EventObject aEvent; @@ -1381,13 +1373,9 @@ void SAL_CALL ScTabViewObj::addEnhancedMouseClickHandler( const uno::Reference< if (aListener.is()) { - sal_uInt16 nCount = aMouseClickHandlers.size(); uno::Reference<awt::XEnhancedMouseClickHandler> *pObj = new uno::Reference<awt::XEnhancedMouseClickHandler>( aListener ); aMouseClickHandlers.push_back( pObj ); - - if (aMouseClickHandlers.size() == 1 && nCount == 0) // only if a listener added - StartMouseListening(); } } @@ -1416,13 +1404,9 @@ void SAL_CALL ScTabViewObj::addActivationEventListener( const uno::Reference< sh if (aListener.is()) { - sal_uInt16 nCount = aActivationListeners.size(); uno::Reference<sheet::XActivationEventListener> *pObj = new uno::Reference<sheet::XActivationEventListener>( aListener ); aActivationListeners.push_back( pObj ); - - if (aActivationListeners.size() == 1 && nCount == 0) // only if a listener added - StartActivationListening(); } } diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 8a9d26730946..b22326edeb5b 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -166,7 +166,6 @@ ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException, st void SAL_CALL ScVbaWorkbooks::Close() throw (uno::RuntimeException, std::exception) { - closeDocuments(); } bool diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx index 1bab90d9a35d..44b7a46e8cd8 100644 --- a/sc/source/ui/view/drawvie2.cxx +++ b/sc/source/ui/view/drawvie2.cxx @@ -19,23 +19,4 @@ #include "drawview.hxx" -// STATIC DATA ----------------------------------------------------------- - -// UpdateBrowser in MarkListHasChanged gerufen - -void ScDrawView::UpdateBrowser() -{ - // VC's und den Browser dazu gibts nicht mehr... -} - -void ScDrawView::VCAddWin( vcl::Window* /* pWin */ ) -{ - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden -} - -void ScDrawView::VCRemoveWin( vcl::Window* /* pWin */ ) -{ - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 4651f54b00fa..498b5cc0ddd7 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -351,8 +351,6 @@ void ScDrawView::MarkListHasChanged() { FmFormView::MarkListHasChanged(); - UpdateBrowser(); - ScTabViewShell* pViewSh = pViewData->GetViewShell(); // #i110829# remove the cell selection only if drawing objects are selected diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx index 29c9bfa6c58a..d5db61ebf849 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.cxx @@ -20,22 +20,4 @@ #include "olkact.hxx" -// STATIC DATA ----------------------------------------------------------- - -void ActivateOlk( ScViewData* /* pViewData */ ) -{ - // Browser fuer Virtual Controls fuellen - // VC's und den Browser dazu gibts nicht mehr... - - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden -} - -void DeActivateOlk( ScViewData* /* pViewData */ ) -{ - // Browser fuer Virtual Controls fuellen - // VC's und den Browser dazu gibts nicht mehr... - - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/olkact.hxx b/sc/source/ui/view/olkact.hxx index ebb48317e2f3..880b15617254 100644 --- a/sc/source/ui/view/olkact.hxx +++ b/sc/source/ui/view/olkact.hxx @@ -21,12 +21,6 @@ #define INCLUDED_SC_SOURCE_UI_VIEW_OLKACT_HXX -class ScViewData; - -void ActivateOlk(ScViewData * pViewData); - -void DeActivateOlk(ScViewData * pViewData); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index cf18c69da95a..1ee8f4e1ab10 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -308,34 +308,27 @@ void ScTabView::CheckSelectionTransfer() { ScModule* pScMod = SC_MOD(); ScSelectionTransferObj* pOld = pScMod->GetSelectionTransfer(); - if ( pOld && pOld->GetView() == this && pOld->StillValid() ) + ScSelectionTransferObj* pNew = ScSelectionTransferObj::CreateFromView( this ); + if ( pNew ) { - // selection not changed - nothing to do - } - else - { - ScSelectionTransferObj* pNew = ScSelectionTransferObj::CreateFromView( this ); - if ( pNew ) - { - // create new selection + // create new selection - if (pOld) - pOld->ForgetView(); + if (pOld) + pOld->ForgetView(); - uno::Reference<datatransfer::XTransferable> xRef( pNew ); - pScMod->SetSelectionTransfer( pNew ); - pNew->CopyToSelection( GetActiveWin() ); // may delete pOld - } - else if ( pOld && pOld->GetView() == this ) - { - // remove own selection + uno::Reference<datatransfer::XTransferable> xRef( pNew ); + pScMod->SetSelectionTransfer( pNew ); + pNew->CopyToSelection( GetActiveWin() ); // may delete pOld + } + else if ( pOld && pOld->GetView() == this ) + { + // remove own selection - pOld->ForgetView(); - pScMod->SetSelectionTransfer( NULL ); - TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld - } - // else: selection from outside: leave unchanged + pOld->ForgetView(); + pScMod->SetSelectionTransfer( NULL ); + TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld } + // else: selection from outside: leave unchanged } } diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 66ec1a8463e8..eb5a3364a03d 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -166,7 +166,6 @@ ScTabView::~ScTabView() for (i=0; i<4; i++) if (pGridWin[i]) { - pDrawView->VCRemoveWin(pGridWin[i]); pDrawView->DeleteWindowFromPaintView(pGridWin[i]); } @@ -211,7 +210,6 @@ void ScTabView::MakeDrawView( sal_uInt8 nForceDesignMode ) { if ( SC_SPLIT_BOTTOMLEFT != (ScSplitPos)i ) pDrawView->AddWindowToPaintView(pGridWin[i]); - pDrawView->VCAddWin(pGridWin[i]); } pDrawView->RecalcScale(); for (i=0; i<4; i++) @@ -247,7 +245,6 @@ void ScTabView::DoAddWin( ScGridWindow* pWin ) if (pDrawView) { pDrawView->AddWindowToPaintView(pWin); - pDrawView->VCAddWin(pWin); // #114409# pWin->DrawLayerCreated(); @@ -260,11 +257,6 @@ void ScTabView::TabChanged( bool bSameTabButMoved ) { DrawDeselectAll(); // beendet auch Text-Edit-Modus - sal_uInt16 i; - for (i=0; i<4; i++) - if (pGridWin[i]) - pDrawView->VCRemoveWin(pGridWin[i]); // fuer alte Page - SCTAB nTab = aViewData.GetTabNo(); pDrawView->HideSdrPage(); pDrawView->ShowSdrPage(pDrawView->GetModel()->GetPage(nTab)); @@ -273,10 +265,6 @@ void ScTabView::TabChanged( bool bSameTabButMoved ) pDrawView->RecalcScale(); pDrawView->UpdateWorkArea(); // PageSize ist pro Page unterschiedlich - - for (i=0; i<4; i++) - if (pGridWin[i]) - pDrawView->VCAddWin(pGridWin[i]); // fuer neue Page } SfxBindings& rBindings = aViewData.GetBindings(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index e657c4750117..f8724ad19942 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -121,7 +121,6 @@ void ScTabViewShell::Activate(bool bMDI) pScMod->ViewShellChanged(); ActivateView( true, bFirstActivate ); - ActivateOlk( &GetViewData() ); // AutoCorrect umsetzen, falls der Writer seins neu angelegt hat UpdateDrawTextOutliner(); @@ -255,7 +254,6 @@ void ScTabViewShell::Deactivate(bool bMDI) bool bOldDontSwitch = bDontSwitch; bDontSwitch = true; - DeActivateOlk( &GetViewData() ); ActivateView( false, false ); if ( GetViewFrame()->GetFrame().IsInPlace() ) // inplace diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 39331ac79083..8a3026b89315 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -102,9 +102,6 @@ ScXMLSourceDlg::ScXMLSourceDlg( Link aLink = LINK(this, ScXMLSourceDlg, GetFocusHdl); mpRefEdit->SetGetFocusHdl(aLink); mpRefBtn->SetGetFocusHdl(aLink); - aLink = LINK(this, ScXMLSourceDlg, LoseFocusHdl); - mpRefEdit->SetLoseFocusHdl(aLink); - mpRefBtn->SetLoseFocusHdl(aLink); aLink = LINK(this, ScXMLSourceDlg, TreeItemSelectHdl); mpLbTree->SetSelectHdl(aLink); @@ -220,10 +217,6 @@ void ScXMLSourceDlg::HandleGetFocus(Control* pCtrl) mpActiveEdit->SetSelection(Selection(0, SELECTION_MAX)); } -void ScXMLSourceDlg::HandleLoseFocus(Control* /*pCtrl*/) -{ -} - namespace { class UnhighlightEntry : std::unary_function<SvTreeListEntry*, void> @@ -659,12 +652,6 @@ IMPL_LINK(ScXMLSourceDlg, GetFocusHdl, Control*, pCtrl) return 0; } -IMPL_LINK(ScXMLSourceDlg, LoseFocusHdl, Control*, pCtrl) -{ - HandleLoseFocus(pCtrl); - return 0; -} - IMPL_LINK(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn) { if (pBtn == mpBtnSelectSource) |