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 | |
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
222 files changed, 119 insertions, 3131 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx index 6259d29cf97e..e65df64d9bc4 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx @@ -169,13 +169,6 @@ protected: @return The bounding box (VCL rect.) in screen coordinates. */ virtual Rectangle implGetBoundingBoxOnScreen() SAL_OVERRIDE; - /** @attention This method requires locked mutex's and a living object. - @return The count of used rows. */ - sal_Int32 implGetRowCount() const; - /** @attention This method requires locked mutex's and a living object. - @return The count of used columns. */ - sal_Int32 implGetColumnCount() const; - // internal helper methods ------------------------------------------------ /** @return <TRUE/>, if the objects is a header bar for rows. */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx index 4c04432a7382..21f2f3e05a31 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx @@ -113,9 +113,6 @@ public: // XAccessibleComponent bool SAL_CALL contains (const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleAt (const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException); // XServiceInfo diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx index 1b7972ab7c14..b7d3c15fd3f8 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx @@ -134,7 +134,6 @@ public: // XAccessibleExtendedComponent virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::awt::FontDescriptor SAL_CALL getFontMetrics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xFont ) throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index bfb5a21b627e..3e133bb2d925 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -234,18 +234,7 @@ Rectangle AccessibleGridControlHeader::implGetBoundingBoxOnScreen() return Rectangle(aGridRect.TopLeft(), Size(aHeaderRect.getWidth(),aGridRect.getHeight())); } -sal_Int32 AccessibleGridControlHeader::implGetRowCount() const -{ - return 1; -} - -sal_Int32 AccessibleGridControlHeader::implGetColumnCount() const -{ - return 1; -} - // internal helper methods ---------------------------------------------------- - Reference< XAccessible > AccessibleGridControlHeader::implGetChild( sal_Int32 nRow, sal_uInt32 nColumnPos ) { @@ -263,10 +252,6 @@ Reference< XAccessible > AccessibleGridControlHeader::implGetChild( return xChild; } - - } // namespace accessibility - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index f5b103433db9..6b85039d537c 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -670,45 +670,13 @@ bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (Ru return bInside; } - -Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleAt( const awt::Point& rPoint ) - throw (RuntimeException) -{ - SolarMutexGuard aSolarGuard; - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - Reference< XAccessible > xChild; - if ( m_pListBoxHelper ) - { - UpdateVisibleLineCount(); - if ( contains( rPoint ) && m_nVisibleLineCount > 0 ) - { - Point aPos = VCLPoint( rPoint ); - sal_uInt16 nEndPos = m_pListBoxHelper->GetTopEntry() + (sal_uInt16)m_nVisibleLineCount; - for ( sal_uInt16 i = m_pListBoxHelper->GetTopEntry(); i < nEndPos; ++i ) - { - if ( m_pListBoxHelper->GetBoundingRectangle(i).IsInside( aPos ) ) - { - xChild = getAccessibleChild(i); - break; - } - } - } - } - - return xChild; -} - - //===== XServiceInfo ========================================================== - OUString VCLXAccessibleList::getImplementationName (void) throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleList" ); } - Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames (void) throw (RuntimeException, std::exception) { @@ -719,7 +687,6 @@ Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames (void) return aNames; } - void VCLXAccessibleList::UpdateVisibleLineCount() { if ( m_pListBoxHelper ) @@ -736,7 +703,6 @@ void VCLXAccessibleList::UpdateVisibleLineCount() } } - void VCLXAccessibleList::UpdateEntryRange_Impl() { SolarMutexGuard aSolarGuard; diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 3d2fb8d929c8..8d3b455f0c0d 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -584,17 +584,11 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( ) throw (RuntimeEx } // XAccessibleExtendedComponent - Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( ) throw (RuntimeException, std::exception) { return uno::Reference< awt::XFont >(); } -awt::FontDescriptor SAL_CALL VCLXAccessibleToolBoxItem::getFontMetrics( const Reference< awt::XFont >& xFont ) throw (RuntimeException) -{ - return xFont->getFontDescriptor(); -} - OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index e677d7dfe8c4..46e37ba2f8d2 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -427,31 +427,6 @@ SbxVariable* SbxObject::Make( const OUString& rName, SbxClassType ct, SbxDataTyp return pVar; } -SbxObject* SbxObject::MakeObject( const OUString& rName, const OUString& rClass ) -{ - // Is the object already available? - if( !ISA(SbxCollection) ) - { - SbxVariable* pRes = pObjs->Find( rName, SbxCLASS_OBJECT ); - if( pRes ) - { - return PTR_CAST(SbxObject,pRes); - } - } - SbxObject* pVar = CreateObject( rClass ); - if( pVar ) - { - pVar->SetName( rName ); - pVar->SetParent( this ); - pObjs->Put( pVar, pObjs->Count() ); - SetModified( true ); - // The object listen always - StartListening( pVar->GetBroadcaster(), true ); - Broadcast( SBX_HINT_OBJECTCHANGED ); - } - return pVar; -} - void SbxObject::Insert( SbxVariable* pVar ) { sal_uInt16 nIdx; @@ -708,60 +683,6 @@ bool SbxObject::StoreData( SvStream& rStrm ) const return true; } -OUString SbxObject::GenerateSource( const OUString &rLinePrefix, - const SbxObject* ) -{ - // Collect the properties in a String - OUString aSource; - SbxArrayRef xProps( GetProperties() ); - bool bLineFeed = false; - for ( sal_uInt16 nProp = 0; nProp < xProps->Count(); ++nProp ) - { - SbxPropertyRef xProp = static_cast<SbxProperty*>( xProps->Get(nProp) ); - OUString aPropName( xProp->GetName() ); - if ( xProp->CanWrite() && - !( xProp->GetHashCode() == nNameHash && - aPropName.equalsIgnoreAsciiCase(pNameProp))) - { - // Insert a break except in front of the first property - if ( bLineFeed ) - { - aSource += "\n"; - } - else - { - bLineFeed = true; - } - aSource += rLinePrefix; - aSource += "."; - aSource += aPropName; - aSource += " = "; - - // convert the property value to text - switch ( xProp->GetType() ) - { - case SbxEMPTY: - case SbxNULL: - // no value - break; - - case SbxSTRING: - // Strings in quotation mark - aSource += "\""; - aSource += xProp->GetOUString(); - aSource += "\""; - break; - - default: - // miscellaneous, such as e.g. numbers directly - aSource += xProp->GetOUString(); - break; - } - } - } - return aSource; -} - static bool CollectAttrs( const SbxBase* p, OUString& rRes ) { OUString aAttrs; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 63d3c7140a8a..69ebc3a696c2 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1273,15 +1273,6 @@ AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWnd return 0; } -SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32, - vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& , - const SfxItemSet* pAttrSet ) -{ - SfxModalDialog* pDlg = new SvxCharacterMap( pParent, true, pAttrSet ); - return new CuiAbstractSfxDialog_Impl( pDlg ); -} - SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog(vcl::Window* pParent, const SfxItemSet& rSet) { diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 0f12a217a8af..6737b94803b0 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -511,10 +511,7 @@ class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory public: virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE; - SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId, - vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, - const SfxItemSet* pAttrSet=0 ); + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 7fa0924a96cf..cac43b3b8b86 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -376,12 +376,6 @@ namespace accessibility return uno::Sequence< OUString > (&sServiceName, 1); } - OUString SAL_CALL AccessibleImageBullet::getServiceName (void) throw (uno::RuntimeException) - { - - return OUString("com.sun.star.accessibility.AccessibleContext"); - } - void AccessibleImageBullet::SetIndexInParent( sal_Int32 nIndex ) { diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index e6d52b9a5270..a1497992fb51 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -133,11 +133,6 @@ namespace accessibility mxThis = rInterface; } - uno::Reference< XAccessible > GetEventSource() const - { - - return mxThis; - } void SetOffset( const Point& ); Point GetOffset() const @@ -505,21 +500,6 @@ namespace accessibility { } - const SvxEditSource& AccessibleStaticTextBase::GetEditSource() const - { -#ifdef DBG_UTIL - mpImpl->CheckInvariants(); - - const SvxEditSource& aEditSource = mpImpl->GetEditSource(); - - mpImpl->CheckInvariants(); - - return aEditSource; -#else - return mpImpl->GetEditSource(); -#endif - } - void AccessibleStaticTextBase::SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ) { #ifdef DBG_UTIL @@ -549,21 +529,6 @@ namespace accessibility #endif } - uno::Reference< XAccessible > AccessibleStaticTextBase::GetEventSource() const - { -#ifdef DBG_UTIL - mpImpl->CheckInvariants(); - - uno::Reference< XAccessible > xRet( mpImpl->GetEventSource() ); - - mpImpl->CheckInvariants(); - - return xRet; -#else - return mpImpl->GetEventSource(); -#endif - } - void AccessibleStaticTextBase::SetOffset( const Point& rPoint ) { #ifdef DBG_UTIL @@ -580,37 +545,6 @@ namespace accessibility #endif } - Point AccessibleStaticTextBase::GetOffset() const - { -#ifdef DBG_UTIL - mpImpl->CheckInvariants(); - - Point aPoint( mpImpl->GetOffset() ); - - mpImpl->CheckInvariants(); - - return aPoint; -#else - return mpImpl->GetOffset(); -#endif - } - - void AccessibleStaticTextBase::UpdateChildren() - { -#ifdef DBG_UTIL - // precondition: solar mutex locked - DBG_TESTSOLARMUTEX(); - - mpImpl->CheckInvariants(); - - mpImpl->UpdateChildren(); - - mpImpl->CheckInvariants(); -#else - mpImpl->UpdateChildren(); -#endif - } - void AccessibleStaticTextBase::Dispose() { #ifdef DBG_UTIL diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 68449743ec87..69b2baca1fc4 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -272,88 +272,37 @@ void SvxSpellWrapper::SpellEnd() ShowLanguageErrors(); } - - - bool SvxSpellWrapper::SpellContinue() { return false; } - - void SvxSpellWrapper::AutoCorrect( const OUString&, const OUString& ) { } - - - void SvxSpellWrapper::ScrollArea() { // Set Scroll area } - - - void SvxSpellWrapper::ChangeWord( const OUString&, const sal_uInt16 ) { // Insert Word } - - - void SvxSpellWrapper::ChangeThesWord( const OUString& ) { // replace word due to Thesaurus. } - - -void SvxSpellWrapper::StartThesaurus( const OUString &rWord, sal_uInt16 nLanguage ) -{ - Reference< XThesaurus > xThes( SvxGetThesaurus() ); - if (!xThes.is()) - { - MessageDialog(pWin, EE_RESSTR(RID_SVXSTR_HMERR_THESAURUS), - VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute(); - return; - } - - WAIT_ON(); // while looking up for initial word - EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create(); - boost::scoped_ptr<AbstractThesaurusDialog> pDlg(pFact->CreateThesaurusDialog( pWin, xThes, rWord, nLanguage )); - WAIT_OFF(); - if ( pDlg->Execute()== RET_OK ) - { - ChangeThesWord( pDlg->GetWord() ); - } -} - - - void SvxSpellWrapper::ReplaceAll( const OUString &, sal_Int16 ) { // Replace Word from the Replace list } - - - -void SvxSpellWrapper::SetLanguage( const sal_uInt16 ) -{ // Set Language -} - - - - void SvxSpellWrapper::InsertHyphen( const sal_uInt16 ) { // inserting and deleting Hyphae } - // Testing of the document areas in the order specified by the flags - - void SvxSpellWrapper::SpellDocument( ) { if ( bOtherCntnt ) diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx index e0fb6e33d6d8..1803dd03fd09 100644 --- a/editeng/source/outliner/outlundo.cxx +++ b/editeng/source/outliner/outlundo.cxx @@ -118,12 +118,6 @@ void OutlinerUndoChangeDepth::Redo() GetOutliner()->ImplInitDepth( mnPara, mnNewDepth, false ); } -void OutlinerUndoChangeDepth::Repeat() -{ - OSL_FAIL( "Repeat not implemented!" ); -} - - OutlinerUndoCheckPara::OutlinerUndoCheckPara( Outliner* pOutliner, sal_Int32 nPara ) : OutlinerUndoBase( OLUNDO_DEPTH, pOutliner ) { @@ -144,12 +138,6 @@ void OutlinerUndoCheckPara::Redo() GetOutliner()->ImplCalcBulletText( mnPara, false, false ); } -void OutlinerUndoCheckPara::Repeat() -{ - OSL_FAIL( "Repeat not implemented!" ); -} - - OLUndoExpand::OLUndoExpand(Outliner* pOut, sal_uInt16 _nId ) : EditUndo( _nId, 0 ) { @@ -197,22 +185,14 @@ void OLUndoExpand::Restore( bool bUndo ) } } - void OLUndoExpand::Undo() { Restore( true ); } - void OLUndoExpand::Redo() { Restore( false ); } - -void OLUndoExpand::Repeat() -{ - OSL_FAIL("Not implemented"); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx index 5e60060ac988..e3b1af51cedc 100644 --- a/editeng/source/outliner/outlundo.hxx +++ b/editeng/source/outliner/outlundo.hxx @@ -77,7 +77,6 @@ public: class OutlinerUndoChangeDepth : public OutlinerUndoBase { - using SfxUndoAction::Repeat; private: sal_Int32 mnPara; sal_Int16 mnOldDepth; @@ -88,7 +87,6 @@ public: virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - void Repeat(); }; // Help-Undo: If it does not exist an OutlinerUndoAction for a certain action @@ -96,7 +94,6 @@ public: // to be recalculated. class OutlinerUndoCheckPara : public OutlinerUndoBase { - using SfxUndoAction::Repeat; private: sal_Int32 mnPara; @@ -105,24 +102,16 @@ public: virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - void Repeat(); }; - - - - - class OLUndoExpand : public EditUndo { - using SfxUndoAction::Repeat; void Restore( bool bUndo ); public: OLUndoExpand( Outliner* pOut, sal_uInt16 nId ); virtual ~OLUndoExpand(); virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - void Repeat(); sal_uInt16* pParas; // 0 == nCount contains paragraph number Outliner* pOutliner; diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index e0d082f1aae7..59baa24002ab 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -47,12 +47,6 @@ uno::Reference< text::XText > SAL_CALL SvxAccessibleTextPropertySet::getText() t return uno::Reference< text::XText > (); } -uno::Any SAL_CALL SvxAccessibleTextPropertySet::queryAggregation( const uno::Type & ) throw(uno::RuntimeException) -{ - // TODO (empty?) - return uno::Any(); -} - uno::Any SAL_CALL SvxAccessibleTextPropertySet::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 3f0afee1a12b..ce0551d63e65 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; #define IUL 6 - uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL); class StatusChangeListenerContainer @@ -41,40 +40,12 @@ public: } }; - void Interceptor::DisconnectDocHolder() { osl::MutexGuard aGuard( m_aMutex ); m_pDocHolder = NULL; } -void SAL_CALL -Interceptor::addEventListener( - const uno::Reference<lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) -{ - osl::MutexGuard aGuard( m_aMutex ); - - if ( ! m_pDisposeEventListeners ) - m_pDisposeEventListeners = - new cppu::OInterfaceContainerHelper( m_aMutex ); - - m_pDisposeEventListeners->addInterface( Listener ); -} - - -void SAL_CALL -Interceptor::removeEventListener( - const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) -{ - osl::MutexGuard aGuard( m_aMutex ); - - if ( m_pDisposeEventListeners ) - m_pDisposeEventListeners->removeInterface( Listener ); -} - - Interceptor::Interceptor( DocumentHolder* pDocHolder ) : m_pDocHolder( pDocHolder ), m_pDisposeEventListeners(0), @@ -89,7 +60,6 @@ Interceptor::Interceptor( DocumentHolder* pDocHolder ) } - Interceptor::~Interceptor() { if( m_pDisposeEventListeners ) @@ -99,8 +69,6 @@ Interceptor::~Interceptor() delete m_pStatCL; } - - //XDispatch void SAL_CALL Interceptor::dispatch( diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index b3db0f04ef27..4f301d407ce0 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -393,38 +393,6 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta return xResult; } - -uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLinkUserInit( - const uno::Sequence< sal_Int8 >& aClassID, - const OUString& aClassName, - const uno::Reference< embed::XStorage >& xStorage, - const OUString& sEntName, - const uno::Sequence< beans::PropertyValue >& lArguments, - const uno::Sequence< beans::PropertyValue >& lObjArgs ) - throw ( lang::IllegalArgumentException, - io::IOException, - uno::Exception, - uno::RuntimeException ) -{ - uno::Reference< uno::XInterface > xResult; - - OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); - uno::Reference< embed::XLinkFactory > xLinkFactory( - m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext), - uno::UNO_QUERY ); - if ( !xLinkFactory.is() ) - throw uno::RuntimeException(); // TODO: - - return xLinkFactory->createInstanceLinkUserInit( aClassID, - aClassName, - xStorage, - sEntName, - lArguments, - lObjArgs ); - -} - - OUString SAL_CALL UNOEmbeddedObjectCreator::getImplementationName() throw ( uno::RuntimeException, std::exception ) { @@ -437,7 +405,6 @@ sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const OUString& Ser return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) { diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx index f08135f113ba..65782195dc92 100644 --- a/embeddedobj/source/inc/intercept.hxx +++ b/embeddedobj/source/inc/intercept.hxx @@ -41,17 +41,6 @@ public: virtual ~Interceptor(); void DisconnectDocHolder(); - // overwritten to release the statuslistner. - - // XComponent - void SAL_CALL - addEventListener( - const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException ); - - void SAL_CALL - removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw( com::sun::star::uno::RuntimeException ); //XDispatch virtual void SAL_CALL diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index 22dfcaeaf609..6d1552850efe 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -63,9 +63,6 @@ public: // XLinkCreator virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XLinkFactory - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::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/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index 1e022a3c5f16..a81499f5a264 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -112,18 +112,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet throw(css::beans::PropertyExistException, css::uno::Exception ); - /** remove an existing property info from the set of supported ones. - * - * @param sProperty - * the name of the property. - * - * @throw [com::sun::star::beans::UnknownPropertyException] - * if no property with the specified name exists. - */ - void SAL_CALL impl_removePropertyInfo(const OUString& sProperty) - throw(css::beans::UnknownPropertyException, - css::uno::Exception ); - /** mark the object as "useable for working" or "dead". * * This correspond to the lifetime handling implemented by the base class TransactionBase. diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index 9e7b04bb18a1..ce83b597c4ec 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -63,21 +63,6 @@ void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property m_lProps[aProperty.Name] = aProperty; } -void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProperty) - throw(css::beans::UnknownPropertyException, - css::uno::Exception ) -{ - TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS); - - SolarMutexGuard g; - - PropertySetHelper::TPropInfoHash::iterator pIt = m_lProps.find(sProperty); - if (pIt == m_lProps.end()) - throw css::beans::UnknownPropertyException(); - - m_lProps.erase(pIt); -} - void SAL_CALL PropertySetHelper::impl_enablePropertySet() { } diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx index e6240ddbd58a..b9c86e302239 100644 --- a/include/basic/sbxobj.hxx +++ b/include/basic/sbxobj.hxx @@ -69,7 +69,6 @@ public: // Manage elements bool GetAll( SbxClassType ) { return true; } SbxVariable* Make( const OUString&, SbxClassType, SbxDataType, bool bIsRuntimeFunction = false ); - SbxObject* MakeObject( const OUString&, const OUString& ); virtual void Insert( SbxVariable* ); // AB 23.4.1997, Optimization, Insertion without check for duplicate Entries and // without Broadcasts, only used in SO2/auto.cxx @@ -77,9 +76,6 @@ public: void Remove( const OUString&, SbxClassType ); virtual void Remove( SbxVariable* ); - // Macro-Recording - OUString GenerateSource( const OUString &rLinePrefix, - const SbxObject *pRelativeTo ); // Direct access on arrays SbxArray* GetMethods() { return pMethods; } SbxArray* GetProperties() { return pProps; } diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index fa78d5abfd07..909081153b81 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -93,9 +93,6 @@ namespace accessibility virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XServiceName - OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); - /** Set the current index in the accessibility parent @attention This method does not lock the SolarMutex, diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx index 3ce0c4bb8f78..a6c84404e46f 100644 --- a/include/editeng/AccessibleStaticTextBase.hxx +++ b/include/editeng/AccessibleStaticTextBase.hxx @@ -113,15 +113,6 @@ namespace accessibility EDITENG_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& ); public: - /** Query the current edit source - - @attention This method returns by reference, so you are - responsible for serialization (typically, you acquired the - solar mutex when calling this method). Thus, the method - should only be called from the main office thread. - - */ - const SvxEditSource& GetEditSource() const; /** Set the current edit source @@ -164,13 +155,6 @@ namespace accessibility */ void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); - /** Get the event source - - @return the interface that is set as the source for - accessibility events sent by this object. - */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; - /** Set offset of EditEngine from parent @attention You are required to have the solar mutex @@ -186,30 +170,6 @@ namespace accessibility */ void SetOffset( const Point& rPoint ); - /** Query offset of EditEngine from parent - - @return the offset in screen coordinates (i.e. pixel) - */ - Point GetOffset() const; - - /** Update the visible children - - As this class currently does not represent any content - using children, this does nothing at the moment. - - @attention You are required to have the solar mutex - locked, when calling this method. Thus, the method should - only be called from the main office thread. - - This method reevaluates the visibility of all - children. Call this method if your visibility state has - changed somehow, e.g. if the visible area has changed and - the AccessibleStaticTextHelper isn't notified - internally. Normally, there should not be a need to call - this method. - */ - void UpdateChildren(); - /** Drop all references and enter disposed state This method drops all references to external objects (also diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index b09bff62ee58..18547e96c6ac 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -125,7 +125,6 @@ protected: virtual bool SpellContinue(); // Check Areas // Result available through GetLast virtual void ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage ); //Replace word from the replace list - void StartThesaurus( const OUString &rWord, sal_uInt16 nLang ); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetAllRightDic() const; @@ -135,7 +134,6 @@ protected: virtual void ChangeWord( const OUString& rNewWord, const sal_uInt16 nLang ); // Wort via Thesaurus ersetzen virtual void ChangeThesWord( const OUString& rNewWord ); - void SetLanguage( const sal_uInt16 nLang ); // Change Language virtual void AutoCorrect( const OUString& rAktStr, const OUString& rNewStr ); virtual void InsertHyphen( const sal_uInt16 nPos ); // Insert hyphen diff --git a/include/editeng/unopracc.hxx b/include/editeng/unopracc.hxx index 162c6131e752..ba0e79a5068d 100644 --- a/include/editeng/unopracc.hxx +++ b/include/editeng/unopracc.hxx @@ -42,8 +42,6 @@ public: // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // uno::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/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 0591f5e2aec3..83ec9608dd9a 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -44,7 +44,6 @@ public: virtual bool exportDocument() throw() SAL_OVERRIDE; virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index 74c7186ff96c..8cc4802fe259 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -44,7 +44,6 @@ public: virtual bool exportDocument() throw() SAL_OVERRIDE; virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index ddec48274d31..c41583bbf5bd 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -497,8 +497,6 @@ public: virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; - SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() const; // Only temporarily for the applications! @@ -518,7 +516,6 @@ public: bool IsInPlaceActive(); bool IsUIActive(); virtual void InPlaceActivate( bool ); - void UIActivate( bool ); static bool CopyStoragesOfUnknownMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource, diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index a56376304d84..9db1a356685a 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -45,10 +45,8 @@ public: SfxTemplatePanelControl (SfxBindings* pBindings, vcl::Window* pParentWindow); virtual ~SfxTemplatePanelControl(); - void Update(); virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void FreeResource (void); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 18a3158158dd..6dfe638298c0 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -119,7 +119,6 @@ public: SfxBindings& GetBindings() { return *pBindings; } const SfxBindings& GetBindings() const { return *pBindings; } vcl::Window& GetWindow() const; - void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); SfxProgress* GetProgress() const; @@ -140,16 +139,6 @@ public: virtual void Activate( bool bUI ) SAL_OVERRIDE; virtual void Deactivate( bool bUI ) SAL_OVERRIDE; - // DDE-Interface - long DdeExecute( const OUString& rCmd ); - bool DdeGetData( const OUString& rItem, - const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ); - bool DdeSetData( const OUString& rItem, - const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ); - ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); - void UpdateTitle(); static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ); diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 39bebeec25d8..31e2d6884a13 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -256,7 +256,6 @@ public: const Size& GetMargin() const; void SetMargin( const Size& ); void DisconnectAllClients(); - SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); bool NewWindowAllowed() const { return !bNoNewWindow; } void SetNewWindowAllowed( bool bSet ) { bNoNewWindow = !bSet; } diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx index 078a32be6ffc..75ab09ab9902 100644 --- a/include/sot/factory.hxx +++ b/include/sot/factory.hxx @@ -58,7 +58,6 @@ public: const OUString & rClassName, CreateInstanceType ); void PutSuperClass( const SotFactory * ); - void * CreateInstance( SotObject ** ppObj = NULL ) const; bool Is( const SotFactory * pSuperClass ) const; const SotFactory * GetSuper( sal_uInt16 nPos ) const diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 830faf8a36fc..b25345f61050 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -76,7 +76,6 @@ public: sal_uInt32 GetSize() const; bool CopyTo( SotStorageStream * pDestStm ); bool Commit(); - bool Revert(); bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue ); virtual sal_uInt64 remainingSize() SAL_OVERRIDE; }; @@ -159,7 +158,6 @@ public: if( m_nError == SVSTREAM_OK ) m_nError = nErrorCode; } - void ResetError(); bool IsRoot() const { return m_bIsRoot; } void SignAsRoot( bool b = true ) { m_bIsRoot = b; } @@ -169,19 +167,14 @@ public: void SetClass( const SvGlobalName & rClass, sal_uLong bOriginalClipFormat, const OUString & rUserTypeName ); - void SetConvertClass( const SvGlobalName & rConvertClass, - sal_uLong bOriginalClipFormat, - const OUString & rUserTypeName ); SvGlobalName GetClassName(); // type of data in the storage sal_uLong GetFormat(); OUString GetUserName(); - bool ShouldConvert(); // list of all elements void FillInfoList( SvStorageInfoList * ) const; bool CopyTo( SotStorage * pDestStg ); bool Commit(); - bool Revert(); // create stream with connection to Storage, // more or less a Parent-Child relationship @@ -197,13 +190,8 @@ public: bool IsContained( const OUString & rEleName ) const; // remove element bool Remove( const OUString & rEleName ); - // change element's name - bool Rename( const OUString & rEleName, - const OUString & rNewName ); bool CopyTo( const OUString & rEleName, SotStorage * pDest, const OUString & rNewName ); - bool MoveTo( const OUString & rEleName, SotStorage * pDest, - const OUString & rNewName ); bool IsOLEStorage() const; static bool IsOLEStorage( const OUString & rFileName ); diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 29c9795818e2..710e5e43e897 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -63,12 +63,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - sal_uInt8 GetMin() const; - - sal_uInt8 GetMax() const; - - SfxFieldUnit GetUnit() const; - sal_uInt8 GetValue() const { return m_nValue; } inline void SetValue(sal_uInt8 nTheValue); @@ -122,12 +116,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - sal_uInt16 GetMin() const; - - sal_uInt16 GetMax() const; - - SfxFieldUnit GetUnit() const; - sal_uInt16 GetValue() const { return m_nValue; } inline void SetValue(sal_uInt16 nTheValue); @@ -181,12 +169,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - sal_Int32 GetMin() const; - - sal_Int32 GetMax() const; - - SfxFieldUnit GetUnit() const; - sal_Int32 GetValue() const { return m_nValue; } inline void SetValue(sal_Int32 nTheValue); @@ -240,12 +222,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - sal_uInt32 GetMin() const; - - sal_uInt32 GetMax() const; - - SfxFieldUnit GetUnit() const; - sal_uInt32 GetValue() const { return m_nValue; } inline void SetValue(sal_uInt32 nTheValue); diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 6c4e4fb60d36..210c0eedc47d 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -60,10 +60,6 @@ public: rTheStream); virtual ~SvInputStream(); - - void AddMark(sal_uLong nPos); - - void RemoveMark(sal_uLong nPos); }; #endif // INCLUDED_SVL_INSTRM_HXX diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 70879b31d1fd..12536c4c9de7 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -80,12 +80,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - sal_Int16 GetMin() const; - - sal_Int16 GetMax() const; - - SfxFieldUnit GetUnit() const; - sal_Int16 GetValue() const { return m_nValue; } inline void SetValue(sal_Int16 nTheValue); diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 75bef0d2875a..82091f14705c 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -116,9 +116,6 @@ public: If the display name is empty, this method returns the internal name. */ OUString GetDisplayName() const; - // sets the display name of this style - void SetDisplayName( const OUString& ); - virtual const OUString& GetParent() const; virtual bool SetParent( const OUString& ); virtual const OUString& GetFollow() const; @@ -146,7 +143,6 @@ public: virtual void SetHelpId( const OUString& r, sal_uLong nId ); virtual SfxItemSet& GetItemSet(); - sal_uInt16 GetVersion() const; }; /* Class to iterate and search on a SfxStyleSheetBasePool */ @@ -304,7 +300,6 @@ class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool protected: using SfxStyleSheetBasePool::Create; virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask) SAL_OVERRIDE; - SfxStyleSheetBase* Create(const SfxStyleSheet &); public: SfxStyleSheetPool( SfxItemPool const& ); diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index 73d97f111808..85a1dda2461c 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -74,19 +74,6 @@ 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 ); - //===== XAccessible ===================================================== virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL @@ -115,8 +102,6 @@ public: 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/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 84ec8d8748f8..402e946c84d4 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -322,7 +322,6 @@ public: bool HasBackground() const; bool HasFont() const; - bool HasFontTextColor() const; bool HasFontFillColor() const; void SetFontColorToBackground ( bool bDo = true ) { _bAutoFontColor = bDo; } diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 807eef998675..b9239404ad21 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -225,7 +225,6 @@ public: virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const SAL_OVERRIDE; virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; - using SvTreeListBox::FillAccessibleStateSet; virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const SAL_OVERRIDE; virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; virtual void GrabTableFocus() SAL_OVERRIDE; diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 96c501d6ad8e..5f3401fa7515 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -489,9 +489,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; - /** Fills the StateSet with all states (except DEFUNC, done by the accessible object). */ - void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet ) const; - /** Fills the StateSet of one entry. */ void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const; @@ -577,7 +574,6 @@ protected: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - void CursorMoved( SvTreeListEntry* pNewCursor ); virtual void PreparePaint( SvTreeListEntry* ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 08585d19015d..d114217b16c0 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -206,13 +206,6 @@ namespace accessibility */ void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); - /** Get the event source - - @return the interface that is set as the source for - accessibility events sent by this object. - */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; - /** Set offset of EditEngine/Outliner from parent If the origin of the underlying EditEngine/Outliner does @@ -229,12 +222,6 @@ namespace accessibility */ void SetOffset( const Point& rPoint ); - /** Query offset of EditEngine/Outliner from parent - - @return the offset in screen coordinates (i.e. pixel) - */ - Point GetOffset() const; - /** Set offset the object adds to all children's indices This can be used if the owner of this object has children @@ -338,23 +325,6 @@ namespace accessibility @attention Fires state change events, therefore, don't hold any mutex - @param nEventId - Id of the event to send, @see AccessibleEventId - - @param rNewValue - The value we've changed into - - @param rOldValue - The old value before the change - */ - void FireEvent( const sal_Int16 nEventId, - const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), - const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; - - /** Call this method to invoke all event listeners with the given event - - @attention Fires state change events, therefore, don't hold any mutex - @param rEvent The event to send, @see AccessibleEventObject @@ -362,15 +332,6 @@ namespace accessibility // TODO: make that virtual next time void FireEvent( const ::com::sun::star::accessibility::AccessibleEventObject& rEvent ) const; - /** Query select state of the text managed by this object - - @attention Don't call with locked mutexes. You may hold - the solar mutex, but this method acquires it anyway. - - @return sal_True, if the text or parts of it are currently selected - */ - bool IsSelected() const; - // XAccessibleContext child handling methods /** Implements getAccessibleChildCount diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 3371a15e2a07..9a19a18807e7 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -323,11 +323,6 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const SAL_OVERRIDE; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - double GetMin() const; - double GetMax() const; - - SfxFieldUnit GetUnit() const; - double GetValue() const { return fVal; } void SetValue(double fNewVal) { fVal = fNewVal; } }; diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx index 0d87726917d7..40a22fa17b1b 100644 --- a/include/svx/e3dundo.hxx +++ b/include/svx/e3dundo.hxx @@ -104,7 +104,6 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction virtual bool CanRepeat(SfxRepeatTarget& rView) const SAL_OVERRIDE; virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - void Repeat(); }; #endif // INCLUDED_SVX_E3DUNDO_HXX diff --git a/include/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx index 56c472285938..418ce1679f66 100644 --- a/include/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/include/svx/sdr/contact/viewcontactoftextobj.hxx @@ -28,10 +28,6 @@ namespace sdr { namespace contact { class ViewContactOfTextObj : public ViewContactOfSdrObj { -protected: - // internal access to SdrTextObj - const SdrTextObj& GetTextObj() const; - public: // basic constructor, used from SdrObject. explicit ViewContactOfTextObj(SdrTextObj& rTextObj); diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 3f2cc06d1190..c05a5b80f4c0 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -150,7 +150,6 @@ public: virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum); virtual SdrObject* ReplaceObject(SdrObject* pNewObj, size_t nObjNum); /// Modify ZOrder of an SdrObject - SdrObject* NbcSetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum); virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum); void SetRectsDirty(); diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index a180a92b20bc..627b6759f43b 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -94,17 +94,11 @@ public: // ::com::sun::star::awt::XGraphics Attributes virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL getDevice() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::sal_Int32 getTextColor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::sal_Int32 getTextFillColor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::sal_Int32 getLineColor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::sal_Int32 getFillColor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::awt::RasterOperation getRasterOp() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation _rasterop ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > getFont() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& _font ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index f882b3f707c6..78fdfe7cc4d8 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -100,7 +100,6 @@ namespace toolkit // XAccessibleComponent 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; 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/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index 2e1911f86e57..020e16a2e13c 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -718,19 +718,6 @@ protected: /** Write a sequence of octets. - @descr The supplied sequence of UCS-4 characters is interpreted as a - sequence of octets. It is an error if any of the elements of the - sequence has a numerical value greater than 255. - - @param pBegin Points to the start of the sequence, must not be null. - - @param pEnd Points past the end of the sequence, must be >= pBegin. - */ - void writeSequence(const sal_uInt32 * pBegin, - const sal_uInt32 * pEnd); - - /** Write a sequence of octets. - @descr The supplied sequence of Unicode characters is interpreted as a sequence of octets. It is an error if any of the elements of the sequence has a numerical value greater than 255. @@ -782,18 +769,6 @@ public: /** Write a sequence of octets. - @descr The supplied sequence of UCS-4 characters is interpreted as a - sequence of octets. It is an error if any of the elements of the - sequence has a numerical value greater than 255. - - @param pBegin Points to the start of the sequence, must not be null. - - @param pEnd Points past the end of the sequence, must be >= pBegin. - */ - inline void write(const sal_uInt32 * pBegin, const sal_uInt32 * pEnd); - - /** Write a sequence of octets. - @descr The supplied sequence of Unicode characters is interpreted as a sequence of octets. It is an error if any of the elements of the sequence has a numerical value greater than 255. @@ -879,13 +854,6 @@ inline void INetMIMEOutputSink::write(const sal_Char * pBegin, m_nColumn += pEnd - pBegin; } -inline void INetMIMEOutputSink::write(const sal_uInt32 * pBegin, - const sal_uInt32 * pEnd) -{ - writeSequence(pBegin, pEnd); - m_nColumn += pEnd - pBegin; -} - inline void INetMIMEOutputSink::write(const sal_Unicode * pBegin, const sal_Unicode * pEnd) { diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx index c761429ea126..97e68d15e47c 100644 --- a/include/vcl/printerinfomanager.hxx +++ b/include/vcl/printerinfomanager.hxx @@ -180,9 +180,6 @@ public: // returns the printer queue names const std::list< SystemPrintQueue >& getSystemPrintQueues(); - // similar but returnse whole commandlines - void getSystemPrintCommands( std::list< OUString >& rCommands ); - // abstract print command // returns a stdio FILE* that a postscript file may be written to // this may either be a regular file or the result of popen() diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 72fc3cc72bc2..e9c272d29588 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -704,7 +704,6 @@ public: virtual void Erase() SAL_OVERRIDE; virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); } - void PostPaint(); virtual void Draw( ::OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Move(); virtual void Resize(); diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx index a4a0c891b89b..ece407e9f6a2 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx @@ -73,14 +73,6 @@ void XFContentContainer::Add(XFContent *pContent) m_aContents.push_back(pContent); } -void XFContentContainer::InsertAtBegin(XFContent * pContent) -{ - m_aContents.insert(m_aContents.begin(), pContent); -} -void XFContentContainer::RemoveAt(sal_uInt32 nPos) -{ - m_aContents.erase(m_aContents.begin()+nPos); -} void XFContentContainer::Add(const OUString& text) { XFTextContent *pTC = new XFTextContent(); diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx index d6f3c9998149..7abdf63c27ef 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx @@ -89,8 +89,6 @@ public: */ virtual void Add(XFContent *pContent); - void InsertAtBegin(XFContent *pContent); - void RemoveAt(sal_uInt32 nPos); rtl::Reference<XFContent> GetLastContent(); void RemoveLastContent(); /** diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx b/lotuswordpro/source/filter/xfilter/xflist.cxx index e3f102cbede5..a5b4722fb613 100644 --- a/lotuswordpro/source/filter/xfilter/xflist.cxx +++ b/lotuswordpro/source/filter/xfilter/xflist.cxx @@ -101,29 +101,4 @@ void XFList::ToXml(IXFStream *pStrm) pStrm->EndElement( "text:unordered-list" ); } -void XFList::StartList(IXFStream *pStrm, bool bContinueNumber) -{ - IXFAttrList *pAttrList = pStrm->GetAttrList(); - assert(NULL!=pAttrList); - - pAttrList->Clear(); - if( !GetStyleName().isEmpty() ) - pAttrList->AddAttribute( "text:style-name", GetStyleName() ); - if( bContinueNumber ) - pAttrList->AddAttribute( "text:continue-numbering", "true" ); - - if( m_bOrdered ) - pStrm->StartElement( "text:ordered-list" ); - else - pStrm->StartElement( "text:unordered-list" ); -} - -void XFList::EndList(IXFStream *pStrm) -{ - if( m_bOrdered ) - pStrm->EndElement( "text:ordered-list" ); - else - pStrm->EndElement( "text:unordered-list" ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/source/filter/xfilter/xflist.hxx index 05531cccd858..b8b065c96bf5 100644 --- a/lotuswordpro/source/filter/xfilter/xflist.hxx +++ b/lotuswordpro/source/filter/xfilter/xflist.hxx @@ -92,10 +92,6 @@ public: */ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; - void StartList(IXFStream *pStrm, bool bContinueNumber = false); - - void EndList(IXFStream *pStrm); - private: bool m_bOrdered; bool m_bContinueNumber; diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx index a64b576a6f7b..91a46bd96752 100644 --- a/oox/source/ppt/dgmimport.cxx +++ b/oox/source/ppt/dgmimport.cxx @@ -97,12 +97,6 @@ const ::oox::drawingml::Theme* QuickDiagrammingImport::getCurrentTheme() const return 0; } -sal_Int32 QuickDiagrammingImport::getSchemeClr( sal_Int32 /*nColorSchemeToken*/ ) const -{ - // TODO - return 0; -} - const oox::drawingml::table::TableStyleListPtr QuickDiagrammingImport::getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx index 678fb71daecf..9937b3f777ea 100644 --- a/oox/source/ppt/dgmlayout.cxx +++ b/oox/source/ppt/dgmlayout.cxx @@ -148,15 +148,6 @@ const ::oox::drawingml::Theme* QuickDiagrammingLayout::getCurrentTheme() const return mpThemePtr.get(); } -sal_Int32 QuickDiagrammingLayout::getSchemeClr( sal_Int32 nColorSchemeToken ) const -{ - sal_Int32 nColor = 0; - if( mpThemePtr ) - mpThemePtr->getClrScheme().getColor( nColorSchemeToken, - nColor ); - return nColor; -} - const oox::drawingml::table::TableStyleListPtr QuickDiagrammingLayout::getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 9f68bc34433a..d25f0e2d5ae1 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -437,47 +437,6 @@ const ::std::vector< OUString >& lcl_getControlModelMap() } -uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportComponent( const OUString& _sReportComponentSpecifier ) throw (uno::Exception, lang::IllegalArgumentException,uno::RuntimeException) -{ - ::osl::ResettableMutexGuard aGuard(m_aMutex); - const ::std::vector< OUString >& aRet = lcl_getControlModelMap(); - ::std::vector< OUString >::const_iterator aFind = ::std::find(aRet.begin(),aRet.end(),_sReportComponentSpecifier); - if ( aFind == aRet.end() ) - throw lang::IllegalArgumentException(); - - uno::Reference< report::XReportComponent > xRet; - uno::Reference< lang::XMultiServiceFactory> xFac(getReportDefinition(),uno::UNO_QUERY_THROW); - switch( aFind - aRet.begin() ) - { - case 0: - xRet.set(xFac->createInstance("com.sun.star.form.component.FixedText"),uno::UNO_QUERY); - break; - case 1: - xRet.set(xFac->createInstance("com.sun.star.awt.UnoControlFixedLineModel"),uno::UNO_QUERY); - break; - case 2: - xRet.set(xFac->createInstance("com.sun.star.form.component.DatabaseImageControl"),uno::UNO_QUERY); - break; - case 3: - xRet.set(xFac->createInstance("com.sun.star.form.component.FormattedField"),uno::UNO_QUERY); - break; - case 4: - xRet.set(xFac->createInstance("com.sun.star.drawing.ControlShape"),uno::UNO_QUERY); - break; - default: - break; - } - return xRet; -} - -uno::Sequence< OUString > SAL_CALL OSection::getAvailableReportComponentNames( ) throw (uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - - const ::std::vector< OUString >& aRet = lcl_getControlModelMap(); - return uno::Sequence< OUString >(aRet.data(), aRet.size()); -} - // XChild uno::Reference< uno::XInterface > SAL_CALL OSection::getParent( ) throw (uno::RuntimeException, std::exception) { diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index 8ba80c1a58fb..3bf846d05e1e 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -187,8 +187,6 @@ namespace reportdesign virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > SAL_CALL getGroup() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > SAL_CALL getReportDefinition() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > SAL_CALL createReportComponent( const OUString& _sReportComponentSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::lang::IllegalArgumentException,::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableReportComponentNames( ) throw (::com::sun::star::uno::RuntimeException); // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 39a38015bbf4..77a2358b4a48 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -945,19 +945,6 @@ SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName, return pContext; } -SvXMLImport& ORptFilter::getGlobalContext() -{ - return *this; -} - -void ORptFilter::enterEventContext() -{ -} - -void ORptFilter::leaveEventContext() -{ -} - SvXMLImportContext *ORptFilter::CreateFontDeclsContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 5ad1c29e5ef3..4fa25c67c856 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -168,11 +168,6 @@ public: void removeFunction(const OUString& _sFunctionName); inline const TGroupFunctionMap& getFunctions() const { return m_aFunctions; } - SvXMLImport& getGlobalContext(); - - void enterEventContext(); - void leaveEventContext(); - bool isOldFormat() const; }; 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<css::chart::XChartDocument>& 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<sheet::FormulaToken> 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<OUString> 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) { @@ -215,11 +208,6 @@ ScVbaName::getRefersToRange() throw (css::uno::RuntimeException, std::exception) } void -ScVbaName::setRefersToRange( const css::uno::Reference< ov::excel::XRange > /*rRange*/ ) throw (css::uno::RuntimeException) -{ -} - -void ScVbaName::Delete() throw (css::uno::RuntimeException, std::exception) { mxNames->removeByName( mxNamedRange->getName() ); 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<ScAccessibleDocumentBase*>(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<com::sun::star::accessibility::XAccessible> 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<ScAccessibleDocumentBase*>(GetAccessible(false).get()); - if (pAccDoc) - { - pAccDoc->SwitchViewFireFocus(); - } -} - void ScPreview::DragMove( long nDragMovePos, sal_uInt16 nFlags ) { Fraction aPreviewZoom( nZoom, 100 ); 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; diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 7c0a5255256e..a1b7f8595a34 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -425,64 +425,6 @@ void SfxObjectShell::ReconnectDdeLinks(SfxObjectShell& rServer) } } -/* [Description] - - This method can be overridden by application developers, to receive - DDE-commands directed to the their SfxApplication subclass. - - The base implementation understands the API functionality of the - relevant SfxViewFrame, which is shown and the relevant SfxViewShell - and the relevant SfxApplication subclass in BASIC syntax. Return - values can not be transferred, unfortunately. -*/ -long SfxViewFrame::DdeExecute( const OUString& rCmd ) // Expressed in our BASIC-Syntax -{ - if ( GetObjectShell() ) - return GetObjectShell()->DdeExecute( rCmd ); - - return 0; -} - -/* [Description] - - This method can be overridden by application developers, to receive - DDE-data-requests directed to their SfxApplication subclass. - - The base implementation provides no data and returns false. -*/ -bool SfxViewFrame::DdeGetData( const OUString&, // the Item to be addressed - const OUString&, // in: Format - ::com::sun::star::uno::Any& )// out: requested data -{ - return false; -} - -/* [Description] - - This method can be overridden by application developers, to receive - DDE-data directed to their SfxApplication subclass. - - The base implementation is not receiving any data and returns false. -*/ -bool SfxViewFrame::DdeSetData( const OUString&, // the Item to be addressed - const OUString&, // in: Format - const ::com::sun::star::uno::Any& )// out: requested data -{ - return false; -} - -/* [Description] - - This method can be overridden by application developers, to establish - a DDE-hotlink to their SfxApplication subclass. - - The base implementation is not generate a link and returns 0. -*/ -::sfx2::SvLinkSource* SfxViewFrame::DdeCreateLinkSource( const OUString& )// the Item to be addressed -{ - return 0; -} - bool SfxApplication::InitializeDde() { int nError = 0; diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 28de61f3e989..4d0886e8de2f 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -415,13 +415,6 @@ void SAL_CALL ThumbnailViewAcc::grabFocus() mpParent->GrabFocus(); } -uno::Any SAL_CALL ThumbnailViewAcc::getAccessibleKeyBinding() - throw (uno::RuntimeException) -{ - ThrowIfDisposed(); - return uno::Any(); -} - sal_Int32 SAL_CALL ThumbnailViewAcc::getForeground( ) throw (uno::RuntimeException, std::exception) { @@ -957,12 +950,6 @@ void SAL_CALL ThumbnailViewItemAcc::grabFocus() // nothing to do } -uno::Any SAL_CALL ThumbnailViewItemAcc::getAccessibleKeyBinding() - throw (uno::RuntimeException) -{ - return uno::Any(); -} - sal_Int32 SAL_CALL ThumbnailViewItemAcc::getForeground( ) throw (uno::RuntimeException, std::exception) { diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 737b0c09c4bc..3eae0c037e66 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -111,7 +111,6 @@ public: 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; 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; @@ -226,7 +225,6 @@ public: 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; 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/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 3650edcf77cd..22d5020ab05d 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -279,17 +279,11 @@ SfxTemplatePanelControl::SfxTemplatePanelControl ( SetStyle(GetStyle() & ~WB_DOCKABLE); } - - - SfxTemplatePanelControl::~SfxTemplatePanelControl (void) { delete pImpl; } - - - void SfxTemplatePanelControl::DataChanged( const DataChangedEvent& _rDCEvt ) { if ( ( DataChangedEventType::SETTINGS == _rDCEvt.GetType() ) && @@ -302,17 +296,6 @@ void SfxTemplatePanelControl::DataChanged( const DataChangedEvent& _rDCEvt ) DockingWindow::DataChanged( _rDCEvt ); } - - - -void SfxTemplatePanelControl::Update() -{ - pImpl->Update(); -} - - - - void SfxTemplatePanelControl::Resize() { if(pImpl) @@ -320,39 +303,11 @@ void SfxTemplatePanelControl::Resize() DockingWindow::Resize(); } - void SfxTemplatePanelControl::FreeResource (void) { DockingWindow::FreeResource(); } - -SfxChildAlignment SfxTemplatePanelControl::CheckAlignment(SfxChildAlignment eActAlign,SfxChildAlignment eAlign) -{ - 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: - return eActAlign; - - case SFX_ALIGN_LEFT: - case SFX_ALIGN_RIGHT: - case SFX_ALIGN_FIRSTLEFT: - case SFX_ALIGN_LASTLEFT: - case SFX_ALIGN_FIRSTRIGHT: - case SFX_ALIGN_LASTRIGHT: - return eAlign; - - default: - return eAlign; - } -} - - void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange ) { if ( nStateChange == StateChangedType::INITSHOW ) @@ -372,8 +327,6 @@ void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange ) DockingWindow::StateChanged( nStateChange ); } - - void StyleTreeListBox_Impl::MakeExpanded_Impl(ExpandedEntries_t& rEntries) const { SvTreeListEntry *pEntry; diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index d24cb6b34d30..4c8746f27f04 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1594,12 +1594,6 @@ ErrCode SfxObjectShell::CallXScript( const OUString& rScriptURL, return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError, pCaller ); } - -SfxFrame* SfxObjectShell::GetSmartSelf( SfxFrame* pSelf, SfxMedium& /*rMedium*/ ) -{ - return pSelf; -} - SfxObjectShellFlags SfxObjectShell::GetFlags() const { if( pImp->eFlags == SFXOBJECTSHELL_UNDEFINED ) @@ -1823,10 +1817,6 @@ bool SfxObjectShell::IsUIActive() return pFrame && pFrame->GetFrame().IsInPlace() && pFrame->GetFrame().GetWorkWindow_Impl()->IsVisible_Impl(); } -void SfxObjectShell::UIActivate( bool ) -{ -} - void SfxObjectShell::InPlaceActivate( bool ) { } diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index cad0bcda3814..ff8f3e9f2698 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -385,11 +385,6 @@ void SfxViewFrame::INetState_Impl( SfxItemSet &rItemSet ) rItemSet.DisableItem( SID_CREATELINK ); } -void SfxViewFrame::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) -{ - GetViewShell()->SetZoomFactor( rZoomX, rZoomY ); -} - void SfxViewFrame::Activate( bool bMDI ) { DBG_ASSERT(GetViewShell(), "No Shell"); diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index cf0457b88e30..8d1fe4446b62 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1883,28 +1883,15 @@ void SfxViewShell::SetMargin( const Size& rSize ) } } - - void SfxViewShell::MarginChanged() { } - - bool SfxViewShell::IsShowView_Impl() const { return pImp->m_bIsShowView; } - - -SfxFrame* SfxViewShell::GetSmartSelf( SfxFrame* pSelf, SfxMedium& /*rMedium*/ ) -{ - return pSelf; -} - - - void SfxViewShell::JumpToMark( const OUString& rMark ) { SfxStringItem aMarkItem( SID_JUMPTOMARK, rMark ); diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index f2a1be5665b8..853b603ed9c7 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -111,11 +111,6 @@ namespace slideshow mpRootNode->end(); } - void SlideAnimations::dispose() - { - mpRootNode.reset(); - maContext.dispose(); - } } } diff --git a/slideshow/source/engine/slide/slideanimations.hxx b/slideshow/source/engine/slide/slideanimations.hxx index 0ae0dd8cb02e..f8c738683a3b 100644 --- a/slideshow/source/engine/slide/slideanimations.hxx +++ b/slideshow/source/engine/slide/slideanimations.hxx @@ -103,9 +103,6 @@ namespace slideshow */ void end(); - /// Release all references. Does not notify anything. - void dispose(); - private: SlideShowContext maContext; const basegfx::B2DVector maSlideSize; diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index 5cc444ff1aa3..cade244c5698 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -187,17 +187,6 @@ void SotFactory::DecSvObjectCount( SotObject * pObj ) } /************************************************************************* -|* SotFactory::CreateInstance() -|* -|* Beschreibung -*************************************************************************/ -void * SotFactory::CreateInstance( SotObject ** ppObj ) const -{ - assert(pCreateFunc && "SotFactory::CreateInstance: pCreateFunc == 0"); - return pCreateFunc( ppObj ); -} - -/************************************************************************* |* SotFactory::Is() |* |* Beschreibung @@ -215,7 +204,4 @@ bool SotFactory::Is( const SotFactory * pSuperCl ) const return false; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 30262d25fc49..6de540de9d3b 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -267,16 +267,6 @@ bool SotStorageStream::Commit() return GetError() == SVSTREAM_OK; } -bool SotStorageStream::Revert() -{ - if( pOwnStm ) - { - pOwnStm->Revert(); - SetError( pOwnStm->GetError() ); - } - return GetError() == SVSTREAM_OK; -} - bool SotStorageStream::SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue ) { UCBStorageStream* pStg = PTR_CAST( UCBStorageStream, pOwnStm ); @@ -615,14 +605,6 @@ const OUString & SotStorage::GetName() const return m_aName; } - -void SotStorage::ResetError() -{ - m_nError = SVSTREAM_OK; - if( m_pOwnStg ) - m_pOwnStg->ResetError(); -} - void SotStorage::SetClass( const SvGlobalName & rName, sal_uLong nOriginalClipFormat, const OUString & rUserTypeName ) @@ -634,17 +616,6 @@ void SotStorage::SetClass( const SvGlobalName & rName, SetError( SVSTREAM_GENERALERROR ); } -void SotStorage::SetConvertClass( const SvGlobalName & rName, - sal_uLong nOriginalClipFormat, - const OUString & rUserTypeName ) -{ - DBG_ASSERT( Owner(), "must be owner" ); - if( m_pOwnStg ) - m_pOwnStg->SetConvertClass( rName, nOriginalClipFormat, rUserTypeName ); - else - SetError( SVSTREAM_GENERALERROR ); -} - SvGlobalName SotStorage::GetClassName() { SvGlobalName aGN; @@ -678,16 +649,6 @@ OUString SotStorage::GetUserName() return aName; } -bool SotStorage::ShouldConvert() -{ - DBG_ASSERT( Owner(), "must be owner" ); - if( m_pOwnStg ) - return m_pOwnStg->ShouldConvert(); - else - SetError( SVSTREAM_GENERALERROR ); - return false; -} - void SotStorage::FillInfoList( SvStorageInfoList * pFillList ) const { DBG_ASSERT( Owner(), "must be owner" ); @@ -726,20 +687,6 @@ bool SotStorage::Commit() return SVSTREAM_OK == GetError(); } -bool SotStorage::Revert() -{ - DBG_ASSERT( Owner(), "must be owner" ); - if( m_pOwnStg ) - { - if( !m_pOwnStg->Revert() ) - SetError( m_pOwnStg->GetError() ); - } - else - SetError( SVSTREAM_GENERALERROR ); - - return SVSTREAM_OK == GetError(); -} - SotStorageStream * SotStorage::OpenSotStream( const OUString & rEleName, StreamMode nMode, StorageMode nStorageMode ) @@ -837,20 +784,6 @@ bool SotStorage::Remove( const OUString & rEleName ) return SVSTREAM_OK == GetError(); } -bool SotStorage::Rename( const OUString & rEleName, const OUString & rNewName ) -{ - DBG_ASSERT( Owner(), "must be owner" ); - if( m_pOwnStg ) - { - m_pOwnStg->Rename( rEleName, rNewName ); - SetError( m_pOwnStg->GetError() ); - } - else - SetError( SVSTREAM_GENERALERROR ); - - return SVSTREAM_OK == GetError(); -} - bool SotStorage::CopyTo( const OUString & rEleName, SotStorage * pNewSt, const OUString & rNewName ) { @@ -868,23 +801,6 @@ bool SotStorage::CopyTo( const OUString & rEleName, return SVSTREAM_OK == GetError(); } -bool SotStorage::MoveTo( const OUString & rEleName, - SotStorage * pNewSt, const OUString & rNewName ) -{ - DBG_ASSERT( Owner(), "must be owner" ); - DBG_ASSERT( pNewSt->Owner(), "must be owner" ); - if( m_pOwnStg ) - { - m_pOwnStg->MoveTo( rEleName, pNewSt->m_pOwnStg, rNewName ); - SetError( m_pOwnStg->GetError() ); - SetError( pNewSt->GetError() ); - } - else - SetError( SVSTREAM_GENERALERROR ); - - return SVSTREAM_OK == GetError(); -} - bool SotStorage::Validate() { DBG_ASSERT( m_bIsRoot, "Validate nur an Rootstorage" ); diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 896c7f2f287b..6c543ca6d370 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -124,7 +124,6 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; - bool SetData( const OUString& rData ); virtual sal_uLong GetMiscStatus() const SAL_OVERRIDE; virtual void OnDocumentPrinterChanged( Printer * ) SAL_OVERRIDE; virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE; diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 0d9430e91e95..9a59199eda55 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -260,7 +260,6 @@ protected: const OUString& rText, sal_uInt16 MaxWidth); - sal_uInt16 Print(SfxProgress &rProgress, bool bIsAPI); virtual SfxPrinter *GetPrinter(bool bCreate = false) SAL_OVERRIDE; virtual sal_uInt16 SetPrinter(SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false) SAL_OVERRIDE; diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 5f1948c0e17a..c5acddbfe1bc 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -696,14 +696,6 @@ SmDocShell::~SmDocShell() delete pPrinter; } - -bool SmDocShell::SetData( const OUString& rData ) -{ - SetText( rData ); - return true; -} - - bool SmDocShell::ConvertFrom(SfxMedium &rMedium) { bool bSuccess = false; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 66025860d2a8..9f7a4f034e7b 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1319,13 +1319,6 @@ void SmViewShell::Impl_Print( rOutDev.Pop(); } -sal_uInt16 SmViewShell::Print(SfxProgress & /*rProgress*/, bool /*bIsAPI*/) -{ - SAL_WARN( "starmath", "SmViewShell::Print: no longer used with new UI print dialog. Should be removed!!" ); - return 0; -} - - SfxPrinter* SmViewShell::GetPrinter(bool bCreate) { SmDocShell *pDoc = GetDoc(); @@ -1334,7 +1327,6 @@ SfxPrinter* SmViewShell::GetPrinter(bool bCreate) return 0; } - sal_uInt16 SmViewShell::SetPrinter(SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags, bool ) { SfxPrinter *pOld = GetDoc()->GetPrinter(); diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index 7399633c6b87..0fde0d94003e 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -96,24 +96,6 @@ SfxPoolItem * CntByteItem::Clone(SfxItemPool *) const return new CntByteItem(*this); } -// virtual -sal_uInt8 CntByteItem::GetMin() const -{ - return 0; -} - -// virtual -sal_uInt8 CntByteItem::GetMax() const -{ - return 255; -} - -// virtual -SfxFieldUnit CntByteItem::GetUnit() const -{ - return SFX_FUNIT_NONE; -} - TYPEINIT1_AUTOFACTORY(CntUInt16Item, SfxPoolItem); CntUInt16Item::CntUInt16Item(sal_uInt16 which, SvStream & rStream) : @@ -199,24 +181,6 @@ SfxPoolItem * CntUInt16Item::Clone(SfxItemPool *) const return new CntUInt16Item(*this); } -// virtual -sal_uInt16 CntUInt16Item::GetMin() const -{ - return 0; -} - -// virtual -sal_uInt16 CntUInt16Item::GetMax() const -{ - return 65535; -} - -// virtual -SfxFieldUnit CntUInt16Item::GetUnit() const -{ - return SFX_FUNIT_NONE; -} - TYPEINIT1_AUTOFACTORY(CntInt32Item, SfxPoolItem); CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream) @@ -298,24 +262,6 @@ SfxPoolItem * CntInt32Item::Clone(SfxItemPool *) const return new CntInt32Item(*this); } -// virtual -sal_Int32 CntInt32Item::GetMin() const -{ - return sal_Int32(0x80000000); -} - -// virtual -sal_Int32 CntInt32Item::GetMax() const -{ - return 0x7FFFFFFF; -} - -// virtual -SfxFieldUnit CntInt32Item::GetUnit() const -{ - return SFX_FUNIT_NONE; -} - TYPEINIT1_AUTOFACTORY(CntUInt32Item, SfxPoolItem); CntUInt32Item::CntUInt32Item(sal_uInt16 which, SvStream & rStream) : @@ -402,22 +348,4 @@ SfxPoolItem * CntUInt32Item::Clone(SfxItemPool *) const return new CntUInt32Item(*this); } -// virtual -sal_uInt32 CntUInt32Item::GetMin() const -{ - return 0; -} - -// virtual -sal_uInt32 CntUInt32Item::GetMax() const -{ - return 0xFFFFFFFF; -} - -// virtual -SfxFieldUnit CntUInt32Item::GetUnit() const -{ - return SFX_FUNIT_NONE; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index a9405d7daf5a..e596d4a5a8f9 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -121,25 +121,7 @@ SfxPoolItem * SfxInt16Item::Clone(SfxItemPool *) const return new SfxInt16Item(*this); } -sal_Int16 SfxInt16Item::GetMin() const -{ - return -32768; -} - -sal_Int16 SfxInt16Item::GetMax() const -{ - return 32767; -} - -SfxFieldUnit SfxInt16Item::GetUnit() const -{ - return SFX_FUNIT_NONE; -} - - // class SfxUInt16Item - - TYPEINIT1_AUTOFACTORY(SfxUInt16Item, CntUInt16Item); void SfxUInt16Item::dumpAsXml(xmlTextWriterPtr pWriter) const diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index cddf81b31193..e75c0056d1dc 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -151,13 +151,7 @@ SfxStyleSheetBase::~SfxStyleSheetBase() } } -sal_uInt16 SfxStyleSheetBase::GetVersion() const -{ - return 0x0000; -} - // Change name - const OUString& SfxStyleSheetBase::GetName() const { return aName; @@ -207,13 +201,7 @@ OUString SfxStyleSheetBase::GetDisplayName() const } } -void SfxStyleSheetBase::SetDisplayName( const OUString& rDisplayName ) -{ - maDisplayName = rDisplayName; -} - // Change Parent - const OUString& SfxStyleSheetBase::GetParent() const { return aParent; @@ -957,11 +945,6 @@ SfxStyleSheetBase* SfxStyleSheetPool::Create( const OUString& rName, return new SfxStyleSheet( rName, *this, eFam, mask ); } -SfxStyleSheetBase* SfxStyleSheetPool::Create( const SfxStyleSheet& r ) -{ - return new SfxStyleSheet( r ); -} - SfxUnoStyleSheet::SfxUnoStyleSheet( const OUString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, sal_uInt16 _nMaske ) : ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >( _rName, _rPool, _eFamily, _nMaske ) { diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index fce0de437a39..241a031c284f 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -470,24 +470,8 @@ SvInputStream::~SvInputStream() delete m_pPipe; } -// virtual -void SvInputStream::AddMark(sal_uLong nPos) -{ - if (open() && m_pPipe) - m_pPipe->addMark(nPos); -} - -// virtual -void SvInputStream::RemoveMark(sal_uLong nPos) -{ - if (open() && m_pPipe) - m_pPipe->removeMark(nPos); -} - - // SvOutputStream - // virtual sal_uLong SvOutputStream::GetData(void *, sal_uLong) { diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx index 3274c7e72b36..301036cb04b5 100644 --- a/svtools/inc/vclxaccessibleheaderbaritem.hxx +++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx @@ -58,7 +58,6 @@ private: protected: - void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 713b4c9ad774..fe8d62d3864a 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -3425,22 +3425,15 @@ void SvxIconChoiceCtrl_Impl::InitSettings() { // unit (from settings) is Point vcl::Font aFont( rStyleSettings.GetFieldFont() ); - //const vcl::Font& rFont = pView->GetFont(); - //if( pView->HasFontTextColor() ) - aFont.SetColor( rStyleSettings.GetWindowTextColor() ); - //if( pView->HasFontFillColor() ) - //aFont.SetFillColor( rFont.GetFillColor() ); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); pView->SetPointFont( aFont ); SetDefaultTextSize(); } - //if( !pView->HasFontTextColor() ) - pView->SetTextColor( rStyleSettings.GetFieldTextColor() ); - //if( !pView->HasFontFillColor() ) - pView->SetTextFillColor(); + pView->SetTextColor( rStyleSettings.GetFieldTextColor() ); + pView->SetTextFillColor(); - //if( !pView->HasBackground() ) - pView->SetBackground( rStyleSettings.GetFieldColor()); + pView->SetBackground( rStyleSettings.GetFieldColor()); long nScrBarSize = rStyleSettings.GetScrollBarSize(); if( nScrBarSize != nHorSBarHeight || nScrBarSize != nVerSBarWidth ) diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index e60e62f50cb7..6531f877736f 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -131,11 +131,6 @@ bool SvtIconChoiceCtrl::HasFont() const return false; } -bool SvtIconChoiceCtrl::HasFontTextColor() const -{ - return true; -} - bool SvtIconChoiceCtrl::HasFontFillColor() const { return true; diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index aadadd673070..f726a6a8fd80 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3633,10 +3633,6 @@ void SvTreeListBox::RequestHelp( const HelpEvent& rHEvt ) Control::RequestHelp( rHEvt ); } -void SvTreeListBox::CursorMoved( SvTreeListEntry* ) -{ -} - IMPL_LINK( SvTreeListBox, DefaultCompare, SvSortData*, pData ) { const SvTreeListEntry* pLeft = pData->pLeft; @@ -3933,10 +3929,6 @@ void SvTreeListBox::CallImplEventListeners(sal_uLong nEvent, void* pData) CallEventListeners(nEvent, pData); } -void SvTreeListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& /*rStateSet*/ ) const -{ -} - void SvTreeListBox::set_min_width_in_chars(sal_Int32 nChars) { nMinWidthInChars = nChars; diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index c9262a8eba7c..493ccc8beed4 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -132,13 +132,7 @@ bool SAL_CALL SvtRulerAccessible::isVisible() throw( RuntimeException ) return mpRepr->IsVisible(); } -bool SAL_CALL SvtRulerAccessible::isFocusTraversable() throw( RuntimeException ) -{ - return true; -} - //===== XAccessibleContext ================================================== - sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -293,36 +287,6 @@ void SAL_CALL SvtRulerAccessible::removeAccessibleEventListener( const uno::Refe } } -void SAL_CALL SvtRulerAccessible::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw( RuntimeException ) -{ - if( xListener.is() ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - ThrowExceptionIfNotAlive(); - - uno::Reference< awt::XWindow > xWindow = VCLUnoHelper::GetInterface( mpRepr ); - if( xWindow.is() ) - xWindow->addFocusListener( xListener ); - } -} - -void SAL_CALL SvtRulerAccessible::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (RuntimeException) -{ - if( xListener.is() ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - ThrowExceptionIfNotAlive(); - - uno::Reference< awt::XWindow > xWindow = VCLUnoHelper::GetInterface( mpRepr ); - if( xWindow.is() ) - xWindow->removeFocusListener( xListener ); - } -} - void SAL_CALL SvtRulerAccessible::grabFocus() throw( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -333,12 +297,6 @@ void SAL_CALL SvtRulerAccessible::grabFocus() throw( RuntimeException, std::exce mpRepr->GrabFocus(); } -Any SAL_CALL SvtRulerAccessible::getAccessibleKeyBinding() throw( RuntimeException ) -{ - // here is no implementation, because here are no KeyBindings for every object - return Any(); -} - sal_Int32 SvtRulerAccessible::getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 8aab2122293b..14d05edd3df7 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -427,8 +427,6 @@ awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException, std::excep return awt::Size( aOutSize.Width(), aOutSize.Height() ); } - - void SAL_CALL ToolbarMenuAcc::grabFocus() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -436,16 +434,6 @@ void SAL_CALL ToolbarMenuAcc::grabFocus() throw (RuntimeException, std::exceptio mpParent->mrMenu.GrabFocus(); } - - -Any SAL_CALL ToolbarMenuAcc::getAccessibleKeyBinding() throw (RuntimeException) -{ - ThrowIfDisposed(); - return Any(); -} - - - sal_Int32 SAL_CALL ToolbarMenuAcc::getForeground() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -453,8 +441,6 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getForeground() throw (RuntimeException, std: return static_cast<sal_Int32>(nColor); } - - sal_Int32 SAL_CALL ToolbarMenuAcc::getBackground() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -462,8 +448,6 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getBackground() throw (RuntimeException, std: return static_cast<sal_Int32>(nColor); } - - void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -472,8 +456,6 @@ void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) thr mpParent->selectAccessibleChild( nChildIndex ); } - - sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -909,29 +891,16 @@ awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() throw (RuntimeException, std:: return aRet; } - - void SAL_CALL ToolbarMenuEntryAcc::grabFocus() throw (RuntimeException, std::exception) { // nothing to do } - - -Any SAL_CALL ToolbarMenuEntryAcc::getAccessibleKeyBinding() throw (RuntimeException) -{ - return Any(); -} - - - sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getForeground( ) throw (RuntimeException, std::exception) { return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetMenuTextColor().GetColor()); } - - sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getBackground( ) throw (RuntimeException, std::exception) { return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetMenuColor().GetColor()); diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 55aca40b9cf4..8029dea5b303 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -162,7 +162,6 @@ public: 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; 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; @@ -250,7 +249,6 @@ public: 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; 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/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 56f515c3877a..f552ee5d030c 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -527,8 +527,6 @@ awt::Size SAL_CALL ValueSetAcc::getSize() return aRet; } - - void SAL_CALL ValueSetAcc::grabFocus() throw (uno::RuntimeException, std::exception) { @@ -537,17 +535,6 @@ void SAL_CALL ValueSetAcc::grabFocus() mpParent->GrabFocus(); } - - -uno::Any SAL_CALL ValueSetAcc::getAccessibleKeyBinding() - throw (uno::RuntimeException) -{ - ThrowIfDisposed(); - return uno::Any(); -} - - - sal_Int32 SAL_CALL ValueSetAcc::getForeground( ) throw (uno::RuntimeException, std::exception) { @@ -556,8 +543,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getForeground( ) return static_cast<sal_Int32>(nColor); } - - sal_Int32 SAL_CALL ValueSetAcc::getBackground( ) throw (uno::RuntimeException, std::exception) { @@ -566,8 +551,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getBackground( ) return static_cast<sal_Int32>(nColor); } - - void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -1090,8 +1073,6 @@ sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint ) return Rectangle( aNullPoint, aSize ).IsInside( aTestPoint ); } - - uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleAtPoint( const awt::Point& ) throw (uno::RuntimeException, std::exception) { @@ -1099,8 +1080,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl return xRet; } - - awt::Rectangle SAL_CALL ValueItemAcc::getBounds() throw (uno::RuntimeException, std::exception) { @@ -1124,8 +1103,6 @@ awt::Rectangle SAL_CALL ValueItemAcc::getBounds() return aRet; } - - awt::Point SAL_CALL ValueItemAcc::getLocation() throw (uno::RuntimeException, std::exception) { @@ -1138,8 +1115,6 @@ awt::Point SAL_CALL ValueItemAcc::getLocation() return aRet; } - - awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen() throw (uno::RuntimeException, std::exception) { @@ -1158,8 +1133,6 @@ awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen() return aRet; } - - awt::Size SAL_CALL ValueItemAcc::getSize() throw (uno::RuntimeException, std::exception) { @@ -1172,24 +1145,12 @@ awt::Size SAL_CALL ValueItemAcc::getSize() return aRet; } - - void SAL_CALL ValueItemAcc::grabFocus() throw (uno::RuntimeException, std::exception) { // nothing to do } - - -uno::Any SAL_CALL ValueItemAcc::getAccessibleKeyBinding() - throw (uno::RuntimeException) -{ - return uno::Any(); -} - - - sal_Int32 SAL_CALL ValueItemAcc::getForeground( ) throw (uno::RuntimeException, std::exception) { @@ -1197,8 +1158,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getForeground( ) return static_cast<sal_Int32>(nColor); } - - sal_Int32 SAL_CALL ValueItemAcc::getBackground( ) throw (uno::RuntimeException, std::exception) { @@ -1210,8 +1169,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getBackground( ) return static_cast<sal_Int32>(nColor); } - - sal_Int64 SAL_CALL ValueItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception ) { sal_Int64 nRet; diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 9773363eb213..d04207434810 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -138,7 +138,6 @@ public: 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; 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; @@ -258,7 +257,6 @@ public: 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; 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/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx index 80c566687ce4..dd504066c4c6 100644 --- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx +++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx @@ -55,22 +55,12 @@ VCLXAccessibleHeaderBarItem::VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() ); } - - VCLXAccessibleHeaderBarItem::~VCLXAccessibleHeaderBarItem() { delete m_pExternalLock; m_pExternalLock = NULL; } - - -void VCLXAccessibleHeaderBarItem::ProcessWindowEvent( const VclWindowEvent& ) -{ -} - - - void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { if ( m_pHeadBar ) @@ -87,10 +77,7 @@ void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( utl::AccessibleStateSe } } - // OCommonAccessibleComponent - - awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() throw (RuntimeException) { awt::Rectangle aBounds; diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index 9b5bcc5538f4..cddaf452732c 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -49,13 +49,11 @@ namespace svt { namespace table SetFillColor( aWindowColor ); } - TableDataWindow::~TableDataWindow() { impl_hideTipWindow(); } - void TableDataWindow::Paint( const Rectangle& rUpdateRect ) { m_rTableControl.doPaintContent( rUpdateRect ); @@ -66,17 +64,6 @@ namespace svt { namespace table Window::SetBackground( rColor ); } - void TableDataWindow::SetControlBackground( const Color& rColor ) - { - Window::SetControlBackground( rColor ); - } - - void TableDataWindow::SetControlBackground() - { - Window::SetControlBackground(); - } - - void TableDataWindow::RequestHelp( const HelpEvent& rHEvt ) { HelpEventMode const nHelpMode = rHEvt.GetMode(); diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx index 2c6848e0a4ff..13e1f1fcb0a7 100644 --- a/svtools/source/table/tabledatawindow.hxx +++ b/svtools/source/table/tabledatawindow.hxx @@ -59,8 +59,6 @@ namespace svt { namespace table virtual void MouseButtonDown( const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; - void SetControlBackground(const Color& rColor); - void SetControlBackground(); virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; void SetBackground(const Wallpaper& rColor); 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()) diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index e2230dc10c60..6b63023dbfc3 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -234,8 +234,6 @@ class SwDrawVirtObj : public SdrVirtObj inserted into the drawing layer. */ SwDrawContact& mrDrawContact; - using SdrVirtObj::GetPlusHdl; - protected: /** AW: Need own sdr::contact::ViewContact since AnchorPos from parent is not used but something own (top left of new SnapRect minus top left @@ -277,7 +275,6 @@ class SwDrawVirtObj : public SdrVirtObj virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; virtual ::basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; - SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const; virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE; diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx index 167a61d44c76..99ca2865a489 100644 --- a/sw/inc/dlelstnr.hxx +++ b/sw/inc/dlelstnr.hxx @@ -68,9 +68,6 @@ public: /// XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - /// XDictionaryListEventListener - void SAL_CALL processDictionaryListEvent( const ::com::sun::star::linguistic2::DictionaryListEvent& rDicListEvent) throw( ::com::sun::star::uno::RuntimeException ); - /// XLinguServiceEventListener virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 46eb057f6e9e..1b9b31775003 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -535,7 +535,6 @@ public: ::sw::DocumentContentOperationsManager const & GetDocumentContentOperationsManager() const; ::sw::DocumentContentOperationsManager & GetDocumentContentOperationsManager(); - void SetModified(SwPaM &rPaM); bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 ); bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen ); diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 913a8c5378ea..294bfa79bf7e 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -293,9 +293,6 @@ public: read by the binary filter: */ virtual void UpdateLinks() SAL_OVERRIDE; - void setDocAccTitle( const OUString& rTitle ); - const OUString getDocAccTitle() const; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > GetController(); diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 2c7e45ae1052..17bc9b7896dd 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -45,7 +45,6 @@ public: virtual ~SwRedlineExtraData(); virtual SwRedlineExtraData* CreateNew() const = 0; - void Accept( SwPaM& rPam ) const; virtual void Reject( SwPaM& rPam ) const; virtual bool operator == ( const SwRedlineExtraData& ) const; }; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index d992909534b0..c5f626f2c637 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -420,7 +420,6 @@ public: virtual void SetupFilterOptions(SfxMedium& rMedium); - void SetVersion( const OUString&, long ); virtual bool IsStgWriter() const; void SetShowProgress( bool bFlag = false ) { bShowProgress = bFlag; } diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 414bf5141473..4e9d8ededea6 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -966,13 +966,6 @@ void SAL_CALL SwAccessibleContext::grabFocus() } } -uno::Any SAL_CALL SwAccessibleContext::getAccessibleKeyBinding() - throw (uno::RuntimeException) -{ - // There are no key bindings - return uno::Any(); -} - sal_Int32 SAL_CALL SwAccessibleContext::getForeground() throw (uno::RuntimeException, std::exception) { diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 8d7ae18633b2..9069e3128f8e 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -297,8 +297,6 @@ public: 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() diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index 055cee8ac7dc..7eae97787740 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -447,17 +447,6 @@ namespace sw { namespace mark pResult->second >>= bResult; return bResult; } - - OUString CheckboxFieldmark::toString( ) const - { - - return "CheckboxFieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( " - + m_aName + ", " + GetFieldname() + ", [ " - + OUString::number(GetMarkPos().nNode.GetIndex( ) ) + ", " - + OUString::number( GetMarkPos( ).nContent.GetIndex( ) ) + " ], [" - + OUString::number( GetOtherMarkPos().nNode.GetIndex( ) ) + ", " - + OUString::number( GetOtherMarkPos( ).nContent.GetIndex( ) ) + " ] ) "; - } }} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index e4e8138ad408..e78b2f4a59a8 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -1133,11 +1133,6 @@ namespace sw { namespace mark sortSubsetMarks(); } - bool MarkManager::hasMark(const OUString& rName) const - { - return (m_aMarkNamesSet.find(rName) != m_aMarkNamesSet.end()); - } - void MarkManager::dumpAsXml(xmlTextWriterPtr pWriter) const { xmlTextWriterStartElement(pWriter, BAD_CAST("markManager")); diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 24b31c5fc018..5f00cc5326f7 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -273,12 +273,6 @@ void _SaveRedlEndPosForRestore::_Restore() } } -void SwDoc::SetModified(SwPaM &rPaM) -{ - SwDataChanged aTmp( rPaM ); - getIDocumentState().SetModified(); -} - /// Convert list of ranges of whichIds to a corresponding list of whichIds static std::vector<sal_uInt16> * lcl_RangesToVector(sal_uInt16 * pRanges) { diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 52e2e805e1cb..3898d0e430fa 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -567,10 +567,6 @@ SwRedlineExtraData::~SwRedlineExtraData() { } -void SwRedlineExtraData::Accept( SwPaM& ) const -{ -} - void SwRedlineExtraData::Reject( SwPaM& ) const { } diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index e3e9a6e2f5b8..09e104d60696 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -2352,22 +2352,6 @@ SdrHdl* SwDrawVirtObj::GetHdl(sal_uInt32 nHdlNum) const return pHdl; } -SdrHdl* SwDrawVirtObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const -{ - SdrHdl* pHdl = rRefObj.GetPlusHdl(rHdl, nPlNum); - - if(pHdl) - { - pHdl->SetPos(pHdl->GetPos() + GetOffset()); - } - else - { - OSL_ENSURE(false, "Got no SdrHdl(!)"); - } - - return pHdl; -} - void SwDrawVirtObj::NbcMove(const Size& rSiz) { SdrObject::NbcMove( rSiz ); diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index 636389da14f3..d5f99f75ad83 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -68,7 +68,6 @@ namespace sw { virtual const_iterator_t getAllMarksEnd() const SAL_OVERRIDE; virtual sal_Int32 getAllMarksCount() const SAL_OVERRIDE; virtual const_iterator_t findMark(const OUString& rName) const SAL_OVERRIDE; - bool hasMark(const OUString& rName) const; // bookmarks virtual const_iterator_t getBookmarksBegin() const SAL_OVERRIDE; diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index b6f21ee293be..d87f925ddeda 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -79,7 +79,6 @@ public: virtual bool IsOnlyTextBlock( const OUString& rShort ) const SAL_OVERRIDE; bool IsOnlyTextBlock( sal_uInt16 nIdx ) const; void SetIsTextOnly( const OUString& rShort, bool bNewValue ); - void SetIsTextOnly( sal_uInt16 nIdx, bool bNewValue ); virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTbl, bool bFileAlreadyOpen = false ) SAL_OVERRIDE; diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index ebdfbdf23240..a47040b75e8f 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -253,8 +253,6 @@ namespace sw { virtual void ReleaseDoc(SwDoc* const pDoc) SAL_OVERRIDE; bool IsChecked() const SAL_OVERRIDE; void SetChecked(bool checked) SAL_OVERRIDE; - - OUString toString( ) const; }; } } diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 6b32e2dd0e7c..24030021fb15 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -197,15 +197,6 @@ public: virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //XTextContent - void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException); - - //XComponent - void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - //XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 7311dd904c16..5234dce06df4 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -504,11 +504,6 @@ void SwXMLTextBlocks::SetIsTextOnly( const OUString& rShort, bool bNewValue ) aNames[nIdx]->bIsOnlyTxt = bNewValue; } -void SwXMLTextBlocks::SetIsTextOnly( sal_uInt16 nIdx, bool bNewValue ) -{ - aNames[nIdx]->bIsOnlyTxt = bNewValue; -} - bool SwXMLTextBlocks::IsOnlyTextBlock( const OUString& rShort ) const { sal_uInt16 nIdx = GetIndex ( rShort ); diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 680f83d01c38..4381323cd660 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -845,56 +845,6 @@ uno::Any SwXTextPortion::getPropertyDefault(const OUString& rPropertyName) return aRet; } -void SwXTextPortion::attach(const uno::Reference< text::XTextRange > & /*xTextRange*/) - throw( lang::IllegalArgumentException, uno::RuntimeException ) -{ - SolarMutexGuard aGuard; - // SwXTextPortion cannot be created at the factory therefore - // they cannot be attached - throw uno::RuntimeException(); -} - -uno::Reference< text::XTextRange > SwXTextPortion::getAnchor() -throw( uno::RuntimeException ) -{ - SolarMutexGuard aGuard; - uno::Reference< text::XTextRange > aRet; - SwUnoCrsr* pUnoCrsr = GetCursor(); - if (!pUnoCrsr) - throw uno::RuntimeException(); - - aRet = new SwXTextRange(*pUnoCrsr, m_xParentText); - return aRet; -} - -void SwXTextPortion::dispose() -throw( uno::RuntimeException ) -{ - SolarMutexGuard aGuard; - SwUnoCrsr* pUnoCrsr = GetCursor(); - if (!pUnoCrsr) - throw uno::RuntimeException(); - - setString(OUString()); - pUnoCrsr->Remove(this); -} - -void SAL_CALL SwXTextPortion::addEventListener( - const uno::Reference<lang::XEventListener> & xListener) -throw (uno::RuntimeException) -{ - // no need to lock here as m_pImpl is const and container threadsafe - m_pImpl->m_EventListeners.addInterface(xListener); -} - -void SAL_CALL SwXTextPortion::removeEventListener( - const uno::Reference<lang::XEventListener> & xListener) -throw (uno::RuntimeException) -{ - // no need to lock here as m_pImpl is const and container threadsafe - m_pImpl->m_EventListeners.removeInterface(xListener); -} - uno::Reference< container::XEnumeration > SwXTextPortion::createContentEnumeration(const OUString& /*aServiceName*/) throw( uno::RuntimeException, std::exception ) { diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 558308031d78..3d909bf5d285 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -191,8 +191,6 @@ SwRead GetReader( const OUString& rFltName ) } // namespace SwReaderWriter -void Writer::SetVersion( const OUString&, long ) {} - bool Writer::IsStgWriter() const { return false; } bool StgWriter::IsStgWriter() const { return true; } diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 48ebe66b5ecc..ae2fbd2b5470 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -457,11 +457,6 @@ void DocxExport::ExportDocument_Impl() delete m_pSections, m_pSections = NULL; } -void DocxExport::OutputPageSectionBreaks( const SwTxtNode& ) -{ - OSL_TRACE( "TODO DocxExport::OutputPageSectionBreaks( const SwTxtNode& )" ); -} - void DocxExport::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) { AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo() ); @@ -505,11 +500,6 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode ) } } -void DocxExport::OutputTableNode( const SwTableNode& ) -{ - OSL_TRACE( "TODO DocxExport::OutputTableNode( const SwTableNode& )" ); -} - void DocxExport::OutputGrfNode( const SwGrfNode& ) { OSL_TRACE( "TODO DocxExport::OutputGrfNode( const SwGrfNode& )" ); diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 0f1c655c0bd8..37816385c5c5 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -185,15 +185,9 @@ protected: /// Format-dependent part of the actual export. virtual void ExportDocument_Impl() SAL_OVERRIDE; - /// Output page/section breaks - void OutputPageSectionBreaks( const SwTxtNode& ); - /// Output SwEndNode virtual void OutputEndNode( const SwEndNode& ) SAL_OVERRIDE; - /// Output SwTableNode - void OutputTableNode( const SwTableNode& ); - /// Output SwGrfNode virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE; diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index ea37915e97fd..347852192e3c 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -794,9 +794,6 @@ protected: /// Output SwTxtNode virtual void OutputTextNode( const SwTxtNode& ); - /// Output SwTableNode - void OutputTableNode( const SwTableNode& ); - /// Setup the chapter fields (maChapterFieldLocs). void GatherChapterFields(); diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index 636ff94799b9..ff682479f3d9 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -51,11 +51,6 @@ SwVbaApplication::~SwVbaApplication() { } -SfxObjectShell* SwVbaApplication::GetDocShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) -{ - return static_cast< SfxObjectShell* >( word::getDocShell( xModel ) ); -} - OUString SAL_CALL SwVbaApplication::getName() throw (uno::RuntimeException, std::exception) { diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index a0a25380860c..6cd948cbab91 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -39,8 +39,6 @@ public: SwVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext ); virtual ~SwVbaApplication(); - SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); - // XApplication virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx index 9bfd3c2c1758..60783cf5139f 100644 --- a/sw/source/ui/vba/vbatable.cxx +++ b/sw/source/ui/vba/vbatable.cxx @@ -70,14 +70,6 @@ SwVbaTable::Delete( ) throw (script::BasicErrorException, uno::RuntimeException xRows->removeByIndex( 0, xRows->getCount() ); } -uno::Reference< word::XRange > SAL_CALL -SwVbaTable::ConvertToText( const uno::Any& /*Separator*/, const uno::Any& /*NestedTables*/ ) throw (script::BasicErrorException, uno::RuntimeException) -{ - // #FIXME the helper api uses the dreaded dispatch mechanism, holding off - // implementation while I look for alternative solution - throw uno::RuntimeException(); -} - OUString SAL_CALL SwVbaTable::getName() throw (uno::RuntimeException, std::exception) { diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx index e80e362925f2..5886dc33fd20 100644 --- a/sw/source/ui/vba/vbatable.hxx +++ b/sw/source/ui/vba/vbatable.hxx @@ -37,7 +37,6 @@ public: virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 285b5a07d1d0..f86fe619530a 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1208,25 +1208,6 @@ uno::Reference< frame::XController > return aRet; } -void SwDocShell::setDocAccTitle( const OUString& rTitle ) -{ - if (mpDoc) - { - mpDoc->setDocAccTitle( rTitle ); - } -} - -const OUString SwDocShell::getDocAccTitle() const -{ - OUString sRet; - if (mpDoc) - { - sRet = mpDoc->getDocAccTitle(); - } - - return sRet; -} - static const char* s_EventNames[] = { "OnPageCountChange", diff --git a/sw/source/uibase/cctrl/popbox.cxx b/sw/source/uibase/cctrl/popbox.cxx index 0711ca0eba6d..1ef4113a634b 100644 --- a/sw/source/uibase/cctrl/popbox.cxx +++ b/sw/source/uibase/cctrl/popbox.cxx @@ -40,14 +40,6 @@ void SwHelpToolBox::MouseButtonDown(const MouseEvent &rEvt) ToolBox::MouseButtonDown(rEvt); } -long SwHelpToolBox::DoubleClick( ToolBox* pCaller ) -{ - // No doubleclick on button - if( 0 == pCaller->GetCurItemId() && aDoubleClickLink.Call(0) ) - return sal_True; - return sal_False; -} - SwHelpToolBox::~SwHelpToolBox() {} sal_Int8 SwHelpToolBox::AcceptDrop( const AcceptDropEvent& rEvt ) diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 3554d9779596..6666249466da 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -6228,19 +6228,6 @@ Selection SwEditWin::GetSurroundingTextSelection() const } } -// MT: Removed Windows::SwitchView() introduced with IA2 CWS. -// There are other notifications for this when the active view has changed, so please update the code to use that event mechanism -void SwEditWin::SwitchView() -{ -#ifdef ACCESSIBLE_LAYOUT - if (!Application::IsAccessibilityEnabled()) - { - return ; - } - rView.GetWrtShell().InvalidateAccessibleFocus(); -#endif -} - void SwEditWin::LogicInvalidate(const vcl::Region* pRegion) { OString sRectangle; @@ -6256,10 +6243,6 @@ void SwEditWin::LogicInvalidate(const vcl::Region* pRegion) m_rView.GetWrtShell().libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, sRectangle.getStr()); } -void SwEditWin::LogicMouseMove(const MouseEvent& /*rMouseEvent*/) -{ -} - void SwEditWin::LogicMouseButtonDown(const MouseEvent& rMouseEvent) { // When we're not doing tiled rendering, then positions must be passed as pixels. diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 79273b06054b..7867f957c8a8 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -198,7 +198,6 @@ public: virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE; - sal_Int32 GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const; using Control::Notify; // FIXME why do we have 2 of these virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index c1018f8f5132..5557321a5a1a 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -295,15 +295,12 @@ public: SwEditWin(vcl::Window *pParent, SwView &); virtual ~SwEditWin(); - void SwitchView(); /** * Notification about some region of the output device got invalidated. * * @param pRegion If 0, that means the whole area, otherwise the area in logic coordinates. */ void LogicInvalidate(const vcl::Region* pRegion) SAL_OVERRIDE; - /// Same as MouseMove(), but coordinates are in logic unit. - void LogicMouseMove(const MouseEvent& rMouseEvent); /// Same as MouseButtonDown(), but coordinates are in logic unit. void LogicMouseButtonDown(const MouseEvent& rMouseEvent); /// Same as MouseButtonUp(), but coordinates are in logic unit. diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 02c47361374f..3fa73332defc 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -115,8 +115,6 @@ class SwNavigationPI : public vcl::Window, void MakeVisible(); void InitImageList(); - SfxChildAlignment - CheckAlignment(SfxChildAlignment,SfxChildAlignment); void SetPopupWindow( SfxPopupWindow* ); using Window::Notify; @@ -124,7 +122,6 @@ class SwNavigationPI : public vcl::Window, protected: - bool Close(); virtual void Resize() SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx index fd90c912c6c5..0dbbb48bf9bf 100644 --- a/sw/source/uibase/inc/popbox.hxx +++ b/sw/source/uibase/inc/popbox.hxx @@ -33,7 +33,6 @@ class SwHelpToolBox: public ToolBox, public DropTargetHelper protected: virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE; - long DoubleClick(ToolBox *); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index feeb45f2c784..d486f1764ba5 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -141,7 +141,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; - void SwitchView(); }; /** diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 2cc610fde482..5c8629535f77 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1826,22 +1826,6 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > return GetAccessible( false ); } -// 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 SwPagePreviewWin::SwitchView() -{ -#ifdef ACCESSIBLE_LAYOUT - if (!Application::IsAccessibilityEnabled()) - { - return ; - } - if (mpViewShell) - { - mpViewShell->InvalidateAccessibleFocus(); - } -#endif -} - void SwPagePreview::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions) { GetViewShell()->ApplyAccessiblityOptions(rAccessibilityOptions); diff --git a/sw/source/uibase/uno/dlelstnr.cxx b/sw/source/uibase/uno/dlelstnr.cxx index c57a6e5ee2ac..da97f5f18d56 100644 --- a/sw/source/uibase/uno/dlelstnr.cxx +++ b/sw/source/uibase/uno/dlelstnr.cxx @@ -72,31 +72,6 @@ SwLinguServiceEventListener::~SwLinguServiceEventListener() { } -void SwLinguServiceEventListener::processDictionaryListEvent( - const DictionaryListEvent& rDicListEvent) - throw( RuntimeException ) -{ - SolarMutexGuard aGuard; - - sal_Int16 nEvt = rDicListEvent.nCondensedEvent; - - sal_Int16 nSpellWrongFlags = - DictionaryListEventFlags::ADD_POS_ENTRY | - DictionaryListEventFlags::DEL_NEG_ENTRY | - DictionaryListEventFlags::ACTIVATE_POS_DIC | - DictionaryListEventFlags::DEACTIVATE_NEG_DIC; - bool bIsSpellWrong = 0 != (nEvt & nSpellWrongFlags); - sal_Int16 nSpellAllFlags = - DictionaryListEventFlags::ADD_NEG_ENTRY | - DictionaryListEventFlags::DEL_POS_ENTRY | - DictionaryListEventFlags::ACTIVATE_NEG_DIC | - DictionaryListEventFlags::DEACTIVATE_POS_DIC; - bool bIsSpellAll = 0 != (nEvt & nSpellAllFlags); - - if (bIsSpellWrong || bIsSpellAll) - SW_MOD()->CheckSpellChanges( false, bIsSpellWrong, bIsSpellAll, false ); -} - void SAL_CALL SwLinguServiceEventListener::processLinguServiceEvent( const LinguServiceEvent& rLngSvcEvent ) throw(RuntimeException, std::exception) diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 9b89a7b39dd0..17cd635f6497 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -3542,18 +3542,4 @@ SwNavigationPI* SwContentTree::GetParentWindow() return static_cast<SwNavigationPI*>(Window::GetParent()); } -sal_Int32 SwContentTree::GetEntryRealChildrenNum( SvTreeListEntry* pParent ) const -{ - // ist es ein Inhaltstyp? - if(lcl_IsContentType(pParent)) - { - if(!pParent->HasChildren()) - { - SwContentType* pCntType = (SwContentType*)pParent->GetUserData(); - return pCntType->GetMemberCount(); - } - } - return 0; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 5b17227521e5..00f4b67c7b0b 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -488,16 +488,7 @@ IMPL_LINK( SwNavigationPI, EditGetFocus, NumEditAction *, pEdit ) return 0; } -bool SwNavigationPI::Close() -{ - SfxViewFrame* pVFrame = pCreateView->GetViewFrame(); - pVFrame->GetBindings().Invalidate(SID_NAVIGATOR); - pVFrame->GetDispatcher()->Execute(SID_NAVIGATOR); - return true; -} - // Setting of an automatic mark - void SwNavigationPI::MakeMark() { SwView *pView = GetCreateView(); @@ -952,47 +943,7 @@ NumEditAction& SwNavigationPI::GetPageEdit() return *static_cast<NumEditAction*>(aContentToolBox.GetItemWindow(FN_PAGENUMBER)); } -SfxChildAlignment SwNavigationPI::CheckAlignment - ( - SfxChildAlignment eActAlign, - SfxChildAlignment eAlign - ) -{ -SfxChildAlignment eRetAlign; - - if(_IsZoomedIn()) - eRetAlign = SFX_ALIGN_NOALIGNMENT; - else - switch (eAlign) - { - case SFX_ALIGN_BOTTOM: - case SFX_ALIGN_LOWESTBOTTOM: - case SFX_ALIGN_HIGHESTBOTTOM: - eRetAlign = eActAlign; - break; - - case SFX_ALIGN_TOP: - case SFX_ALIGN_HIGHESTTOP: - case SFX_ALIGN_LOWESTTOP: - 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; - break; - - default: - eRetAlign = eAlign; - break; - } - return eRetAlign; - -} - // Notification on modified DocInfo - void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint ) { if(&rBrdc == pCreateView) diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java index 5788452f6477..3d4df2c5ff19 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java @@ -40,7 +40,6 @@ import com.sun.star.uno.XInterface; * <li><code> getLocationOnScreen()</code></li> * <li><code> getSize()</code></li> * <li><code> grabFocus()</code></li> - * <li><code> getAccessibleKeyBinding()</code></li> * </ul> <p> * * @see com.sun.star.accessibility.XAccessibleComponent diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index cfc6b152e27a..0c92655da6a7 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -184,23 +184,6 @@ void VCLXGraphics::setFont( const uno::Reference< awt::XFont >& rxFont ) throw(u maFont = VCLUnoHelper::CreateFont( rxFont ); } -uno::Reference< awt::XFont > VCLXGraphics::getFont() throw(uno::RuntimeException) -{ - uno::Reference< awt::XFont > xFont; - uno::Reference< awt::XDevice > xDevice( getDevice() ); - - SolarMutexGuard aGuard; - - if ( xDevice.is() ) - { - VCLXFont *pFont = new VCLXFont; - pFont->Init( *xDevice.get(), maFont ); - xFont.set( static_cast< ::cppu::OWeakObject* >( pFont ), uno::UNO_QUERY ); - } - - return xFont; -} - void VCLXGraphics::selectFont( const awt::FontDescriptor& rDescription ) throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -215,12 +198,6 @@ void VCLXGraphics::setTextColor( sal_Int32 nColor ) throw(uno::RuntimeException, maTextColor = Color( (sal_uInt32)nColor ); } -::sal_Int32 VCLXGraphics::getTextColor() throw(uno::RuntimeException) -{ - SolarMutexGuard aGuard; - return maTextColor.GetColor(); -} - void VCLXGraphics::setTextFillColor( sal_Int32 nColor ) throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -228,12 +205,6 @@ void VCLXGraphics::setTextFillColor( sal_Int32 nColor ) throw(uno::RuntimeExcept maTextFillColor = Color( (sal_uInt32)nColor ); } -::sal_Int32 VCLXGraphics::getTextFillColor() throw(uno::RuntimeException) -{ - SolarMutexGuard aGuard; - return maTextFillColor.GetColor(); -} - void VCLXGraphics::setLineColor( sal_Int32 nColor ) throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -241,12 +212,6 @@ void VCLXGraphics::setLineColor( sal_Int32 nColor ) throw(uno::RuntimeException, maLineColor = Color( (sal_uInt32)nColor ); } -::sal_Int32 VCLXGraphics::getLineColor() throw(uno::RuntimeException) -{ - SolarMutexGuard aGuard; - return maLineColor.GetColor(); -} - void VCLXGraphics::setFillColor( sal_Int32 nColor ) throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -254,12 +219,6 @@ void VCLXGraphics::setFillColor( sal_Int32 nColor ) throw(uno::RuntimeException, maFillColor = Color( (sal_uInt32)nColor ); } -::sal_Int32 VCLXGraphics::getFillColor() throw(uno::RuntimeException) -{ - SolarMutexGuard aGuard; - return maFillColor.GetColor(); -} - void VCLXGraphics::setRasterOp( awt::RasterOperation eROP ) throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -267,13 +226,6 @@ void VCLXGraphics::setRasterOp( awt::RasterOperation eROP ) throw(uno::RuntimeEx meRasterOp = (RasterOp)eROP; } -awt::RasterOperation VCLXGraphics::getRasterOp() -throw(uno::RuntimeException) -{ - SolarMutexGuard aGuard; - return (awt::RasterOperation) meRasterOp; -} - void VCLXGraphics::setClipRegion( const uno::Reference< awt::XRegion >& rxRegion ) throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index b384af37139c..d8084d46832e 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -313,13 +313,6 @@ namespace toolkit } - Any SAL_CALL OAccessibleControlContext::getAccessibleKeyBinding( ) throw (RuntimeException) - { - // we do not have any key bindings to activate a UNO control in design mode - return Any(); - } - - sal_Int32 SAL_CALL OAccessibleControlContext::getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index f39bc6228e77..d1ec8379489b 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -2851,25 +2851,6 @@ sal_Size INetMIMEOutputSink::writeSequence(const sal_Char * pSequence) } // virtual -void INetMIMEOutputSink::writeSequence(const sal_uInt32 * pBegin, - const sal_uInt32 * pEnd) -{ - DBG_ASSERT(pBegin && pBegin <= pEnd, - "INetMIMEOutputSink::writeSequence(): Bad sequence"); - - sal_Char * pBufferBegin = new sal_Char[pEnd - pBegin]; - sal_Char * pBufferEnd = pBufferBegin; - while (pBegin != pEnd) - { - DBG_ASSERT(*pBegin < 256, - "INetMIMEOutputSink::writeSequence(): Bad octet"); - *pBufferEnd++ = sal_Char(*pBegin++); - } - writeSequence(pBufferBegin, pBufferEnd); - delete[] pBufferBegin; -} - -// virtual void INetMIMEOutputSink::writeSequence(const sal_Unicode * pBegin, const sal_Unicode * pEnd) { diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index b99eb6dfb212..eda6a419ebfc 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -768,27 +768,6 @@ namespace DOM { return OUString(); } - - void SAL_CALL CElement::setElementName(const OUString& aName) - throw (RuntimeException, DOMException) - { - if (aName.isEmpty() || (0 <= aName.indexOf(':'))) - { - DOMException e; - e.Code = DOMExceptionType_INVALID_CHARACTER_ERR; - throw e; - } - - ::osl::MutexGuard const g(m_rMutex); - - if (0 == m_aNodePtr) { - throw RuntimeException(); - } - OString oName = OUStringToOString(aName, RTL_TEXTENCODING_UTF8); - xmlChar const *xName = reinterpret_cast<xmlChar const *>(oName.getStr()); - xmlNodeSetName(m_aNodePtr, xName); - } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx index 59f105646c10..8afbc4286bab 100644 --- a/unoxml/source/dom/element.hxx +++ b/unoxml/source/dom/element.hxx @@ -159,12 +159,6 @@ namespace DOM const OUString& namespaceURI, const OUString& qualifiedName, const OUString& value) throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE; - /** - sets the element name - */ - void SAL_CALL setElementName(const OUString& elementName) - throw (css::uno::RuntimeException, css::xml::dom::DOMException); - // overrides for XNode base virtual OUString SAL_CALL getNodeName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/unusedcode.easy b/unusedcode.easy index 6fa37f56aa28..336374e606f9 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,5 +1,15 @@ BigInt::BigInt(unsigned int) +CalendarWrapper::getDSTOffsetInMillis() const +CalendarWrapper::getZoneOffsetInMillis() const FontCharMap::GetDefaultMap(bool) +Interceptor::addEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&) +Interceptor::removeEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&) +LineListBox::Clear() +LineListBox::InsertEntry(rtl::OUString const&, int) +LineListBox::RemoveEntry(int) +Menu::RequestHelp(HelpEvent const&) +OCommonEmbeddedObject::getImplementationId() +OOoEmbeddedObjectFactory::createInstanceLinkUserInit(com::sun::star::uno::Sequence<signed char> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) OpenGLContext::init(_XDisplay*, unsigned long, unsigned int, unsigned int, int) OpenGLContext::renderToFile() OpenGLContext::requestSingleBufferedRendering() @@ -14,42 +24,93 @@ OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const OutputDevice::LogicToPixel(vcl::Region const&, MapMode const&) const OutputDevice::PixelToLogic(vcl::Region const&, MapMode const&) const +Picture::Type() Primitive2dXmlDump::filterActionType(unsigned short, bool) Primitive2dXmlDump::filterAllActionTypes() +Printer::Error() SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*) +SalGtkFilePicker::disposing(com::sun::star::lang::EventObject const&) +SalGtkFolderPicker::disposing(com::sun::star::lang::EventObject const&) +SbModule::SetSource(rtl::OUString const&) ScBroadcastAreaSlotMachine::AreaBroadcastInRange(ScRange const&, ScHint const&) const ScCellValue::set(ScRefCellValue const&) +ScCondFormatManagerDlg::IsInRefMode() const +ScConsolidateItem::GetValueText() const +ScDocShell::Activate() +ScDocShell::Deactivate() ScDocument::CreateFormatTable() const ScDocument::EndAllListeners(ScRange const&) -ScFormulaCellGroup::scheduleCompilation() +ScDoubleItem::GetValueText() const +ScInputStatusItem::GetValueText() const +ScMergeAttr::GetValueText() const +ScPageHFItem::GetValueText() const +ScPivotItem::GetValueText() const +ScPreviewShell::GetDescription() const +ScPrivatSplit::GetDeltaX() +ScQueryItem::GetValueText() const +ScSolveItem::GetValueText() const +ScSortItem::GetValueText() const +ScSubTotalItem::GetValueText() const +ScTabOpItem::GetValueText() const +ScTabViewShell::GetDescription() const +ScTbxInsertCtrl::Select(bool) +ScTpCalcItem::GetValueText() const +ScTpDefaultsItem::GetValueText() const +ScTpFormulaItem::GetValueText() const +ScTpPrintItem::GetValueText() const +ScTpViewItem::GetValueText() const +ScUserListItem::GetValueText() const ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) +ScViewObjectModeItem::GetValueText(unsigned short) const +SecurityEnvironment_NssImpl::getCertificate(rtl::OUString const&, rtl::OUString const&) SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*) +SfxBoolItem::GetValueCount() const +SfxFrameItem::GetValueText() const +SfxObjectShellItem::GetValueText() const +SfxProgress::SetText(rtl::OUString const&) +SfxTemplateDialog_Impl::Command(CommandEvent const&) +SfxViewFrameItem::GetValueText() const +SotObject::GetInterface(SvGlobalName const&) +StylePool::getCount() const StyleSettings::SetAlternatingRowColor(Color const&) StyleSettings::SetCursorSize(long) StyleSettings::SetFloatTitleHeight(long) StyleSettings::SetHideDisabledMenuItems(bool) -StyleSettings::SetRowColor(Color const&) StyleSettings::SetSpinSize(long) StyleSettings::SetTitleHeight(long) StyleSettings::SetUseFlatBorders(bool) StyleSettings::SetUseFlatMenus(bool) +SvpSalFrame::enableDamageTracker(bool) SvpSalInstance::PostedEventsInQueue() SvtListener::IsListening(SvtBroadcaster&) const +SvxColorTabPage::GetPropertyList(XPropertyListType) +SvxColumnItem::GetValueText() const +SvxDoubleItem::GetMax() const +SvxDoubleItem::GetMin() const +SvxDoubleItem::GetUnit() const +SvxDummyTextSource::SetNotifyHdl(Link const&) SvxFontListBox::GetSelectEntry() const +SvxFontWorkDialog::Zoom() +SvxFormatCellsDialog::Apply() +SvxLongLRSpaceItem::GetValueText() const +SvxLongULSpaceItem::GetValueText() const +SvxNewTableDialog::Apply() +SvxObjectItem::GetValueText() const SvxOpenGLObject::getRenderer() SvxOpenGLObject::setRenderer(IOpenGLRenderer*) +SvxPagePosSizeItem::GetValueText() const +SvxRotateModeItem::GetValueText(unsigned short) const +SwSelPaintRects::Paint(Rectangle const&) Test::testCopyPasteSkipEmptyConditionalFormatting() Test::testPerf() Test::testSharedFormulaMoveBlock() -VCLXGraphics::getFillColor() -VCLXGraphics::getFont() -VCLXGraphics::getLineColor() -VCLXGraphics::getRasterOp() -VCLXGraphics::getTextColor() -VCLXGraphics::getTextFillColor() +ToolBox::UserDraw(UserDrawEvent const&) +UnxPluginComm::NPP_GetMIMEDescription() +X11SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&) XclXmlUtils::ToOString(XclRange const&) XmlTestTools::parseXml(utl::TempFile&) +accessibility::AccessibleOutlineView::FireEvent(com::sun::star::accessibility::AccessibleEventObject const&) apitest::CellProperties::testRotateReference() apitest::CellProperties::testVertJustify() apitest::DataPilotField::testAutoShowInfo() @@ -170,13 +231,53 @@ comphelper::OAccessibleImplementationAccess::setStateBit(short, bool) comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const +connectivity::dbase::ODbaseResultSet::createAnalyzer() connectivity::firebird::release(int&, cppu::OBroadcastHelperVar<cppu::OMultiTypeInterfaceContainerHelper, com::sun::star::uno::Type>&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&, com::sun::star::lang::XComponent*) connectivity::odbc::appendSQLWCHARs(rtl::OUStringBuffer&, wchar_t const*, int) connectivity::sdbcx::OGroup::OGroup(bool) connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, bool) +connectivity::sdbcx::OView::disposing() +dbaccess::OBookmarkContainer::dispose() +dbaccess::ODatabaseDocument::disposing(com::sun::star::lang::EventObject const&) +dbaccess::StorageInputStream::close() +dbaui::OConnectionLineAccess::contains(com::sun::star::awt::Point const&) +dbaui::OConnectionLineAccess::isEditable() const +dbaui::OConnectionLineAccess::isFocusTraversable() +dbaui::OConnectionLineAccess::isShowing() +dbaui::OConnectionLineAccess::isVisible() +dbaui::OGenericUnoController::InvalidateFeature(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::frame::XStatusListener> const&, bool) +dbaui::OJoinDesignViewAccess::isEditable() const +dbaui::OJoinTableView::StartDrag(signed char, Point const&) +dbaui::OPropColumnEditCtrl::SetSpecialReadOnly(bool) +dbaui::OPropEditCtrl::SetSpecialReadOnly(bool) +dbaui::OPropListBoxCtrl::SetSpecialReadOnly(bool) +dbaui::OQueryViewSwitch::resizeDocumentView(Rectangle&) +dbaui::OQueryViewSwitch::setReadOnly(bool) +dbaui::OSelectionBrowseBox::GetDefaultColumnWidth(rtl::OUString const&) const +dbaui::OTableController::Load(com::sun::star::uno::Reference<com::sun::star::io::XObjectInputStream> const&) +dbaui::OTableController::Save(com::sun::star::uno::Reference<com::sun::star::io::XObjectOutputStream> const&) +dbaui::OTableEditorCtrl::Redo() +dbaui::OTableEditorCtrl::Undo() +dbaui::OTableEditorCtrl::UpdateAll() +dbaui::OTableRowView::SetUpdatable(bool) +dbaui::OTableWindowAccess::isEditable() const +dbtools::FormattedColumnValue::getColumnUpdate() const +dbtools::FormattedColumnValue::getFieldType() const +dbtools::FormattedColumnValue::getFormatKey() const +dp_registry::backend::RegisteredDb::getEntry(rtl::OUString const&) +frm::OComponentEventThread::kill() oglcanvas::CanvasHelper::flush() const oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const +oox::core::FilterDetectDocHandler::ignorableWhitespace(rtl::OUString const&) +oox::core::FilterDetectDocHandler::processingInstruction(rtl::OUString const&, rtl::OUString const&) +oox::docprop::OOXMLDocPropHandler::ignorableWhitespace(rtl::OUString const&) +oox::docprop::OOXMLDocPropHandler::processingInstruction(rtl::OUString const&, rtl::OUString const&) oox::drawingml::TextListStyle::dump() const +property::OPropertySet::disposePropertySet() +rptui::OCustomShape::GetStep() const +rptui::ODesignView::setReadOnly(bool) +rptui::OOle2Obj::GetStep() const +rptui::OUnoObject::GetStep() const sc::CLBuildKernelThread::CLBuildKernelThread() sc::CLBuildKernelThread::consume() sc::CLBuildKernelThread::finish() @@ -190,7 +291,6 @@ sc::FormulaGroupAreaListener::isEndFixed() const sc::FormulaGroupAreaListener::isStartFixed() const sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) -sdr::contact::ViewContactOfTextObj::GetTextObj() const std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&) std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long) -vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool) +sw::mark::MarkManager::hasMark(rtl::OUString const&) const diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx index 65a67c596fc5..0fb20d801e89 100644 --- a/vcl/null/printerinfomanager.cxx +++ b/vcl/null/printerinfomanager.cxx @@ -101,11 +101,6 @@ bool PrinterInfoManager::setDefaultPrinter( const OUString& /* rPrinterName */ ) return false; } -void PrinterInfoManager::getSystemPrintCommands( std::list< OUString >& /* rCommands */ ) -{ - -} - const std::list< PrinterInfoManager::SystemPrintQueue >& PrinterInfoManager::getSystemPrintQueues() { return m_aSystemPrintQueues; diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 84ce98a588ae..4d47decb9a74 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -682,10 +682,6 @@ void Window::Paint( const Rectangle& rRect ) CallEventListeners( VCLEVENT_WINDOW_PAINT, (void*)&rRect ); } -void Window::PostPaint() -{ -} - void Window::SetPaintTransparent( bool bTransparent ) { diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 0b2c13d7812c..51c9c2f3ae75 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -836,26 +836,6 @@ bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName ) return bSuccess; } -void PrinterInfoManager::getSystemPrintCommands( std::list< OUString >& rCommands ) -{ - if( m_pQueueInfo && m_pQueueInfo->hasChanged() ) - { - m_aSystemPrintCommand = m_pQueueInfo->getCommand(); - m_pQueueInfo->getSystemQueues( m_aSystemPrintQueues ); - delete m_pQueueInfo, m_pQueueInfo = NULL; - } - - std::list< SystemPrintQueue >::const_iterator it; - rCommands.clear(); - OUString aPrinterConst( "(PRINTER)" ); - for( it = m_aSystemPrintQueues.begin(); it != m_aSystemPrintQueues.end(); ++it ) - { - OUString aCmd( m_aSystemPrintCommand ); - aCmd = aCmd.replaceAll( aPrinterConst, it->m_aQueue ); - rCommands.push_back( aCmd ); - } -} - const std::list< PrinterInfoManager::SystemPrintQueue >& PrinterInfoManager::getSystemPrintQueues() { if( m_pQueueInfo && m_pQueueInfo->hasChanged() ) diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx index 920a07d7c2fd..9047bea2bc65 100644 --- a/writerfilter/source/dmapper/TableManager.cxx +++ b/writerfilter/source/dmapper/TableManager.cxx @@ -170,11 +170,6 @@ void TableManager::handle0x7() #endif } -void TableManager::props(TablePropertyMapPtr pProps) -{ - setProps(pProps); -} - bool TableManager::sprm(Sprm& rSprm) { bool bRet = true; diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index 2f1c32d5df8d..9f120eccefdf 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -552,13 +552,6 @@ public: virtual bool sprm(Sprm & rSprm); /** - Handle properties at current handle. - - @param pProps the properites - */ - void props(TablePropertyMapPtr pProps); - - /** Handle occurrence of character 0x7. */ void handle0x7(); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index c87e9811b7fc..fe716446d28a 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -281,20 +281,6 @@ const uno::Sequence< sal_Int8 > & OOXMLFastContextHandler::getUnoTunnelId() return theOOXMLFastContextHandlerUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL OOXMLFastContextHandler::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException) -{ - if( rId.getLength() == 16 - && 0 == memcmp( getUnoTunnelId().getConstArray(), - rId.getConstArray(), 16 ) ) - { - return sal::static_int_cast<sal_Int64> - (reinterpret_cast<sal_IntPtr>(this)); - } - - return 0x0; -} - void OOXMLFastContextHandler::setStream(Stream * pStream) { mpStream = pStream; @@ -355,12 +341,6 @@ void OOXMLFastContextHandler::setParent mpParent = pParent; } -OOXMLPropertySet * OOXMLFastContextHandler::getPicturePropSet -(const OUString & rId) -{ - return mpParserState->getDocument()->getPicturePropSet(rId); -} - void OOXMLFastContextHandler::sendTableDepth() const { if (mnTableDepth > 0) @@ -697,11 +677,6 @@ void OOXMLFastContextHandler::propagateCharacterPropertiesAsSet(const Id & rId) mpParserState->setCharacterProperties(pPropertySet); } -bool OOXMLFastContextHandler::propagatesProperties() const -{ - return false; -} - void OOXMLFastContextHandler::propagateCellProperties() { mpParserState->setCellProperties(getPropertySet()); @@ -1269,12 +1244,6 @@ void OOXMLFastContextHandlerTable::addCurrentChild() } } -void OOXMLFastContextHandlerTable::newPropertySet -(OOXMLPropertySet::Pointer_t /*pPropertySet*/) -{ - -} - /* class OOXMLFastContextHandlerXNote */ diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index ae1b6258274e..4c980ce6240c 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -83,7 +83,6 @@ public: throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8> & rId) throw (css::uno::RuntimeException); // local @@ -187,7 +186,6 @@ public: void propagateTableProperties(); void propagateRowProperties(); void propagateCellProperties(); - bool propagatesProperties() const; void sendPropertiesWithId(const Id & rId); void sendPropertiesToParent(); void sendCellProperties(); @@ -234,8 +232,6 @@ protected: void startAction(Token_t Element); void endAction(Token_t Element); - OOXMLPropertySet * getPicturePropSet - (const OUString & rId); virtual void resolvePropertySetAttrs(); css::uno::Reference< css::uno::XComponentContext > getComponentContext() { return m_xContext;} @@ -364,7 +360,6 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - void newPropertySet(OOXMLPropertySet::Pointer_t pPropertySet); protected: OOXMLTableImpl mTable; diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 71cbcd04fcbe..0999e132eb8e 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -322,22 +322,6 @@ void SecurityEnvironment_MSCryptImpl :: adoptSymKey( HCRYPTKEY aSymKey ) throw( } } -void SecurityEnvironment_MSCryptImpl :: rejectSymKey( HCRYPTKEY aSymKey ) throw( Exception , RuntimeException ) { - HCRYPTKEY symkey ; - std::list< HCRYPTKEY >::iterator keyIt ; - - if( aSymKey != NULL ) { - for( keyIt = m_tSymKeyList.begin() ; keyIt != m_tSymKeyList.end() ; ++keyIt ) { - if( *keyIt == aSymKey ) { - symkey = *keyIt ; - CryptDestroyKey( symkey ) ; - m_tSymKeyList.erase( keyIt ) ; - break ; - } - } - } -} - HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getSymKey( unsigned int position ) throw( Exception , RuntimeException ) { HCRYPTKEY symkey ; std::list< HCRYPTKEY >::iterator keyIt ; @@ -352,44 +336,6 @@ HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getSymKey( unsigned int position ) return symkey ; } -void SecurityEnvironment_MSCryptImpl :: adoptPubKey( HCRYPTKEY aPubKey ) throw( Exception , RuntimeException ) { - HCRYPTKEY pubkey ; - std::list< HCRYPTKEY >::iterator keyIt ; - - if( aPubKey != NULL ) { - //First try to find the key in the list - for( keyIt = m_tPubKeyList.begin() ; keyIt != m_tPubKeyList.end() ; ++keyIt ) { - if( *keyIt == aPubKey ) - return ; - } - - //If we do not find the key in the list, add a new node - pubkey = aPubKey ; - - try { - m_tPubKeyList.push_back( pubkey ) ; - } catch ( Exception& ) { - CryptDestroyKey( pubkey ) ; - } - } -} - -void SecurityEnvironment_MSCryptImpl :: rejectPubKey( HCRYPTKEY aPubKey ) throw( Exception , RuntimeException ) { - HCRYPTKEY pubkey ; - std::list< HCRYPTKEY >::iterator keyIt ; - - if( aPubKey != NULL ) { - for( keyIt = m_tPubKeyList.begin() ; keyIt != m_tPubKeyList.end() ; ++keyIt ) { - if( *keyIt == aPubKey ) { - pubkey = *keyIt ; - CryptDestroyKey( pubkey ) ; - m_tPubKeyList.erase( keyIt ) ; - break ; - } - } - } -} - HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getPubKey( unsigned int position ) throw( Exception , RuntimeException ) { HCRYPTKEY pubkey ; std::list< HCRYPTKEY >::iterator keyIt ; @@ -404,44 +350,6 @@ HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getPubKey( unsigned int position ) return pubkey ; } -void SecurityEnvironment_MSCryptImpl :: adoptPriKey( HCRYPTKEY aPriKey ) throw( Exception , RuntimeException ) { - HCRYPTKEY prikey ; - std::list< HCRYPTKEY >::iterator keyIt ; - - if( aPriKey != NULL ) { - //First try to find the key in the list - for( keyIt = m_tPriKeyList.begin() ; keyIt != m_tPriKeyList.end() ; ++keyIt ) { - if( *keyIt == aPriKey ) - return ; - } - - //If we do not find the key in the list, add a new node - prikey = aPriKey ; - - try { - m_tPriKeyList.push_back( prikey ) ; - } catch ( Exception& ) { - CryptDestroyKey( prikey ) ; - } - } -} - -void SecurityEnvironment_MSCryptImpl :: rejectPriKey( HCRYPTKEY aPriKey ) throw( Exception , RuntimeException ) { - HCRYPTKEY prikey ; - std::list< HCRYPTKEY >::iterator keyIt ; - - if( aPriKey != NULL ) { - for( keyIt = m_tPriKeyList.begin() ; keyIt != m_tPriKeyList.end() ; ++keyIt ) { - if( *keyIt == aPriKey ) { - prikey = *keyIt ; - CryptDestroyKey( prikey ) ; - m_tPriKeyList.erase( keyIt ) ; - break ; - } - } - } -} - HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getPriKey( unsigned int position ) throw( Exception , RuntimeException ) { HCRYPTKEY prikey ; std::list< HCRYPTKEY >::iterator keyIt ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index b0d74d525e89..b4a0e5770b97 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -170,15 +170,10 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper3< virtual void setCertDb( HCERTSTORE aCertDb ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; virtual void adoptSymKey( HCRYPTKEY aSymKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void rejectSymKey( HCRYPTKEY aSymKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; virtual HCRYPTKEY getSymKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void adoptPubKey( HCRYPTKEY aPubKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void rejectPubKey( HCRYPTKEY aPubKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; virtual HCRYPTKEY getPubKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void adoptPriKey( HCRYPTKEY aPriKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void rejectPriKey( HCRYPTKEY aPriKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; virtual HCRYPTKEY getPriKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; virtual void enableDefaultCrypt( sal_Bool enable ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 7ee875443d0a..b59e9a087ad5 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -254,21 +254,6 @@ void SecurityEnvironment_NssImpl :: adoptSymKey( PK11SymKey* aSymKey ) throw( Ex } } -void SecurityEnvironment_NssImpl :: rejectSymKey( PK11SymKey* aSymKey ) throw( Exception , RuntimeException ) { - std::list< PK11SymKey* >::iterator keyIt ; - - if( aSymKey != NULL ) { - for( keyIt = m_tSymKeyList.begin() ; keyIt != m_tSymKeyList.end() ; ++keyIt ) { - if( *keyIt == aSymKey ) { - PK11SymKey* symkey = *keyIt ; - PK11_FreeSymKey( symkey ) ; - m_tSymKeyList.erase( keyIt ) ; - break ; - } - } - } -} - PK11SymKey* SecurityEnvironment_NssImpl :: getSymKey( unsigned int position ) throw( Exception , RuntimeException ) { PK11SymKey* symkey ; std::list< PK11SymKey* >::iterator keyIt ; @@ -283,44 +268,6 @@ PK11SymKey* SecurityEnvironment_NssImpl :: getSymKey( unsigned int position ) th return symkey ; } -void SecurityEnvironment_NssImpl :: adoptPubKey( SECKEYPublicKey* aPubKey ) throw( Exception , RuntimeException ) { - std::list< SECKEYPublicKey* >::iterator keyIt ; - - if( aPubKey != NULL ) { - //First try to find the key in the list - for( keyIt = m_tPubKeyList.begin() ; keyIt != m_tPubKeyList.end() ; ++keyIt ) { - if( *keyIt == aPubKey ) - return ; - } - - //If we do not find the key in the list, add a new node - SECKEYPublicKey* pubkey = SECKEY_CopyPublicKey( aPubKey ) ; - if( pubkey == NULL ) - throw RuntimeException() ; - - try { - m_tPubKeyList.push_back( pubkey ) ; - } catch ( Exception& ) { - SECKEY_DestroyPublicKey( pubkey ) ; - } - } -} - -void SecurityEnvironment_NssImpl :: rejectPubKey( SECKEYPublicKey* aPubKey ) throw( Exception , RuntimeException ) { - std::list< SECKEYPublicKey* >::iterator keyIt ; - - if( aPubKey != NULL ) { - for( keyIt = m_tPubKeyList.begin() ; keyIt != m_tPubKeyList.end() ; ++keyIt ) { - if( *keyIt == aPubKey ) { - SECKEYPublicKey* pubkey = *keyIt ; - SECKEY_DestroyPublicKey( pubkey ) ; - m_tPubKeyList.erase( keyIt ) ; - break ; - } - } - } -} - SECKEYPublicKey* SecurityEnvironment_NssImpl :: getPubKey( unsigned int position ) throw( Exception , RuntimeException ) { SECKEYPublicKey* pubkey ; std::list< SECKEYPublicKey* >::iterator keyIt ; @@ -335,44 +282,6 @@ SECKEYPublicKey* SecurityEnvironment_NssImpl :: getPubKey( unsigned int position return pubkey ; } -void SecurityEnvironment_NssImpl :: adoptPriKey( SECKEYPrivateKey* aPriKey ) throw( Exception , RuntimeException ) { - std::list< SECKEYPrivateKey* >::iterator keyIt ; - - if( aPriKey != NULL ) { - //First try to find the key in the list - for( keyIt = m_tPriKeyList.begin() ; keyIt != m_tPriKeyList.end() ; ++keyIt ) { - if( *keyIt == aPriKey ) - return ; - } - - //If we do not find the key in the list, add a new node - SECKEYPrivateKey* prikey = SECKEY_CopyPrivateKey( aPriKey ) ; - if( prikey == NULL ) - throw RuntimeException() ; - - try { - m_tPriKeyList.push_back( prikey ) ; - } catch ( Exception& ) { - SECKEY_DestroyPrivateKey( prikey ) ; - } - } -} - -void SecurityEnvironment_NssImpl :: rejectPriKey( SECKEYPrivateKey* aPriKey ) throw( Exception , RuntimeException ) { - std::list< SECKEYPrivateKey* >::iterator keyIt ; - - if( aPriKey != NULL ) { - for( keyIt = m_tPriKeyList.begin() ; keyIt != m_tPriKeyList.end() ; ++keyIt ) { - if( *keyIt == aPriKey ) { - SECKEYPrivateKey* prikey = *keyIt ; - SECKEY_DestroyPrivateKey( prikey ) ; - m_tPriKeyList.erase( keyIt ) ; - break ; - } - } - } -} - SECKEYPrivateKey* SecurityEnvironment_NssImpl :: getPriKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) { SECKEYPrivateKey* prikey ; std::list< SECKEYPrivateKey* >::iterator keyIt ; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index 18ae0b2ecd75..dd0bc10b249c 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -112,15 +112,10 @@ private : void setCertDb( CERTCertDBHandle* aCertDb ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; void adoptSymKey( PK11SymKey* aSymKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - void rejectSymKey( PK11SymKey* aSymKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; PK11SymKey* getSymKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - void adoptPubKey( SECKEYPublicKey* aPubKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - void rejectPubKey( SECKEYPublicKey* aPubKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; SECKEYPublicKey* getPubKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - void adoptPriKey( SECKEYPrivateKey* aPriKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - void rejectPriKey( SECKEYPrivateKey* aPriKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; SECKEYPrivateKey* getPriKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL getPersonalCertificates() throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; |