[Libreoffice-commits] .: 2 commits - basic/source scaddins/source UnoControls/inc UnoControls/source unotools/inc
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Feb 21 05:03:14 PST 2012
UnoControls/inc/basecontainercontrol.hxx | 105 ++----
UnoControls/inc/basecontrol.hxx | 225 ++++++-------
UnoControls/inc/multiplexer.hxx | 148 +++-----
UnoControls/source/inc/OConnectionPointContainerHelper.hxx | 35 --
UnoControls/source/inc/OConnectionPointHelper.hxx | 45 +-
UnoControls/source/inc/framecontrol.hxx | 113 ++----
UnoControls/source/inc/progressbar.hxx | 53 +--
UnoControls/source/inc/progressmonitor.hxx | 99 ++---
UnoControls/source/inc/statusindicator.hxx | 79 +---
basic/source/inc/propacc.hxx | 69 +--
scaddins/source/analysis/analysis.cxx | 10
scaddins/source/analysis/analysis.hxx | 30 -
scaddins/source/analysis/analysisdefs.hxx | 25 -
scaddins/source/analysis/analysishelper.hxx | 96 ++---
unotools/inc/unotools/ucblockbytes.hxx | 40 --
unotools/inc/unotools/ucbstreamhelper.hxx | 14
16 files changed, 539 insertions(+), 647 deletions(-)
New commits:
commit 48bfb52d71e19757da9c90145bbcea8337c411f4
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 21 14:00:46 2012 +0100
expand and remove NS_* macro
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index d79c688..f8e91d1 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -37,15 +37,11 @@
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
-#define NS_BEANS ::com::sun::star::beans
-#define NS_LANG ::com::sun::star::lang
-#define NS_UNO ::com::sun::star::uno
-
-typedef NS_BEANS::PropertyValue* SbPropertyValuePtr;
+typedef ::com::sun::star::beans::PropertyValue* SbPropertyValuePtr;
SV_DECL_PTRARR( SbPropertyValueArr_Impl, SbPropertyValuePtr, 4 )
-typedef ::cppu::WeakImplHelper2< NS_BEANS::XPropertySet,
- NS_BEANS::XPropertyAccess > SbPropertyValuesHelper;
+typedef ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertySet,
+ ::com::sun::star::beans::XPropertyAccess > SbPropertyValuesHelper;
//==========================================================================
@@ -53,7 +49,7 @@ typedef ::cppu::WeakImplHelper2< NS_BEANS::XPropertySet,
class SbPropertyValues: public SbPropertyValuesHelper
{
SbPropertyValueArr_Impl _aPropVals;
- NS_UNO::Reference< ::com::sun::star::beans::XPropertySetInfo > _xInfo;
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > _xInfo;
private:
sal_Int32 GetIndex_Impl( const ::rtl::OUString &rPropName ) const;
@@ -63,65 +59,65 @@ public:
virtual ~SbPropertyValues();
// XPropertySet
- virtual NS_UNO::Reference< NS_BEANS::XPropertySetInfo > SAL_CALL
- getPropertySetInfo(void) throw( NS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setPropertyValue(
const ::rtl::OUString& aPropertyName,
- const NS_UNO::Any& aValue)
+ const ::com::sun::star::uno::Any& aValue)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual NS_UNO::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
- throw( NS_BEANS::UnknownPropertyException,
- NS_LANG::WrappedTargetException,
- NS_UNO::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+ throw( ::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener(
const ::rtl::OUString& aPropertyName,
- const NS_UNO::Reference< NS_BEANS::XPropertyChangeListener >& )
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& )
throw ();
virtual void SAL_CALL removePropertyChangeListener(
const ::rtl::OUString& aPropertyName,
- const NS_UNO::Reference< NS_BEANS::XPropertyChangeListener >& )
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& )
throw ();
virtual void SAL_CALL addVetoableChangeListener(
const ::rtl::OUString& aPropertyName,
- const NS_UNO::Reference< NS_BEANS::XVetoableChangeListener >& )
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& )
throw ();
virtual void SAL_CALL removeVetoableChangeListener(
const ::rtl::OUString& aPropertyName,
- const NS_UNO::Reference< NS_BEANS::XVetoableChangeListener >& )
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& )
throw ();
// XPropertyAccess
- virtual NS_UNO::Sequence< NS_BEANS::PropertyValue > SAL_CALL getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValues(const NS_UNO::Sequence< NS_BEANS::PropertyValue >& PropertyValues_) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& PropertyValues_) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
};
//==========================================================================
-typedef ::cppu::WeakImplHelper1< NS_BEANS::XPropertySetInfo > SbPropertySetInfoHelper;
+typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo > SbPropertySetInfoHelper;
// AB 20.3.2000 Help Class for XPropertySetInfo implementation
class PropertySetInfoImpl
{
friend class SbPropertySetInfo;
- NS_UNO::Sequence< NS_BEANS::Property > _aProps;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > _aProps;
sal_Int32 GetIndex_Impl( const ::rtl::OUString &rPropName ) const;
public:
PropertySetInfoImpl();
- PropertySetInfoImpl( NS_UNO::Sequence< NS_BEANS::Property >& rProps );
+ PropertySetInfoImpl( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProps );
// XPropertySetInfo
- NS_UNO::Sequence< NS_BEANS::Property > SAL_CALL getProperties(void) throw ();
- NS_BEANS::Property SAL_CALL getPropertyByName(const ::rtl::OUString& Name)
- throw( NS_UNO::RuntimeException );
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) throw ();
+ ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const ::rtl::OUString& Name)
+ throw( ::com::sun::star::uno::RuntimeException );
sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& Name)
- throw ( NS_UNO::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException );
};
class SbPropertySetInfo: public SbPropertySetInfoHelper
@@ -133,12 +129,12 @@ public:
virtual ~SbPropertySetInfo();
// XPropertySetInfo
- virtual NS_UNO::Sequence< NS_BEANS::Property > SAL_CALL getProperties(void)
- throw( NS_UNO::RuntimeException );
- virtual NS_BEANS::Property SAL_CALL getPropertyByName(const ::rtl::OUString& Name)
- throw( NS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void)
+ throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const ::rtl::OUString& Name)
+ throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& Name)
- throw( NS_UNO::RuntimeException );
+ throw( ::com::sun::star::uno::RuntimeException );
};
//=========================================================================
@@ -148,13 +144,6 @@ class SbxArray;
void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
-
-#undef NS_BEANS
-#undef NS_LANG
-#undef NS_UNO
-
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx
index 141296d..9ac68b3 100644
--- a/unotools/inc/unotools/ucblockbytes.hxx
+++ b/unotools/inc/unotools/ucblockbytes.hxx
@@ -97,12 +97,6 @@ public:
SV_DECL_IMPL_REF( UcbLockBytesHandler )
-#define NS_UNO ::com::sun::star::uno
-#define NS_IO ::com::sun::star::io
-#define NS_UCB ::com::sun::star::ucb
-#define NS_BEANS ::com::sun::star::beans
-#define NS_TASK ::com::sun::star::task
-
class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes
{
osl::Condition m_aInitialized;
@@ -113,9 +107,9 @@ class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes
String m_aRealURL;
DateTime m_aExpireDate;
- NS_UNO::Reference < NS_IO::XInputStream > m_xInputStream;
- NS_UNO::Reference < NS_IO::XOutputStream > m_xOutputStream;
- NS_UNO::Reference < NS_IO::XSeekable > m_xSeekable;
+ ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > m_xInputStream;
+ ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > m_xOutputStream;
+ ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > m_xSeekable;
void* m_pCommandThread; // is alive only for compatibility reasons
UcbLockBytesHandlerRef m_xHandler;
@@ -135,21 +129,21 @@ protected:
public:
// properties: Referer, PostMimeType
- static UcbLockBytesRef CreateLockBytes( const NS_UNO::Reference < NS_UCB::XContent >& xContent,
+ static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XContent >& xContent,
const ::rtl::OUString& rReferer,
const ::rtl::OUString& rMediaType,
- const NS_UNO::Reference < NS_IO::XInputStream >& xPostData,
- const NS_UNO::Reference < NS_TASK::XInteractionHandler >& xInter,
+ const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xPostData,
+ const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& xInter,
UcbLockBytesHandler* pHandler=0 );
- static UcbLockBytesRef CreateLockBytes( const NS_UNO::Reference < NS_UCB::XContent >& xContent,
- const NS_UNO::Sequence < NS_BEANS::PropertyValue >& rProps,
+ static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XContent >& xContent,
+ const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rProps,
StreamMode eMode,
- const NS_UNO::Reference < NS_TASK::XInteractionHandler >& xInter,
+ const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& xInter,
UcbLockBytesHandler* pHandler=0 );
- static UcbLockBytesRef CreateInputLockBytes( const NS_UNO::Reference < NS_IO::XInputStream >& xContent );
- static UcbLockBytesRef CreateLockBytes( const NS_UNO::Reference < NS_IO::XStream >& xContent );
+ static UcbLockBytesRef CreateInputLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xContent );
+ static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream >& xContent );
// SvLockBytes
virtual void SetSynchronMode (sal_Bool bSynchron);
@@ -173,27 +167,27 @@ public:
DateTime GetExpireDate() const;
// calling this method delegates the responsibility to call closeinput to the caller!
- NS_UNO::Reference < NS_IO::XInputStream > getInputStream();
+ ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > getInputStream();
#if _SOLAR__PRIVATE
- sal_Bool setInputStream_Impl( const NS_UNO::Reference < NS_IO::XInputStream > &rxInputStream,
+ sal_Bool setInputStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > &rxInputStream,
sal_Bool bSetXSeekable = sal_True );
- sal_Bool setStream_Impl( const NS_UNO::Reference < NS_IO::XStream > &rxStream );
+ sal_Bool setStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > &rxStream );
void terminate_Impl (void);
- NS_UNO::Reference < NS_IO::XInputStream > getInputStream_Impl() const
+ ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > getInputStream_Impl() const
{
osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex );
return m_xInputStream;
}
- NS_UNO::Reference < NS_IO::XOutputStream > getOutputStream_Impl() const
+ ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > getOutputStream_Impl() const
{
osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex );
return m_xOutputStream;
}
- NS_UNO::Reference < NS_IO::XSeekable > getSeekable_Impl() const
+ ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > getSeekable_Impl() const
{
osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex );
return m_xSeekable;
diff --git a/unotools/inc/unotools/ucbstreamhelper.hxx b/unotools/inc/unotools/ucbstreamhelper.hxx
index f309b01..817bd29 100644
--- a/unotools/inc/unotools/ucbstreamhelper.hxx
+++ b/unotools/inc/unotools/ucbstreamhelper.hxx
@@ -54,10 +54,6 @@ namespace com
}
}
-#define NS_UNO ::com::sun::star::uno
-#define NS_IO ::com::sun::star::io
-#define NS_TASK ::com::sun::star::task
-
class String;
namespace utl
{
@@ -69,15 +65,15 @@ namespace utl
static SvStream* CreateStream( const String& rFileName, StreamMode eOpenMode,
UcbLockBytesHandler* pHandler=0 );
static SvStream* CreateStream( const String& rFileName, StreamMode eOpenMode,
- NS_UNO::Reference < NS_TASK::XInteractionHandler >,
+ ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >,
UcbLockBytesHandler* pHandler=0 );
static SvStream* CreateStream( const String& rFileName, StreamMode eOpenMode,
sal_Bool bFileExists,
UcbLockBytesHandler* pHandler=0 );
- static SvStream* CreateStream( NS_UNO::Reference < NS_IO::XInputStream > xStream );
- static SvStream* CreateStream( NS_UNO::Reference < NS_IO::XStream > xStream );
- static SvStream* CreateStream( NS_UNO::Reference < NS_IO::XInputStream > xStream, sal_Bool bCloseStream );
- static SvStream* CreateStream( NS_UNO::Reference < NS_IO::XStream > xStream, sal_Bool bCloseStream );
+ static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream );
+ static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream );
+ static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream, sal_Bool bCloseStream );
+ static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream, sal_Bool bCloseStream );
};
}
commit 8b0351023010a2954b6dfe3f6c7aaf2eccd35125
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 21 13:54:41 2012 +0100
expand and remove CSS* macro
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index 6d32b9d..7052c58 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -56,18 +56,13 @@
namespace unocontrols{
-#define CSS_UNO ::com::sun::star::uno
-#define CSS_AWT ::com::sun::star::awt
-#define CSS_LANG ::com::sun::star::lang
-#define CSS_CONTAINER ::com::sun::star::container
-
//____________________________________________________________________________________________________________
// structs, types, forwards
//____________________________________________________________________________________________________________
struct IMPL_ControlInfo
{
- CSS_UNO::Reference< CSS_AWT::XControl > xControl ;
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl ;
::rtl::OUString sName ;
};
@@ -75,8 +70,8 @@ struct IMPL_ControlInfo
// classes
//____________________________________________________________________________________________________________
-class BaseContainerControl : public CSS_AWT::XControlModel
- , public CSS_AWT::XControlContainer
+class BaseContainerControl : public ::com::sun::star::awt::XControlModel
+ , public ::com::sun::star::awt::XControlContainer
, public BaseControl
{
@@ -103,7 +98,7 @@ public:
@onerror -
*/
- BaseContainerControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
+ BaseContainerControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
/**_______________________________________________________________________________________________________
@short -
@@ -137,9 +132,9 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual CSS_UNO::Any SAL_CALL queryInterface(
- const CSS_UNO::Type& aType
- ) throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
+ const ::com::sun::star::uno::Type& aType
+ ) throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XTypeProvider
@@ -158,8 +153,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XAggregation
@@ -178,9 +173,9 @@ public:
@onerror -
*/
- virtual CSS_UNO::Any SAL_CALL queryAggregation(
- const CSS_UNO::Type& aType
- ) throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
+ const ::com::sun::star::uno::Type& aType
+ ) throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XControl
@@ -200,9 +195,9 @@ public:
*/
virtual void SAL_CALL createPeer(
- const CSS_UNO::Reference< CSS_AWT::XToolkit >& xToolkit ,
- const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit ,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -218,8 +213,8 @@ public:
*/
virtual sal_Bool SAL_CALL setModel(
- const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -234,8 +229,8 @@ public:
@onerror -
*/
- virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
+ throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XComponent
@@ -254,7 +249,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
+ virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XEventListener
@@ -273,7 +268,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL disposing( const CSS_LANG::EventObject& rEvent ) throw( CSS_UNO::RuntimeException );
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XControlContainer
@@ -294,8 +289,8 @@ public:
virtual void SAL_CALL addControl(
const ::rtl::OUString& sName ,
- const CSS_UNO::Reference< CSS_AWT::XControl >& xControl
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xControl
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -311,8 +306,8 @@ public:
*/
virtual void SAL_CALL addContainerListener(
- const CSS_UNO::Reference< CSS_CONTAINER::XContainerListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -328,8 +323,8 @@ public:
*/
virtual void SAL_CALL removeControl(
- const CSS_UNO::Reference< CSS_AWT::XControl >& xControl
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xControl
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -345,8 +340,8 @@ public:
*/
virtual void SAL_CALL removeContainerListener(
- const CSS_UNO::Reference< CSS_CONTAINER::XContainerListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -363,7 +358,7 @@ public:
virtual void SAL_CALL setStatusText(
const ::rtl::OUString& sStatusText
- ) throw( CSS_UNO::RuntimeException );
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -378,9 +373,9 @@ public:
@onerror -
*/
- virtual CSS_UNO::Reference< CSS_AWT::XControl > SAL_CALL getControl(
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl(
const ::rtl::OUString& sName
- ) throw( CSS_UNO::RuntimeException );
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -395,8 +390,8 @@ public:
@onerror -
*/
- virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XControl > > SAL_CALL getControls()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls()
+ throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XUnoControlContainer
@@ -416,8 +411,8 @@ public:
*/
virtual void SAL_CALL addTabController(
- const CSS_UNO::Reference< CSS_AWT::XTabController >& xTabController
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& xTabController
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -433,8 +428,8 @@ public:
*/
virtual void SAL_CALL removeTabController(
- const CSS_UNO::Reference< CSS_AWT::XTabController >& xTabController
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& xTabController
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -450,8 +445,8 @@ public:
*/
virtual void SAL_CALL setTabControllers(
- const CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > >& xTabControllers
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > >& xTabControllers
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -466,8 +461,8 @@ public:
@onerror -
*/
- virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > > SAL_CALL getTabControllers()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > SAL_CALL getTabControllers()
+ throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XWindow
@@ -486,7 +481,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( CSS_UNO::RuntimeException );
+ virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException );
//____________________________________________________________________________________________________________
// protected methods
@@ -507,8 +502,8 @@ protected:
@onerror
*/
- virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
- const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+ virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentPeer
);
/**_______________________________________________________________________________________________________
@@ -527,7 +522,7 @@ protected:
virtual void impl_paint(
sal_Int32 nX ,
sal_Int32 nY ,
- const CSS_UNO::Reference< CSS_AWT::XGraphics >& xGraphics
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics
);
//____________________________________________________________________________________________________________
@@ -575,18 +570,12 @@ private:
::std::vector< IMPL_ControlInfo* > maControlInfoList;
// list of references of XTabController to hold tab-order in this container
- CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > > m_xTabControllerList ;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > m_xTabControllerList ;
::cppu::OMultiTypeInterfaceContainerHelper m_aListeners ;
}; // class BaseContainerControl
-// The namespace aliases are only used in this header
-#undef CSS_UNO
-#undef CSS_AWT
-#undef CSS_LANG
-#undef CSS_CONTAINER
-
} // namespace unocontrols
#endif // ifndef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index e8eb59b..f35aa21 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -111,10 +111,6 @@
namespace unocontrols{
-#define CSS_UNO ::com::sun::star::uno
-#define CSS_AWT ::com::sun::star::awt
-#define CSS_LANG ::com::sun::star::lang
-
//____________________________________________________________________________________________________________
// macros
//____________________________________________________________________________________________________________
@@ -136,12 +132,12 @@ struct IMPL_MutexContainer
// classes
//____________________________________________________________________________________________________________
-class BaseControl : public CSS_LANG::XServiceInfo
- , public CSS_AWT::XPaintListener
- , public CSS_AWT::XWindowListener
- , public CSS_AWT::XView
- , public CSS_AWT::XWindow
- , public CSS_AWT::XControl
+class BaseControl : public ::com::sun::star::lang::XServiceInfo
+ , public ::com::sun::star::awt::XPaintListener
+ , public ::com::sun::star::awt::XWindowListener
+ , public ::com::sun::star::awt::XView
+ , public ::com::sun::star::awt::XWindow
+ , public ::com::sun::star::awt::XControl
, public IMPL_MutexContainer
, public ::cppu::OComponentHelper
{
@@ -168,7 +164,7 @@ public:
@onerror -
*/
- BaseControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
+ BaseControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
/**_______________________________________________________________________________________________________
@short -
@@ -202,9 +198,9 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual CSS_UNO::Any SAL_CALL queryInterface(
- const CSS_UNO::Type& aType
- ) throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
+ const ::com::sun::star::uno::Type& aType
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -255,8 +251,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short get implementation id
@@ -272,8 +268,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual CSS_UNO::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XAggregation
@@ -293,8 +289,8 @@ public:
*/
virtual void SAL_CALL setDelegator(
- const CSS_UNO::Reference< CSS_UNO::XInterface >& xDelegator
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDelegator
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -309,9 +305,9 @@ public:
@onerror -
*/
- virtual CSS_UNO::Any SAL_CALL queryAggregation(
- const CSS_UNO::Type& aType
- ) throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
+ const ::com::sun::star::uno::Type& aType
+ ) throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XServiceInfo
@@ -332,7 +328,7 @@ public:
virtual sal_Bool SAL_CALL supportsService(
const ::rtl::OUString& sServiceName
- ) throw( CSS_UNO::RuntimeException );
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -348,7 +344,7 @@ public:
*/
virtual ::rtl::OUString SAL_CALL getImplementationName()
- throw( CSS_UNO::RuntimeException );
+ throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -363,8 +359,8 @@ public:
@onerror -
*/
- virtual CSS_UNO::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XComponent
@@ -383,7 +379,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
+ virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -399,8 +395,8 @@ public:
*/
virtual void SAL_CALL addEventListener(
- const CSS_UNO::Reference< CSS_LANG::XEventListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -416,8 +412,8 @@ public:
*/
virtual void SAL_CALL removeEventListener(
- const CSS_UNO::Reference< CSS_LANG::XEventListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XControl
@@ -437,9 +433,9 @@ public:
*/
virtual void SAL_CALL createPeer(
- const CSS_UNO::Reference< CSS_AWT::XToolkit >& xToolkit,
- const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -455,8 +451,8 @@ public:
*/
virtual void SAL_CALL setContext(
- const CSS_UNO::Reference< CSS_UNO::XInterface >& xContext
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xContext
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -472,8 +468,8 @@ public:
*/
virtual sal_Bool SAL_CALL setModel(
- const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
- ) throw( CSS_UNO::RuntimeException ) = 0 ;
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel
+ ) throw( ::com::sun::star::uno::RuntimeException ) = 0 ;
/**_______________________________________________________________________________________________________
@short -
@@ -488,7 +484,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( CSS_UNO::RuntimeException );
+ virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -503,8 +499,8 @@ public:
@onerror -
*/
- virtual CSS_UNO::Reference< CSS_UNO::XInterface > SAL_CALL getContext()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext()
+ throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -519,8 +515,8 @@ public:
@onerror -
*/
- virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
- throw( CSS_UNO::RuntimeException ) = 0;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
+ throw( ::com::sun::star::uno::RuntimeException ) = 0;
/**_______________________________________________________________________________________________________
@short -
@@ -535,8 +531,8 @@ public:
@onerror -
*/
- virtual CSS_UNO::Reference< CSS_AWT::XWindowPeer > SAL_CALL getPeer()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer()
+ throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -551,8 +547,8 @@ public:
@onerror -
*/
- virtual CSS_UNO::Reference< CSS_AWT::XView > SAL_CALL getView()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView()
+ throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -567,7 +563,7 @@ public:
@onerror -
*/
- virtual sal_Bool SAL_CALL isDesignMode() throw( CSS_UNO::RuntimeException );
+ virtual sal_Bool SAL_CALL isDesignMode() throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -582,7 +578,7 @@ public:
@onerror -
*/
- virtual sal_Bool SAL_CALL isTransparent() throw( CSS_UNO::RuntimeException );
+ virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XWindow
@@ -605,7 +601,7 @@ public:
sal_Int32 nY ,
sal_Int32 nWidth ,
sal_Int32 nHeight ,
- sal_Int16 nFlags ) throw( CSS_UNO::RuntimeException );
+ sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -620,7 +616,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( CSS_UNO::RuntimeException );
+ virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -635,7 +631,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( CSS_UNO::RuntimeException );
+ virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -650,7 +646,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setFocus() throw( CSS_UNO::RuntimeException );
+ virtual void SAL_CALL setFocus() throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -665,7 +661,7 @@ public:
@onerror -
*/
- virtual CSS_AWT::Rectangle SAL_CALL getPosSize() throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -681,8 +677,8 @@ public:
*/
virtual void SAL_CALL addWindowListener(
- const CSS_UNO::Reference< CSS_AWT::XWindowListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -698,8 +694,8 @@ public:
*/
virtual void SAL_CALL addFocusListener(
- const CSS_UNO::Reference< CSS_AWT::XFocusListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -715,8 +711,8 @@ public:
*/
virtual void SAL_CALL addKeyListener(
- const CSS_UNO::Reference< CSS_AWT::XKeyListener >& xListener )
- throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -732,8 +728,8 @@ public:
*/
virtual void SAL_CALL addMouseListener(
- const CSS_UNO::Reference< CSS_AWT::XMouseListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -749,8 +745,8 @@ public:
*/
virtual void SAL_CALL addMouseMotionListener(
- const CSS_UNO::Reference< CSS_AWT::XMouseMotionListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -766,8 +762,8 @@ public:
*/
virtual void SAL_CALL addPaintListener(
- const CSS_UNO::Reference< CSS_AWT::XPaintListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -783,8 +779,8 @@ public:
*/
virtual void SAL_CALL removeWindowListener(
- const CSS_UNO::Reference< CSS_AWT::XWindowListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -800,8 +796,8 @@ public:
*/
virtual void SAL_CALL removeFocusListener(
- const CSS_UNO::Reference< CSS_AWT::XFocusListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -817,8 +813,8 @@ public:
*/
virtual void SAL_CALL removeKeyListener(
- const CSS_UNO::Reference< CSS_AWT::XKeyListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -834,8 +830,8 @@ public:
*/
virtual void SAL_CALL removeMouseListener(
- const CSS_UNO::Reference< CSS_AWT::XMouseListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -851,8 +847,8 @@ public:
*/
virtual void SAL_CALL removeMouseMotionListener(
- const CSS_UNO::Reference< CSS_AWT::XMouseMotionListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -868,8 +864,8 @@ public:
*/
virtual void SAL_CALL removePaintListener(
- const CSS_UNO::Reference< CSS_AWT::XPaintListener >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XView
@@ -889,7 +885,7 @@ public:
*/
virtual void SAL_CALL draw( sal_Int32 nX ,
- sal_Int32 nY ) throw( CSS_UNO::RuntimeException );
+ sal_Int32 nY ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -905,8 +901,8 @@ public:
*/
virtual sal_Bool SAL_CALL setGraphics(
- const CSS_UNO::Reference< CSS_AWT::XGraphics >& xDevice
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xDevice
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -922,7 +918,7 @@ public:
*/
virtual void SAL_CALL setZoom( float fZoomX ,
- float fZoomY ) throw( CSS_UNO::RuntimeException );
+ float fZoomY ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -937,8 +933,8 @@ public:
@onerror -
*/
- virtual CSS_UNO::Reference< CSS_AWT::XGraphics > SAL_CALL getGraphics()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics()
+ throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -953,10 +949,10 @@ public:
@onerror -
*/
- virtual CSS_AWT::Size SAL_CALL getSize() throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
- // CSS_LANG::XEventListener
+ // ::com::sun::star::lang::XEventListener
//________________________________________________________________________________________________________
/**_______________________________________________________________________________________________________
@@ -973,8 +969,8 @@ public:
*/
virtual void SAL_CALL disposing(
- const CSS_LANG::EventObject& rSource
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::lang::EventObject& rSource
+ ) throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XPaintListener
@@ -994,8 +990,8 @@ public:
*/
virtual void SAL_CALL windowPaint(
- const CSS_AWT::PaintEvent& rEvent
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::awt::PaintEvent& rEvent
+ ) throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XWindowListener
@@ -1014,10 +1010,10 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowResized( const CSS_AWT::WindowEvent& aEvent ) throw( CSS_UNO::RuntimeException );
- virtual void SAL_CALL windowMoved( const CSS_AWT::WindowEvent& aEvent ) throw( CSS_UNO::RuntimeException );
- virtual void SAL_CALL windowShown( const CSS_LANG::EventObject& aEvent ) throw( CSS_UNO::RuntimeException );
- virtual void SAL_CALL windowHidden( const CSS_LANG::EventObject& aEvent ) throw( CSS_UNO::RuntimeException );
+ virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// impl but public method to register service
@@ -1036,7 +1032,7 @@ public:
@onerror -
*/
- static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
+ static const ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
/**_______________________________________________________________________________________________________
@short -
@@ -1073,7 +1069,7 @@ protected:
@onerror -
*/
- const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory > impl_getMultiServiceFactory();
+ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > impl_getMultiServiceFactory();
/**_______________________________________________________________________________________________________
@short -
@@ -1088,7 +1084,7 @@ protected:
@onerror -
*/
- const CSS_UNO::Reference< CSS_AWT::XWindow > impl_getPeerWindow();
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > impl_getPeerWindow();
/**_______________________________________________________________________________________________________
@short -
@@ -1103,7 +1099,7 @@ protected:
@onerror -
*/
- const CSS_UNO::Reference< CSS_AWT::XGraphics > impl_getGraphicsPeer();
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > impl_getGraphicsPeer();
/**_______________________________________________________________________________________________________
@short -
@@ -1148,8 +1144,8 @@ protected:
@onerror -
*/
- virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
- const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+ virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentPeer
);
/**_______________________________________________________________________________________________________
@@ -1167,7 +1163,7 @@ protected:
virtual void impl_paint( sal_Int32 nX ,
sal_Int32 nY ,
- const CSS_UNO::Reference< CSS_AWT::XGraphics >& xGraphics );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics );
/**_______________________________________________________________________________________________________
@short -
@@ -1182,7 +1178,7 @@ protected:
@onerror -
*/
- virtual void impl_recalcLayout( const CSS_AWT::WindowEvent& aEvent );
+ virtual void impl_recalcLayout( const ::com::sun::star::awt::WindowEvent& aEvent );
/**_______________________________________________________________________________________________________
@short -
@@ -1197,7 +1193,7 @@ protected:
@onerror -
*/
- CSS_UNO::Reference< CSS_UNO::XInterface > impl_getDelegator();
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > impl_getDelegator();
//____________________________________________________________________________________________________________
// private methods
@@ -1241,15 +1237,15 @@ private:
private:
- CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory > m_xFactory ;
- CSS_UNO::Reference< CSS_UNO::XInterface > m_xDelegator ;
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory ;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator ;
OMRCListenerMultiplexerHelper* m_pMultiplexer ; // multiplex events
- CSS_UNO::Reference< CSS_UNO::XInterface > m_xMultiplexer ;
- CSS_UNO::Reference< CSS_UNO::XInterface > m_xContext ;
- CSS_UNO::Reference< CSS_AWT::XWindowPeer > m_xPeer ;
- CSS_UNO::Reference< CSS_AWT::XWindow > m_xPeerWindow ;
- CSS_UNO::Reference< CSS_AWT::XGraphics > m_xGraphicsView ; // graphics for CSS_AWT::XView-operations
- CSS_UNO::Reference< CSS_AWT::XGraphics > m_xGraphicsPeer ; // graphics for painting on a peer
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xMultiplexer ;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xContext ;
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > m_xPeer ;
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xPeerWindow ;
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > m_xGraphicsView ; // graphics for ::com::sun::star::awt::XView-operations
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > m_xGraphicsPeer ; // graphics for painting on a peer
sal_Int32 m_nX ; // Position ...
sal_Int32 m_nY ;
sal_Int32 m_nWidth ; // ... and size of window
@@ -1260,11 +1256,6 @@ private:
}; // class BaseControl
-// The namespace aliaes are only used in this header
-#undef CSS_UNO
-#undef CSS_AWT
-#undef CSS_LANG
-
} // namespace unocontrols
#endif // ifndef _UNOCONTROLS_BASECONTROL_CTRL_HXX
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index b9a90c5..de45536 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -68,21 +68,17 @@
namespace unocontrols{
-#define CSS_UNO ::com::sun::star::uno
-#define CSS_AWT ::com::sun::star::awt
-#define CSS_LANG ::com::sun::star::lang
-
//____________________________________________________________________________________________________________
// class
//____________________________________________________________________________________________________________
-class OMRCListenerMultiplexerHelper : public CSS_AWT::XFocusListener
- , public CSS_AWT::XWindowListener
- , public CSS_AWT::XKeyListener
- , public CSS_AWT::XMouseListener
- , public CSS_AWT::XMouseMotionListener
- , public CSS_AWT::XPaintListener
- , public CSS_AWT::XTopWindowListener
+class OMRCListenerMultiplexerHelper : public ::com::sun::star::awt::XFocusListener
+ , public ::com::sun::star::awt::XWindowListener
+ , public ::com::sun::star::awt::XKeyListener
+ , public ::com::sun::star::awt::XMouseListener
+ , public ::com::sun::star::awt::XMouseMotionListener
+ , public ::com::sun::star::awt::XPaintListener
+ , public ::com::sun::star::awt::XTopWindowListener
, public ::cppu::OWeakObject
{
@@ -110,8 +106,8 @@ public:
@onerror -
*/
- OMRCListenerMultiplexerHelper( const CSS_UNO::Reference< CSS_AWT::XWindow >& xControl ,
- const CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer );
+ OMRCListenerMultiplexerHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xControl ,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xPeer );
/**_______________________________________________________________________________________________________
@short copy-constructor
@@ -160,8 +156,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
+ throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -212,7 +208,7 @@ public:
@onerror -
*/
- operator CSS_UNO::Reference< CSS_UNO::XInterface >() const;
+ operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() const;
/**_______________________________________________________________________________________________________
@short -
@@ -246,7 +242,7 @@ public:
@onerror -
*/
- void setPeer( const CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer );
+ void setPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xPeer );
/**_______________________________________________________________________________________________________
@short Remove all listeners and send a disposing message.
@@ -276,8 +272,8 @@ public:
@onerror -
*/
- void advise( const CSS_UNO::Type& aType ,
- const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener );
+ void advise( const ::com::sun::star::uno::Type& aType ,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener );
/**_______________________________________________________________________________________________________
@short Remove the specified listener from the source.
@@ -292,8 +288,8 @@ public:
@onerror -
*/
- void unadvise( const CSS_UNO::Type& aType ,
- const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener );
+ void unadvise( const ::com::sun::star::uno::Type& aType ,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener );
//________________________________________________________________________________________________________
// XEventListener
@@ -313,8 +309,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL disposing(const CSS_LANG::EventObject& aSource)
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& aSource)
+ throw( ::com::sun::star::uno::RuntimeException ) ;
//________________________________________________________________________________________________________
// XFocusListener
@@ -334,8 +330,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL focusGained(const CSS_AWT::FocusEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -351,8 +347,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL focusLost(const CSS_AWT::FocusEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
//________________________________________________________________________________________________________
// XWindowListener
@@ -372,8 +368,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowResized(const CSS_AWT::WindowEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -389,8 +385,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowMoved(const CSS_AWT::WindowEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -406,8 +402,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowShown(const CSS_LANG::EventObject& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowShown(const ::com::sun::star::lang::EventObject& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -423,8 +419,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowHidden(const CSS_LANG::EventObject& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
//________________________________________________________________________________________________________
// XKeyListener
@@ -444,8 +440,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL keyPressed( const CSS_AWT::KeyEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -461,8 +457,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL keyReleased( const CSS_AWT::KeyEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
//________________________________________________________________________________________________________
// XMouseListener
@@ -482,8 +478,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL mousePressed(const CSS_AWT::MouseEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -499,8 +495,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL mouseReleased(const CSS_AWT::MouseEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -516,8 +512,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL mouseEntered(const CSS_AWT::MouseEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -533,8 +529,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL mouseExited(const CSS_AWT::MouseEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
//________________________________________________________________________________________________________
// XMouseMotionListener
@@ -554,8 +550,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL mouseDragged(const CSS_AWT::MouseEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -571,8 +567,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL mouseMoved(const CSS_AWT::MouseEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
//________________________________________________________________________________________________________
// XPaintListener
@@ -592,8 +588,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowPaint(const CSS_AWT::PaintEvent& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
//________________________________________________________________________________________________________
// XTopWindowListener
@@ -613,8 +609,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowOpened( const CSS_LANG::EventObject& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -630,8 +626,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowClosing( const CSS_LANG::EventObject& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -647,8 +643,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowClosed( const CSS_LANG::EventObject& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -664,8 +660,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowMinimized( const CSS_LANG::EventObject& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -681,8 +677,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowNormalized( const CSS_LANG::EventObject& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -698,8 +694,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowActivated( const CSS_LANG::EventObject& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
/**_______________________________________________________________________________________________________
@short -
@@ -715,8 +711,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL windowDeactivated( const CSS_LANG::EventObject& aEvent )
- throw( CSS_UNO::RuntimeException ) ;
+ virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& aEvent )
+ throw( ::com::sun::star::uno::RuntimeException ) ;
//____________________________________________________________________________________________________________
// protected methods
@@ -738,8 +734,8 @@ protected:
@onerror -
*/
- void impl_adviseToPeer( const CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer ,
- const CSS_UNO::Type& aType );
+ void impl_adviseToPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xPeer ,
+ const ::com::sun::star::uno::Type& aType );
/**_______________________________________________________________________________________________________
@short Add the listener to the peer.
@@ -755,8 +751,8 @@ protected:
@onerror -
*/
- void impl_unadviseFromPeer( const CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer ,
- const CSS_UNO::Type& aType );
+ void impl_unadviseFromPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xPeer ,
+ const ::com::sun::star::uno::Type& aType );
//____________________________________________________________________________________________________________
// private variables
@@ -765,18 +761,12 @@ protected:
private:
::osl::Mutex m_aMutex ;
- CSS_UNO::Reference< CSS_AWT::XWindow > m_xPeer ; /// The source of the events. Normally this is the peer object.
- CSS_UNO::WeakReference< CSS_AWT::XWindow > m_xControl ;
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xPeer ; /// The source of the events. Normally this is the peer object.
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::awt::XWindow > m_xControl ;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerHolder ;
}; // class OMRCListenerMultiplexerHelper
-// The namespace aliases are only used in this header
-#undef CSS_UNO
-#undef CSS_AWT
-#undef CSS_LANG
-
-
} // namespace unocontrols
#endif // ifndef _UNOCONTROLS_MULTIPLEXER_HXX
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index e0cc5a9..a2825fb 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -48,9 +48,6 @@
namespace unocontrols{
-#define CSS_UNO ::com::sun::star::uno
-#define CSS_LANG ::com::sun::star::lang
-
//______________________________________________________________________________________________________________
// defines
//______________________________________________________________________________________________________________
@@ -59,7 +56,7 @@ namespace unocontrols{
// class declaration OConnectionPointContainerHelper
//______________________________________________________________________________________________________________
-class OConnectionPointContainerHelper : public CSS_LANG::XConnectionPointContainer
+class OConnectionPointContainerHelper : public ::com::sun::star::lang::XConnectionPointContainer
, public ::cppu::OWeakObject
{
@@ -120,8 +117,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
+ throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -172,8 +169,8 @@ public:
@onerror
*/
- virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getConnectionPointTypes()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes()
+ throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -188,9 +185,9 @@ public:
@onerror
*/
- virtual CSS_UNO::Reference< CSS_LANG::XConnectionPoint > SAL_CALL queryConnectionPoint(
- const CSS_UNO::Type& aType
- ) throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint(
+ const ::com::sun::star::uno::Type& aType
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -206,9 +203,9 @@ public:
*/
virtual void SAL_CALL advise(
- const CSS_UNO::Type& aType ,
- const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Type& aType ,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -224,9 +221,9 @@ public:
*/
virtual void SAL_CALL unadvise(
- const CSS_UNO::Type& aType ,
- const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Type& aType ,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -254,10 +251,6 @@ private:
}; // class OConnectionPointContainerHelper
-// The namespace aliases are only used in this header
-#undef CSS_UNO
-#undef CSS_LANG
-
} // namespace unocontrols
#endif // #ifndef _OCONNECTIONPOINTCONTAINERHELPER_HXX
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index b36147e..a0907ae 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -49,9 +49,6 @@
namespace unocontrols{
-#define CSS_UNO ::com::sun::star::uno
-#define CSS_LANG ::com::sun::star::lang
-
//______________________________________________________________________________________________________________
// defines
//______________________________________________________________________________________________________________
@@ -60,7 +57,7 @@ namespace unocontrols{
// class declaration OConnectionPointHelper
//______________________________________________________________________________________________________________
-class OConnectionPointHelper : public CSS_LANG::XConnectionPoint
+class OConnectionPointHelper : public ::com::sun::star::lang::XConnectionPoint
, public ::cppu::OWeakObject
{
@@ -89,7 +86,7 @@ public:
OConnectionPointHelper( ::osl::Mutex& aMutex ,
OConnectionPointContainerHelper* pContainerImplementation ,
- CSS_UNO::Type aType );
+ ::com::sun::star::uno::Type aType );
/**_________________________________________________________________________________________________________
@short
@@ -123,8 +120,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
+ throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -175,8 +172,8 @@ public:
@onerror
*/
- virtual CSS_UNO::Type SAL_CALL getConnectionType()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Type SAL_CALL getConnectionType()
+ throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -191,8 +188,8 @@ public:
@onerror
*/
- virtual CSS_UNO::Reference< CSS_LANG::XConnectionPointContainer > SAL_CALL getConnectionPointContainer()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer()
+ throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -208,11 +205,11 @@ public:
*/
virtual void SAL_CALL advise(
- const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener
) throw (
- CSS_LANG::ListenerExistException,
- CSS_LANG::InvalidListenerException ,
- CSS_UNO::RuntimeException
+ ::com::sun::star::lang::ListenerExistException,
+ ::com::sun::star::lang::InvalidListenerException ,
+ ::com::sun::star::uno::RuntimeException
);
/**_________________________________________________________________________________________________________
@@ -228,8 +225,8 @@ public:
@onerror
*/
- virtual void SAL_CALL unadvise( const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener )
- throw( CSS_UNO::RuntimeException );
+ virtual void SAL_CALL unadvise( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -244,8 +241,8 @@ public:
@onerror
*/
- virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_UNO::XInterface > > SAL_CALL getConnections()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getConnections()
+ throw( ::com::sun::star::uno::RuntimeException );
//______________________________________________________________________________________________________________
// private methods
@@ -290,18 +287,14 @@ private:
private:
::osl::Mutex& m_aSharedMutex ;
- CSS_UNO::WeakReference< CSS_LANG::XConnectionPointContainer > m_oContainerWeakReference ; // Reference to container-class!. Don't use Reference<...>
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XConnectionPointContainer > m_oContainerWeakReference ; // Reference to container-class!. Don't use Reference<...>
// It is a ring-reference => and must be a wekreference!
OConnectionPointContainerHelper* m_pContainerImplementation ;
- CSS_UNO::Type m_aInterfaceType ;
- CSS_UNO::Reference< CSS_UNO::XInterface > m_xLock ;
+ ::com::sun::star::uno::Type m_aInterfaceType ;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xLock ;
}; // class OConnectionPointHelper
-// The namespace aliases are only used in this header
-#undef CSS_UNO
-#undef CSS_LANG
-
} // namespace unocontrols
#endif // #ifndef _OCONNECTIONPOINTHELPER_HXX
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index 5d068ad..185e596 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -55,12 +55,6 @@
namespace unocontrols{
-#define CSS_UNO ::com::sun::star::uno
-#define CSS_LANG ::com::sun::star::lang
-#define CSS_BEANS ::com::sun::star::beans
-#define CSS_AWT ::com::sun::star::awt
-#define CSS_FRAME ::com::sun::star::frame
-
//______________________________________________________________________________________________________________
// defines
//______________________________________________________________________________________________________________
@@ -80,8 +74,8 @@ namespace unocontrols{
// class
//______________________________________________________________________________________________________________
-class FrameControl : public CSS_AWT::XControlModel
- , public CSS_LANG::XConnectionPointContainer
+class FrameControl : public ::com::sun::star::awt::XControlModel
+ , public ::com::sun::star::lang::XConnectionPointContainer
, public BaseControl // This order is neccessary for right initialization of m_aMutex!
, public ::cppu::OBroadcastHelper
, public ::cppu::OPropertySetHelper
@@ -110,7 +104,7 @@ public:
@onerror
*/
- FrameControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
+ FrameControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
/**_________________________________________________________________________________________________________
@short
@@ -144,9 +138,9 @@ public:
@onerror
*/
- virtual CSS_UNO::Any SAL_CALL queryInterface(
- const CSS_UNO::Type& aType
- ) throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
+ const ::com::sun::star::uno::Type& aType
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -197,8 +191,8 @@ public:
@onerror
*/
- virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw( ::com::sun::star::uno::RuntimeException );
//__________________________________________________________________________________________________________
// XAggregation
@@ -217,9 +211,9 @@ public:
@onerror
*/
- CSS_UNO::Any SAL_CALL queryAggregation(
- const CSS_UNO::Type& aType
- ) throw( CSS_UNO::RuntimeException );
+ ::com::sun::star::uno::Any SAL_CALL queryAggregation(
+ const ::com::sun::star::uno::Type& aType
+ ) throw( ::com::sun::star::uno::RuntimeException );
//__________________________________________________________________________________________________________
// XControl
@@ -239,9 +233,9 @@ public:
*/
virtual void SAL_CALL createPeer(
- const CSS_UNO::Reference< CSS_AWT::XToolkit >& xToolkit ,
- const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
- ) throw ( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit ,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent
+ ) throw ( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -257,8 +251,8 @@ public:
*/
virtual sal_Bool SAL_CALL setModel(
- const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -273,8 +267,8 @@ public:
@onerror
*/
- virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
+ throw( ::com::sun::star::uno::RuntimeException );
//__________________________________________________________________________________________________________
// XComponent
@@ -293,7 +287,7 @@ public:
@onerror
*/
- virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
+ virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
//__________________________________________________________________________________________________________
// XView
@@ -313,8 +307,8 @@ public:
*/
virtual sal_Bool SAL_CALL setGraphics(
- const CSS_UNO::Reference< CSS_AWT::XGraphics >& xDevice
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xDevice
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -329,8 +323,8 @@ public:
@onerror
*/
- virtual CSS_UNO::Reference< CSS_AWT::XGraphics > SAL_CALL getGraphics()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics()
+ throw( ::com::sun::star::uno::RuntimeException );
//__________________________________________________________________________________________________________
// XConnectionPointContainer
@@ -349,8 +343,8 @@ public:
@onerror
*/
- virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getConnectionPointTypes()
- throw( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes()
+ throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -365,9 +359,9 @@ public:
@onerror
*/
- virtual CSS_UNO::Reference< CSS_LANG::XConnectionPoint > SAL_CALL queryConnectionPoint(
- const CSS_UNO::Type& aType
- ) throw ( CSS_UNO::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint(
+ const ::com::sun::star::uno::Type& aType
+ ) throw ( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -383,9 +377,9 @@ public:
*/
virtual void SAL_CALL advise(
- const CSS_UNO::Type& aType ,
- const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Type& aType ,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -401,9 +395,9 @@ public:
*/
virtual void SAL_CALL unadvise(
- const CSS_UNO::Type& aType ,
- const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
- ) throw( CSS_UNO::RuntimeException );
+ const ::com::sun::star::uno::Type& aType ,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener
+ ) throw( ::com::sun::star::uno::RuntimeException );
//__________________________________________________________________________________________________________
// impl but public methods to register service!
@@ -422,7 +416,7 @@ public:
@onerror
*/
- static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
+ static const ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
/**_________________________________________________________________________________________________________
@short
@@ -463,11 +457,11 @@ protected:
*/
virtual sal_Bool SAL_CALL convertFastPropertyValue(
- CSS_UNO::Any& rConvertedValue ,
- CSS_UNO::Any& rOldValue ,
+ ::com::sun::star::uno::Any& rConvertedValue ,
+ ::com::sun::star::uno::Any& rOldValue ,
sal_Int32 nHandle ,
- const CSS_UNO::Any& rValue
- ) throw( CSS_LANG::IllegalArgumentException );
+ const ::com::sun::star::uno::Any& rValue
+ ) throw( ::com::sun::star::lang::IllegalArgumentException );
/**_________________________________________________________________________________________________________
@short
@@ -484,7 +478,7 @@ protected:
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle ,
- const CSS_UNO::Any& rValue
+ const ::com::sun::star::uno::Any& rValue
) throw ( ::com::sun::star::uno::Exception );
/**_________________________________________________________________________________________________________
@@ -500,7 +494,7 @@ protected:
@onerror
*/
- virtual void SAL_CALL getFastPropertyValue( CSS_UNO::Any& rValue ,
+ virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue ,
sal_Int32 nHandle ) const ;
/**_________________________________________________________________________________________________________
@@ -535,8 +529,8 @@ protected:
@onerror
*/
- CSS_UNO::Reference< CSS_BEANS::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw( CSS_UNO::RuntimeException );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list