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 /svx/source | |
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 'svx/source')
-rw-r--r-- | svx/source/accessibility/AccessibleFrameSelector.cxx | 130 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleTextHelper.cxx | 60 | ||||
-rw-r--r-- | svx/source/accessibility/GraphCtlAccessibleContext.cxx | 47 | ||||
-rw-r--r-- | svx/source/accessibility/charmapacc.cxx | 28 | ||||
-rw-r--r-- | svx/source/accessibility/svxrectctaccessiblecontext.cxx | 77 | ||||
-rw-r--r-- | svx/source/engine3d/e3dundo.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/fmvwimp.cxx | 16 | ||||
-rw-r--r-- | svx/source/inc/AccessibleFrameSelector.hxx | 8 | ||||
-rw-r--r-- | svx/source/inc/GraphCtlAccessibleContext.hxx | 3 | ||||
-rw-r--r-- | svx/source/inc/charmapacc.hxx | 3 | ||||
-rw-r--r-- | svx/source/inc/fmvwimp.hxx | 3 | ||||
-rw-r--r-- | svx/source/inc/svxrectctaccessiblecontext.hxx | 34 | ||||
-rw-r--r-- | svx/source/items/chrtitem.cxx | 28 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewcontactoftextobj.cxx | 5 | ||||
-rw-r--r-- | svx/source/svdraw/svdpage.cxx | 28 |
15 files changed, 0 insertions, 476 deletions
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 5695268aa13d..5378d7de937b 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -39,10 +39,6 @@ #include <svx/dialogs.hrc> #include "frmsel.hrc" -#ifndef MNEMONIC_CHAR -#define MNEMONIC_CHAR ((sal_Unicode)'~') -#endif - namespace svx { namespace a11y { @@ -123,8 +119,6 @@ sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException, return (meBorder == FRAMEBORDER_NONE) ? mpFrameSel->GetEnabledBorderCount() : 0; } - - Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, std::exception) { @@ -138,8 +132,6 @@ Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i ) return xRet; } - - Reference< XAccessible > AccFrameSelector::getAccessibleParent( ) throw (RuntimeException, std::exception) { @@ -153,8 +145,6 @@ Reference< XAccessible > AccFrameSelector::getAccessibleParent( ) return xRet; } - - sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { @@ -178,15 +168,11 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) return nIdx; } - - sal_Int16 AccFrameSelector::getAccessibleRole( ) throw (RuntimeException, std::exception) { return meBorder == FRAMEBORDER_NONE ? AccessibleRole::OPTION_PANE : AccessibleRole::CHECK_BOX; } - - OUString AccFrameSelector::getAccessibleDescription( ) throw (RuntimeException, std::exception) { @@ -195,8 +181,6 @@ OUString AccFrameSelector::getAccessibleDescription( ) return maDescriptions.GetString(meBorder); } - - OUString AccFrameSelector::getAccessibleName( ) throw (RuntimeException, std::exception) { @@ -205,8 +189,6 @@ OUString AccFrameSelector::getAccessibleName( ) return maNames.GetString(meBorder); } - - Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { @@ -239,8 +221,6 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( return xRet; } - - Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { @@ -285,33 +265,12 @@ Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet( ) return xRet; } - - Locale AccFrameSelector::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { return Application::GetSettings().GetUILanguageTag().getLocale(); } - - -void AccFrameSelector::addPropertyChangeListener( - const Reference< XPropertyChangeListener >& xListener ) - throw (RuntimeException) -{ - maPropertyListeners.addInterface( xListener ); -} - - - -void AccFrameSelector::removePropertyChangeListener( const Reference< XPropertyChangeListener >& xListener ) - throw (RuntimeException) -{ - maPropertyListeners.removeInterface( xListener ); -} - - - sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt ) throw (RuntimeException, std::exception) { @@ -321,8 +280,6 @@ sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt ) return mpFrameSel->ContainsClickPoint( Point( aPt.X, aPt.Y ) ); } - - Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint( const AwtPoint& aPt ) throw (RuntimeException, std::exception) @@ -419,49 +376,6 @@ AwtSize AccFrameSelector::getSize( ) throw (RuntimeException, std::exception) return aRet; } - - -bool AccFrameSelector::isShowing( ) throw (RuntimeException) -{ - SolarMutexGuard aGuard; - IsValid(); - return true; -} - - - -bool AccFrameSelector::isVisible( ) throw (RuntimeException) -{ - SolarMutexGuard aGuard; - IsValid(); - return true; -} - - - -bool AccFrameSelector::isFocusTraversable( ) throw (RuntimeException) -{ - SolarMutexGuard aGuard; - IsValid(); - return true; -} - - - -void AccFrameSelector::addFocusListener( const Reference< XFocusListener >& xListener ) throw (RuntimeException) -{ - maFocusListeners.addInterface( xListener ); -} - - - -void AccFrameSelector::removeFocusListener( const Reference< XFocusListener >& xListener ) throw (RuntimeException) -{ - maFocusListeners.removeInterface( xListener ); -} - - - void AccFrameSelector::grabFocus( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -469,44 +383,6 @@ void AccFrameSelector::grabFocus( ) throw (RuntimeException, std::exception) mpFrameSel->GrabFocus(); } - - -Any AccFrameSelector::getAccessibleKeyBinding( ) throw (RuntimeException) -{ - Any aRet; - SolarMutexGuard aGuard; - IsValid(); - Reference< XAccessibleRelationSet > xRet = new utl::AccessibleRelationSetHelper; - if(meBorder == FRAMEBORDER_NONE) - { - vcl::Window* pPrev = mpFrameSel->GetWindow( WINDOW_PREV ); - if(pPrev && WINDOW_FIXEDTEXT == pPrev->GetType()) - { - OUString sText = pPrev->GetText(); - sal_Int32 nFound = sText.indexOf(MNEMONIC_CHAR); - if(-1 != nFound && ++nFound < sText.getLength()) - { - sText = sText.toAsciiUpperCase(); - sal_Unicode cChar = sText[nFound]; - AwtKeyEvent aEvent; - - aEvent.KeyCode = 0; - aEvent.KeyChar = cChar; - aEvent.KeyFunc = 0; - if(cChar >= 'A' && cChar <= 'Z') - { - aEvent.KeyCode = AwtKey::A + cChar - 'A'; - } - aEvent.Modifiers = AwtKeyModifier::MOD2; - aRet <<= aEvent; - } - } - } - return aRet; -} - - - sal_Int32 AccFrameSelector::getForeground( ) throw (RuntimeException, std::exception) { @@ -515,8 +391,6 @@ sal_Int32 AccFrameSelector::getForeground( ) return mpFrameSel->GetControlForeground().GetColor(); } - - sal_Int32 AccFrameSelector::getBackground( ) throw (RuntimeException, std::exception) { @@ -525,8 +399,6 @@ sal_Int32 AccFrameSelector::getBackground( ) return mpFrameSel->GetControlBackground().GetColor(); } - - void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -541,8 +413,6 @@ void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleE } } - - void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index f14db530ff07..9b4f55696549 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -1715,21 +1715,6 @@ namespace accessibility #endif } - uno::Reference< XAccessible > AccessibleTextHelper::GetEventSource() const - { -#ifdef DBG_UTIL - mpImpl->CheckInvariants(); - - uno::Reference< XAccessible > xRet( mpImpl->GetEventSource() ); - - mpImpl->CheckInvariants(); - - return xRet; -#else - return mpImpl->GetEventSource(); -#endif - } - void AccessibleTextHelper::SetFocus( bool bHaveFocus ) { #ifdef DBG_UTIL @@ -1761,19 +1746,6 @@ namespace accessibility #endif } - void AccessibleTextHelper::FireEvent( const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue ) const - { -#ifdef DBG_UTIL - mpImpl->CheckInvariants(); -#endif - - mpImpl->FireEvent( nEventId, rNewValue, rOldValue ); - -#ifdef DBG_UTIL - mpImpl->CheckInvariants(); -#endif - } - void AccessibleTextHelper::FireEvent( const AccessibleEventObject& rEvent ) const { #ifdef DBG_UTIL @@ -1803,21 +1775,6 @@ namespace accessibility #endif } - Point AccessibleTextHelper::GetOffset() const - { -#ifdef DBG_UTIL - mpImpl->CheckInvariants(); - - Point aPoint( mpImpl->GetOffset() ); - - mpImpl->CheckInvariants(); - - return aPoint; -#else - return mpImpl->GetOffset(); -#endif - } - void AccessibleTextHelper::SetStartIndex( sal_Int32 nOffset ) { #ifdef DBG_UTIL @@ -1891,23 +1848,6 @@ namespace accessibility #endif } - bool AccessibleTextHelper::IsSelected() const - { - SolarMutexGuard aGuard; - -#ifdef DBG_UTIL - mpImpl->CheckInvariants(); - - bool aRet = mpImpl->IsSelected(); - - mpImpl->CheckInvariants(); - - return aRet; -#else - return mpImpl->IsSelected(); -#endif - } - // XAccessibleContext sal_Int32 AccessibleTextHelper::GetChildCount() { diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 5ee2f88d14c3..12d983ad93b9 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -474,38 +474,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( cons } } - - -void SAL_CALL SvxGraphCtrlAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& xListener ) - throw( RuntimeException ) -{ - ::SolarMutexGuard aGuard; - - if( xListener.is() ) - { - Reference< ::com::sun::star::awt::XWindow > xWindow( VCLUnoHelper::GetInterface( mpControl ) ); - if( xWindow.is() ) - xWindow->addFocusListener( xListener ); - } -} - - - -void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Reference< awt::XFocusListener >& xListener ) - throw (RuntimeException) -{ - ::SolarMutexGuard aGuard; - - if( xListener.is() ) - { - Reference< ::com::sun::star::awt::XWindow > xWindow = VCLUnoHelper::GetInterface( mpControl ); - if( xWindow.is() ) - xWindow->removeFocusListener( xListener ); - } -} - - - void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -516,18 +484,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException mpControl->GrabFocus(); } - - -Any SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleKeyBinding() throw( RuntimeException ) -{ - // here is no implementation, because here are no KeyBindings for every object - return Any(); -} - - - - - sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -536,9 +492,6 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) return static_cast<sal_Int32>(nColor); } - - - sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index ed94dac21a7c..b52d8d8051f4 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -108,12 +108,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtual return xRet; } -uno::Any SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleKeyBinding() - throw (uno::RuntimeException) -{ - return uno::Any(); -} - void SAL_CALL SvxShowCharSetVirtualAcc::grabFocus() throw (uno::RuntimeException, std::exception) { @@ -122,8 +116,6 @@ void SAL_CALL SvxShowCharSetVirtualAcc::grabFocus() mpParent->GrabFocus(); } - - Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -481,9 +473,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge return xRet; } - - - void SAL_CALL SvxShowCharSetAcc::grabFocus() throw (uno::RuntimeException, std::exception) { @@ -492,14 +481,6 @@ void SAL_CALL SvxShowCharSetAcc::grabFocus() m_pParent->getCharSetControl()->GrabFocus(); } - - -uno::Any SAL_CALL SvxShowCharSetAcc::getAccessibleKeyBinding() - throw (uno::RuntimeException) -{ - return uno::Any(); -} - sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowCount( ) throw (RuntimeException, std::exception) { return ((getAccessibleChildCount()-1) / COLUMN_COUNT) + 1; @@ -781,21 +762,12 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe return pStateSet; } - void SAL_CALL SvxShowCharSetItemAcc::grabFocus() throw (uno::RuntimeException, std::exception) { // nothing to do } - - -uno::Any SAL_CALL SvxShowCharSetItemAcc::getAccessibleKeyBinding() - throw (uno::RuntimeException) -{ - return uno::Any(); -} - awt::Rectangle SvxShowCharSetItemAcc::implGetBounds( ) throw (RuntimeException) { awt::Rectangle aRet; diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 79507b68230c..bd6a3393894e 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -248,11 +248,6 @@ bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeException ) return mpRepr->IsVisible(); } -bool SAL_CALL SvxRectCtlAccessibleContext::isFocusTraversable() throw( RuntimeException ) -{ - return true; -} - // XAccessibleContext sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) { @@ -450,36 +445,6 @@ void SAL_CALL SvxRectCtlAccessibleContext::removeAccessibleEventListener( const } } -void SAL_CALL SvxRectCtlAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& xListener ) - throw( RuntimeException ) -{ - if( xListener.is() ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - ThrowExceptionIfNotAlive(); - - Reference< awt::XWindow > xWindow = VCLUnoHelper::GetInterface( mpRepr ); - if( xWindow.is() ) - xWindow->addFocusListener( xListener ); - } -} - -void SAL_CALL SvxRectCtlAccessibleContext::removeFocusListener( const Reference< awt::XFocusListener >& xListener ) - throw (RuntimeException) -{ - if( xListener.is() ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - ThrowExceptionIfNotAlive(); - - Reference< awt::XWindow > xWindow = VCLUnoHelper::GetInterface( mpRepr ); - if( xWindow.is() ) - xWindow->removeFocusListener( xListener ); - } -} - void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aSolarGuard; @@ -490,12 +455,6 @@ void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException, mpRepr->GrabFocus(); } -Any SAL_CALL SvxRectCtlAccessibleContext::getAccessibleKeyBinding() throw( RuntimeException ) -{ - // here is no implementation, because here are no KeyBindings for every object - return Any(); -} - sal_Int32 SvxRectCtlAccessibleContext::getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -835,46 +794,10 @@ awt::Size SAL_CALL SvxRectCtlChildAccessibleContext::getSize() throw( RuntimeExc return AWTSize( GetBoundingBox().GetSize() ); } -bool SAL_CALL SvxRectCtlChildAccessibleContext::isShowing() throw( RuntimeException ) -{ - return true; -} - -bool SAL_CALL SvxRectCtlChildAccessibleContext::isVisible() throw( RuntimeException ) -{ - ::osl::MutexGuard aGuard( maMutex ); - - ThrowExceptionIfNotAlive(); - - return mxParent.is()? ( static_cast< SvxRectCtlAccessibleContext* >( mxParent.get() ) )->isVisible() : sal_False; -} - -bool SAL_CALL SvxRectCtlChildAccessibleContext::isFocusTraversable() throw( RuntimeException ) -{ - return false; -} - -void SAL_CALL SvxRectCtlChildAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& /*xListener*/ ) - throw( RuntimeException ) -{ - OSL_FAIL( "SvxRectCtlChildAccessibleContext::addFocusListener: not implemented" ); -} - -void SAL_CALL SvxRectCtlChildAccessibleContext::removeFocusListener( const Reference< awt::XFocusListener >& /*xListener*/ ) - throw (RuntimeException) -{ - OSL_FAIL( "SvxRectCtlChildAccessibleContext::removeFocusListener: not implemented" ); -} - void SAL_CALL SvxRectCtlChildAccessibleContext::grabFocus() throw( RuntimeException, std::exception ) { } -Any SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleKeyBinding() throw( RuntimeException ) -{ - // here is no implementation, because here are no KeyBindings for every object - return Any(); -} sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx index fbd03121bd58..9d6dcfcff40d 100644 --- a/svx/source/engine3d/e3dundo.cxx +++ b/svx/source/engine3d/e3dundo.cxx @@ -100,10 +100,4 @@ bool E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const return false; } -// Multiple Undo is not possible - -void E3dAttributesUndoAction::Repeat() -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 79afdfe1c79b..e6f7557acd89 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -197,7 +197,6 @@ FormViewPageWindowAdapter::~FormViewPageWindowAdapter() { } - void FormViewPageWindowAdapter::dispose() { for ( ::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin(); @@ -230,34 +229,22 @@ void FormViewPageWindowAdapter::dispose() m_aControllerList.clear(); } - - sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements(void) throw( RuntimeException, std::exception ) { return getCount() != 0; } - Type SAL_CALL FormViewPageWindowAdapter::getElementType(void) throw( RuntimeException, std::exception ) { return cppu::UnoType<XFormController>::get(); } -// XEnumerationAccess - -Reference< XEnumeration > SAL_CALL FormViewPageWindowAdapter::createEnumeration(void) throw( RuntimeException ) -{ - return new ::comphelper::OEnumerationByIndex(this); -} - // XIndexAccess - sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount(void) throw( RuntimeException, std::exception ) { return m_aControllerList.size(); } - Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if (nIndex < 0 || @@ -269,7 +256,6 @@ Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( Inde return aElement; } - void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -284,7 +270,6 @@ void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl } } - Reference< XFormController > getControllerSearchChildren( const Reference< XIndexAccess > & xIndex, const Reference< XTabControllerModel > & xModel) { if (xIndex.is() && xIndex->getCount()) @@ -308,7 +293,6 @@ Reference< XFormController > getControllerSearchChildren( const Reference< XInd } // Search the according controller - Reference< XFormController > FormViewPageWindowAdapter::getController( const Reference< XForm > & xForm ) const { Reference< XTabControllerModel > xModel(xForm, UNO_QUERY); diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index fc998adf7a0c..62cf8cf486fc 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -75,8 +75,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); //XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -85,13 +83,7 @@ public: virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException); - bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException); - bool SAL_CALL isFocusTraversable( ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index ca861db77a21..1c0955c26f85 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -108,10 +108,7 @@ public: virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index a85d343b3d32..cc964f8b6155 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -58,7 +58,6 @@ namespace svx // XAccessibleComponent virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //OAccessibleContextHelper // XAccessibleContext - still waiting to be overwritten @@ -138,7 +137,6 @@ namespace svx // XAccessibleComponent virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //OAccessibleContextHelper @@ -236,7 +234,6 @@ namespace svx // XAccessibleComponent virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //OAccessibleContextHelper diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 2f68067994da..bc725c197426 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -107,9 +107,6 @@ public: virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XEnumerationAccess - ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException); - // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 _Index) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 04dec2226891..e4091b9005fb 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -110,24 +110,9 @@ public: bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException ); - bool SAL_CALL - isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException ); - - void SAL_CALL - addFocusListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException ); - - void SAL_CALL - removeFocusListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL - getAccessibleKeyBinding() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL @@ -354,28 +339,9 @@ public: virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - bool SAL_CALL - isShowing() throw( ::com::sun::star::uno::RuntimeException ); - - bool SAL_CALL - isVisible() throw( ::com::sun::star::uno::RuntimeException ); - - bool SAL_CALL - isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException ); - - void SAL_CALL - addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException ); - - void SAL_CALL - removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL - getAccessibleKeyBinding() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 69927c65a1ed..7b1fb27dfb89 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -254,46 +254,18 @@ SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const return new SvxDoubleItem(_fVal, Which()); } - - SvStream& SvxDoubleItem::Store(SvStream& rOut, sal_uInt16 /*nItemVersion*/) const { rOut.WriteDouble( fVal ); return rOut; } - - -double SvxDoubleItem::GetMin() const -{ - return DBL_MIN; -} - - - -double SvxDoubleItem::GetMax() const -{ - return DBL_MAX; -} - - - -SfxFieldUnit SvxDoubleItem::GetUnit() const -{ - return SFX_FUNIT_NONE; -} - - - - - bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= fVal; return true; } - bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { return rVal >>= fVal; diff --git a/svx/source/sdr/contact/viewcontactoftextobj.cxx b/svx/source/sdr/contact/viewcontactoftextobj.cxx index 7b6913b3198f..89c503987ee0 100644 --- a/svx/source/sdr/contact/viewcontactoftextobj.cxx +++ b/svx/source/sdr/contact/viewcontactoftextobj.cxx @@ -22,11 +22,6 @@ namespace sdr { namespace contact { -const SdrTextObj& ViewContactOfTextObj::GetTextObj() const -{ - return static_cast<const SdrTextObj&>(GetSdrObject()); -} - ViewContactOfTextObj::ViewContactOfTextObj(SdrTextObj& rTextObj) : ViewContactOfSdrObj(rTextObj) { diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 12301dcea3d9..fedc9de7b736 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -568,34 +568,6 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum) return pObj; } -SdrObject* SdrObjList::NbcSetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) -{ - if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size()) - { - OSL_ASSERT(nOldObjNum<maList.size()); - OSL_ASSERT(nNewObjNum<maList.size()); - return NULL; - } - - SdrObject* pObj=maList[nOldObjNum]; - if (nOldObjNum==nNewObjNum) return pObj; - DBG_ASSERT(pObj!=NULL,"SdrObjList::NbcSetObjectOrdNum: Object not found."); - if (pObj!=NULL) { - DBG_ASSERT(pObj->IsInserted(),"SdrObjList::NbcSetObjectOrdNum: ZObjekt does not have status Inserted."); - RemoveObjectFromContainer(nOldObjNum); - - InsertObjectIntoContainer(*pObj,nNewObjNum); - - // No need to delete visualisation data since same object - // gets inserted again. Also a single ActionChanged is enough - pObj->ActionChanged(); - - pObj->SetOrdNum(nNewObjNum); - bObjOrdNumsDirty=true; - } - return pObj; -} - SdrObject* SdrObjList::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) { if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size()) |