Skip to content

C
core
Kaydet (Commit) 828eba88 authored tarafından Kurt Zenker's avatar Kurt Zenker
Dosyalara gözat
Seçenekler

INTEGRATION: CWS fwk16 (1.32.82); FILE MERGED 

2005/06/13 08:18:42 as 1.32.82.1: #i50186# use new threadsafe property set helper
üst 4df1453e
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 34 deletions
framework/inc/services/frame.hxx
Dosyayı görüntüle @ 828eba88
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: frame.hxx,v $ * $RCSfile: frame.hxx,v $
* *
* $Revision: 1.32 $ * $Revision: 1.33 $
* *
* last change: $Author: kz $ $Date: 2005-03-01 19:25:24 $ * last change: $Author: kz $ $Date: 2005-07-12 14:12:14 $
* *
* 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
...@@ -70,12 +70,8 @@ ...@@ -70,12 +70,8 @@
#include <classes/framecontainer.hxx> #include <classes/framecontainer.hxx>
#endif #endif
#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #ifndef __FRAMEWORK_CLASSES_PROPERTYSETHELPER_HXX_
#include <threadhelp/transactionbase.hxx> #include <classes/propertysethelper.hxx>
#endif
#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
#include <threadhelp/threadhelpbase.hxx>
#endif #endif
#ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
...@@ -234,10 +230,6 @@ ...@@ -234,10 +230,6 @@
#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/interfacecontainer.hxx>
#endif #endif
#ifndef _CPPUHELPER_PROPSHLP_HXX
#include <cppuhelper/propshlp.hxx>
#endif
#ifndef _CPPUHELPER_WEAK_HXX_ #ifndef _CPPUHELPER_WEAK_HXX_
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#endif #endif
...@@ -313,11 +305,8 @@ class Frame : // interfaces ...@@ -313,11 +305,8 @@ class Frame : // interfaces
public css::frame::XComponentLoader , public css::frame::XComponentLoader ,
// base classes // base classes
// Order is neccessary for right initialization of this class! // Order is neccessary for right initialization of this class!
public ThreadHelpBase , // helper for own threadsafe code public PropertySetHelper , // helper implements ThreadHelpbase, TransactionBase, XPropertySet, XPropertySetInfo
public TransactionBase , // helper for rejecting calls for wrong object states public ::cppu::OWeakObject // helper implements XInterface, XWeak
public ::cppu::OBroadcastHelper , // helper for propertyset => XPropertySet, XFastPropertySet, XMultiPropertySet
public ::cppu::OPropertySetHelper ,
public ::cppu::OWeakObject // helper for refcount mechanism
{ {
//------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------
// public methods // public methods
...@@ -466,25 +455,19 @@ class Frame : // interfaces ...@@ -466,25 +455,19 @@ class Frame : // interfaces
virtual void SAL_CALL addCloseListener ( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException); virtual void SAL_CALL addCloseListener ( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException); virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException);
//-------------------------------------------------------------------------------------------------------------
// protected methods
//-------------------------------------------------------------------------------------------------------------
protected:
//--------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------
// OPropertySetHelper // PropertySetHelper => XPropertySet, XPropertySetInfo
//--------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------
virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue , private:
css::uno::Any& aOldValue ,
sal_Int32 nHandle , void impl_initializePropInfo();
const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException );
virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle , virtual void SAL_CALL impl_setPropertyValue(const ::rtl::OUString& sProperty,
const css::uno::Any& aValue ) throw( css::uno::Exception ); sal_Int32 nHandle ,
virtual void SAL_CALL getFastPropertyValue ( css::uno::Any& aValue , const css::uno::Any& aValue );
sal_Int32 nHandle ) const;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper ( ); virtual css::uno::Any SAL_CALL impl_getPropertyValue(const ::rtl::OUString& sProperty,
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo ( ) throw (::com::sun::star::uno::RuntimeException); sal_Int32 nHandle );
//------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------
// private methods // private methods
......
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