From 309574394bd4ae3e9e10e5ff0d64bdd7bbbc8b83 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 29 Jan 2015 09:07:25 +0000 Subject: callcatcher: large newly detected unused methods post de-virtualization i.e lots now able to be detected after... commit b44cbb26efe1d0b0950b1e1613e131b506dc3876 Author: Noel Grandin Date: Tue Jan 20 12:38:10 2015 +0200 new loplugin: change virtual methods to non-virtual Where we can prove that the virtual method is never overriden. In the case of pure-virtual methods, we remove the method entirely. Sometimes this leads to entire methods and fields being eliminated. Change-Id: I605e2fa56f7186c3d3a764f3cd30f5cf7f881f9d --- sc/inc/cellsuno.hxx | 7 ---- sc/inc/formulacell.hxx | 3 +- sc/source/core/data/formulacell.cxx | 4 +-- sc/source/filter/excel/xeescher.cxx | 64 ------------------------------------- sc/source/filter/inc/xeescher.hxx | 1 - sc/source/ui/drawfunc/chartsh.cxx | 6 ---- sc/source/ui/drawfunc/fupoor.cxx | 33 ------------------- sc/source/ui/drawfunc/oleobjsh.cxx | 6 ---- sc/source/ui/inc/chartsh.hxx | 1 - sc/source/ui/inc/fupoor.hxx | 4 --- sc/source/ui/inc/gridwin.hxx | 3 -- sc/source/ui/inc/navipi.hxx | 2 -- sc/source/ui/inc/oleobjsh.hxx | 1 - sc/source/ui/inc/preview.hxx | 2 -- sc/source/ui/navipi/navipi.cxx | 34 -------------------- sc/source/ui/unoobj/cellsuno.cxx | 9 ------ sc/source/ui/vba/vbaapplication.cxx | 39 ---------------------- sc/source/ui/vba/vbaapplication.hxx | 4 --- sc/source/ui/vba/vbadialogs.cxx | 5 --- sc/source/ui/vba/vbadialogs.hxx | 2 -- sc/source/ui/vba/vbaname.cxx | 12 ------- sc/source/ui/vba/vbaname.hxx | 2 -- sc/source/ui/view/gridwin.cxx | 5 --- sc/source/ui/view/gridwin5.cxx | 12 ------- sc/source/ui/view/preview.cxx | 11 ------- 25 files changed, 4 insertions(+), 268 deletions(-) (limited to 'sc') diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index d733a932f68a..ba9dedbe156c 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -673,13 +673,6 @@ public: virtual void RefChanged() SAL_OVERRIDE; - // via getImplementation() - void SetArrayFormulaWithGrammar( const OUString& rFormula, - const OUString& rFormulaNmsp, - const formula::FormulaGrammar::Grammar ) - throw (css::uno::RuntimeException, - std::exception); - // XCellRangeAddressable virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getRangeAddress() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 0ed021f6b756..3803a468f7f3 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -78,8 +78,9 @@ public: ScFormulaCellGroup(); ~ScFormulaCellGroup(); - +#if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION void scheduleCompilation(); +#endif void setCode( const ScTokenArray& rCode ); void setCode( ScTokenArray* pCode ); diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 579b1e76413f..0d810561561a 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -495,16 +495,16 @@ ScFormulaCellGroup::~ScFormulaCellGroup() delete mpImpl; } +#if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION void ScFormulaCellGroup::scheduleCompilation() { -#if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION meKernelState = sc::OpenCLKernelCompilationScheduled; sc::CLBuildKernelWorkItem aWorkItem; aWorkItem.meWhatToDo = sc::CLBuildKernelWorkItem::COMPILE; aWorkItem.mxGroup = this; sxCompilationThread->push(aWorkItem); -#endif } +#endif void ScFormulaCellGroup::setCode( const ScTokenArray& rCode ) { diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index f22d1295622e..acf29b8f2c72 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -1109,70 +1109,6 @@ void XclExpChartObj::SaveXml( XclExpXmlStream& rStrm ) pDrawing->endElement( FSNS( XML_xdr, XML_twoCellAnchor ) ); } -void XclExpChartObj::WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ) -{ - pDrawing->startElement( FSNS( XML_xdr, XML_graphicFrame ), FSEND ); - - pDrawing->startElement( FSNS( XML_xdr, XML_nvGraphicFramePr ), FSEND ); - - // TODO: get the correct chart name chart id - OUString sName = "Object 1"; - Reference< XNamed > xNamed( mxShape, UNO_QUERY ); - if (xNamed.is()) - { - sName = xNamed->getName(); - } - sal_Int32 nID = rStrm.GetUniqueId(); - - pDrawing->singleElement( FSNS( XML_xdr, XML_cNvPr ), - XML_id, I32S( nID ), - XML_name, USS( sName ), - FSEND ); - - pDrawing->singleElement( FSNS( XML_xdr, XML_cNvGraphicFramePr ), - FSEND ); - - pDrawing->endElement( FSNS( XML_xdr, XML_nvGraphicFramePr ) ); - - // visual chart properties - WriteShapeTransformation( pDrawing, mxShape ); - - // writer chart object - pDrawing->startElement( FSNS( XML_a, XML_graphic ), FSEND ); - pDrawing->startElement( FSNS( XML_a, XML_graphicData ), - XML_uri, "http://schemas.openxmlformats.org/drawingml/2006/chart", - FSEND ); - OUString sId; - // TODO: - static sal_Int32 nChartCount = 0; - nChartCount++; - sax_fastparser::FSHelperPtr pChart = rStrm.CreateOutputStream( - XclXmlUtils::GetStreamName( "xl/", "charts/chart", nChartCount ), - XclXmlUtils::GetStreamName( "../", "charts/chart", nChartCount ), - rStrm.GetCurrentStream()->getOutputStream(), - "application/vnd.openxmlformats-officedocument.drawingml.chart+xml", - "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart", - &sId ); - - pDrawing->singleElement( FSNS( XML_c, XML_chart ), - FSNS( XML_xmlns, XML_c ), "http://schemas.openxmlformats.org/drawingml/2006/chart", - FSNS( XML_xmlns, XML_r ), "http://schemas.openxmlformats.org/officeDocument/2006/relationships", - FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(), - FSEND ); - - rStrm.PushStream( pChart ); - Reference< XModel > xModel( mxChartDoc, UNO_QUERY ); - ChartExport aChartExport( XML_xdr, pChart, xModel, &rStrm, DrawingML::DOCUMENT_XLSX ); - aChartExport.ExportContent(); - - rStrm.PopStream(); - - pDrawing->endElement( FSNS( XML_a, XML_graphicData ) ); - pDrawing->endElement( FSNS( XML_a, XML_graphic ) ); - pDrawing->endElement( FSNS( XML_xdr, XML_graphicFrame ) ); - -} - void XclExpChartObj::WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, bool bFlipH, bool bFlipV, sal_Int32 nRotation ) { ::com::sun::star::awt::Point aPos = rXShape->getPosition(); diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 4db040f7d0f6..87bf7c362013 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -300,7 +300,6 @@ public: /** Writes the OBJ record and the entire chart substream. */ virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ); void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 ); const css::uno::Reference& GetChartDoc() const; diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 84a26ce49fd5..07752f6aac77 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -105,10 +105,4 @@ void ScChartShell::ExecuteExportAsGraphic( SfxRequest& ) Invalidate(); } -void ScChartShell::HandleSelectionChange (void) -{ - // Do not call the implementation in the base class. Let - // Activate()/Deactivate() handle context switches. -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index ea7759e0c3c4..074987b48d3c 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -198,42 +198,11 @@ sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt) return pView->Command(rCEvt,pWindow); } -void FuPoor::DoCut() -{ - if (pView) - { -//! pView->DoCut(pWindow); - } -} - -/************************************************************************* -|* -|* Copy object to clipboard -|* -\************************************************************************/ - -void FuPoor::DoCopy() -{ - if (pView) - { -//! pView->DoCopy(pWindow); - } -} - -void FuPoor::DoPaste() -{ - if (pView) - { -//! pView->DoPaste(pWindow); - } -} - /************************************************************************* |* |* Timer-Handler fuer Drag&Drop |* \************************************************************************/ - IMPL_LINK_NOARG(FuPoor, DragTimerHdl) { // ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer @@ -255,8 +224,6 @@ IMPL_LINK_NOARG(FuPoor, DragHdl) { pWindow->ReleaseMouse(); bIsInDragMode = true; - -// pView->BeginDrag(pWindow, aMDPos); pViewShell->GetScDrawView()->BeginDrag(pWindow, aMDPos); } return 0; diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index 5fc452e15b63..779129964a95 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -64,10 +64,4 @@ ScOleObjectShell::~ScOleObjectShell() { } -void ScOleObjectShell::HandleSelectionChange (void) -{ - // Do not call the implementation in the base class. Let - // Activate()/Deactivate() handle context switches. -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx index 4900d78309a0..4dde7d0b353f 100644 --- a/sc/source/ui/inc/chartsh.hxx +++ b/sc/source/ui/inc/chartsh.hxx @@ -45,7 +45,6 @@ public: void ExecuteExportAsGraphic(SfxRequest& rReq); void GetExportAsGraphicState(SfxItemSet &rSet); - void HandleSelectionChange(void); }; #endif diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 692090ed6aab..9ad121f14dca 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -75,10 +75,6 @@ public: void Paint(const Rectangle&, vcl::Window*) {} - void DoCut(); - void DoCopy(); - void DoPaste(); - // 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/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index b1878265ba4e..e7f9c418f972 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -286,8 +286,6 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou void GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ); protected: - using Window::Resize; - void Resize( const Size& rSize ); virtual void PrePaint() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; @@ -383,7 +381,6 @@ public: void DoInvertRect( const Rectangle& rPixel ); void CheckNeedsRepaint(); - void SwitchView(); void UpdateDPFromFieldPopupMenu(); bool UpdateVisibleRange(); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index d3b374d84e63..c6192a4ec3e7 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -314,8 +314,6 @@ public: void CursorPosChanged(); - SfxChildAlignment - CheckAlignment(SfxChildAlignment,SfxChildAlignment); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx index b451e730f3cf..2262cd9ffd11 100644 --- a/sc/source/ui/inc/oleobjsh.hxx +++ b/sc/source/ui/inc/oleobjsh.hxx @@ -43,7 +43,6 @@ public: ScOleObjectShell(ScViewData* pData); virtual ~ScOleObjectShell(); - void HandleSelectionChange(); }; #endif diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index ca46dcad358a..bcf4fbc66d15 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -158,8 +158,6 @@ public: FmFormView* GetDrawView() { return pDrawView; } - void SwitchView(); - SC_DLLPUBLIC void SetSelectedTabs(const ScMarkData& rMark); const ScMarkData::MarkedTabsType& GetSelectedTabs() const { return maSelectedTabs; } }; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 85b7d0e590c4..5acbf26abbee 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -1326,38 +1326,4 @@ void ScNavigatorDlg::EndOfDataArea() } } -SfxChildAlignment ScNavigatorDlg::CheckAlignment( - SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) -{ - SfxChildAlignment eRetAlign; - - //! no docking, if Listbox not exists ??? - - switch (eAlign) - { - case SFX_ALIGN_TOP: - case SFX_ALIGN_HIGHESTTOP: - case SFX_ALIGN_LOWESTTOP: - case SFX_ALIGN_BOTTOM: - case SFX_ALIGN_LOWESTBOTTOM: - case SFX_ALIGN_HIGHESTBOTTOM: - eRetAlign = eActAlign; // illegal - break; - - case SFX_ALIGN_LEFT: - case SFX_ALIGN_RIGHT: - case SFX_ALIGN_FIRSTLEFT: - case SFX_ALIGN_LASTLEFT: - case SFX_ALIGN_FIRSTRIGHT: - case SFX_ALIGN_LASTRIGHT: - eRetAlign = eAlign; // legal - break; - - default: - eRetAlign = eAlign; - break; - } - return eRetAlign; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 5f1c7ee694a4..546083aed0fb 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -5128,16 +5128,7 @@ void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula ) SetArrayFormula_Impl( aFormula, OUString(), formula::FormulaGrammar::GRAM_PODF_A1); } -void ScCellRangeObj::SetArrayFormulaWithGrammar(const OUString& rFormula, - const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar) - throw (uno::RuntimeException, std::exception) -{ - SolarMutexGuard aGuard; - SetArrayFormula_Impl( rFormula, rFormulaNmsp, eGrammar); -} - // XArrayFormulaTokens - uno::Sequence SAL_CALL ScCellRangeObj::getArrayTokens() throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 31d2b20a20df..46f9ecb94aa6 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -141,11 +141,6 @@ ScVbaApplication::~ScVbaApplication() return ScVbaStaticAppSettings::get().mbEnableEvents; } -SfxObjectShell* ScVbaApplication::GetDocShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) -{ - return static_cast< SfxObjectShell* >( excel::getDocShell( xModel ) ); -} - OUString SAL_CALL ScVbaApplication::getExactName( const OUString& aApproximateName ) throw (uno::RuntimeException, std::exception) { @@ -1280,40 +1275,6 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep return aRet; } -uno::Any SAL_CALL ScVbaApplication::GetOpenFilename( - const uno::Any& rFileFilter, const uno::Any& rFilterIndex, const uno::Any& rTitle, - const uno::Any& rButtonText, const uno::Any& rMultiSelect ) throw (uno::RuntimeException) -{ - uno::Sequence< uno::Any > aArgs( 6 ); - aArgs[ 0 ] <<= getThisExcelDoc( mxContext ); - aArgs[ 1 ] = rFileFilter; - aArgs[ 2 ] = rFilterIndex; - aArgs[ 3 ] = rTitle; - aArgs[ 4 ] = rButtonText; - aArgs[ 5 ] = rMultiSelect; - uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); - uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - OUString( "ooo.vba.OpenFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); - return xFilePicker->execute(); -} - -uno::Any SAL_CALL ScVbaApplication::GetSaveAsFilename( - const uno::Any& rInitialFileName, const uno::Any& rFileFilter, const uno::Any& rFilterIndex, - const uno::Any& rTitle, const uno::Any& rButtonText ) throw (uno::RuntimeException) -{ - uno::Sequence< uno::Any > aArgs( 6 ); - aArgs[ 0 ] <<= getThisExcelDoc( mxContext ); - aArgs[ 1 ] = rInitialFileName; - aArgs[ 2 ] = rFileFilter; - aArgs[ 3 ] = rFilterIndex; - aArgs[ 4 ] = rTitle; - aArgs[ 5 ] = rButtonText; - uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); - uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - OUString( "ooo.vba.SaveAsFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); - return xFilePicker->execute(); -} - uno::Reference< frame::XModel > ScVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException) { diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 7910209bf709..76aa0297bf4d 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -49,8 +49,6 @@ public: /** Returns true, if VBA document events are enabled. */ static bool getDocumentEventsEnabled(); - SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); - // XExactName virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -130,8 +128,6 @@ public: virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - css::uno::Any SAL_CALL GetOpenFilename( const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText, const css::uno::Any& rMultiSelect ) throw (css::uno::RuntimeException); - css::uno::Any SAL_CALL GetSaveAsFilename( const css::uno::Any& rInitialFileName, const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText ) throw (css::uno::RuntimeException); virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx index f6633af889b2..93460c20c95e 100644 --- a/sc/source/ui/vba/vbadialogs.cxx +++ b/sc/source/ui/vba/vbadialogs.cxx @@ -23,11 +23,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -void -ScVbaDialogs::Dummy() throw (uno::RuntimeException) -{ -} - uno::Any ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index 79fd5e001f62..06ae7c468c61 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -37,8 +37,6 @@ public: // XCollection virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDialogs - void SAL_CALL Dummy() throw (css::uno::RuntimeException); // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence getServiceNames() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx index 4949384b17fc..6230344de292 100644 --- a/sc/source/ui/vba/vbaname.cxx +++ b/sc/source/ui/vba/vbaname.cxx @@ -55,13 +55,6 @@ ScVbaName::~ScVbaName() { } -css::uno::Reference< ov::excel::XWorksheet > -ScVbaName::getWorkSheet() throw (css::uno::RuntimeException) -{ - uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); - return xApplication->getActiveSheet(); -} - OUString ScVbaName::getName() throw (css::uno::RuntimeException, std::exception) { @@ -214,11 +207,6 @@ ScVbaName::getRefersToRange() throw (css::uno::RuntimeException, std::exception) return xRange; } -void -ScVbaName::setRefersToRange( const css::uno::Reference< ov::excel::XRange > /*rRange*/ ) throw (css::uno::RuntimeException) -{ -} - void ScVbaName::Delete() throw (css::uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index 11189a26a96d..69e29198f4fe 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -38,7 +38,6 @@ class ScVbaName : public NameImpl_BASE void setContent( const OUString& sContent, const formula::FormulaGrammar::Grammar eGrammar, bool removeEquals = true ); protected: css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } - css::uno::Reference< ov::excel::XWorksheet > getWorkSheet() throw (css::uno::RuntimeException); public: ScVbaName( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRange >& xName , const css::uno::Reference< css::sheet::XNamedRanges >& xNames , const css::uno::Reference< css::frame::XModel >& xModel ); @@ -62,7 +61,6 @@ public: virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setRefersToRange( const css::uno::Reference< ov::excel::XRange > xRange ) throw (css::uno::RuntimeException); // Methods virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 436bc154eeab..eaaa620d6836 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -524,11 +524,6 @@ ScGridWindow::~ScGridWindow() delete pNoteMarker; } -void ScGridWindow::Resize( const Size& ) -{ - // gar nix -} - void ScGridWindow::ClickExtern() { do diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 4d82db17d69f..531127b42c22 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -467,18 +467,6 @@ com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > pAccessibleDocument->Init(); return xAcc; - } - -// MT: Removed Windows::SwitchView() introduced with IA2 CWS. -// There are other notifications for this when the active view has chnaged, so -// please update the code to use that event mechanism -void ScGridWindow::SwitchView() -{ - ScAccessibleDocumentBase* pAccDoc = static_cast(GetAccessible(false).get()); - if (pAccDoc) - { - pAccDoc->SwitchViewFireFocus(); - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 455534c230ae..14e16b366e41 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -1527,17 +1527,6 @@ com::sun::star::uno::Reference ScPre return xAcc; } -// MT: Removed Windows::SwitchView() introduced with IA2 CWS. -// There are other notifications for this when the active view has chnaged, so please update the code to use that event mechanism -void ScPreview::SwitchView() -{ - ScAccessibleDocumentBase* pAccDoc = static_cast(GetAccessible(false).get()); - if (pAccDoc) - { - pAccDoc->SwitchViewFireFocus(); - } -} - void ScPreview::DragMove( long nDragMovePos, sal_uInt16 nFlags ) { Fraction aPreviewZoom( nZoom, 100 ); -- cgit