diff options
author | Noel Grandin <noel@peralex.com> | 2015-07-23 09:49:57 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-24 10:36:20 +0000 |
commit | 38023af6c13602ae1856bea11693c18c0c3efa36 (patch) | |
tree | c17ef3941354f732e2fdd7c3cedb7c649f99e965 /embeddedobj/source | |
parent | 2c6ad5343de947f1646536c539b116346adb8fdc (diff) |
loplugin:unusedmethods
Change-Id: If5090c330e12d6e537766bf4a9be0a2360381a7a
Reviewed-on: https://gerrit.libreoffice.org/17312
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'embeddedobj/source')
-rw-r--r-- | embeddedobj/source/commonembedding/miscobj.cxx | 40 | ||||
-rw-r--r-- | embeddedobj/source/commonembedding/specialobject.cxx | 23 | ||||
-rw-r--r-- | embeddedobj/source/inc/commonembobj.hxx | 5 | ||||
-rw-r--r-- | embeddedobj/source/inc/docholder.hxx | 3 | ||||
-rw-r--r-- | embeddedobj/source/inc/oleembobj.hxx | 29 | ||||
-rw-r--r-- | embeddedobj/source/inc/specialobject.hxx | 4 |
6 files changed, 12 insertions, 92 deletions
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 966eb4723f97..f5e4de65b54d 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -404,47 +404,7 @@ void SAL_CALL OCommonEmbeddedObject::release() } -uno::Sequence< uno::Type > SAL_CALL OCommonEmbeddedObject::getTypes() - throw( uno::RuntimeException ) -{ - static ::cppu::OTypeCollection* pTypeCollection = NULL; - - if ( !pTypeCollection ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pTypeCollection ) - { - if ( m_bIsLink ) - { - static ::cppu::OTypeCollection aTypeCollection( - cppu::UnoType<lang::XTypeProvider>::get(), - cppu::UnoType<embed::XEmbeddedObject>::get(), - cppu::UnoType<embed::XInplaceObject>::get(), - cppu::UnoType<embed::XCommonEmbedPersist>::get(), - cppu::UnoType<container::XChild>::get(), - cppu::UnoType<embed::XLinkageSupport>::get()); - - pTypeCollection = &aTypeCollection ; - } - else - { - static ::cppu::OTypeCollection aTypeCollection( - cppu::UnoType<lang::XTypeProvider>::get(), - cppu::UnoType<embed::XEmbeddedObject>::get(), - cppu::UnoType<embed::XInplaceObject>::get(), - cppu::UnoType<embed::XCommonEmbedPersist>::get(), - cppu::UnoType<container::XChild>::get(), - cppu::UnoType<embed::XEmbedPersist>::get(), - cppu::UnoType<embed::XEmbedPersist2>::get()); - - pTypeCollection = &aTypeCollection ; - } - } - } - - return pTypeCollection->getTypes() ; -} uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID() throw ( uno::RuntimeException, std::exception ) diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index 39fb7d20f49b..52fcb32074c5 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -73,29 +73,6 @@ uno::Any SAL_CALL OSpecialEmbeddedObject::queryInterface( const uno::Type& rType } -uno::Sequence< uno::Type > SAL_CALL OSpecialEmbeddedObject::getTypes() - throw( uno::RuntimeException ) -{ - static ::cppu::OTypeCollection* pTypeCollection = NULL; - - if ( !pTypeCollection ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pTypeCollection ) - { - static ::cppu::OTypeCollection aTypeCollection( - cppu::UnoType<lang::XTypeProvider>::get(), - cppu::UnoType<embed::XEmbeddedObject>::get(), - cppu::UnoType<embed::XInplaceObject>::get()); - - pTypeCollection = &aTypeCollection ; - } - } - - return pTypeCollection->getTypes() ; - -} - embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualRepresentation( sal_Int64 nAspect ) throw ( lang::IllegalArgumentException, embed::WrongStateException, diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index 410850e25099..c035282e801c 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -258,11 +258,6 @@ public: virtual void SAL_CALL release() throw() SAL_OVERRIDE; -// XTypeProvider - - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException ) ; - // XEmbeddedObject virtual void SAL_CALL changeState( sal_Int32 nNewState ) diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index d372a57fe805..dcf196a3d4ed 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -123,7 +123,6 @@ public: void SetComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable >& xDoc, bool bReadOnly ); void ResizeHatchWindow(); - void LockOffice(); void FreeOffice(); void CloseDocument( bool bDeliverOwnership, bool bWaitForClose ); @@ -134,8 +133,6 @@ public: return m_aContainerName + " - " + m_aDocumentNamePart; } - OUString GetContainerName() const { return m_aContainerName; } - void SetOutplaceFrameProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aProps ) { m_aOutplaceFrameProps = aProps; } diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index 04ffae9a4667..06d883b83f5f 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -49,38 +49,38 @@ class VerbExecutionController // the following mutex is allowed to be locked only for variables initialization, so no deadlock can be caused ::osl::Mutex m_aVerbExecutionMutex; - bool m_bVerbExecutionInProgress; + sal_Int32 m_nNotificationLock; + #ifdef WNT + bool m_bWasEverActive; + bool m_bVerbExecutionInProgress; oslThreadIdentifier m_nVerbExecutionThreadIdentifier; sal_Bool m_bChangedOnVerbExecution; #endif - bool m_bWasEverActive; - sal_Int32 m_nNotificationLock; - public: VerbExecutionController() - : m_bVerbExecutionInProgress( false ) + : m_nNotificationLock( 0 ) #ifdef WNT + , m_bWasEverActive( false ) + , m_bVerbExecutionInProgress( false ) , m_nVerbExecutionThreadIdentifier( 0 ) , m_bChangedOnVerbExecution( sal_False ) #endif - , m_bWasEverActive( false ) - , m_nNotificationLock( 0 ) {} + #ifdef WNT void StartControlExecution(); sal_Bool EndControlExecution_WasModified(); void ModificationNotificationIsDone(); -#endif - void LockNotification(); - void UnlockNotification(); - // no need to lock anything to check the value of the numeric members bool CanDoNotification() { return ( !m_bVerbExecutionInProgress && !m_bWasEverActive && !m_nNotificationLock ); } // ... or to change it void ObjectIsActive() { m_bWasEverActive = true; } +#endif + void LockNotification(); + void UnlockNotification(); }; class VerbExecutionControllerGuard @@ -220,7 +220,6 @@ protected: const ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor >& aVerbList ); #endif - void CloseComponent(); void Dispose(); void SwitchOwnPersistence( @@ -269,14 +268,10 @@ protected: void CreateOleComponent_Impl( OleComponent* pOleComponent = NULL ); void CreateOleComponentAndLoad_Impl( OleComponent* pOleComponent = NULL ); void CreateOleComponentFromClipboard_Impl( OleComponent* pOleComponent = NULL ); -#endif - void SetObjectIsLink_Impl( bool bIsLink ) { m_bIsLink = bIsLink; } - -#ifdef WNT OUString CreateTempURLEmpty_Impl(); OUString GetTempURL_Impl(); + void SetObjectIsLink_Impl( bool bIsLink ) { m_bIsLink = bIsLink; } #endif - OUString GetContainerName_Impl() { return m_aContainerName; } // the following 4 methods are related to switch to wrapping mode void MoveListeners(); diff --git a/embeddedobj/source/inc/specialobject.hxx b/embeddedobj/source/inc/specialobject.hxx index fa34f17cc041..0d4895aa7879 100644 --- a/embeddedobj/source/inc/specialobject.hxx +++ b/embeddedobj/source/inc/specialobject.hxx @@ -37,10 +37,6 @@ public: 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 ; - // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE ; - // XVisualObject virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw ( ::com::sun::star::lang::IllegalArgumentException, |