diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-01-29 09:07:25 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-29 23:42:26 +0000 |
commit | 309574394bd4ae3e9e10e5ff0d64bdd7bbbc8b83 (patch) | |
tree | f8b8cea0a81bc74ca34e8bda2d0dfce939b28ce0 /sd | |
parent | 20deac4903fc0697477e855feeff482b3da234f9 (diff) |
callcatcher: large newly detected unused methods post de-virtualization
i.e lots now able to be detected after...
commit b44cbb26efe1d0b0950b1e1613e131b506dc3876
Author: Noel Grandin <noel@peralex.com>
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
Diffstat (limited to 'sd')
32 files changed, 0 insertions, 337 deletions
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 08245158bd7d..33255377e06e 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -130,7 +130,6 @@ protected: void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix ); virtual SfxStyleSheetBase* Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 nMask) SAL_OVERRIDE; - SfxStyleSheetBase* Create(const SdStyleSheet& rStyle); using SfxStyleSheetPool::Create; virtual ~SdStyleSheetPool(); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 5e41ba3bb5d0..564d7d323de5 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -138,11 +138,6 @@ SfxStyleSheetBase* SdStyleSheetPool::Create(const OUString& rName, SfxStyleFamil return new SdStyleSheet(rName, *this, eFamily, _nMask); } -SfxStyleSheetBase* SdStyleSheetPool::Create(const SdStyleSheet& rStyle) -{ - return new SdStyleSheet( rStyle ); -} - SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const OUString& rLayoutName) { OUString aName(rLayoutName); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 6f3fcbb43e2b..1709b193567c 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -1167,43 +1167,6 @@ SfxDocumentInfoDialog* DrawDocShell::CreateDocumentInfoDialog( vcl::Window *pPar return pDlg; } -void DrawDocShell::setDocAccTitle( const OUString& rTitle ) -{ - if (mpDoc ) - { - mpDoc->setDocAccTitle( rTitle ); - } -} - -const OUString DrawDocShell::getDocAccTitle() const -{ - OUString sRet; - if (mpDoc) - { - sRet = mpDoc->getDocAccTitle(); - } - - return sRet; -} - -void DrawDocShell::setDocReadOnly( bool bReadOnly) -{ - if (mpDoc ) - { - mpDoc->setDocReadOnly( bReadOnly ); - } -} - -bool DrawDocShell::getDocReadOnly() const -{ - if (mpDoc) - { - return mpDoc->getDocReadOnly(); - } - - return false; -} - void DrawDocShell::setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage) { // Set the edit mode to either the normal edit mode or the diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 7f7cfee5aa4f..f72acbc845e6 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -226,11 +226,6 @@ protected: bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor void Construct(bool bClipboard); virtual void InPlaceActivate( bool bActive ) SAL_OVERRIDE; -public: - void setDocAccTitle( const OUString& rTitle ); - const OUString getDocAccTitle() const; - void setDocReadOnly( bool bReadOnly); - bool getDocReadOnly() const; private: void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage); }; diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 56dbc5f4b76f..1eb4498b423b 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -140,9 +140,6 @@ public: void ShowMousePosInfo(const Rectangle& rRect, ::sd::Window* pWin); - void AddWindow(::sd::Window* pWin); - void RemoveWindow(::sd::Window* pWin); - virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive); virtual void SetZoom( long nZoom ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 9d67d5c9c39c..516d2dac3378 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -93,10 +93,6 @@ public: void SetActualPage( SdPage* pActual ); void Paint (const Rectangle& rRect, ::sd::Window* pWin); - void AdjustPosSizePixel( - const Point &rPos, - const Size &rSize, - ::sd::Window* pWindow); // Callbacks fuer LINKs DECL_LINK( ParagraphInsertedHdl, Outliner * ); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 951c40f93c4f..cf8835d4d036 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -77,9 +77,6 @@ public: virtual long VirtHScrollHdl(ScrollBar* pHScroll) SAL_OVERRIDE; virtual long VirtVScrollHdl(ScrollBar* pVHScroll) SAL_OVERRIDE; - void AddWindow(::sd::Window* pWin); - void RemoveWindow(::sd::Window* pWin); - virtual void Activate( bool IsMDIActivate ) SAL_OVERRIDE; virtual void Deactivate( bool IsMDIActivate ) SAL_OVERRIDE; @@ -105,8 +102,6 @@ public: virtual void SetZoom(long nZoom) SAL_OVERRIDE; virtual void SetZoomRect(const Rectangle& rZoomRect) SAL_OVERRIDE; - OUString GetSelectionText( bool bCompleteWords = false ); - bool HasSelection( bool bText = true ) const; void Execute(SfxRequest& rReq); diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 25750a4c9cde..38691b671761 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -85,11 +85,6 @@ public: css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // lang::XEventListener - void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); - // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index ec1ab1aac49a..efeca382d336 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -72,8 +72,6 @@ public: */ static SlideSorterViewShell* GetSlideSorter (ViewShellBase& rBase); - void GetFocus (void); - void LoseFocus (void); virtual SdPage* GetActualPage (void) SAL_OVERRIDE; /// inherited from sd::ViewShell @@ -186,8 +184,6 @@ public: protected: - SvBorder GetBorder (bool bOuterResize); - /** Override this method to handle a missing tool bar correctly. This is the case when the slide sorter is not the main view shell. */ diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx index 8e2c9e527ff0..1b12cfe1c6df 100644 --- a/sd/source/ui/inc/TextObjectBar.hxx +++ b/sd/source/ui/inc/TextObjectBar.hxx @@ -53,8 +53,6 @@ public: void GetCharState( SfxItemSet& rSet ); void Execute( SfxRequest &rReq ); - void Command( const CommandEvent& rCEvt ); - private: ViewShell* mpViewShell; ::sd::View* mpView; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 589fb3594d04..b4bd3331a30e 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -188,8 +188,6 @@ public: bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); - void Draw(OutputDevice &rDev, const ::vcl::Region &rReg); - virtual void SetUIUnit(FieldUnit eUnit); void SetDefTabHRuler( sal_uInt16 nDefTab ); diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index e88fa1df1c8a..3eb247a9ba37 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -189,7 +189,6 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE; - void SwitchView(); OUString GetSurroundingText() const SAL_OVERRIDE; Selection GetSurroundingTextSelection() const SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index b0ff1af75dcd..d633cfecf978 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -182,14 +182,6 @@ void AllMasterPagesSelector::UpdatePageSet (ItemList& rItemList) rItemList.push_back((*iDescriptor)->maToken); } -void AllMasterPagesSelector::GetState (SfxItemSet& rItemSet) -{ - // MasterPagesSelector::GetState(rItemSet); - - if (rItemSet.GetItemState(SID_TP_EDIT_MASTER) == SfxItemState::DEFAULT) - rItemSet.DisableItem(SID_TP_EDIT_MASTER); -} - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index ba120ea63ec3..e3135871d5ca 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -47,8 +47,6 @@ public: */ virtual void Fill (ItemList& rItemList) SAL_OVERRIDE; - void GetState (SfxItemSet& rItemSet); - protected: virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 9b708235b58d..e5a3d39d97f7 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -129,15 +129,6 @@ sal_Int32 MasterPagesSelector::GetPreferredHeight (sal_Int32 nWidth) return PreviewValueSet::GetPreferredHeight (nWidth); } -Size MasterPagesSelector::GetPreferredSize (void) -{ - int nPreferredWidth = GetPreferredWidth( - PreviewValueSet::GetOutputSizePixel().Height()); - int nPreferredHeight = GetPreferredHeight(nPreferredWidth); - return Size (nPreferredWidth, nPreferredHeight); - -} - void MasterPagesSelector::UpdateLocks (const ItemList& rItemList) { ItemList aNewLockList; @@ -499,21 +490,6 @@ void MasterPagesSelector::SetUserData (int nIndex, UserData* pData) } } -bool MasterPagesSelector::IsResizable (void) -{ - return false; -} - -::vcl::Window* MasterPagesSelector::GetWindow (void) -{ - return this; -} - -sal_Int32 MasterPagesSelector::GetMinimumWidth (void) -{ - return mpContainer->GetPreviewSizePixel().Width() + 2*3; -} - void MasterPagesSelector::UpdateSelection (void) { } diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index adec3911ed8a..4e088d5eef25 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -79,12 +79,8 @@ public: SdPage* pMasterPage, sal_uInt16 nInsertionIndex); - Size GetPreferredSize (void); sal_Int32 GetPreferredWidth (sal_Int32 nHeight); sal_Int32 GetPreferredHeight (sal_Int32 nWidth); - bool IsResizable (void); - vcl::Window* GetWindow (void); - sal_Int32 GetMinimumWidth (void); /** Update the selection of previews according to whatever influences them apart from mouse and keyboard. If, for diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index a159d80e86ee..90c4a49a2907 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -66,17 +66,6 @@ void PanelBase::Resize (void) } } -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> PanelBase::CreateAccessibleObject ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& ) -{ - if (ProvideWrappedControl()) - return mpWrappedControl->GetAccessible(); - else - return NULL; -} - void PanelBase::SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { mxSidebar = rxSidebar; diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index 77800f8aa59f..672112fa57d7 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -57,11 +57,6 @@ public: // ISidebarReceiver virtual void SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessibleObject ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent); - protected: ::boost::scoped_ptr< vcl::Window> mpWrappedControl; virtual vcl::Window* CreateWrappedControl ( diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 861d783b9e9b..6f72964833da 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2926,53 +2926,6 @@ void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeExcep setUsePen( true ); // enable pen mode, update color } -void SAL_CALL SlideshowImpl::setUseEraser( bool /*_usepen*/ ) throw (css::uno::RuntimeException) -{ -} - -void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeException) -{ - SolarMutexGuard aSolarGuard; - setUsePen( bSwitchPenMode ); // SwitchPen Mode - -} - -void SAL_CALL SlideshowImpl::setPointerMode( bool bSwitchPointerMode ) throw (css::uno::RuntimeException) -{ - SolarMutexGuard aSolarGuard; - if (mxShow.is()) try - { - mxShow->setProperty( - beans::PropertyValue( "PointerVisible" , - -1, - makeAny( bSwitchPointerMode ), - beans::PropertyState_DIRECT_VALUE ) ); - } - catch ( Exception& ) - { - SAL_WARN( "sd.slideshow", "sd::SlideShowImpl::setPointerMode(), " - "exception caught: " << comphelper::anyToString( cppu::getCaughtException() )); - } -} - -void SAL_CALL SlideshowImpl::setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException) -{ - SolarMutexGuard aSolarGuard; - if (mxShow.is()) try - { - mxShow->setProperty( - beans::PropertyValue( "PointerPosition" , - -1, - makeAny( pos ), - beans::PropertyState_DIRECT_VALUE ) ); - } - catch ( Exception& ) - { - SAL_WARN( "sd.slideshow", "sd::SlideShowImpl::setPointerPosition(), " - "exception caught: " << comphelper::anyToString( cppu::getCaughtException() )); - } -} - void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeException) { if( bEraseAllInk ) @@ -2993,16 +2946,7 @@ void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeExc } } -void SAL_CALL SlideshowImpl::setEraseInk( sal_Int32 /*nEraseInkSize*/ ) throw (css::uno::RuntimeException) -{ -} - -void SAL_CALL SlideshowImpl::setEraserMode( bool /*bSwitchEraserMode*/ ) throw (css::uno::RuntimeException) -{ -} - // XSlideShowController Methods - sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 35a931a8c206..0f584cdfa4c8 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -176,15 +176,9 @@ public: virtual void SAL_CALL setUsePen( sal_Bool _usepen ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setUseEraser( bool _usepen ) throw (css::uno::RuntimeException); virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setEraseAllInk( bool bEraseAllInk ) throw (css::uno::RuntimeException); - void SAL_CALL setEraseInk( sal_Int32 nEraseInkSize ) throw (css::uno::RuntimeException); - void SAL_CALL setPenMode( bool bSwitchPenMode) throw (css::uno::RuntimeException); - void SAL_CALL setEraserMode( bool bSwitchEraserMode ) throw (css::uno::RuntimeException); - void SAL_CALL setPointerMode( bool bSwitchPointerMode) throw (css::uno::RuntimeException); - void SAL_CALL setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getSlideCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index a8500979b00f..ea088a0b916d 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -68,24 +68,6 @@ TransferableData::~TransferableData (void) EndListening(*mpViewShell); } -void TransferableData::DragFinished (sal_Int8 nDropAction) -{ - if (mpViewShell != NULL) - mpViewShell->DragFinished(nDropAction); - /* - for (CallbackContainer::const_iterator - iCallback(maDragFinishCallbacks.begin()), - iEnd(maDragFinishCallbacks.end()); - iCallback!=iEnd; - ++iCallback) - { - if (*iCallback) - (*iCallback)(nDropAction); - } - maDragFinishCallbacks.clear(); - */ -} - void TransferableData::Notify (SfxBroadcaster&, const SfxHint& rHint) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index 2d379006dcac..57d51f28ed2e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -69,8 +69,6 @@ public: const ::std::vector<TransferableData::Representative>& rRepresentatives); virtual ~TransferableData (void); - void DragFinished (sal_Int8 nDropAction); - const ::std::vector<Representative>& GetRepresentatives (void) const { return maRepresentatives;} /** Return the view shell for which the transferable was created. diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index b63c3ffe4b87..3a6e58428645 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -325,18 +325,6 @@ bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow) } } -void SlideSorterViewShell::GetFocus (void) -{ - OSL_ASSERT(mpSlideSorter.get()!=NULL); - mpSlideSorter->GetController().GetFocusManager().ShowFocus(); -} - -void SlideSorterViewShell::LoseFocus (void) -{ - OSL_ASSERT(mpSlideSorter.get()!=NULL); - mpSlideSorter->GetController().GetFocusManager().HideFocus(); -} - SdPage* SlideSorterViewShell::getCurrentPage(void) const { // since SlideSorterViewShell::GetActualPage() currently also @@ -521,12 +509,6 @@ void SlideSorterViewShell::Deactivate (bool /*bIsMDIActivate*/) WriteFrameViewData(); } -SvBorder SlideSorterViewShell::GetBorder (bool ) -{ - OSL_ASSERT(mpSlideSorter.get()!=NULL); - return mpSlideSorter->GetBorder(); -} - void SlideSorterViewShell::Command ( const CommandEvent& rEvent, ::sd::Window* pWindow) diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index 8cd73a9a1a92..edc40f63c5e1 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -130,11 +130,6 @@ void SdUnoOutlineView::setFastPropertyValue ( } } -void SAL_CALL SdUnoOutlineView::disposing (const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) -{ -} - Any SAL_CALL SdUnoOutlineView::getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index f7f2695a92df..329dd9836a58 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -305,13 +305,6 @@ void SdXShape::dispose() delete this; } -// XInterface -uno::Any SAL_CALL SdXShape::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException) -{ - return mpShape->queryAggregation( rType ); -} - uno::Any SAL_CALL SdXShape::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 4ac5fac514cb..aed695bab2df 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -81,7 +81,6 @@ public: virtual void objectChanged( SdrObject* pNewObj ) SAL_OVERRIDE; // XInterface - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index ee31d49c401d..a58efdc9acea 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -589,14 +589,6 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); } -/** - * Command event - */ - -void TextObjectBar::Command( const CommandEvent& ) -{ -} - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index c5da8097731d..ea5cbffefa09 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -1064,16 +1064,6 @@ void DrawViewShell::GetSnapItemState( SfxItemSet &rSet ) } } -void DrawViewShell::AddWindow (::sd::Window* pWin) -{ - mpDrawView->AddWindowToPaintView(pWin); -} - -void DrawViewShell::RemoveWindow(::sd::Window* pWin) -{ - mpDrawView->DeleteWindowFromPaintView(pWin); -} - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 425145032504..3bee96e7e24e 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -322,16 +322,6 @@ void OutlineViewShell::ExecCtrl(SfxRequest &rReq) } } -void OutlineViewShell::AddWindow (::sd::Window* pWin) -{ - pOlView->AddWindowToPaintView(pWin); -} - -void OutlineViewShell::RemoveWindow (::sd::Window* pWin) -{ - pOlView->DeleteWindowFromPaintView(pWin); -} - /** * Activate(): during the first invocation the fields get updated */ @@ -1455,52 +1445,6 @@ bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) } /** - * Return text of the selection - */ -OUString OutlineViewShell::GetSelectionText(bool bCompleteWords) -{ - OUString aStrSelection; - ::Outliner& rOl = pOlView->GetOutliner(); - OutlinerView* pOutlinerView = pOlView->GetViewByWindow( GetActiveWindow() ); - - if (bCompleteWords) - { - ESelection aSel = pOutlinerView->GetSelection(); - OUString aStrCurrentDelimiters = rOl.GetWordDelimiters(); - - rOl.SetWordDelimiters(" .,;\"'"); - aStrSelection = rOl.GetWord( aSel.nEndPara, aSel.nEndPos ); - rOl.SetWordDelimiters( aStrCurrentDelimiters ); - } - else - { - aStrSelection = pOutlinerView->GetSelected(); - } - - return (aStrSelection); -} - -/** - * Is something selected? - */ -bool OutlineViewShell::HasSelection(bool bText) const -{ - bool bReturn = false; - - if (bText) - { - OutlinerView* pOutlinerView = pOlView->GetViewByWindow( GetActiveWindow() ); - - if (pOutlinerView && !pOutlinerView->GetSelected().isEmpty()) - { - bReturn = true; - } - } - - return bReturn; -} - -/** * Status of Attribute-Items */ void OutlineViewShell::GetAttrState( SfxItemSet& rSet ) diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 48402965674f..86fb77d7c753 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -240,13 +240,6 @@ void OutlineView::InvalidateSlideNumberArea() { } -/** - * Window size was changed - */ -void OutlineView::AdjustPosSizePixel(const Point &,const Size &,::sd::Window*) -{ -} - void OutlineView::AddWindowToPaintView(OutputDevice* pWin) { bool bAdded = false; diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index f9b7983c5636..5f5061b72aeb 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -950,17 +950,6 @@ void Window::DropScroll(const Point& rMousePos) } } -// 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 Window::SwitchView() -{ - if (mpViewShell) - { - mpViewShell->SwitchViewFireFocus(GetAccessible(false)); - } -} - OUString Window::GetSurroundingText() const { if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE ) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 990173702da9..a78c68f36f46 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1369,10 +1369,6 @@ void ViewShell::Paint (const Rectangle&, ::sd::Window* ) { } -void ViewShell::Draw(OutputDevice &, const vcl::Region &) -{ -} - void ViewShell::ShowUIControls (bool bVisible) { mpImpl->mbIsShowingUIControls = bVisible; |