Skip to content

C
core
Kaydet (Commit) d970055b authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien
Dosyalara gözat
Seçenekler

INTEGRATION: CWS fwkbugfix02 (1.9.10); FILE MERGED 

2004/04/29 07:49:10 mav 1.9.10.4: #116056# interfaces review
2004/04/28 10:26:11 mav 1.9.10.3: #116056# use inheritance
2004/04/19 13:35:48 mav 1.9.10.2: #116056# interfaces review
2004/04/07 16:34:51 mav 1.9.10.1: #116056# adopt to incompatible changes
üst 860be7ce
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 21 deletions
embeddedobj/source/inc/oleembobj.hxx
Dosyayı görüntüle @ d970055b
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: oleembobj.hxx,v $ * $RCSfile: oleembobj.hxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: mav $ $Date: 2003-12-15 15:37:40 $ * last change: $Author: hr $ $Date: 2004-05-10 17:53:05 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
#include <com/sun/star/embed/XComponentSupplier.hpp> #include <com/sun/star/embed/XComponentSupplier.hpp>
#endif #endif
#ifndef _COM_SUN_STAR_EMBED_VERBDESCR_HPP_ #ifndef _COM_SUN_STAR_EMBED_VERBDESCR_HPP_
#include <com/sun/star/embed/VerbDescr.hpp> #include <com/sun/star/embed/VerbDescriptor.hpp>
#endif #endif
#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTBROADCASTER_HPP_ #ifndef _COM_SUN_STAR_DOCUMENT_XEVENTBROADCASTER_HPP_
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
#include <com/sun/star/util/XCloseListener.hpp> #include <com/sun/star/util/XCloseListener.hpp>
#endif #endif
#ifndef _CPPUHELPER_IMPLBASE8_HXX_ #ifndef _CPPUHELPER_IMPLBASE3_HXX_
#include <cppuhelper/implbase8.hxx> #include <cppuhelper/implbase3.hxx>
#endif #endif
namespace cppu { namespace cppu {
...@@ -114,15 +114,15 @@ namespace cppu { ...@@ -114,15 +114,15 @@ namespace cppu {
} }
class OleComponent; class OleComponent;
class OleEmbeddedObject : public ::cppu::WeakImplHelper8 class OleEmbeddedObject : public ::cppu::WeakImplHelper3
< ::com::sun::star::embed::XEmbeddedObject < ::com::sun::star::embed::XEmbeddedObject
, ::com::sun::star::embed::XVisualObject // , ::com::sun::star::embed::XVisualObject
, ::com::sun::star::embed::XEmbedPersist , ::com::sun::star::embed::XEmbedPersist
, ::com::sun::star::embed::XLinkageSupport , ::com::sun::star::embed::XLinkageSupport >
, ::com::sun::star::embed::XClassifiedObject // , ::com::sun::star::embed::XClassifiedObject
, ::com::sun::star::embed::XComponentSupplier // , ::com::sun::star::embed::XComponentSupplier
, ::com::sun::star::util::XCloseable // , ::com::sun::star::util::XCloseable
, ::com::sun::star::document::XEventBroadcaster > // , ::com::sun::star::document::XEventBroadcaster >
{ {
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
...@@ -172,7 +172,7 @@ protected: ...@@ -172,7 +172,7 @@ protected:
::com::sun::star::uno::Sequence< sal_Int32 > GetIntermediateVerbsSequence_Impl( sal_Int32 nNewState ); ::com::sun::star::uno::Sequence< sal_Int32 > GetIntermediateVerbsSequence_Impl( sal_Int32 nNewState );
::com::sun::star::uno::Sequence< sal_Int32 > GetReachableStatesList_Impl( ::com::sun::star::uno::Sequence< sal_Int32 > GetReachableStatesList_Impl(
const ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescr >& aVerbList ); const ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor >& aVerbList );
void CloseComponent(); void CloseComponent();
void Dispose(); void Dispose();
...@@ -232,7 +232,7 @@ public: ...@@ -232,7 +232,7 @@ public:
::com::sun::star::uno::Exception, ::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescr > SAL_CALL getSupportedVerbs() virtual ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
throw ( ::com::sun::star::embed::WrongStateException, throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException );
...@@ -258,27 +258,27 @@ public: ...@@ -258,27 +258,27 @@ public:
throw ( ::com::sun::star::embed::WrongStateException, throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException );
// XVisualObject
virtual void SAL_CALL setContainerName( const ::rtl::OUString& sName ) virtual void SAL_CALL setContainerName( const ::rtl::OUString& sName )
throw ( ::com::sun::star::uno::RuntimeException ); throw ( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setVisAreaSize( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize )
// XVisualObject
virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception, ::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::awt::Size SAL_CALL getVisAreaSize( sal_Int64 nAspect ) virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception, ::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Any SAL_CALL getVisualCache( sal_Int64 nAspect ) virtual sal_Int32 SAL_CALL getMapMode( sal_Int64 nAspect )
throw ( ::com::sun::star::uno::Exception, throw ( ::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException);
// XEmbedPersist // XEmbedPersist
...@@ -377,6 +377,10 @@ public: ...@@ -377,6 +377,10 @@ public:
throw ( ::com::sun::star::lang::NoSupportException, throw ( ::com::sun::star::lang::NoSupportException,
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException );
// XStateChangeBroadcaster
virtual void SAL_CALL addStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
// XComponentSupplier // XComponentSupplier
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment