diff options
Diffstat (limited to 'toolkit')
278 files changed, 3545 insertions, 3545 deletions
diff --git a/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx index 46d4c383a984..bc2ad2863f6e 100644 --- a/toolkit/inc/layout/layout-post.hxx +++ b/toolkit/inc/layout/layout-post.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/layout/layout-pre.hxx b/toolkit/inc/layout/layout-pre.hxx index 4205a44f1f54..07da43333509 100644 --- a/toolkit/inc/layout/layout-pre.hxx +++ b/toolkit/inc/layout/layout-pre.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx index ec63578b0408..6c3320cc581a 100644 --- a/toolkit/inc/layout/layout.hxx +++ b/toolkit/inc/layout/layout.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/pch/precompiled_toolkit.cxx b/toolkit/inc/pch/precompiled_toolkit.cxx index 1fe273215d9b..75827de350f2 100644 --- a/toolkit/inc/pch/precompiled_toolkit.cxx +++ b/toolkit/inc/pch/precompiled_toolkit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/pch/precompiled_toolkit.hxx b/toolkit/inc/pch/precompiled_toolkit.hxx index 300536d3951c..93d2c9035196 100644 --- a/toolkit/inc/pch/precompiled_toolkit.hxx +++ b/toolkit/inc/pch/precompiled_toolkit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx index 24eae01f8e9d..89cd5cf8a741 100644 --- a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ #include <comphelper/accimplaccess.hxx> #include <comphelper/accessiblecomponenthelper.hxx> -#include <tools/gen.hxx> // Size -#include <tools/link.hxx> // Size +#include <tools/gen.hxx> // Size +#include <tools/link.hxx> // Size class Window; class VCLXWindow; @@ -55,13 +55,13 @@ class AccessibleStateSetHelper; } -// ---------------------------------------------------- -// class VCLXAccessibleComponent -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXAccessibleComponent +// ---------------------------------------------------- -typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; +typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; -typedef ::cppu::ImplHelper1< +typedef ::cppu::ImplHelper1< ::com::sun::star::lang::XServiceInfo > VCLXAccessibleComponent_BASE; class VCLExternalSolarLock; @@ -73,30 +73,30 @@ class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent { private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> mxWindow; - VCLXWindow* mpVCLXindow; + VCLXWindow* mpVCLXindow; - ULONG nDummy1; - ULONG nDummy2; - void* pDummy1; - VCLExternalSolarLock* m_pSolarLock; + ULONG nDummy1; + ULONG nDummy2; + void* pDummy1; + VCLExternalSolarLock* m_pSolarLock; protected: DECL_LINK( WindowEventListener, VclSimpleEvent* ); DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual void ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ); - virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ); - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + virtual void ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ); + virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ); + virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChildAccessible( const VclWindowEvent& rVclWindowEvent ); - + public: VCLXAccessibleComponent( VCLXWindow* pVCLXindow ); ~VCLXAccessibleComponent(); VCLXWindow* GetVCLXWindow() const { return mpVCLXindow; } - Window* GetWindow() const; + Window* GetWindow() const; virtual void SAL_CALL disposing(); @@ -113,24 +113,24 @@ public: // ::com::sun::star::accessibility::XAccessibleContext sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); + sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::accessibility::XAccessibleComponent ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException); void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::accessibility::XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); @@ -139,7 +139,7 @@ protected: ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds( ) throw (::com::sun::star::uno::RuntimeException); private: - /** we may be reparented (if external components use OAccessibleImplementationAccess base class), + /** we may be reparented (if external components use OAccessibleImplementationAccess base class), so this method here returns the parent in the VCL world, in opposite to the parent an external component gave us @precond diff --git a/toolkit/inc/toolkit/awt/vclxbitmap.hxx b/toolkit/inc/toolkit/awt/vclxbitmap.hxx index aa489d094e48..d527eee1939b 100644 --- a/toolkit/inc/toolkit/awt/vclxbitmap.hxx +++ b/toolkit/inc/toolkit/awt/vclxbitmap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,47 +38,47 @@ #include <vcl/bitmapex.hxx> -// ---------------------------------------------------- -// class VCLXBitmap -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXBitmap +// ---------------------------------------------------- -class VCLXBitmap : public ::com::sun::star::awt::XBitmap, +class VCLXBitmap : public ::com::sun::star::awt::XBitmap, public ::com::sun::star::awt::XDisplayBitmap, public ::com::sun::star::lang::XTypeProvider, public ::com::sun::star::lang::XUnoTunnel, public ::cppu::OWeakObject { private: - ::osl::Mutex maMutex; - BitmapEx maBitmap; + ::osl::Mutex maMutex; + BitmapEx maBitmap; protected: - ::osl::Mutex& GetMutex() { return maMutex; } + ::osl::Mutex& GetMutex() { return maMutex; } public: - void SetBitmap( const BitmapEx& rBmp ) { maBitmap = rBmp; } - const BitmapEx& GetBitmap() const { return maBitmap; } - + void SetBitmap( const BitmapEx& rBmp ) { maBitmap = rBmp; } + const BitmapEx& GetBitmap() const { return maBitmap; } + // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXBitmap* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXBitmap* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XBitmap - ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/toolkit/inc/toolkit/awt/vclxcontainer.hxx b/toolkit/inc/toolkit/awt/vclxcontainer.hxx index 3e95d8f9811f..6d52065c213d 100644 --- a/toolkit/inc/toolkit/awt/vclxcontainer.hxx +++ b/toolkit/inc/toolkit/awt/vclxcontainer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,26 +39,26 @@ #include <toolkit/awt/vclxwindow.hxx> -// ---------------------------------------------------- -// class VCLXContainer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXContainer +// ---------------------------------------------------- -class VCLXContainer : public ::com::sun::star::awt::XVclContainer, - public ::com::sun::star::awt::XVclContainerPeer, +class VCLXContainer : public ::com::sun::star::awt::XVclContainer, + public ::com::sun::star::awt::XVclContainerPeer, public VCLXWindow { -public: +public: VCLXContainer(); ~VCLXContainer(); - + // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclContainer void SAL_CALL addVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx index 5cee7501ac34..d47c883d37ff 100644 --- a/toolkit/inc/toolkit/awt/vclxdevice.hxx +++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx @@ -41,14 +41,14 @@ class OutputDevice; class VirtualDevice; -// ---------------------------------------------------- -// class VCLXDevice -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXDevice +// ---------------------------------------------------- // For using nDummy, no incompatible update, add a BOOL bCreatedWithToolkitMember later... #define FLAGS_CREATEDWITHTOOLKIT 0x00000001 -class TOOLKIT_DLLPUBLIC VCLXDevice : public ::com::sun::star::awt::XDevice, +class TOOLKIT_DLLPUBLIC VCLXDevice : public ::com::sun::star::awt::XDevice, public ::com::sun::star::lang::XTypeProvider, public ::com::sun::star::lang::XUnoTunnel, /* public ::com::sun::star::awt::XTextConstraints,*/ @@ -59,47 +59,47 @@ class TOOLKIT_DLLPUBLIC VCLXDevice : public ::com::sun::star::awt::XDevice, private: ::osl::SolarMutex& mrMutex; // Reference to SolarMutex - OutputDevice* mpOutputDevice; + OutputDevice* mpOutputDevice; public: - void* pDummy; - sal_uInt32 nFlags; + void* pDummy; + sal_uInt32 nFlags; protected: ::osl::SolarMutex& GetMutex() { return mrMutex; } - void DestroyOutputDevice(); + void DestroyOutputDevice(); public: VCLXDevice(); ~VCLXDevice(); - void SetOutputDevice( OutputDevice* pOutDev ) { mpOutputDevice = pOutDev; } - OutputDevice* GetOutputDevice() const { return mpOutputDevice; } + void SetOutputDevice( OutputDevice* pOutDev ) { mpOutputDevice = pOutDev; } + OutputDevice* GetOutputDevice() const { return mpOutputDevice; } void SetCreatedWithToolkit( sal_Bool bCreatedWithToolkit ); sal_Bool IsCreatedWithToolkit() const; // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXDevice* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXDevice* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XDevice, - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL createGraphics( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL createGraphics( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor > SAL_CALL getFontDescriptors( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( const ::com::sun::star::awt::FontDescriptor& aDescriptor ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( const ::com::sun::star::awt::FontDescriptor& aDescriptor ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap > SAL_CALL createDisplayBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& Bitmap ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTextConstraints @@ -115,19 +115,19 @@ public: }; -// ---------------------------------------------------- -// class VCLXVirtualDevice -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXVirtualDevice +// ---------------------------------------------------- class VCLXVirtualDevice : public VCLXDevice { private: - VirtualDevice* mpVDev; + VirtualDevice* mpVDev; public: ~VCLXVirtualDevice(); - void SetVirtualDevice( VirtualDevice* pVDev ) { SetOutputDevice( (OutputDevice*)pVDev ); } + void SetVirtualDevice( VirtualDevice* pVDev ) { SetOutputDevice( (OutputDevice*)pVDev ); } }; diff --git a/toolkit/inc/toolkit/awt/vclxfont.hxx b/toolkit/inc/toolkit/awt/vclxfont.hxx index 3aa432071251..ef13c6aea20a 100644 --- a/toolkit/inc/toolkit/awt/vclxfont.hxx +++ b/toolkit/inc/toolkit/awt/vclxfont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,54 +38,54 @@ #include <osl/mutex.hxx> #include <vcl/metric.hxx> -// ---------------------------------------------------- -// class VCLXFont -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXFont +// ---------------------------------------------------- -class TOOLKIT_DLLPUBLIC VCLXFont : public ::com::sun::star::awt::XFont2, +class TOOLKIT_DLLPUBLIC VCLXFont : public ::com::sun::star::awt::XFont2, public ::com::sun::star::lang::XTypeProvider, public ::com::sun::star::lang::XUnoTunnel, public ::cppu::OWeakObject { private: - ::osl::Mutex maMutex; + ::osl::Mutex maMutex; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; - Font maFont; - FontMetric* mpFontMetric; + Font maFont; + FontMetric* mpFontMetric; protected: - BOOL ImplAssertValidFontMetric(); - ::osl::Mutex& GetMutex() { return maMutex; } + BOOL ImplAssertValidFontMetric(); + ::osl::Mutex& GetMutex() { return maMutex; } public: VCLXFont(); ~VCLXFont(); - void Init( ::com::sun::star::awt::XDevice& rxDev, const Font& rFont ); - const Font& GetFont() const { return maFont; } + void Init( ::com::sun::star::awt::XDevice& rxDev, const Font& rFont ); + const Font& GetFont() const { return maFont; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXFont* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXFont* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XFont - ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptor( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric( ) throw(::com::sun::star::uno::RuntimeException); - sal_Int16 SAL_CALL getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getStringWidth( const ::rtl::OUString& str ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getStringWidthArray( const ::rtl::OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars1, ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars2, ::com::sun::star::uno::Sequence< sal_Int16 >& rnKerns ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptor( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric( ) throw(::com::sun::star::uno::RuntimeException); + sal_Int16 SAL_CALL getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(::com::sun::star::uno::RuntimeException); + sal_Int32 SAL_CALL getStringWidth( const ::rtl::OUString& str ) throw(::com::sun::star::uno::RuntimeException); + sal_Int32 SAL_CALL getStringWidthArray( const ::rtl::OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars1, ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars2, ::com::sun::star::uno::Sequence< sal_Int16 >& rnKerns ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XFont2 sal_Bool SAL_CALL hasGlyphs( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/toolkit/inc/toolkit/awt/vclxgraphics.hxx index 22266f3aa7fc..2572484f7b27 100644 --- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx +++ b/toolkit/inc/toolkit/awt/vclxgraphics.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,34 +44,34 @@ class OutputDevice; class Region; -#define INITOUTDEV_FONT 0x0001 -#define INITOUTDEV_COLORS 0x0002 -#define INITOUTDEV_RASTEROP 0x0004 -#define INITOUTDEV_CLIPREGION 0x0008 -#define INITOUTDEV_ALL 0xFFFF +#define INITOUTDEV_FONT 0x0001 +#define INITOUTDEV_COLORS 0x0002 +#define INITOUTDEV_RASTEROP 0x0004 +#define INITOUTDEV_CLIPREGION 0x0008 +#define INITOUTDEV_ALL 0xFFFF -// ---------------------------------------------------- -// class VCLXGraphics -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXGraphics +// ---------------------------------------------------- -class VCLXGraphics : public ::com::sun::star::awt::XGraphics, +class VCLXGraphics : public ::com::sun::star::awt::XGraphics, public ::com::sun::star::lang::XTypeProvider, public ::com::sun::star::lang::XUnoTunnel, public ::cppu::OWeakObject { private: - osl::SolarMutex& mrMutex; // Reference to SolarMutex - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; // nur um bei getDevice() immer das gleiche zurueckzugeben - - OutputDevice* mpOutputDevice; - Font maFont; - Color maTextColor; - Color maTextFillColor; - Color maLineColor; - Color maFillColor; - RasterOp meRasterOp; - Region* mpClipRegion; + osl::SolarMutex& mrMutex; // Reference to SolarMutex + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; // nur um bei getDevice() immer das gleiche zurueckzugeben + + OutputDevice* mpOutputDevice; + Font maFont; + Color maTextColor; + Color maTextFillColor; + Color maLineColor; + Color maFillColor; + RasterOp meRasterOp; + Region* mpClipRegion; protected: osl::SolarMutex& GetMutex() { return mrMutex; } @@ -80,58 +80,58 @@ public: VCLXGraphics(); ~VCLXGraphics(); - void Init( OutputDevice* pOutDev ); - void InitOutputDevice( sal_uInt16 nFlags ); + void Init( OutputDevice* pOutDev ); + void InitOutputDevice( sal_uInt16 nFlags ); - void SetOutputDevice( OutputDevice* pOutDev ); - OutputDevice* GetOutputDevice() const { return mpOutputDevice; } + void SetOutputDevice( OutputDevice* pOutDev ); + OutputDevice* GetOutputDevice() const { return mpOutputDevice; } - const Font& GetFont() const { return maFont; } + const Font& GetFont() const { return maFont; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXGraphics* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXGraphics* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XGraphics - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL getDevice( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric() throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xNewFont ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL selectFont( const ::com::sun::star::awt::FontDescriptor& aDescription ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setTextColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setTextFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setLineColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation ROP ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& Clipping ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& xClipping ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL push( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL pop( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& xSource, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& xBitmapHandle, sal_Int32 SourceX, sal_Int32 SourceY, sal_Int32 SourceWidth, sal_Int32 SourceHeight, sal_Int32 DestX, sal_Int32 DestY, sal_Int32 DestWidth, sal_Int32 DestHeight ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawPixel( sal_Int32 X, sal_Int32 Y ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawLine( sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawRect( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawRoundedRect( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 nHorzRound, sal_Int32 nVertRound ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawPolyLine( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawPolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataY ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawEllipse( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawArc( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawPie( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawChord( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawGradient( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 Height, const ::com::sun::star::awt::Gradient& aGradient ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawText( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawTextArray( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< sal_Int32 >& Longs ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL getDevice( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric() throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xNewFont ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL selectFont( const ::com::sun::star::awt::FontDescriptor& aDescription ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setTextColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setTextFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setLineColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation ROP ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& Clipping ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& xClipping ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL push( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL pop( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& xSource, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& xBitmapHandle, sal_Int32 SourceX, sal_Int32 SourceY, sal_Int32 SourceWidth, sal_Int32 SourceHeight, sal_Int32 DestX, sal_Int32 DestY, sal_Int32 DestWidth, sal_Int32 DestHeight ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawPixel( sal_Int32 X, sal_Int32 Y ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawLine( sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawRect( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawRoundedRect( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 nHorzRound, sal_Int32 nVertRound ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawPolyLine( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawPolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataY ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawEllipse( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawArc( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawPie( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawChord( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawGradient( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 Height, const ::com::sun::star::awt::Gradient& aGradient ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawText( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawTextArray( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< sal_Int32 >& Longs ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx index 0060d155a01c..cdf0fff9b61d 100644 --- a/toolkit/inc/toolkit/awt/vclxmenu.hxx +++ b/toolkit/inc/toolkit/awt/vclxmenu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ class PopupMenu; DECLARE_LIST( PopupMenuRefList, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >* ) -// ---------------------------------------------------- -// class VCLXMenu -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXMenu +// ---------------------------------------------------- class TOOLKIT_DLLPUBLIC VCLXMenu : public ::com::sun::star::awt::XMenuBarExtended, public ::com::sun::star::awt::XPopupMenuExtended, @@ -62,17 +62,17 @@ class TOOLKIT_DLLPUBLIC VCLXMenu : public ::com::sun::star::awt::XMenuBarExtend public ::cppu::OWeakObject { private: - ::osl::Mutex maMutex; - Menu* mpMenu; - MenuListenerMultiplexer maMenuListeners; - PopupMenuRefList maPopupMenueRefs; + ::osl::Mutex maMutex; + Menu* mpMenu; + MenuListenerMultiplexer maMenuListeners; + PopupMenuRefList maPopupMenueRefs; protected: - ::osl::Mutex& GetMutex() { return maMutex; } + ::osl::Mutex& GetMutex() { return maMutex; } - DECL_LINK( MenuEventListener, VclSimpleEvent* ); + DECL_LINK( MenuEventListener, VclSimpleEvent* ); - void ImplCreateMenu( sal_Bool bPopup ); + void ImplCreateMenu( sal_Bool bPopup ); public: VCLXMenu(); @@ -80,22 +80,22 @@ public: ~VCLXMenu(); - Menu* GetMenu() const { return mpMenu; } - BOOL IsPopupMenu() const; + Menu* GetMenu() const { return mpMenu; } + BOOL IsPopupMenu() const; // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXMenu* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXMenu* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XMenu void SAL_CALL addMenuListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); @@ -166,9 +166,9 @@ public: }; -// ---------------------------------------------------- -// class VCLXMenuBar -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXMenuBar +// ---------------------------------------------------- class TOOLKIT_DLLPUBLIC VCLXMenuBar : public VCLXMenu { public: @@ -176,9 +176,9 @@ public: VCLXMenuBar( MenuBar* pMenuBar ); }; -// ---------------------------------------------------- -// class VCLXPopupMenu -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXPopupMenu +// ---------------------------------------------------- class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCLXMenu { public: diff --git a/toolkit/inc/toolkit/awt/vclxpointer.hxx b/toolkit/inc/toolkit/awt/vclxpointer.hxx index 20fea4e36216..d24fd04e0d4f 100644 --- a/toolkit/inc/toolkit/awt/vclxpointer.hxx +++ b/toolkit/inc/toolkit/awt/vclxpointer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,41 +38,41 @@ #include <vcl/pointr.hxx> -// ---------------------------------------------------- -// class VCLXPointer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXPointer +// ---------------------------------------------------- -class VCLXPointer : public ::com::sun::star::awt::XPointer, +class VCLXPointer : public ::com::sun::star::awt::XPointer, public ::com::sun::star::lang::XTypeProvider, public ::com::sun::star::lang::XUnoTunnel, public ::cppu::OWeakObject { private: - ::osl::Mutex maMutex; - Pointer maPointer; + ::osl::Mutex maMutex; + Pointer maPointer; protected: - ::osl::Mutex& GetMutex() { return maMutex; } + ::osl::Mutex& GetMutex() { return maMutex; } -public: +public: VCLXPointer(); ~VCLXPointer(); - const Pointer& GetPointer() const { return maPointer; } - + const Pointer& GetPointer() const { return maPointer; } + // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXPointer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXPointer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XPointer void SAL_CALL setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/awt/vclxprinter.hxx b/toolkit/inc/toolkit/awt/vclxprinter.hxx index 318177d5d818..f140cacce2be 100644 --- a/toolkit/inc/toolkit/awt/vclxprinter.hxx +++ b/toolkit/inc/toolkit/awt/vclxprinter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,41 +45,41 @@ // Fuer den Drucker relevante Properties: /* - sal_Bool Horizontal - sal_uInt16 CopyCount; - sal_Bool Collate; - String FormDescriptor; - sal_uInt16 Orientation; // PORTRAIT, LANDSCAPE + sal_Bool Horizontal + sal_uInt16 CopyCount; + sal_Bool Collate; + String FormDescriptor; + sal_uInt16 Orientation; // PORTRAIT, LANDSCAPE */ -// ---------------------------------------------------- -// class VCLXPrinterPropertySet -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXPrinterPropertySet +// ---------------------------------------------------- -class VCLXPrinterPropertySet : public ::com::sun::star::awt::XPrinterPropertySet, +class VCLXPrinterPropertySet : public ::com::sun::star::awt::XPrinterPropertySet, public ::com::sun::star::lang::XTypeProvider, public MutexAndBroadcastHelper, public ::cppu::OPropertySetHelper { protected: boost::shared_ptr<Printer> mpPrinter; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > mxPrnDevice; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > mxPrnDevice; - sal_Int16 mnOrientation; - sal_Bool mbHorizontal; -public: + sal_Int16 mnOrientation; + sal_Bool mbHorizontal; +public: VCLXPrinterPropertySet( const String& rPrinterName ); virtual ~VCLXPrinterPropertySet(); - Printer* GetPrinter() const { return mpPrinter.get(); } - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > GetDevice(); + Printer* GetPrinter() const { return mpPrinter.get(); } + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > GetDevice(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -105,11 +105,11 @@ public: void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); }; -// ---------------------------------------------------- -// class VCLXPrinter -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXPrinter +// ---------------------------------------------------- -class VCLXPrinter: public ::com::sun::star::awt::XPrinter, +class VCLXPrinter: public ::com::sun::star::awt::XPrinter, public VCLXPrinterPropertySet, public ::cppu::OWeakObject { @@ -120,13 +120,13 @@ public: ~VCLXPrinter(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet @@ -153,11 +153,11 @@ public: void SAL_CALL endPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException); }; -// ---------------------------------------------------- -// class VCLXInfoPrinter -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXInfoPrinter +// ---------------------------------------------------- -class VCLXInfoPrinter: public ::com::sun::star::awt::XInfoPrinter, +class VCLXInfoPrinter: public ::com::sun::star::awt::XInfoPrinter, public VCLXPrinterPropertySet, public ::cppu::OWeakObject { @@ -166,13 +166,13 @@ public: ~VCLXInfoPrinter(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet @@ -195,23 +195,23 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice( ) throw(::com::sun::star::uno::RuntimeException); }; -// ---------------------------------------------------- -// class VCLXPrinterServer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXPrinterServer +// ---------------------------------------------------- -class VCLXPrinterServer : public ::com::sun::star::awt::XPrinterServer, - public ::cppu::OWeakObject +class VCLXPrinterServer : public ::com::sun::star::awt::XPrinterServer, + public ::cppu::OWeakObject { public: - + // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XPrinterServer ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/awt/vclxregion.hxx b/toolkit/inc/toolkit/awt/vclxregion.hxx index b2c6d765e445..577d7469f8da 100644 --- a/toolkit/inc/toolkit/awt/vclxregion.hxx +++ b/toolkit/inc/toolkit/awt/vclxregion.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,55 +38,55 @@ #include <vcl/region.hxx> -// ---------------------------------------------------- -// class VCLXRegion -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXRegion +// ---------------------------------------------------- -class VCLXRegion : public ::com::sun::star::awt::XRegion, +class VCLXRegion : public ::com::sun::star::awt::XRegion, public ::com::sun::star::lang::XTypeProvider, public ::com::sun::star::lang::XUnoTunnel, public ::cppu::OWeakObject { private: - ::osl::Mutex maMutex; - Region maRegion; + ::osl::Mutex maMutex; + Region maRegion; protected: - ::osl::Mutex& GetMutex() { return maMutex; } + ::osl::Mutex& GetMutex() { return maMutex; } -public: +public: VCLXRegion(); ~VCLXRegion(); - void SetRegion( const Region& rRegion ) { maRegion = rRegion; } - const Region& GetRegion() const { return maRegion; } - + void SetRegion( const Region& rRegion ) { maRegion = rRegion; } + const Region& GetRegion() const { return maRegion; } + // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXRegion* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXRegion* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XRegion - ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL unionRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL intersectRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL excludeRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL xOrRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL unionRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL intersectRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL excludeRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL xOrRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL unionRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL intersectRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL excludeRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL xOrRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL unionRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL intersectRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL excludeRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL xOrRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::awt::Rectangle > SAL_CALL getRectangles() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/toolkit/inc/toolkit/awt/vclxspinbutton.hxx b/toolkit/inc/toolkit/awt/vclxspinbutton.hxx index 4139f7c92815..49515a954137 100644 --- a/toolkit/inc/toolkit/awt/vclxspinbutton.hxx +++ b/toolkit/inc/toolkit/awt/vclxspinbutton.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx b/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx index c2903a144bdc..4952f25712aa 100644 --- a/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,25 +37,25 @@ #include <toolkit/awt/vclxwindow.hxx> -// ---------------------------------------------------- -// class VCLXSystemDependendtWindow -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXSystemDependendtWindow +// ---------------------------------------------------- -class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public ::com::sun::star::awt::XSystemDependentWindowPeer, +class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public ::com::sun::star::awt::XSystemDependentWindowPeer, public VCLXWindow { -public: +public: VCLXSystemDependentWindow(); ~VCLXSystemDependentWindow(); - + // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XSystemDependendtWindowPeer ::com::sun::star::uno::Any SAL_CALL getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx index 314168738d93..ea16cde5b632 100644 --- a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx +++ b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,17 +68,17 @@ extern "C" { } -// ---------------------------------------------------- -// class VCLXTOOLKIT -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXTOOLKIT +// ---------------------------------------------------- class VCLXToolkit_Impl { protected: - ::osl::Mutex maMutex; + ::osl::Mutex maMutex; }; -class VCLXToolkit : public VCLXToolkit_Impl, +class VCLXToolkit : public VCLXToolkit_Impl, public cppu::WeakComponentImplHelper7< ::com::sun::star::awt::XToolkit, ::com::sun::star::lang::XServiceInfo, @@ -91,8 +91,8 @@ class VCLXToolkit : public VCLXToolkit_Impl, ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxSelection; - oslModule hSvToolsLib; - FN_SvtCreateWindow fnSvtCreateWindow; + oslModule hSvToolsLib; + FN_SvtCreateWindow fnSvtCreateWindow; ::cppu::OInterfaceContainerHelper m_aTopWindowListeners; ::cppu::OInterfaceContainerHelper m_aKeyHandlers; @@ -116,25 +116,25 @@ class VCLXToolkit : public VCLXToolkit_Impl, void callFocusListeners(::VclSimpleEvent const * pEvent, bool bGained); protected: - ::osl::Mutex& GetMutex() { return maMutex; } + ::osl::Mutex& GetMutex() { return maMutex; } virtual void SAL_CALL disposing(); - Window* ImplCreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor& rDescriptor, Window* pParent, WinBits nWinBits ); + Window* ImplCreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor& rDescriptor, Window* pParent, WinBits nWinBits ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ImplCreateWindow( const ::com::sun::star::awt::WindowDescriptor& Descriptor, WinBits nWinBits ); -public: +public: VCLXToolkit( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); ~VCLXToolkit(); - + // ::com::sun::star::awt::XToolkit - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getDesktopWindow( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::awt::Rectangle SAL_CALL getWorkArea( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL createWindow( const ::com::sun::star::awt::WindowDescriptor& Descriptor ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getDesktopWindow( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::awt::Rectangle SAL_CALL getWorkArea( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL createWindow( const ::com::sun::star::awt::WindowDescriptor& Descriptor ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > > SAL_CALL createWindows( const ::com::sun::star::uno::Sequence< ::com::sun::star::awt::WindowDescriptor >& Descriptors ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion > SAL_CALL createRegion( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion > SAL_CALL createRegion( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XSystemChildFactory ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL createSystemChild( const ::com::sun::star::uno::Any& Parent, const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException); @@ -146,7 +146,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL getDragGestureRecognizer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > SAL_CALL getDragSource( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > SAL_CALL getDropTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const ::rtl::OUString& clipboardName ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const ::rtl::OUString& clipboardName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); @@ -198,21 +198,21 @@ public: ::com::sun::star::awt::XFocusListener > const & rListener) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL fireFocusGained( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > const & source) + virtual void SAL_CALL fireFocusGained( + ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface > const & source) throw (::com::sun::star::uno::RuntimeException); - - virtual void SAL_CALL fireFocusLost( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > const & source) + + virtual void SAL_CALL fireFocusLost( + ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface > const & source) throw (::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::awt::XReschedule: virtual void SAL_CALL reschedule() throw (::com::sun::star::uno::RuntimeException); - + }; #endif // _TOOLKIT_AWT_VCLXTOOLKIT_HXX_ diff --git a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx b/toolkit/inc/toolkit/awt/vclxtopwindow.hxx index 5c49313c1aed..2792b40b5c26 100644 --- a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx +++ b/toolkit/inc/toolkit/awt/vclxtopwindow.hxx @@ -88,9 +88,9 @@ public: virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); }; -// ---------------------------------------------------- -// class VCLXTopWindow -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXTopWindow +// ---------------------------------------------------- class VCLXTopWindow: public VCLXTopWindow_Base, public VCLXContainer @@ -105,13 +105,13 @@ public: ~VCLXTopWindow(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } diff --git a/toolkit/inc/toolkit/awt/vclxwindow.hxx b/toolkit/inc/toolkit/awt/vclxwindow.hxx index fb3ca32b590a..e72d4dd18672 100644 --- a/toolkit/inc/toolkit/awt/vclxwindow.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ #include <cppuhelper/implbase9.hxx> #include <osl/mutex.hxx> -#include <tools/gen.hxx> // Size +#include <tools/gen.hxx> // Size #include <tools/link.hxx> #include <stdarg.h> @@ -67,9 +67,9 @@ namespace toolkit } -// ---------------------------------------------------- -// class VCLXWINDOW -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXWINDOW +// ---------------------------------------------------- class UnoPropertyArrayHelper; class VCLXWindowImpl; @@ -91,9 +91,9 @@ private: VCLXWindowImpl* mpImpl; UnoPropertyArrayHelper *GetPropHelper(); - + protected: - Size ImplCalcWindowSize( const Size& rOutSz ) const; + Size ImplCalcWindowSize( const Size& rOutSz ) const; DECL_LINK( WindowEventListener, VclSimpleEvent* ); virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); @@ -103,7 +103,7 @@ protected: void SetSynthesizingVCLEvent( sal_Bool b ); BOOL IsSynthesizingVCLEvent() const; - void SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ); + void SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ); ::toolkit::IAccessibleFactory& getAccessibleFactory(); @@ -138,8 +138,8 @@ public: VCLXWindow( bool bWithDefaultProps = false ); ~VCLXWindow(); - virtual void SetWindow( Window* pWindow ); - Window* GetWindow() const { return (Window*)GetOutputDevice(); } + virtual void SetWindow( Window* pWindow ); + Window* GetWindow() const { return (Window*)GetOutputDevice(); } void suspendVclEventListening( ); void resumeVclEventListening( ); @@ -147,9 +147,9 @@ public: void notifyWindowRemoved( Window& _rWindow ); // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXWindow* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXWindow* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx index 66950befa6e2..5533155a3642 100644 --- a/toolkit/inc/toolkit/awt/vclxwindows.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx @@ -108,10 +108,10 @@ class ToolBox; class VclSimpleEvent; class VclMenuEvent; -// ---------------------------------------------------- -// class VCLXGraphicControl +// ---------------------------------------------------- +// class VCLXGraphicControl // deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model -// ---------------------------------------------------- +// ---------------------------------------------------- class TOOLKIT_DLLPUBLIC VCLXGraphicControl : public VCLXWindow @@ -147,9 +147,9 @@ public: }; -// ---------------------------------------------------- -// class VCLXButton -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXButton +// ---------------------------------------------------- typedef ::cppu::ImplInheritanceHelper2 < VCLXGraphicControl , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XToggleButton @@ -157,8 +157,8 @@ typedef ::cppu::ImplInheritanceHelper2 < VCLXGraphicControl class VCLXButton :public VCLXButton_Base { private: - ::rtl::OUString maActionCommand; - ActionListenerMultiplexer maActionListeners; + ::rtl::OUString maActionCommand; + ActionListenerMultiplexer maActionListeners; ItemListenerMultiplexer maItemListeners; protected: @@ -196,9 +196,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXImageControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXImageControl +// ---------------------------------------------------- class VCLXImageControl : public VCLXGraphicControl { public: @@ -221,16 +221,16 @@ protected: virtual void ImplSetNewImage(); }; -// ---------------------------------------------------- -// class VCLXCheckBox -// ---------------------------------------------------- -class VCLXCheckBox : public ::com::sun::star::awt::XCheckBox, +// ---------------------------------------------------- +// class VCLXCheckBox +// ---------------------------------------------------- +class VCLXCheckBox : public ::com::sun::star::awt::XCheckBox, public ::com::sun::star::awt::XButton, public VCLXGraphicControl { private: - ActionListenerMultiplexer maActionListeners; - ::rtl::OUString maActionCommand; + ActionListenerMultiplexer maActionListeners; + ::rtl::OUString maActionCommand; ItemListenerMultiplexer maItemListeners; protected: @@ -241,13 +241,13 @@ public: VCLXCheckBox(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent @@ -279,20 +279,20 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXRadioButton -// ---------------------------------------------------- -class VCLXRadioButton : public ::com::sun::star::awt::XRadioButton, +// ---------------------------------------------------- +// class VCLXRadioButton +// ---------------------------------------------------- +class VCLXRadioButton : public ::com::sun::star::awt::XRadioButton, public ::com::sun::star::awt::XButton, public VCLXGraphicControl { private: ItemListenerMultiplexer maItemListeners; - ActionListenerMultiplexer maActionListeners; - ::rtl::OUString maActionCommand; + ActionListenerMultiplexer maActionListeners; + ::rtl::OUString maActionCommand; protected: - void ImplClickedOrToggled( BOOL bToggled ); + void ImplClickedOrToggled( BOOL bToggled ); void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); @@ -300,13 +300,13 @@ public: VCLXRadioButton(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -338,10 +338,10 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getFirstActionListener (); }; -// ---------------------------------------------------- -// class VCLXMessageBox -// ---------------------------------------------------- -class VCLXMessageBox : public ::com::sun::star::awt::XMessageBox, +// ---------------------------------------------------- +// class VCLXMessageBox +// ---------------------------------------------------- +class VCLXMessageBox : public ::com::sun::star::awt::XMessageBox, public VCLXTopWindow { public: @@ -349,13 +349,13 @@ public: ~VCLXMessageBox(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XMessageBox @@ -374,10 +374,10 @@ public: -// ---------------------------------------------------- -// class VCLXDialog -// ---------------------------------------------------- -class VCLXDialog : public ::com::sun::star::awt::XDialog2, +// ---------------------------------------------------- +// class VCLXDialog +// ---------------------------------------------------- +class VCLXDialog : public ::com::sun::star::awt::XDialog2, public ::com::sun::star::document::XVbaMethodParameter, //liuchen 2009-6-22, add the support of input/output parameters to VBA UserForm_QueryClose event public VCLXTopWindow { @@ -386,13 +386,13 @@ public: ~VCLXDialog(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XDialog2 virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException); @@ -422,23 +422,23 @@ public: ::com::sun::star::uno::Any SAL_CALL getVbaMethodParameter( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); }; -// ---------------------------------------------------- -// class VCLXTabPage -// ---------------------------------------------------- -class VCLXTabPage : public VCLXContainer +// ---------------------------------------------------- +// class VCLXTabPage +// ---------------------------------------------------- +class VCLXTabPage : public VCLXContainer { public: VCLXTabPage(); ~VCLXTabPage(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XView void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException); @@ -506,10 +506,10 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXFixedText -// ---------------------------------------------------- -class VCLXFixedText : public ::com::sun::star::awt::XFixedText, +// ---------------------------------------------------- +// class VCLXFixedText +// ---------------------------------------------------- +class VCLXFixedText : public ::com::sun::star::awt::XFixedText, public VCLXWindow { protected: @@ -520,13 +520,13 @@ public: ~VCLXFixedText(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XFixedText void SAL_CALL setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); @@ -543,10 +543,10 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXScrollBar -// ---------------------------------------------------- -class VCLXScrollBar : public ::com::sun::star::awt::XScrollBar, +// ---------------------------------------------------- +// class VCLXScrollBar +// ---------------------------------------------------- +class VCLXScrollBar : public ::com::sun::star::awt::XScrollBar, public VCLXWindow { private: @@ -559,13 +559,13 @@ protected: public: VCLXScrollBar(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent @@ -604,10 +604,10 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXEdit -// ---------------------------------------------------- -class TOOLKIT_DLLPUBLIC VCLXEdit : public ::com::sun::star::awt::XTextComponent, +// ---------------------------------------------------- +// class VCLXEdit +// ---------------------------------------------------- +class TOOLKIT_DLLPUBLIC VCLXEdit : public ::com::sun::star::awt::XTextComponent, public ::com::sun::star::awt::XTextEditField, public ::com::sun::star::awt::XTextLayoutConstrains, public VCLXWindow @@ -623,16 +623,16 @@ protected: public: VCLXEdit(); - TextListenerMultiplexer& GetTextListeners() { return maTextListeners; } + TextListenerMultiplexer& GetTextListeners() { return maTextListeners; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent @@ -672,9 +672,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXListBox -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXListBox +// ---------------------------------------------------- typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow , ::com::sun::star::awt::XListBox , ::com::sun::star::awt::XTextLayoutConstrains @@ -683,11 +683,11 @@ typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow class VCLXListBox : public VCLXListBox_Base { private: - ActionListenerMultiplexer maActionListeners; - ItemListenerMultiplexer maItemListeners; + ActionListenerMultiplexer maActionListeners; + ItemListenerMultiplexer maItemListeners; protected: - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); void ImplCallItemListeners(); @@ -749,17 +749,17 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXComboBox -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXComboBox +// ---------------------------------------------------- typedef ::cppu::ImplInheritanceHelper2 < VCLXEdit , ::com::sun::star::awt::XComboBox , ::com::sun::star::awt::XItemListListener > VCLXComboBox_Base; -class VCLXComboBox : public VCLXComboBox_Base +class VCLXComboBox : public VCLXComboBox_Base { private: - ActionListenerMultiplexer maActionListeners; - ItemListenerMultiplexer maItemListeners; + ActionListenerMultiplexer maActionListeners; + ItemListenerMultiplexer maItemListeners; protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); @@ -813,14 +813,14 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXSpinField -// ---------------------------------------------------- -class TOOLKIT_DLLPUBLIC VCLXSpinField : public ::com::sun::star::awt::XSpinField, +// ---------------------------------------------------- +// class VCLXSpinField +// ---------------------------------------------------- +class TOOLKIT_DLLPUBLIC VCLXSpinField : public ::com::sun::star::awt::XSpinField, public VCLXEdit { private: - SpinListenerMultiplexer maSpinListeners; + SpinListenerMultiplexer maSpinListeners; protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); @@ -829,13 +829,13 @@ public: VCLXSpinField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XSpinField @@ -851,25 +851,25 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXFormattedSpinField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXFormattedSpinField +// ---------------------------------------------------- class VCLXFormattedSpinField : public VCLXSpinField { private: - FormatterBase* mpFormatter; + FormatterBase* mpFormatter; protected: - FormatterBase* GetFormatter() const { return GetWindow() ? mpFormatter : NULL; } + FormatterBase* GetFormatter() const { return GetWindow() ? mpFormatter : NULL; } public: VCLXFormattedSpinField(); ~VCLXFormattedSpinField(); - void SetFormatter( FormatterBase* pFormatter ) { mpFormatter = pFormatter; } + void SetFormatter( FormatterBase* pFormatter ) { mpFormatter = pFormatter; } - void setStrictFormat( sal_Bool bStrict ); - sal_Bool isStrictFormat(); + void setStrictFormat( sal_Bool bStrict ); + sal_Bool isStrictFormat(); // ::com::sun::star::awt::VclWindowPeer void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); @@ -879,10 +879,10 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXDateField -// ---------------------------------------------------- -class TOOLKIT_DLLPUBLIC VCLXDateField : public ::com::sun::star::awt::XDateField, +// ---------------------------------------------------- +// class VCLXDateField +// ---------------------------------------------------- +class TOOLKIT_DLLPUBLIC VCLXDateField : public ::com::sun::star::awt::XDateField, public VCLXFormattedSpinField { public: @@ -890,13 +890,13 @@ public: ~VCLXDateField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XDateField @@ -925,10 +925,10 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXTimeField -// ---------------------------------------------------- -class VCLXTimeField : public ::com::sun::star::awt::XTimeField, +// ---------------------------------------------------- +// class VCLXTimeField +// ---------------------------------------------------- +class VCLXTimeField : public ::com::sun::star::awt::XTimeField, public VCLXFormattedSpinField { public: @@ -936,13 +936,13 @@ public: ~VCLXTimeField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTimeField void SAL_CALL setTime( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); @@ -968,10 +968,10 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXNumericField -// ---------------------------------------------------- -class VCLXNumericField : public ::com::sun::star::awt::XNumericField, +// ---------------------------------------------------- +// class VCLXNumericField +// ---------------------------------------------------- +class VCLXNumericField : public ::com::sun::star::awt::XNumericField, public VCLXFormattedSpinField { public: @@ -979,13 +979,13 @@ public: ~VCLXNumericField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XNumericField void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException); @@ -1013,12 +1013,12 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXMetricField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXMetricField +// ---------------------------------------------------- class MetricFormatter; class MetricField; -class VCLXMetricField : public ::com::sun::star::awt::XMetricField, +class VCLXMetricField : public ::com::sun::star::awt::XMetricField, public VCLXFormattedSpinField { MetricFormatter *GetMetricFormatter() throw(::com::sun::star::uno::RuntimeException); @@ -1029,13 +1029,13 @@ public: ~VCLXMetricField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XMetricField virtual void SAL_CALL setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException); @@ -1065,10 +1065,10 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXCurrencyField -// ---------------------------------------------------- -class VCLXCurrencyField : public ::com::sun::star::awt::XCurrencyField, +// ---------------------------------------------------- +// class VCLXCurrencyField +// ---------------------------------------------------- +class VCLXCurrencyField : public ::com::sun::star::awt::XCurrencyField, public VCLXFormattedSpinField { public: @@ -1076,13 +1076,13 @@ public: ~VCLXCurrencyField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XCurrencyField @@ -1111,10 +1111,10 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXPatternField -// ---------------------------------------------------- -class VCLXPatternField : public ::com::sun::star::awt::XPatternField, +// ---------------------------------------------------- +// class VCLXPatternField +// ---------------------------------------------------- +class VCLXPatternField : public ::com::sun::star::awt::XPatternField, public VCLXFormattedSpinField { public: @@ -1122,13 +1122,13 @@ public: ~VCLXPatternField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XPatternField @@ -1147,10 +1147,10 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXToolBox -// ---------------------------------------------------- -class VCLXToolBox : public VCLXWindow +// ---------------------------------------------------- +// class VCLXToolBox +// ---------------------------------------------------- +class VCLXToolBox : public VCLXWindow { private: diff --git a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx b/toolkit/inc/toolkit/awt/xsimpleanimation.hxx index 74ae6f619d24..479e49c0f9ef 100644 --- a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx +++ b/toolkit/inc/toolkit/awt/xsimpleanimation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/awt/xthrobber.hxx b/toolkit/inc/toolkit/awt/xthrobber.hxx index 8b87fec352cc..d4eca444204c 100644 --- a/toolkit/inc/toolkit/awt/xthrobber.hxx +++ b/toolkit/inc/toolkit/awt/xthrobber.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx b/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx index 8ececaeda794..52a473bda2a6 100644 --- a/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx +++ b/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,9 +46,9 @@ namespace toolkit //= OAccessibleControlContext //==================================================================== - typedef ::comphelper::OAccessibleComponentHelper OAccessibleControlContext_Base; - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XEventListener - > OAccessibleControlContext_IBase; + typedef ::comphelper::OAccessibleComponentHelper OAccessibleControlContext_Base; + typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XEventListener + > OAccessibleControlContext_IBase; /** class implementing the AccessibleContext for an UNO control - to be used in design mode of the control. <p><b>life time control<b/><br/> @@ -63,9 +63,9 @@ namespace toolkit { private: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - m_xControlModel; // the model of the control which's context we implement + m_xControlModel; // the model of the control which's context we implement ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > - m_xModelPropsInfo; // the cached property set info of the model + m_xModelPropsInfo; // the cached property set info of the model protected: /// ctor. @see Init @@ -76,7 +76,7 @@ namespace toolkit */ void Init( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator - ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); + ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); // OCommonAccessibleComponent overridables virtual ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds( ) throw (::com::sun::star::uno::RuntimeException); @@ -119,18 +119,18 @@ namespace toolkit private: // retrieves the value of a string property from the model, if the property is present - ::rtl::OUString getModelStringProperty( const sal_Char* _pPropertyName ) SAL_THROW( ( ) ); + ::rtl::OUString getModelStringProperty( const sal_Char* _pPropertyName ) SAL_THROW( ( ) ); // starts listening at the control model (currently for disposal only) void startModelListening( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); // stops listening at the control model void stopModelListening( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); - Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const; + Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const; }; //........................................................................ -} // namespace toolkit +} // namespace toolkit //........................................................................ #endif // TOOLKIT_ACCESSIBLE_CONTROL_CONTEXT_HXX diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx index 04b8c9b9f9c6..32e7db6220b7 100644 --- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx +++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx @@ -52,20 +52,20 @@ #include <map> #include <com/sun/star/graphic/XGraphicObject.hpp> -// ---------------------------------------------------- -// class UnoControlDialogModel -// ---------------------------------------------------- -typedef UnoControlModel UnoControlDialogModel_Base; -typedef ::cppu::ImplHelper6 < ::com::sun::star::lang::XMultiServiceFactory - , ::com::sun::star::container::XContainer - , ::com::sun::star::container::XNameContainer - , ::com::sun::star::awt::XTabControllerModel - , ::com::sun::star::util::XChangesNotifier - , ::com::sun::star::beans::XPropertyChangeListener - > UnoControlDialogModel_IBase; - -class UnoControlDialogModel : public UnoControlDialogModel_IBase - , public UnoControlDialogModel_Base +// ---------------------------------------------------- +// class UnoControlDialogModel +// ---------------------------------------------------- +typedef UnoControlModel UnoControlDialogModel_Base; +typedef ::cppu::ImplHelper6 < ::com::sun::star::lang::XMultiServiceFactory + , ::com::sun::star::container::XContainer + , ::com::sun::star::container::XNameContainer + , ::com::sun::star::awt::XTabControllerModel + , ::com::sun::star::util::XChangesNotifier + , ::com::sun::star::beans::XPropertyChangeListener + > UnoControlDialogModel_IBase; + +class UnoControlDialogModel : public UnoControlDialogModel_IBase + , public UnoControlDialogModel_Base { public: // would like to make this typedef private, too, but the Forte 7 compiler does have @@ -73,48 +73,48 @@ public: typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >, ::rtl::OUString > UnoControlModelHolder; private: - typedef ::std::list< UnoControlModelHolder > UnoControlModelHolderList; + typedef ::std::list< UnoControlModelHolder > UnoControlModelHolderList; // for grouping control models (XTabControllerModel::getGroupXXX) typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > ModelGroup; - typedef ::std::vector< ModelGroup > AllGroups; + typedef ::std::vector< ModelGroup > AllGroups; friend struct CloneControlModel; friend struct FindControlModel; friend struct CompareControlModel; private: - ContainerListenerMultiplexer maContainerListeners; - ::cppu::OInterfaceContainerHelper maChangeListeners; - UnoControlModelHolderList maModels; + ContainerListenerMultiplexer maContainerListeners; + ::cppu::OInterfaceContainerHelper maChangeListeners; + UnoControlModelHolderList maModels; - AllGroups maGroups; - sal_Bool mbGroupsUpToDate; + AllGroups maGroups; + sal_Bool mbGroupsUpToDate; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj; bool mbAdjustingGraphic; protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - UnoControlModelHolderList::iterator ImplFindElement( const ::rtl::OUString& rName ); + UnoControlModelHolderList::iterator ImplFindElement( const ::rtl::OUString& rName ); public: UnoControlDialogModel(); UnoControlDialogModel( const UnoControlDialogModel& rModel ); ~UnoControlDialogModel(); - UnoControlModel* Clone() const; + UnoControlModel* Clone() const; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlModel::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlModel::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XContainer void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); @@ -196,16 +196,16 @@ private: ::std::map< ::rtl::OUString, ModelGroup >& pNamedGroups ); }; -// ---------------------------------------------------- -// class UnoDialogControl -// ---------------------------------------------------- -typedef ::cppu::ImplHelper6 < ::com::sun::star::container::XContainerListener - , ::com::sun::star::awt::XTopWindow - , ::com::sun::star::awt::XDialog2 - , ::com::sun::star::util::XChangesListener +// ---------------------------------------------------- +// class UnoDialogControl +// ---------------------------------------------------- +typedef ::cppu::ImplHelper6 < ::com::sun::star::container::XContainerListener + , ::com::sun::star::awt::XTopWindow + , ::com::sun::star::awt::XDialog2 + , ::com::sun::star::util::XChangesListener , ::com::sun::star::util::XModifyListener , ::com::sun::star::awt::XWindowListener - > UnoDialogControl_IBase; + > UnoDialogControl_IBase; class ResourceListener :public ::com::sun::star::util::XModifyListener, public ::cppu::OWeakObject, @@ -235,35 +235,35 @@ class ResourceListener :public ::com::sun::star::util::XModifyListener, bool m_bListening; }; -class UnoDialogControl :public UnoControlContainer +class UnoDialogControl :public UnoControlContainer ,public UnoDialogControl_IBase { private: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar > mxMenuBar; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > mxTabController; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar > mxMenuBar; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > mxTabController; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxListener; - TopWindowListenerMultiplexer maTopWindowListeners; + TopWindowListenerMultiplexer maTopWindowListeners; bool mbWindowListener; bool mbSizeModified; bool mbPosModified; protected: - void ImplInsertControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel, const ::rtl::OUString& rName ); - void ImplRemoveControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel ); - void ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl ); + void ImplInsertControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel, const ::rtl::OUString& rName ); + void ImplRemoveControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel ); + void ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl ); void ImplUpdateResourceResolver(); void ImplStartListingForResourceEvents(); public: UnoDialogControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlContainer::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlContainer::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); @@ -298,8 +298,8 @@ public: void SAL_CALL endExecute() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XControl sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/eventcontainer.hxx b/toolkit/inc/toolkit/controls/eventcontainer.hxx index 625986ca6614..7094a39cbf55 100644 --- a/toolkit/inc/toolkit/controls/eventcontainer.hxx +++ b/toolkit/inc/toolkit/controls/eventcontainer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,43 +88,43 @@ public: } // Methods XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements( ) + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); // Methods XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + throw(::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // Methods XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + throw(::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // Methods XNameContainer virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::WrappedTargetException, + throw(::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::ElementExistException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + throw(::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // Methods XContainer - void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) + void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) + void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); }; @@ -135,6 +135,6 @@ public: }; -} // namespace toolkit_namecontainer +} // namespace toolkit_namecontainer /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/inc/toolkit/controls/formattedcontrol.hxx b/toolkit/inc/toolkit/controls/formattedcontrol.hxx index 40ba795487cc..7c4b22a434ae 100644 --- a/toolkit/inc/toolkit/controls/formattedcontrol.hxx +++ b/toolkit/inc/toolkit/controls/formattedcontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,8 +45,8 @@ namespace toolkit // =================================================================== class UnoControlFormattedFieldModel : public UnoControlModel { - protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + protected: + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); ::com::sun::star::uno::Any m_aCachedFormat; bool m_bRevokedAsClient; @@ -70,9 +70,9 @@ namespace toolkit public: UnoControlFormattedFieldModel(); UnoControlFormattedFieldModel( const UnoControlFormattedFieldModel& rModel ) : UnoControlModel( rModel ) {;} - - UnoControlModel* Clone() const { return new UnoControlFormattedFieldModel( *this ); } - + + UnoControlModel* Clone() const { return new UnoControlFormattedFieldModel( *this ); } + // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -94,11 +94,11 @@ namespace toolkit // UnoControlModel virtual void ImplNormalizePropertySequence( - const sal_Int32 _nCount, /// the number of entries in the arrays - sal_Int32* _pHandles, /// the handles of the properties to set - ::com::sun::star::uno::Any* _pValues, /// the values of the properties to set - sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted - ) const SAL_THROW(()); + const sal_Int32 _nCount, /// the number of entries in the arrays + sal_Int32* _pHandles, /// the handles of the properties to set + ::com::sun::star::uno::Any* _pValues, /// the values of the properties to set + sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted + ) const SAL_THROW(()); private: void impl_updateTextFromValue_nothrow(); void impl_updateCachedFormatter_nothrow(); @@ -112,17 +112,17 @@ namespace toolkit { public: UnoFormattedFieldControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); // ::com::sun::star::awt::XTextListener void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFormattedFieldControl, UnoEditControl, szServiceName2_UnoControlFormattedField ) }; //........................................................................ -} // namespace toolkit +} // namespace toolkit //........................................................................ #endif // TOOLKIT_FORMATTED_CONTROL_HXX diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx index fe57638c43ad..51ea2c07b6ba 100644 --- a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx +++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,9 +54,9 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer ) //==================================================================== //= OGeometryControlModel_Base //==================================================================== - typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::util::XCloneable - , ::com::sun::star::script::XScriptEventsSupplier - > OGCM_Base; + typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::util::XCloneable + , ::com::sun::star::script::XScriptEventsSupplier + > OGCM_Base; class OGeometryControlModel_Base :public ::comphelper::OMutexAndBroadcastHelper ,public ::comphelper::OPropertySetAggregationHelper @@ -66,27 +66,27 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer ) protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xAggregate; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxEventContainer; // <properties> - sal_Int32 m_nPosX; - sal_Int32 m_nPosY; - sal_Int32 m_nWidth; - sal_Int32 m_nHeight; - ::rtl::OUString m_aName; - sal_Int16 m_nTabIndex; - sal_Int32 m_nStep; + sal_Int32 m_nPosX; + sal_Int32 m_nPosY; + sal_Int32 m_nWidth; + sal_Int32 m_nHeight; + ::rtl::OUString m_aName; + sal_Int16 m_nTabIndex; + sal_Int32 m_nStep; ::rtl::OUString m_aTag; ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > m_xStrResolver; // </properties> - sal_Bool m_bCloneable; + sal_Bool m_bCloneable; protected: - virtual ::com::sun::star::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle) const; - virtual ::com::sun::star::uno::Any ImplGetPropertyValueByHandle(sal_Int32 nHandle) const; - virtual void ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue); + virtual ::com::sun::star::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle) const; + virtual ::com::sun::star::uno::Any ImplGetPropertyValueByHandle(sal_Int32 nHandle) const; + virtual void ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue); protected: /** @@ -137,9 +137,9 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer ) ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle) const; // OPropertyStateHelper overridables - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); - virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle); - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const; + virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); + virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle); + virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); @@ -151,7 +151,7 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer ) virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw(::com::sun::star::uno::RuntimeException); //XScriptEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException); // XCloneable implementation - to be overwritten @@ -177,7 +177,7 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer ) //==================================================================== //= OGeometryControlModel //==================================================================== - /* example for usage: + /* example for usage: Reference< XAggregation > xIFace = new ::toolkit::OGeometryControlModel< UnoControlButtonModel > (); */ template <class CONTROLMODEL> @@ -220,8 +220,8 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer ) ,public ::comphelper::OIdPropertyArrayUsageHelper< OCommonGeometryControlModel > { private: - ::rtl::OUString m_sServiceSpecifier; // the service specifier of our aggregate - sal_Int32 m_nPropertyMapId; // our unique property info id, used to look up in s_aAggregateProperties + ::rtl::OUString m_sServiceSpecifier; // the service specifier of our aggregate + sal_Int32 m_nPropertyMapId; // our unique property info id, used to look up in s_aAggregateProperties public: /** instantiate the model @@ -232,7 +232,7 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer ) */ OCommonGeometryControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAgg, - const ::rtl::OUString& _rxServiceSpecifier + const ::rtl::OUString& _rxServiceSpecifier ); // OIdPropertyArrayUsageHelper overridables @@ -257,7 +257,7 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer ) #include "toolkit/controls/geometrycontrolmodel_impl.hxx" //........................................................................ -// } // namespace toolkit +// } // namespace toolkit //........................................................................ #endif // _TOOLKIT_HELPERS_GEOMETRYCONTROLMODEL_HXX_ diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx index 725b6998ec01..69ff0ac14304 100644 --- a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx +++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx index 3669e7b795ba..dac682a7f114 100644 --- a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx +++ b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,22 +49,22 @@ #include <comphelper/uno3.hxx> -typedef GraphicControlModel UnoControlRoadmapModel_Base; +typedef GraphicControlModel UnoControlRoadmapModel_Base; -typedef ::cppu::ImplHelper3 < ::com::sun::star::lang::XSingleServiceFactory - , ::com::sun::star::container::XContainer - , ::com::sun::star::container::XIndexContainer - > UnoControlRoadmapModel_IBase; +typedef ::cppu::ImplHelper3 < ::com::sun::star::lang::XSingleServiceFactory + , ::com::sun::star::container::XContainer + , ::com::sun::star::container::XIndexContainer + > UnoControlRoadmapModel_IBase; -typedef UnoControlBase UnoControlRoadmap_Base; -typedef ::cppu::ImplHelper4 < ::com::sun::star::awt::XItemEventBroadcaster +typedef UnoControlBase UnoControlRoadmap_Base; +typedef ::cppu::ImplHelper4 < ::com::sun::star::awt::XItemEventBroadcaster , ::com::sun::star::container::XContainerListener - , ::com::sun::star::awt::XItemListener + , ::com::sun::star::awt::XItemListener , ::com::sun::star::beans::XPropertyChangeListener - > UnoControlRoadmap_IBase; + > UnoControlRoadmap_IBase; @@ -89,15 +89,15 @@ namespace toolkit{ // =================================================================== class UnoControlRoadmapModel : public UnoControlRoadmapModel_Base, public UnoControlRoadmapModel_IBase - + { private: -// PropertyChangeListenerMultiplexer maPropertyListeners; +// PropertyChangeListenerMultiplexer maPropertyListeners; - typedef ::std::vector< Reference< XInterface > > RoadmapItemHolderList; + typedef ::std::vector< Reference< XInterface > > RoadmapItemHolderList; - ContainerListenerMultiplexer maContainerListeners; - RoadmapItemHolderList maRoadmapItems; + ContainerListenerMultiplexer maContainerListeners; + RoadmapItemHolderList maRoadmapItems; void MakeRMItemValidation( sal_Int32 Index, Reference< XInterface > xRoadmapItem ); ContainerEvent GetContainerEvent(sal_Int32 Index, Reference< XInterface > ); @@ -107,7 +107,7 @@ namespace toolkit{ protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: @@ -116,7 +116,7 @@ namespace toolkit{ UnoControlRoadmapModel_Base( rModel ), UnoControlRoadmapModel_IBase( rModel ), maContainerListeners( *this ) {} - UnoControlModel* Clone() const { return new UnoControlRoadmapModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlRoadmapModel( *this ); } // XTypeProvider @@ -130,19 +130,19 @@ namespace toolkit{ DECLIMPL_SERVICEINFO_DERIVED( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, szServiceName2_UnoControlRoadmapModel ) sal_Int32 SAL_CALL getCount() throw (RuntimeException); - virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); + virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any & _Element) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any & _Element) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any & _Element) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any & _Element) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); virtual void SAL_CALL addContainerListener( const Reference< XContainerListener >& xListener ) throw (RuntimeException); virtual void SAL_CALL removeContainerListener( const Reference< XContainerListener >& xListener ) throw (RuntimeException); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlRoadmapModel_Base::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { UnoControlRoadmapModel_Base::acquire(); } - void SAL_CALL release() throw() { UnoControlRoadmapModel_Base::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlRoadmapModel_Base::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { UnoControlRoadmapModel_Base::acquire(); } + void SAL_CALL release() throw() { UnoControlRoadmapModel_Base::release(); } // ::com::sun::star::beans::XPropertySet @@ -154,7 +154,7 @@ namespace toolkit{ virtual Type SAL_CALL getElementType() throw (RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException); + virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException); }; @@ -163,31 +163,31 @@ namespace toolkit{ // = UnoRoadmapControl // =================================================================== class UnoRoadmapControl : public UnoControlRoadmap_Base, - public UnoControlRoadmap_IBase + public UnoControlRoadmap_IBase { private: - ItemListenerMultiplexer maItemListeners; + ItemListenerMultiplexer maItemListeners; public: UnoRoadmapControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); } - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException ); void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException); virtual void SAL_CALL removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException); virtual void SAL_CALL itemStateChanged( const ItemEvent& rEvent ) throw (RuntimeException); - + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider diff --git a/toolkit/inc/toolkit/controls/roadmapentry.hxx b/toolkit/inc/toolkit/controls/roadmapentry.hxx index 71ab5752012e..e06c3d642251 100644 --- a/toolkit/inc/toolkit/controls/roadmapentry.hxx +++ b/toolkit/inc/toolkit/controls/roadmapentry.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,10 +37,10 @@ #include <com/sun/star/lang/XServiceInfo.hpp> -#define RM_PROPERTY_ID_LABEL 1 -#define RM_PROPERTY_ID_ID 2 -#define RM_PROPERTY_ID_ENABLED 4 -#define RM_PROPERTY_ID_INTERACTIVE 5 +#define RM_PROPERTY_ID_LABEL 1 +#define RM_PROPERTY_ID_ID 2 +#define RM_PROPERTY_ID_ENABLED 4 +#define RM_PROPERTY_ID_INTERACTIVE 5 typedef ::cppu::WeakImplHelper1 < ::com::sun::star::lang::XServiceInfo > ORoadmapEntry_Base; @@ -81,9 +81,9 @@ protected: protected: // <properties> ::rtl::OUString m_sLabel; - sal_Int32 m_nID; - sal_Bool m_bEnabled; - sal_Bool m_bInteractive; + sal_Int32 m_nID; + sal_Bool m_bEnabled; + sal_Bool m_bInteractive; // </properties> }; diff --git a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx b/toolkit/inc/toolkit/controls/stdtabcontroller.hxx index 847f8a057b36..7ac7939efa26 100644 --- a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx +++ b/toolkit/inc/toolkit/controls/stdtabcontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,38 +41,38 @@ #include <toolkit/helper/servicenames.hxx> -class StdTabController : public ::com::sun::star::awt::XTabController, +class StdTabController : public ::com::sun::star::awt::XTabController, public ::com::sun::star::lang::XServiceInfo, public ::com::sun::star::lang::XTypeProvider, public ::cppu::OWeakAggObject { private: - ::osl::Mutex maMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > mxModel; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > mxControlContainer; + ::osl::Mutex maMutex; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > mxModel; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > mxControlContainer; protected: - ::osl::Mutex& GetMutex() { return maMutex; } - sal_Bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, sal_Bool bPeerComponent ) const; + ::osl::Mutex& GetMutex() { return maMutex; } + sal_Bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, sal_Bool bPeerComponent ) const; // wenn rModels kuerzer als rControls ist, werden nur die rModels entsprechenden Elemente geliefert und die korrespondierenden Elemente aus rControls entfernt - void ImplActivateControl( sal_Bool bFirst ) const; + void ImplActivateControl( sal_Bool bFirst ) const; public: StdTabController(); ~StdTabController(); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > FindControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & rxCtrlModel ); + static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > FindControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & rxCtrlModel ); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); } - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); } + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // XTabController void SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >& Model ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx index 170e46f838a4..17ea3928e1a0 100644 --- a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx +++ b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,72 +51,72 @@ DECLARE_LIST( UnoControlModelEntryListBase, UnoControlModelEntry* ) class UnoControlModelEntryList : public UnoControlModelEntryListBase { private: - ::rtl::OUString maGroupName; + ::rtl::OUString maGroupName; public: UnoControlModelEntryList(); ~UnoControlModelEntryList(); - const ::rtl::OUString& GetName() const { return maGroupName; } - void SetName( const ::rtl::OUString& rName ) { maGroupName = rName; } + const ::rtl::OUString& GetName() const { return maGroupName; } + void SetName( const ::rtl::OUString& rName ) { maGroupName = rName; } - void Reset(); - void DestroyEntry( sal_uInt32 nEntry ); + void Reset(); + void DestroyEntry( sal_uInt32 nEntry ); }; struct UnoControlModelEntry { - sal_Bool bGroup; + sal_Bool bGroup; union { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >* pxControl; - UnoControlModelEntryList* pGroup; + UnoControlModelEntryList* pGroup; }; }; // Keine Referenz halten, nur temporaer fuer AutoTabOrder struct ComponentEntry { - ::com::sun::star::awt::XWindow* pComponent; - Point aPos; + ::com::sun::star::awt::XWindow* pComponent; + Point aPos; }; DECLARE_LIST( ComponentEntryList, ComponentEntry* ) -#define CONTROLPOS_NOTFOUND 0xFFFFFFFF +#define CONTROLPOS_NOTFOUND 0xFFFFFFFF -class StdTabControllerModel : public ::com::sun::star::awt::XTabControllerModel, +class StdTabControllerModel : public ::com::sun::star::awt::XTabControllerModel, public ::com::sun::star::lang::XServiceInfo, - public ::com::sun::star::io::XPersistObject, + public ::com::sun::star::io::XPersistObject, public ::com::sun::star::lang::XTypeProvider, public ::cppu::OWeakAggObject { private: - ::osl::Mutex maMutex; - UnoControlModelEntryList maControls; - sal_Bool mbGroupControl; + ::osl::Mutex maMutex; + UnoControlModelEntryList maControls; + sal_Bool mbGroupControl; protected: - ::osl::Mutex& GetMutex() { return maMutex; } - sal_uInt32 ImplGetControlCount( const UnoControlModelEntryList& rList ) const; - void ImplGetControlModels( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > ** pRefs, const UnoControlModelEntryList& rList ) const; - void ImplSetControlModels( UnoControlModelEntryList& rList, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) const; - sal_uInt32 ImplGetControlPos( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > xCtrl, const UnoControlModelEntryList& rList ) const; + ::osl::Mutex& GetMutex() { return maMutex; } + sal_uInt32 ImplGetControlCount( const UnoControlModelEntryList& rList ) const; + void ImplGetControlModels( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > ** pRefs, const UnoControlModelEntryList& rList ) const; + void ImplSetControlModels( UnoControlModelEntryList& rList, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) const; + sal_uInt32 ImplGetControlPos( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > xCtrl, const UnoControlModelEntryList& rList ) const; public: StdTabControllerModel(); ~StdTabControllerModel(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); } - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); } + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTabControllerModel sal_Bool SAL_CALL getGroupControl( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/tkscrollbar.hxx b/toolkit/inc/toolkit/controls/tkscrollbar.hxx index 3cd3427345b4..2c79213bf3b6 100644 --- a/toolkit/inc/toolkit/controls/tkscrollbar.hxx +++ b/toolkit/inc/toolkit/controls/tkscrollbar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,16 +46,16 @@ namespace toolkit //==================================================================== class UnoControlScrollBarModel : public UnoControlModel { - protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + protected: + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlScrollBarModel(); UnoControlScrollBarModel( const UnoControlScrollBarModel& rModel ) : UnoControlModel( rModel ) {;} - - UnoControlModel* Clone() const { return new UnoControlScrollBarModel( *this ); } - + + UnoControlModel* Clone() const { return new UnoControlScrollBarModel( *this ); } + // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -69,7 +69,7 @@ namespace toolkit //==================================================================== //= UnoControlScrollBarModel //==================================================================== - class UnoScrollBarControl : public UnoControlBase, + class UnoScrollBarControl : public UnoControlBase, public ::com::sun::star::awt::XAdjustmentListener, public ::com::sun::star::awt::XScrollBar { @@ -78,24 +78,24 @@ namespace toolkit public: UnoScrollBarControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); } void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XAdjustmentListener void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); - // ::com::sun::star::awt::XScrollBar + // ::com::sun::star::awt::XScrollBar void SAL_CALL addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx b/toolkit/inc/toolkit/controls/tksimpleanimation.hxx index cddaffb01e6f..bface83097dd 100644 --- a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx +++ b/toolkit/inc/toolkit/controls/tksimpleanimation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,16 +47,16 @@ namespace toolkit //==================================================================== class UnoSimpleAnimationControlModel : public UnoControlModel { - protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + protected: + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoSimpleAnimationControlModel(); UnoSimpleAnimationControlModel( const UnoSimpleAnimationControlModel& rModel ) : UnoControlModel( rModel ) {;} - - UnoControlModel* Clone() const { return new UnoSimpleAnimationControlModel( *this ); } - + + UnoControlModel* Clone() const { return new UnoSimpleAnimationControlModel( *this ); } + // XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -82,10 +82,10 @@ namespace toolkit public: UnoSimpleAnimationControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); DECLARE_UNO3_AGG_DEFAULTS( UnoSimpleAnimationControl, UnoControlBase ); - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); } diff --git a/toolkit/inc/toolkit/controls/tkspinbutton.hxx b/toolkit/inc/toolkit/controls/tkspinbutton.hxx index 645540be002c..af304b42abdd 100644 --- a/toolkit/inc/toolkit/controls/tkspinbutton.hxx +++ b/toolkit/inc/toolkit/controls/tkspinbutton.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,16 +47,16 @@ namespace toolkit //==================================================================== class UnoSpinButtonModel : public UnoControlModel { - protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + protected: + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoSpinButtonModel(); UnoSpinButtonModel( const UnoSpinButtonModel& rModel ) : UnoControlModel( rModel ) {;} - - UnoControlModel* Clone() const { return new UnoSpinButtonModel( *this ); } - + + UnoControlModel* Clone() const { return new UnoSpinButtonModel( *this ); } + // XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -84,10 +84,10 @@ namespace toolkit public: UnoSpinButtonControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); DECLARE_UNO3_AGG_DEFAULTS( UnoSpinButtonControl, UnoControlBase ); - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); } diff --git a/toolkit/inc/toolkit/controls/tkthrobber.hxx b/toolkit/inc/toolkit/controls/tkthrobber.hxx index 9e9b25914bda..cf300faec2ab 100644 --- a/toolkit/inc/toolkit/controls/tkthrobber.hxx +++ b/toolkit/inc/toolkit/controls/tkthrobber.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,16 +47,16 @@ namespace toolkit //==================================================================== class UnoThrobberControlModel : public UnoControlModel { - protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + protected: + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoThrobberControlModel(); UnoThrobberControlModel( const UnoThrobberControlModel& rModel ) : UnoControlModel( rModel ) {;} - - UnoControlModel* Clone() const { return new UnoThrobberControlModel( *this ); } - + + UnoControlModel* Clone() const { return new UnoThrobberControlModel( *this ); } + // XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -82,10 +82,10 @@ namespace toolkit public: UnoThrobberControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); DECLARE_UNO3_AGG_DEFAULTS( UnoThrobberControl, UnoControlBase ); - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); } diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/toolkit/inc/toolkit/controls/unocontrol.hxx index 5b2f9a894b94..c87127edafd4 100644 --- a/toolkit/inc/toolkit/controls/unocontrol.hxx +++ b/toolkit/inc/toolkit/controls/unocontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,12 +54,12 @@ struct UnoControlComponentInfos { - sal_Bool bVisible; - sal_Bool bEnable; - long nX, nY, nWidth, nHeight; - sal_uInt16 nFlags; - float nZoomX, nZoomY; - + sal_Bool bVisible; + sal_Bool bEnable; + long nX, nY, nWidth, nHeight; + sal_uInt16 nFlags; + float nZoomX, nZoomY; + UnoControlComponentInfos() { bVisible = sal_True; @@ -71,72 +71,72 @@ struct UnoControlComponentInfos }; struct UnoControl_Data; -// ---------------------------------------------------- -// class UnoControl -// ---------------------------------------------------- -typedef ::cppu::WeakAggImplHelper9 < ::com::sun::star::awt::XControl - , ::com::sun::star::awt::XWindow2 - , ::com::sun::star::awt::XView - , ::com::sun::star::beans::XPropertiesChangeListener - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::accessibility::XAccessible - , ::com::sun::star::util::XModeChangeBroadcaster - , ::com::sun::star::awt::XUnitConversion +// ---------------------------------------------------- +// class UnoControl +// ---------------------------------------------------- +typedef ::cppu::WeakAggImplHelper9 < ::com::sun::star::awt::XControl + , ::com::sun::star::awt::XWindow2 + , ::com::sun::star::awt::XView + , ::com::sun::star::beans::XPropertiesChangeListener + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::accessibility::XAccessible + , ::com::sun::star::util::XModeChangeBroadcaster + , ::com::sun::star::awt::XUnitConversion , ::com::sun::star::awt::XStyleSettingsSupplier - > UnoControl_Base; + > UnoControl_Base; -class TOOLKIT_DLLPUBLIC UnoControl : public UnoControl_Base +class TOOLKIT_DLLPUBLIC UnoControl : public UnoControl_Base { private: - ::osl::Mutex maMutex; - - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > mxPeer; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > mxVclWindowPeer; // just to avoid the query_interface thing + ::osl::Mutex maMutex; + + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > mxPeer; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > mxVclWindowPeer; // just to avoid the query_interface thing protected: - EventListenerMultiplexer maDisposeListeners; - WindowListenerMultiplexer maWindowListeners; - FocusListenerMultiplexer maFocusListeners; - KeyListenerMultiplexer maKeyListeners; - MouseListenerMultiplexer maMouseListeners; - MouseMotionListenerMultiplexer maMouseMotionListeners; - PaintListenerMultiplexer maPaintListeners; - ::cppu::OInterfaceContainerHelper maModeChangeListeners; - - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxContext; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > mxModel; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > mxGraphics; + EventListenerMultiplexer maDisposeListeners; + WindowListenerMultiplexer maWindowListeners; + FocusListenerMultiplexer maFocusListeners; + KeyListenerMultiplexer maKeyListeners; + MouseListenerMultiplexer maMouseListeners; + MouseMotionListenerMultiplexer maMouseMotionListeners; + PaintListenerMultiplexer maPaintListeners; + ::cppu::OInterfaceContainerHelper maModeChangeListeners; + + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxContext; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > mxModel; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > mxGraphics; ::com::sun::star::uno::WeakReferenceHelper - maAccessibleContext; /// our most recent XAccessibleContext instance - - sal_Bool mbDisposePeer; - sal_Bool mbRefeshingPeer; - sal_Bool mbCreatingPeer; - sal_Bool mbCreatingCompatiblePeer; - sal_Bool mbDesignMode; - - UnoControlComponentInfos maComponentInfos; + maAccessibleContext; /// our most recent XAccessibleContext instance + + sal_Bool mbDisposePeer; + sal_Bool mbRefeshingPeer; + sal_Bool mbCreatingPeer; + sal_Bool mbCreatingCompatiblePeer; + sal_Bool mbDesignMode; + + UnoControlComponentInfos maComponentInfos; UnoControl_Data* mpData; + + ::osl::Mutex& GetMutex() { return maMutex; } - ::osl::Mutex& GetMutex() { return maMutex; } - - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParentPeer() const; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParentPeer() const; virtual void updateFromModel(); void peerCreated(); bool ImplCheckLocalize( ::rtl::OUString& _rPossiblyLocalizable ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer ); - virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); - virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer ); + virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); + virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ); virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ); void ImplLockPropertyChangeNotification( const ::rtl::OUString& rPropertyName, bool bLock ); void ImplLockPropertyChangeNotifications( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames, bool bLock ); - void disposeAccessibleContext(); + void disposeAccessibleContext(); - inline void setPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _xPeer) - { + inline void setPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _xPeer) + { mxPeer = _xPeer; mxVclWindowPeer = ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >(mxPeer,::com::sun::star::uno::UNO_QUERY); // just to avoid the query_interface thing } @@ -147,13 +147,13 @@ public: UnoControl(); ~UnoControl(); - UnoControlComponentInfos& GetComponentInfos() { return maComponentInfos; } + UnoControlComponentInfos& GetComponentInfos() { return maComponentInfos; } - - virtual ::rtl::OUString GetComponentServiceName(); + + virtual ::rtl::OUString GetComponentServiceName(); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -208,7 +208,7 @@ public: void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isDesignMode( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::lang::XServiceInfo ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/unocontrolbase.hxx b/toolkit/inc/toolkit/controls/unocontrolbase.hxx index 2d21f3f82c84..d4f395c3752d 100644 --- a/toolkit/inc/toolkit/controls/unocontrolbase.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,35 +33,35 @@ #include <toolkit/controls/unocontrol.hxx> -// ---------------------------------------------------- -// class UnoControlBase -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlBase +// ---------------------------------------------------- class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl { protected: - sal_Bool ImplHasProperty( sal_uInt16 nProp ); - sal_Bool ImplHasProperty( const ::rtl::OUString& aPropertyName ); - void ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis ); - void ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis ); - ::com::sun::star::uno::Any ImplGetPropertyValue( const ::rtl::OUString& aPropertyName ); + sal_Bool ImplHasProperty( sal_uInt16 nProp ); + sal_Bool ImplHasProperty( const ::rtl::OUString& aPropertyName ); + void ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis ); + void ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis ); + ::com::sun::star::uno::Any ImplGetPropertyValue( const ::rtl::OUString& aPropertyName ); - sal_Bool ImplGetPropertyValue_BOOL( sal_uInt16 nProp ); - sal_Int16 ImplGetPropertyValue_INT16( sal_uInt16 nProp ); - sal_uInt16 ImplGetPropertyValue_UINT16( sal_uInt16 nProp ); - sal_Int32 ImplGetPropertyValue_INT32( sal_uInt16 nProp ); - sal_uInt32 ImplGetPropertyValue_UINT32( sal_uInt16 nProp ); - double ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp ); - ::rtl::OUString ImplGetPropertyValue_UString( sal_uInt16 nProp ); + sal_Bool ImplGetPropertyValue_BOOL( sal_uInt16 nProp ); + sal_Int16 ImplGetPropertyValue_INT16( sal_uInt16 nProp ); + sal_uInt16 ImplGetPropertyValue_UINT16( sal_uInt16 nProp ); + sal_Int32 ImplGetPropertyValue_INT32( sal_uInt16 nProp ); + sal_uInt32 ImplGetPropertyValue_UINT32( sal_uInt16 nProp ); + double ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp ); + ::rtl::OUString ImplGetPropertyValue_UString( sal_uInt16 nProp ); // XLayoutConstrains (nur wenn das Control es unterstuetzt!) - ::com::sun::star::awt::Size Impl_getMinimumSize(); - ::com::sun::star::awt::Size Impl_getPreferredSize(); - ::com::sun::star::awt::Size Impl_calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ); + ::com::sun::star::awt::Size Impl_getMinimumSize(); + ::com::sun::star::awt::Size Impl_getPreferredSize(); + ::com::sun::star::awt::Size Impl_calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ); // XTextLayoutConstrains (nur wenn das Control es unterstuetzt!) - ::com::sun::star::awt::Size Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ); - void Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ); + ::com::sun::star::awt::Size Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ); + void Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ); }; diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx index a566fef2716e..3550bc12a1cc 100644 --- a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,9 +44,9 @@ class UnoControlHolderList; -// ---------------------------------------------------- -// class UnoControlContainer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlContainer +// ---------------------------------------------------- typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XUnoControlContainer , ::com::sun::star::awt::XControlContainer @@ -56,13 +56,13 @@ typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase class UnoControlContainer : public UnoControlContainer_Base { -private: - UnoControlHolderList* mpControls; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > maTabControllers; - ContainerListenerMultiplexer maCListeners; +private: + UnoControlHolderList* mpControls; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > maTabControllers; + ContainerListenerMultiplexer maCListeners; protected: - void ImplActivateTabControllers(); + void ImplActivateTabControllers(); public: UnoControlContainer(); @@ -101,16 +101,16 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL addControl( const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::awt::XUnoControlContainer void SAL_CALL setTabControllers( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > >& TabControllers ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > SAL_CALL getTabControllers( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL addTabController( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& TabController ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeTabController( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& TabController ) throw(::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::awt::XControl void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::awt::XWindow void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx index 21a338a0f2a7..177a86b72d2b 100644 --- a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,28 +35,28 @@ #include <toolkit/helper/servicenames.hxx> -// ---------------------------------------------------- -// class ::com::sun::star::awt::UnoControlContainerModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class ::com::sun::star::awt::UnoControlContainerModel +// ---------------------------------------------------- class UnoControlContainerModel : public UnoControlModel { -protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); +protected: + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlContainerModel(); UnoControlContainerModel( const UnoControlContainerModel& rModel ) : UnoControlModel( rModel ) {;} - - UnoControlModel* Clone() const { return new UnoControlContainerModel( *this ); } + + UnoControlModel* Clone() const { return new UnoControlContainerModel( *this ); } // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlContainerModel, UnoControlModel, szServiceName2_UnoControlContainerModel ) }; diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx index e46780b3b052..e75acfcda526 100644 --- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,15 +48,15 @@ #include <list> -class ImplPropertyTable; +class ImplPropertyTable; -// ---------------------------------------------------- -// class UnoControlModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlModel +// ---------------------------------------------------- -class TOOLKIT_DLLPUBLIC UnoControlModel : public ::com::sun::star::awt::XControlModel, - public ::com::sun::star::beans::XPropertyState, - public ::com::sun::star::io::XPersistObject, +class TOOLKIT_DLLPUBLIC UnoControlModel : public ::com::sun::star::awt::XControlModel, + public ::com::sun::star::beans::XPropertyState, + public ::com::sun::star::io::XPersistObject, public ::com::sun::star::lang::XComponent, public ::com::sun::star::lang::XServiceInfo, public ::com::sun::star::lang::XTypeProvider, @@ -67,16 +67,16 @@ class TOOLKIT_DLLPUBLIC UnoControlModel : public ::com::sun::star::awt::XContr public ::cppu::OWeakAggObject { private: - ImplPropertyTable* mpData; - EventListenerMultiplexer maDisposeListeners; + ImplPropertyTable* mpData; + EventListenerMultiplexer maDisposeListeners; protected: - void ImplRegisterProperty( sal_uInt16 nPropType ); - void ImplRegisterProperties( const std::list< sal_uInt16 > &rIds ); - void ImplRegisterProperty( sal_uInt16 nPropId, const ::com::sun::star::uno::Any& rDefault ); - ::com::sun::star::uno::Sequence<sal_Int32> ImplGetPropertyIds() const; - virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - sal_Bool ImplHasProperty( sal_uInt16 nPropId ) const; + void ImplRegisterProperty( sal_uInt16 nPropType ); + void ImplRegisterProperties( const std::list< sal_uInt16 > &rIds ); + void ImplRegisterProperty( sal_uInt16 nPropId, const ::com::sun::star::uno::Any& rDefault ); + ::com::sun::star::uno::Sequence<sal_Int32> ImplGetPropertyIds() const; + virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + sal_Bool ImplHasProperty( sal_uInt16 nPropId ) const; /** called before setting multiple properties, allows to care for property dependencies @@ -85,11 +85,11 @@ protected: the properties are internally really set.</p> */ virtual void ImplNormalizePropertySequence( - const sal_Int32 _nCount, /// the number of entries in the arrays - sal_Int32* _pHandles, /// the handles of the properties to set - ::com::sun::star::uno::Any* _pValues, /// the values of the properties to set - sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted - ) const SAL_THROW(()); + const sal_Int32 _nCount, /// the number of entries in the arrays + sal_Int32* _pHandles, /// the handles of the properties to set + ::com::sun::star::uno::Any* _pValues, /// the values of the properties to set + sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted + ) const SAL_THROW(()); /// ensures that two property values in a sequence have a certain order void ImplEnsureHandleOrder( @@ -100,31 +100,31 @@ protected: sal_Int32 _nSecondHandle /// second handle, which should supersede _nFirstHandle in the sequence ) const; -public: +public: UnoControlModel(); UnoControlModel( const UnoControlModel& rModel ); ~UnoControlModel(); - - virtual UnoControlModel* Clone() const = 0; - + + virtual UnoControlModel* Clone() const = 0; + // ::com::sun::star::uno::XAggregation - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); } - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); } + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static UnoControlModel* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static UnoControlModel* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XCloneable ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XControlModel diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx index 21b634155585..993c798cd952 100644 --- a/toolkit/inc/toolkit/controls/unocontrols.hxx +++ b/toolkit/inc/toolkit/controls/unocontrols.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,22 +71,22 @@ #define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:" #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX "vnd.sun.star.Package:" + - -// ---------------------------------------------------- -// class UnoControlEditModel -// ---------------------------------------------------- -class UnoControlEditModel : public UnoControlModel +// ---------------------------------------------------- +// class UnoControlEditModel +// ---------------------------------------------------- +class UnoControlEditModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlEditModel(); UnoControlEditModel( const UnoControlEditModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlEditModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlEditModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -99,9 +99,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlEditModel, UnoControlModel, szServiceName2_UnoControlEditModel ) }; -// ---------------------------------------------------- -// class UnoEditControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoEditControl +// ---------------------------------------------------- typedef ::cppu::ImplHelper4 < ::com::sun::star::awt::XTextComponent , ::com::sun::star::awt::XTextListener , ::com::sun::star::awt::XLayoutConstrains @@ -111,7 +111,7 @@ class TOOLKIT_DLLPUBLIC UnoEditControl :public UnoControlBase ,public UnoEditControl_Base { private: - TextListenerMultiplexer maTextListeners; + TextListenerMultiplexer maTextListeners; // Not all fields derived from UnoEditCOntrol have the property "Text" // They only support XTextComponent, so keep the text @@ -126,10 +126,10 @@ private: public: UnoEditControl(); - ::rtl::OUString GetComponentServiceName(); - TextListenerMultiplexer& GetTextListeners() { return maTextListeners; } + ::rtl::OUString GetComponentServiceName(); + TextListenerMultiplexer& GetTextListeners() { return maTextListeners; } - void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); + void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); } @@ -176,20 +176,20 @@ public: sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException ); }; -// ---------------------------------------------------- -// class UnoControlFileControlModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlFileControlModel +// ---------------------------------------------------- class UnoControlFileControlModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlFileControlModel(); UnoControlFileControlModel( const UnoControlFileControlModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlFileControlModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlFileControlModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -201,28 +201,28 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlFileControlModel, UnoControlModel, szServiceName2_UnoControlFileControlModel ) }; -// ---------------------------------------------------- -// class UnoFileControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoFileControl +// ---------------------------------------------------- class UnoFileControl : public UnoEditControl { public: UnoFileControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFileControl, UnoEditControl, szServiceName2_UnoControlFileControl ) }; -// ---------------------------------------------------- -// class GraphicControlModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class GraphicControlModel +// ---------------------------------------------------- class GraphicControlModel : public UnoControlModel { private: bool mbAdjustingImagePosition; bool mbAdjustingGraphic; - + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj; protected: @@ -239,20 +239,20 @@ private: GraphicControlModel& operator=( const GraphicControlModel& ); // never implemented }; -// ---------------------------------------------------- -// class UnoControlButtonModel -// ---------------------------------------------------- -class UnoControlButtonModel : public GraphicControlModel +// ---------------------------------------------------- +// class UnoControlButtonModel +// ---------------------------------------------------- +class UnoControlButtonModel : public GraphicControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlButtonModel(); UnoControlButtonModel( const UnoControlButtonModel& rModel ) : GraphicControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlButtonModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlButtonModel( *this ); } // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -264,9 +264,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlButtonModel, GraphicControlModel, szServiceName2_UnoControlButtonModel ) }; -// ---------------------------------------------------- -// class UnoButtonControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoButtonControl +// ---------------------------------------------------- typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XToggleButton @@ -278,12 +278,12 @@ class UnoButtonControl : public UnoButtonControl_Base private: ActionListenerMultiplexer maActionListeners; ItemListenerMultiplexer maItemListeners; - ::rtl::OUString maActionCommand; + ::rtl::OUString maActionCommand; public: UnoButtonControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -314,23 +314,23 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoButtonControl, UnoControlBase, szServiceName2_UnoControlButton ) }; -// ---------------------------------------------------- -// class UnoControlImageControlModel -// ---------------------------------------------------- -class UnoControlImageControlModel : public GraphicControlModel +// ---------------------------------------------------- +// class UnoControlImageControlModel +// ---------------------------------------------------- +class UnoControlImageControlModel : public GraphicControlModel { private: bool mbAdjustingImageScaleMode; protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlImageControlModel(); UnoControlImageControlModel( const UnoControlImageControlModel& rModel ) : GraphicControlModel( rModel ), mbAdjustingImageScaleMode( false ) { } - UnoControlModel* Clone() const { return new UnoControlImageControlModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlImageControlModel( *this ); } // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -345,22 +345,22 @@ public: void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); }; -// ---------------------------------------------------- -// class UnoImageControlControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoImageControlControl +// ---------------------------------------------------- typedef ::cppu::AggImplInheritanceHelper1 < UnoControlBase , ::com::sun::star::awt::XLayoutConstrains > UnoImageControlControl_Base; class UnoImageControlControl : public UnoImageControlControl_Base { private: - ActionListenerMultiplexer maActionListeners; - ::rtl::OUString maActionCommand; + ActionListenerMultiplexer maActionListeners; + ::rtl::OUString maActionCommand; public: UnoImageControlControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -376,21 +376,21 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoImageControlControl, UnoControlBase, szServiceName2_UnoControlImageControl ) }; -// ---------------------------------------------------- -// class UnoControlRadioButtonModel -// ---------------------------------------------------- -class UnoControlRadioButtonModel : public GraphicControlModel +// ---------------------------------------------------- +// class UnoControlRadioButtonModel +// ---------------------------------------------------- +class UnoControlRadioButtonModel : public GraphicControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlRadioButtonModel(); UnoControlRadioButtonModel( const UnoControlRadioButtonModel& rModel ) : GraphicControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlRadioButtonModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlRadioButtonModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -403,9 +403,9 @@ public: }; -// ---------------------------------------------------- -// class UnoRadioButtonControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoRadioButtonControl +// ---------------------------------------------------- typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XRadioButton @@ -415,14 +415,14 @@ typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase class UnoRadioButtonControl : public UnoRadioButtonControl_Base { private: - ItemListenerMultiplexer maItemListeners; - ActionListenerMultiplexer maActionListeners; - ::rtl::OUString maActionCommand; + ItemListenerMultiplexer maItemListeners; + ActionListenerMultiplexer maActionListeners; + ::rtl::OUString maActionCommand; public: UnoRadioButtonControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -456,20 +456,20 @@ public: }; -// ---------------------------------------------------- -// class UnoControlCheckBoxModel -// ---------------------------------------------------- -class UnoControlCheckBoxModel : public GraphicControlModel +// ---------------------------------------------------- +// class UnoControlCheckBoxModel +// ---------------------------------------------------- +class UnoControlCheckBoxModel : public GraphicControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlCheckBoxModel(); UnoControlCheckBoxModel( const UnoControlCheckBoxModel& rModel ) : GraphicControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlCheckBoxModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlCheckBoxModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -481,9 +481,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlCheckBoxModel, GraphicControlModel, szServiceName2_UnoControlCheckBoxModel ) }; -// ---------------------------------------------------- -// class UnoCheckBoxControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoCheckBoxControl +// ---------------------------------------------------- typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XCheckBox @@ -494,14 +494,14 @@ class UnoCheckBoxControl : public UnoCheckBoxControl_Base { private: ItemListenerMultiplexer maItemListeners; - ActionListenerMultiplexer maActionListeners; - ::rtl::OUString maActionCommand; + ActionListenerMultiplexer maActionListeners; + ::rtl::OUString maActionCommand; public: UnoCheckBoxControl(); ~UnoCheckBoxControl(){;} - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -537,14 +537,14 @@ public: }; -// ---------------------------------------------------- -// class UnoControlFixedTextModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlFixedTextModel +// ---------------------------------------------------- class UnoControlFixedHyperlinkModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlFixedHyperlinkModel(); @@ -562,9 +562,9 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedHyperlinkModel, UnoControlModel, szServiceName_UnoControlFixedHyperlinkModel ) }; -// ---------------------------------------------------- +// ---------------------------------------------------- // class UnoFixedHyperlinkControl -// ---------------------------------------------------- +// ---------------------------------------------------- class UnoFixedHyperlinkControl : public UnoControlBase, public ::com::sun::star::awt::XFixedHyperlink, public ::com::sun::star::awt::XLayoutConstrains @@ -577,17 +577,17 @@ public: ::rtl::OUString GetComponentServiceName(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XControl sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); @@ -640,14 +640,14 @@ public: class UnoMultiPageModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoMultiPageModel(); UnoMultiPageModel( const UnoMultiPageModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoMultiPageModel( *this ); } + UnoControlModel* Clone() const { return new UnoMultiPageModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -659,14 +659,14 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, UnoControlModel, szServiceName_UnoMultiPageModel ) }; -// ---------------------------------------------------- -// class UnoGroupBoxControl -// ---------------------------------------------------- -class UnoMultiPageControl : public UnoControlBase +// ---------------------------------------------------- +// class UnoGroupBoxControl +// ---------------------------------------------------- +class UnoMultiPageControl : public UnoControlBase { public: UnoMultiPageControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); @@ -714,20 +714,20 @@ public: }; -// ---------------------------------------------------- -// class UnoControlGroupBoxModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlGroupBoxModel +// ---------------------------------------------------- class UnoControlGroupBoxModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlGroupBoxModel(); UnoControlGroupBoxModel( const UnoControlGroupBoxModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlGroupBoxModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlGroupBoxModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -740,14 +740,14 @@ public: }; -// ---------------------------------------------------- -// class UnoGroupBoxControl -// ---------------------------------------------------- -class UnoGroupBoxControl : public UnoControlBase +// ---------------------------------------------------- +// class UnoGroupBoxControl +// ---------------------------------------------------- +class UnoGroupBoxControl : public UnoControlBase { public: UnoGroupBoxControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); @@ -756,9 +756,9 @@ public: }; -// ---------------------------------------------------- -// class UnoControlListBoxModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlListBoxModel +// ---------------------------------------------------- struct UnoControlListBoxModel_Data; typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel , ::com::sun::star::awt::XItemList @@ -772,14 +772,14 @@ public: UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource ); ~UnoControlListBoxModel(); - UnoControlModel* Clone() const { return new UnoControlListBoxModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlListBoxModel( *this ); } - virtual void ImplNormalizePropertySequence( - const sal_Int32 _nCount, /// the number of entries in the arrays - sal_Int32* _pHandles, /// the handles of the properties to set - ::com::sun::star::uno::Any* _pValues, /// the values of the properties to set - sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted - ) const SAL_THROW(()); + virtual void ImplNormalizePropertySequence( + const sal_Int32 _nCount, /// the number of entries in the arrays + sal_Int32* _pHandles, /// the handles of the properties to set + ::com::sun::star::uno::Any* _pValues, /// the values of the properties to set + sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted + ) const SAL_THROW(()); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -815,8 +815,8 @@ public: void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); private: void impl_notifyItemListEvent_nolck( @@ -853,9 +853,9 @@ protected: ::cppu::OInterfaceContainerHelper m_aItemListListeners; }; -// ---------------------------------------------------- -// class UnoListBoxControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoListBoxControl +// ---------------------------------------------------- typedef ::cppu::AggImplInheritanceHelper5 < UnoControlBase , ::com::sun::star::awt::XListBox , ::com::sun::star::awt::XItemListener @@ -867,7 +867,7 @@ class TOOLKIT_DLLPUBLIC UnoListBoxControl : public UnoListBoxControl_Base { public: UnoListBoxControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -929,27 +929,27 @@ protected: virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); virtual void updateFromModel(); - ActionListenerMultiplexer& getActionListeners(); - ItemListenerMultiplexer& getItemListeners(); + ActionListenerMultiplexer& getActionListeners(); + ItemListenerMultiplexer& getItemListeners(); private: - ActionListenerMultiplexer maActionListeners; - ItemListenerMultiplexer maItemListeners; + ActionListenerMultiplexer maActionListeners; + ItemListenerMultiplexer maItemListeners; }; -// ---------------------------------------------------- -// class UnoControlComboBoxModel -// ---------------------------------------------------- -class UnoControlComboBoxModel : public UnoControlListBoxModel +// ---------------------------------------------------- +// class UnoControlComboBoxModel +// ---------------------------------------------------- +class UnoControlComboBoxModel : public UnoControlListBoxModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlComboBoxModel(); UnoControlComboBoxModel( const UnoControlComboBoxModel& rModel ) : UnoControlListBoxModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlComboBoxModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlComboBoxModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -966,36 +966,36 @@ public: }; -// ---------------------------------------------------- -// class UnoComboBoxControl -// ---------------------------------------------------- -class UnoComboBoxControl : public UnoEditControl +// ---------------------------------------------------- +// class UnoComboBoxControl +// ---------------------------------------------------- +class UnoComboBoxControl : public UnoEditControl , public ::com::sun::star::awt::XComboBox , public ::com::sun::star::awt::XItemListener , public ::com::sun::star::awt::XItemListListener { private: - ActionListenerMultiplexer maActionListeners; - ItemListenerMultiplexer maItemListeners; + ActionListenerMultiplexer maActionListeners; + ItemListenerMultiplexer maItemListeners; public: UnoComboBoxControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoEditControl::disposing( Source ); } void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoEditControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } - + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoEditControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } + // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XComboBox void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -1031,32 +1031,32 @@ public: protected: virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); virtual void updateFromModel(); - ActionListenerMultiplexer& getActionListeners(); - ItemListenerMultiplexer& getItemListeners(); + ActionListenerMultiplexer& getActionListeners(); + ItemListenerMultiplexer& getItemListeners(); }; -// ---------------------------------------------------- -// class UnoSpinFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoSpinFieldControl +// ---------------------------------------------------- class UnoSpinFieldControl : public UnoEditControl, public ::com::sun::star::awt::XSpinField { private: - SpinListenerMultiplexer maSpinListeners; + SpinListenerMultiplexer maSpinListeners; BOOL mbRepeat; public: UnoSpinFieldControl(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoEditControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoEditControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); @@ -1075,20 +1075,20 @@ public: }; -// ---------------------------------------------------- -// class UnoControlDateFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlDateFieldModel +// ---------------------------------------------------- class UnoControlDateFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlDateFieldModel(); UnoControlDateFieldModel( const UnoControlDateFieldModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlDateFieldModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlDateFieldModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -1101,9 +1101,9 @@ public: }; -// ---------------------------------------------------- -// class UnoDateFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoDateFieldControl +// ---------------------------------------------------- class UnoDateFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XDateField { @@ -1113,16 +1113,16 @@ private: sal_Bool mbLongFormat; public: UnoDateFieldControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); @@ -1151,20 +1151,20 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoDateFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlDateField ) }; -// ---------------------------------------------------- -// class UnoControlTimeFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlTimeFieldModel +// ---------------------------------------------------- class UnoControlTimeFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlTimeFieldModel(); UnoControlTimeFieldModel( const UnoControlTimeFieldModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlTimeFieldModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlTimeFieldModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -1177,9 +1177,9 @@ public: }; -// ---------------------------------------------------- -// class UnoTimeFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoTimeFieldControl +// ---------------------------------------------------- class UnoTimeFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XTimeField { @@ -1189,16 +1189,16 @@ private: public: UnoTimeFieldControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); @@ -1226,20 +1226,20 @@ public: }; -// ---------------------------------------------------- -// class UnoControlNumericFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlNumericFieldModel +// ---------------------------------------------------- class UnoControlNumericFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlNumericFieldModel(); UnoControlNumericFieldModel( const UnoControlNumericFieldModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlNumericFieldModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlNumericFieldModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -1252,10 +1252,10 @@ public: }; -// ---------------------------------------------------- -// class UnoNumericFieldControl -// ---------------------------------------------------- -class UnoNumericFieldControl : public UnoSpinFieldControl, +// ---------------------------------------------------- +// class UnoNumericFieldControl +// ---------------------------------------------------- +class UnoNumericFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XNumericField { private: @@ -1264,18 +1264,18 @@ private: public: UnoNumericFieldControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTextListener void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); @@ -1303,20 +1303,20 @@ public: }; -// ---------------------------------------------------- -// class UnoControlCurrencyFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlCurrencyFieldModel +// ---------------------------------------------------- class UnoControlCurrencyFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlCurrencyFieldModel(); UnoControlCurrencyFieldModel( const UnoControlCurrencyFieldModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlCurrencyFieldModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlCurrencyFieldModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -1329,10 +1329,10 @@ public: }; -// ---------------------------------------------------- -// class UnoCurrencyFieldControl -// ---------------------------------------------------- -class UnoCurrencyFieldControl : public UnoSpinFieldControl, +// ---------------------------------------------------- +// class UnoCurrencyFieldControl +// ---------------------------------------------------- +class UnoCurrencyFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XCurrencyField { private: @@ -1341,18 +1341,18 @@ private: public: UnoCurrencyFieldControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTextListener void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); @@ -1379,20 +1379,20 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoCurrencyFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlCurrencyField ) }; -// ---------------------------------------------------- -// class UnoControlPatternFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlPatternFieldModel +// ---------------------------------------------------- class UnoControlPatternFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlPatternFieldModel(); UnoControlPatternFieldModel( const UnoControlPatternFieldModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlPatternFieldModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlPatternFieldModel( *this ); } // ::com::sun::star::io::XPersistObject ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -1405,27 +1405,27 @@ public: }; -// ---------------------------------------------------- -// class UnoPatternFieldControl -// ---------------------------------------------------- -class UnoPatternFieldControl : public UnoSpinFieldControl, +// ---------------------------------------------------- +// class UnoPatternFieldControl +// ---------------------------------------------------- +class UnoPatternFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XPatternField { protected: - void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); + void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); public: UnoPatternFieldControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XPatternField void SAL_CALL setMasks( const ::rtl::OUString& EditMask, const ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException); @@ -1440,20 +1440,20 @@ public: }; -// ---------------------------------------------------- -// class UnoControlProgressBarModel -// ---------------------------------------------------- -class UnoControlProgressBarModel : public UnoControlModel +// ---------------------------------------------------- +// class UnoControlProgressBarModel +// ---------------------------------------------------- +class UnoControlProgressBarModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlProgressBarModel(); UnoControlProgressBarModel( const UnoControlProgressBarModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlProgressBarModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlProgressBarModel( *this ); } // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -1465,30 +1465,30 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoControlProgressBarModel, UnoControlModel, szServiceName2_UnoControlProgressBarModel ) }; -// ---------------------------------------------------- -// class UnoProgressBarControl -// ---------------------------------------------------- -class UnoProgressBarControl : public UnoControlBase, +// ---------------------------------------------------- +// class UnoProgressBarControl +// ---------------------------------------------------- +class UnoProgressBarControl : public UnoControlBase, public ::com::sun::star::awt::XProgressBar { public: UnoProgressBarControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XProgressBar void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException ); + void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException ); sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo @@ -1496,20 +1496,20 @@ public: }; -// ---------------------------------------------------- -// class UnoControlFixedLineModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlFixedLineModel +// ---------------------------------------------------- class UnoControlFixedLineModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoControlFixedLineModel(); UnoControlFixedLineModel( const UnoControlFixedLineModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlFixedLineModel( *this ); } + UnoControlModel* Clone() const { return new UnoControlFixedLineModel( *this ); } // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -1522,14 +1522,14 @@ public: }; -// ---------------------------------------------------- -// class UnoFixedLineControl -// ---------------------------------------------------- -class UnoFixedLineControl : public UnoControlBase +// ---------------------------------------------------- +// class UnoFixedLineControl +// ---------------------------------------------------- +class UnoFixedLineControl : public UnoControlBase { public: UnoFixedLineControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/dllapi.h b/toolkit/inc/toolkit/dllapi.h index c1dc5f48a138..7a2a4516ead7 100644 --- a/toolkit/inc/toolkit/dllapi.h +++ b/toolkit/inc/toolkit/dllapi.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/helper/accessibilityclient.hxx b/toolkit/inc/toolkit/helper/accessibilityclient.hxx index beec9681aad4..8324ec674690 100644 --- a/toolkit/inc/toolkit/helper/accessibilityclient.hxx +++ b/toolkit/inc/toolkit/helper/accessibilityclient.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/helper/accessiblefactory.hxx b/toolkit/inc/toolkit/helper/accessiblefactory.hxx index 1362a7d4d365..e5829cce8cdc 100644 --- a/toolkit/inc/toolkit/helper/accessiblefactory.hxx +++ b/toolkit/inc/toolkit/helper/accessiblefactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/helper/convert.hxx b/toolkit/inc/toolkit/helper/convert.hxx index 2a7f9a46169d..4bdf510cc642 100644 --- a/toolkit/inc/toolkit/helper/convert.hxx +++ b/toolkit/inc/toolkit/helper/convert.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,6 +65,6 @@ inline ::Rectangle VCLRectangle( const ::com::sun::star::awt::Rectangle& rAWTRec return ::Rectangle( ::Point( rAWTRect.X, rAWTRect.Y ), ::Size( rAWTRect.Width, rAWTRect.Height ) ); } -#endif // _TOOLKIT_HELPER_CONVERT_HXX_ +#endif // _TOOLKIT_HELPER_CONVERT_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx b/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx index 5f9cacd85f3b..a34a2f0daf0f 100644 --- a/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx +++ b/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,15 +34,15 @@ #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/FontStrikeout.hpp> -// ---------------------------------------------------- -// class EmptyFontDescriptor -// ---------------------------------------------------- -class EmptyFontDescriptor : public ::com::sun::star::awt::FontDescriptor +// ---------------------------------------------------- +// class EmptyFontDescriptor +// ---------------------------------------------------- +class EmptyFontDescriptor : public ::com::sun::star::awt::FontDescriptor { -public: +public: EmptyFontDescriptor() { - // Not all enums are initialized correctly in FontDescriptor-CTOR because + // Not all enums are initialized correctly in FontDescriptor-CTOR because // they are set to the first enum value, this is not allways the default value. Slant = ::com::sun::star::awt::FontSlant_DONTKNOW; Underline = ::com::sun::star::awt::FontUnderline::DONTKNOW; diff --git a/toolkit/inc/toolkit/helper/externallock.hxx b/toolkit/inc/toolkit/helper/externallock.hxx index 667051d409b6..e62b8df06b15 100644 --- a/toolkit/inc/toolkit/helper/externallock.hxx +++ b/toolkit/inc/toolkit/helper/externallock.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <comphelper/accessiblecontexthelper.hxx> // ----------------------------------------------------------------------------- -// class VCLExternalSolarLock +// class VCLExternalSolarLock // ----------------------------------------------------------------------------- class TOOLKIT_DLLPUBLIC VCLExternalSolarLock : public ::comphelper::IMutex @@ -42,6 +42,6 @@ public: virtual void release(); }; -#endif // _TOOLKIT_HELPER_EXTERNALLOCK_HXX_ +#endif // _TOOLKIT_HELPER_EXTERNALLOCK_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/inc/toolkit/helper/fixedhyperbase.hxx b/toolkit/inc/toolkit/helper/fixedhyperbase.hxx index 4372861a7e15..6b25401de3f9 100644 --- a/toolkit/inc/toolkit/helper/fixedhyperbase.hxx +++ b/toolkit/inc/toolkit/helper/fixedhyperbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/helper/formpdfexport.hxx b/toolkit/inc/toolkit/helper/formpdfexport.hxx index 2bed137d0e6b..fb413d28eb5d 100644 --- a/toolkit/inc/toolkit/helper/formpdfexport.hxx +++ b/toolkit/inc/toolkit/helper/formpdfexport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/helper/imagealign.hxx b/toolkit/inc/toolkit/helper/imagealign.hxx index 4dd6a019a1de..3551c314e2a2 100644 --- a/toolkit/inc/toolkit/helper/imagealign.hxx +++ b/toolkit/inc/toolkit/helper/imagealign.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx index 38d7300382cd..f8d49eee27da 100644 --- a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx +++ b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,49 +56,49 @@ #include <toolkit/helper/mutexhelper.hxx> #include <toolkit/helper/macros.hxx> #include <com/sun/star/awt/grid/XGridSelectionListener.hpp> -// ---------------------------------------------------- -// class ListenerMultiplexerBase -// ---------------------------------------------------- +// ---------------------------------------------------- +// class ListenerMultiplexerBase +// ---------------------------------------------------- class TOOLKIT_DLLPUBLIC ListenerMultiplexerBase : public MutexHelper, public ::cppu::OInterfaceContainerHelper, public ::com::sun::star::uno::XInterface { private: - ::cppu::OWeakObject& mrContext; + ::cppu::OWeakObject& mrContext; protected: - ::cppu::OWeakObject& GetContext() { return mrContext; } + ::cppu::OWeakObject& GetContext() { return mrContext; } public: ListenerMultiplexerBase( ::cppu::OWeakObject& rSource ); virtual ~ListenerMultiplexerBase(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { mrContext.acquire(); } - void SAL_CALL release() throw() { mrContext.release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { mrContext.acquire(); } + void SAL_CALL release() throw() { mrContext.release(); } }; -// ---------------------------------------------------- -// class EventListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class EventListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( EventListenerMultiplexer, ::com::sun::star::lang::XEventListener ) DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class FocusListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class FocusListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class WindowListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class WindowListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException); @@ -108,25 +108,25 @@ DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class VclContainerListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VclContainerListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener ) void SAL_CALL windowAdded( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL windowRemoved( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class KeyListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class KeyListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class MouseListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class MouseListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener ) void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException); @@ -134,24 +134,24 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, ::com::sun::sta void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class MouseMotionListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class MouseMotionListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class PaintListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class PaintListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& e ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class TopWindowListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class TopWindowListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener ) void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException); @@ -162,39 +162,39 @@ DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, ::com::sun::star:: void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class TextListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class TextListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START_DLLPUB( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener ) void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class ActionListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class ActionListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START_DLLPUB( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener ) void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class ItemListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class ItemListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener ) void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class ContainerListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class ContainerListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener ) void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class SpinListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SpinListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener ) void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); @@ -202,16 +202,16 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, ::com::sun::star void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class AdjustmentListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class AdjustmentListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener ) void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class MenuListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class MenuListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener ) void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); @@ -219,16 +219,16 @@ DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt:: void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class TreeSelectionListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class TreeSelectionListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener ) virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class TreeExpansionListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class TreeExpansionListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener ) virtual void SAL_CALL requestChildNodes( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL treeExpanding( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException); @@ -237,17 +237,17 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, ::com:: virtual void SAL_CALL treeCollapsed( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class TreeEditListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class TreeEditListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeEditListenerMultiplexer, ::com::sun::star::awt::tree::XTreeEditListener ) virtual void SAL_CALL nodeEditing( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException,::com::sun::star::util::VetoException); virtual void SAL_CALL nodeEdited( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node, const ::rtl::OUString& NewText ) throw (::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END -// ---------------------------------------------------- -// class SelectionListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SelectionListenerMultiplexer +// ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START_DLLPUB( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener ) void SAL_CALL selectionChanged( const ::com::sun::star::awt::grid::GridSelectionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx index 9fac9cb14582..65c0cbf7d70d 100644 --- a/toolkit/inc/toolkit/helper/macros.hxx +++ b/toolkit/inc/toolkit/helper/macros.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< // ------------------------------------------------------------------------------------- -#define IMPL_IMPLEMENTATION_ID( ClassName ) \ +#define IMPL_IMPLEMENTATION_ID( ClassName ) \ ::com::sun::star::uno::Sequence< sal_Int8 > ClassName::getImplementationId() throw(::com::sun::star::uno::RuntimeException) \ { \ static ::cppu::OImplementationId* pId = NULL; \ @@ -109,7 +109,7 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< return (*pId).getImplementationId(); \ } -#define IMPL_XTYPEPROVIDER_START( ClassName ) \ +#define IMPL_XTYPEPROVIDER_START( ClassName ) \ IMPL_IMPLEMENTATION_ID( ClassName ) \ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > ClassName::getTypes() throw(::com::sun::star::uno::RuntimeException) \ { \ @@ -139,10 +139,10 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ { \ public: \ ClassName( ::cppu::OWeakObject& rSource ); \ - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); \ - void SAL_CALL acquire() throw() { ListenerMultiplexerBase::acquire(); } \ - void SAL_CALL release() throw() { ListenerMultiplexerBase::release(); } \ - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); \ + void SAL_CALL acquire() throw() { ListenerMultiplexerBase::acquire(); } \ + void SAL_CALL release() throw() { ListenerMultiplexerBase::release(); } \ + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); // ------------------------------------------------------------------------------------- @@ -151,10 +151,10 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter { \ public: \ ClassName( ::cppu::OWeakObject& rSource ); \ - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); \ - void SAL_CALL acquire() throw() { ListenerMultiplexerBase::acquire(); } \ - void SAL_CALL release() throw() { ListenerMultiplexerBase::release(); } \ - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); \ + void SAL_CALL acquire() throw() { ListenerMultiplexerBase::acquire(); } \ + void SAL_CALL release() throw() { ListenerMultiplexerBase::release(); } \ + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); // ------------------------------------------------------------------------------------- @@ -242,7 +242,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa #define DECLIMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \ ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii( "stardiv.Toolkit." #ImplName ); } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ { \ ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = BaseClass::getSupportedServiceNames( ); \ aNames.realloc( aNames.getLength() + 1 ); \ @@ -254,7 +254,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa #define DECLIMPL_SERVICEINFO( ImplName, ServiceName ) \ ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii( "stardiv.Toolkit." #ImplName ); } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ { \ ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames( 1 ); \ aNames[ 0 ] = ::rtl::OUString::createFromAscii( ServiceName ); \ diff --git a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx b/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx index f9d5eec31a2b..55fd55c01381 100644 --- a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx +++ b/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,17 +35,17 @@ // Helper class with Mutex and BroadcastHelper, because they must be // initialized before calling the OPropertySetHelper-CTOR -class MutexAndBroadcastHelper +class MutexAndBroadcastHelper { public: MutexAndBroadcastHelper() : BrdcstHelper( Mutex ) {} - - ::osl::Mutex Mutex; - ::cppu::OBroadcastHelper BrdcstHelper; - - ::osl::Mutex& GetMutex() { return Mutex; } - + + ::osl::Mutex Mutex; + ::cppu::OBroadcastHelper BrdcstHelper; + + ::osl::Mutex& GetMutex() { return Mutex; } + }; @@ -53,7 +53,7 @@ public: -#endif // _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX +#endif // _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/inc/toolkit/helper/mutexhelper.hxx b/toolkit/inc/toolkit/helper/mutexhelper.hxx index d1cd5e258dbd..eab1cb1c7c3c 100644 --- a/toolkit/inc/toolkit/helper/mutexhelper.hxx +++ b/toolkit/inc/toolkit/helper/mutexhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,11 +31,11 @@ #include <osl/mutex.hxx> -// ---------------------------------------------------- -// class MutexHelper -// ---------------------------------------------------- +// ---------------------------------------------------- +// class MutexHelper +// ---------------------------------------------------- -class MutexHelper +class MutexHelper { private: ::osl::Mutex maMutex; diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx index 611384b89d22..3ca2fdd8b9d8 100644 --- a/toolkit/inc/toolkit/helper/property.hxx +++ b/toolkit/inc/toolkit/helper/property.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,102 +46,102 @@ namespace rtl { } -#define BASEPROPERTY_NOTFOUND 0 - -#define BASEPROPERTY_TEXT 1 // ::rtl::OUString -#define BASEPROPERTY_BACKGROUNDCOLOR 2 // sal_Int32 -#define BASEPROPERTY_FILLCOLOR 3 // sal_Int32 -#define BASEPROPERTY_TEXTCOLOR 4 // sal_Int32 -#define BASEPROPERTY_LINECOLOR 5 // sal_Int32 -#define BASEPROPERTY_BORDER 6 // sal_Int16 -#define BASEPROPERTY_ALIGN 7 // sal_Int16 -#define BASEPROPERTY_FONTDESCRIPTOR 8 // ::com::sun::star::awt::FontDescriptor, war mal Font, aber nie gespeichert... -#define BASEPROPERTY_DROPDOWN 9 // sal_Bool -#define BASEPROPERTY_MULTILINE 10 // sal_Bool -#define BASEPROPERTY_STRINGITEMLIST 11 // UStringSequence -#define BASEPROPERTY_HSCROLL 12 // sal_Bool -#define BASEPROPERTY_VSCROLL 13 // sal_Bool -#define BASEPROPERTY_TABSTOP 14 // sal_Bool -#define BASEPROPERTY_STATE 15 // sal_Int16 -#define BASEPROPERTY_FONT_TYPE 16 // OLD: Font_Type -#define BASEPROPERTY_FONT_SIZE 17 // OLD: Font_Size -#define BASEPROPERTY_FONT_ATTRIBS 18 // OLD: Font_Attribs -#define BASEPROPERTY_DEFAULTCONTROL 19 // ::rtl::OUString (ServiceName) -#define BASEPROPERTY_LABEL 20 // ::rtl::OUString -#define BASEPROPERTY_LINECOUNT 21 // sal_Int16 -#define BASEPROPERTY_EXTDATEFORMAT 22 // sal_Int16 -#define BASEPROPERTY_DATESHOWCENTURY 23 // sal_Bool -#define BASEPROPERTY_EXTTIMEFORMAT 24 // sal_Int16 -#define BASEPROPERTY_NUMSHOWTHOUSANDSEP 25 // sal_Bool -#define BASEPROPERTY_CURRENCYSYMBOL 26 // ::rtl::OUString -#define BASEPROPERTY_SPIN 27 // sal_Bool -#define BASEPROPERTY_STRICTFORMAT 28 // sal_Bool -#define BASEPROPERTY_DECIMALACCURACY 29 // sal_Int16 -#define BASEPROPERTY_DATE 30 // sal_Int32 -#define BASEPROPERTY_DATEMIN 31 // sal_Int32 -#define BASEPROPERTY_DATEMAX 32 // sal_Int32 -#define BASEPROPERTY_TIME 33 // sal_Int32 -#define BASEPROPERTY_TIMEMIN 34 // sal_Int32 -#define BASEPROPERTY_TIMEMAX 35 // sal_Int32 -#define BASEPROPERTY_VALUE_INT32 36 // sal_Int32 -#define BASEPROPERTY_VALUEMIN_INT32 37 // sal_Int32 -#define BASEPROPERTY_VALUEMAX_INT32 38 // sal_Int32 -#define BASEPROPERTY_VALUESTEP_INT32 39 // sal_Int32 -#define BASEPROPERTY_EDITMASK 40 // ::rtl::OUString -#define BASEPROPERTY_LITERALMASK 41 // ::rtl::OUString -#define BASEPROPERTY_IMAGEURL 42 // ::rtl::OUString -#define BASEPROPERTY_READONLY 43 // sal_Bool -#define BASEPROPERTY_ENABLED 44 // sal_Bool -#define BASEPROPERTY_PRINTABLE 45 // sal_Bool -#define BASEPROPERTY_ECHOCHAR 46 // sal_Int16 -#define BASEPROPERTY_MAXTEXTLEN 47 // sal_Int16 -#define BASEPROPERTY_HARDLINEBREAKS 48 // sal_Int16 -#define BASEPROPERTY_AUTOCOMPLETE 49 // sal_Bool -#define BASEPROPERTY_MULTISELECTION 50 // sal_Bool -#define BASEPROPERTY_SELECTEDITEMS 51 // INT16Sequence -#define BASEPROPERTY_VALUE_DOUBLE 52 // DOUBLE -#define BASEPROPERTY_VALUEMIN_DOUBLE 53 // DOUBLE -#define BASEPROPERTY_VALUEMAX_DOUBLE 54 // DOUBLE -#define BASEPROPERTY_VALUESTEP_DOUBLE 55 // DOUBLE -#define BASEPROPERTY_TRISTATE 56 // sal_Bool -#define BASEPROPERTY_DEFAULTBUTTON 57 // sal_Bool -#define BASEPROPERTY_HELPURL 58 // ::rtl::OUString -#define BASEPROPERTY_AUTOTOGGLE 59 // sal_Bool -//#define BASEPROPERTY_FOCUSSELECTIONHIDE 60 // sal_Bool -#define BASEPROPERTY_FORMATKEY 61 // sal_Bool -#define BASEPROPERTY_FORMATSSUPPLIER 62 // ::com::sun::star::util::XNumberFormatsSupplier -#define BASEPROPERTY_EFFECTIVE_VALUE 63 // Any (double or string) -#define BASEPROPERTY_TREATASNUMBER 64 // sal_Bool -#define BASEPROPERTY_EFFECTIVE_DEFAULT 65 // Any (double or string) -#define BASEPROPERTY_EFFECTIVE_MIN 66 // Double -#define BASEPROPERTY_EFFECTIVE_MAX 67 // Double -#define BASEPROPERTY_CURSYM_POSITION 68 // sal_Bool -#define BASEPROPERTY_TITLE 69 // ::rtl::OUString -#define BASEPROPERTY_MOVEABLE 70 // sal_Bool -#define BASEPROPERTY_CLOSEABLE 71 // sal_Bool -#define BASEPROPERTY_SIZEABLE 72 // sal_Bool -#define BASEPROPERTY_HELPTEXT 73 // ::rtl::OUString -#define BASEPROPERTY_PROGRESSVALUE 74 // sal_Int32 -#define BASEPROPERTY_PROGRESSVALUE_MIN 75 // sal_Int32 -#define BASEPROPERTY_PROGRESSVALUE_MAX 76 // sal_Int32 -#define BASEPROPERTY_SCROLLVALUE 77 // sal_Int32 -#define BASEPROPERTY_SCROLLVALUE_MAX 78 // sal_Int32 -#define BASEPROPERTY_LINEINCREMENT 79 // sal_Int32 -#define BASEPROPERTY_BLOCKINCREMENT 80 // sal_Int32 -#define BASEPROPERTY_VISIBLESIZE 81 // sal_Int32 -#define BASEPROPERTY_ORIENTATION 82 // sal_Int32 -#define BASEPROPERTY_FONTRELIEF 83 // sal_Int16 -#define BASEPROPERTY_FONTEMPHASISMARK 84 // sal_Int16 -#define BASEPROPERTY_TEXTLINECOLOR 85 // sal_Int32 -#define BASEPROPERTY_IMAGEALIGN 86 // sal_Int16 -#define BASEPROPERTY_SCALEIMAGE 87 // sal_Bool -#define BASEPROPERTY_PUSHBUTTONTYPE 88 // sal_Int16 -#define BASEPROPERTY_DISPLAYBACKGROUNDCOLOR 89 // sal_Int32 -#define BASEPROPERTY_AUTOMNEMONICS 90 // sal_Bool -#define BASEPROPERTY_MOUSETRANSPARENT 91 // sal_Bool +#define BASEPROPERTY_NOTFOUND 0 + +#define BASEPROPERTY_TEXT 1 // ::rtl::OUString +#define BASEPROPERTY_BACKGROUNDCOLOR 2 // sal_Int32 +#define BASEPROPERTY_FILLCOLOR 3 // sal_Int32 +#define BASEPROPERTY_TEXTCOLOR 4 // sal_Int32 +#define BASEPROPERTY_LINECOLOR 5 // sal_Int32 +#define BASEPROPERTY_BORDER 6 // sal_Int16 +#define BASEPROPERTY_ALIGN 7 // sal_Int16 +#define BASEPROPERTY_FONTDESCRIPTOR 8 // ::com::sun::star::awt::FontDescriptor, war mal Font, aber nie gespeichert... +#define BASEPROPERTY_DROPDOWN 9 // sal_Bool +#define BASEPROPERTY_MULTILINE 10 // sal_Bool +#define BASEPROPERTY_STRINGITEMLIST 11 // UStringSequence +#define BASEPROPERTY_HSCROLL 12 // sal_Bool +#define BASEPROPERTY_VSCROLL 13 // sal_Bool +#define BASEPROPERTY_TABSTOP 14 // sal_Bool +#define BASEPROPERTY_STATE 15 // sal_Int16 +#define BASEPROPERTY_FONT_TYPE 16 // OLD: Font_Type +#define BASEPROPERTY_FONT_SIZE 17 // OLD: Font_Size +#define BASEPROPERTY_FONT_ATTRIBS 18 // OLD: Font_Attribs +#define BASEPROPERTY_DEFAULTCONTROL 19 // ::rtl::OUString (ServiceName) +#define BASEPROPERTY_LABEL 20 // ::rtl::OUString +#define BASEPROPERTY_LINECOUNT 21 // sal_Int16 +#define BASEPROPERTY_EXTDATEFORMAT 22 // sal_Int16 +#define BASEPROPERTY_DATESHOWCENTURY 23 // sal_Bool +#define BASEPROPERTY_EXTTIMEFORMAT 24 // sal_Int16 +#define BASEPROPERTY_NUMSHOWTHOUSANDSEP 25 // sal_Bool +#define BASEPROPERTY_CURRENCYSYMBOL 26 // ::rtl::OUString +#define BASEPROPERTY_SPIN 27 // sal_Bool +#define BASEPROPERTY_STRICTFORMAT 28 // sal_Bool +#define BASEPROPERTY_DECIMALACCURACY 29 // sal_Int16 +#define BASEPROPERTY_DATE 30 // sal_Int32 +#define BASEPROPERTY_DATEMIN 31 // sal_Int32 +#define BASEPROPERTY_DATEMAX 32 // sal_Int32 +#define BASEPROPERTY_TIME 33 // sal_Int32 +#define BASEPROPERTY_TIMEMIN 34 // sal_Int32 +#define BASEPROPERTY_TIMEMAX 35 // sal_Int32 +#define BASEPROPERTY_VALUE_INT32 36 // sal_Int32 +#define BASEPROPERTY_VALUEMIN_INT32 37 // sal_Int32 +#define BASEPROPERTY_VALUEMAX_INT32 38 // sal_Int32 +#define BASEPROPERTY_VALUESTEP_INT32 39 // sal_Int32 +#define BASEPROPERTY_EDITMASK 40 // ::rtl::OUString +#define BASEPROPERTY_LITERALMASK 41 // ::rtl::OUString +#define BASEPROPERTY_IMAGEURL 42 // ::rtl::OUString +#define BASEPROPERTY_READONLY 43 // sal_Bool +#define BASEPROPERTY_ENABLED 44 // sal_Bool +#define BASEPROPERTY_PRINTABLE 45 // sal_Bool +#define BASEPROPERTY_ECHOCHAR 46 // sal_Int16 +#define BASEPROPERTY_MAXTEXTLEN 47 // sal_Int16 +#define BASEPROPERTY_HARDLINEBREAKS 48 // sal_Int16 +#define BASEPROPERTY_AUTOCOMPLETE 49 // sal_Bool +#define BASEPROPERTY_MULTISELECTION 50 // sal_Bool +#define BASEPROPERTY_SELECTEDITEMS 51 // INT16Sequence +#define BASEPROPERTY_VALUE_DOUBLE 52 // DOUBLE +#define BASEPROPERTY_VALUEMIN_DOUBLE 53 // DOUBLE +#define BASEPROPERTY_VALUEMAX_DOUBLE 54 // DOUBLE +#define BASEPROPERTY_VALUESTEP_DOUBLE 55 // DOUBLE +#define BASEPROPERTY_TRISTATE 56 // sal_Bool +#define BASEPROPERTY_DEFAULTBUTTON 57 // sal_Bool +#define BASEPROPERTY_HELPURL 58 // ::rtl::OUString +#define BASEPROPERTY_AUTOTOGGLE 59 // sal_Bool +//#define BASEPROPERTY_FOCUSSELECTIONHIDE 60 // sal_Bool +#define BASEPROPERTY_FORMATKEY 61 // sal_Bool +#define BASEPROPERTY_FORMATSSUPPLIER 62 // ::com::sun::star::util::XNumberFormatsSupplier +#define BASEPROPERTY_EFFECTIVE_VALUE 63 // Any (double or string) +#define BASEPROPERTY_TREATASNUMBER 64 // sal_Bool +#define BASEPROPERTY_EFFECTIVE_DEFAULT 65 // Any (double or string) +#define BASEPROPERTY_EFFECTIVE_MIN 66 // Double +#define BASEPROPERTY_EFFECTIVE_MAX 67 // Double +#define BASEPROPERTY_CURSYM_POSITION 68 // sal_Bool +#define BASEPROPERTY_TITLE 69 // ::rtl::OUString +#define BASEPROPERTY_MOVEABLE 70 // sal_Bool +#define BASEPROPERTY_CLOSEABLE 71 // sal_Bool +#define BASEPROPERTY_SIZEABLE 72 // sal_Bool +#define BASEPROPERTY_HELPTEXT 73 // ::rtl::OUString +#define BASEPROPERTY_PROGRESSVALUE 74 // sal_Int32 +#define BASEPROPERTY_PROGRESSVALUE_MIN 75 // sal_Int32 +#define BASEPROPERTY_PROGRESSVALUE_MAX 76 // sal_Int32 +#define BASEPROPERTY_SCROLLVALUE 77 // sal_Int32 +#define BASEPROPERTY_SCROLLVALUE_MAX 78 // sal_Int32 +#define BASEPROPERTY_LINEINCREMENT 79 // sal_Int32 +#define BASEPROPERTY_BLOCKINCREMENT 80 // sal_Int32 +#define BASEPROPERTY_VISIBLESIZE 81 // sal_Int32 +#define BASEPROPERTY_ORIENTATION 82 // sal_Int32 +#define BASEPROPERTY_FONTRELIEF 83 // sal_Int16 +#define BASEPROPERTY_FONTEMPHASISMARK 84 // sal_Int16 +#define BASEPROPERTY_TEXTLINECOLOR 85 // sal_Int32 +#define BASEPROPERTY_IMAGEALIGN 86 // sal_Int16 +#define BASEPROPERTY_SCALEIMAGE 87 // sal_Bool +#define BASEPROPERTY_PUSHBUTTONTYPE 88 // sal_Int16 +#define BASEPROPERTY_DISPLAYBACKGROUNDCOLOR 89 // sal_Int32 +#define BASEPROPERTY_AUTOMNEMONICS 90 // sal_Bool +#define BASEPROPERTY_MOUSETRANSPARENT 91 // sal_Bool #define BASEPROPERTY_ACCESSIBLENAME 92 // ::rtl::OUString -#define BASEPROPERTY_PLUGINPARENT 93 // sal_Int64 -#define BASEPROPERTY_SCROLLVALUE_MIN 94 // sal_Int32 +#define BASEPROPERTY_PLUGINPARENT 93 // sal_Int64 +#define BASEPROPERTY_SCROLLVALUE_MIN 94 // sal_Int32 #define BASEPROPERTY_REPEAT_DELAY 95 // sal_Int32 #define BASEPROPERTY_SYMBOL_COLOR 96 // sal_Int32 #define BASEPROPERTY_SPINVALUE 97 // sal_Int32 @@ -168,20 +168,20 @@ namespace rtl { #define BASEPROPERTY_STEP_TIME 118 // sal_Int32 #define BASEPROPERTY_DECORATION 119 // sal_Bool #define BASEPROPERTY_PAINTTRANSPARENT 120 // sal_Bool -#define BASEPROPERTY_AUTOHSCROLL 121 // sal_Bool +#define BASEPROPERTY_AUTOHSCROLL 121 // sal_Bool #define BASEPROPERTY_AUTOVSCROLL 122 // sal_Bool #define BASEPROPERTY_DESKTOP_AS_PARENT 123 // sal_Bool -#define BASEPROPERTY_TREE_START 124 -#define BASEPROPERTY_TREE_SELECTIONTYPE 124 -#define BASEPROPERTY_TREE_EDITABLE 125 -#define BASEPROPERTY_TREE_DATAMODEL 126 -#define BASEPROPERTY_TREE_ROOTDISPLAYED 127 -#define BASEPROPERTY_TREE_SHOWSHANDLES 128 -#define BASEPROPERTY_TREE_SHOWSROOTHANDLES 129 -#define BASEPROPERTY_TREE_ROWHEIGHT 130 -#define BASEPROPERTY_TREE_INVOKESSTOPNODEEDITING 131 -#define BASEPROPERTY_TREE_END 131 -#define BASEPROPERTY_DIALOGSOURCEURL 132 +#define BASEPROPERTY_TREE_START 124 +#define BASEPROPERTY_TREE_SELECTIONTYPE 124 +#define BASEPROPERTY_TREE_EDITABLE 125 +#define BASEPROPERTY_TREE_DATAMODEL 126 +#define BASEPROPERTY_TREE_ROOTDISPLAYED 127 +#define BASEPROPERTY_TREE_SHOWSHANDLES 128 +#define BASEPROPERTY_TREE_SHOWSROOTHANDLES 129 +#define BASEPROPERTY_TREE_ROWHEIGHT 130 +#define BASEPROPERTY_TREE_INVOKESSTOPNODEEDITING 131 +#define BASEPROPERTY_TREE_END 131 +#define BASEPROPERTY_DIALOGSOURCEURL 132 #define BASEPROPERTY_NOLABEL 133 // ::rtl::OUString added for issue79712 #define BASEPROPERTY_URL 134 // ::rtl::OUString #define BASEPROPERTY_UNIT 135 // ::awt::FieldUnit @@ -200,48 +200,48 @@ namespace rtl { #define BASEPROPERTY_HIGHCONTRASTMODE 147 #define BASEPROPERTY_GRID_EVEN_ROW_BACKGROUND 148 #define BASEPROPERTY_GRID_HEADER_BACKGROUND 149 -#define BASEPROPERTY_GRID_LINE_COLOR 150 -#define BASEPROPERTY_GRID_ROW_BACKGROUND 151 +#define BASEPROPERTY_GRID_LINE_COLOR 150 +#define BASEPROPERTY_GRID_ROW_BACKGROUND 151 #define BASEPROPERTY_MULTISELECTION_SIMPLEMODE 152 #define BASEPROPERTY_ITEM_SEPARATOR_POS 153 #define BASEPROPERTY_GROUPNAME 154 // ::rtl::OUString // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen. -#define BASEPROPERTY_FONTDESCRIPTORPART_START 1000 -#define BASEPROPERTY_FONTDESCRIPTORPART_NAME 1000 // ::rtl::OUString, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME 1001 // ::rtl::OUString, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_FAMILY 1002 // sal_Int16, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_CHARSET 1003 // sal_Int16, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT 1004 // sal_Int16, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT 1005 // Float, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_SLANT 1006 // sal_Int16, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE 1007 // sal_Int16, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT 1008 // sal_Int16, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_WIDTH 1009 // sal_Int16, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_PITCH 1010 // sal_Int16, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH 1011 // Float, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION 1012 // Float, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_KERNING 1013 // sal_Bool, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE 1014 // sal_Bool, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_TYPE 1015 // sal_Int16, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_END 1015 - -#define PROPERTY_ALIGN_LEFT 0 -#define PROPERTY_ALIGN_CENTER 1 -#define PROPERTY_ALIGN_RIGHT 2 - -#define PROPERTY_STATE_OFF 0 -#define PROPERTY_STATE_ON 1 -#define PROPERTY_STATE_DONTCARE 2 - -TOOLKIT_DLLPUBLIC sal_uInt16 GetPropertyId( const ::rtl::OUString& rPropertyName ); -const ::com::sun::star::uno::Type* GetPropertyType( sal_uInt16 nPropertyId ); -TOOLKIT_DLLPUBLIC const ::rtl::OUString& GetPropertyName( sal_uInt16 nPropertyId ); -sal_Int16 GetPropertyAttribs( sal_uInt16 nPropertyId ); -sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId ); -sal_Bool DoesDependOnOthers( sal_uInt16 nPropertyId ); -sal_Bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ); +#define BASEPROPERTY_FONTDESCRIPTORPART_START 1000 +#define BASEPROPERTY_FONTDESCRIPTORPART_NAME 1000 // ::rtl::OUString, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME 1001 // ::rtl::OUString, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_FAMILY 1002 // sal_Int16, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_CHARSET 1003 // sal_Int16, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT 1004 // sal_Int16, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT 1005 // Float, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_SLANT 1006 // sal_Int16, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE 1007 // sal_Int16, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT 1008 // sal_Int16, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_WIDTH 1009 // sal_Int16, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_PITCH 1010 // sal_Int16, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH 1011 // Float, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION 1012 // Float, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_KERNING 1013 // sal_Bool, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE 1014 // sal_Bool, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_TYPE 1015 // sal_Int16, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_END 1015 + +#define PROPERTY_ALIGN_LEFT 0 +#define PROPERTY_ALIGN_CENTER 1 +#define PROPERTY_ALIGN_RIGHT 2 + +#define PROPERTY_STATE_OFF 0 +#define PROPERTY_STATE_ON 1 +#define PROPERTY_STATE_DONTCARE 2 + +TOOLKIT_DLLPUBLIC sal_uInt16 GetPropertyId( const ::rtl::OUString& rPropertyName ); +const ::com::sun::star::uno::Type* GetPropertyType( sal_uInt16 nPropertyId ); +TOOLKIT_DLLPUBLIC const ::rtl::OUString& GetPropertyName( sal_uInt16 nPropertyId ); +sal_Int16 GetPropertyAttribs( sal_uInt16 nPropertyId ); +sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId ); +sal_Bool DoesDependOnOthers( sal_uInt16 nPropertyId ); +sal_Bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ); diff --git a/toolkit/inc/toolkit/helper/servicenames.hxx b/toolkit/inc/toolkit/helper/servicenames.hxx index 9b13eb07c21d..4067cd0998af 100644 --- a/toolkit/inc/toolkit/helper/servicenames.hxx +++ b/toolkit/inc/toolkit/helper/servicenames.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/inc/toolkit/helper/throbberimpl.hxx b/toolkit/inc/toolkit/helper/throbberimpl.hxx index eab9eb76aa53..42f104c51bbc 100644 --- a/toolkit/inc/toolkit/helper/throbberimpl.hxx +++ b/toolkit/inc/toolkit/helper/throbberimpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace toolkit class Throbber_Impl { private: - osl::SolarMutex& mrMutex; // Reference to SolarMutex + osl::SolarMutex& mrMutex; // Reference to SolarMutex ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > maImageList; ::com::sun::star::uno::Reference< VCLXWindow > mxParent; @@ -56,7 +56,7 @@ namespace toolkit DECL_LINK( TimeOutHdl, Throbber_Impl* ); - osl::SolarMutex& GetMutex() { return mrMutex; } + osl::SolarMutex& GetMutex() { return mrMutex; } public: Throbber_Impl( ::com::sun::star::uno::Reference< VCLXWindow > xParent, diff --git a/toolkit/inc/toolkit/helper/tkresmgr.hxx b/toolkit/inc/toolkit/helper/tkresmgr.hxx index 9d04fab909b4..90e21c94736b 100644 --- a/toolkit/inc/toolkit/helper/tkresmgr.hxx +++ b/toolkit/inc/toolkit/helper/tkresmgr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ private: TkResMgr() { } ~TkResMgr() { } - // we'll instantiate one static member of the following class, + // we'll instantiate one static member of the following class, // which in it's dtor ensures that m_pSimpleResMgr will be deleted class EnsureDelete { diff --git a/toolkit/inc/toolkit/helper/unomemorystream.hxx b/toolkit/inc/toolkit/helper/unomemorystream.hxx index 7cfeae03d8b1..1e0438186fab 100644 --- a/toolkit/inc/toolkit/helper/unomemorystream.hxx +++ b/toolkit/inc/toolkit/helper/unomemorystream.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,35 +36,35 @@ #include <tools/stream.hxx> -// ---------------------------------------------------- -// class UNOMEMORYSTREAM -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UNOMEMORYSTREAM +// ---------------------------------------------------- -class UnoMemoryStream : public SvMemoryStream, +class UnoMemoryStream : public SvMemoryStream, public ::com::sun::star::io::XInputStream, public ::cppu::OWeakObject { private: - ::osl::Mutex maMutex; + ::osl::Mutex maMutex; protected: - ::osl::Mutex& GetMutex() { return maMutex; } + ::osl::Mutex& GetMutex() { return maMutex; } -public: +public: UnoMemoryStream( sal_uInt32 nInitSize = 0x3FFF, sal_uInt32 nResize = 0x3FFFF ); - + // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::io::XInputStream - sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + sal_Int32 SAL_CALL available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); }; diff --git a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx index c109528beed9..c690743a93c8 100644 --- a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx +++ b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,21 +37,21 @@ #include <list> #include "toolkit/dllapi.h" -// ---------------------------------------------------- -// class UnoPropertyArrayHelper -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoPropertyArrayHelper +// ---------------------------------------------------- class TOOLKIT_DLLPUBLIC UnoPropertyArrayHelper : public ::cppu::IPropertyArrayHelper { -private: - Table maIDs; +private: + Table maIDs; protected: - sal_Bool ImplHasProperty( sal_uInt16 nPropId ) const; + sal_Bool ImplHasProperty( sal_uInt16 nPropId ) const; public: UnoPropertyArrayHelper( const ::com::sun::star::uno::Sequence<sal_Int32>& rIDs ); UnoPropertyArrayHelper( const std::list< sal_uInt16 > &rIDs ); - + // ::cppu::IPropertyArrayHelper sal_Bool SAL_CALL fillPropertyMembersByHandle( ::rtl::OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(); diff --git a/toolkit/inc/toolkit/helper/unowrapper.hxx b/toolkit/inc/toolkit/helper/unowrapper.hxx index 75bb4b6dcab9..fc796650442b 100644 --- a/toolkit/inc/toolkit/helper/unowrapper.hxx +++ b/toolkit/inc/toolkit/helper/unowrapper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,9 +38,9 @@ #include <vcl/unowrap.hxx> #include <vcl/window.hxx> -// ---------------------------------------------------- -// class UnoWrapper -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoWrapper +// ---------------------------------------------------- class UnoWrapper : public UnoWrapperBase { @@ -48,39 +48,39 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> mxToolkit; ::toolkit::AccessibilityClient maAccessibleFactoryAccess; -public: +public: UnoWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>& rxToolkit ); - + virtual void Destroy(); - + // Toolkit virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> GetVCLToolkit(); // Graphics - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics> CreateGraphics( OutputDevice* pOutDev ); - virtual void ReleaseAllGraphics( OutputDevice* pOutDev ); - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics> CreateGraphics( OutputDevice* pOutDev ); + virtual void ReleaseAllGraphics( OutputDevice* pOutDev ); + // Window virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, sal_Bool bCreate ); - virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ); + virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ); - void WindowDestroyed( Window* pWindow ); - void WindowEvent_Move( Window* pWindow ); - void WindowEvent_Resize( Window* pWindow ); - void WindowEvent_Show( Window* pWindow, BOOL bShow ); - void WindowEvent_Close( Window* pWindow ); - void WindowEvent_Minimize( Window* pWindow ); - void WindowEvent_Normalize( Window* pWindow ); - void WindowEvent_Activate( Window* pWindow, BOOL bActivated ); - void WindowEvent_MouseButtonUp( Window* pWindow, const MouseEvent& rEvt ); - void WindowEvent_MouseButtonDown( Window* pWindow, const MouseEvent& rEvt ); - void WindowEvent_MouseMove( Window* pWindow, const MouseEvent& rEvt ); - void WindowEvent_Command( Window* pWindow, const CommandEvent& rCEvt ); - void WindowEvent_KeyInput( Window* pWindow, const KeyEvent& rEvt ); - void WindowEvent_KeyUp( Window* pWindow, const KeyEvent& rEvt ); - void WindowEvent_GetFocus( Window* pWindow ); - void WindowEvent_LoseFocus( Window* pWindow ); - void WindowEvent_Paint( Window* pWindow, const Rectangle& rRect ); + void WindowDestroyed( Window* pWindow ); + void WindowEvent_Move( Window* pWindow ); + void WindowEvent_Resize( Window* pWindow ); + void WindowEvent_Show( Window* pWindow, BOOL bShow ); + void WindowEvent_Close( Window* pWindow ); + void WindowEvent_Minimize( Window* pWindow ); + void WindowEvent_Normalize( Window* pWindow ); + void WindowEvent_Activate( Window* pWindow, BOOL bActivated ); + void WindowEvent_MouseButtonUp( Window* pWindow, const MouseEvent& rEvt ); + void WindowEvent_MouseButtonDown( Window* pWindow, const MouseEvent& rEvt ); + void WindowEvent_MouseMove( Window* pWindow, const MouseEvent& rEvt ); + void WindowEvent_Command( Window* pWindow, const CommandEvent& rCEvt ); + void WindowEvent_KeyInput( Window* pWindow, const KeyEvent& rEvt ); + void WindowEvent_KeyUp( Window* pWindow, const KeyEvent& rEvt ); + void WindowEvent_GetFocus( Window* pWindow ); + void WindowEvent_LoseFocus( Window* pWindow ); + void WindowEvent_Paint( Window* pWindow, const Rectangle& rRect ); // Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/toolkit/inc/toolkit/helper/vclunohelper.hxx b/toolkit/inc/toolkit/helper/vclunohelper.hxx index fafff3fc07dc..ca3a4c7780d6 100644 --- a/toolkit/inc/toolkit/helper/vclunohelper.hxx +++ b/toolkit/inc/toolkit/helper/vclunohelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,57 +74,57 @@ class OutputDevice; class MouseEvent; class KeyEvent; -// ---------------------------------------------------- -// class VclUnoHelper -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VclUnoHelper +// ---------------------------------------------------- class TOOLKIT_DLLPUBLIC VCLUnoHelper { public: // Toolkit - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> CreateToolkit(); + static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> CreateToolkit(); // Bitmap - static BitmapEx GetBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>& rxBitmap ); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap> CreateBitmap( const BitmapEx& rBitmap ); + static BitmapEx GetBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>& rxBitmap ); + static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap> CreateBitmap( const BitmapEx& rBitmap ); // Window - static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ); - static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 ); - static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer ); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> GetInterface( Window* pWindow ); + static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ); + static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 ); + static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer ); + static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> GetInterface( Window* pWindow ); // OutputDevice - static OutputDevice* GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>& rxDevice ); - static OutputDevice* GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics>& rxGraphics ); + static OutputDevice* GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>& rxDevice ); + static OutputDevice* GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics>& rxGraphics ); // Region - static Region GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ); + static Region GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ); // Pointer static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer> CreatePointer(); // Polygon - static Polygon CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ); + static Polygon CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ); // Font - static ::com::sun::star::awt::FontDescriptor CreateFontDescriptor( const Font& rFont ); - static Font CreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr, const Font& rInitFont ); - static Font CreateFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ); - static ::com::sun::star::awt::SimpleFontMetric CreateFontMetric( const FontMetric& rFontMetric ); - static float ConvertFontWidth( FontWidth eWidth ); - static FontWidth ConvertFontWidth( float f ); - static float ConvertFontWeight( FontWeight eWeight ); - static FontWeight ConvertFontWeight( float f ); - + static ::com::sun::star::awt::FontDescriptor CreateFontDescriptor( const Font& rFont ); + static Font CreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr, const Font& rInitFont ); + static Font CreateFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ); + static ::com::sun::star::awt::SimpleFontMetric CreateFontMetric( const FontMetric& rFontMetric ); + static float ConvertFontWidth( FontWidth eWidth ); + static FontWidth ConvertFontWidth( float f ); + static float ConvertFontWeight( FontWeight eWeight ); + static FontWeight ConvertFontWeight( float f ); + // Rectangle - static sal_Bool IsZero( ::com::sun::star::awt::Rectangle rRect ); + static sal_Bool IsZero( ::com::sun::star::awt::Rectangle rRect ); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> CreateControlContainer( Window* pWindow ); + static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> CreateControlContainer( Window* pWindow ); // MapUnits - static MapUnit UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit ); - static sal_Int32 VCL2UnoEmbedMapUnit( MapUnit nVCLMapUnit ); + static MapUnit UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit ); + static sal_Int32 VCL2UnoEmbedMapUnit( MapUnit nVCLMapUnit ); //======================================================================== //= MeasurementUnitConversion @@ -161,6 +161,6 @@ public: }; -#endif // _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ +#endif // _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/qa/complex/toolkit/CallbackClass.java b/toolkit/qa/complex/toolkit/CallbackClass.java index efc0ef91f7c0..8e1a005bc47f 100644 --- a/toolkit/qa/complex/toolkit/CallbackClass.java +++ b/toolkit/qa/complex/toolkit/CallbackClass.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ public class CallbackClass implements XCallback{ public CallbackClass(LogWriter log, XMultiServiceFactory xMSF ) { - + this.xMSF = xMSF; this.log = log; } @@ -58,7 +58,7 @@ public class CallbackClass implements XCallback{ /** * Callback method which will be called by the asynchronous - * service where we have added our request before. + * service where we have added our request before. */ public void notify( Object aData ) { diff --git a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java index fee95f2e6de0..6ad18a4aa04f 100755 --- a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java +++ b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java index 36394732ce78..e877a9023dd8 100755 --- a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java +++ b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/qa/complex/toolkit/CheckAsyncCallback.java b/toolkit/qa/complex/toolkit/CheckAsyncCallback.java index cc184f3c1a73..ad26344630a4 100644 --- a/toolkit/qa/complex/toolkit/CheckAsyncCallback.java +++ b/toolkit/qa/complex/toolkit/CheckAsyncCallback.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,14 +88,14 @@ public class CheckAsyncCallback extends ComplexTestCase { try { xMSF = (XMultiServiceFactory)param.getMSF(); SOfficeFactory xSOF = SOfficeFactory.getFactory(xMSF); - + XRequestCallback xAsyncCallback = null; - - XInterface xIfc = (XInterface)xMSF.createInstance( + + XInterface xIfc = (XInterface)xMSF.createInstance( "com.sun.star.awt.AsyncCallback" ); xAsyncCallback = (XRequestCallback) UnoRuntime.queryInterface(XRequestCallback.class,xIfc); - + testObject=xAsyncCallback; } catch(com.sun.star.uno.Exception e) { @@ -114,7 +114,7 @@ public class CheckAsyncCallback extends ComplexTestCase { new _XRequestCallback(testObject, log, xMSF ); assure("failed: XRequestCallback::addCallback", _xRequestCallback._addCallback()); } - + public void checkCallback() { getTestObject(); log.println("*** Now testing asynchronous callback service ***"); diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java index e3d80629be40..fc66e0b47d21 100755 --- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java +++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java index 230eb3d098d3..294812061bc5 100755 --- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java +++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java index 18a20d02e233..e2998772dae0 100755 --- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java +++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java index e022e60d90c0..b6766bea066d 100755 --- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java +++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java index d6357e8f24bc..8ae001fc35ad 100755 --- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java +++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java b/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java index 472412e80aa6..3d04c2030081 100644 --- a/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java +++ b/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ public class _XRequestCallback { res = false; } log.println("addCallback called" ); - + return res; } diff --git a/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java b/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java index 654f5ec69da5..9e1500bc3dde 100644 --- a/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java +++ b/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,10 @@ import util.DesktopTools; * These are converter methods to get the size of a well known awt component * in a com.sun.star.util.MeasureUnit you want. * You don't need to know the factors to calculate by hand. - * + * * @author ll93751 */ -public class XUnitConversionTest extends ComplexTestCase +public class XUnitConversionTest extends ComplexTestCase { public String[] getTestMethodNames() { @@ -87,7 +87,7 @@ public class XUnitConversionTest extends ComplexTestCase log.println("Caught IllegalArgumentException in convertSizeToLogic with '" + _sEinheit + "' " + e.getMessage()); } } - + /** * The real test function * 1. try to get the XMultiServiceFactory of an already running office. Therefore make sure an (open|star)office is running with @@ -96,10 +96,10 @@ public class XUnitConversionTest extends ComplexTestCase * 3. try to convert the WindowPeer to an XWindow * 4. try to resize and move the window to an other position, so we get a well knowing position and size. * 5. run some more tests - * + * * If no test fails, the test is well done and returns with 'PASSED, OK' - * - */ public void testXUnitConversion() + * + */ public void testXUnitConversion() { XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF(); assure("failed: There is no office.", xMSF != null); @@ -218,5 +218,5 @@ public class XUnitConversionTest extends ComplexTestCase // close the window. // IMHO a little bit stupid, but the XWindow doesn't support a XCloseable interface xWindow.dispose(); - } + } } diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index e912e83bd12e..d629f9cd6e66 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,13 +80,13 @@ private: { CallbackData( const css::uno::Reference< css::awt::XCallback >& rCallback, const css::uno::Any& rAny ) : xCallback( rCallback ), aData( rAny ) {} - + css::uno::Reference< css::awt::XCallback > xCallback; css::uno::Any aData; }; - + DECL_STATIC_LINK( AsyncCallback, Notify_Impl, CallbackData* ); - + AsyncCallback(AsyncCallback &); // not defined void operator =(AsyncCallback &); // not defined @@ -145,7 +145,7 @@ IMPL_STATIC_LINK_NOINSTANCE( AsyncCallback, Notify_Impl, CallbackData*, pCallbac catch ( css::uno::Exception& ) { } - + delete pCallbackData; return 0; } diff --git a/toolkit/source/awt/forward.hxx b/toolkit/source/awt/forward.hxx index ab39b40ba7c9..839e948fef70 100644 --- a/toolkit/source/awt/forward.hxx +++ b/toolkit/source/awt/forward.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index fd77de8ba8c9..6aaf8f8955cf 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,9 +59,9 @@ using namespace ::comphelper; DBG_NAME(VCLXAccessibleComponent) -// ---------------------------------------------------- -// class VCLXAccessibleComponent -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXAccessibleComponent +// ---------------------------------------------------- VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXindow ) : AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() ) , OAccessibleImplementationAccess( ) @@ -293,9 +293,9 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind { // avoid notification if a child frame is already active // only one frame may be active at a given time - if ( !pAccWindow->HasActiveChildFrame() && - ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || - getAccessibleRole() == accessibility::AccessibleRole::ALERT || + if ( !pAccWindow->HasActiveChildFrame() && + ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || + getAccessibleRole() == accessibility::AccessibleRole::ALERT || getAccessibleRole() == accessibility::AccessibleRole::DIALOG ) ) // #i18891# { aNewValue <<= accessibility::AccessibleStateType::ACTIVE; @@ -305,8 +305,8 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind break; case VCLEVENT_WINDOW_DEACTIVATE: { - if ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || - getAccessibleRole() == accessibility::AccessibleRole::ALERT || + if ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || + getAccessibleRole() == accessibility::AccessibleRole::ALERT || getAccessibleRole() == accessibility::AccessibleRole::DIALOG ) // #i18891# { aOldValue <<= accessibility::AccessibleStateType::ACTIVE; @@ -486,13 +486,13 @@ void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHel } if ( pWindow->HasChildPathFocus() && - ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || - getAccessibleRole() == accessibility::AccessibleRole::ALERT || + ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || + getAccessibleRole() == accessibility::AccessibleRole::ALERT || getAccessibleRole() == accessibility::AccessibleRole::DIALOG ) ) // #i18891# rStateSet.AddState( accessibility::AccessibleStateType::ACTIVE ); // #104290# MT: This way, a ComboBox doesn't get state FOCUSED. - // I also don't understand + // I also don't understand // a) why WINDOW_FIRSTCHILD is used here (which btw is a border window in the case of a combo box) // b) why HasFocus() is nout "enough" for a compound control /* @@ -589,7 +589,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getVclPare return xAcc; } -uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleParent( ) throw (uno::RuntimeException) +uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleParent( ) throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); @@ -601,7 +601,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi return xAcc; } -sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( ) throw (uno::RuntimeException) +sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( ) throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); @@ -609,7 +609,7 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( ) throw (uno::Ru uno::Reference< accessibility::XAccessible > xAcc( implGetForeignControlledParent() ); if ( xAcc.is() ) - { // we _do_ have a foreign-controlled parent -> use the base class' implementation, + { // we _do_ have a foreign-controlled parent -> use the base class' implementation, // which goes the UNO way nIndex = AccessibleExtendedComponentHelper_BASE::getAccessibleIndexInParent( ); } @@ -631,7 +631,7 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( ) throw (uno::Ru } } */ - // Iterate over all the parent's children and search for this object. + // Iterate over all the parent's children and search for this object. // this should be compatible with the code in SVX uno::Reference< accessibility::XAccessible > xParentAcc( pParent->GetAccessible() ); if ( xParentAcc.is() ) @@ -673,7 +673,7 @@ sal_Int16 VCLXAccessibleComponent::getAccessibleRole( ) throw (uno::RuntimeExce return nRole; } -::rtl::OUString VCLXAccessibleComponent::getAccessibleDescription( ) throw (uno::RuntimeException) +::rtl::OUString VCLXAccessibleComponent::getAccessibleDescription( ) throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); @@ -702,7 +702,7 @@ sal_Int16 VCLXAccessibleComponent::getAccessibleRole( ) throw (uno::RuntimeExce return aName; } -uno::Reference< accessibility::XAccessibleRelationSet > VCLXAccessibleComponent::getAccessibleRelationSet( ) throw (uno::RuntimeException) +uno::Reference< accessibility::XAccessibleRelationSet > VCLXAccessibleComponent::getAccessibleRelationSet( ) throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); @@ -738,8 +738,8 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi { uno::Reference< accessibility::XAccessible > xAcc = getAccessibleChild( i ); if ( xAcc.is() ) - { - uno::Reference< accessibility::XAccessibleComponent > xComp( xAcc->getAccessibleContext(), uno::UNO_QUERY ); + { + uno::Reference< accessibility::XAccessibleComponent > xComp( xAcc->getAccessibleContext(), uno::UNO_QUERY ); if ( xComp.is() ) { Rectangle aRect = VCLRectangle( xComp->getBounds() ); @@ -778,7 +778,7 @@ awt::Rectangle VCLXAccessibleComponent::implGetBounds() throw (uno::RuntimeExcep uno::Reference< accessibility::XAccessible > xParent( implGetForeignControlledParent() ); if ( xParent.is() ) - { // hmm, we can't rely on our VCL coordinates, as in the Accessibility Hierarchy, somebody gave + { // hmm, we can't rely on our VCL coordinates, as in the Accessibility Hierarchy, somebody gave // us a parent which is different from our VCL parent // (actually, we did not check if it's really different ...) @@ -833,7 +833,7 @@ void VCLXAccessibleComponent::grabFocus( ) throw (uno::RuntimeException) mxWindow->setFocus(); } -sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground( ) throw (uno::RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground( ) throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); @@ -857,7 +857,7 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground( ) throw (uno::Runtim return nColor; } -sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground( ) throw (uno::RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground( ) throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); @@ -901,7 +901,7 @@ uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont( ) throw return xFont; } -::rtl::OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText( ) throw (uno::RuntimeException) +::rtl::OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText( ) throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index 7b5dc0a53442..d3dd104aa6e7 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,9 +37,9 @@ #include <rtl/memory.h> #include <rtl/uuid.h> -// ---------------------------------------------------- -// class VCLXBitmap -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXBitmap +// ---------------------------------------------------- // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any VCLXBitmap::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) diff --git a/toolkit/source/awt/vclxbutton.cxx b/toolkit/source/awt/vclxbutton.cxx index d201a2344fa3..9d660fc25e47 100644 --- a/toolkit/source/awt/vclxbutton.cxx +++ b/toolkit/source/awt/vclxbutton.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxbutton.hxx b/toolkit/source/awt/vclxbutton.hxx index 34ac8fe0b84b..facdd0f44ad1 100644 --- a/toolkit/source/awt/vclxbutton.hxx +++ b/toolkit/source/awt/vclxbutton.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index f0988c6d1eac..a21234ec819b 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,9 +40,9 @@ #include <vcl/window.hxx> #include <tools/debug.hxx> -// ---------------------------------------------------- -// class VCLXContainer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXContainer +// ---------------------------------------------------- void VCLXContainer::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -199,7 +199,7 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun: { if ( pPrevRadio ) { - bNewPrevWin = ( pPrevWin == pPrevRadio ); // Radio-Button wurde vor das PreWin sortiert.... + bNewPrevWin = ( pPrevWin == pPrevRadio ); // Radio-Button wurde vor das PreWin sortiert.... pSortBehind = pPrevRadio; } pPrevRadio = pWin; diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index c7d3910b4262..4faed3be9036 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -50,9 +50,9 @@ #include <vcl/bitmapex.hxx> #include <vcl/font.hxx> -// ---------------------------------------------------- -// class VCLXDevice -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXDevice +// ---------------------------------------------------- VCLXDevice::VCLXDevice() : mrMutex( Application::GetSolarMutex() ) { mpOutputDevice = NULL; diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx index 19e08029213a..89d7a6aa5cac 100644 --- a/toolkit/source/awt/vclxdialog.cxx +++ b/toolkit/source/awt/vclxdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx index 978519319d3a..a01abdfac004 100644 --- a/toolkit/source/awt/vclxdialog.hxx +++ b/toolkit/source/awt/vclxdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxfixedline.cxx b/toolkit/source/awt/vclxfixedline.cxx index cecef12fa992..ad0f04434d83 100644 --- a/toolkit/source/awt/vclxfixedline.cxx +++ b/toolkit/source/awt/vclxfixedline.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxfixedline.hxx b/toolkit/source/awt/vclxfixedline.hxx index 8bd26f5ecc0b..740390b062b3 100644 --- a/toolkit/source/awt/vclxfixedline.hxx +++ b/toolkit/source/awt/vclxfixedline.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index 66461db68e77..6489b971a425 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,9 +40,9 @@ #include <vcl/outdev.hxx> -// ---------------------------------------------------- -// class VCLXFont -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXFont +// ---------------------------------------------------- VCLXFont::VCLXFont() { mpFontMetric = NULL; @@ -113,7 +113,7 @@ IMPL_XTYPEPROVIDER_END ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); ::com::sun::star::awt::SimpleFontMetric aFM; - if ( ImplAssertValidFontMetric() ) + if ( ImplAssertValidFontMetric() ) aFM = VCLUnoHelper::CreateFontMetric( *mpFontMetric ); return aFM; } @@ -128,7 +128,7 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::R { Font aOldFont = pOutDev->GetFont(); pOutDev->SetFont( maFont ); - + nRet = sal::static_int_cast< sal_Int16 >( pOutDev->GetTextWidth( String(c) )); @@ -147,7 +147,7 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::R { Font aOldFont = pOutDev->GetFont(); pOutDev->SetFont( maFont ); - + sal_Int16 nCount = nLast-nFirst + 1; aSeq = ::com::sun::star::uno::Sequence<sal_Int16>( nCount ); for ( USHORT n = 0; n < nCount; n++ ) diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index ac3add9d5ddc..4f7e3a033feb 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -43,9 +43,9 @@ #include <tools/debug.hxx> -// ---------------------------------------------------- -// class VCLXGraphics -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXGraphics +// ---------------------------------------------------- // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any VCLXGraphics::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) @@ -89,15 +89,15 @@ void VCLXGraphics::SetOutputDevice( OutputDevice* pOutDev ) void VCLXGraphics::Init( OutputDevice* pOutDev ) { DBG_ASSERT( !mpOutputDevice, "VCLXGraphics::Init allready has pOutDev !" ); - mpOutputDevice = pOutDev; + mpOutputDevice = pOutDev; - maFont = mpOutputDevice->GetFont(); - maTextColor = COL_BLACK; + maFont = mpOutputDevice->GetFont(); + maTextColor = COL_BLACK; maTextFillColor = COL_TRANSPARENT; - maLineColor = COL_BLACK; - maFillColor = COL_WHITE; - meRasterOp = ROP_OVERPAINT; - mpClipRegion = NULL; + maLineColor = COL_BLACK; + maFillColor = COL_WHITE; + meRasterOp = ROP_OVERPAINT; + mpClipRegion = NULL; // Register at OutputDevice List* pLst = mpOutputDevice->GetUnoGraphicsList(); diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 6e1e036fe8e7..5e267d127be5 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,9 +77,9 @@ #endif -// ---------------------------------------------------- -// class VCLXMenu -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXMenu +// ---------------------------------------------------- DBG_NAME(VCLXMenu) @@ -1082,9 +1082,9 @@ throw ( ::com::sun::star::container::NoSuchElementException, } -// ---------------------------------------------------- -// class VCLXMenuBar -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXMenuBar +// ---------------------------------------------------- DBG_NAME(VCLXMenuBar); @@ -1099,9 +1099,9 @@ VCLXMenuBar::VCLXMenuBar( MenuBar* pMenuBar ) : VCLXMenu( (Menu *)pMenuBar ) DBG_CTOR( VCLXMenuBar, 0 ); } -// ---------------------------------------------------- -// class VCLXPopupMenu -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXPopupMenu +// ---------------------------------------------------- DBG_NAME(VCLXPopupMenu); diff --git a/toolkit/source/awt/vclxplugin.cxx b/toolkit/source/awt/vclxplugin.cxx index 2e8e4c12cbcf..c48d1de581cd 100644 --- a/toolkit/source/awt/vclxplugin.cxx +++ b/toolkit/source/awt/vclxplugin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,11 +56,11 @@ void SAL_CALL VCLXPlugin::dispose() throw(uno::RuntimeException) { { ::osl::SolarGuard aGuard( GetMutex() ); - + lang::EventObject aDisposeEvent; aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); } - + VCLXWindow::dispose(); } diff --git a/toolkit/source/awt/vclxplugin.hxx b/toolkit/source/awt/vclxplugin.hxx index 340fa453441f..0b173f9f2f14 100644 --- a/toolkit/source/awt/vclxplugin.hxx +++ b/toolkit/source/awt/vclxplugin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx index 6f0d0a8af449..7ab0d6d25f5a 100644 --- a/toolkit/source/awt/vclxpointer.cxx +++ b/toolkit/source/awt/vclxpointer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,9 +34,9 @@ #include <toolkit/helper/macros.hxx> #include <cppuhelper/typeprovider.hxx> -// ---------------------------------------------------- -// class VCLXPointer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXPointer +// ---------------------------------------------------- VCLXPointer::VCLXPointer() { } diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 093e02fc0efd..d0ddf420df68 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,10 +47,10 @@ #include <toolkit/awt/vclxdevice.hxx> -#define BINARYSETUPMARKER 0x23864691 +#define BINARYSETUPMARKER 0x23864691 -#define PROPERTY_Orientation 0 -#define PROPERTY_Horizontal 1 +#define PROPERTY_Orientation 0 +#define PROPERTY_Horizontal 1 ::com::sun::star::beans::Property* ImplGetProperties( sal_uInt16& rElementCount ) { @@ -74,9 +74,9 @@ return pProperties; } -// ---------------------------------------------------- -// class VCLXPrinterPropertySet -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXPrinterPropertySet +// ---------------------------------------------------- // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any VCLXPrinterPropertySet::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) @@ -241,7 +241,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com:: ::osl::MutexGuard aGuard( Mutex ); sal_uInt16 nPaperBinCount = GetPrinter()->GetPaperBinCount(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aDescriptions( nPaperBinCount ); + ::com::sun::star::uno::Sequence< ::rtl::OUString > aDescriptions( nPaperBinCount ); for ( sal_uInt16 n = 0; n < nPaperBinCount; n++ ) { // Format: <DisplayFormName;FormNameId;DisplayPaperBinName;PaperBinNameId;DisplayPaperName;PaperNameId> @@ -293,9 +293,9 @@ void VCLXPrinterPropertySet::setBinarySetup( const ::com::sun::star::uno::Sequen } -// ---------------------------------------------------- -// class VCLXPrinter -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXPrinter +// ---------------------------------------------------- VCLXPrinter::VCLXPrinter( const String& rPrinterName ) : VCLXPrinterPropertySet( rPrinterName ) { @@ -377,9 +377,9 @@ void VCLXPrinter::endPage( ) throw(::com::sun::star::awt::PrinterException, ::c } -// ---------------------------------------------------- -// class VCLXInfoPrinter -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXInfoPrinter +// ---------------------------------------------------- VCLXInfoPrinter::VCLXInfoPrinter( const String& rPrinterName ) : VCLXPrinterPropertySet( rPrinterName ) @@ -416,9 +416,9 @@ IMPL_XTYPEPROVIDER_END return GetDevice(); } -// ---------------------------------------------------- -// class VCLXPrinterServer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXPrinterServer +// ---------------------------------------------------- // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any VCLXPrinterServer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) @@ -439,10 +439,10 @@ IMPL_XTYPEPROVIDER_END const std::vector<rtl::OUString>& rQueues = Printer::GetPrinterQueues(); sal_uInt32 nPrinters = rQueues.size(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames( nPrinters ); - for ( sal_uInt32 n = 0; n < nPrinters; n++ ) + ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames( nPrinters ); + for ( sal_uInt32 n = 0; n < nPrinters; n++ ) aNames.getArray()[n] = rQueues[n]; - + return aNames; } diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index 99a1924cecd1..2fa015a9950a 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ #include <rtl/uuid.h> #include <vcl/svapp.hxx> -// ---------------------------------------------------- -// class VCLXRegion -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXRegion +// ---------------------------------------------------- VCLXRegion::VCLXRegion() { } diff --git a/toolkit/source/awt/vclxscroller.cxx b/toolkit/source/awt/vclxscroller.cxx index 27424ef83d03..1655116ea5e2 100644 --- a/toolkit/source/awt/vclxscroller.cxx +++ b/toolkit/source/awt/vclxscroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxscroller.hxx b/toolkit/source/awt/vclxscroller.hxx index 7252cd68563a..763b52f5abb2 100644 --- a/toolkit/source/awt/vclxscroller.hxx +++ b/toolkit/source/awt/vclxscroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx index 1ee7d455d809..9c8129420541 100644 --- a/toolkit/source/awt/vclxspinbutton.cxx +++ b/toolkit/source/awt/vclxspinbutton.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,14 +109,14 @@ namespace toolkit if ( listener.is() ) maAdjustmentListeners.addInterface( listener ); } - + //-------------------------------------------------------------------- void SAL_CALL VCLXSpinButton::removeAdjustmentListener( const Reference< XAdjustmentListener >& listener ) throw (RuntimeException) { if ( listener.is() ) maAdjustmentListeners.removeInterface( listener ); } - + namespace { typedef void (SpinButton::*SetSpinButtonValue) (long); @@ -151,7 +151,7 @@ namespace toolkit { lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetValue, n ); } - + //-------------------------------------------------------------------- void SAL_CALL VCLXSpinButton::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException) { @@ -161,49 +161,49 @@ namespace toolkit setMaximum( maxValue ); setValue( currentValue ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXSpinButton::getValue( ) throw (RuntimeException) { return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetValue ); } - + //-------------------------------------------------------------------- void SAL_CALL VCLXSpinButton::setMinimum( sal_Int32 minValue ) throw (RuntimeException) { lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetRangeMin, minValue ); } - + //-------------------------------------------------------------------- void SAL_CALL VCLXSpinButton::setMaximum( sal_Int32 maxValue ) throw (RuntimeException) { lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetRangeMax, maxValue ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXSpinButton::getMinimum( ) throw (RuntimeException) { return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetRangeMin ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXSpinButton::getMaximum( ) throw (RuntimeException) { return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetRangeMax ); } - + //-------------------------------------------------------------------- void SAL_CALL VCLXSpinButton::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException) { lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetValueStep, spinIncrement ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXSpinButton::getSpinIncrement( ) throw (RuntimeException) { return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetValueStep ); } - + //-------------------------------------------------------------------- void SAL_CALL VCLXSpinButton::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException) { @@ -211,7 +211,7 @@ namespace toolkit lcl_modifyStyle( GetWindow(), WB_HSCROLL, orientation == ScrollBarOrientation::HORIZONTAL ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXSpinButton::getOrientation( ) throw (RuntimeException) { @@ -219,7 +219,7 @@ namespace toolkit ? ScrollBarOrientation::HORIZONTAL : ScrollBarOrientation::VERTICAL; } - + //-------------------------------------------------------------------- void VCLXSpinButton::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) { @@ -301,7 +301,7 @@ namespace toolkit } } } - + //-------------------------------------------------------------------- Any SAL_CALL VCLXSpinButton::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException) { diff --git a/toolkit/source/awt/vclxsplitter.cxx b/toolkit/source/awt/vclxsplitter.cxx index 1ffbb9373647..bbd2dac59487 100644 --- a/toolkit/source/awt/vclxsplitter.cxx +++ b/toolkit/source/awt/vclxsplitter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxsplitter.hxx b/toolkit/source/awt/vclxsplitter.hxx index 2880e70993ef..ca4cb094e2ea 100644 --- a/toolkit/source/awt/vclxsplitter.hxx +++ b/toolkit/source/awt/vclxsplitter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index fb28d89b9cbc..a7155fd70204 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,9 +53,9 @@ #include <vcl/syschild.hxx> #include <vcl/sysdata.hxx> -// ---------------------------------------------------- -// class VCLXSystemDependentWindow -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXSystemDependentWindow +// ---------------------------------------------------- VCLXSystemDependentWindow::VCLXSystemDependentWindow() { } diff --git a/toolkit/source/awt/vclxtabcontrol.cxx b/toolkit/source/awt/vclxtabcontrol.cxx index fb2e361c337c..ab5c617f7919 100644 --- a/toolkit/source/awt/vclxtabcontrol.cxx +++ b/toolkit/source/awt/vclxtabcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxtabcontrol.hxx b/toolkit/source/awt/vclxtabcontrol.hxx index dfe1b0975346..c4b9002a39e3 100644 --- a/toolkit/source/awt/vclxtabcontrol.hxx +++ b/toolkit/source/awt/vclxtabcontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/vclxtabpage.hxx b/toolkit/source/awt/vclxtabpage.hxx index 81560e07da76..955a5982fe78 100644 --- a/toolkit/source/awt/vclxtabpage.hxx +++ b/toolkit/source/awt/vclxtabpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ public: // XInterface DECLARE_XINTERFACE() - + // XTypeProvider DECLARE_XTYPEPROVIDER() diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 3a80494bb979..0c9246babe53 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -119,8 +119,8 @@ namespace css = ::com::sun::star; -#define VCLWINDOW_FRAMEWINDOW 0x1000 -#define VCLWINDOW_SYSTEMCHILDWINDOW 0x1001 +#define VCLWINDOW_FRAMEWINDOW 0x1000 +#define VCLWINDOW_SYSTEMCHILDWINDOW 0x1001 #if (defined WNT) #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32 @@ -256,77 +256,77 @@ TOOLKIT_DLLPUBLIC WinBits ImplGetWinBits( sal_uInt32 nComponentAttribs, sal_uInt struct ComponentInfo { - const char* pName; - WindowType nWinType; + const char* pName; + WindowType nWinType; }; static ComponentInfo __FAR_DATA aComponentInfos [] = { - { "buttondialog", WINDOW_BUTTONDIALOG }, - { "cancelbutton", WINDOW_CANCELBUTTON }, - { "checkbox", WINDOW_CHECKBOX }, - { "combobox", WINDOW_COMBOBOX }, - { "control", WINDOW_CONTROL }, - { "currencybox", WINDOW_CURRENCYBOX }, - { "currencyfield", WINDOW_CURRENCYFIELD }, - { "datebox", WINDOW_DATEBOX }, - { "datefield", WINDOW_DATEFIELD }, - { "dialog", WINDOW_DIALOG }, - { "dockingarea", WINDOW_DOCKINGAREA }, - { "dockingwindow", WINDOW_DOCKINGWINDOW }, - { "edit", WINDOW_EDIT }, - { "errorbox", WINDOW_ERRORBOX }, - { "fixedbitmap", WINDOW_FIXEDBITMAP }, - { "fixedimage", WINDOW_FIXEDIMAGE }, - { "fixedline", WINDOW_FIXEDLINE }, - { "fixedtext", WINDOW_FIXEDTEXT }, - { "floatingwindow", WINDOW_FLOATINGWINDOW }, - { "framewindow", VCLWINDOW_FRAMEWINDOW }, - { "groupbox", WINDOW_GROUPBOX }, - { "helpbutton", WINDOW_HELPBUTTON }, - { "imagebutton", WINDOW_IMAGEBUTTON }, - { "imageradiobutton", WINDOW_IMAGERADIOBUTTON }, - { "infobox", WINDOW_INFOBOX }, - { "listbox", WINDOW_LISTBOX }, - { "longcurrencybox", WINDOW_LONGCURRENCYBOX }, - { "longcurrencyfield", WINDOW_LONGCURRENCYFIELD }, - { "menubutton", WINDOW_MENUBUTTON }, - { "messbox", WINDOW_MESSBOX }, - { "metricbox", WINDOW_METRICBOX }, - { "metricfield", WINDOW_METRICFIELD }, - { "modaldialog", WINDOW_MODALDIALOG }, - { "modelessdialog", WINDOW_MODELESSDIALOG }, - { "morebutton", WINDOW_MOREBUTTON }, - { "multilineedit", WINDOW_MULTILINEEDIT }, - { "multilistbox", WINDOW_MULTILISTBOX }, - { "numericbox", WINDOW_NUMERICBOX }, - { "numericfield", WINDOW_NUMERICFIELD }, - { "okbutton", WINDOW_OKBUTTON }, - { "patternbox", WINDOW_PATTERNBOX }, - { "patternfield", WINDOW_PATTERNFIELD }, - { "pushbutton", WINDOW_PUSHBUTTON }, - { "querybox", WINDOW_QUERYBOX }, - { "radiobutton", WINDOW_RADIOBUTTON }, - { "scrollbar", WINDOW_SCROLLBAR }, - { "scrollbarbox", WINDOW_SCROLLBARBOX }, - { "simpleanimation", WINDOW_CONTROL }, - { "spinbutton", WINDOW_SPINBUTTON }, - { "spinfield", WINDOW_SPINFIELD }, - { "throbber", WINDOW_CONTROL }, - { "splitter", WINDOW_SPLITTER }, - { "splitwindow", WINDOW_SPLITWINDOW }, - { "statusbar", WINDOW_STATUSBAR }, - { "systemchildwindow", VCLWINDOW_SYSTEMCHILDWINDOW }, - { "tabcontrol", WINDOW_TABCONTROL }, - { "tabdialog", WINDOW_TABDIALOG }, - { "tabpage", WINDOW_TABPAGE }, - { "timebox", WINDOW_TIMEBOX }, - { "timefield", WINDOW_TIMEFIELD }, - { "toolbox", WINDOW_TOOLBOX }, - { "tristatebox", WINDOW_TRISTATEBOX }, - { "warningbox", WINDOW_WARNINGBOX }, - { "window", WINDOW_WINDOW }, - { "workwindow", WINDOW_WORKWINDOW } + { "buttondialog", WINDOW_BUTTONDIALOG }, + { "cancelbutton", WINDOW_CANCELBUTTON }, + { "checkbox", WINDOW_CHECKBOX }, + { "combobox", WINDOW_COMBOBOX }, + { "control", WINDOW_CONTROL }, + { "currencybox", WINDOW_CURRENCYBOX }, + { "currencyfield", WINDOW_CURRENCYFIELD }, + { "datebox", WINDOW_DATEBOX }, + { "datefield", WINDOW_DATEFIELD }, + { "dialog", WINDOW_DIALOG }, + { "dockingarea", WINDOW_DOCKINGAREA }, + { "dockingwindow", WINDOW_DOCKINGWINDOW }, + { "edit", WINDOW_EDIT }, + { "errorbox", WINDOW_ERRORBOX }, + { "fixedbitmap", WINDOW_FIXEDBITMAP }, + { "fixedimage", WINDOW_FIXEDIMAGE }, + { "fixedline", WINDOW_FIXEDLINE }, + { "fixedtext", WINDOW_FIXEDTEXT }, + { "floatingwindow", WINDOW_FLOATINGWINDOW }, + { "framewindow", VCLWINDOW_FRAMEWINDOW }, + { "groupbox", WINDOW_GROUPBOX }, + { "helpbutton", WINDOW_HELPBUTTON }, + { "imagebutton", WINDOW_IMAGEBUTTON }, + { "imageradiobutton", WINDOW_IMAGERADIOBUTTON }, + { "infobox", WINDOW_INFOBOX }, + { "listbox", WINDOW_LISTBOX }, + { "longcurrencybox", WINDOW_LONGCURRENCYBOX }, + { "longcurrencyfield", WINDOW_LONGCURRENCYFIELD }, + { "menubutton", WINDOW_MENUBUTTON }, + { "messbox", WINDOW_MESSBOX }, + { "metricbox", WINDOW_METRICBOX }, + { "metricfield", WINDOW_METRICFIELD }, + { "modaldialog", WINDOW_MODALDIALOG }, + { "modelessdialog", WINDOW_MODELESSDIALOG }, + { "morebutton", WINDOW_MOREBUTTON }, + { "multilineedit", WINDOW_MULTILINEEDIT }, + { "multilistbox", WINDOW_MULTILISTBOX }, + { "numericbox", WINDOW_NUMERICBOX }, + { "numericfield", WINDOW_NUMERICFIELD }, + { "okbutton", WINDOW_OKBUTTON }, + { "patternbox", WINDOW_PATTERNBOX }, + { "patternfield", WINDOW_PATTERNFIELD }, + { "pushbutton", WINDOW_PUSHBUTTON }, + { "querybox", WINDOW_QUERYBOX }, + { "radiobutton", WINDOW_RADIOBUTTON }, + { "scrollbar", WINDOW_SCROLLBAR }, + { "scrollbarbox", WINDOW_SCROLLBARBOX }, + { "simpleanimation", WINDOW_CONTROL }, + { "spinbutton", WINDOW_SPINBUTTON }, + { "spinfield", WINDOW_SPINFIELD }, + { "throbber", WINDOW_CONTROL }, + { "splitter", WINDOW_SPLITTER }, + { "splitwindow", WINDOW_SPLITWINDOW }, + { "statusbar", WINDOW_STATUSBAR }, + { "systemchildwindow", VCLWINDOW_SYSTEMCHILDWINDOW }, + { "tabcontrol", WINDOW_TABCONTROL }, + { "tabdialog", WINDOW_TABDIALOG }, + { "tabpage", WINDOW_TABPAGE }, + { "timebox", WINDOW_TIMEBOX }, + { "timefield", WINDOW_TIMEFIELD }, + { "toolbox", WINDOW_TOOLBOX }, + { "tristatebox", WINDOW_TRISTATEBOX }, + { "warningbox", WINDOW_WARNINGBOX }, + { "window", WINDOW_WINDOW }, + { "workwindow", WINDOW_WORKWINDOW } }; extern "C" @@ -350,7 +350,7 @@ sal_uInt16 ImplGetComponentType( const String& rServiceName ) static sal_Bool bSorted = sal_False; if( !bSorted ) { - qsort( (void*) aComponentInfos, + qsort( (void*) aComponentInfos, sizeof( aComponentInfos ) / sizeof( ComponentInfo ), sizeof( ComponentInfo ), ComponentInfoCompare ); @@ -376,13 +376,13 @@ sal_uInt16 ImplGetComponentType( const String& rServiceName ) } -// ---------------------------------------------------- -// class VCLXToolkit -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXToolkit +// ---------------------------------------------------- -static sal_Int32 nVCLToolkitInstanceCount = 0; -static BOOL bInitedByVCLToolkit = sal_False; -//static cppu::OInterfaceContainerHelper * pToolkits = 0; +static sal_Int32 nVCLToolkitInstanceCount = 0; +static BOOL bInitedByVCLToolkit = sal_False; +//static cppu::OInterfaceContainerHelper * pToolkits = 0; static osl::Mutex & getInitMutex() { @@ -455,7 +455,7 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs ) if( pToolkits ) { cppu::OInterfaceIteratorHelper aIt( *pToolkits ); - ::com::sun::star::uno::XInterface * pI; + ::com::sun::star::uno::XInterface * pI; while( pI = aIt.next() ) ((::com::sun::star::lang::XComponent *)pI)->dispose(); @@ -614,7 +614,7 @@ void SAL_CALL VCLXToolkit::disposing() return xRef; } -Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, +Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor& rDescriptor, Window* pParent, WinBits nWinBits ) { @@ -941,9 +941,9 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, if( bUseParentData ) { SystemParentData aParentData; - aParentData.nSize = sizeof( aParentData ); + aParentData.nSize = sizeof( aParentData ); #if defined QUARTZ - aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle); + aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle); #elif defined UNX aParentData.aWindow = nWindowHandle; aParentData.bXEmbedSupport = bXEmbed; @@ -1154,9 +1154,9 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( if( bUseParentData ) { SystemParentData aParentData; - aParentData.nSize = sizeof( aParentData ); + aParentData.nSize = sizeof( aParentData ); #if defined QUARTZ - aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle); + aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle); #elif defined UNX aParentData.aWindow = nWindowHandle; aParentData.bXEmbedSupport = bXEmbed; @@ -1200,12 +1200,12 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( } // ::com::sun::star::awt::XMessageBoxFactory -::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL VCLXToolkit::createMessageBox( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent, - const ::com::sun::star::awt::Rectangle& aPosSize, - const ::rtl::OUString& aType, - ::sal_Int32 aButtons, - const ::rtl::OUString& aTitle, +::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL VCLXToolkit::createMessageBox( + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent, + const ::com::sun::star::awt::Rectangle& aPosSize, + const ::rtl::OUString& aType, + ::sal_Int32 aButtons, + const ::rtl::OUString& aTitle, const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException) { ::com::sun::star::awt::WindowDescriptor aDescriptor; @@ -1243,7 +1243,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( nAddWinBits |= WB_ABORT_RETRY_IGNORE; if ( sal_Int32( aButtons & 0xffff0000L ) == css::awt::MessageBoxButtons::DEFAULT_BUTTON_IGNORE ) nAddWinBits |= WB_DEF_IGNORE; - + aDescriptor.Type = css::awt::WindowClass_MODALTOP; aDescriptor.WindowServiceName = aType; aDescriptor.ParentIndex = -1; @@ -1491,17 +1491,17 @@ void SAL_CALL VCLXToolkit::removeFocusListener( } // virtual -void SAL_CALL VCLXToolkit::fireFocusGained( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > const &) +void SAL_CALL VCLXToolkit::fireFocusGained( + ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface > const &) throw (::com::sun::star::uno::RuntimeException) { } - -// virtual -void SAL_CALL VCLXToolkit::fireFocusLost( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > const &) + +// virtual +void SAL_CALL VCLXToolkit::fireFocusLost( + ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface > const &) throw (::com::sun::star::uno::RuntimeException) { } @@ -1601,11 +1601,11 @@ long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent, { ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > aHandlers(m_aKeyHandlers.getElements()); - + if (aHandlers.hasElements()) { ::Window * pWindow = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow(); - + // See implementation in vclxwindow.cxx for mapping between VCL and UNO AWT event ::KeyEvent * pKeyEvent = static_cast< ::KeyEvent * >( static_cast< ::VclWindowEvent const * >(pEvent)->GetData()); diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index 61e89fae8165..746163c9f6e3 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -252,9 +252,9 @@ void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display ) throw (Runt pWindow->SetScreenNumber( _display ); } -// ---------------------------------------------------- -// class VCLXTopWindow -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXTopWindow +// ---------------------------------------------------- void VCLXTopWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 8b6587627a67..d52ed9f09633 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -138,15 +138,15 @@ private: ::osl::Mutex maListenerContainerMutex; ::cppu::OInterfaceContainerHelper maWindow2Listeners; ::cppu::OInterfaceContainerHelper maDockableWindowListeners; - EventListenerMultiplexer maEventListeners; - FocusListenerMultiplexer maFocusListeners; - WindowListenerMultiplexer maWindowListeners; - KeyListenerMultiplexer maKeyListeners; - MouseListenerMultiplexer maMouseListeners; - MouseMotionListenerMultiplexer maMouseMotionListeners; - PaintListenerMultiplexer maPaintListeners; - VclContainerListenerMultiplexer maContainerListeners; - TopWindowListenerMultiplexer maTopWindowListeners; + EventListenerMultiplexer maEventListeners; + FocusListenerMultiplexer maFocusListeners; + WindowListenerMultiplexer maWindowListeners; + KeyListenerMultiplexer maKeyListeners; + MouseListenerMultiplexer maMouseListeners; + MouseMotionListenerMultiplexer maMouseMotionListeners; + PaintListenerMultiplexer maPaintListeners; + VclContainerListenerMultiplexer maContainerListeners; + TopWindowListenerMultiplexer maTopWindowListeners; CallbackArray maCallbackEvents; ULONG mnCallbackEventId; @@ -215,11 +215,11 @@ public: inline FocusListenerMultiplexer& getFocusListeners() { return maFocusListeners; } inline WindowListenerMultiplexer& getWindowListeners() { return maWindowListeners; } inline KeyListenerMultiplexer& getKeyListeners() { return maKeyListeners; } - inline MouseListenerMultiplexer& getMouseListeners() { return maMouseListeners; } + inline MouseListenerMultiplexer& getMouseListeners() { return maMouseListeners; } inline MouseMotionListenerMultiplexer& getMouseMotionListeners() { return maMouseMotionListeners; } - inline PaintListenerMultiplexer& getPaintListeners() { return maPaintListeners; } + inline PaintListenerMultiplexer& getPaintListeners() { return maPaintListeners; } inline VclContainerListenerMultiplexer& getContainerListeners() { return maContainerListeners; } - inline TopWindowListenerMultiplexer& getTopWindowListeners() { return maTopWindowListeners; } + inline TopWindowListenerMultiplexer& getTopWindowListeners() { return maTopWindowListeners; } virtual ~VCLXWindowImpl(); @@ -393,9 +393,9 @@ void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, Window* pW pWindow->GetBorder( rEvent.LeftInset, rEvent.TopInset, rEvent.RightInset, rEvent.BottomInset ); } -// ---------------------------------------------------- -// class VCLXWindow -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXWindow +// ---------------------------------------------------- DBG_NAME(VCLXWindow); @@ -449,7 +449,7 @@ void VCLXWindow::SetWindow( Window* pWindow ) sal_Bool bDirectVisible = pWindow ? pWindow->IsVisible() : false; mpImpl->setDirectVisible( bDirectVisible ); } - + } void VCLXWindow::suspendVclEventListening( ) @@ -639,11 +639,11 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) case VCLEVENT_CONTROL_GETFOCUS: case VCLEVENT_WINDOW_GETFOCUS: { - if ( ( rVclWindowEvent.GetWindow()->IsCompoundControl() - && rVclWindowEvent.GetId() == VCLEVENT_CONTROL_GETFOCUS + if ( ( rVclWindowEvent.GetWindow()->IsCompoundControl() + && rVclWindowEvent.GetId() == VCLEVENT_CONTROL_GETFOCUS ) - || ( !rVclWindowEvent.GetWindow()->IsCompoundControl() - && rVclWindowEvent.GetId() == VCLEVENT_WINDOW_GETFOCUS + || ( !rVclWindowEvent.GetWindow()->IsCompoundControl() + && rVclWindowEvent.GetId() == VCLEVENT_WINDOW_GETFOCUS ) ) { @@ -661,11 +661,11 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) case VCLEVENT_CONTROL_LOSEFOCUS: case VCLEVENT_WINDOW_LOSEFOCUS: { - if ( ( rVclWindowEvent.GetWindow()->IsCompoundControl() - && rVclWindowEvent.GetId() == VCLEVENT_CONTROL_LOSEFOCUS + if ( ( rVclWindowEvent.GetWindow()->IsCompoundControl() + && rVclWindowEvent.GetId() == VCLEVENT_CONTROL_LOSEFOCUS ) - || ( !rVclWindowEvent.GetWindow()->IsCompoundControl() - && rVclWindowEvent.GetId() == VCLEVENT_WINDOW_LOSEFOCUS + || ( !rVclWindowEvent.GetWindow()->IsCompoundControl() + && rVclWindowEvent.GetId() == VCLEVENT_WINDOW_LOSEFOCUS ) ) { @@ -744,7 +744,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // COMMAND_CONTEXTMENU als mousePressed mit PopupTrigger = sal_True versenden... Point aWhere = static_cast< CommandEvent* >( rVclWindowEvent.GetData() )->GetMousePosPixel(); if ( !pCmdEvt->IsMouseEvent() ) - { // for keyboard events, we set the coordinates to -1,-1. This is a slight HACK, but the current API + { // for keyboard events, we set the coordinates to -1,-1. This is a slight HACK, but the current API // handles a context menu command as special case of a mouse event, which is simply wrong. // Without extending the API, we would not have another chance to notify listeners of a // keyboard-triggered context menu request @@ -992,7 +992,7 @@ void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException) if ( GetWindow() ) { OutputDevice* pOutDev = GetOutputDevice(); - SetWindow( NULL ); // Damit ggf. Handler abgemeldet werden (virtuell). + SetWindow( NULL ); // Damit ggf. Handler abgemeldet werden (virtuell). SetOutputDevice( pOutDev ); DestroyOutputDevice(); } @@ -1398,7 +1398,7 @@ void VCLXWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds, bool bWithDe // some properties are not included in the FontDescriptor, but everytime // when we have a FontDescriptor we want to have these properties too. // => Easier to register the here, istead everywhere where I register the FontDescriptor... - + rIds.push_back( BASEPROPERTY_TEXTCOLOR ); rIds.push_back( BASEPROPERTY_TEXTLINECOLOR ); rIds.push_back( BASEPROPERTY_FONTRELIEF ); @@ -1578,7 +1578,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: if (aText.getLength()) pWindow->SetText( aText ); break; - + default: pWindow->SetText( aText ); break; @@ -1617,7 +1617,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: ::rtl::OUString aHelpText; if ( Value >>= aHelpText ) { - pWindow->SetQuickHelpText( aHelpText ); + pWindow->SetQuickHelpText( aHelpText ); } } break; @@ -1687,9 +1687,9 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: pWindow->SetPaintTransparent( TRUE ); break; } - + default: - { + { // default code which enables transparency for // compound controls. It's not real transparency // as most of these controls repaint their client @@ -1720,7 +1720,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: pWindow->SetPaintTransparent( FALSE ); default: ; } - pWindow->Invalidate(); // Falls das Control nicht drauf reagiert + pWindow->Invalidate(); // Falls das Control nicht drauf reagiert } } break; @@ -2330,7 +2330,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno: Window* pWindow = GetWindow(); if ( !pWindow ) return; - + if ( isDesignMode() || mpImpl->isEnableVisible() ) { TabPage* pTabPage = dynamic_cast< TabPage* >( pWindow ); @@ -2444,7 +2444,7 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject& uno::Reference< uno::XInterface > xSource( _rSource.Source, uno::UNO_QUERY ); if ( aAC.get() == xSource.get() ) - { // yep, it does + { // yep, it does mpImpl->mxAccessibleContext = uno::Reference< accessibility::XAccessibleContext >(); } } @@ -2455,7 +2455,7 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject& using namespace ::com::sun::star; ::osl::SolarGuard aGuard( GetMutex() ); - + // already disposed if( ! mpImpl ) return uno::Reference< accessibility::XAccessibleContext >(); diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index f97f11f9320d..00d728ad43e4 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) Window *pWindow = GetWindow(); if ( pWindow->GetType() != WINDOW_WORKWINDOW ) { - ::com::sun::star::uno::Exception *pException = + ::com::sun::star::uno::Exception *pException = new ::com::sun::star::uno::RuntimeException; pException->Message = ::rtl::OUString::createFromAscii( "not a work window" ); throw pException; @@ -92,7 +92,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) throw pException; } // create system parent data - SystemParentData aSysParentData; + SystemParentData aSysParentData; aSysParentData.nSize = sizeof ( SystemParentData ); #if defined( WIN ) || defined( WNT ) || defined ( OS2 ) aSysParentData.hWnd = (HWND) nHandle; diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index d3fd77d602b5..bbe45fb36a75 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -205,9 +205,9 @@ namespace toolkit } } -// ---------------------------------------------------- -// class VCLXGraphicControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXGraphicControl +// ---------------------------------------------------- void VCLXGraphicControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -335,8 +335,8 @@ void VCLXGraphicControl::setProperty( const ::rtl::OUString& PropertyName, const } //-------------------------------------------------------------------- -// class VCLXButton -// ---------------------------------------------------- +// class VCLXButton +// ---------------------------------------------------- void VCLXButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -620,9 +620,9 @@ void VCLXButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -// ---------------------------------------------------- -// class VCLXImageControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXImageControl +// ---------------------------------------------------- void VCLXImageControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -751,9 +751,9 @@ void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const : return aProp; } -// ---------------------------------------------------- -// class VCLXCheckBox -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXCheckBox +// ---------------------------------------------------- void VCLXCheckBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) @@ -1054,9 +1054,9 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -// ---------------------------------------------------- -// class VCLXRadioButton -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXRadioButton +// ---------------------------------------------------- void VCLXRadioButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, @@ -1345,9 +1345,9 @@ void VCLXRadioButton::ImplClickedOrToggled( BOOL bToggled ) return maActionListeners.getElements()[0]; } -// ---------------------------------------------------- -// class VCLXSpinField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXSpinField +// ---------------------------------------------------- void VCLXSpinField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, @@ -1480,9 +1480,9 @@ void VCLXSpinField::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } -// ---------------------------------------------------- -// class VCLXListBox -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXListBox +// ---------------------------------------------------- void VCLXListBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, @@ -2195,9 +2195,9 @@ void SAL_CALL VCLXListBox::disposing( const EventObject& i_rEvent ) throw (Runti VCLXWindow::disposing( i_rEvent ); } -// ---------------------------------------------------- -// class VCLXMessageBox -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXMessageBox +// ---------------------------------------------------- void VCLXMessageBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -2280,9 +2280,9 @@ sal_Int16 VCLXMessageBox::execute() throw(::com::sun::star::uno::RuntimeExceptio return ::com::sun::star::awt::Size( 250, 100 ); } -// ---------------------------------------------------- -// class VCLXDialog -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXDialog +// ---------------------------------------------------- void VCLXDialog::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { VCLXTopWindow::ImplGetPropertyIds( rIds ); @@ -2498,9 +2498,9 @@ throw(::com::sun::star::uno::RuntimeException) } } -// ---------------------------------------------------- -// class VCLXTabPage -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXTabPage +// ---------------------------------------------------- VCLXTabPage::VCLXTabPage() { } @@ -2594,9 +2594,9 @@ throw(::com::sun::star::uno::RuntimeException) } } -// ---------------------------------------------------- +// ---------------------------------------------------- // class VCLXFixedHyperlink -// ---------------------------------------------------- +// ---------------------------------------------------- VCLXFixedHyperlink::VCLXFixedHyperlink() : maActionListeners( *this ) @@ -3029,9 +3029,9 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio return VCLUnoHelper::ConvertToAWTSize( aAdjustedSize ); } -// ---------------------------------------------------- -// class VCLXScrollBar -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXScrollBar +// ---------------------------------------------------- void VCLXScrollBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, @@ -3507,9 +3507,9 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } -// ---------------------------------------------------- -// class VCLXEdit -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXEdit +// ---------------------------------------------------- void VCLXEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -3885,9 +3885,9 @@ void VCLXEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -// ---------------------------------------------------- -// class VCLXComboBox -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXComboBox +// ---------------------------------------------------- void VCLXComboBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -4205,7 +4205,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { ::com::sun::star::awt::ActionEvent aEvent; aEvent.Source = (::cppu::OWeakObject*)this; -// aEvent.ActionCommand = ...; +// aEvent.ActionCommand = ...; maActionListeners.actionPerformed( aEvent ); } break; @@ -4377,9 +4377,9 @@ void SAL_CALL VCLXComboBox::disposing( const EventObject& i_rEvent ) throw (Runt VCLXEdit::disposing( i_rEvent ); } -// ---------------------------------------------------- -// class VCLXFormattedSpinField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXFormattedSpinField +// ---------------------------------------------------- void VCLXFormattedSpinField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { // Interestingly in the UnoControl API this is @@ -4482,9 +4482,9 @@ void VCLXFormattedSpinField::setProperty( const ::rtl::OUString& PropertyName, c } -// ---------------------------------------------------- -// class VCLXDateField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXDateField +// ---------------------------------------------------- void VCLXDateField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -4826,9 +4826,9 @@ sal_Bool VCLXDateField::isStrictFormat() throw(::com::sun::star::uno::RuntimeExc } -// ---------------------------------------------------- -// class VCLXTimeField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXTimeField +// ---------------------------------------------------- void VCLXTimeField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -5129,9 +5129,9 @@ void VCLXTimeField::setProperty( const ::rtl::OUString& PropertyName, const ::co return aProp; } -// ---------------------------------------------------- -// class VCLXNumericField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXNumericField +// ---------------------------------------------------- void VCLXNumericField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -5722,9 +5722,9 @@ void VCLXMetricField::setProperty( const ::rtl::OUString& PropertyName, const :: } -// ---------------------------------------------------- -// class VCLXCurrencyField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXCurrencyField +// ---------------------------------------------------- void VCLXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -6078,9 +6078,9 @@ void VCLXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const return aProp; } -// ---------------------------------------------------- -// class VCLXPatternField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXPatternField +// ---------------------------------------------------- void VCLXPatternField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { @@ -6141,7 +6141,7 @@ void VCLXPatternField::setMasks( const ::rtl::OUString& EditMask, const ::rtl::O PatternField* pPatternField = (PatternField*) GetWindow(); if ( pPatternField ) { - pPatternField->SetMask( ByteString( UniString( EditMask ), RTL_TEXTENCODING_ASCII_US ), LiteralMask ); + pPatternField->SetMask( ByteString( UniString( EditMask ), RTL_TEXTENCODING_ASCII_US ), LiteralMask ); } } @@ -6252,9 +6252,9 @@ void VCLXPatternField::setProperty( const ::rtl::OUString& PropertyName, const : return aProp; } -// ---------------------------------------------------- -// class VCLXToolBox -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXToolBox +// ---------------------------------------------------- VCLXToolBox::VCLXToolBox() { } diff --git a/toolkit/source/awt/xsimpleanimation.cxx b/toolkit/source/awt/xsimpleanimation.cxx index 925fe57b3436..ad56e1717f2d 100644 --- a/toolkit/source/awt/xsimpleanimation.cxx +++ b/toolkit/source/awt/xsimpleanimation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ namespace toolkit { mpThrobber->start(); } - + //-------------------------------------------------------------------- void SAL_CALL XSimpleAnimation::stop() throw ( uno::RuntimeException ) { @@ -116,7 +116,7 @@ namespace toolkit mnStepTime = nStepTime; mpThrobber->setStepTime( mnStepTime ); } - + break; } case BASEPROPERTY_REPEAT: { @@ -133,7 +133,7 @@ namespace toolkit } } } - + //-------------------------------------------------------------------- uno::Any SAL_CALL XSimpleAnimation::getProperty( const ::rtl::OUString& PropertyName ) throw( uno::RuntimeException ) diff --git a/toolkit/source/awt/xthrobber.cxx b/toolkit/source/awt/xthrobber.cxx index 01527839d75f..112fad327f43 100644 --- a/toolkit/source/awt/xthrobber.cxx +++ b/toolkit/source/awt/xthrobber.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace toolkit { mpThrobber->start(); } - + //-------------------------------------------------------------------- void SAL_CALL XThrobber::stop() throw ( uno::RuntimeException ) { @@ -115,7 +115,7 @@ namespace toolkit VCLXWindow::setProperty( PropertyName, Value ); } } - + //-------------------------------------------------------------------- uno::Any SAL_CALL XThrobber::getProperty( const ::rtl::OUString& PropertyName ) throw( uno::RuntimeException ) @@ -150,7 +150,7 @@ namespace toolkit mpThrobber->setImageList( aImageList ); } - + //........................................................................ } // namespace toolkit //........................................................................ diff --git a/toolkit/source/awt/xthrobber.hrc b/toolkit/source/awt/xthrobber.hrc index 32c068ff8a85..5fa6bdede24b 100644 --- a/toolkit/source/awt/xthrobber.hrc +++ b/toolkit/source/awt/xthrobber.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/awt/xthrobber.src b/toolkit/source/awt/xthrobber.src index 199b25015056..cf3522cfb707 100644 --- a/toolkit/source/awt/xthrobber.src +++ b/toolkit/source/awt/xthrobber.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 4cd86d028205..ce48809c1a74 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ namespace toolkit m_xControlModel = m_xControlModel.query( xControl->getModel() ); OSL_ENSURE( m_xControlModel.is(), "OAccessibleControlContext::Init: invalid creator (no control, or control without model!" ); if ( !m_xControlModel.is() ) - throw DisposedException(); // caught by the caller (the create method) + throw DisposedException(); // caught by the caller (the create method) // start listening at the model startModelListening(); @@ -190,7 +190,7 @@ namespace toolkit pStateSet = new ::utl::AccessibleStateSetHelper( implGetForeignControlledStates() ); } else - { // only the DEFUNC state if we're already disposed + { // only the DEFUNC state if we're already disposed pStateSet = new ::utl::AccessibleStateSetHelper; pStateSet->AddState( AccessibleStateType::DEFUNC ); } @@ -215,7 +215,7 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName ) + ::rtl::OUString OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName ) { ::rtl::OUString sReturn; try @@ -235,7 +235,7 @@ namespace toolkit } //-------------------------------------------------------------------- - Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const + Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const { Reference< awt::XControl > xControl( getAccessibleCreator(), UNO_QUERY ); Reference< awt::XWindow > xWindow; @@ -376,7 +376,7 @@ namespace toolkit } //........................................................................ -} //namespace toolkit +} //namespace toolkit //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index b80222108594..b99a377109ad 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -171,7 +171,7 @@ public: struct CloneControlModel : public ::std::unary_function< UnoControlDialogModel::UnoControlModelHolder, void > { private: - UnoControlDialogModel::UnoControlModelHolderList& m_rTargetList; + UnoControlDialogModel::UnoControlModelHolderList& m_rTargetList; public: CloneControlModel( UnoControlDialogModel::UnoControlModelHolderList& _rTargetList ) @@ -206,19 +206,19 @@ public: // ---------------------------------------------------------------------------- static void lcl_throwIllegalArgumentException( ) -{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... +{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw IllegalArgumentException(); } // ---------------------------------------------------------------------------- static void lcl_throwNoSuchElementException( ) -{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... +{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw NoSuchElementException(); } // ---------------------------------------------------------------------------- static void lcl_throwElementExistException( ) -{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... +{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw ElementExistException(); } @@ -236,20 +236,20 @@ static const ::rtl::OUString& getStepPropertyName( ) return s_sStepProperty; } -// ---------------------------------------------------- -// class UnoControlDialogModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlDialogModel +// ---------------------------------------------------- UnoControlDialogModel::UnoControlDialogModel() :maContainerListeners( *this ) ,maChangeListeners ( GetMutex() ) ,mbGroupsUpToDate( sal_False ), mbAdjustingGraphic( false ) { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); -// ImplRegisterProperty( BASEPROPERTY_BORDER ); +// ImplRegisterProperty( BASEPROPERTY_BORDER ); ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL ); ImplRegisterProperty( BASEPROPERTY_ENABLED ); ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR ); -// ImplRegisterProperty( BASEPROPERTY_PRINTABLE ); +// ImplRegisterProperty( BASEPROPERTY_PRINTABLE ); ImplRegisterProperty( BASEPROPERTY_HELPTEXT ); ImplRegisterProperty( BASEPROPERTY_HELPURL ); ImplRegisterProperty( BASEPROPERTY_TITLE ); @@ -387,9 +387,9 @@ void SAL_CALL UnoControlDialogModel::dispose( ) throw(RuntimeException) ::std::vector< Reference< XControlModel > > aChildModels( maModels.size() ); ::std::transform( - maModels.begin(), maModels.end(), // source range - aChildModels.begin(), // target location - ::std::select1st< UnoControlModelHolder >( ) // operation to apply -> select the XControlModel part + maModels.begin(), maModels.end(), // source range + aChildModels.begin(), // target location + ::std::select1st< UnoControlModelHolder >( ) // operation to apply -> select the XControlModel part ); // now dispose @@ -622,9 +622,9 @@ Sequence< ::rtl::OUString > UnoControlDialogModel::getElementNames() throw(Runti Sequence< ::rtl::OUString > aNames( maModels.size() ); ::std::transform( - maModels.begin(), maModels.end(), // source range - aNames.getArray(), // target range - ::std::select2nd< UnoControlModelHolder >() // operator to apply: select the second element (the name) + maModels.begin(), maModels.end(), // source range + aNames.getArray(), // target range + ::std::select2nd< UnoControlModelHolder >() // operator to apply: select the second element (the name) ); return aNames; @@ -791,7 +791,7 @@ Sequence< Reference< XControlModel > > SAL_CALL UnoControlDialogModel::getContro // has it? if ( xPSI.is() && xPSI->hasPropertyByName( getTabIndexPropertyName() ) ) - { // yes + { // yes sal_Int32 nTabIndex = -1; xControlProps->getPropertyValue( getTabIndexPropertyName() ) >>= nTabIndex; @@ -913,8 +913,8 @@ void UnoControlDialogModel::implNotifyTabModelChange( const ::rtl::OUString& _rA // the changes event ChangesEvent aEvent; aEvent.Source = *this; - aEvent.Base <<= aEvent.Source; // the "base of the changes root" is also ourself - aEvent.Changes.realloc( 1 ); // exactly one change + aEvent.Base <<= aEvent.Source; // the "base of the changes root" is also ourself + aEvent.Changes.realloc( 1 ); // exactly one change aEvent.Changes[ 0 ].Accessor <<= _rAccessor; @@ -1007,10 +1007,10 @@ void UnoControlDialogModel::implUpdateGroupStructure() // in extreme we have as much groups as controls maGroups.reserve( aControlModels.getLength() ); - GroupingMachineState eState = eLookingForGroup; // the current state of our machine - Reference< XServiceInfo > xModelSI; // for checking for a radion button + GroupingMachineState eState = eLookingForGroup; // the current state of our machine + Reference< XServiceInfo > xModelSI; // for checking for a radion button ModelGroup* aCurrentGroup = NULL; // the group which we're currently building - sal_Bool bIsRadioButton; // is it a radio button? + sal_Bool bIsRadioButton; // is it a radio button? const ::rtl::OUString GROUP_NAME( RTL_CONSTASCII_USTRINGPARAM( "GroupName" ) ); @@ -1054,7 +1054,7 @@ void UnoControlDialogModel::implUpdateGroupStructure() case eExpandingGroup: { if ( !bIsRadioButton ) - { // no radio button -> the group is done + { // no radio button -> the group is done aCurrentGroup = NULL; eState = eLookingForGroup; #if OSL_DEBUG_LEVEL > 1 @@ -1493,7 +1493,7 @@ void UnoDialogControl::ImplSetPosSize( Reference< XControl >& rxCtrl ) } sal_Int16 nH = aFM.Ascent + aFM.Descent; - sal_Int16 nW = nH/2; // calculate avarage width?! + sal_Int16 nW = nH/2; // calculate avarage width?! nX *= nW; nX /= 4; @@ -1561,9 +1561,9 @@ sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) // destroy the old tab controller, if existent if ( mxTabController.is() ) { - mxTabController->setModel( NULL ); // just to be sure, should not be necessary + mxTabController->setModel( NULL ); // just to be sure, should not be necessary removeTabController( mxTabController ); - ::comphelper::disposeComponent( mxTabController ); // just to be sure, should not be necessary + ::comphelper::disposeComponent( mxTabController ); // just to be sure, should not be necessary mxTabController.clear(); } @@ -1995,7 +1995,7 @@ void UnoDialogControl::ImplUpdateResourceResolver() && ( xStringResourceResolver == xCurrStringResourceResolver ) ) { - Reference< XMultiPropertySet > xMultiPropSet( xPropertySet, UNO_QUERY ); + Reference< XMultiPropertySet > xMultiPropSet( xPropertySet, UNO_QUERY ); Reference< XPropertiesChangeListener > xListener( xPropertySet, UNO_QUERY ); xMultiPropSet->firePropertiesChangeEvent( aPropNames, xListener ); } @@ -2012,7 +2012,7 @@ void UnoDialogControl::ImplUpdateResourceResolver() Reference< XPropertySet > xPropertySet( getModel(), UNO_QUERY ); if ( xPropertySet.is() ) { - Reference< XMultiPropertySet > xMultiPropSet( xPropertySet, UNO_QUERY ); + Reference< XMultiPropertySet > xMultiPropSet( xPropertySet, UNO_QUERY ); Reference< XPropertiesChangeListener > xListener( xPropertySet, UNO_QUERY ); xMultiPropSet->firePropertiesChangeEvent( lcl_getLanguageDependentProperties(), xListener ); } @@ -2132,9 +2132,9 @@ throw (RuntimeException) ImplUpdateResourceResolver(); } -// ---------------------------------------------------- -// Helper Method to convert relative url to physical location -// ---------------------------------------------------- +// ---------------------------------------------------- +// Helper Method to convert relative url to physical location +// ---------------------------------------------------- ::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ) { diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index ef860a33b7ac..653f14958cbb 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ using namespace std; namespace toolkit { - + // Methods XElementAccess Type NameContainer_Impl::getElementType() throw(RuntimeException) @@ -61,7 +61,7 @@ Type NameContainer_Impl::getElementType() return mType; } -sal_Bool NameContainer_Impl::hasElements() +sal_Bool NameContainer_Impl::hasElements() throw(RuntimeException) { sal_Bool bRet = (mnElementCount > 0); @@ -69,7 +69,7 @@ sal_Bool NameContainer_Impl::hasElements() } // Methods XNameAccess -Any NameContainer_Impl::getByName( const OUString& aName ) +Any NameContainer_Impl::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); @@ -88,7 +88,7 @@ Sequence< OUString > NameContainer_Impl::getElementNames() return mNames; } -sal_Bool NameContainer_Impl::hasByName( const OUString& aName ) +sal_Bool NameContainer_Impl::hasByName( const OUString& aName ) throw(RuntimeException) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); @@ -98,7 +98,7 @@ sal_Bool NameContainer_Impl::hasByName( const OUString& aName ) // Methods XNameReplace -void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aElement ) +void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { Type aAnyType = aElement.getValueType(); @@ -115,7 +115,7 @@ void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aEleme mValues.getArray()[ iHashResult ] = aElement; // Fire event - ContainerEvent aEvent; + ContainerEvent aEvent; aEvent.Source = *this; aEvent.Element <<= aElement; aEvent.ReplacedElement = aOldElement; @@ -125,7 +125,7 @@ void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aEleme // Methods XNameContainer -void NameContainer_Impl::insertByName( const OUString& aName, const Any& aElement ) +void NameContainer_Impl::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { Type aAnyType = aElement.getValueType(); @@ -146,14 +146,14 @@ void NameContainer_Impl::insertByName( const OUString& aName, const Any& aElemen mHashMap[ aName ] = nCount; // Fire event - ContainerEvent aEvent; + ContainerEvent aEvent; aEvent.Source = *this; aEvent.Element <<= aElement; aEvent.Accessor <<= aName; maContainerListeners.elementInserted( aEvent ); } -void NameContainer_Impl::removeByName( const OUString& Name ) +void NameContainer_Impl::removeByName( const OUString& Name ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { NameContainerNameMap::iterator aIt = mHashMap.find( Name ); @@ -166,7 +166,7 @@ void NameContainer_Impl::removeByName( const OUString& Name ) Any aOldElement = mValues.getConstArray()[ iHashResult ]; // Fire event - ContainerEvent aEvent; + ContainerEvent aEvent; aEvent.Source = *this; aEvent.Element = aOldElement; aEvent.Accessor <<= Name; diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index b82b8b4be2c0..1c2416dc489b 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace toolkit const Reference< XNumberFormatsSupplier >& lcl_getDefaultFormats_throw() { ::osl::MutexGuard aGuard( getDefaultFormatsMutex() ); - + bool& rbTriedCreation = lcl_getTriedCreation(); Reference< XNumberFormatsSupplier >& rDefaultFormats( lcl_getDefaultFormatsAccess_nothrow() ); if ( !rDefaultFormats.is() && !rbTriedCreation ) @@ -376,7 +376,7 @@ namespace toolkit throw IllegalArgumentException( ( ::rtl::OUString::createFromAscii("Unable to convert the given value for the property ") - += GetPropertyName((sal_uInt16)nPropId) ) + += GetPropertyName((sal_uInt16)nPropId) ) += ::rtl::OUString::createFromAscii(" (double, integer, or string expected)."), static_cast< XPropertySet* >(this), 1); @@ -416,7 +416,7 @@ namespace toolkit static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -459,13 +459,13 @@ namespace toolkit aValues[1] = xPeer->getProperty( aNames[1] ); ImplSetPropertyValues( aNames, aValues, FALSE ); - + if ( GetTextListeners().getLength() ) GetTextListeners().textChanged( e ); } //........................................................................ -} // namespace toolkit +} // namespace toolkit //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 5349e311c86a..578312290743 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,27 +43,27 @@ #include <comphelper/sequence.hxx> -#define GCM_PROPERTY_ID_POS_X 1 -#define GCM_PROPERTY_ID_POS_Y 2 -#define GCM_PROPERTY_ID_WIDTH 3 -#define GCM_PROPERTY_ID_HEIGHT 4 -#define GCM_PROPERTY_ID_NAME 5 -#define GCM_PROPERTY_ID_TABINDEX 6 -#define GCM_PROPERTY_ID_STEP 7 -#define GCM_PROPERTY_ID_TAG 8 +#define GCM_PROPERTY_ID_POS_X 1 +#define GCM_PROPERTY_ID_POS_Y 2 +#define GCM_PROPERTY_ID_WIDTH 3 +#define GCM_PROPERTY_ID_HEIGHT 4 +#define GCM_PROPERTY_ID_NAME 5 +#define GCM_PROPERTY_ID_TABINDEX 6 +#define GCM_PROPERTY_ID_STEP 7 +#define GCM_PROPERTY_ID_TAG 8 #define GCM_PROPERTY_ID_RESOURCERESOLVER 9 -#define GCM_PROPERTY_POS_X ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX")) -#define GCM_PROPERTY_POS_Y ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY")) -#define GCM_PROPERTY_WIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width")) -#define GCM_PROPERTY_HEIGHT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height")) -#define GCM_PROPERTY_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) -#define GCM_PROPERTY_TABINDEX ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")) -#define GCM_PROPERTY_STEP ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Step")) -#define GCM_PROPERTY_TAG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tag")) -#define GCM_PROPERTY_RESOURCERESOLVER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceResolver")) +#define GCM_PROPERTY_POS_X ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX")) +#define GCM_PROPERTY_POS_Y ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY")) +#define GCM_PROPERTY_WIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width")) +#define GCM_PROPERTY_HEIGHT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height")) +#define GCM_PROPERTY_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) +#define GCM_PROPERTY_TABINDEX ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")) +#define GCM_PROPERTY_STEP ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Step")) +#define GCM_PROPERTY_TAG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tag")) +#define GCM_PROPERTY_RESOURCERESOLVER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceResolver")) -#define DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT +#define DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT //........................................................................ // namespace toolkit @@ -100,7 +100,7 @@ { m_xAggregate = _pAggregateInstance; - { // check if the aggregat is cloneable + { // check if the aggregat is cloneable Reference< XCloneable > xCloneAccess(m_xAggregate, UNO_QUERY); m_bCloneable = xCloneAccess.is(); } @@ -183,14 +183,14 @@ void OGeometryControlModel_Base::registerProperties() { // register our members for the property handling of the OPropertyContainer - registerProperty(GCM_PROPERTY_POS_X, GCM_PROPERTY_ID_POS_X, DEFAULT_ATTRIBS(), &m_nPosX, ::getCppuType(&m_nPosX)); - registerProperty(GCM_PROPERTY_POS_Y, GCM_PROPERTY_ID_POS_Y, DEFAULT_ATTRIBS(), &m_nPosY, ::getCppuType(&m_nPosY)); - registerProperty(GCM_PROPERTY_WIDTH, GCM_PROPERTY_ID_WIDTH, DEFAULT_ATTRIBS(), &m_nWidth, ::getCppuType(&m_nWidth)); - registerProperty(GCM_PROPERTY_HEIGHT, GCM_PROPERTY_ID_HEIGHT, DEFAULT_ATTRIBS(), &m_nHeight, ::getCppuType(&m_nHeight)); - registerProperty(GCM_PROPERTY_NAME, GCM_PROPERTY_ID_NAME, DEFAULT_ATTRIBS(), &m_aName, ::getCppuType(&m_aName)); - registerProperty(GCM_PROPERTY_TABINDEX, GCM_PROPERTY_ID_TABINDEX, DEFAULT_ATTRIBS(), &m_nTabIndex, ::getCppuType(&m_nTabIndex)); - registerProperty(GCM_PROPERTY_STEP, GCM_PROPERTY_ID_STEP, DEFAULT_ATTRIBS(), &m_nStep, ::getCppuType(&m_nStep)); - registerProperty(GCM_PROPERTY_TAG, GCM_PROPERTY_ID_TAG, DEFAULT_ATTRIBS(), &m_aTag, ::getCppuType(&m_aTag)); + registerProperty(GCM_PROPERTY_POS_X, GCM_PROPERTY_ID_POS_X, DEFAULT_ATTRIBS(), &m_nPosX, ::getCppuType(&m_nPosX)); + registerProperty(GCM_PROPERTY_POS_Y, GCM_PROPERTY_ID_POS_Y, DEFAULT_ATTRIBS(), &m_nPosY, ::getCppuType(&m_nPosY)); + registerProperty(GCM_PROPERTY_WIDTH, GCM_PROPERTY_ID_WIDTH, DEFAULT_ATTRIBS(), &m_nWidth, ::getCppuType(&m_nWidth)); + registerProperty(GCM_PROPERTY_HEIGHT, GCM_PROPERTY_ID_HEIGHT, DEFAULT_ATTRIBS(), &m_nHeight, ::getCppuType(&m_nHeight)); + registerProperty(GCM_PROPERTY_NAME, GCM_PROPERTY_ID_NAME, DEFAULT_ATTRIBS(), &m_aName, ::getCppuType(&m_aName)); + registerProperty(GCM_PROPERTY_TABINDEX, GCM_PROPERTY_ID_TABINDEX, DEFAULT_ATTRIBS(), &m_nTabIndex, ::getCppuType(&m_nTabIndex)); + registerProperty(GCM_PROPERTY_STEP, GCM_PROPERTY_ID_STEP, DEFAULT_ATTRIBS(), &m_nStep, ::getCppuType(&m_nStep)); + registerProperty(GCM_PROPERTY_TAG, GCM_PROPERTY_ID_TAG, DEFAULT_ATTRIBS(), &m_aTag, ::getCppuType(&m_aTag)); registerProperty(GCM_PROPERTY_RESOURCERESOLVER, GCM_PROPERTY_ID_RESOURCERESOLVER, DEFAULT_ATTRIBS(), &m_xStrResolver, ::getCppuType(&m_xStrResolver)); } @@ -198,19 +198,19 @@ ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetDefaultValueByHandle(sal_Int32 nHandle) const { ::com::sun::star::uno::Any aDefault; - + switch ( nHandle ) { - case GCM_PROPERTY_ID_POS_X: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_POS_Y: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_WIDTH: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_HEIGHT: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_NAME: aDefault <<= ::rtl::OUString(); break; - case GCM_PROPERTY_ID_TABINDEX: aDefault <<= (sal_Int16) -1; break; - case GCM_PROPERTY_ID_STEP: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_TAG: aDefault <<= ::rtl::OUString(); break; + case GCM_PROPERTY_ID_POS_X: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_POS_Y: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_WIDTH: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_HEIGHT: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_NAME: aDefault <<= ::rtl::OUString(); break; + case GCM_PROPERTY_ID_TABINDEX: aDefault <<= (sal_Int16) -1; break; + case GCM_PROPERTY_ID_STEP: aDefault <<= (sal_Int32) 0; break; + case GCM_PROPERTY_ID_TAG: aDefault <<= ::rtl::OUString(); break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aDefault <<= Reference< resource::XStringResourceResolver >(); break; - default: DBG_ERROR( "ImplGetDefaultValueByHandle - unknown Property" ); + default: DBG_ERROR( "ImplGetDefaultValueByHandle - unknown Property" ); } return aDefault; @@ -220,19 +220,19 @@ ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetPropertyValueByHandle(sal_Int32 nHandle) const { ::com::sun::star::uno::Any aValue; - + switch ( nHandle ) { - case GCM_PROPERTY_ID_POS_X: aValue <<= m_nPosX; break; - case GCM_PROPERTY_ID_POS_Y: aValue <<= m_nPosY; break; - case GCM_PROPERTY_ID_WIDTH: aValue <<= m_nWidth; break; - case GCM_PROPERTY_ID_HEIGHT: aValue <<= m_nHeight; break; - case GCM_PROPERTY_ID_NAME: aValue <<= m_aName; break; - case GCM_PROPERTY_ID_TABINDEX: aValue <<= m_nTabIndex; break; - case GCM_PROPERTY_ID_STEP: aValue <<= m_nStep; break; - case GCM_PROPERTY_ID_TAG: aValue <<= m_aTag; break; + case GCM_PROPERTY_ID_POS_X: aValue <<= m_nPosX; break; + case GCM_PROPERTY_ID_POS_Y: aValue <<= m_nPosY; break; + case GCM_PROPERTY_ID_WIDTH: aValue <<= m_nWidth; break; + case GCM_PROPERTY_ID_HEIGHT: aValue <<= m_nHeight; break; + case GCM_PROPERTY_ID_NAME: aValue <<= m_aName; break; + case GCM_PROPERTY_ID_TABINDEX: aValue <<= m_nTabIndex; break; + case GCM_PROPERTY_ID_STEP: aValue <<= m_nStep; break; + case GCM_PROPERTY_ID_TAG: aValue <<= m_aTag; break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue <<= m_xStrResolver; break; - default: DBG_ERROR( "ImplGetPropertyValueByHandle - unknown Property" ); + default: DBG_ERROR( "ImplGetPropertyValueByHandle - unknown Property" ); } return aValue; @@ -240,19 +240,19 @@ //-------------------------------------------------------------------- void OGeometryControlModel_Base::ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue) - { + { switch ( nHandle ) { - case GCM_PROPERTY_ID_POS_X: aValue >>= m_nPosX; break; - case GCM_PROPERTY_ID_POS_Y: aValue >>= m_nPosY; break; - case GCM_PROPERTY_ID_WIDTH: aValue >>= m_nWidth; break; - case GCM_PROPERTY_ID_HEIGHT: aValue >>= m_nHeight; break; - case GCM_PROPERTY_ID_NAME: aValue >>= m_aName; break; - case GCM_PROPERTY_ID_TABINDEX: aValue >>= m_nTabIndex; break; - case GCM_PROPERTY_ID_STEP: aValue >>= m_nStep; break; - case GCM_PROPERTY_ID_TAG: aValue >>= m_aTag; break; + case GCM_PROPERTY_ID_POS_X: aValue >>= m_nPosX; break; + case GCM_PROPERTY_ID_POS_Y: aValue >>= m_nPosY; break; + case GCM_PROPERTY_ID_WIDTH: aValue >>= m_nWidth; break; + case GCM_PROPERTY_ID_HEIGHT: aValue >>= m_nHeight; break; + case GCM_PROPERTY_ID_NAME: aValue >>= m_aName; break; + case GCM_PROPERTY_ID_TABINDEX: aValue >>= m_nTabIndex; break; + case GCM_PROPERTY_ID_STEP: aValue >>= m_nStep; break; + case GCM_PROPERTY_ID_TAG: aValue >>= m_aTag; break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue >>= m_xStrResolver; break; - default: DBG_ERROR( "ImplSetPropertyValueByHandle - unknown Property" ); + default: DBG_ERROR( "ImplSetPropertyValueByHandle - unknown Property" ); } } @@ -332,7 +332,7 @@ { OPropertyArrayAggregationHelper& rPH = static_cast<OPropertyArrayAggregationHelper&>(const_cast<OGeometryControlModel_Base*>(this)->getInfoHelper()); ::rtl::OUString sPropName; - sal_Int32 nOriginalHandle = -1; + sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&sPropName, &nOriginalHandle, _nHandle)) OPropertySetAggregationHelper::getFastPropertyValue(_rValue, _nHandle); @@ -392,14 +392,14 @@ // should have been reset // set properties - pOwnClone->m_nPosX = m_nPosX; - pOwnClone->m_nPosY = m_nPosY; - pOwnClone->m_nWidth = m_nWidth; - pOwnClone->m_nHeight = m_nHeight; - pOwnClone->m_aName = m_aName; - pOwnClone->m_nTabIndex = m_nTabIndex; - pOwnClone->m_nStep = m_nStep; - pOwnClone->m_aTag = m_aTag; + pOwnClone->m_nPosX = m_nPosX; + pOwnClone->m_nPosY = m_nPosY; + pOwnClone->m_nWidth = m_nWidth; + pOwnClone->m_nHeight = m_nHeight; + pOwnClone->m_aName = m_aName; + pOwnClone->m_nTabIndex = m_nTabIndex; + pOwnClone->m_nStep = m_nStep; + pOwnClone->m_aTag = m_aTag; // Clone event container @@ -407,13 +407,13 @@ static_cast< ::com::sun::star::script::XScriptEventsSupplier* >( this ); Reference< ::com::sun::star::script::XScriptEventsSupplier > xCloneEventsSupplier = static_cast< ::com::sun::star::script::XScriptEventsSupplier* >( pOwnClone ); - + if( xEventsSupplier.is() && xCloneEventsSupplier.is() ) { Reference< XNameContainer > xEventCont = xEventsSupplier->getEvents(); Reference< XNameContainer > xCloneEventCont = xCloneEventsSupplier->getEvents(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = + ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = xEventCont->getElementNames(); const ::rtl::OUString* pNames = aNames.getConstArray(); sal_Int32 i, nNameCount = aNames.getLength(); @@ -453,8 +453,8 @@ //==================================================================== //-------------------------------------------------------------------- - typedef ::std::hash_map< ::rtl::OUString, sal_Int32, ::comphelper::UStringHash > HashMapString2Int; - typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; + typedef ::std::hash_map< ::rtl::OUString, sal_Int32, ::comphelper::UStringHash > HashMapString2Int; + typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; typedef ::std::vector< ::std::vector< sal_Int32 > > IntArrayArray; // for creating class-unique PropertySetInfo's, we need some info: @@ -518,7 +518,7 @@ //-------------------------------------------------------------------- struct PropertyNameEqual : public ::std::unary_function< Property, bool > { - const ::rtl::OUString& m_rCompare; + const ::rtl::OUString& m_rCompare; PropertyNameEqual( const ::rtl::OUString& _rCompare ) : m_rCompare( _rCompare ) { } bool operator()( const Property& _rLHS ) @@ -561,7 +561,7 @@ // look for the current property in the properties of our aggregate const Property* pAggPropPos = ::std::find_if( pAggProps, pAggPropsEnd, PropertyNameEqual( pProp->Name ) ); if ( pAggPropPos != pAggPropsEnd ) - { // found a duplicate + { // found a duplicate // -> remove from the aggregate property sequence ::comphelper::removeElementAt( aAggregateProps, pAggPropPos - pAggProps ); // which means we have to adjust the pointers @@ -612,7 +612,7 @@ //-------------------------------------------------------------------- struct Int32Equal : public ::std::unary_function< sal_Int32, bool > { - sal_Int32 m_nCompare; + sal_Int32 m_nCompare; Int32Equal( sal_Int32 _nCompare ) : m_nCompare( _nCompare ) { } bool operator()( sal_Int32 _nLHS ) @@ -648,7 +648,7 @@ } //........................................................................ -// } // namespace toolkit +// } // namespace toolkit //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 1716d843a117..d6d99cf4cc40 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,14 +117,14 @@ void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) t for(sal_Int32 i=0;i<rowElements;i++) { - Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY ); + Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY ); columns.push_back(xColumn); xColumn->setIndex(i); } } ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL DefaultGridColumnModel::copyColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column) throw (::com::sun::star::uno::RuntimeException) { - Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY ); + Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY ); xColumn->setColumnWidth(column->getColumnWidth()); xColumn->setPreferredWidth(column->getPreferredWidth()); xColumn->setMaxWidth(column->getMaxWidth()); diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx index 7f01b625e62c..6dbe18e347a3 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ class DefaultGridColumnModel : public ::cppu::WeakImplHelper2< XGridColumnModel, public: DefaultGridColumnModel(const Reference< XMultiServiceFactory >& xFactory); virtual ~DefaultGridColumnModel(); - + // XGridColumnModel //virtual ::sal_Bool SAL_CALL getColumnSelectionAllowed() throw (::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index f59e7a42f768..45714078bd00 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,9 +77,9 @@ void DefaultGridDataModel::broadcast( broadcast_type eType, const GridDataEvent& XGridDataListener* pListener = static_cast<XGridDataListener*>(aListIter.next()); switch( eType ) { - case row_added: pListener->rowAdded(aEvent); break; - case row_removed: pListener->rowRemoved(aEvent); break; - case data_changed: pListener->dataChanged(aEvent); break; + case row_added: pListener->rowAdded(aEvent); break; + case row_removed: pListener->rowRemoved(aEvent); break; + case data_changed: pListener->dataChanged(aEvent); break; } } } @@ -96,7 +96,7 @@ void DefaultGridDataModel::broadcast_changed( ::rtl::OUString name, sal_Int32 in //--------------------------------------------------------------------- -void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString & headerName, +void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString & headerName, ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException) { Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); @@ -106,7 +106,7 @@ void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString //--------------------------------------------------------------------- -void DefaultGridDataModel::broadcast_remove( sal_Int32 index, const ::rtl::OUString & headerName, +void DefaultGridDataModel::broadcast_remove( sal_Int32 index, const ::rtl::OUString & headerName, ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException) { Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); @@ -180,13 +180,13 @@ void SAL_CALL DefaultGridDataModel::addRow(const ::rtl::OUString & headername, c // store row data std::vector< Any > newRow; for ( int i = 0; i < rRowdata.getLength();i++) - { + { newRow.push_back(rRowdata[i]); } data.push_back( newRow ); - - broadcast_add( data.size()-1, headername, comphelper::containerToSequence(newRow)); + + broadcast_add( data.size()-1, headername, comphelper::containerToSequence(newRow)); } @@ -199,21 +199,21 @@ void SAL_CALL DefaultGridDataModel::removeRow(::sal_Int32 index) throw (::com::s ::rtl::OUString headerName( (::rtl::OUString) rowHeaders[index] ); rowHeaders.erase(rowHeaders.begin() + index); - Sequence< Any >& rowData ( (Sequence< Any >&)data[index] ); + Sequence< Any >& rowData ( (Sequence< Any >&)data[index] ); data.erase(data.begin() + index); - broadcast_remove( index, headerName, rowData); + broadcast_remove( index, headerName, rowData); } - else + else return; } //--------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< Any > > SAL_CALL DefaultGridDataModel::getData() throw (::com::sun::star::uno::RuntimeException) { - + std::vector< std::vector< Any > >::iterator iterator; std::vector< Sequence< Any > > dummyContainer(0); - + for(iterator = data.begin(); iterator != data.end(); iterator++) { Sequence< Any > cols(comphelper::containerToSequence(*iterator)); @@ -242,7 +242,7 @@ void SAL_CALL DefaultGridDataModel::removeAll() throw (RuntimeException) { rowHeaders.clear(); data.clear(); - broadcast_remove( -1, ::rtl::OUString(), 0); + broadcast_remove( -1, ::rtl::OUString(), 0); } //--------------------------------------------------------------------- void SAL_CALL DefaultGridDataModel::setRowHeaderWidth(sal_Int32 _value) throw (::com::sun::star::uno::RuntimeException) diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.hxx b/toolkit/source/controls/grid/defaultgriddatamodel.hxx index ac6282a0eaef..2b882a08a8bb 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.hxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 8c1645e2f6ae..168569e7fe35 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ void GridColumn::broadcast( broadcast_column_type eType, const GridColumnEvent& XGridColumnListener* pListener = static_cast<XGridColumnListener*>(aListIter.next()); switch( eType ) { - case column_attribute_changed: pListener->columnChanged(aEvent); break; + case column_attribute_changed: pListener->columnChanged(aEvent); break; } } } diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx index 4d582201d128..c7f3e7701c8b 100644 --- a/toolkit/source/controls/grid/gridcolumn.hxx +++ b/toolkit/source/controls/grid/gridcolumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ public: virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); - + virtual void SAL_CALL setIndex(sal_Int32 _nIndex)throw (::com::sun::star::uno::RuntimeException); private: void broadcast( broadcast_column_type eType, const GridColumnEvent& aEvent ); diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 158876245be6..3206260e420a 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,9 +53,9 @@ using namespace ::com::sun::star::view; namespace toolkit { -// ---------------------------------------------------- -// class UnoGridModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoGridModel +// ---------------------------------------------------- UnoGridModel::UnoGridModel() { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -91,7 +91,7 @@ UnoGridModel::UnoGridModel( const UnoGridModel& rModel ) : UnoControlModel( rModel ) { } - + UnoControlModel* UnoGridModel::Clone() const { return new UnoGridModel( *this ); @@ -105,9 +105,9 @@ OUString UnoGridModel::getServiceName() throw(RuntimeException) Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { switch( nPropId ) - { + { case BASEPROPERTY_DEFAULTCONTROL: - return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_GridControl ) ); + return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_GridControl ) ); case BASEPROPERTY_GRID_SELECTIONMODE: return uno::makeAny( SelectionType(1) ); case BASEPROPERTY_GRID_SHOWROWHEADER: @@ -127,9 +127,9 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const case BASEPROPERTY_GRID_ROW_BACKGROUND: return uno::makeAny(com::sun::star::util::Color(0xFFFFFF) ); default: - return UnoControlModel::ImplGetDefaultValue( nPropId ); + return UnoControlModel::ImplGetDefaultValue( nPropId ); } - + } ::cppu::IPropertyArrayHelper& UnoGridModel::getInfoHelper() @@ -137,7 +137,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -151,9 +151,9 @@ Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) throw(Runtime } -// ---------------------------------------------------- -// class UnoGridControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoGridControl +// ---------------------------------------------------- UnoGridControl::UnoGridControl() : mSelectionMode(SelectionType(1)), m_aSelectionListeners( *this ) @@ -179,7 +179,7 @@ void UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk Reference< XGridControl > xGrid( getPeer(), UNO_QUERY_THROW ); xGrid->addSelectionListener(&m_aSelectionListeners); - + Reference<XGridDataListener> xListener ( getPeer(), UNO_QUERY_THROW ); Reference<XGridColumnListener> xColListener ( getPeer(), UNO_QUERY_THROW ); Reference<XPropertySet> xPropSet ( getModel(), UNO_QUERY_THROW ); @@ -191,7 +191,7 @@ void UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk if(xGridColumnModel != NULL) { for(int i = 0;i<xGridColumnModel->getColumnCount();i++) - { + { xGridColumnModel->getColumn(i)->addColumnListener(xColListener); } } diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index 564e752e618e..be3adbc7200b 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,16 +52,16 @@ using namespace ::com::sun::star::container; // =================================================================== class UnoGridModel : public UnoControlModel { -protected: - Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); +protected: + Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoGridModel(); UnoGridModel( const UnoGridModel& rModel ); - + UnoControlModel* Clone() const; - + // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -80,21 +80,21 @@ class UnoGridControl : public ::cppu::ImplInheritanceHelper1< UnoControlBase, :: { public: UnoGridControl(); - ::rtl::OUString GetComponentServiceName(); - + ::rtl::OUString GetComponentServiceName(); + // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XControl void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); - // ::com::sun::star::awt::grid::XGridControl + // ::com::sun::star::awt::grid::XGridControl - virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setToolTip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& text, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& columns) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::grid::XGridSelection - + virtual ::sal_Int32 SAL_CALL getMinSelectionIndex() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getMaxSelectionIndex() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL selectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException); @@ -107,14 +107,14 @@ public: virtual void SAL_CALL selectRow(::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoGridControl, UnoControlBase, szServiceName_GridControl ) using UnoControl::getPeer; private: ::com::sun::star::view::SelectionType mSelectionMode; - SelectionListenerMultiplexer m_aSelectionListeners; + SelectionListenerMultiplexer m_aSelectionListeners; }; } // toolkit diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index bf9639901f11..0c17a584c476 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,17 +47,17 @@ namespace toolkit using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -// ---------------------------------------------------- +// ---------------------------------------------------- // helper -// ---------------------------------------------------- +// ---------------------------------------------------- static void lcl_throwIllegalArgumentException( ) -{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... +{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw IllegalArgumentException(); } static void lcl_throwIndexOutOfBoundsException( ) -{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... +{ // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw IndexOutOfBoundsException(); } @@ -142,7 +142,7 @@ static void lcl_throwIndexOutOfBoundsException( ) // ------------------------------------------------------------------- - ::com::sun::star::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType ); if ( !aRet.hasValue() ) @@ -157,7 +157,7 @@ static void lcl_throwIndexOutOfBoundsException( ) static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -204,7 +204,7 @@ static void lcl_throwIndexOutOfBoundsException( ) void UnoControlRoadmapModel::SetRMItemDefaultProperties( const sal_Int32 , Reference< XInterface > xRoadmapItem) { - Any aAny; + Any aAny; Reference< XPropertySet > xPropertySet( xRoadmapItem, UNO_QUERY ); Reference< XPropertySet > xProps( xRoadmapItem, UNO_QUERY ); if ( xProps.is() ) @@ -296,7 +296,7 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::removeByIndex( sal_Int32 Index) - throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) + throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { if (( Index > (sal_Int32)maRoadmapItems.size()) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index e12fbfae7565..c66cfb368bd1 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index bb4f35644e3a..50799a017167 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,9 +49,9 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -// ---------------------------------------------------- -// class StdTabController -// ---------------------------------------------------- +// ---------------------------------------------------- +// class StdTabController +// ---------------------------------------------------- StdTabController::StdTabController() { } @@ -61,13 +61,13 @@ StdTabController::~StdTabController() } sal_Bool StdTabController::ImplCreateComponentSequence( - Sequence< Reference< XControl > >& rControls, - const Sequence< Reference< XControlModel > >& rModels, - Sequence< Reference< XWindow > >& rComponents, - Sequence< Any>* pTabStops, + Sequence< Reference< XControl > >& rControls, + const Sequence< Reference< XControlModel > >& rModels, + Sequence< Reference< XWindow > >& rComponents, + Sequence< Any>* pTabStops, sal_Bool bPeerComponent ) const { - sal_Bool bOK = sal_True; + sal_Bool bOK = sal_True; // nur die wirklich geforderten Controls sal_Int32 nModels = rModels.getLength(); @@ -94,7 +94,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence( const Reference< XControl > * pControls = rControls.getConstArray(); - sal_uInt32 nCtrls = rControls.getLength(); + sal_uInt32 nCtrls = rControls.getLength(); rComponents.realloc( nCtrls ); Reference< XWindow > * pComps = rComponents.getArray(); Any* pTabs = NULL; @@ -107,22 +107,22 @@ sal_Bool StdTabController::ImplCreateComponentSequence( } for ( sal_uInt32 n = 0; bOK && ( n < nCtrls ); n++ ) - { + { // Zum Model passendes Control suchen Reference< XControl > xCtrl(pControls[n]); if ( xCtrl.is() ) { if (bPeerComponent) - pComps[n] = Reference< XWindow > (xCtrl->getPeer(), UNO_QUERY); + pComps[n] = Reference< XWindow > (xCtrl->getPeer(), UNO_QUERY); else pComps[n] = Reference< XWindow > (xCtrl, UNO_QUERY); // TabStop-Property if ( pTabs ) - { + { // opt: String fuer TabStop als Konstante static const ::rtl::OUString aTabStopName( ::rtl::OUString::createFromAscii( "Tabstop" ) ); - + Reference< XPropertySet > xPSet( xCtrl->getModel(), UNO_QUERY ); Reference< XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); if( xInfo->hasPropertyByName( aTabStopName ) ) @@ -147,9 +147,9 @@ void StdTabController::ImplActivateControl( sal_Bool bFirst ) const Sequence< Reference< XControl > > aCtrls = xTabController->getControls(); const Reference< XControl > * pControls = aCtrls.getConstArray(); sal_uInt32 nCount = aCtrls.getLength(); - + for ( sal_uInt32 n = bFirst ? 0 : nCount; bFirst ? ( n < nCount ) : n; ) - { + { sal_uInt32 nCtrl = bFirst ? n++ : --n; DBG_ASSERT( pControls[nCtrl].is(), "Control nicht im Container!" ); if ( pControls[nCtrl].is() ) @@ -187,35 +187,35 @@ IMPL_XTYPEPROVIDER_END void StdTabController::setModel( const Reference< XTabControllerModel >& Model ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + mxModel = Model; } Reference< XTabControllerModel > StdTabController::getModel( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + return mxModel; } void StdTabController::setContainer( const Reference< XControlContainer >& Container ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + mxControlContainer = Container; } Reference< XControlContainer > StdTabController::getContainer( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + return mxControlContainer; } Sequence< Reference< XControl > > StdTabController::getControls( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + Sequence< Reference< XControl > > aSeq; if ( mxControlContainer.is() ) @@ -241,7 +241,7 @@ Sequence< Reference< XControl > > StdTabController::getControls( ) throw(Runtim void StdTabController::autoTabOrder( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + DBG_ASSERT( mxControlContainer.is(), "autoTabOrder: No ControlContainer!" ); if ( !mxControlContainer.is() ) return; @@ -251,7 +251,7 @@ void StdTabController::autoTabOrder( ) throw(RuntimeException) // vieleicht erhalte ich hier einen TabController, // der schneller die Liste meiner Controls ermittelt - Reference< XTabController > xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY); + Reference< XTabController > xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY); Sequence< Reference< XControl > > aControls = xTabController->getControls(); // #58317# Es sind ggf. noch nicht alle Controls fuer die Models im Container, @@ -306,7 +306,7 @@ void StdTabController::autoTabOrder( ) throw(RuntimeException) void StdTabController::activateTabOrder( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + // Am Container die Tab-Reihenfolge aktivieren... Reference< XControl > xC( mxControlContainer, UNO_QUERY ); @@ -318,7 +318,7 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) // vieleicht erhalte ich hier einen TabController, // der schneller die Liste meiner Controls ermittelt - Reference< XTabController > xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY); + Reference< XTabController > xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY); // Flache Liste besorgen... Sequence< Reference< XControlModel > > aModels = mxModel->getControlModels(); @@ -327,7 +327,7 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) // DG: Aus Optimierungsgruenden werden die Controls mittels getControls() geholt, // dieses hoert sich zwar wiedersinning an, fuehrt aber im konkreten Fall (Forms) zu sichtbaren - // Geschwindigkeitsvorteilen + // Geschwindigkeitsvorteilen Sequence< Reference< XControl > > aControls = xTabController->getControls(); // #58317# Es sind ggf. noch nicht alle Controls fuer die Models im Container, @@ -338,8 +338,8 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) xVclContainerPeer->setTabOrder( aCompSeq, aTabSeq, mxModel->getGroupControl() ); ::rtl::OUString aName; - Sequence< Reference< XControlModel > > aThisGroupModels; - Sequence< Reference< XWindow > > aControlComponents; + Sequence< Reference< XControlModel > > aThisGroupModels; + Sequence< Reference< XWindow > > aControlComponents; sal_uInt32 nGroups = mxModel->getGroupCount(); for ( sal_uInt32 nG = 0; nG < nGroups; nG++ ) @@ -362,14 +362,14 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) void StdTabController::activateFirst( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ImplActivateControl( sal_True ); } void StdTabController::activateLast( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ImplActivateControl( sal_False ); } @@ -412,7 +412,7 @@ Reference< XControl > StdTabController::FindControl( Sequence< Reference< XCont if ( !xCtrl.is() && rxCtrlModel.is()) */ DBG_ASSERT( rxCtrlModel.is(), "ImplFindControl - welches ?!" ); - + const Reference< XControl > * pCtrls = rCtrls.getConstArray(); sal_Int32 nCtrls = rCtrls.getLength(); for ( sal_Int32 n = 0; n < nCtrls; n++ ) diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index e4f62e1c3a9f..efa718fbc8bc 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,11 +40,11 @@ #include <tools/debug.hxx> -#define UNOCONTROL_STREAMVERSION (short)2 +#define UNOCONTROL_STREAMVERSION (short)2 -// ---------------------------------------------------- -// class UnoControlModelEntryList -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlModelEntryList +// ---------------------------------------------------- UnoControlModelEntryList::UnoControlModelEntryList() { } @@ -73,9 +73,9 @@ void UnoControlModelEntryList::DestroyEntry( sal_uInt32 nEntry ) delete pEntry; } -// ---------------------------------------------------- -// class StdTabControllerModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class StdTabControllerModel +// ---------------------------------------------------- StdTabControllerModel::StdTabControllerModel() { mbGroupControl = sal_True; @@ -149,8 +149,8 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star sal_uInt32 nStoredControls = 0; sal_Int32 nDataBeginMark = xMark->createMark(); - OutStream->writeLong( 0L ); // DataLen - OutStream->writeLong( 0L ); // nStoredControls + OutStream->writeLong( 0L ); // DataLen + OutStream->writeLong( 0L ); // nStoredControls sal_uInt32 nCtrls = rCtrls.getLength(); for ( sal_uInt32 n = 0; n < nCtrls; n++ ) @@ -219,21 +219,21 @@ IMPL_XTYPEPROVIDER_END sal_Bool StdTabControllerModel::getGroupControl( ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + return mbGroupControl; } void StdTabControllerModel::setGroupControl( sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + mbGroupControl = GroupControl; } void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + maControls.Reset(); ImplSetControlModels( maControls, Controls ); } @@ -241,7 +241,7 @@ void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Seque ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > StdTabControllerModel::getControlModels( ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq( ImplGetControlCount( maControls ) ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > * pRefs = aSeq.getArray(); ImplGetControlModels( &pRefs, maControls ); @@ -251,7 +251,7 @@ void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Seque void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const ::rtl::OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + // Die Controls stehen eventuel flach in der Liste und werden jetzt gruppiert. // Verschachtelte Gruppen sind erstmal nicht moeglich... // Das erste Element der Gruppe welches auch schon in der flachen Liste @@ -291,7 +291,7 @@ void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::c sal_Int32 StdTabControllerModel::getGroupCount( ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + // erstmal nur eine Ebene... // Das Model und die Impl-Methoden arbeiten zwar rekursiv, aber das wird // erstmal nich nach aussen gegeben. @@ -310,7 +310,7 @@ sal_Int32 StdTabControllerModel::getGroupCount( ) throw(::com::sun::star::uno:: void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup, ::rtl::OUString& rName ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq; sal_uInt32 nG = 0; sal_uInt32 nEntries = maControls.Count(); @@ -337,7 +337,7 @@ void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::S void StdTabControllerModel::getGroupByName( const ::rtl::OUString& rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + sal_uInt32 nGroup = 0; sal_uInt32 nEntries = maControls.Count(); for ( sal_uInt32 n = 0; n < nEntries; n++ ) @@ -366,7 +366,7 @@ void StdTabControllerModel::getGroupByName( const ::rtl::OUString& rName, ::com: void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ::com::sun::star::uno::Reference< ::com::sun::star::io::XMarkableStream > xMark( OutStream, ::com::sun::star::uno::UNO_QUERY ); DBG_ASSERT( xMark.is(), "write: no XMarkableStream!" ); @@ -390,7 +390,7 @@ void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com void StdTabControllerModel::read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq = ImplReadControls( InStream ); setControlModels( aSeq ); diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index e2acf791a886..75a29ae6b862 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ namespace toolkit static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx index f60abcaf3823..f0454e8d81b7 100644 --- a/toolkit/source/controls/tksimpleanimation.cxx +++ b/toolkit/source/controls/tksimpleanimation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -185,7 +185,7 @@ namespace toolkit if ( xAnimation.is() ) xAnimation->start(); } - + //-------------------------------------------------------------------- void SAL_CALL UnoSimpleAnimationControl::stop() throw ( uno::RuntimeException ) { @@ -195,7 +195,7 @@ namespace toolkit if ( xAnimation.is() ) xAnimation->stop(); } - + //-------------------------------------------------------------------- void SAL_CALL UnoSimpleAnimationControl::setImageList( const uno::Sequence< uno::Reference< graphic::XGraphic > >& ImageList ) throw ( uno::RuntimeException ) diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index c22cbf1fae10..6cefd1e5552b 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ namespace toolkit static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -247,7 +247,7 @@ namespace toolkit { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( value ), sal_True ); } - + //-------------------------------------------------------------------- void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException) { @@ -255,7 +255,7 @@ namespace toolkit ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), sal_True ); ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( currentValue ), sal_True ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL UnoSpinButtonControl::getValue( ) throw (RuntimeException) { @@ -268,19 +268,19 @@ namespace toolkit return nValue; } - + //-------------------------------------------------------------------- void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue ) throw (RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), sal_True ); } - + //-------------------------------------------------------------------- void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue ) throw (RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), sal_True ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL UnoSpinButtonControl::getMinimum( ) throw (RuntimeException) { @@ -293,7 +293,7 @@ namespace toolkit return nMin; } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL UnoSpinButtonControl::getMaximum( ) throw (RuntimeException) { @@ -306,13 +306,13 @@ namespace toolkit return nMax; } - + //-------------------------------------------------------------------- void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPININCREMENT ), makeAny( spinIncrement ), sal_True ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL UnoSpinButtonControl::getSpinIncrement( ) throw (RuntimeException) { @@ -325,13 +325,13 @@ namespace toolkit return nIncrement; } - + //-------------------------------------------------------------------- void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), makeAny( orientation ), sal_True ); } - + //-------------------------------------------------------------------- sal_Int32 SAL_CALL UnoSpinButtonControl::getOrientation( ) throw (RuntimeException) { @@ -344,7 +344,7 @@ namespace toolkit return nOrientation; } - + //........................................................................ } // namespace toolkit //........................................................................ diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx index 0f3d2a58654e..e4081377ff06 100644 --- a/toolkit/source/controls/tkthrobber.cxx +++ b/toolkit/source/controls/tkthrobber.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -183,7 +183,7 @@ namespace toolkit if ( xAnimation.is() ) xAnimation->start(); } - + //-------------------------------------------------------------------- void SAL_CALL UnoThrobberControl::stop() throw ( uno::RuntimeException ) { @@ -193,7 +193,7 @@ namespace toolkit if ( xAnimation.is() ) xAnimation->stop(); } - + //........................................................................ } // namespace toolkit //........................................................................ diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 2b3a6d61d9ea..d5d9ce350a6d 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,9 +51,9 @@ using namespace ::com::sun::star::view; namespace toolkit { -// ---------------------------------------------------- -// class UnoTreeModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoTreeModel +// ---------------------------------------------------- UnoTreeModel::UnoTreeModel() { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -82,7 +82,7 @@ UnoTreeModel::UnoTreeModel( const UnoTreeModel& rModel ) : UnoControlModel( rModel ) { } - + UnoControlModel* UnoTreeModel::Clone() const { return new UnoTreeModel( *this ); @@ -122,7 +122,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -136,9 +136,9 @@ Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo( ) throw(Runtime } -// ---------------------------------------------------- -// class UnoTreeControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoTreeControl +// ---------------------------------------------------- UnoTreeControl::UnoTreeControl() : maSelectionListeners( *this ) , maTreeExpansionListeners( *this ) diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx index a6f037f9c56a..5b71bdb8fab3 100644 --- a/toolkit/source/controls/tree/treecontrol.hxx +++ b/toolkit/source/controls/tree/treecontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,16 +50,16 @@ using namespace ::com::sun::star::container; // =================================================================== class UnoTreeModel : public UnoControlModel { -protected: - Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); +protected: + Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: UnoTreeModel(); UnoTreeModel( const UnoTreeModel& rModel ); - + UnoControlModel* Clone() const; - + // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -78,7 +78,7 @@ class UnoTreeControl : public ::cppu::ImplInheritanceHelper1< UnoControlBase, :: { public: UnoTreeControl(); - ::rtl::OUString GetComponentServiceName(); + ::rtl::OUString GetComponentServiceName(); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 2f6f6e9118cf..780f82d4d6ff 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ static void implThrowIllegalArgumentException() throw( IllegalArgumentException throw IllegalArgumentException(); } -class MutableTreeDataModel : public ::cppu::WeakAggImplHelper2< XMutableTreeDataModel, XServiceInfo >, +class MutableTreeDataModel : public ::cppu::WeakAggImplHelper2< XMutableTreeDataModel, XServiceInfo >, public MutexAndBroadcastHelper { public: @@ -141,7 +141,7 @@ public: } private: - TreeNodeVector maChilds; + TreeNodeVector maChilds; Any maDisplayValue; Any maDataValue; sal_Bool mbHasChildsOnDemand; @@ -186,10 +186,10 @@ void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTr XTreeDataModelListener* pListener = static_cast<XTreeDataModelListener*>(aListIter.next()); switch( eType ) { - case nodes_changed: pListener->treeNodesChanged(aEvent); break; - case nodes_inserted: pListener->treeNodesInserted(aEvent); break; - case nodes_removed: pListener->treeNodesRemoved(aEvent); break; - case structure_changed: pListener->treeStructureChanged(aEvent); break; + case nodes_changed: pListener->treeNodesChanged(aEvent); break; + case nodes_inserted: pListener->treeNodesInserted(aEvent); break; + case nodes_removed: pListener->treeNodesRemoved(aEvent); break; + case structure_changed: pListener->treeStructureChanged(aEvent); break; } } } @@ -224,7 +224,7 @@ void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode > MutableTreeNodeRef xImpl( dynamic_cast< MutableTreeNode* >( xNode.get() ) ); if( !xImpl.is() || xImpl->mbIsInserted ) throw IllegalArgumentException(); - + xImpl->mbIsInserted = true; mxRootNode.set(xImpl.get()); @@ -447,7 +447,7 @@ void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); - + MutableTreeNodeRef xImpl; if( (nChildIndex >= 0) && (nChildIndex < (sal_Int32)maChilds.size()) ) diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index d078aa358e60..71df27cf0cd5 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,8 +106,8 @@ static Sequence< ::rtl::OUString> lcl_ImplGetPropertyNames( const Reference< XMu Sequence< ::rtl::OUString> aNames; Reference< XPropertySetInfo > xPSInf = rxModel->getPropertySetInfo(); DBG_ASSERT( xPSInf.is(), "UpdateFromModel: No PropertySetInfo!" ); - if ( xPSInf.is() ) - { + if ( xPSInf.is() ) + { Sequence< Property> aProps = xPSInf->getProperties(); sal_Int32 nLen = aProps.getLength(); aNames = Sequence< ::rtl::OUString>( nLen ); @@ -119,7 +119,7 @@ static Sequence< ::rtl::OUString> lcl_ImplGetPropertyNames( const Reference< XMu return aNames; } -// ==================================================== +// ==================================================== class VclListenerLock { private: @@ -158,9 +158,9 @@ struct UnoControl_Data } }; -// ---------------------------------------------------- -// class UnoControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControl +// ---------------------------------------------------- DBG_NAME( UnoControl ) UnoControl::UnoControl() : maDisposeListeners( *this ) @@ -192,7 +192,7 @@ UnoControl::~UnoControl() return ::rtl::OUString(); } -Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer ) +Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer ) { DBG_ASSERT( !mbCreatingCompatiblePeer, "ImplGetCompatiblePeer - rekursive?" ); @@ -210,7 +210,7 @@ Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptE if( bVis ) maComponentInfos.bVisible = sal_False; - Reference< XWindowPeer > xCurrentPeer = getPeer(); + Reference< XWindowPeer > xCurrentPeer = getPeer(); setPeer( NULL ); // queryInterface ourself, to allow aggregation @@ -287,7 +287,7 @@ void UnoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const An // this assumption may be false in some (seldom) multi-threading scenarios (cause propertiesChange // releases our mutex before calling here in) // That's why this additional check - + if ( mxVclWindowPeer.is() ) { Any aConvertedValue( rVal ); @@ -318,7 +318,7 @@ void UnoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const An } } } - + mxVclWindowPeer->setProperty( rPropName, aConvertedValue ); } } @@ -327,7 +327,7 @@ void UnoControl::PrepareWindowDescriptor( WindowDescriptor& ) { } -Reference< XWindow > UnoControl::getParentPeer() const +Reference< XWindow > UnoControl::getParentPeer() const { Reference< XWindow > xPeer; if( mxContext.is() ) @@ -348,7 +348,7 @@ void UnoControl::updateFromModel() // Alle standard Properties werden ausgelesen und in das Peer uebertragen if( getPeer().is() ) { - Reference< XMultiPropertySet > xPropSet( mxModel, UNO_QUERY ); + Reference< XMultiPropertySet > xPropSet( mxModel, UNO_QUERY ); if( xPropSet.is() ) { Sequence< ::rtl::OUString> aNames = lcl_ImplGetPropertyNames( xPropSet ); @@ -409,7 +409,7 @@ void UnoControl::dispose( ) throw(RuntimeException) maMouseMotionListeners.disposeAndClear( aDisposeEvent ); maPaintListeners.disposeAndClear( aDisposeEvent ); maModeChangeListeners.disposeAndClear( aDisposeEvent ); - + // Model wieder freigeben setModel( Reference< XControlModel > () ); setContext( Reference< XInterface > () ); @@ -418,14 +418,14 @@ void UnoControl::dispose( ) throw(RuntimeException) void UnoControl::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + maDisposeListeners.addInterface( rxListener ); } void UnoControl::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + maDisposeListeners.removeInterface( rxListener ); } @@ -464,7 +464,7 @@ void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvent ImplModelPropertiesChanged( aEvents ); } - + void UnoControl::ImplLockPropertyChangeNotification( const ::rtl::OUString& rPropertyName, bool bLock ) { MapString2Int::iterator pos = mpData->aSuspendedPropertyNotifications.find( rPropertyName ); @@ -502,8 +502,8 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent if( getPeer().is() ) { DECLARE_STL_VECTOR( PropertyValue, PropertyValueVector); - PropertyValueVector aPeerPropertiesToSet; - sal_Int32 nIndependentPos = 0; + PropertyValueVector aPeerPropertiesToSet; + sal_Int32 nIndependentPos = 0; bool bResourceResolverSet( false ); // position where to insert the independent properties into aPeerPropertiesToSet, // dependent ones are inserted at the end of the vector @@ -537,9 +537,9 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent if ( pEvents->NewValue >>= xStrResolver ) bResourceResolverSet = xStrResolver.is(); } - + sal_uInt16 nPType = GetPropertyId( pEvents->PropertyName ); - if ( mbDesignMode && mbDisposePeer && !mbRefeshingPeer && !mbCreatingPeer ) + if ( mbDesignMode && mbDisposePeer && !mbRefeshingPeer && !mbCreatingPeer ) { // if we're in design mode, then some properties can change which // require creating a *new* peer (since these properties cannot @@ -606,7 +606,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent } } - Reference< XWindow > xParent = getParentPeer(); + Reference< XWindow > xParent = getParentPeer(); Reference< XControl > xThis( (XAggregation*)(::cppu::OWeakAggObject*)this, UNO_QUERY ); // call createPeer via a interface got from queryInterface, so the aggregating class can intercept it @@ -624,14 +624,14 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent bool bMustBeInserted( true ); for ( sal_uInt32 i = 0; i < aPeerPropertiesToSet.size(); i++ ) { - if ( aPeerPropertiesToSet[i].Name.equalsAsciiL( + if ( aPeerPropertiesToSet[i].Name.equalsAsciiL( pLangDepProp->pPropName, pLangDepProp->nPropNameLength )) { bMustBeInserted = false; break; } } - + if ( bMustBeInserted ) { // Add language dependent props at the end @@ -642,12 +642,12 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent PropertyValue( aPropName, 0, xPS->getPropertyValue( aPropName ), PropertyState_DIRECT_VALUE ) ); } } - + ++pLangDepProp; } } aGuard.clear(); - + // clear the guard before creating a new peer - as usual, our peer implementations use the SolarMutex // #82300# - 2000-12-21 - fs@openoffice.org if (bNeedNewPeer && xParent.is()) @@ -663,7 +663,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent mxPeer.clear(); mxVclWindowPeer = NULL; mbRefeshingPeer = sal_True; - Reference< XWindowPeer > xP( xParent, UNO_QUERY ); + Reference< XWindowPeer > xP( xParent, UNO_QUERY ); xThis->createPeer( Reference< XToolkit > (), xP ); mbRefeshingPeer = sal_False; aPeerPropertiesToSet.clear(); @@ -684,7 +684,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent // To prevent deadlocks resulting from this, we do this without our own mutex locked // 2000-11-03 - fs@openoffice.org PropertyValueVectorIterator aEnd = aPeerPropertiesToSet.end(); - for ( PropertyValueVectorIterator aLoop = aPeerPropertiesToSet.begin(); + for ( PropertyValueVectorIterator aLoop = aPeerPropertiesToSet.begin(); aLoop != aEnd; ++aLoop ) @@ -776,17 +776,17 @@ void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3 Reference< XWindow > xWindow; { ::osl::MutexGuard aGuard( GetMutex() ); - + if ( Flags & awt::PosSize::X ) - maComponentInfos.nX = X; + maComponentInfos.nX = X; if ( Flags & awt::PosSize::Y ) - maComponentInfos.nY = Y; + maComponentInfos.nY = Y; if ( Flags & awt::PosSize::WIDTH ) - maComponentInfos.nWidth = Width; + maComponentInfos.nWidth = Width; if ( Flags & awt::PosSize::HEIGHT ) maComponentInfos.nHeight = Height; maComponentInfos.nFlags |= Flags; - + xWindow = xWindow.query( getPeer() ); } @@ -814,7 +814,7 @@ void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException) Reference< XWindow > xWindow; { ::osl::MutexGuard aGuard( GetMutex() ); - + // Visible status ist Sache der View maComponentInfos.bVisible = bVisible; xWindow = xWindow.query( getPeer() ); @@ -828,7 +828,7 @@ void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException) Reference< XWindow > xWindow; { ::osl::MutexGuard aGuard( GetMutex() ); - + // Enable status ist Sache der View maComponentInfos.bEnable = bEnable; xWindow = xWindow.query( getPeer() ); @@ -837,7 +837,7 @@ void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException) xWindow->setEnable( bEnable ); } -void UnoControl::setFocus( ) throw(RuntimeException) +void UnoControl::setFocus( ) throw(RuntimeException) { Reference< XWindow > xWindow; { @@ -1010,7 +1010,7 @@ sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) throw( Reference< XView > xView; { ::osl::MutexGuard aGuard( GetMutex() ); - + mxGraphics = rDevice; xView = xView.query( getPeer() ); } @@ -1047,7 +1047,7 @@ void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException) if ( xDrawPeerView.is() ) { Reference< XVclWindowPeer > xWindowPeer; - xWindowPeer.set( xDrawPeer, UNO_QUERY ); + xWindowPeer.set( xDrawPeer, UNO_QUERY ); if ( xWindowPeer.is() ) xWindowPeer->setDesignMode( mbDesignMode ); xDrawPeerView->draw( x, y ); @@ -1062,7 +1062,7 @@ void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException) Reference< XView > xView; { ::osl::MutexGuard aGuard( GetMutex() ); - + maComponentInfos.nZoomX = fZoomX; maComponentInfos.nZoomY = fZoomY; @@ -1076,14 +1076,14 @@ void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException) void UnoControl::setContext( const Reference< XInterface >& rxContext ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + mxContext = rxContext; } Reference< XInterface > UnoControl::getContext( ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + return mxContext; } @@ -1123,7 +1123,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer aException.Context = (XAggregation*)(::cppu::OWeakAggObject*)this; throw( aException ); } - + if( !getPeer().is() ) { mbCreatingPeer = sal_True; @@ -1133,7 +1133,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer if( rParentPeer.is() && mxContext.is() ) { // kein TopWindow - if ( !xToolkit.is() ) + if ( !xToolkit.is() ) xToolkit = rParentPeer->getToolkit(); Any aAny = OWeakAggObject::queryInterface( ::getCppuType((const Reference< XControlContainer>*)0) ); Reference< XControlContainer > xC; @@ -1148,13 +1148,13 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer { // Nur richtig, wenn es sich um ein Top Window handelt if( rParentPeer.is() ) { - if ( !xToolkit.is() ) + if ( !xToolkit.is() ) xToolkit = rParentPeer->getToolkit(); eType = WindowClass_CONTAINER; } else { - if ( !xToolkit.is() ) + if ( !xToolkit.is() ) xToolkit = VCLUnoHelper::CreateToolkit(); eType = WindowClass_TOP; } @@ -1169,7 +1169,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer // Border Reference< XPropertySet > xPSet( mxModel, UNO_QUERY ); Reference< XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); - + Any aVal; ::rtl::OUString aPropName = GetPropertyName( BASEPROPERTY_BORDER ); if ( xInfo->hasPropertyByName( aPropName ) ) @@ -1226,7 +1226,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer if ( ( aVal >>= b ) && b) aDescr.WindowAttributes |= VclWindowPeerAttribute::DROPDOWN; } - + // Spin aPropName = GetPropertyName( BASEPROPERTY_SPIN ); if ( xInfo->hasPropertyByName( aPropName ) ) @@ -1278,7 +1278,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer } //added for issue79712 - //NoLabel + //NoLabel aPropName = GetPropertyName( BASEPROPERTY_NOLABEL ); if ( xInfo->hasPropertyByName( aPropName ) ) { @@ -1288,7 +1288,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer aDescr.WindowAttributes |= VclWindowPeerAttribute::NOLABEL; } //issue79712 ends - + // Align aPropName = GetPropertyName( BASEPROPERTY_ALIGN ); if ( xInfo->hasPropertyByName( aPropName ) ) @@ -1364,7 +1364,7 @@ Reference< XWindowPeer > UnoControl::getPeer() throw(RuntimeException) sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + Reference< XMultiPropertySet > xPropSet( mxModel, UNO_QUERY ); // query for the XPropertiesChangeListener - our delegator is allowed to overwrite this interface @@ -1399,14 +1399,14 @@ sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw return mxModel.is(); } -Reference< XControlModel > UnoControl::getModel( ) throw(RuntimeException) +Reference< XControlModel > UnoControl::getModel( ) throw(RuntimeException) { return mxModel; } Reference< XView > UnoControl::getView( ) throw(RuntimeException) { - return static_cast< XView* >( this ); + return static_cast< XView* >( this ); } void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException) @@ -1439,7 +1439,7 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException) maModeChangeListeners.notifyEach( &XModeChangeListener::modeChanged, aModeChangeEvent ); } -sal_Bool UnoControl::isDesignMode( ) throw(RuntimeException) +sal_Bool UnoControl::isDesignMode( ) throw(RuntimeException) { return mbDesignMode; } @@ -1450,7 +1450,7 @@ sal_Bool UnoControl::isTransparent( ) throw(RuntimeException) } // XServiceInfo -::rtl::OUString UnoControl::getImplementationName( ) throw(RuntimeException) +::rtl::OUString UnoControl::getImplementationName( ) throw(RuntimeException) { DBG_ERROR( "This method should be overloaded!" ); return ::rtl::OUString(); @@ -1459,7 +1459,7 @@ sal_Bool UnoControl::isTransparent( ) throw(RuntimeException) sal_Bool UnoControl::supportsService( const ::rtl::OUString& rServiceName ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - + Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); const ::rtl::OUString* pArray = aSNL.getConstArray(); const ::rtl::OUString* pArrayEnd = aSNL.getConstArray() + aSNL.getLength(); @@ -1487,7 +1487,7 @@ Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext( ) th if ( !xCurrentContext.is() ) { if ( !mbDesignMode ) - { // in alive mode, use the AccessibleContext of the peer + { // in alive mode, use the AccessibleContext of the peer Reference< XAccessible > xPeerAcc( getPeer(), UNO_QUERY ); if ( xPeerAcc.is() ) xCurrentContext = xPeerAcc->getAccessibleContext( ); diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx index 254fefe54cd0..20eda935000b 100644 --- a/toolkit/source/controls/unocontrolbase.cxx +++ b/toolkit/source/controls/unocontrolbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,9 +36,9 @@ #include <tools/debug.hxx> -// ---------------------------------------------------- -// class UnoControlBase -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlBase +// ---------------------------------------------------- sal_Bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId ) { @@ -92,7 +92,7 @@ void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequenc void UnoControlBase::ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis ) { // Model ggf. schon abgemeldet, aber ein Event schlaegt noch zu... - if ( mxModel.is() ) + if ( mxModel.is() ) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet( mxModel, ::com::sun::star::uno::UNO_QUERY ); if ( !bUpdateThis ) diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 7aa2e63fd9cc..4918f9e37dfc 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,9 +56,9 @@ using namespace ::com::sun::star; extern WorkWindow* lcl_GetDefaultWindow(); -// ---------------------------------------------------- -// class UnoControlHolder -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlHolder +// ---------------------------------------------------- struct UnoControlHolder { uno::Reference< awt::XControl > mxControl; @@ -66,7 +66,7 @@ struct UnoControlHolder public: UnoControlHolder( const ::rtl::OUString& rName, const uno::Reference< awt::XControl > & rControl ) - : mxControl( rControl ), + : mxControl( rControl ), msName( rName ) { } @@ -328,10 +328,10 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdenti } throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "out of identifiers" ) ), NULL ); } -// ---------------------------------------------------- -// Function to set the controls' visibility according -// to the dialog's "Step" property -// ---------------------------------------------------- +// ---------------------------------------------------- +// Function to set the controls' visibility according +// to the dialog's "Step" property +// ---------------------------------------------------- void implUpdateVisibility ( sal_Int32 nDialogStep, @@ -373,9 +373,9 @@ void implUpdateVisibility } -// ---------------------------------------------------- -// class DialogStepChangedListener -// ---------------------------------------------------- +// ---------------------------------------------------- +// class DialogStepChangedListener +// ---------------------------------------------------- typedef ::cppu::WeakImplHelper1< beans::XPropertyChangeListener > PropertyChangeListenerHelper; class DialogStepChangedListener: public PropertyChangeListenerHelper @@ -388,7 +388,7 @@ public: : mxControlContainer( xControlContainer ) {} // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw( uno::RuntimeException); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw( uno::RuntimeException); // XPropertyChangeListener virtual void SAL_CALL propertyChange( const beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException); @@ -401,7 +401,7 @@ void SAL_CALL DialogStepChangedListener::disposing( const lang::EventObject& /* mxControlContainer.clear(); } -void SAL_CALL DialogStepChangedListener::propertyChange( const beans::PropertyChangeEvent& evt ) +void SAL_CALL DialogStepChangedListener::propertyChange( const beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException) { // evt.PropertyName HAS to be "Step" because we only use the listener for that @@ -410,16 +410,16 @@ void SAL_CALL DialogStepChangedListener::propertyChange( const beans::PropertyC implUpdateVisibility( nDialogStep, mxControlContainer ); } -// ---------------------------------------------------- -// class UnoControlContainer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlContainer +// ---------------------------------------------------- UnoControlContainer::UnoControlContainer() : maCListeners( *this ) { mpControls = new UnoControlHolderList; } UnoControlContainer::UnoControlContainer( uno::Reference< awt::XWindowPeer > xP ) - : maCListeners( *this ) + : maCListeners( *this ) { setPeer( xP ); mbDisposePeer = sal_False; @@ -442,7 +442,7 @@ void UnoControlContainer::ImplActivateTabControllers() } // lang::XComponent -void UnoControlContainer::dispose( ) throw(uno::RuntimeException) +void UnoControlContainer::dispose( ) throw(uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -643,7 +643,7 @@ void UnoControlContainer::impl_createControlPeerIfNecessary( const uno::Referenc // if the container already has a peer, then also create a peer for the control uno::Reference< awt::XWindowPeer > xMyPeer( getPeer() ); - + if( xMyPeer.is() ) { _rxControl->createPeer( NULL, xMyPeer ); diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index c29886dadf5f..cc5aba769fb8 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,9 +34,9 @@ #include <toolkit/helper/servicenames.hxx> #include <toolkit/helper/unopropertyarrayhelper.hxx> -// ---------------------------------------------------- -// class UnoControlContainerModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlContainerModel +// ---------------------------------------------------- UnoControlContainerModel::UnoControlContainerModel() { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -75,11 +75,11 @@ UnoControlContainerModel::UnoControlContainerModel() ::cppu::IPropertyArrayHelper& UnoControlContainerModel::getInfoHelper() { ::osl::Guard< ::osl::Mutex > aGuard( ((UnoControlContainerModel*)this)->GetMutex() ); - + static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - ::com::sun::star::uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + ::com::sun::star::uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 4ad984647eb4..10a14d733e52 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,8 +74,8 @@ using ::com::sun::star::awt::FontDescriptor; struct ImplControlProperty { private: - sal_uInt16 nId; - ::com::sun::star::uno::Any aValue; + sal_uInt16 nId; + ::com::sun::star::uno::Any aValue; public: ImplControlProperty( const ImplControlProperty& rProp ) : aValue( rProp.aValue ) @@ -93,67 +93,67 @@ public: nId = nT; } - sal_uInt16 GetId() const { return nId; } - const ::com::sun::star::uno::Any& GetValue() const { return aValue; } - void SetValue( const ::com::sun::star::uno::Any& rValue ) { aValue = rValue; } + sal_uInt16 GetId() const { return nId; } + const ::com::sun::star::uno::Any& GetValue() const { return aValue; } + void SetValue( const ::com::sun::star::uno::Any& rValue ) { aValue = rValue; } }; DECLARE_TABLE( ImplPropertyTable, ImplControlProperty* ) -#define UNOCONTROL_STREAMVERSION (short)2 +#define UNOCONTROL_STREAMVERSION (short)2 static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, const Any& rValue ) { // some props are defined with other types than the matching FontDescriptor members have // (e.g. FontWidth, FontSlant) // 78474 - 09/19/2000 - FS - float nExtractFloat = 0; - sal_Int16 nExtractShort = 0; + float nExtractFloat = 0; + sal_Int16 nExtractShort = 0; switch ( nPropId ) { - case BASEPROPERTY_FONTDESCRIPTORPART_NAME: rValue >>= rFD.Name; + case BASEPROPERTY_FONTDESCRIPTORPART_NAME: rValue >>= rFD.Name; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: rValue >>= rFD.StyleName; + case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: rValue >>= rFD.StyleName; break; - case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: rValue >>= rFD.Family; + case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: rValue >>= rFD.Family; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: rValue >>= rFD.CharSet; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: rValue >>= rFD.CharSet; break; - case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue >>= nExtractFloat; rFD.Height = (sal_Int16)nExtractFloat; + case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue >>= nExtractFloat; rFD.Height = (sal_Int16)nExtractFloat; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: rValue >>= rFD.Weight; + case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: rValue >>= rFD.Weight; break; - case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: if ( rValue >>= nExtractShort ) + case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: if ( rValue >>= nExtractShort ) rFD.Slant = (::com::sun::star::awt::FontSlant)nExtractShort; else rValue >>= rFD.Slant; break; - case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: rValue >>= rFD.Underline; + case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: rValue >>= rFD.Underline; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: rValue >>= rFD.Strikeout; + case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: rValue >>= rFD.Strikeout; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: rValue >>= rFD.Width; + case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: rValue >>= rFD.Width; break; - case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: rValue >>= rFD.Pitch; + case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: rValue >>= rFD.Pitch; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: rValue >>= rFD.CharacterWidth; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: rValue >>= rFD.CharacterWidth; break; - case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: rValue >>= rFD.Orientation; + case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: rValue >>= rFD.Orientation; break; - case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: rValue >>= rFD.Kerning; + case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: rValue >>= rFD.Kerning; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: rValue >>= rFD.WordLineMode; + case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: rValue >>= rFD.WordLineMode; break; - case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue >>= rFD.Type; + case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue >>= rFD.Type; break; - default: DBG_ERROR( "FontProperty?!" ); + default: DBG_ERROR( "FontProperty?!" ); } } -// ---------------------------------------------------- -// class UnoControlModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlModel +// ---------------------------------------------------- UnoControlModel::UnoControlModel() : OPropertySetHelper( BrdcstHelper ), maDisposeListeners( *this ) { @@ -193,7 +193,7 @@ UnoControlModel::~UnoControlModel() delete mpData; } -UnoControlModel* UnoControlModel::Clone() const +UnoControlModel* UnoControlModel::Clone() const { DBG_ERROR( "UnoControlModel::Clone() ?!" ); return NULL; @@ -202,7 +202,7 @@ UnoControlModel* UnoControlModel::Clone() const ::com::sun::star::uno::Sequence<sal_Int32> UnoControlModel::ImplGetPropertyIds() const { sal_uInt32 nIDs = mpData->Count(); - ::com::sun::star::uno::Sequence<sal_Int32> aIDs( nIDs ); + ::com::sun::star::uno::Sequence<sal_Int32> aIDs( nIDs ); sal_Int32* pIDs = aIDs.getArray(); for ( sal_uInt32 n = 0; n < nIDs; n++ ) pIDs[n] = mpData->GetObjectKey( n ); @@ -232,23 +232,23 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const EmptyFontDescriptor aFD; switch ( nPropId ) { - case BASEPROPERTY_FONTDESCRIPTOR: aDefault <<= aFD; break; - case BASEPROPERTY_FONTDESCRIPTORPART_NAME: aDefault <<= aFD.Name; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: aDefault <<= aFD.StyleName; break; - case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: aDefault <<= aFD.Family; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: aDefault <<= aFD.CharSet; break; - case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: aDefault <<= (float)aFD.Height; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: aDefault <<= aFD.Weight; break; - case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: aDefault <<= (sal_Int16)aFD.Slant; break; - case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: aDefault <<= aFD.Underline; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: aDefault <<= aFD.Strikeout; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: aDefault <<= aFD.Width; break; - case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: aDefault <<= aFD.Pitch; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: aDefault <<= aFD.CharacterWidth; break; - case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: aDefault <<= aFD.Orientation; break; - case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: aDefault <<= aFD.Kerning; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: aDefault <<= aFD.WordLineMode; break; - case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: aDefault <<= aFD.Type; break; + case BASEPROPERTY_FONTDESCRIPTOR: aDefault <<= aFD; break; + case BASEPROPERTY_FONTDESCRIPTORPART_NAME: aDefault <<= aFD.Name; break; + case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: aDefault <<= aFD.StyleName; break; + case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: aDefault <<= aFD.Family; break; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: aDefault <<= aFD.CharSet; break; + case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: aDefault <<= (float)aFD.Height; break; + case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: aDefault <<= aFD.Weight; break; + case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: aDefault <<= (sal_Int16)aFD.Slant; break; + case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: aDefault <<= aFD.Underline; break; + case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: aDefault <<= aFD.Strikeout; break; + case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: aDefault <<= aFD.Width; break; + case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: aDefault <<= aFD.Pitch; break; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: aDefault <<= aFD.CharacterWidth; break; + case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: aDefault <<= aFD.Orientation; break; + case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: aDefault <<= aFD.Kerning; break; + case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: aDefault <<= aFD.WordLineMode; break; + case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: aDefault <<= aFD.Type; break; default: DBG_ERROR( "FontProperty?!" ); } } @@ -275,9 +275,9 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_DATESHOWCENTURY: case BASEPROPERTY_TIME: case BASEPROPERTY_VALUE_DOUBLE: - case BASEPROPERTY_PROGRESSVALUE: - case BASEPROPERTY_SCROLLVALUE: - case BASEPROPERTY_VISIBLESIZE: + case BASEPROPERTY_PROGRESSVALUE: + case BASEPROPERTY_SCROLLVALUE: + case BASEPROPERTY_VISIBLESIZE: case BASEPROPERTY_BACKGROUNDCOLOR: case BASEPROPERTY_FILLCOLOR: break; // Void @@ -303,14 +303,14 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_TIMEMIN: aDefault <<= (sal_Int32) 0; break; case BASEPROPERTY_VALUEMAX_DOUBLE: aDefault <<= (double) 1000000; break; case BASEPROPERTY_VALUEMIN_DOUBLE: aDefault <<= (double) -1000000; break; - case BASEPROPERTY_VALUESTEP_DOUBLE: aDefault <<= (double ) 1; break; + case BASEPROPERTY_VALUESTEP_DOUBLE: aDefault <<= (double ) 1; break; case BASEPROPERTY_PROGRESSVALUE_MAX: aDefault <<= (sal_Int32) 100; break; case BASEPROPERTY_PROGRESSVALUE_MIN: aDefault <<= (sal_Int32) 0; break; - case BASEPROPERTY_SCROLLVALUE_MAX: aDefault <<= (sal_Int32) 100; break; - case BASEPROPERTY_SCROLLVALUE_MIN: aDefault <<= (sal_Int32) 0; break; - case BASEPROPERTY_LINEINCREMENT: aDefault <<= (sal_Int32) 1; break; - case BASEPROPERTY_BLOCKINCREMENT: aDefault <<= (sal_Int32) 10; break; - case BASEPROPERTY_ORIENTATION: aDefault <<= (sal_Int32) 0; break; + case BASEPROPERTY_SCROLLVALUE_MAX: aDefault <<= (sal_Int32) 100; break; + case BASEPROPERTY_SCROLLVALUE_MIN: aDefault <<= (sal_Int32) 0; break; + case BASEPROPERTY_LINEINCREMENT: aDefault <<= (sal_Int32) 1; break; + case BASEPROPERTY_BLOCKINCREMENT: aDefault <<= (sal_Int32) 10; break; + case BASEPROPERTY_ORIENTATION: aDefault <<= (sal_Int32) 0; break; case BASEPROPERTY_SPINVALUE: aDefault <<= (sal_Int32) 0; break; case BASEPROPERTY_SPININCREMENT: aDefault <<= (sal_Int32) 1; break; case BASEPROPERTY_SPINVALUE_MIN: aDefault <<= (sal_Int32) 0; break; @@ -354,7 +354,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_HELPTEXT: case BASEPROPERTY_HELPURL: case BASEPROPERTY_IMAGEURL: - case BASEPROPERTY_DIALOGSOURCEURL: + case BASEPROPERTY_DIALOGSOURCEURL: case BASEPROPERTY_EDITMASK: case BASEPROPERTY_LITERALMASK: case BASEPROPERTY_LABEL: @@ -411,8 +411,8 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const // look for the currency entry (for this language) which has the given bank symbol Sequence< Currency2 > aAllCurrencies = aLocaleInfo.getAllCurrencies(); - const Currency2* pAllCurrencies = aAllCurrencies.getConstArray(); - const Currency2* pAllCurrenciesEnd = pAllCurrencies + aAllCurrencies.getLength(); + const Currency2* pAllCurrencies = aAllCurrencies.getConstArray(); + const Currency2* pAllCurrenciesEnd = pAllCurrencies + aAllCurrencies.getLength(); ::rtl::OUString sCurrencySymbol = aLocaleInfo.getCurrSymbol(); if ( !sBankSymbol.getLength() ) @@ -638,7 +638,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: for ( i = 0; i < nProps; i++ ) { sal_Int32 nPropDataBeginMark = xMark->createMark(); - OutStream->writeLong( 0L ); // DataLen + OutStream->writeLong( 0L ); // DataLen ImplControlProperty* pProp = aProps.GetObject( i ); OutStream->writeShort( pProp->GetId() ); @@ -782,9 +782,9 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: for ( sal_uInt16 n = BASEPROPERTY_FONT_TYPE; n <= BASEPROPERTY_FONT_ATTRIBS; n++ ) { sal_Int32 nPropDataBeginMark = xMark->createMark(); - OutStream->writeLong( 0L ); // DataLen - OutStream->writeShort( n ); // PropId - OutStream->writeBoolean( sal_False ); // Void + OutStream->writeLong( 0L ); // DataLen + OutStream->writeShort( n ); // PropId + OutStream->writeBoolean( sal_False ); // Void if ( n == BASEPROPERTY_FONT_TYPE ) { @@ -924,7 +924,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { long nEntries = InStream->readLong(); ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq( nEntries ); - for ( long n = 0; n < nEntries; n++ ) + for ( long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = InStream->readUTF(); aValue <<= aSeq; @@ -934,7 +934,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { long nEntries = InStream->readLong(); ::com::sun::star::uno::Sequence<sal_uInt16> aSeq( nEntries ); - for ( long n = 0; n < nEntries; n++ ) + for ( long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = (sal_uInt16)InStream->readShort(); aValue <<= aSeq; } @@ -942,7 +942,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { long nEntries = InStream->readLong(); ::com::sun::star::uno::Sequence<sal_Int16> aSeq( nEntries ); - for ( long n = 0; n < nEntries; n++ ) + for ( long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = (sal_Int16)InStream->readShort(); aValue <<= aSeq; } @@ -970,7 +970,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { // Sonst ist es nur die redundante Info fuer alte Versionen // Daten werden durch MarkableStream geskippt. - if ( nVersion < 2 ) + if ( nVersion < 2 ) { if ( !pFD ) { @@ -999,7 +999,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: } pFD->Width = (sal_Int16)InStream->readLong(); pFD->Height = (sal_Int16)InStream->readLong(); - InStream->readShort(); // ::com::sun::star::awt::FontWidth ignorieren - wurde mal falsch geschrieben und wird nicht gebraucht. + InStream->readShort(); // ::com::sun::star::awt::FontWidth ignorieren - wurde mal falsch geschrieben und wird nicht gebraucht. pFD->CharacterWidth = ::com::sun::star::awt::FontWidth::DONTKNOW; } } @@ -1007,7 +1007,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { if ( nVersion < 2 ) { - if ( !pFD ) + if ( !pFD ) { pFD = new ::com::sun::star::awt::FontDescriptor; ImplControlProperty* pProp = mpData->Get( BASEPROPERTY_FONTDESCRIPTOR ); @@ -1038,7 +1038,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: } } - if ( mpData->Get( nPropId ) ) + if ( mpData->Get( nPropId ) ) { aProps.getArray()[i] = GetPropertyName( nPropId ); aValues.getArray()[i] = aValue; @@ -1051,13 +1051,13 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: // Falls bereits mehr drinsteht als diese Version kennt: xMark->jumpToMark( nPropDataBeginMark ); InStream->skipBytes( nPropDataLen ); - xMark->deleteMark(nPropDataBeginMark); + xMark->deleteMark(nPropDataBeginMark); } - if ( bInvalidEntries ) + if ( bInvalidEntries ) { - for ( i = 0; i < (sal_uInt32)aProps.getLength(); i++ ) + for ( i = 0; i < (sal_uInt32)aProps.getLength(); i++ ) { - if ( !aProps.getConstArray()[i].getLength() ) + if ( !aProps.getConstArray()[i].getLength() ) { ::comphelper::removeElementAt( aProps, i ); ::comphelper::removeElementAt( aValues, i ); @@ -1065,7 +1065,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: } } } - + try { setPropertyValues( aProps, aValues ); @@ -1075,7 +1075,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: DBG_UNHANDLED_EXCEPTION(); } - if ( pFD ) + if ( pFD ) { ::com::sun::star::uno::Any aValue; aValue <<= *pFD; @@ -1090,13 +1090,13 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { DBG_ERROR( "This method should be overloaded!" ); return ::rtl::OUString(); - + } sal_Bool UnoControlModel::supportsService( const ::rtl::OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); const ::rtl::OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) @@ -1168,7 +1168,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & if ( bConverted ) rConvertedValue <<= nAsDouble; else - { // try as integer - 96136 - 2002-10-08 - fs@openoffice.org + { // try as integer - 96136 - 2002-10-08 - fs@openoffice.org sal_Int32 nAsInteger = 0; bConverted = ( rValue >>= nAsInteger ); if ( bConverted ) @@ -1260,7 +1260,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) { // Fehlt: Die gefakten Einzelproperties des FontDescriptors... - + ImplControlProperty* pProp = mpData->Get( nPropId ); ENSURE_OR_RETURN_VOID( pProp, "UnoControlModel::setFastPropertyValue_NoBroadcast: invalid property id!" ); @@ -1271,9 +1271,9 @@ void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nPropId ) const { ::osl::Guard< ::osl::Mutex > aGuard( ((UnoControlModel*)this)->GetMutex() ); - + ImplControlProperty* pProp = mpData->Get( nPropId ); - + if ( pProp ) rValue = pProp->GetValue(); else if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) @@ -1281,39 +1281,39 @@ void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, pProp = mpData->Get( BASEPROPERTY_FONTDESCRIPTOR ); ::com::sun::star::awt::FontDescriptor aFD; pProp->GetValue() >>= aFD; - switch ( nPropId ) + switch ( nPropId ) { - case BASEPROPERTY_FONTDESCRIPTORPART_NAME: rValue <<= aFD.Name; + case BASEPROPERTY_FONTDESCRIPTORPART_NAME: rValue <<= aFD.Name; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: rValue <<= aFD.StyleName; + case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME: rValue <<= aFD.StyleName; break; - case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: rValue <<= aFD.Family; + case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY: rValue <<= aFD.Family; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: rValue <<= aFD.CharSet; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET: rValue <<= aFD.CharSet; break; - case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue <<= (float)aFD.Height; + case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT: rValue <<= (float)aFD.Height; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: rValue <<= aFD.Weight; + case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: rValue <<= aFD.Weight; break; - case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: rValue <<= (sal_Int16)aFD.Slant; + case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: rValue <<= (sal_Int16)aFD.Slant; break; - case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: rValue <<= aFD.Underline; + case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE: rValue <<= aFD.Underline; break; - case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: rValue <<= aFD.Strikeout; + case BASEPROPERTY_FONTDESCRIPTORPART_STRIKEOUT: rValue <<= aFD.Strikeout; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: rValue <<= aFD.Width; + case BASEPROPERTY_FONTDESCRIPTORPART_WIDTH: rValue <<= aFD.Width; break; - case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: rValue <<= aFD.Pitch; + case BASEPROPERTY_FONTDESCRIPTORPART_PITCH: rValue <<= aFD.Pitch; break; - case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: rValue <<= aFD.CharacterWidth; + case BASEPROPERTY_FONTDESCRIPTORPART_CHARWIDTH: rValue <<= aFD.CharacterWidth; break; - case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: rValue <<= aFD.Orientation; + case BASEPROPERTY_FONTDESCRIPTORPART_ORIENTATION: rValue <<= aFD.Orientation; break; - case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: rValue <<= aFD.Kerning; + case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: rValue <<= aFD.Kerning; break; - case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: rValue <<= aFD.WordLineMode; + case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: rValue <<= aFD.WordLineMode; break; - case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue <<= aFD.Type; + case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue <<= aFD.Type; break; default: DBG_ERROR( "FontProperty?!" ); } @@ -1345,7 +1345,7 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun: if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); - + Any aOldSingleValue; getFastPropertyValue( aOldSingleValue, BASEPROPERTY_FONTDESCRIPTORPART_START ); @@ -1384,10 +1384,10 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun: void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); - + sal_Int32 nProps = rPropertyNames.getLength(); -// sal_Int32* pHandles = new sal_Int32[nProps]; +// sal_Int32* pHandles = new sal_Int32[nProps]; // don't do this - it leaks in case of an exception Sequence< sal_Int32 > aHandles( nProps ); sal_Int32* pHandles = aHandles.getArray(); @@ -1399,16 +1399,16 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< sal_Int32 nValidHandles = getInfoHelper().fillHandles( pHandles, rPropertyNames ); - if ( nValidHandles ) + if ( nValidHandles ) { // if somebody sets properties which are single aspects of a font descriptor, // remove them, and build a font descriptor instead ::std::auto_ptr< awt::FontDescriptor > pFD; - for ( sal_uInt16 n = 0; n < nProps; ++n ) + for ( sal_uInt16 n = 0; n < nProps; ++n ) { if ( ( pHandles[n] >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( pHandles[n] <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) { - if ( !pFD.get() ) + if ( !pFD.get() ) { ImplControlProperty* pProp = mpData->Get( BASEPROPERTY_FONTDESCRIPTOR ); pFD.reset( new awt::FontDescriptor ); @@ -1433,9 +1433,9 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< else aGuard.clear(); // same as a few lines above - + // FD-Propertie nicht in das Array mergen, weil sortiert... - if ( pFD.get() ) + if ( pFD.get() ) { ::com::sun::star::uno::Any aValue; aValue <<= *pFD; diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index b72ae69e44c6..90fcba2e4e32 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ using namespace ::toolkit; #define IMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \ ::rtl::OUString SAL_CALL ImplName::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii( "stardiv.Toolkit." #ImplName ); } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ { \ ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = BaseClass::getSupportedServiceNames( ); \ aNames.realloc( aNames.getLength() + 1 ); \ @@ -91,9 +91,9 @@ using namespace ::toolkit; -// ---------------------------------------------------- -// class UnoControlEditModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlEditModel +// ---------------------------------------------------- UnoControlEditModel::UnoControlEditModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit ); @@ -128,7 +128,7 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -142,9 +142,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInf } -// ---------------------------------------------------- -// class UnoEditControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoEditControl +// ---------------------------------------------------- UnoEditControl::UnoEditControl() :maTextListeners( *this ) ,mnMaxTextLen( 0 ) @@ -456,9 +456,9 @@ void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) t } -// ---------------------------------------------------- -// class UnoControlFileControlModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlFileControlModel +// ---------------------------------------------------- UnoControlFileControlModel::UnoControlFileControlModel() { ImplRegisterProperty( BASEPROPERTY_ALIGN ); @@ -502,7 +502,7 @@ uno::Any UnoControlFileControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -515,9 +515,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropert return xInfo; } -// ---------------------------------------------------- -// class UnoFileControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoFileControl +// ---------------------------------------------------- UnoFileControl::UnoFileControl() { } @@ -527,9 +527,9 @@ UnoFileControl::UnoFileControl() return ::rtl::OUString::createFromAscii( "filecontrol" ); } -// ---------------------------------------------------- -// class GraphicControlModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class GraphicControlModel +// ---------------------------------------------------- uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { if ( nPropId == BASEPROPERTY_GRAPHIC ) @@ -634,9 +634,9 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n } } -// ---------------------------------------------------- -// class UnoControlButtonModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlButtonModel +// ---------------------------------------------------- UnoControlButtonModel::UnoControlButtonModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXButton ); @@ -677,7 +677,7 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -690,9 +690,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetI return xInfo; } -// ---------------------------------------------------- -// class UnoButtonControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoButtonControl +// ---------------------------------------------------- UnoButtonControl::UnoButtonControl() : maActionListeners( *this ) , maItemListeners( *this ) @@ -829,9 +829,9 @@ awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw( return Impl_calcAdjustedSize( rNewSize ); } -// ---------------------------------------------------- -// class UnoControlImageControlModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlImageControlModel +// ---------------------------------------------------- UnoControlImageControlModel::UnoControlImageControlModel() :mbAdjustingImageScaleMode( false ) { @@ -859,7 +859,7 @@ uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -910,9 +910,9 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal } } -// ---------------------------------------------------- -// class UnoImageControlControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoImageControlControl +// ---------------------------------------------------- UnoImageControlControl::UnoImageControlControl() : maActionListeners( *this ) { @@ -954,9 +954,9 @@ awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize ) return Impl_calcAdjustedSize( rNewSize ); } -// ---------------------------------------------------- -// class UnoControlRadioButtonModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlRadioButtonModel +// ---------------------------------------------------- UnoControlRadioButtonModel::UnoControlRadioButtonModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton ); @@ -986,7 +986,7 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -1001,9 +1001,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropert -// ---------------------------------------------------- -// class UnoRadioButtonControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoRadioButtonControl +// ---------------------------------------------------- UnoRadioButtonControl::UnoRadioButtonControl() : maItemListeners( *this ), maActionListeners( *this ) { @@ -1161,9 +1161,9 @@ awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) t return Impl_calcAdjustedSize( rNewSize ); } -// ---------------------------------------------------- -// class UnoControlCheckBoxModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlCheckBoxModel +// ---------------------------------------------------- UnoControlCheckBoxModel::UnoControlCheckBoxModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox ); @@ -1193,7 +1193,7 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -1208,9 +1208,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySe -// ---------------------------------------------------- -// class UnoCheckBoxControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoCheckBoxControl +// ---------------------------------------------------- UnoCheckBoxControl::UnoCheckBoxControl() : maItemListeners( *this ), maActionListeners( *this ) { @@ -1344,9 +1344,9 @@ awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) thro return Impl_calcAdjustedSize( rNewSize ); } -// ---------------------------------------------------- +// ---------------------------------------------------- // class UnoControlFixedHyperlinkModel -// ---------------------------------------------------- +// ---------------------------------------------------- UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink ); @@ -1386,7 +1386,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -1399,9 +1399,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getProp return xInfo; } -// ---------------------------------------------------- +// ---------------------------------------------------- // class UnoFixedHyperlinkControl -// ---------------------------------------------------- +// ---------------------------------------------------- UnoFixedHyperlinkControl::UnoFixedHyperlinkControl() : maActionListeners( *this ) { @@ -1659,9 +1659,9 @@ awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) thr return Impl_calcAdjustedSize( rNewSize ); } -// ---------------------------------------------------- -// class UnoControlGroupBoxModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlGroupBoxModel +// ---------------------------------------------------- UnoControlGroupBoxModel::UnoControlGroupBoxModel() { ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL ); @@ -1697,7 +1697,7 @@ uno::Any UnoControlGroupBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -1710,9 +1710,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySe return xInfo; } -// ---------------------------------------------------- -// class UnoGroupBoxControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoGroupBoxControl +// ---------------------------------------------------- UnoGroupBoxControl::UnoGroupBoxControl() { maComponentInfos.nWidth = 100; @@ -1766,7 +1766,7 @@ uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -1779,9 +1779,9 @@ uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo( return xInfo; } -// ---------------------------------------------------- -// class MultiPageControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class MultiPageControl +// ---------------------------------------------------- UnoMultiPageControl::UnoMultiPageControl() { maComponentInfos.nWidth = 100; @@ -1948,7 +1948,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -2342,9 +2342,9 @@ void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_n m_aItemListListeners.notifyEach( NotificationMethod, aEvent ); } -// ---------------------------------------------------- -// class UnoListBoxControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoListBoxControl +// ---------------------------------------------------- UnoListBoxControl::UnoListBoxControl() :maActionListeners( *this ) ,maItemListeners( *this ) @@ -2764,17 +2764,17 @@ void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEv if ( xPeerListener.is() ) xPeerListener->itemListChanged( i_rEvent ); } -ActionListenerMultiplexer& UnoListBoxControl::getActionListeners() +ActionListenerMultiplexer& UnoListBoxControl::getActionListeners() { return maActionListeners; } -ItemListenerMultiplexer& UnoListBoxControl::getItemListeners() +ItemListenerMultiplexer& UnoListBoxControl::getItemListeners() { return maItemListeners; } -// ---------------------------------------------------- -// class UnoControlComboBoxModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlComboBoxModel +// ---------------------------------------------------- UnoControlComboBoxModel::UnoControlComboBoxModel() : UnoControlListBoxModel(true) { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXComboBox ); @@ -2793,7 +2793,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySe static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -2847,11 +2847,11 @@ uno::Any UnoControlComboBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons return UnoControlModel::ImplGetDefaultValue( nPropId ); } -// ---------------------------------------------------- -// class UnoComboBoxControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoComboBoxControl +// ---------------------------------------------------- UnoComboBoxControl::UnoComboBoxControl() - : maActionListeners( *this ), + : maActionListeners( *this ), maItemListeners( *this ) { maComponentInfos.nWidth = 100; @@ -2961,7 +2961,7 @@ void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemLis { if( getPeer().is() && maItemListeners.getLength() == 1 ) { - uno::Reference < awt::XComboBox > xComboBox( getPeer(), uno::UNO_QUERY ); // MT: Mal alles so umstellen, schoener als Ref anlegen und query rufen + uno::Reference < awt::XComboBox > xComboBox( getPeer(), uno::UNO_QUERY ); // MT: Mal alles so umstellen, schoener als Ref anlegen und query rufen xComboBox->removeItemListener( &maItemListeners ); } maItemListeners.removeInterface( l ); @@ -3045,11 +3045,11 @@ void SAL_CALL UnoComboBoxControl::itemListChanged( const lang::EventObject& i_rE if ( xPeerListener.is() ) xPeerListener->itemListChanged( i_rEvent ); } -ActionListenerMultiplexer& UnoComboBoxControl::getActionListeners() +ActionListenerMultiplexer& UnoComboBoxControl::getActionListeners() { return maActionListeners; } -ItemListenerMultiplexer& UnoComboBoxControl::getItemListeners() +ItemListenerMultiplexer& UnoComboBoxControl::getItemListeners() { return maItemListeners; } @@ -3167,9 +3167,9 @@ sal_Int16 UnoComboBoxControl::getDropDownLineCount() throw(uno::RuntimeException } -// ---------------------------------------------------- -// UnoSpinFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// UnoSpinFieldControl +// ---------------------------------------------------- UnoSpinFieldControl::UnoSpinFieldControl() : maSpinListeners( *this ) { mbRepeat = sal_False; @@ -3257,9 +3257,9 @@ void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::sta xField->enableRepeat( bRepeat ); } -// ---------------------------------------------------- -// class UnoControlDateFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlDateFieldModel +// ---------------------------------------------------- UnoControlDateFieldModel::UnoControlDateFieldModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXDateField ); @@ -3287,7 +3287,7 @@ uno::Any UnoControlDateFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -3302,9 +3302,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertyS -// ---------------------------------------------------- -// class UnoDateFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoDateFieldControl +// ---------------------------------------------------- UnoDateFieldControl::UnoDateFieldControl() { mnFirst = Date( 1, 1, 1900 ).GetDate(); @@ -3497,9 +3497,9 @@ sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException) return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } -// ---------------------------------------------------- -// class UnoControlTimeFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlTimeFieldModel +// ---------------------------------------------------- UnoControlTimeFieldModel::UnoControlTimeFieldModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXTimeField ); @@ -3527,7 +3527,7 @@ uno::Any UnoControlTimeFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -3542,9 +3542,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertyS -// ---------------------------------------------------- -// class UnoTimeFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoTimeFieldControl +// ---------------------------------------------------- UnoTimeFieldControl::UnoTimeFieldControl() { mnFirst = Time( 0, 0 ).GetTime(); @@ -3696,9 +3696,9 @@ sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException) return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } -// ---------------------------------------------------- -// class UnoControlNumericFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlNumericFieldModel +// ---------------------------------------------------- UnoControlNumericFieldModel::UnoControlNumericFieldModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXNumericField ); @@ -3726,7 +3726,7 @@ uno::Any UnoControlNumericFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -3741,9 +3741,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getProper -// ---------------------------------------------------- -// class UnoNumericFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoNumericFieldControl +// ---------------------------------------------------- UnoNumericFieldControl::UnoNumericFieldControl() { mnFirst = 0; @@ -3892,9 +3892,9 @@ sal_Int16 UnoNumericFieldControl::getDecimalDigits() throw(uno::RuntimeException return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } -// ---------------------------------------------------- -// class UnoControlCurrencyFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlCurrencyFieldModel +// ---------------------------------------------------- UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCurrencyField ); @@ -3928,7 +3928,7 @@ uno::Any UnoControlCurrencyFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -3941,9 +3941,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPrope return xInfo; } -// ---------------------------------------------------- -// class UnoCurrencyFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoCurrencyFieldControl +// ---------------------------------------------------- UnoCurrencyFieldControl::UnoCurrencyFieldControl() { mnFirst = 0; @@ -4091,9 +4091,9 @@ sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() throw(uno::RuntimeExceptio return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } -// ---------------------------------------------------- -// class UnoControlPatternFieldModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlPatternFieldModel +// ---------------------------------------------------- UnoControlPatternFieldModel::UnoControlPatternFieldModel() { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXPatternField ); @@ -4120,7 +4120,7 @@ uno::Any UnoControlPatternFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -4134,9 +4134,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getProper } -// ---------------------------------------------------- -// class UnoPatternFieldControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoPatternFieldControl +// ---------------------------------------------------- UnoPatternFieldControl::UnoPatternFieldControl() { } @@ -4223,9 +4223,9 @@ sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException) } -// ---------------------------------------------------- -// class UnoControlProgressBarModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlProgressBarModel +// ---------------------------------------------------- UnoControlProgressBarModel::UnoControlProgressBarModel() { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -4265,7 +4265,7 @@ uno::Any UnoControlProgressBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -4279,9 +4279,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropert } -// ---------------------------------------------------- -// class UnoProgressBarControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoProgressBarControl +// ---------------------------------------------------- UnoProgressBarControl::UnoProgressBarControl() { } @@ -4355,9 +4355,9 @@ sal_Int32 UnoProgressBarControl::getValue() throw(::com::sun::star::uno::Runtime } -// ---------------------------------------------------- -// class UnoControlFixedLineModel -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoControlFixedLineModel +// ---------------------------------------------------- UnoControlFixedLineModel::UnoControlFixedLineModel() { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -4393,7 +4393,7 @@ uno::Any UnoControlFixedLineModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; @@ -4406,13 +4406,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertyS return xInfo; } -// ---------------------------------------------------- -// class UnoFixedLineControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoFixedLineControl +// ---------------------------------------------------- UnoFixedLineControl::UnoFixedLineControl() { - maComponentInfos.nWidth = 100; // ?? - maComponentInfos.nHeight = 100; // ?? + maComponentInfos.nWidth = 100; // ?? + maComponentInfos.nHeight = 100; // ?? } ::rtl::OUString UnoFixedLineControl::GetComponentServiceName() diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index f172e4791c51..63982e5d7a64 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/helper/externallock.cxx b/toolkit/source/helper/externallock.cxx index 9f5de20466cc..33be3e7e5c76 100644 --- a/toolkit/source/helper/externallock.cxx +++ b/toolkit/source/helper/externallock.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <vcl/svapp.hxx> // ----------------------------------------------------------------------------- -// class VCLExternalSolarLock +// class VCLExternalSolarLock // ----------------------------------------------------------------------------- void VCLExternalSolarLock::acquire() { diff --git a/toolkit/source/helper/fixedhyperbase.cxx b/toolkit/source/helper/fixedhyperbase.cxx index 0519593339d8..b9ce25f40f8f 100644 --- a/toolkit/source/helper/fixedhyperbase.cxx +++ b/toolkit/source/helper/fixedhyperbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace toolkit // ---------------------------------------------------- // class FixedHyperlinkBase -// ---------------------------------------------------- +// ---------------------------------------------------- FixedHyperlinkBase::FixedHyperlinkBase( Window* pParent, const ResId& rId ) : FixedText( pParent, rId ) diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index 32dccee23668..5f11d2b5aa88 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -423,7 +423,7 @@ namespace toolkitform OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_FONT ) >>= aUNOFont ); _rpDescriptor->TextFont = VCLUnoHelper::CreateFont( aUNOFont, Font() ); } - + // tab order rtl::OUString aTabIndexString( RTL_CONSTASCII_USTRINGPARAM( "TabIndex" ) ); if ( xPSI->hasPropertyByName( aTabIndexString ) ) @@ -561,7 +561,7 @@ namespace toolkitform // since we explicitly list the entries in the order in which they appear, they should not be // resorted by the PDF viewer pListWidget->Sort = false; - + // get selected items Sequence< sal_Int16 > aSelectIndices; OSL_VERIFY( xModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" ) ) ) >>= aSelectIndices ); diff --git a/toolkit/source/helper/imagealign.cxx b/toolkit/source/helper/imagealign.cxx index 4c782c99c37e..28ad8a0d1f77 100644 --- a/toolkit/source/helper/imagealign.cxx +++ b/toolkit/source/helper/imagealign.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index 1e75709f188f..c197d7e921ab 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,9 +31,9 @@ #include <toolkit/helper/listenermultiplexer.hxx> #include <com/sun/star/lang/DisposedException.hpp> -// ---------------------------------------------------- -// class ListenerMultiplexerBase -// ---------------------------------------------------- +// ---------------------------------------------------- +// class ListenerMultiplexerBase +// ---------------------------------------------------- ListenerMultiplexerBase::ListenerMultiplexerBase( ::cppu::OWeakObject& rSource ) : ::cppu::OInterfaceContainerHelper( GetMutex() ), mrContext( rSource ) { @@ -50,9 +50,9 @@ ListenerMultiplexerBase::~ListenerMultiplexerBase() } -// ---------------------------------------------------- -// class EventListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class EventListenerMultiplexer +// ---------------------------------------------------- EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource ) : ListenerMultiplexerBase( rSource ) { @@ -71,61 +71,61 @@ void EventListenerMultiplexer::disposing( const ::com::sun::star::lang::EventObj { } -// ---------------------------------------------------- -// class FocusListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class FocusListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener, focusGained, ::com::sun::star::awt::FocusEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener, focusLost, ::com::sun::star::awt::FocusEvent ) -// ---------------------------------------------------- -// class WindowListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class WindowListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowResized, ::com::sun::star::awt::WindowEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowMoved, ::com::sun::star::awt::WindowEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowShown, ::com::sun::star::lang::EventObject ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowHidden, ::com::sun::star::lang::EventObject ) -// ---------------------------------------------------- -// class VclContainerListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VclContainerListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener, windowAdded, ::com::sun::star::awt::VclContainerEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener, windowRemoved, ::com::sun::star::awt::VclContainerEvent ) -// ---------------------------------------------------- -// class KeyListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class KeyListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener, keyPressed, ::com::sun::star::awt::KeyEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener, keyReleased, ::com::sun::star::awt::KeyEvent ) -// ---------------------------------------------------- -// class MouseListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class MouseListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mousePressed, ::com::sun::star::awt::MouseEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseReleased, ::com::sun::star::awt::MouseEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseEntered, ::com::sun::star::awt::MouseEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseExited, ::com::sun::star::awt::MouseEvent ) -// ---------------------------------------------------- -// class MouseMotionListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class MouseMotionListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener, mouseDragged, ::com::sun::star::awt::MouseEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener, mouseMoved, ::com::sun::star::awt::MouseEvent ) -// ---------------------------------------------------- -// class PaintListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class PaintListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener, windowPaint, ::com::sun::star::awt::PaintEvent ) -// ---------------------------------------------------- -// class TopWindowListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class TopWindowListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowOpened, ::com::sun::star::lang::EventObject ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowClosing, ::com::sun::star::lang::EventObject ) @@ -135,65 +135,65 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::su IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowActivated, ::com::sun::star::lang::EventObject ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowDeactivated, ::com::sun::star::lang::EventObject ) -// ---------------------------------------------------- -// class TextListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class TextListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener, textChanged, ::com::sun::star::awt::TextEvent ) -// ---------------------------------------------------- -// class ActionListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class ActionListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener, actionPerformed, ::com::sun::star::awt::ActionEvent ) -// ---------------------------------------------------- -// class ItemListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class ItemListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener, itemStateChanged, ::com::sun::star::awt::ItemEvent ) -// ---------------------------------------------------- -// class ContainerListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class ContainerListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementInserted, ::com::sun::star::container::ContainerEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementRemoved, ::com::sun::star::container::ContainerEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementReplaced, ::com::sun::star::container::ContainerEvent ) - -// ---------------------------------------------------- -// class SpinListenerMultiplexer -// ---------------------------------------------------- + +// ---------------------------------------------------- +// class SpinListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, up, ::com::sun::star::awt::SpinEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, down, ::com::sun::star::awt::SpinEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, first, ::com::sun::star::awt::SpinEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, last, ::com::sun::star::awt::SpinEvent ) -// ---------------------------------------------------- -// class AdjustmentListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class AdjustmentListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener, adjustmentValueChanged, ::com::sun::star::awt::AdjustmentEvent ) -// ---------------------------------------------------- -// class MenuListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class MenuListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, highlight, ::com::sun::star::awt::MenuEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, select, ::com::sun::star::awt::MenuEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, activate, ::com::sun::star::awt::MenuEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, deactivate, ::com::sun::star::awt::MenuEvent ) -// ---------------------------------------------------- -// class TreeSelectionListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class TreeSelectionListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener, selectionChanged, ::com::sun::star::lang::EventObject ) -// ---------------------------------------------------- -// class TreeSelectionListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class TreeSelectionListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, requestChildNodes, ::com::sun::star::awt::tree::TreeExpansionEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeExpanding, ::com::sun::star::awt::tree::TreeExpansionEvent, ::com::sun::star::awt::tree::ExpandVetoException ) @@ -201,14 +201,14 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( TreeExpansionListenerMultiple IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeExpanded, ::com::sun::star::awt::tree::TreeExpansionEvent ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeCollapsed, ::com::sun::star::awt::tree::TreeExpansionEvent ) -// ---------------------------------------------------- -// class TreeEditListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class TreeEditListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeEditListenerMultiplexer, ::com::sun::star::awt::tree::XTreeEditListener ) -// ---------------------------------------------------- -// class SelectionListenerMultiplexer -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SelectionListenerMultiplexer +// ---------------------------------------------------- IMPL_LISTENERMULTIPLEXER_BASEMETHODS( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener ) IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener, selectionChanged, ::com::sun::star::awt::grid::GridSelectionEvent ) diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index 9e49ed6bd316..93d685063a13 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <toolkit/helper/macros.hxx> #include <osl/mutex.hxx> -#include <stdlib.h> // qsort/bsearch +#include <stdlib.h> // qsort/bsearch #include <tools/debug.hxx> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/awt/FontSlant.hpp> @@ -70,11 +70,11 @@ using ::com::sun::star::style::VerticalAlignment; struct ImplPropertyInfo { - ::rtl::OUString aName; - sal_uInt16 nPropId; - ::com::sun::star::uno::Type aType; - sal_Int16 nAttribs; - sal_Bool bDependsOnOthers; // eg. VALUE depends on MIN/MAX and must be set after MIN/MAX. + ::rtl::OUString aName; + sal_uInt16 nPropId; + ::com::sun::star::uno::Type aType; + sal_Int16 nAttribs; + sal_Bool bDependsOnOthers; // eg. VALUE depends on MIN/MAX and must be set after MIN/MAX. ImplPropertyInfo() { @@ -208,7 +208,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_2 ( "MultiSelection", MULTISELECTION, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "MultiSelectionSimpleMode", MULTISELECTION_SIMPLEMODE, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "NativeWidgetLook", NATIVE_WIDGET_LOOK, bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "NoLabel", NOLABEL, bool, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "NoLabel", NOLABEL, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "Orientation", ORIENTATION, sal_Int32, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "PaintTransparent", PAINTTRANSPARENT, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "PluginParent", PLUGINPARENT, sal_Int64, BOUND, MAYBEDEFAULT ), @@ -267,29 +267,29 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_2 ( "StepTime", STEP_TIME, sal_Int32, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "Decoration", DECORATION, sal_Bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "SelectionType", TREE_SELECTIONTYPE, ::com::sun::star::view::SelectionType, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "Editable", TREE_EDITABLE, sal_Bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_3 ( "DataModel", TREE_DATAMODEL, Reference< ::com::sun::star::awt::tree::XTreeDataModel >, BOUND, MAYBEDEFAULT, MAYBEVOID ), - DECL_PROP_2 ( "RootDisplayed", TREE_ROOTDISPLAYED, sal_Bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "ShowsHandles", TREE_SHOWSHANDLES, sal_Bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "ShowsRootHandles", TREE_SHOWSROOTHANDLES, sal_Bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_3 ( "RowHeight", TREE_ROWHEIGHT, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), - DECL_PROP_2 ( "InvokesStopNodeEditing", TREE_INVOKESSTOPNODEEDITING, sal_Bool, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "SelectionType", TREE_SELECTIONTYPE, ::com::sun::star::view::SelectionType, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "Editable", TREE_EDITABLE, sal_Bool, BOUND, MAYBEDEFAULT ), + DECL_PROP_3 ( "DataModel", TREE_DATAMODEL, Reference< ::com::sun::star::awt::tree::XTreeDataModel >, BOUND, MAYBEDEFAULT, MAYBEVOID ), + DECL_PROP_2 ( "RootDisplayed", TREE_ROOTDISPLAYED, sal_Bool, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "ShowsHandles", TREE_SHOWSHANDLES, sal_Bool, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "ShowsRootHandles", TREE_SHOWSROOTHANDLES, sal_Bool, BOUND, MAYBEDEFAULT ), + DECL_PROP_3 ( "RowHeight", TREE_ROWHEIGHT, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), + DECL_PROP_2 ( "InvokesStopNodeEditing", TREE_INVOKESSTOPNODEEDITING, sal_Bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "DialogSourceURL", DIALOGSOURCEURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "URL", URL, ::rtl::OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "WritingMode", WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "ContextWritingMode", CONTEXT_WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT ), - DECL_PROP_2 ( "ShowRowHeader", GRID_SHOWROWHEADER, sal_Bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "ShowColumnHeader", GRID_SHOWCOLUMNHEADER, sal_Bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_3 ( "GridDataModel", GRID_DATAMODEL, Reference< ::com::sun::star::awt::grid::XGridDataModel >, BOUND, MAYBEDEFAULT, MAYBEVOID ), - DECL_PROP_3 ( "ColumnModel", GRID_COLUMNMODEL, Reference< ::com::sun::star::awt::grid::XGridColumnModel >, BOUND, MAYBEDEFAULT, MAYBEVOID ), - DECL_PROP_3 ( "SelectionModel", GRID_SELECTIONMODE, ::com::sun::star::view::SelectionType, BOUND, MAYBEDEFAULT, MAYBEVOID ), + DECL_PROP_2 ( "ShowRowHeader", GRID_SHOWROWHEADER, sal_Bool, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "ShowColumnHeader", GRID_SHOWCOLUMNHEADER, sal_Bool, BOUND, MAYBEDEFAULT ), + DECL_PROP_3 ( "GridDataModel", GRID_DATAMODEL, Reference< ::com::sun::star::awt::grid::XGridDataModel >, BOUND, MAYBEDEFAULT, MAYBEVOID ), + DECL_PROP_3 ( "ColumnModel", GRID_COLUMNMODEL, Reference< ::com::sun::star::awt::grid::XGridColumnModel >, BOUND, MAYBEDEFAULT, MAYBEVOID ), + DECL_PROP_3 ( "SelectionModel", GRID_SELECTIONMODE, ::com::sun::star::view::SelectionType, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "EnableVisible", ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "ReferenceDevice", REFERENCE_DEVICE, Reference< XDevice >,BOUND, MAYBEDEFAULT, TRANSIENT ), DECL_PROP_3 ( "EvenRowBackgroundColor", GRID_EVEN_ROW_BACKGROUND, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "HeaderBackgroundColor", GRID_HEADER_BACKGROUND, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "GridLineColor", GRID_LINE_COLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), - DECL_PROP_3 ( "RowBackgroundColor", GRID_ROW_BACKGROUND, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ) + DECL_PROP_3 ( "RowBackgroundColor", GRID_ROW_BACKGROUND, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ) }; pPropertyInfos = aImplPropertyInfos; nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo ); @@ -302,15 +302,15 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) struct ImplPropertyInfoCompareFunctor : ::std::binary_function<ImplPropertyInfo,::rtl::OUString,bool> { - inline bool operator()(const ImplPropertyInfo& lhs,const ImplPropertyInfo& rhs) const + inline bool operator()(const ImplPropertyInfo& lhs,const ImplPropertyInfo& rhs) const { return lhs.aName.compareTo(rhs.aName) < 0; } - inline bool operator()(const ImplPropertyInfo& lhs,const ::rtl::OUString& rhs) const + inline bool operator()(const ImplPropertyInfo& lhs,const ::rtl::OUString& rhs) const { return lhs.aName.compareTo(rhs) < 0; } - inline bool operator()(const ::rtl::OUString& lhs,const ImplPropertyInfo& rhs) const + inline bool operator()(const ::rtl::OUString& lhs,const ImplPropertyInfo& rhs) const { return lhs.compareTo(rhs.aName) < 0; } diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx index 95d91c2d96ab..f2197952040f 100644 --- a/toolkit/source/helper/registerservices.cxx +++ b/toolkit/source/helper/registerservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx index 1a310d1d12df..5bd87f1b6dff 100644 --- a/toolkit/source/helper/servicenames.cxx +++ b/toolkit/source/helper/servicenames.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/helper/throbberimpl.cxx b/toolkit/source/helper/throbberimpl.cxx index 509407d3ff66..0bb2a75f28b4 100644 --- a/toolkit/source/helper/throbberimpl.cxx +++ b/toolkit/source/helper/throbberimpl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ namespace toolkit mnCurStep = 0; maWaitTimer.Start(); } - + //-------------------------------------------------------------------- void Throbber_Impl::stop() throw ( uno::RuntimeException ) { diff --git a/toolkit/source/helper/tkresmgr.cxx b/toolkit/source/helper/tkresmgr.cxx index 0fad4faba19f..eb1606b9d5dc 100644 --- a/toolkit/source/helper/tkresmgr.cxx +++ b/toolkit/source/helper/tkresmgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/helper/unomemorystream.cxx b/toolkit/source/helper/unomemorystream.cxx index 765353e9b678..3105da5414a5 100644 --- a/toolkit/source/helper/unomemorystream.cxx +++ b/toolkit/source/helper/unomemorystream.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,9 +33,9 @@ #include <toolkit/helper/unomemorystream.hxx> #include <algorithm> -// ---------------------------------------------------- -// class UnoMemoryStream -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoMemoryStream +// ---------------------------------------------------- UnoMemoryStream::UnoMemoryStream( sal_uInt32 nInitSize, sal_uInt32 nInitResize ) : SvMemoryStream( nInitSize, nInitResize ) { @@ -49,7 +49,7 @@ UnoMemoryStream::UnoMemoryStream( sal_uInt32 nInitSize, sal_uInt32 nInitResize ) return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } - + // ::com::sun::star::io::XInputStream sal_Int32 UnoMemoryStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { @@ -58,10 +58,10 @@ sal_Int32 UnoMemoryStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 sal_Int32 nRead = available(); if ( nRead > nBytesToRead ) nRead = nBytesToRead; - + rData = ::com::sun::star::uno::Sequence< sal_Int8 >( nRead ); Read( rData.getArray(), nRead ); - + return nRead; } @@ -70,14 +70,14 @@ sal_Int32 UnoMemoryStream::readSomeBytes( ::com::sun::star::uno::Sequence< sal_I ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); sal_Int32 nAvailable = available(); - if( nAvailable ) + if( nAvailable ) { return readBytes( rData, std::min( nMaxBytesToRead , nAvailable ) ); } - else + else { // Not the most effective method, but it sticks to the specification - return readBytes( rData, 1 ); + return readBytes( rData, 1 ); } } @@ -100,7 +100,7 @@ sal_Int32 UnoMemoryStream::available() throw(::com::sun::star::io::NotConnectedE void UnoMemoryStream::closeInput() throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { - // nothing to do + // nothing to do } diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx index f17fab4e9e58..0902fdd4f152 100644 --- a/toolkit/source/helper/unopropertyarrayhelper.cxx +++ b/toolkit/source/helper/unopropertyarrayhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,9 +32,9 @@ #include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/helper/property.hxx> -// ---------------------------------------------------- -// class UnoPropertyArrayHelper -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoPropertyArrayHelper +// ---------------------------------------------------- UnoPropertyArrayHelper::UnoPropertyArrayHelper( const ::com::sun::star::uno::Sequence<sal_Int32>& rIDs ) { @@ -55,7 +55,7 @@ sal_Bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const { if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) nPropId = BASEPROPERTY_FONTDESCRIPTOR; - + return maIDs.Get( nPropId ) ? sal_True : sal_False; } @@ -64,11 +64,11 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString * { sal_uInt16 id = sal::static_int_cast< sal_uInt16 >(nPropId); sal_Bool bValid = ImplHasProperty( id ); - if ( bValid ) + if ( bValid ) { - if ( pPropName ) + if ( pPropName ) *pPropName = GetPropertyName( id ); - if ( pAttributes ) + if ( pAttributes ) *pAttributes = GetPropertyAttribs( id ); } return bValid; @@ -77,7 +77,7 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString * ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > UnoPropertyArrayHelper::getProperties() { // Sortiert nach Namen... - + Table aSortedPropsIds; sal_uInt32 nProps = maIDs.Count(); for ( sal_uInt32 s = 0; s < nProps; s++ ) @@ -94,11 +94,11 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString * } } - nProps = aSortedPropsIds.Count(); // koennen jetzt mehr sein + nProps = aSortedPropsIds.Count(); // koennen jetzt mehr sein ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aProps( nProps ); ::com::sun::star::beans::Property* pProps = aProps.getArray(); - - for ( sal_uInt32 n = 0; n < nProps; n++ ) + + for ( sal_uInt32 n = 0; n < nProps; n++ ) { sal_uInt16 nId = (sal_uInt16)(sal_uIntPtr)aSortedPropsIds.GetObject( n ); pProps[n].Name = GetPropertyName( nId ); @@ -106,7 +106,7 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString * pProps[n].Type = *GetPropertyType( nId ); pProps[n].Attributes = GetPropertyAttribs( nId ); } - + return aProps; } @@ -142,10 +142,10 @@ sal_Int32 UnoPropertyArrayHelper::fillHandles( sal_Int32* pHandles, const ::com: sal_Int32 nValues = rPropNames.getLength(); sal_Int32 nValidHandles = 0; - for ( sal_Int32 n = 0; n < nValues; n++ ) + for ( sal_Int32 n = 0; n < nValues; n++ ) { sal_uInt16 nPropId = GetPropertyId( pNames[n] ); - if ( nPropId && ImplHasProperty( nPropId ) ) + if ( nPropId && ImplHasProperty( nPropId ) ) { pHandles[n] = nPropId; nValidHandles++; diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index cee3427f3866..8ef8c48c95ad 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,12 +102,12 @@ using namespace ::com::sun::star; case WINDOW_WORKWINDOW: case WINDOW_DOCKINGWINDOW: case WINDOW_FLOATINGWINDOW: - case WINDOW_HELPTEXTWINDOW: return new VCLXTopWindow; + case WINDOW_HELPTEXTWINDOW: return new VCLXTopWindow; case WINDOW_WINDOW: case WINDOW_TABPAGE: return new VCLXContainer; - case WINDOW_TOOLBOX: return new VCLXToolBox; + case WINDOW_TOOLBOX: return new VCLXToolBox; // case WINDOW_FIXEDLINE: // case WINDOW_FIXEDBITMAP: @@ -128,9 +128,9 @@ using namespace ::com::sun::star; } } -// ---------------------------------------------------- -// class UnoWrapper -// ---------------------------------------------------- +// ---------------------------------------------------- +// class UnoWrapper +// ---------------------------------------------------- extern "C" { @@ -139,7 +139,7 @@ TOOLKIT_DLLPUBLIC UnoWrapperBase* CreateUnoWrapper() return new UnoWrapper( NULL ); } -} // extern "C" +} // extern "C" UnoWrapper::UnoWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>& rxToolkit ) @@ -185,7 +185,7 @@ void UnoWrapper::SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Ref { int i = 0; i++; - // DBG_ERROR( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" ); + // DBG_ERROR( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" ); } pVCLXWindow->SetWindow( pWindow ); pWindow->SetWindowPeer( xIFace, pVCLXWindow ); @@ -261,34 +261,34 @@ void UnoWrapper::WindowDestroyed( Window* pWindow ) // ggf. existieren noch von ::com::sun::star::loader::Java erzeugte Childs, die sonst erst // im Garbage-Collector zerstoert werden... Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); - while ( pChild ) + while ( pChild ) { Window* pNextChild = pChild->GetWindow( WINDOW_NEXT ); Window* pClient = pChild->GetWindow( WINDOW_CLIENT ); - if ( pClient->GetWindowPeer() ) + if ( pClient->GetWindowPeer() ) { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( FALSE ), ::com::sun::star::uno::UNO_QUERY ); xComp->dispose(); } - + pChild = pNextChild; } // ::com::sun::star::chaos::System-Windows suchen... Window* pOverlap = pWindow->GetWindow( WINDOW_OVERLAP ); pOverlap = pOverlap->GetWindow( WINDOW_FIRSTOVERLAP ); - while ( pOverlap ) + while ( pOverlap ) { Window* pNextOverlap = pOverlap->GetWindow( WINDOW_NEXT ); Window* pClient = pOverlap->GetWindow( WINDOW_CLIENT ); - + if ( pClient->GetWindowPeer() && lcl_ImplIsParent( pWindow, pClient ) ) { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( FALSE ), ::com::sun::star::uno::UNO_QUERY ); xComp->dispose(); } - + pOverlap = pNextOverlap; } diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 5bdd975803f1..bd95cd7996ae 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,9 +70,9 @@ using namespace ::com::sun::star; -// ---------------------------------------------------- -// class VCLUnoHelper -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLUnoHelper +// ---------------------------------------------------- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> VCLUnoHelper::CreateToolkit() { @@ -350,7 +350,7 @@ FontWeight VCLUnoHelper::ConvertFontWeight( float f ) aFD.Orientation = rFont.GetOrientation(); aFD.Kerning = rFont.IsKerning(); aFD.WordLineMode = rFont.IsWordLineMode(); - aFD.Type = 0; // ??? => Nur an Metric... + aFD.Type = 0; // ??? => Nur an Metric... return aFD; } @@ -536,7 +536,7 @@ namespace } if ( eDirection == FieldUnitToMeasurementUnit ) return -1; - + _rFieldToUNOValueFactor = 1; return (sal_Int16)FUNIT_NONE; } diff --git a/toolkit/source/layout/core/bin.cxx b/toolkit/source/layout/core/bin.cxx index e8b665b73a4a..8a72d88cf2e5 100644 --- a/toolkit/source/layout/core/bin.cxx +++ b/toolkit/source/layout/core/bin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/bin.hxx b/toolkit/source/layout/core/bin.hxx index 69e97cebdf40..4e03d56949fd 100644 --- a/toolkit/source/layout/core/bin.hxx +++ b/toolkit/source/layout/core/bin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/box-base.cxx b/toolkit/source/layout/core/box-base.cxx index b9db7098bc57..3fd7939bfff0 100644 --- a/toolkit/source/layout/core/box-base.cxx +++ b/toolkit/source/layout/core/box-base.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ static bool isVisible( uno::Reference< awt::XLayoutConstrains > xWidget ) return true; } - + bool Box_Base::ChildData::isVisible() { // FIXME: call the 'isVisible' method on it ? @@ -153,7 +153,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL Box_Base::getChildProperties( const uno::Reference< awt::XLayoutConstrains >& xChild ) throw (uno::RuntimeException) { - + for ( std::list< ChildData * >::iterator it = maChildren.begin(); it != maChildren.end(); it++) { diff --git a/toolkit/source/layout/core/box-base.hxx b/toolkit/source/layout/core/box-base.hxx index 0c0415afe622..faeddf91f8e9 100644 --- a/toolkit/source/layout/core/box-base.hxx +++ b/toolkit/source/layout/core/box-base.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ public: css::uno::Reference< css::beans::XPropertySet > mxProps; css::awt::Size maRequisition; virtual bool isVisible(); - + ChildData( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild ); virtual ~ChildData() { }; }; @@ -62,9 +62,9 @@ protected: virtual ChildData *createChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild ) = 0; virtual ChildProps *createChildProps( ChildData* pData ) = 0; - + ChildData *removeChildData( std::list< ChildData *>&, css::uno::Reference< css::awt::XLayoutConstrains > const& Child ); - + public: void AddChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child); @@ -77,7 +77,7 @@ public: virtual css::uno::Sequence< css::uno::Reference < css::awt::XLayoutConstrains > > SAL_CALL getChildren() throw (css::uno::RuntimeException); - + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getChildProperties( const css::uno::Reference< css::awt::XLayoutConstrains >& Child ) throw (css::uno::RuntimeException); diff --git a/toolkit/source/layout/core/box.cxx b/toolkit/source/layout/core/box.cxx index fb1a875bfea2..180706486477 100644 --- a/toolkit/source/layout/core/box.cxx +++ b/toolkit/source/layout/core/box.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/box.hxx b/toolkit/source/layout/core/box.hxx index 46309a5d0b1c..936b99ea771e 100644 --- a/toolkit/source/layout/core/box.hxx +++ b/toolkit/source/layout/core/box.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/byteseq.cxx b/toolkit/source/layout/core/byteseq.cxx index 41141fbc777d..4330754cf7be 100644 --- a/toolkit/source/layout/core/byteseq.cxx +++ b/toolkit/source/layout/core/byteseq.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ uno::Reference< io::XInputStream > getFileAsStream( const rtl::OUString &rName ) sMsg.append(configmgr::FileHelper::createOSLErrorString(errorCode)); throw io::IOException(sMsg.makeStringAndClear(),NULL); - } + } */ } diff --git a/toolkit/source/layout/core/container.cxx b/toolkit/source/layout/core/container.cxx index f5822bc4569a..80f8dfc1b9fa 100644 --- a/toolkit/source/layout/core/container.cxx +++ b/toolkit/source/layout/core/container.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,7 +121,7 @@ void Container::propertiesChanged() { // cl: why this assertion? This is also called to set properties at the top level widget which has no parent!? // DBG_ASSERT( mxParent.is(), "Properties listener: error container doesn't have parent" ); - + if ( mxLayoutUnit.is() && mxParent.is() ) mxLayoutUnit->queueResize( mxParent ); } diff --git a/toolkit/source/layout/core/container.hxx b/toolkit/source/layout/core/container.hxx index 5f53f47b8ece..3c15efaaaeb7 100644 --- a/toolkit/source/layout/core/container.hxx +++ b/toolkit/source/layout/core/container.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/dialogbuttonhbox.cxx b/toolkit/source/layout/core/dialogbuttonhbox.cxx index ed7b35dafa51..a72700779702 100644 --- a/toolkit/source/layout/core/dialogbuttonhbox.cxx +++ b/toolkit/source/layout/core/dialogbuttonhbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/dialogbuttonhbox.hxx b/toolkit/source/layout/core/dialogbuttonhbox.hxx index aead7fc1eb80..fbeca8691be1 100644 --- a/toolkit/source/layout/core/dialogbuttonhbox.hxx +++ b/toolkit/source/layout/core/dialogbuttonhbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/factory.cxx b/toolkit/source/layout/core/factory.cxx index 2e1c7012b8e0..30856e27764c 100644 --- a/toolkit/source/layout/core/factory.cxx +++ b/toolkit/source/layout/core/factory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ sal_Bool SAL_CALL LayoutFactory::supportsService( const ::rtl::OUString& Service for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) if ( ServiceName.compareTo( aSeq[i] ) == 0 ) return sal_True; - + return sal_False; } diff --git a/toolkit/source/layout/core/factory.hxx b/toolkit/source/layout/core/factory.hxx index 57fca62cdca1..7d1f77a9a2df 100644 --- a/toolkit/source/layout/core/factory.hxx +++ b/toolkit/source/layout/core/factory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/flow.cxx b/toolkit/source/layout/core/flow.cxx index 8b57ca04f33c..d772f7c450ec 100644 --- a/toolkit/source/layout/core/flow.cxx +++ b/toolkit/source/layout/core/flow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/flow.hxx b/toolkit/source/layout/core/flow.hxx index d1965e1ecb4f..e6d9677db1bc 100644 --- a/toolkit/source/layout/core/flow.hxx +++ b/toolkit/source/layout/core/flow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/helper.cxx b/toolkit/source/layout/core/helper.cxx index 1434054d8cf9..80013b2e503b 100644 --- a/toolkit/source/layout/core/helper.cxx +++ b/toolkit/source/layout/core/helper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -383,7 +383,7 @@ Window* WidgetFactory::sfx2CreateWindow (VCLXWindow** component, Window* parent, Window* WidgetFactory::layoutCreateWindow (VCLXWindow** component, Window *parent, OUString const& name, long& attributes) { Window* window = 0; - + if (0) { ; diff --git a/toolkit/source/layout/core/helper.hxx b/toolkit/source/layout/core/helper.hxx index cd91a19aa88d..f19f74611ff5 100644 --- a/toolkit/source/layout/core/helper.hxx +++ b/toolkit/source/layout/core/helper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx index b4fbacc02243..b4c03918c492 100644 --- a/toolkit/source/layout/core/import.cxx +++ b/toolkit/source/layout/core/import.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -239,7 +239,7 @@ void RadioGroups::addItem( rtl::OUString id, uno::Reference< awt::XRadioButton > { if ( ! xRadio.is() ) throw uno::RuntimeException(); - + uno::Reference< RadioGroup > group; RadioGroupsMap::iterator it = mxRadioGroups.find( id ); if ( it == mxRadioGroups.end() ) diff --git a/toolkit/source/layout/core/import.hxx b/toolkit/source/layout/core/import.hxx index 2eea1b0975ee..8c9a6c5e3753 100644 --- a/toolkit/source/layout/core/import.hxx +++ b/toolkit/source/layout/core/import.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/localized-string.cxx b/toolkit/source/layout/core/localized-string.cxx index 35384f641101..992aa8fea06d 100644 --- a/toolkit/source/layout/core/localized-string.cxx +++ b/toolkit/source/layout/core/localized-string.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/localized-string.hxx b/toolkit/source/layout/core/localized-string.hxx index d8a4f7a89369..884c702cc371 100644 --- a/toolkit/source/layout/core/localized-string.hxx +++ b/toolkit/source/layout/core/localized-string.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace layoutimpl namespace css = ::com::sun::star; // FIXME: misuse XFixedText interface for simple string -class LocalizedString : public css::awt::XFixedText +class LocalizedString : public css::awt::XFixedText , public VCLXWindow { public: @@ -55,7 +55,7 @@ public: ::rtl::OUString SAL_CALL getText() throw(css::uno::RuntimeException); void SAL_CALL setAlignment( sal_Int16 ) - throw(css::uno::RuntimeException) { } + throw(css::uno::RuntimeException) { } sal_Int16 SAL_CALL getAlignment() throw(css::uno::RuntimeException) { return 0; } diff --git a/toolkit/source/layout/core/precompiled_xmlscript.hxx b/toolkit/source/layout/core/precompiled_xmlscript.hxx index 0be98395c1ea..67a7d2d4eee8 100644 --- a/toolkit/source/layout/core/precompiled_xmlscript.hxx +++ b/toolkit/source/layout/core/precompiled_xmlscript.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx index 24c9bc471833..0b15cff83515 100644 --- a/toolkit/source/layout/core/proplist.cxx +++ b/toolkit/source/layout/core/proplist.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/proplist.hxx b/toolkit/source/layout/core/proplist.hxx index fafd45059552..20eacbd19885 100644 --- a/toolkit/source/layout/core/proplist.hxx +++ b/toolkit/source/layout/core/proplist.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/root.cxx b/toolkit/source/layout/core/root.cxx index f5b96d94d5ae..db6bedc075fc 100644 --- a/toolkit/source/layout/core/root.cxx +++ b/toolkit/source/layout/core/root.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -175,7 +175,7 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument if (! xDocHandler.is() ) error( OUString::createFromAscii( "cannot find SAx handler for document type of:") + aXMLName ); - + xParser->setDocumentHandler( xDocHandler ); xml::sax::InputSource source; diff --git a/toolkit/source/layout/core/root.hxx b/toolkit/source/layout/core/root.hxx index 601536bdacba..b4e3fe68cfb3 100644 --- a/toolkit/source/layout/core/root.hxx +++ b/toolkit/source/layout/core/root.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/table.cxx b/toolkit/source/layout/core/table.cxx index b990a88f38f0..d724c8c48083 100644 --- a/toolkit/source/layout/core/table.cxx +++ b/toolkit/source/layout/core/table.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/table.hxx b/toolkit/source/layout/core/table.hxx index 30e7f24540b7..5fa20d2412dc 100644 --- a/toolkit/source/layout/core/table.hxx +++ b/toolkit/source/layout/core/table.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/timer.cxx b/toolkit/source/layout/core/timer.cxx index 18be0e19a122..1749a9af91d6 100644 --- a/toolkit/source/layout/core/timer.cxx +++ b/toolkit/source/layout/core/timer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/timer.hxx b/toolkit/source/layout/core/timer.hxx index 8be521e634f3..5c6408985500 100644 --- a/toolkit/source/layout/core/timer.hxx +++ b/toolkit/source/layout/core/timer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/translate.cxx b/toolkit/source/layout/core/translate.cxx index 4d35f101ae21..916ecbf18d9b 100644 --- a/toolkit/source/layout/core/translate.cxx +++ b/toolkit/source/layout/core/translate.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/translate.hxx b/toolkit/source/layout/core/translate.hxx index b20166252bd6..251958ff92c0 100644 --- a/toolkit/source/layout/core/translate.hxx +++ b/toolkit/source/layout/core/translate.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/vcl.cxx b/toolkit/source/layout/core/vcl.cxx index 9fc861506a00..53dae2563d73 100644 --- a/toolkit/source/layout/core/vcl.cxx +++ b/toolkit/source/layout/core/vcl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/core/vcl.hxx b/toolkit/source/layout/core/vcl.hxx index 45c01314782b..d7fb5a4ffeb4 100644 --- a/toolkit/source/layout/core/vcl.hxx +++ b/toolkit/source/layout/core/vcl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/vcl/wbutton.cxx b/toolkit/source/layout/vcl/wbutton.cxx index 79d8f31bc9fa..0354f18cc6c8 100644 --- a/toolkit/source/layout/vcl/wbutton.cxx +++ b/toolkit/source/layout/vcl/wbutton.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/vcl/wcontainer.cxx b/toolkit/source/layout/vcl/wcontainer.cxx index 950a006d1fed..5f8311d71f9f 100644 --- a/toolkit/source/layout/vcl/wcontainer.cxx +++ b/toolkit/source/layout/vcl/wcontainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/vcl/wfield.cxx b/toolkit/source/layout/vcl/wfield.cxx index ce8b59f6023f..f4584796f251 100644 --- a/toolkit/source/layout/vcl/wfield.cxx +++ b/toolkit/source/layout/vcl/wfield.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/vcl/wrapper.cxx b/toolkit/source/layout/vcl/wrapper.cxx index 3acb946f7545..75dd9a86795e 100644 --- a/toolkit/source/layout/vcl/wrapper.cxx +++ b/toolkit/source/layout/vcl/wrapper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/source/layout/vcl/wrapper.hxx b/toolkit/source/layout/vcl/wrapper.hxx index 8a88be68001e..56046cc73f42 100644 --- a/toolkit/source/layout/vcl/wrapper.hxx +++ b/toolkit/source/layout/vcl/wrapper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -142,7 +142,7 @@ inline WindowImpl &Window::getImpl() const{ return *(static_cast< WindowImpl * > : parent##Impl( context, peer, window ) \ { \ } \ - }; + }; } // namespace layout diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java index 64a5a5a3c4f6..5a922da5045f 100644 --- a/toolkit/test/accessibility/AccTreeNode.java +++ b/toolkit/test/accessibility/AccTreeNode.java @@ -56,18 +56,18 @@ class AccTreeNode System.out.println ("replacing handler " + i); HandlerDescriptor aDescriptor = (HandlerDescriptor)maHandlers.get(i); aDescriptor.maHandler = aDescriptor.maHandler.createHandler (mxContext); - aDescriptor.mnChildCount = + aDescriptor.mnChildCount = aDescriptor.maHandler.getChildCount (this); } } public XAccessibleContext getContext () - { - return mxContext; + { + return mxContext; } public XAccessibleComponent getComponent () - { + { if (mxComponent == null && mxContext != null) mxComponent = (XAccessibleComponent)UnoRuntime.queryInterface( XAccessibleComponent.class, mxContext); @@ -75,7 +75,7 @@ class AccTreeNode } public XAccessibleExtendedComponent getExtendedComponent () - { + { if (mxComponent == null) getComponent(); if (mxComponent != null) @@ -86,38 +86,38 @@ class AccTreeNode } public XAccessibleText getText () - { + { if (mxText == null && mxContext != null) mxText = (XAccessibleText)UnoRuntime.queryInterface( XAccessibleText.class, mxContext); - return mxText; + return mxText; } public XAccessibleEditableText getEditText () - { + { return (XAccessibleEditableText)UnoRuntime.queryInterface( XAccessibleEditableText.class, mxContext); } public XAccessibleTable getTable () - { + { if (mxTable == null && mxContext != null) mxTable = (XAccessibleTable)UnoRuntime.queryInterface( XAccessibleTable.class, mxContext); - return mxTable; + return mxTable; } - public XAccessible getAccessible() + public XAccessible getAccessible() { if ((mxAccessible == null) && (mxContext != null)) mxAccessible = (XAccessible)UnoRuntime.queryInterface( XAccessible.class, mxContext); - return mxAccessible; + return mxAccessible; } public XAccessibleSelection getSelection () - { + { return (XAccessibleSelection)UnoRuntime.queryInterface( XAccessibleSelection.class, mxContext); } @@ -131,7 +131,7 @@ class AccTreeNode /** iterate over handlers and return child sum */ protected HandlerDescriptor getHandlerDescriptor (int i) - { + { HandlerDescriptor aDescriptor = (HandlerDescriptor)maHandlers.get(i); if (aDescriptor.mnChildCount < 0) aDescriptor.mnChildCount = @@ -140,7 +140,7 @@ class AccTreeNode } public int getChildCount() - { + { int nChildCount = 0; for (int i = 0; i < maHandlers.size(); i++) { @@ -246,7 +246,7 @@ class AccTreeNode /** this node is a leaf if have no handlers, or is those handlers show no children */ - public boolean isLeaf() + public boolean isLeaf() { return (maHandlers.size() == 0);// || (getChildCount() == 0); } @@ -295,7 +295,7 @@ class AccTreeNode } /** Try to add the specified accessible object as new accessible child of the - AccessibleTreeHandler. + AccessibleTreeHandler. Note that child is used in another context than it is used in the other methods of this class. */ @@ -322,7 +322,7 @@ class AccTreeNode */ public Vector updateChildren (java.lang.Class class1) { - return updateChildren (class1, null); + return updateChildren (class1, null); } public Vector updateChildren (java.lang.Class class1, java.lang.Class class2) diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java index 819631b41eb8..5beb8bb0565e 100755 --- a/toolkit/test/accessibility/AccessibilityTree.java +++ b/toolkit/test/accessibility/AccessibilityTree.java @@ -11,11 +11,11 @@ import javax.swing.tree.*; import javax.swing.event.*; - + /** This is the tree component that is responsible for displaying the contents of the tree model on the screen. -*/ -public class AccessibilityTree +*/ +public class AccessibilityTree implements TreeExpansionListener, TreeWillExpandListener { /** Create a new accessibility tree. Use the specified message display @@ -26,16 +26,16 @@ public class AccessibilityTree { maTree = new JTree (); - AccessibilityTreeModel aModel = + AccessibilityTreeModel aModel = new AccessibilityTreeModel ( new StringNode ("Please press Update button", null)); maTree.setModel (aModel); - + maCellRenderer = new AccessibleTreeCellRenderer(); // setCellRenderer (maCellRenderer); // allow editing of XAccessibleText interfaces - // setEditable (true); + // setEditable (true); // maTreeModel.addTreeModelListener( new TextUpdateListener() ); maTree.addMouseListener (new MouseListener (this)); @@ -131,7 +131,7 @@ public class AccessibilityTree // System.out.print ("e"); - try + try { // get 'our' object Object aObj = aPath.getLastPathComponent(); @@ -140,7 +140,7 @@ public class AccessibilityTree if( aExpander.expand( aObj ) ) { maTree.expandPath (aPath); - if( aFirst == null ) + if( aFirst == null ) aFirst = aPath; } @@ -151,8 +151,8 @@ public class AccessibilityTree int nLength = aNode.getChildCount(); for( int i = 0; i < nLength; i++ ) { - TreePath aRet = expandTree( - aPath.pathByAddingChild( aNode.getChild( i ) ), + TreePath aRet = expandTree( + aPath.pathByAddingChild( aNode.getChild( i ) ), aExpander ); if( aFirst == null ) aFirst = aRet; @@ -161,7 +161,7 @@ public class AccessibilityTree } catch (Exception e) { - System.out.println ("caught exception while expanding tree path " + System.out.println ("caught exception while expanding tree path " + aPath + ": " + e); e.printStackTrace (); } @@ -211,7 +211,7 @@ public class AccessibilityTree class MouseListener extends MouseAdapter { - public MouseListener (AccessibilityTree aTree) + public MouseListener (AccessibilityTree aTree) { maTree=aTree; } @@ -237,7 +237,7 @@ public class AccessibilityTree if( aObject instanceof AccTreeNode ) { AccTreeNode aNode = (AccTreeNode)aObject; - + Vector aActions = new Vector(); aMenu.add (new AccessibilityTree.ShapeExpandAction(maTree, aNode)); aMenu.add (new AccessibilityTree.SubtreeExpandAction(maTree, aNode)); @@ -245,7 +245,7 @@ public class AccessibilityTree aNode.getActions(aActions); for( int i = 0; i < aActions.size(); i++ ) { - aMenu.add( new NodeAction( + aMenu.add( new NodeAction( aActions.elementAt(i).toString(), aNode, i ) ); } @@ -258,16 +258,16 @@ public class AccessibilityTree if (nCount > 0) { for (int i=0; i<nCount; i++) - aMenu.add( new NodeAction( + aMenu.add( new NodeAction( aActionNames[i], - aNode, + aNode, i)); } else aMenu = null; } if (aMenu != null) - aMenu.show (maTree.getComponent(), + aMenu.show (maTree.getComponent(), e.getX(), e.getY()); } } @@ -301,13 +301,13 @@ public class AccessibilityTree { private AccessibilityTree maTree; private AccTreeNode maNode; - public ShapeExpandAction (AccessibilityTree aTree, AccTreeNode aNode) + public ShapeExpandAction (AccessibilityTree aTree, AccTreeNode aNode) { super ("Expand Shapes"); maTree = aTree; maNode = aNode; } - public void actionPerformed (ActionEvent e) + public void actionPerformed (ActionEvent e) { maTree.expandShapes (maNode); } @@ -318,13 +318,13 @@ public class AccessibilityTree { private AccessibilityTree maTree; private AccTreeNode maNode; - public SubtreeExpandAction (AccessibilityTree aTree, AccTreeNode aNode) + public SubtreeExpandAction (AccessibilityTree aTree, AccTreeNode aNode) { super ("Expand Subtree"); maTree = aTree; maNode = aNode; } - public void actionPerformed (ActionEvent e) + public void actionPerformed (ActionEvent e) { maTree.expandAll (maNode); } @@ -333,8 +333,8 @@ public class AccessibilityTree /** Predicate class to determine whether a node should be expanded * For use with expandTree method */ abstract class Expander - { - abstract public boolean expand (Object aObject); + { + abstract public boolean expand (Object aObject); } /** expand all nodes */ @@ -365,13 +365,13 @@ public class AccessibilityTree protected AccessibleTreeCellRenderer maCellRenderer; - + private JTree maTree; private Canvas maCanvas; private boolean mbFirstShapeSeen; - private int + private int mnExpandLevel; } diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java index d4981e86b4a0..7a226ec6c6af 100644 --- a/toolkit/test/accessibility/AccessibilityTreeModel.java +++ b/toolkit/test/accessibility/AccessibilityTreeModel.java @@ -164,7 +164,7 @@ public class AccessibilityTreeModel } catch (Exception e) { - System.out.println ("caught exception while removing child " + System.out.println ("caught exception while removing child " + aNode + " : " + e); e.printStackTrace (); return false; @@ -174,7 +174,7 @@ public class AccessibilityTreeModel public void removeNode (XAccessibleContext xNode) { - if (xNode != null) + if (xNode != null) { AccessibleTreeNode aNode = maNodeMap.GetNode (xNode); AccessibleTreeNode aRootNode = (AccessibleTreeNode)getRoot(); @@ -189,7 +189,7 @@ public class AccessibilityTreeModel /** Add add a new child to a parent. - @return + @return Returns the new or existing representation of the specified accessible object. */ @@ -210,7 +210,7 @@ public class AccessibilityTreeModel } catch (Exception e) { - System.out.println ("caught exception while adding child " + System.out.println ("caught exception while adding child " + xNewChild + " to parent " + aParentNode + ": " + e); e.printStackTrace (); } @@ -227,7 +227,7 @@ public class AccessibilityTreeModel { if (maCanvas != null) maCanvas.updateNode ((AccTreeNode)aParentNode); - + // A call to fireTreeNodesInserted for xNew // should be sufficient but at least the // StringNode object that contains the number of @@ -242,7 +242,7 @@ public class AccessibilityTreeModel } } - + /** Add the child node to the internal tree structure. @param aNode The node to insert into the internal tree structure. @@ -265,11 +265,11 @@ public class AccessibilityTreeModel } bRet = true; } - + } catch (Exception e) { - System.out.println ("caught exception while adding node " + System.out.println ("caught exception while adding node " + aNode + ": " + e); e.printStackTrace (); } @@ -335,7 +335,7 @@ public class AccessibilityTreeModel } /** Create a TreeModelEvent object that informs listeners that one child - has been removed from or inserted into its parent. + has been removed from or inserted into its parent. */ public TreeModelEvent createEvent (XAccessibleContext xParent, XAccessible xChild) { @@ -354,7 +354,7 @@ public class AccessibilityTreeModel protected TreeModelEvent createEvent ( - AccessibleTreeNode aParentNode, + AccessibleTreeNode aParentNode, AccessibleTreeNode aChildNode) { Object[] aPathToParent = createPath (aParentNode); @@ -367,11 +367,11 @@ public class AccessibilityTreeModel if (nIndexInParent == -1) // This event may be passed only to treeStructureChanged of the listeners. - return new TreeModelEvent (this, + return new TreeModelEvent (this, aPathToParent); else // General purpose event for removing or inserting known nodes. - return new TreeModelEvent (this, + return new TreeModelEvent (this, aPathToParent, new int[] {nIndexInParent}, new Object[] {aChildNode} ); @@ -422,7 +422,7 @@ public class AccessibilityTreeModel } - + protected XAccessibleEventBroadcaster getBroadcaster (Object aObject) { if (aObject instanceof AccTreeNode) @@ -466,15 +466,15 @@ public class AccessibilityTreeModel public void updateNode (XAccessibleContext xSource, java.lang.Class class1) { - updateNode (xSource, class1,null); + updateNode (xSource, class1,null); } - /** Get a list of children of the node associated with xSource that are + /** Get a list of children of the node associated with xSource that are affected by the given handlers. Fire events that these children may have changed in the tree view. Update the canvas representation of xSource. */ - public AccTreeNode updateNode (XAccessibleContext xSource, + public AccTreeNode updateNode (XAccessibleContext xSource, java.lang.Class class1, java.lang.Class class2) { AccessibleTreeNode aTreeNode = maNodeMap.GetNode (xSource); diff --git a/toolkit/test/accessibility/AccessibilityTreeModelBase.java b/toolkit/test/accessibility/AccessibilityTreeModelBase.java index e80819bef840..23e403a67c89 100644 --- a/toolkit/test/accessibility/AccessibilityTreeModelBase.java +++ b/toolkit/test/accessibility/AccessibilityTreeModelBase.java @@ -71,7 +71,7 @@ public class AccessibilityTreeModelBase { AccessibleTreeNode aParentNode = (AccessibleTreeNode) aParent; AccessibleTreeNode aChildNode = (AccessibleTreeNode) aChild; - + int nChildCount = aParentNode.getChildCount(); for( int i = 0; i < nChildCount; i++ ) { @@ -105,7 +105,7 @@ public class AccessibilityTreeModelBase return maRoot; } - public void valueForPathChanged(TreePath path, Object newValue) + public void valueForPathChanged(TreePath path, Object newValue) { } protected synchronized void setRoot (AccessibleTreeNode aRoot) diff --git a/toolkit/test/accessibility/AccessibilityWorkBench.java b/toolkit/test/accessibility/AccessibilityWorkBench.java index 58ad607fed67..77997201b377 100755 --- a/toolkit/test/accessibility/AccessibilityWorkBench.java +++ b/toolkit/test/accessibility/AccessibilityWorkBench.java @@ -50,7 +50,7 @@ import ov.ObjectViewContainer; public class AccessibilityWorkBench extends JFrame implements ActionListener, XTerminateListener, TreeSelectionListener - + { public static final String msVersion = "v1.7.2"; public String msOptionsFileName = ".AWBrc"; @@ -74,7 +74,7 @@ public class AccessibilityWorkBench nPortNumber = Integer.parseInt (args[++i]); } } - + saWorkBench = new AccessibilityWorkBench (nPortNumber); } @@ -101,7 +101,7 @@ public class AccessibilityWorkBench mbInitialized = false; Layout (); - + MessageArea.println (System.getProperty ("os.name") + " / " + System.getProperty ("os.arch") + " / " + System.getProperty ("os.version")); @@ -123,7 +123,7 @@ public class AccessibilityWorkBench /** Create and arrange the widgets of the GUI. - */ + */ public void Layout () { setSize (new Dimension (8000,600)); @@ -157,7 +157,7 @@ public class AccessibilityWorkBench // Split pane for tree view and object view. JSplitPane aLeftViewSplitPane = new JSplitPane ( JSplitPane.VERTICAL_SPLIT, - aTreeScrollPane, + aTreeScrollPane, aObjectViewContainerScrollPane ); aLeftViewSplitPane.setDividerLocation (300); @@ -166,7 +166,7 @@ public class AccessibilityWorkBench maCanvas = new Canvas (); maCanvas.setTree (maAccessibilityTree.getComponent()); maAccessibilityTree.SetCanvas (maCanvas); - JScrollPane aScrolledCanvas = new JScrollPane(maCanvas, + JScrollPane aScrolledCanvas = new JScrollPane(maCanvas, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); aScrolledCanvas.getViewport().setBackground (Color.RED); @@ -175,12 +175,12 @@ public class AccessibilityWorkBench // Split pane for tree view and canvas. JSplitPane aViewSplitPane = new JSplitPane ( JSplitPane.HORIZONTAL_SPLIT, - aLeftViewSplitPane, + aLeftViewSplitPane, aScrolledCanvas ); aViewSplitPane.setOneTouchExpandable(true); aViewSplitPane.setDividerLocation (400); - + // Text output area. maMessageArea = MessageArea.Instance (); // maMessageArea.setPreferredSize (new Dimension (300,50)); @@ -204,7 +204,7 @@ public class AccessibilityWorkBench aUpdateButton = createButton ("Update", "update"); aShapesButton = createButton ("Expand Shapes", "shapes"); aExpandButton = createButton ("Expand All", "expand"); - aQuitButton = createButton ("Quit", "quit"); + aQuitButton = createButton ("Quit", "quit"); UpdateButtonStates (); Options.Instance().Load (msOptionsFileName); @@ -224,7 +224,7 @@ public class AccessibilityWorkBench /** Shortcut method for adding an object to a GridBagLayout. */ - void addGridElement (JComponent object, + void addGridElement (JComponent object, int x, int y, int width, int height, int weightx, int weighty, int anchor, int fill) { @@ -252,7 +252,7 @@ public class AccessibilityWorkBench aButton.setEnabled (false); aButton.setActionCommand (command); aButton.addActionListener (this); - + maButtonBar.add (aButton); return aButton; } @@ -269,7 +269,7 @@ public class AccessibilityWorkBench { // Menu bar. maMenuBar = new JMenuBar (); - + // File menu. JMenu aFileMenu = new JMenu ("File"); maMenuBar.add (aFileMenu); @@ -330,7 +330,7 @@ public class AccessibilityWorkBench // Help menu. JMenu aHelpMenu = new JMenu ("Help"); maMenuBar.add (aHelpMenu); - + aItem = new JMenuItem ("Help"); aHelpMenu.add (aItem); aItem.addActionListener (this); @@ -413,7 +413,7 @@ public class AccessibilityWorkBench /** Callback for GUI actions from the buttons. */ - public void actionPerformed (java.awt.event.ActionEvent e) + public void actionPerformed (java.awt.event.ActionEvent e) { if (e.getActionCommand().equals("connect")) { @@ -578,17 +578,17 @@ public class AccessibilityWorkBench /// The Singleton Workbench object. - private static AccessibilityWorkBench + private static AccessibilityWorkBench saWorkBench = null; - - protected SimpleOffice + + protected SimpleOffice office; - protected InformationWriter + protected InformationWriter info; - - private XModel + + private XModel mxModel; - private JPanel + private JPanel maMainPanel, maButtonBar; private Canvas @@ -599,9 +599,9 @@ public class AccessibilityWorkBench maObjectViewContainer; private JScrollPane maScrollPane; - private MessageArea + private MessageArea maMessageArea; - private JButton + private JButton aConnectButton, aQuitButton, aUpdateButton, @@ -615,6 +615,6 @@ public class AccessibilityWorkBench mbInitialized; private TopWindowListener maTopWindowListener; - private QueuedTopWindowListener + private QueuedTopWindowListener maQueuedTopWindowListener; } diff --git a/toolkit/test/accessibility/AccessibleActionHandler.java b/toolkit/test/accessibility/AccessibleActionHandler.java index 0aac7158efde..d91923b2b7a2 100644 --- a/toolkit/test/accessibility/AccessibleActionHandler.java +++ b/toolkit/test/accessibility/AccessibleActionHandler.java @@ -4,12 +4,12 @@ import com.sun.star.accessibility.XAccessibleContext; import com.sun.star.accessibility.XAccessibleAction; import com.sun.star.lang.IndexOutOfBoundsException; -class AccessibleActionHandler +class AccessibleActionHandler extends NodeHandler { public NodeHandler createHandler (XAccessibleContext xContext) { - XAccessibleAction xEComponent = + XAccessibleAction xEComponent = (XAccessibleAction) UnoRuntime.queryInterface ( XAccessibleAction.class, xContext); if (xEComponent != null) @@ -35,7 +35,7 @@ class AccessibleActionHandler } public AccessibleTreeNode createChild ( - AccessibleTreeNode aParent, + AccessibleTreeNode aParent, int nIndex) { AccessibleTreeNode aChild = null; @@ -54,7 +54,7 @@ class AccessibleActionHandler try { aChild = new AccessibleActionNode ( - "Action " + nIndex + " : " + "Action " + nIndex + " : " + xAction.getAccessibleActionDescription (nIndex), aParent, nIndex); diff --git a/toolkit/test/accessibility/AccessibleActionNode.java b/toolkit/test/accessibility/AccessibleActionNode.java index 7c72ac69803e..b684d4c87f3e 100644 --- a/toolkit/test/accessibility/AccessibleActionNode.java +++ b/toolkit/test/accessibility/AccessibleActionNode.java @@ -7,7 +7,7 @@ import com.sun.star.accessibility.XAccessibleAction; class AccessibleActionNode extends StringNode { - public AccessibleActionNode (String aDisplayObject, + public AccessibleActionNode (String aDisplayObject, AccessibleTreeNode aParent, int nActionIndex) { @@ -15,13 +15,13 @@ class AccessibleActionNode mnActionIndex = nActionIndex; } - public String[] getActions () + public String[] getActions () { return new String[] {"Perform Action"}; } /** perform action */ - public void performAction (int nIndex) + public void performAction (int nIndex) { if (nIndex != 0) return; @@ -37,10 +37,10 @@ class AccessibleActionNode { } - JOptionPane.showMessageDialog (null, + JOptionPane.showMessageDialog (null, "performed action " + mnActionIndex + (bResult?" with":" without") + " success", - "Action " + mnActionIndex, + "Action " + mnActionIndex, JOptionPane.INFORMATION_MESSAGE); } diff --git a/toolkit/test/accessibility/AccessibleCellHandler.java b/toolkit/test/accessibility/AccessibleCellHandler.java index 19b4a9df67ad..bef792998db6 100644 --- a/toolkit/test/accessibility/AccessibleCellHandler.java +++ b/toolkit/test/accessibility/AccessibleCellHandler.java @@ -15,7 +15,7 @@ class AccessibleCellHandler extends NodeHandler XAccessible xParent = xContext.getAccessibleParent(); if (xParent != null) { - XAccessibleTable xTable = + XAccessibleTable xTable = (XAccessibleTable) UnoRuntime.queryInterface ( XAccessibleTable.class, xParent.getAccessibleContext()); if (xTable != null) diff --git a/toolkit/test/accessibility/AccessibleComponentHandler.java b/toolkit/test/accessibility/AccessibleComponentHandler.java index 38e5545d23aa..3c9f2b56a29d 100644 --- a/toolkit/test/accessibility/AccessibleComponentHandler.java +++ b/toolkit/test/accessibility/AccessibleComponentHandler.java @@ -4,20 +4,20 @@ import com.sun.star.accessibility.XAccessibleContext; import com.sun.star.accessibility.XAccessibleComponent; -class AccessibleComponentHandler +class AccessibleComponentHandler extends NodeHandler { public NodeHandler createHandler (XAccessibleContext xContext) { - XAccessibleComponent xComponent = + XAccessibleComponent xComponent = (XAccessibleComponent) UnoRuntime.queryInterface ( XAccessibleComponent.class, xContext); if (xComponent != null) return new AccessibleComponentHandler (xComponent); else return null; - + } public AccessibleComponentHandler () @@ -35,9 +35,9 @@ class AccessibleComponentHandler AccessibleTreeNode aChild = null; if (aParent instanceof AccTreeNode) { - XAccessibleComponent xComponent = + XAccessibleComponent xComponent = ((AccTreeNode)aParent).getComponent(); - + if (xComponent != null) { int nColor; @@ -64,7 +64,7 @@ class AccessibleComponentHandler case 3: com.sun.star.awt.Rectangle aBBox = xComponent.getBounds(); aChild = new StringNode ( - "Bounding Box: "+ aBBox.X + ", " + aBBox.Y + "," + "Bounding Box: "+ aBBox.X + ", " + aBBox.Y + "," + aBBox.Width + ", " + aBBox.Height, aParent); break; diff --git a/toolkit/test/accessibility/AccessibleContextHandler.java b/toolkit/test/accessibility/AccessibleContextHandler.java index fd22bcd5367f..a9267e562938 100644 --- a/toolkit/test/accessibility/AccessibleContextHandler.java +++ b/toolkit/test/accessibility/AccessibleContextHandler.java @@ -7,7 +7,7 @@ import java.util.HashMap; import tools.NameProvider; -class AccessibleContextHandler +class AccessibleContextHandler extends NodeHandler { protected int nChildrenCount; @@ -37,14 +37,14 @@ class AccessibleContextHandler XAccessibleContext xContext = null; if (aParent instanceof AccTreeNode) xContext = ((AccTreeNode)aParent).getContext(); - + String sChild = new String(); if (xContext != null) { switch( nIndex ) { case 0: - sChild = "Description: " + + sChild = "Description: " + xContext.getAccessibleDescription(); break; case 1: @@ -56,14 +56,14 @@ class AccessibleContextHandler sChild = "Has parent: " + (xParent!=null ? "yes" : "no"); /* if (xParent != ((AccTreeNode)aParent).getAccessible()) { - sChild += " but that is inconsistent" + sChild += " but that is inconsistent" + "#" + xParent + " # " + ((AccTreeNode)aParent).getAccessible(); } */ break; case 3: sChild = ""; - XAccessibleStateSet xStateSet = + XAccessibleStateSet xStateSet = xContext.getAccessibleStateSet(); if (xStateSet != null) { diff --git a/toolkit/test/accessibility/AccessibleEditableTextHandler.java b/toolkit/test/accessibility/AccessibleEditableTextHandler.java index a79158c099ba..80081da665e9 100644 --- a/toolkit/test/accessibility/AccessibleEditableTextHandler.java +++ b/toolkit/test/accessibility/AccessibleEditableTextHandler.java @@ -8,7 +8,7 @@ class AccessibleEditableTextHandler extends NodeHandler { public NodeHandler createHandler (XAccessibleContext xContext) { - XAccessibleEditableText xText = + XAccessibleEditableText xText = (XAccessibleEditableText) UnoRuntime.queryInterface ( XAccessibleEditableText.class, xContext); if (xText != null) diff --git a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java index 7f9fc17b23a5..3336175d2d22 100644 --- a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java +++ b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java @@ -3,12 +3,12 @@ import com.sun.star.accessibility.XAccessibleContext; import com.sun.star.accessibility.XAccessibleExtendedComponent; -class AccessibleExtendedComponentHandler +class AccessibleExtendedComponentHandler extends NodeHandler { public NodeHandler createHandler (XAccessibleContext xContext) { - XAccessibleExtendedComponent xEComponent = + XAccessibleExtendedComponent xEComponent = (XAccessibleExtendedComponent) UnoRuntime.queryInterface ( XAccessibleExtendedComponent.class, xContext); if (xEComponent != null) @@ -30,7 +30,7 @@ class AccessibleExtendedComponentHandler private static XAccessibleExtendedComponent getComponent (AccTreeNode aNode) { return (XAccessibleExtendedComponent) UnoRuntime.queryInterface ( - XAccessibleExtendedComponent.class, + XAccessibleExtendedComponent.class, aNode.getContext()); } @@ -41,7 +41,7 @@ class AccessibleExtendedComponentHandler if (aParent instanceof AccTreeNode) { XAccessibleExtendedComponent xEComponent = getComponent ((AccTreeNode)aParent); - + if (xEComponent != null) { int nColor; diff --git a/toolkit/test/accessibility/AccessibleHyperlinkHandler.java b/toolkit/test/accessibility/AccessibleHyperlinkHandler.java index 674331317f7e..34609fe9ef33 100644 --- a/toolkit/test/accessibility/AccessibleHyperlinkHandler.java +++ b/toolkit/test/accessibility/AccessibleHyperlinkHandler.java @@ -8,7 +8,7 @@ class AccessibleHyperlinkHandler extends AccessibleTreeHandler { public NodeHandler createHandler (XAccessibleContext xContext) { - XAccessibleHyperlink xLink = + XAccessibleHyperlink xLink = (XAccessibleHyperlink) UnoRuntime.queryInterface ( XAccessibleHyperlink.class, xContext); if (xLink != null) @@ -29,7 +29,7 @@ class AccessibleHyperlinkHandler extends AccessibleTreeHandler protected XAccessibleHyperlink getHyperlink(Object aObject) { - XAccessibleHyperlink xHyperlink = + XAccessibleHyperlink xHyperlink = (XAccessibleHyperlink) UnoRuntime.queryInterface ( XAccessibleHyperlink.class, aObject); return xHyperlink; diff --git a/toolkit/test/accessibility/AccessibleHypertextHandler.java b/toolkit/test/accessibility/AccessibleHypertextHandler.java index aa703942bc4c..ddfd5ebef910 100644 --- a/toolkit/test/accessibility/AccessibleHypertextHandler.java +++ b/toolkit/test/accessibility/AccessibleHypertextHandler.java @@ -8,7 +8,7 @@ class AccessibleHypertextHandler extends AccessibleTreeHandler { public NodeHandler createHandler (XAccessibleContext xContext) { - XAccessibleHypertext xText = + XAccessibleHypertext xText = (XAccessibleHypertext) UnoRuntime.queryInterface ( XAccessibleHypertext.class, xContext); if (xText != null) @@ -29,7 +29,7 @@ class AccessibleHypertextHandler extends AccessibleTreeHandler protected static XAccessibleHypertext getHypertext (AccTreeNode aNode) { - XAccessibleHypertext xHypertext = + XAccessibleHypertext xHypertext = (XAccessibleHypertext) UnoRuntime.queryInterface ( XAccessibleHypertext.class, aNode.getContext()); return xHypertext; diff --git a/toolkit/test/accessibility/AccessibleImageHandler.java b/toolkit/test/accessibility/AccessibleImageHandler.java index 92917e1b9740..c7e28a679b3e 100644 --- a/toolkit/test/accessibility/AccessibleImageHandler.java +++ b/toolkit/test/accessibility/AccessibleImageHandler.java @@ -8,7 +8,7 @@ class AccessibleImageHandler extends NodeHandler { public NodeHandler createHandler (XAccessibleContext xContext) { - XAccessibleImage xImage = + XAccessibleImage xImage = (XAccessibleImage) UnoRuntime.queryInterface ( XAccessibleImage.class, xContext); if (xImage != null) @@ -40,7 +40,7 @@ class AccessibleImageHandler extends NodeHandler XAccessibleImage xImage = getImage ((AccTreeNode)aParent); if (xImage != null) return new StringNode ( - "Image: " + + "Image: " + xImage.getAccessibleImageDescription() + " (" + xImage.getAccessibleImageWidth() + "x" + xImage.getAccessibleImageHeight() + ")", diff --git a/toolkit/test/accessibility/AccessibleRelationHandler.java b/toolkit/test/accessibility/AccessibleRelationHandler.java index ea3be4c16264..d4cbc9a7e1c2 100644 --- a/toolkit/test/accessibility/AccessibleRelationHandler.java +++ b/toolkit/test/accessibility/AccessibleRelationHandler.java @@ -8,7 +8,7 @@ import com.sun.star.lang.IndexOutOfBoundsException; import tools.NameProvider; -class AccessibleRelationHandler +class AccessibleRelationHandler extends NodeHandler { public NodeHandler createHandler( XAccessibleContext xContext ) @@ -34,7 +34,7 @@ class AccessibleRelationHandler maChildList.setSize( 1 ); } - public AccessibleTreeNode createChild( AccessibleTreeNode aParent, + public AccessibleTreeNode createChild( AccessibleTreeNode aParent, int nIndex ) { XAccessibleRelationSet xRelation = null; @@ -42,7 +42,7 @@ class AccessibleRelationHandler if( aParent instanceof AccTreeNode ) { - xRelation = + xRelation = ((AccTreeNode)aParent).getContext().getAccessibleRelationSet(); } if( xRelation == null ) @@ -64,8 +64,8 @@ class AccessibleRelationHandler for( int j = 0; j < aRelation.TargetSet.length; j++ ) { Object aTarget = aRelation.TargetSet[j]; - XAccessible xAccTarget = - (XAccessible)UnoRuntime.queryInterface( + XAccessible xAccTarget = + (XAccessible)UnoRuntime.queryInterface( XAccessible.class, aTarget ); if( xAccTarget == null ) { @@ -80,7 +80,7 @@ class AccessibleRelationHandler } aBuffer.delete( aBuffer.length() - 2, aBuffer.length() ); - aVNode.addChild( new StringNode( aBuffer.toString(), + aVNode.addChild( new StringNode( aBuffer.toString(), aParent ) ); } diff --git a/toolkit/test/accessibility/AccessibleSelectionHandler.java b/toolkit/test/accessibility/AccessibleSelectionHandler.java index f7ab62807332..bf6fbade0762 100644 --- a/toolkit/test/accessibility/AccessibleSelectionHandler.java +++ b/toolkit/test/accessibility/AccessibleSelectionHandler.java @@ -13,15 +13,15 @@ import java.awt.event.ActionEvent; -class AccessibleSelectionHandler +class AccessibleSelectionHandler extends NodeHandler { public NodeHandler createHandler( XAccessibleContext xContext ) { - XAccessibleSelection xSelection = + XAccessibleSelection xSelection = (XAccessibleSelection) UnoRuntime.queryInterface( XAccessibleSelection.class, xContext); - return (xSelection == null) ? null : + return (xSelection == null) ? null : new AccessibleSelectionHandler(xSelection); } @@ -35,28 +35,28 @@ class AccessibleSelectionHandler maChildList.setSize( 2 ); } - public AccessibleTreeNode createChild( AccessibleTreeNode aParent, + public AccessibleTreeNode createChild( AccessibleTreeNode aParent, int nIndex ) { AccessibleTreeNode aChild = null; if( aParent instanceof AccTreeNode ) { - XAccessibleSelection xSelection = + XAccessibleSelection xSelection = ((AccTreeNode)aParent).getSelection(); if( xSelection != null ) { switch( nIndex ) { case 0: - aChild = new StringNode( - "getSelectedAccessibleChildCount: " + + aChild = new StringNode( + "getSelectedAccessibleChildCount: " + xSelection.getSelectedAccessibleChildCount(), aParent ); break; case 1: { - VectorNode aVNode = + VectorNode aVNode = new VectorNode( "Selected Children", aParent); int nSelected = 0; int nCount = ((AccTreeNode)aParent).getContext(). @@ -71,13 +71,13 @@ class AccessibleSelectionHandler { XAccessible xSelChild = xSelection. getSelectedAccessibleChild(nSelected); - XAccessible xNChild = + XAccessible xNChild = ((AccTreeNode)aParent). getContext().getAccessibleChild( i ); aVNode.addChild( new StringNode( - i + ": " + + i + ": " + xNChild.getAccessibleContext(). - getAccessibleDescription() + " (" + + getAccessibleDescription() + " (" + (xSelChild.equals(xNChild) ? "OK" : "XXX") + ")", aParent ) ); } @@ -93,7 +93,7 @@ class AccessibleSelectionHandler } catch( IndexOutOfBoundsException e ) { - aChild = new StringNode( "IndexOutOfBounds", + aChild = new StringNode( "IndexOutOfBounds", aParent ); } } @@ -109,11 +109,11 @@ class AccessibleSelectionHandler } - public String[] getActions (AccessibleTreeNode aNode) - { + public String[] getActions (AccessibleTreeNode aNode) + { if( aNode instanceof AccTreeNode ) { - XAccessibleSelection xSelection = + XAccessibleSelection xSelection = ((AccTreeNode)aNode).getSelection(); if( xSelection != null ) { @@ -124,7 +124,7 @@ class AccessibleSelectionHandler } public void performAction (AccessibleTreeNode aNode, int nIndex) - { + { new SelectionDialog( (AccTreeNode)aNode ).show(); } } diff --git a/toolkit/test/accessibility/AccessibleTableHandler.java b/toolkit/test/accessibility/AccessibleTableHandler.java index c3883f649d5e..cc175bb4c63d 100644 --- a/toolkit/test/accessibility/AccessibleTableHandler.java +++ b/toolkit/test/accessibility/AccessibleTableHandler.java @@ -8,7 +8,7 @@ class AccessibleTableHandler extends NodeHandler { public NodeHandler createHandler (XAccessibleContext xContext) { - XAccessibleTable xTable = + XAccessibleTable xTable = (XAccessibleTable) UnoRuntime.queryInterface ( XAccessibleTable.class, xContext); if (xTable != null) diff --git a/toolkit/test/accessibility/AccessibleTextHandler.java b/toolkit/test/accessibility/AccessibleTextHandler.java index 6fa083b22ea3..2f256a4f3573 100644 --- a/toolkit/test/accessibility/AccessibleTextHandler.java +++ b/toolkit/test/accessibility/AccessibleTextHandler.java @@ -78,9 +78,9 @@ class AccessibleTextHandler extends NodeHandler aChild = new StringNode (characters( xText ), aParent); break; case 3: - aChild = new StringNode ("selection: " - + "[" + xText.getSelectionStart() - + "," + xText.getSelectionEnd() + aChild = new StringNode ("selection: " + + "[" + xText.getSelectionStart() + + "," + xText.getSelectionEnd() + "] \"" + xText.getSelectedText() + "\"", aParent); break; @@ -91,32 +91,32 @@ class AccessibleTextHandler extends NodeHandler { VectorNode aVec = new VectorNode("portions", aParent); aChild = aVec; - aVec.addChild( - textAtIndexNode( xText, "Character", + aVec.addChild( + textAtIndexNode( xText, "Character", AccessibleTextType.CHARACTER, aParent ) ); - aVec.addChild( - textAtIndexNode( xText, "Word", - AccessibleTextType.WORD, + aVec.addChild( + textAtIndexNode( xText, "Word", + AccessibleTextType.WORD, aParent ) ); - aVec.addChild( - textAtIndexNode( xText, "Sentence", + aVec.addChild( + textAtIndexNode( xText, "Sentence", AccessibleTextType.SENTENCE, aParent ) ); - aVec.addChild( - textAtIndexNode( xText, "Paragraph", + aVec.addChild( + textAtIndexNode( xText, "Paragraph", AccessibleTextType.PARAGRAPH, aParent ) ); - aVec.addChild( - textAtIndexNode( xText, "Line", + aVec.addChild( + textAtIndexNode( xText, "Line", AccessibleTextType.LINE, aParent ) ); - aVec.addChild( + aVec.addChild( textAtIndexNode( xText, "Attribute", AccessibleTextType.ATTRIBUTE_RUN, aParent ) ); - aVec.addChild( - textAtIndexNode( xText, "Glyph", + aVec.addChild( + textAtIndexNode( xText, "Glyph", AccessibleTextType.GLYPH, aParent ) ); } @@ -147,21 +147,21 @@ class AccessibleTextHandler extends NodeHandler { return "[" + nStart + "," + nEnd + "] " + "\"" + sWord + "\" \t" - + "(" + sBefore + "," + + "(" + sBefore + "," + "" + sBehind + ")"; } - + /** Create a text node that lists all strings of a particular text type */ private AccessibleTreeNode textAtIndexNode( - XAccessibleText xText, - String sName, + XAccessibleText xText, + String sName, short nTextType, AccessibleTreeNode aParent) { VectorNode aNode = new VectorNode (sName, aParent); - // get word at all positions; + // get word at all positions; // for nicer display, compare current word to previous one and // make a new node for every interval, not for every word int nLength = xText.getCharacterCount(); @@ -170,7 +170,7 @@ class AccessibleTextHandler extends NodeHandler try { // sWord + nStart mark the current word - // make a node as soon as a new one is found; close the last + // make a node as soon as a new one is found; close the last // one at the end TextSegment sWord = xText.getTextAtIndex(0, nTextType); TextSegment sBefore = xText.getTextBeforeIndex(0, nTextType); @@ -185,14 +185,14 @@ class AccessibleTextHandler extends NodeHandler sTBeh.equals( sBehind ) ) ) { aNode.addChild (new StringNode (textAtIndexNodeString( - nStart, i, + nStart, i, sWord.SegmentText, sBefore.SegmentText, sBehind.SegmentText), aNode)); sWord = sTmp; sBefore = sTBef; sBehind = sTBeh; nStart = i; } - + // don't generate more than 50 children. if (aNode.getChildCount() > 50) { @@ -200,8 +200,8 @@ class AccessibleTextHandler extends NodeHandler break; } } - aNode.addChild (new StringNode (textAtIndexNodeString( - nStart, nLength, + aNode.addChild (new StringNode (textAtIndexNodeString( + nStart, nLength, sWord.SegmentText, sBefore.SegmentText, sBehind.SegmentText), aNode)); } catch( IndexOutOfBoundsException e ) @@ -237,7 +237,7 @@ class AccessibleTextHandler extends NodeHandler aChars.append( xText.getCharacter(i) ); aChars.append( "," ); } - if( nChars > 0) + if( nChars > 0) { if( nChars == xText.getCharacterCount() ) aChars.deleteCharAt( aChars.length() - 1 ); @@ -256,7 +256,7 @@ class AccessibleTextHandler extends NodeHandler } - /** iterate over characters, and translate their positions + /** iterate over characters, and translate their positions * back and forth */ private String bounds( XAccessibleText xText ) { @@ -290,7 +290,7 @@ class AccessibleTextHandler extends NodeHandler return aBuffer.toString(); } - + private AccessibleTreeNode getAttributes( XAccessibleText xText, AccessibleTreeNode aParent) { @@ -316,7 +316,7 @@ class AccessibleTextHandler extends NodeHandler try { VectorNode aPortions = new VectorNode ("getAttributes", aParent); - + int nIndex = 0; int nLength = xText.getCharacterCount(); while( nIndex < nLength ) @@ -325,7 +325,7 @@ class AccessibleTextHandler extends NodeHandler String aPortion = null; try { - aPortion = xText.getTextAtIndex( + aPortion = xText.getTextAtIndex( nIndex, AccessibleTextType.ATTRIBUTE_RUN).SegmentText; } catch(com.sun.star.lang.IllegalArgumentException e) @@ -338,7 +338,7 @@ class AccessibleTextHandler extends NodeHandler VectorNode aAttrs = new VectorNode (aPortion, aPortions); for( int i = 0; i < aValues.length; i++ ) { - new StringNode( aValues[i].Name + ": " + aValues[i].Value, + new StringNode( aValues[i].Name + ": " + aValues[i].Value, aAttrs ); } @@ -349,31 +349,31 @@ class AccessibleTextHandler extends NodeHandler aRet = aPortions; } catch( IndexOutOfBoundsException e ) - { - aRet = new StringNode( "Exception caught:" + e, aParent ); + { + aRet = new StringNode( "Exception caught:" + e, aParent ); } return aRet; } - static String[] aTextActions = + static String[] aTextActions = new String[] { "select...", "copy..." }; - static String[] aEditableTextActions = - new String[] { "select...", "copy...", + static String[] aEditableTextActions = + new String[] { "select...", "copy...", "cut...", "paste...", "edit...", "format..." }; - public String[] getActions (AccessibleTreeNode aNode) - { + public String[] getActions (AccessibleTreeNode aNode) + { XAccessibleEditableText xEText = null; if (aNode instanceof AccTreeNode) xEText = ((AccTreeNode)aNode).getEditText (); - + return (xEText == null) ? aTextActions : aEditableTextActions; } public void performAction (AccessibleTreeNode aNode, int nIndex) - { + { if ( ! (aNode instanceof AccTreeNode)) return; @@ -384,66 +384,66 @@ class AccessibleTextHandler extends NodeHandler switch( nIndex ) { case 0: - aDialog = new TextActionDialog( aATNode, - "Select range:", + aDialog = new TextActionDialog( aATNode, + "Select range:", "select" ) { - boolean action( + boolean action( JTextComponent aText, AccTreeNode aNode ) throws IndexOutOfBoundsException { - return aNode.getText().setSelection( - getSelectionStart(), + return aNode.getText().setSelection( + getSelectionStart(), getSelectionEnd() ); } }; break; case 1: - aDialog = new TextActionDialog( aATNode, - "Select range and copy:", + aDialog = new TextActionDialog( aATNode, + "Select range and copy:", "copy" ) { - boolean action( + boolean action( JTextComponent aText, AccTreeNode aNode ) throws IndexOutOfBoundsException { - return aNode.getText().copyText( - getSelectionStart(), + return aNode.getText().copyText( + getSelectionStart(), getSelectionEnd() ); } }; break; case 2: - aDialog = new TextActionDialog( aATNode, - "Select range and cut:", + aDialog = new TextActionDialog( aATNode, + "Select range and cut:", "cut" ) { - boolean action( + boolean action( JTextComponent aText, AccTreeNode aNode ) throws IndexOutOfBoundsException { - return aNode.getEditText().cutText( - getSelectionStart(), + return aNode.getEditText().cutText( + getSelectionStart(), getSelectionEnd() ); } }; break; case 3: - aDialog = new TextActionDialog( aATNode, - "Place Caret and paste:", + aDialog = new TextActionDialog( aATNode, + "Place Caret and paste:", "paste" ) { - boolean action( + boolean action( JTextComponent aText, AccTreeNode aNode ) throws IndexOutOfBoundsException { - return aNode.getEditText().pasteText( + return aNode.getEditText().pasteText( aText.getCaretPosition() ); } }; break; case 4: - aDialog = new TextEditDialog( aATNode, "Edit text:", + aDialog = new TextEditDialog( aATNode, "Edit text:", "edit" ); break; case 5: @@ -469,7 +469,7 @@ class TextActionDialog extends JDialog JCheckBox aIndexToggle; public TextActionDialog( AccTreeNode aNd, - String sExplanation, + String sExplanation, String sButtonText ) { super( AccessibilityWorkBench.Instance() ); @@ -482,8 +482,8 @@ class TextActionDialog extends JDialog } /** build dialog */ - protected void init( String sExplanation, - String sText, + protected void init( String sExplanation, + String sText, String sButtonText ) { setTitle( sName ); @@ -504,7 +504,7 @@ class TextActionDialog extends JDialog aText.setLineWrap( true ); aText.setEditable( false ); aContent.add( aText, BorderLayout.CENTER ); - + JPanel aButtons = new JPanel(); aButtons.setLayout( new FlowLayout() ); aIndexToggle = new JCheckBox( "reverse selection" ); @@ -543,8 +543,8 @@ class TextActionDialog extends JDialog } if( sError != null ) - JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(), - sError, sName, + JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(), + sError, sName, JOptionPane.ERROR_MESSAGE); cancel(); @@ -565,14 +565,14 @@ class TextActionDialog extends JDialog int getSelectionEnd() { return getSelection(false); } int getSelection(boolean bStart) { - return ( bStart ^ aIndexToggle.isSelected() ) + return ( bStart ^ aIndexToggle.isSelected() ) ? aText.getSelectionStart() : aText.getSelectionEnd(); } /** override this for dialog-specific action */ - boolean action( JTextComponent aText, AccTreeNode aNode ) + boolean action( JTextComponent aText, AccTreeNode aNode ) throws IndexOutOfBoundsException { return false; @@ -583,14 +583,14 @@ class TextActionDialog extends JDialog class TextEditDialog extends TextActionDialog { public TextEditDialog( AccTreeNode aNode, - String sExplanation, + String sExplanation, String sButtonText ) { super( aNode, sExplanation, sButtonText ); } - protected void init( String sExplanation, - String sText, + protected void init( String sExplanation, + String sText, String sButtonText ) { super.init( sExplanation, sText, sButtonText ); @@ -599,7 +599,7 @@ class TextEditDialog extends TextActionDialog /** edit the text */ - boolean action( JTextComponent aText, AccTreeNode aNode ) + boolean action( JTextComponent aText, AccTreeNode aNode ) { // is this text editable? if not, fudge you and return XAccessibleEditableText xEdit = aNode.getEditText(); @@ -629,7 +629,7 @@ class TextEditDialog extends TextActionDialog nFront++; int nBack = 0; while( (nBack < nMinLength) && - ( sNew.charAt(sNew.length()-nBack-1) == + ( sNew.charAt(sNew.length()-nBack-1) == sOld.charAt(sOld.length()-nBack-1) ) ) nBack++; if( nFront + nBack > nMinLength ) @@ -640,7 +640,7 @@ class TextEditDialog extends TextActionDialog String sDel = sOld.substring( nFront, sOld.length() - nBack ); String sIns = sNew.substring( nFront, sNew.length() - nBack ); - System.out.println("edit text: " + + System.out.println("edit text: " + sOld.substring(0, nFront) + " [ " + sDel + " -> " + sIns + " ] " + sOld.substring(sOld.length() - nBack) ); @@ -674,19 +674,19 @@ class TextAttributeDialog extends TextActionDialog public TextAttributeDialog( AccTreeNode aNode ) { - super( aNode, "Choose attributes, select text, and press 'Set':", + super( aNode, "Choose attributes, select text, and press 'Set':", "set" ); } private JCheckBox aBold, aUnderline, aItalics; private Color aForeground, aBackground; - protected void init( String sExplanation, - String sText, + protected void init( String sExplanation, + String sText, String sButtonText ) { super.init( sExplanation, sText, sButtonText ); - + aForeground = Color.black; aBackground = Color.white; @@ -699,22 +699,22 @@ class TextAttributeDialog extends TextActionDialog JButton aForeButton = new JButton("Foreground", new ColorIcon(true)); aForeButton.addActionListener( new ActionListener() { - public void actionPerformed(ActionEvent e) - { + public void actionPerformed(ActionEvent e) + { aForeground = JColorChooser.showDialog( - TextAttributeDialog.this, - "Select Foreground Color", + TextAttributeDialog.this, + "Select Foreground Color", aForeground); } } ); - + JButton aBackButton = new JButton("Background", new ColorIcon(false)); aBackButton.addActionListener( new ActionListener() { - public void actionPerformed(ActionEvent e) - { + public void actionPerformed(ActionEvent e) + { aBackground = JColorChooser.showDialog( - TextAttributeDialog.this, - "Select Background Color", + TextAttributeDialog.this, + "Select Background Color", aBackground); } } ); @@ -751,10 +751,10 @@ class TextAttributeDialog extends TextActionDialog } } - + /** edit the text */ - boolean action( JTextComponent aText, AccTreeNode aNode ) + boolean action( JTextComponent aText, AccTreeNode aNode ) throws IndexOutOfBoundsException { // is this text editable? if not, fudge you and return @@ -782,7 +782,7 @@ class TextAttributeDialog extends TextActionDialog aSequence[5].Name = "CharBackTransparent"; aSequence[5].Value = new Boolean( false ); - bSuccess = xEdit.setAttributes( getSelectionStart(), + bSuccess = xEdit.setAttributes( getSelectionStart(), getSelectionEnd(), aSequence ); } diff --git a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java index deb3cb967133..8e8f26aa858a 100644 --- a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java +++ b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java @@ -7,7 +7,7 @@ import java.util.Vector; public class AccessibleTreeCellRenderer - extends DefaultTreeCellRenderer + extends DefaultTreeCellRenderer { public Color maDefaultColor, @@ -17,7 +17,7 @@ public class AccessibleTreeCellRenderer - public AccessibleTreeCellRenderer () + public AccessibleTreeCellRenderer () { maDefaultColor = Color.black; maChangedColor = Color.red; @@ -31,7 +31,7 @@ public class AccessibleTreeCellRenderer boolean expanded, boolean leaf, int row, - boolean hasFocus) + boolean hasFocus) { super.getTreeCellRendererComponent( tree, value, sel, @@ -40,7 +40,7 @@ public class AccessibleTreeCellRenderer if (maChangedLines.size()<=row || maChangedLines.elementAt (row) == null) setTextNonSelectionColor (maDefaultColor); - else + else setTextNonSelectionColor (maChangedColor); return this; diff --git a/toolkit/test/accessibility/AccessibleTreeHandler.java b/toolkit/test/accessibility/AccessibleTreeHandler.java index f45db8cb5ab9..7c05ed43008d 100644 --- a/toolkit/test/accessibility/AccessibleTreeHandler.java +++ b/toolkit/test/accessibility/AccessibleTreeHandler.java @@ -6,9 +6,9 @@ import com.sun.star.lang.IndexOutOfBoundsException; /** * Map the tree of accessibility objects into their - * AccessibilityTreeModel counterparts. + * AccessibilityTreeModel counterparts. */ -class AccessibleTreeHandler +class AccessibleTreeHandler extends NodeHandler { protected XAccessibleContext mxContext; @@ -59,7 +59,7 @@ class AccessibleTreeHandler xChild, aParent); } catch( IndexOutOfBoundsException e ) - { + { aChild = new StringNode ("ERROR: no child with index " + nIndex, aParent); } } @@ -98,7 +98,7 @@ class AccessibleTreeHandler /** Update only the child count node. Trust on other ways to update the - accessible children. + accessible children. */ public void update (AccessibleTreeNode aNode) { diff --git a/toolkit/test/accessibility/AccessibleTreeNode.java b/toolkit/test/accessibility/AccessibleTreeNode.java index f9b0799e4423..205556c061c6 100644 --- a/toolkit/test/accessibility/AccessibleTreeNode.java +++ b/toolkit/test/accessibility/AccessibleTreeNode.java @@ -23,14 +23,14 @@ class AccessibleTreeNode // Empty } - public AccessibleTreeNode getParent () + public AccessibleTreeNode getParent () { - return maParent; + return maParent; } - public Object getDisplayObject () + public Object getDisplayObject () { - return maDisplayObject; + return maDisplayObject; } public int getChildCount () @@ -78,7 +78,7 @@ class AccessibleTreeNode return aPath.toArray(); } - public boolean isLeaf() + public boolean isLeaf() { return true; } @@ -89,13 +89,13 @@ class AccessibleTreeNode } /** get names of suported actions */ - public String[] getActions () - { + public String[] getActions () + { return new String[] {}; } /** perform action */ - public void performAction (int nIndex) + public void performAction (int nIndex) { } } diff --git a/toolkit/test/accessibility/AccessibleUNOHandler.java b/toolkit/test/accessibility/AccessibleUNOHandler.java index d52e60cd721f..cdd0906ef614 100644 --- a/toolkit/test/accessibility/AccessibleUNOHandler.java +++ b/toolkit/test/accessibility/AccessibleUNOHandler.java @@ -12,14 +12,14 @@ import com.sun.star.uno.Type; /** This handler displays lower level UNO information. These are the supported services, interfaces, and the implementation name. */ -class AccessibleUNOHandler +class AccessibleUNOHandler extends NodeHandler { public NodeHandler createHandler (XAccessibleContext xContext) { if (xContext == null) return null; - else + else return new AccessibleUNOHandler (xContext); } @@ -49,7 +49,7 @@ class AccessibleUNOHandler return xTypeProvider; } - public AccessibleTreeNode createChild (AccessibleTreeNode aParent, + public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex) { AccessibleTreeNode aChild = null; diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java index a1d8fb0f7d08..a9614c81e4bb 100755 --- a/toolkit/test/accessibility/Canvas.java +++ b/toolkit/test/accessibility/Canvas.java @@ -19,7 +19,7 @@ import com.sun.star.accessibility.XAccessibleComponent; <p>The canvas listens to selection events of the associated JTree and highlights the first selected node of that tree.</p> */ -class Canvas +class Canvas extends JPanel implements MouseListener, MouseMotionListener, TreeSelectionListener//, Scrollable { @@ -48,7 +48,7 @@ class Canvas } /** Tell the canvas which tree view to use to highlight accessible - objects. + objects. */ public void setTree (JTree aTree) { @@ -67,7 +67,7 @@ class Canvas if (maNodes.indexOf (aNode) == -1) { maNodes.add (aNode); - + CanvasShape aObject = (CanvasShape) maObjects.get (aNode); if (aObject == null) { @@ -77,7 +77,7 @@ class Canvas maBoundingBox = aObject.getBBox(); else maBoundingBox = maBoundingBox.union (aObject.getBBox()); - + maObjects.put (aNode, aObject); maObjectList.add (aObject); @@ -109,14 +109,14 @@ class Canvas aObject.update(); } } - + public void updateNodeGeometry (AccTreeNode aNode) { CanvasShape aObject = (CanvasShape)maObjects.get(aNode); if (aObject != null) aObject.updateGeometry(); } - + public void clear () { while (maNodes.size() > 0) @@ -159,7 +159,7 @@ class Canvas Options.SetBoolean ("Antialiasing", bNewValue); repaint (); } - + public boolean getShowText () { return Options.GetBoolean ("ShowText"); @@ -191,10 +191,10 @@ class Canvas Graphics2D g2 = (Graphics2D)g; if (getAntialiasing()) - g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING, + g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); else - g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING, + g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); setupTransformation (); @@ -212,7 +212,7 @@ class Canvas g2.fill (aScreen); g2.setColor (Color.BLACK); g2.draw (aScreen); - + synchronized (maObjectList) { int nCount = maObjectList.size(); @@ -228,7 +228,7 @@ class Canvas bShowDescriptions, bShowNames, bShowText); } } - + // Paint highlighted frame around active object as the last thing. if (maActiveObject != null) maActiveObject.paint_highlight ( @@ -278,7 +278,7 @@ class Canvas // Calculate the scales that would map the screen onto the // widget in both of the coordinate axes and select the // smaller - // of the two: it maps the screen onto the widget in both + // of the two: it maps the screen onto the widget in both // axes at the same time. double nHScale = (aWidgetSize.getWidth() - 10) / aScreenSize.getWidth(); double nVScale = (aWidgetSize.getHeight() - 10) / aScreenSize.getHeight(); @@ -299,7 +299,7 @@ class Canvas mnHOffset = 0; if (mnVOffset < 0) mnVOffset = 0; - + setPreferredSize (new Dimension ( (int)(2*mnHOffset + mnScale * aScreenSize.getWidth()), (int)(2*mnVOffset + mnScale * aScreenSize.getHeight()))); @@ -316,8 +316,8 @@ class Canvas } maLastWidgetSize = aWidgetSize; } - - + + /** Call getAccessibleAt to determine accessible object under mouse. */ @@ -388,7 +388,7 @@ class Canvas { if (maActiveObject != null) maActiveObject.unhighlight(); - + maActiveObject = aNewActiveObject; if (maActiveObject != null) { @@ -406,7 +406,7 @@ class Canvas else return false; } - + /** Called when the selection of the tree changes. Highlight the corresponding graphical representation of the first selected object. */ @@ -422,7 +422,7 @@ class Canvas } } - private int + private int mnXAnchor, mnYAnchor, maResizeFlag; @@ -430,19 +430,19 @@ class Canvas mnHOffset, mnVOffset, mnScale; - private CanvasShape + private CanvasShape maActiveObject; private java.util.HashMap maObjects; - private Vector + private Vector maObjectList, maContexts, maNodes; - private Rectangle + private Rectangle maBoundingBox; private JTree maTree; // The size of the widget at the last call of setupTransformation() - private Dimension + private Dimension maLastWidgetSize; } diff --git a/toolkit/test/accessibility/CanvasShape.java b/toolkit/test/accessibility/CanvasShape.java index 57cedebb9e88..c71320b43e69 100644 --- a/toolkit/test/accessibility/CanvasShape.java +++ b/toolkit/test/accessibility/CanvasShape.java @@ -61,7 +61,7 @@ class CanvasShape mbFocused = xStateSet.contains (AccessibleStateType.FOCUSED); } } - + updateGeometry (); if (mxComponent != null) { @@ -99,7 +99,7 @@ class CanvasShape /** Paint the object into the specified canvas. It is transformed according to the specified offset and scale. */ - public void paint (Graphics2D g, + public void paint (Graphics2D g, double nXOffset, double nYOffset, double nScaleFactor, boolean bShowDescription, boolean bShowName, boolean bShowText) { @@ -112,7 +112,7 @@ class CanvasShape maPosition.y * nScaleFactor + nYOffset, maSize.width * nScaleFactor, maSize.height * nScaleFactor); - + // Fill the object's bounding box with its background color if it // has no children. if (mxContext.getAccessibleChildCount() == 0) @@ -127,7 +127,7 @@ class CanvasShape color = new Color (maFgColor.getRed(), maFgColor.getGreen(), maFgColor.getBlue()); g.setColor (color); g.draw (maShape); - + if (mbFocused) { g.setColor (maFocusColor); @@ -167,7 +167,7 @@ class CanvasShape } } - public void paint_highlight (Graphics2D g, + public void paint_highlight (Graphics2D g, double nXOffset, double nYOffset, double nScaleFactor) { if (mbHighlighted) @@ -182,18 +182,18 @@ class CanvasShape private void paintName (Graphics2D g) { - g.drawString ("Name: " + msName, - (float)maShape.x+5, - (float)maShape.y+15); + g.drawString ("Name: " + msName, + (float)maShape.x+5, + (float)maShape.y+15); } private void paintDescription (Graphics2D g) { - g.drawString ("Description: " + msDescription, - (float)maShape.x+5, - (float)maShape.y+35); + g.drawString ("Description: " + msDescription, + (float)maShape.x+5, + (float)maShape.y+35); } @@ -215,10 +215,10 @@ class CanvasShape { com.sun.star.awt.Rectangle aRect = xText.getCharacterBounds(i); - + double x = maShape.x + aRect.X; double y = maShape.y + aRect.Y + aRect.Height; - + g.drawString(sText.substring(i, i+1), (float)x, (float)y); } } @@ -267,7 +267,7 @@ class CanvasShape { return new Rectangle (maPosition, maSize); } - + public Point getOrigin () { return maPosition; diff --git a/toolkit/test/accessibility/EventHandler.java b/toolkit/test/accessibility/EventHandler.java index 69f7fd2144f0..616448e5d769 100644 --- a/toolkit/test/accessibility/EventHandler.java +++ b/toolkit/test/accessibility/EventHandler.java @@ -31,9 +31,9 @@ class EventHandler public void Print (PrintStream out) { - out.println ("Event id is " + mnEventId + out.println ("Event id is " + mnEventId + " (" + NameProvider.getEventName(mnEventId)+")" - + " for " + mxEventSource.getAccessibleName() + " / " + + " for " + mxEventSource.getAccessibleName() + " / " + NameProvider.getRoleName (mxEventSource.getAccessibleRole())); PrintOldAndNew (out); } diff --git a/toolkit/test/accessibility/EventQueue.java b/toolkit/test/accessibility/EventQueue.java index 9c90af9c63b7..4eb86ede50ce 100644 --- a/toolkit/test/accessibility/EventQueue.java +++ b/toolkit/test/accessibility/EventQueue.java @@ -93,7 +93,7 @@ class EventQueue } catch( Throwable e ) { - System.out.println( + System.out.println( "caught exception during event delivery: " + e ); e.printStackTrace(); } @@ -109,7 +109,7 @@ class EventQueue } } catch (Exception e) - { + { // can't wait? odd! System.err.println("Can't wait!"); e.printStackTrace(); diff --git a/toolkit/test/accessibility/FrameActionListener.java b/toolkit/test/accessibility/FrameActionListener.java index 30324fb9bc52..27d44455e73b 100644 --- a/toolkit/test/accessibility/FrameActionListener.java +++ b/toolkit/test/accessibility/FrameActionListener.java @@ -9,12 +9,12 @@ public class FrameActionListener public FrameActionListener () { } - + public void frameAction (com.sun.star.frame.FrameActionEvent aEvent) { System.out.println ("frame action"); } - + public void disposing (com.sun.star.lang.EventObject aEvent) { } diff --git a/toolkit/test/accessibility/GeometryEventHandler.java b/toolkit/test/accessibility/GeometryEventHandler.java index 07236785e862..9402a33b91d7 100644 --- a/toolkit/test/accessibility/GeometryEventHandler.java +++ b/toolkit/test/accessibility/GeometryEventHandler.java @@ -48,7 +48,7 @@ class GeometryEventHandler aShapeQueue.addLast (aTreeNode); } } - aCanvas.repaint (); + aCanvas.repaint (); } } } diff --git a/toolkit/test/accessibility/HelpWindow.java b/toolkit/test/accessibility/HelpWindow.java index 74627ad99761..80b206f24ce5 100644 --- a/toolkit/test/accessibility/HelpWindow.java +++ b/toolkit/test/accessibility/HelpWindow.java @@ -118,7 +118,7 @@ class HelpWindow {} } - public void actionPerformed (java.awt.event.ActionEvent e) + public void actionPerformed (java.awt.event.ActionEvent e) { if (e.getActionCommand().equals("Prev")) { diff --git a/toolkit/test/accessibility/InformationWriter.java b/toolkit/test/accessibility/InformationWriter.java index e119d2037350..d2cc118a1564 100755 --- a/toolkit/test/accessibility/InformationWriter.java +++ b/toolkit/test/accessibility/InformationWriter.java @@ -72,7 +72,7 @@ public class InformationWriter { XPropertySet xPropertySet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, xObject); - MessageArea.println (prefix + + MessageArea.println (prefix + xPropertySet.getPropertyValue (name)); } catch (Exception e) @@ -82,7 +82,7 @@ public class InformationWriter } } - + public void showShapes (XDrawPage xPage) { @@ -90,24 +90,24 @@ public class InformationWriter { XIndexAccess xShapeList = (XIndexAccess) UnoRuntime.queryInterface( XIndexAccess.class, xPage); - - MessageArea.println ("There are " + xShapeList.getCount() + + MessageArea.println ("There are " + xShapeList.getCount() + " shapes"); for (int i=0; i<xShapeList.getCount(); i++) { XShape xShape = (XShape) UnoRuntime.queryInterface( XShape.class, xShapeList.getByIndex (i)); - - XShapeDescriptor xShapeDescriptor = + + XShapeDescriptor xShapeDescriptor = (XShapeDescriptor) UnoRuntime.queryInterface( XShapeDescriptor.class, xShape); String sName = xShapeDescriptor.getShapeType (); MessageArea.println (" shape " + i + " : " + sName); - - XPropertySet xPropertySet = + + XPropertySet xPropertySet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, xShape); - Integer nZOrder = + Integer nZOrder = (Integer) xPropertySet.getPropertyValue ("ZOrder"); MessageArea.println (" zorder = " + nZOrder); } @@ -117,11 +117,11 @@ public class InformationWriter MessageArea.println ("caught exception in showShapes: " + e); } } + - - /** @descr Print all available services of the given object to the + /** @descr Print all available services of the given object to the standard output. */ public void showServices (XInterface xObject) @@ -138,7 +138,7 @@ public class InformationWriter else { String[] sServiceNames = xMSF.getAvailableServiceNames (); - MessageArea.println (" object can create " + MessageArea.println (" object can create " + sServiceNames.length + " services"); for (int i=0; i<sServiceNames.length; i++) MessageArea.println (" service " + i + " : " + sServiceNames[i]); @@ -149,7 +149,7 @@ public class InformationWriter MessageArea.println ("caught exception in showServices : " + e); } } - + /** @descr Print the service and implementation name of the given object. */ @@ -167,7 +167,7 @@ public class InformationWriter { MessageArea.println (" Service name : " + xSN.getServiceName ()); } - + // Use interface XServiceInfo to retrieve information about // supported services. XServiceInfo xSI = (XServiceInfo) UnoRuntime.queryInterface ( @@ -176,8 +176,8 @@ public class InformationWriter MessageArea.println (" interface XServiceInfo not supported"); else { - MessageArea.println (" Implementation name : " - + xSI.getImplementationName ()); + MessageArea.println (" Implementation name : " + + xSI.getImplementationName ()); } } catch (Exception e) @@ -185,10 +185,10 @@ public class InformationWriter MessageArea.println ("caught exception in showInfo : " + e); } } - - - - + + + + /** @descr Print information about supported interfaces. */ public void showInterfaces (XInterface xObject) @@ -205,10 +205,10 @@ public class InformationWriter else { Type[] aTypeList = xTP.getTypes (); - MessageArea.println (" object supports " + aTypeList.length + MessageArea.println (" object supports " + aTypeList.length + " interfaces"); for (int i=0; i<aTypeList.length; i++) - MessageArea.println (" " + i + " : " + MessageArea.println (" " + i + " : " + aTypeList[i].getTypeName()); } } @@ -217,8 +217,8 @@ public class InformationWriter MessageArea.println ("caught exception in showInterfaces : " + e); } } - - + + /** @descr Print information concerning the accessibility of the given object. */ @@ -233,46 +233,46 @@ public class InformationWriter // Get XAccessibleContext object if given object does not // already support this interface. - XAccessibleContext xContext + XAccessibleContext xContext = (XAccessibleContext) UnoRuntime.queryInterface ( XAccessibleContext.class, xObject); if (xContext == null) { - XAccessible xAccessible + XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface ( XAccessible.class, xObject); if (xAccessible == null) { - MessageArea.println (sIndent + "given object " + xObject + MessageArea.println (sIndent + "given object " + xObject + " is not accessible"); return false; } else xContext = xAccessible.getAccessibleContext(); } - + // Print information about the accessible context. if (xContext != null) { - MessageArea.println (sIndent + "Name : " + MessageArea.println (sIndent + "Name : " + xContext.getAccessibleName()); - MessageArea.println (sIndent + "Description : " + MessageArea.println (sIndent + "Description : " + xContext.getAccessibleDescription()); - MessageArea.println (sIndent + "Role : " + MessageArea.println (sIndent + "Role : " + xContext.getAccessibleRole()); String sHasParent; if (xContext.getAccessibleParent() != null) { MessageArea.println (sIndent + "Has parent : yes"); - MessageArea.println (sIndent + "Parent index : " + MessageArea.println (sIndent + "Parent index : " + xContext.getAccessibleIndexInParent()); } else MessageArea.println (sIndent + "Has parent : no"); - MessageArea.println (sIndent + "Child count : " + MessageArea.println (sIndent + "Child count : " + xContext.getAccessibleChildCount()); MessageArea.print (sIndent + "Relation set : "); - XAccessibleRelationSet xRelationSet + XAccessibleRelationSet xRelationSet = xContext.getAccessibleRelationSet(); if (xRelationSet != null) { @@ -287,13 +287,13 @@ public class InformationWriter } else MessageArea.println ("no relation set"); - + MessageArea.print (sIndent + "State set : "); - XAccessibleStateSet xStateSet = + XAccessibleStateSet xStateSet = xContext.getAccessibleStateSet(); if (xStateSet != null) { - XIndexAccess xStates = + XIndexAccess xStates = (XIndexAccess) UnoRuntime.queryInterface ( XIndexAccess.class, xStateSet); MessageArea.print (xStates.getCount() + " ("); @@ -312,7 +312,7 @@ public class InformationWriter } else MessageArea.println ("object has no accessible context."); - + // showInfo (xContext); // showServices (xContext); // showInterfaces (xContext); @@ -323,7 +323,7 @@ public class InformationWriter } return true; } - + @@ -333,20 +333,20 @@ public class InformationWriter { try { - XAccessibleComponent xComponent = + XAccessibleComponent xComponent = (XAccessibleComponent) UnoRuntime.queryInterface ( XAccessibleComponent.class, xObject); - + // Print information about the accessible context. if (xComponent != null) { - MessageArea.println (sIndent + "Position : " + MessageArea.println (sIndent + "Position : " + xComponent.getLocation().X+", " + xComponent.getLocation().Y); - MessageArea.println (sIndent + "Screen position : " + MessageArea.println (sIndent + "Screen position : " + xComponent.getLocationOnScreen().X+", " + xComponent.getLocationOnScreen().Y); - MessageArea.println (sIndent + "Size : " + MessageArea.println (sIndent + "Size : " + xComponent.getSize().Width+", " + xComponent.getSize().Height); } @@ -368,7 +368,7 @@ public class InformationWriter { if ( ! showAccessibility (xRoot, depth)) return false; - + String sIndent = ""; for (int i=0; i<depth; i++) sIndent += " "; diff --git a/toolkit/test/accessibility/MessageArea.java b/toolkit/test/accessibility/MessageArea.java index c9d95995e066..6e9aef02c514 100644 --- a/toolkit/test/accessibility/MessageArea.java +++ b/toolkit/test/accessibility/MessageArea.java @@ -9,7 +9,7 @@ import javax.swing.JScrollBar; /** A message area displays text in a scrollable text widget. It is a - singleton. Other objects can access it directly to display messages. + singleton. Other objects can access it directly to display messages. */ public class MessageArea extends JScrollPane diff --git a/toolkit/test/accessibility/MessageInterface.java b/toolkit/test/accessibility/MessageInterface.java index ad189bb8214f..4fc2c4184fb3 100755 --- a/toolkit/test/accessibility/MessageInterface.java +++ b/toolkit/test/accessibility/MessageInterface.java @@ -1,5 +1,5 @@ interface MessageInterface { - void message (String text); + void message (String text); } diff --git a/toolkit/test/accessibility/NodeFactory.java b/toolkit/test/accessibility/NodeFactory.java index 403c482e5ea1..e132988a1cf9 100644 --- a/toolkit/test/accessibility/NodeFactory.java +++ b/toolkit/test/accessibility/NodeFactory.java @@ -37,7 +37,7 @@ class NodeFactory maUNOHandler = new AccessibleUNOHandler(); } - + /** add default handlers based on the supported interfaces */ private void addDefaultHandlers (AccTreeNode aNode, XAccessibleContext xContext) { @@ -106,7 +106,7 @@ class NodeFactory sDisplay = xContext.getAccessibleName(); if (sDisplay.length()==0) { - sDisplay = "<no name> Role: " + sDisplay = "<no name> Role: " + NameProvider.getRoleName ( xContext.getAccessibleRole()); } diff --git a/toolkit/test/accessibility/NodeHandler.java b/toolkit/test/accessibility/NodeHandler.java index b39741b1f398..c4c374e60178 100644 --- a/toolkit/test/accessibility/NodeHandler.java +++ b/toolkit/test/accessibility/NodeHandler.java @@ -44,8 +44,8 @@ abstract class NodeHandler } /** - * return a child object. Complex - * children have to be AccTreeNode instances. + * return a child object. Complex + * children have to be AccTreeNode instances. * @see AccTreeNode */ public AccessibleTreeNode getChild (AccessibleTreeNode aParent, int nIndex) @@ -110,7 +110,7 @@ abstract class NodeHandler // The following methods support editing of children and actions. // They have default implementations for no actions and read-only. // - + /** May this child be changed? */ public boolean isChildEditable (AccessibleTreeNode aNode, int nIndex) { @@ -122,13 +122,13 @@ abstract class NodeHandler /** get names of suported actions */ - public String[] getActions (AccessibleTreeNode aNode) - { + public String[] getActions (AccessibleTreeNode aNode) + { return new String[] {}; } /** perform action */ - public void performAction (AccessibleTreeNode aNode, int nIndex) + public void performAction (AccessibleTreeNode aNode, int nIndex) { } diff --git a/toolkit/test/accessibility/NodeMap.java b/toolkit/test/accessibility/NodeMap.java index 43479278aec4..4e2f631027cb 100644 --- a/toolkit/test/accessibility/NodeMap.java +++ b/toolkit/test/accessibility/NodeMap.java @@ -31,7 +31,7 @@ class NodeMap public boolean InsertNode (XAccessibleContext xContext, AccessibleTreeNode aNode) { AccessibleTreeNode aPreviousNode = (AccessibleTreeNode)maXAccessibleToNode.put ( - xContext, + xContext, aNode); return aPreviousNode != aNode; } @@ -47,7 +47,7 @@ class NodeMap } catch (Exception e) { - System.out.println ("caught exception while removing node " + System.out.println ("caught exception while removing node " + aNode + " : " + e); e.printStackTrace(); } @@ -67,7 +67,7 @@ class NodeMap } catch (Exception e) { - System.out.println ("caught exception applying functor to " + System.out.println ("caught exception applying functor to " + i + "th node " + aNodes[i] + " : " + e); e.printStackTrace(); } @@ -84,7 +84,7 @@ class NodeMap { if (aObject instanceof XAccessibleContext) return GetNode ((XAccessibleContext)aObject); - else + else return null; } @@ -92,7 +92,7 @@ class NodeMap { if ((aNode != null) && (aNode instanceof AccTreeNode)) return ((AccTreeNode)aNode).getContext(); - else + else return null; } diff --git a/toolkit/test/accessibility/OfficeConnection.java b/toolkit/test/accessibility/OfficeConnection.java index 4cc5bee1ed78..d98d48aabc3d 100755 --- a/toolkit/test/accessibility/OfficeConnection.java +++ b/toolkit/test/accessibility/OfficeConnection.java @@ -23,7 +23,7 @@ public class OfficeConnection mnDefaultPort = nPortNumber; connect (); } - + /** @descr Return the service manager that represents the connected StarOffice application */ @@ -33,7 +33,7 @@ public class OfficeConnection connect (); return maServiceManager; } - + /** @descr Return a flag that indicates if the constructor has been able to establish a valid connection. */ @@ -48,14 +48,14 @@ public class OfficeConnection { connect (msDefaultHost, mnDefaultPort); } - + private void connect (String hostname) { connect (hostname, mnDefaultPort); } - - /** @descr Connect to a already running StarOffice application that has - been started with a command line argument like + + /** @descr Connect to a already running StarOffice application that has + been started with a command line argument like "-accept=socket,host=localhost,port=5678;urp;" */ private void connect (String hostname, int portnumber) @@ -65,7 +65,7 @@ public class OfficeConnection String sConnectString = "uno:socket,host=" + hostname + ",port=" + portnumber + ";urp;StarOffice.ServiceManager"; - + // connect to a running office and get the ServiceManager try { @@ -76,7 +76,7 @@ public class OfficeConnection XUnoUrlResolver.class, aLocalServiceManager.createInstance ("com.sun.star.bridge.UnoUrlResolver") ); - + maServiceManager = (XMultiServiceFactory) UnoRuntime.queryInterface ( XMultiServiceFactory.class, aURLResolver.resolve (sConnectString) @@ -94,7 +94,7 @@ public class OfficeConnection private int mnDefaultPort = 5678; private final String msDefaultHost = "localhost"; private XMultiServiceFactory maServiceManager = null; - + /** A value of true just indicates that it has been tried to establish a connection, not that that has been successfull. */ diff --git a/toolkit/test/accessibility/Options.java b/toolkit/test/accessibility/Options.java index 9b0f6f01889c..76a2a3b0b55b 100644 --- a/toolkit/test/accessibility/Options.java +++ b/toolkit/test/accessibility/Options.java @@ -58,7 +58,7 @@ class Options } catch (java.io.IOException e) { - // Ignore a non-existing options file. + // Ignore a non-existing options file. } } @@ -72,7 +72,7 @@ class Options { } } - + private Options () { } diff --git a/toolkit/test/accessibility/Print.java b/toolkit/test/accessibility/Print.java index e4d21dc4e092..1a04934cf224 100755 --- a/toolkit/test/accessibility/Print.java +++ b/toolkit/test/accessibility/Print.java @@ -1,5 +1,5 @@ interface Print { - void print (String text); + void print (String text); void println (String text); } diff --git a/toolkit/test/accessibility/QueuedListener.java b/toolkit/test/accessibility/QueuedListener.java index b92d7ac487e6..1523808ad79e 100644 --- a/toolkit/test/accessibility/QueuedListener.java +++ b/toolkit/test/accessibility/QueuedListener.java @@ -26,14 +26,14 @@ class QueuedListener xContext = xAccessible.getAccessibleContext(); } final XAccessibleContext xSource = xContext; - EventQueue.Instance().addDisposingEvent (new Runnable() + EventQueue.Instance().addDisposingEvent (new Runnable() { - public void run() + public void run() { if (QueuedListener.this.maListener != null) QueuedListener.this.maListener.disposing (xSource); } - } + } ); } @@ -45,7 +45,7 @@ class QueuedListener { QueuedListener.this.maListener.notifyEvent( aEvent ); } - } + } ); } diff --git a/toolkit/test/accessibility/QueuedTopWindowListener.java b/toolkit/test/accessibility/QueuedTopWindowListener.java index 61b3472d2002..7eaff5b47d57 100644 --- a/toolkit/test/accessibility/QueuedTopWindowListener.java +++ b/toolkit/test/accessibility/QueuedTopWindowListener.java @@ -17,7 +17,7 @@ class QueuedTopWindowListener { QueuedTopWindowListener.this.maListener.windowOpened (aEvent); } - } + } ); } @@ -40,32 +40,32 @@ class QueuedTopWindowListener { QueuedTopWindowListener.this.maListener.windowClosed (aEvent); } - } + } ); } - public void windowMinimized (final com.sun.star.lang.EventObject aEvent) + public void windowMinimized (final com.sun.star.lang.EventObject aEvent) throws RuntimeException { System.out.println ("QueuedTopWindowListener: Top window minimized: " + aEvent); } - public void windowNormalized (final com.sun.star.lang.EventObject aEvent) + public void windowNormalized (final com.sun.star.lang.EventObject aEvent) throws RuntimeException { System.out.println ("QueuedTopWindowListener: Top window normalized: " + aEvent); } - public void windowActivated (final com.sun.star.lang.EventObject aEvent) + public void windowActivated (final com.sun.star.lang.EventObject aEvent) throws RuntimeException { System.out.println ("QueuedTopWindowListener: Top window actived: " + aEvent); } - public void windowDeactivated (final com.sun.star.lang.EventObject aEvent) + public void windowDeactivated (final com.sun.star.lang.EventObject aEvent) throws RuntimeException { System.out.println ("QueuedTopWindowListener: Top window deactived: " + aEvent); @@ -73,14 +73,14 @@ class QueuedTopWindowListener public void disposing( final EventObject aEvent) { - EventQueue.Instance().addDisposingEvent (new Runnable() + EventQueue.Instance().addDisposingEvent (new Runnable() { - public void run() + public void run() { if (QueuedTopWindowListener.this.maListener != null) QueuedTopWindowListener.this.maListener.disposing (aEvent); } - } + } ); } diff --git a/toolkit/test/accessibility/SelectionDialog.java b/toolkit/test/accessibility/SelectionDialog.java index a632e9f77a0c..551875c9d5f9 100644 --- a/toolkit/test/accessibility/SelectionDialog.java +++ b/toolkit/test/accessibility/SelectionDialog.java @@ -22,7 +22,7 @@ class SelectionDialog extends JDialog public SelectionDialog (AccTreeNode aNode) { super (AccessibilityWorkBench.Instance()); - + maNode = aNode; Layout(); @@ -37,7 +37,7 @@ class SelectionDialog extends JDialog Container aContent = getContentPane(); // label with explanation - aContent.add( new JLabel( "Select/Deselect child elements" ), + aContent.add( new JLabel( "Select/Deselect child elements" ), BorderLayout.NORTH ); // the JListBox @@ -122,9 +122,9 @@ class SelectionDialog extends JDialog } catch( IndexOutOfBoundsException e ) { - JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(), + JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(), "Can't select: IndexOutofBounds", - "Error in selectAccessibleChild", + "Error in selectAccessibleChild", JOptionPane.ERROR_MESSAGE); } } @@ -133,14 +133,14 @@ class SelectionDialog extends JDialog { try { - mxSelection.deselectAccessibleChild( + mxSelection.deselectAccessibleChild( maChildrenSelector.getSelectedIndex()); } catch( IndexOutOfBoundsException e ) { - JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(), + JOptionPane.showMessageDialog( AccessibilityWorkBench.Instance(), "Can't deselect: IndexOutofBounds", - "Error in deselectAccessibleChild", + "Error in deselectAccessibleChild", JOptionPane.ERROR_MESSAGE); } } @@ -155,7 +155,7 @@ class SelectionDialog extends JDialog mxSelection.clearAccessibleSelection(); } - + public void actionPerformed(ActionEvent e) { diff --git a/toolkit/test/accessibility/SimpleOffice.java b/toolkit/test/accessibility/SimpleOffice.java index 4417267675af..c1c2d28738ff 100755 --- a/toolkit/test/accessibility/SimpleOffice.java +++ b/toolkit/test/accessibility/SimpleOffice.java @@ -73,7 +73,7 @@ public class SimpleOffice try { // Load the document from the specified URL. - XComponentLoader xLoader = + XComponentLoader xLoader = (XComponentLoader)UnoRuntime.queryInterface( XComponentLoader.class, mxDesktop); @@ -108,7 +108,7 @@ public class SimpleOffice XModel xModel = null; try { - XTasksSupplier xTasksSupplier = + XTasksSupplier xTasksSupplier = (XTasksSupplier) UnoRuntime.queryInterface( XTasksSupplier.class, mxDesktop); XEnumerationAccess xEA = xTasksSupplier.getTasks(); @@ -157,7 +157,7 @@ public class SimpleOffice } else MessageArea.println ("Connected successfully."); - + // Create a new desktop. mxDesktop = (XDesktop) UnoRuntime.queryInterface( XDesktop.class, @@ -248,7 +248,7 @@ public class SimpleOffice - /** @descr Return the current window associated with the given + /** @descr Return the current window associated with the given model. */ public XWindow getCurrentWindow () @@ -264,8 +264,8 @@ public class SimpleOffice public XWindow getCurrentWindow (XModel xModel) { XWindow xWindow = null; - try - { + try + { if (xModel == null) MessageArea.println ("invalid model (==null)"); XController xController = xModel.getCurrentController(); @@ -282,7 +282,7 @@ public class SimpleOffice { MessageArea.println ("caught exception while getting current window" + e); } - + return xWindow; } @@ -301,8 +301,8 @@ public class SimpleOffice public XDrawPage getCurrentDrawPage (XDrawView xView) { XDrawPage xPage = null; - try - { + try + { if (xView == null) MessageArea.println ("can't get current draw page from null view"); else @@ -312,7 +312,7 @@ public class SimpleOffice { MessageArea.println ("caught exception while getting current draw page : " + e); } - + return xPage; } @@ -332,8 +332,8 @@ public class SimpleOffice MessageArea.println ("can't get desktop to retrieve current view"); XDrawView xView = null; - try - { + try + { XComponent xComponent = xDesktop.getCurrentComponent(); if (xComponent == null) MessageArea.println ("can't get component to retrieve current view"); @@ -345,7 +345,7 @@ public class SimpleOffice XController xController = xFrame.getController(); if (xController == null) MessageArea.println ("can't get controller to retrieve current view"); - + xView = (XDrawView) UnoRuntime.queryInterface( XDrawView.class, xController); if (xView == null) @@ -355,7 +355,7 @@ public class SimpleOffice { MessageArea.println ("caught exception while getting current view : " + e); } - + return xView; } diff --git a/toolkit/test/accessibility/TableEventHandler.java b/toolkit/test/accessibility/TableEventHandler.java index 7655d3a13599..35bd7c64dc4e 100644 --- a/toolkit/test/accessibility/TableEventHandler.java +++ b/toolkit/test/accessibility/TableEventHandler.java @@ -19,7 +19,7 @@ class TableEventHandler switch (mnEventId) { case AccessibleEventId.TABLE_MODEL_CHANGED: - AccessibleTableModelChange aModelChange = + AccessibleTableModelChange aModelChange = (AccessibleTableModelChange)maEvent.NewValue; out.println( "Range: StartRow " + aModelChange.FirstRow + " StartColumn " + aModelChange.FirstColumn + diff --git a/toolkit/test/accessibility/TextUpdateListener.java b/toolkit/test/accessibility/TextUpdateListener.java index 0ce990144c67..eece44d5fc60 100644 --- a/toolkit/test/accessibility/TextUpdateListener.java +++ b/toolkit/test/accessibility/TextUpdateListener.java @@ -28,7 +28,7 @@ class TextUpdateListener implements TreeModelListener { // aha! we have an xText. So we can now check for // the various cases we support - XAccessibleText xText = + XAccessibleText xText = (XAccessibleText)aParent.getUserObject(); if( aIndices[0] == 0 ) @@ -48,8 +48,8 @@ class TextUpdateListener implements TreeModelListener // try // { // // aha! Selection: - // setSelection( xText, - // Integer.parseInt(m.group(1)), + // setSelection( xText, + // Integer.parseInt(m.group(1)), // Integer.parseInt(m.group(2)) ); // } // catch( NumberFormatException f ) @@ -75,7 +75,7 @@ class TextUpdateListener implements TreeModelListener throws com.sun.star.lang.IndexOutOfBoundsException { // is this text editable? if not, fudge you and return - XAccessibleEditableText xEdit = + XAccessibleEditableText xEdit = (XAccessibleEditableText) UnoRuntime.queryInterface ( XAccessibleEditableText.class, xText); if (xEdit == null) @@ -99,7 +99,7 @@ class TextUpdateListener implements TreeModelListener nFront++; int nBack = 0; while( (nBack < nMinLength) && - ( sNew.charAt(sNew.length()-nBack-1) == + ( sNew.charAt(sNew.length()-nBack-1) == sOld.charAt(sOld.length()-nBack-1) ) ) nBack++; if( nFront + nBack > nMinLength ) @@ -110,7 +110,7 @@ class TextUpdateListener implements TreeModelListener String sDel = sOld.substring( nFront, sOld.length() - nBack ); String sIns = sNew.substring( nFront, sNew.length() - nBack ); - System.out.println("edit text: " + + System.out.println("edit text: " + sOld.substring(0, nFront) + " [ " + sDel + " -> " + sIns + " ] " + sOld.substring(sOld.length() - nBack) ); @@ -150,14 +150,14 @@ class TextUpdateListener implements TreeModelListener } // /** replace the given node with a new xText node */ - // void updateNode( XAccessibleText xText, + // void updateNode( XAccessibleText xText, // DefaultMutableTreeNode aNode ) // { // // create a new node // DefaultMutableTreeNode aNew = newTextTreeNode( xText ); - // + // // // get parent (must be DefaultMutableTreeNode) - // DefaultMutableTreeNode aParent = + // DefaultMutableTreeNode aParent = // (DefaultMutableTreeNode)aNode.getParent(); // if( aParent != null ) // { diff --git a/toolkit/test/accessibility/TopWindowListener.java b/toolkit/test/accessibility/TopWindowListener.java index c0aea933ece7..84e7a65e9781 100644 --- a/toolkit/test/accessibility/TopWindowListener.java +++ b/toolkit/test/accessibility/TopWindowListener.java @@ -75,7 +75,7 @@ class TopWindowListener if (aRootObject instanceof VectorNode) { VectorNode aRoot = (VectorNode) aRootObject; - AccessibleTreeNode aNode = + AccessibleTreeNode aNode = NodeFactory.Instance().createDefaultNode (xNewTopLevelObject, aRoot); aRoot.addChild (aNode); maModel.fireTreeNodesInserted (maModel.createEvent (aRoot, aNode)); @@ -147,7 +147,7 @@ class TopWindowListener // XTopWindowListener - public void windowOpened (final com.sun.star.lang.EventObject aEvent) + public void windowOpened (final com.sun.star.lang.EventObject aEvent) throws RuntimeException { if (maModel != null) @@ -170,7 +170,7 @@ class TopWindowListener - public void windowClosed (final com.sun.star.lang.EventObject aEvent) + public void windowClosed (final com.sun.star.lang.EventObject aEvent) throws RuntimeException { if (maModel != null) diff --git a/toolkit/test/accessibility/VectorNode.java b/toolkit/test/accessibility/VectorNode.java index 282abb595620..6277cfaefe57 100644 --- a/toolkit/test/accessibility/VectorNode.java +++ b/toolkit/test/accessibility/VectorNode.java @@ -16,7 +16,7 @@ class VectorNode maChildren = new Vector (); } - public void addChild (AccessibleTreeNode aChild) + public void addChild (AccessibleTreeNode aChild) { maChildren.add (aChild); } @@ -43,7 +43,7 @@ class VectorNode return maChildren.indexOf (aNode); } - public boolean isLeaf() + public boolean isLeaf() { return maChildren.isEmpty(); } diff --git a/toolkit/test/accessibility/ov/ListeningObjectView.java b/toolkit/test/accessibility/ov/ListeningObjectView.java index 574fa989b20f..109390a8eff2 100644 --- a/toolkit/test/accessibility/ov/ListeningObjectView.java +++ b/toolkit/test/accessibility/ov/ListeningObjectView.java @@ -25,7 +25,7 @@ abstract class ListeningObjectView public void SetObject (XAccessibleContext xContext) { super.SetObject (xContext); - XAccessibleEventBroadcaster xBroadcaster = + XAccessibleEventBroadcaster xBroadcaster = (XAccessibleEventBroadcaster)UnoRuntime.queryInterface( XAccessibleEventBroadcaster.class, xContext); if (xBroadcaster != null) @@ -39,7 +39,7 @@ abstract class ListeningObjectView public void Destroy () { super.Destroy (); - XAccessibleEventBroadcaster xBroadcaster = + XAccessibleEventBroadcaster xBroadcaster = (XAccessibleEventBroadcaster)UnoRuntime.queryInterface( XAccessibleEventBroadcaster.class, mxContext); if (xBroadcaster != null) diff --git a/toolkit/test/accessibility/ov/ObjectViewContainer.java b/toolkit/test/accessibility/ov/ObjectViewContainer.java index c0bf6a86736b..96eb1c7b5363 100644 --- a/toolkit/test/accessibility/ov/ObjectViewContainer.java +++ b/toolkit/test/accessibility/ov/ObjectViewContainer.java @@ -64,7 +64,7 @@ public class ObjectViewContainer Class aViewClass = (Class)maViewTemplates.elementAt (i); Method aCreateMethod = aViewClass.getDeclaredMethod ( "Create", new Class[] { - ObjectViewContainer.class, + ObjectViewContainer.class, XAccessibleContext.class}); if (aCreateMethod != null) { @@ -142,7 +142,7 @@ public class ObjectViewContainer /** Update the layout manager by setting the vertical weight of the bottom entry to 1 and so make it strech to over the available space. - + */ private void UpdateLayoutManager () { diff --git a/toolkit/test/accessibility/ov/SelectionView.java b/toolkit/test/accessibility/ov/SelectionView.java index a71f242420ba..f3e4d5214d33 100644 --- a/toolkit/test/accessibility/ov/SelectionView.java +++ b/toolkit/test/accessibility/ov/SelectionView.java @@ -163,12 +163,12 @@ class SelectionView } XAccessibleStateSet aChildStateSet = mxContext.getAccessibleStateSet(); - aChild.setSelected (aChildStateSet!=null + aChild.setSelected (aChildStateSet!=null && aChildStateSet.contains(AccessibleStateType.SELECTED)); aChild.addActionListener (this); maChildrenSelector.add (aChild); - + } catch (IndexOutOfBoundsException e) { @@ -186,7 +186,7 @@ class SelectionView { mxSelection.clearAccessibleSelection(); } - + /** Call the function associated with the pressed button. */ diff --git a/toolkit/test/accessibility/ov/StateSetView.java b/toolkit/test/accessibility/ov/StateSetView.java index e8997ac0c5a0..a2e4e28a49b3 100644 --- a/toolkit/test/accessibility/ov/StateSetView.java +++ b/toolkit/test/accessibility/ov/StateSetView.java @@ -159,7 +159,7 @@ public class StateSetAllView Color aTextColor = g.getColor(); g.setRenderingHint ( - RenderingHints.KEY_ANTIALIASING, + RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); XAccessibleStateSet xStateSet = mxContext.getAccessibleStateSet(); diff --git a/toolkit/test/accessibility/ov/TextView.java b/toolkit/test/accessibility/ov/TextView.java index 094647986e4f..b472e030f936 100644 --- a/toolkit/test/accessibility/ov/TextView.java +++ b/toolkit/test/accessibility/ov/TextView.java @@ -116,7 +116,7 @@ public class TextView } } - private JLabel + private JLabel maTextLabel, maCaretPositionLabel; private XAccessibleText mxText; diff --git a/toolkit/test/accessibility/tools/NameProvider.java b/toolkit/test/accessibility/tools/NameProvider.java index d9bcab802cbf..5b1d5a01b329 100644 --- a/toolkit/test/accessibility/tools/NameProvider.java +++ b/toolkit/test/accessibility/tools/NameProvider.java @@ -98,7 +98,7 @@ public class NameProvider maStateMap.put (new Integer (AccessibleStateType.OPAQUE), "OPAQUE"); maStateMap.put (new Integer (AccessibleStateType.PRESSED), "PRESSED"); maStateMap.put (new Integer (AccessibleStateType.RESIZABLE), "RESIZABLE"); - maStateMap.put (new Integer (AccessibleStateType.SELECTABLE), "SELECTABLE"); + maStateMap.put (new Integer (AccessibleStateType.SELECTABLE), "SELECTABLE"); maStateMap.put (new Integer (AccessibleStateType.SELECTED), "SELECTED"); maStateMap.put (new Integer (AccessibleStateType.SENSITIVE), "SENSITIVE"); maStateMap.put (new Integer (AccessibleStateType.SHOWING), "SHOWING"); diff --git a/toolkit/workben/controls.cxx b/toolkit/workben/controls.cxx index 853e03e4ef08..46e432e083ef 100644 --- a/toolkit/workben/controls.cxx +++ b/toolkit/workben/controls.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #include <unoctrl.hxx> -#include <svtools/unoiface.hxx> // InitExtToolkit +#include <svtools/unoiface.hxx> // InitExtToolkit UsrAny UsrAny_UINT16( UINT16 n ) { @@ -68,13 +68,13 @@ MyApp aMyApp; class MyWin : public WorkWindow { - XControlRef xCtrl; - XPropertySetRef xCtrlModel; - XControlContainerRef xCont; - XPropertySetRef xContModel; - XControlRef xDrawCtrl; - XGraphicsRef xG; - + XControlRef xCtrl; + XPropertySetRef xCtrlModel; + XControlContainerRef xCont; + XPropertySetRef xContModel; + XControlRef xDrawCtrl; + XGraphicsRef xG; + public: MyWin( Window* pParent, WinBits nWinStyle ); ~MyWin(); @@ -116,7 +116,7 @@ MyWin::~MyWin() void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) { - if( rMEvt.GetClicks() == 2 ) + if( rMEvt.GetClicks() == 2 ) { XViewRef xV( xDrawCtrl, USR_QUERY ); XWindowRef xC( xDrawCtrl, USR_QUERY ); @@ -128,13 +128,13 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) XServiceProviderRef xSSI = xProv->queryServiceProvider( L"stardiv.vcl.PrinterServer" ); XPrinterServerRef xPrinterServer( xSSI->createInstance(), USR_QUERY ); - Sequence< UString > aPrinterNames = xPrinterServer->getPrinterNames(); + Sequence< UString > aPrinterNames = xPrinterServer->getPrinterNames(); USHORT nPrinters = aPrinterNames.getLen(); String aInfo( "Printers: " ); - aInfo += nPrinters; - if ( nPrinters ) + aInfo += nPrinters; + if ( nPrinters ) { - for ( USHORT n = 0; n < nPrinters; n++ ) + for ( USHORT n = 0; n < nPrinters; n++ ) { aInfo += '\n'; aInfo += OUStringToString( aPrinterNames.getConstArray()[n], CHARSET_SYSTEM ); @@ -149,9 +149,9 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) xPrinter->end(); } InfoBox( this, aInfo ).Execute(); -*/ +*/ } - else if( rMEvt.GetClicks() == 1 ) + else if( rMEvt.GetClicks() == 1 ) { if( xContModel ) { @@ -165,7 +165,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) XServiceManagerRef xProv = getGlobalServiceManager(); XMultiServiceFactoryRef xMSF = NAMESPACE_USR( getProcessServiceManager )(); - + XServiceProviderRef xSSI = xProv->queryServiceProvider( L"stardiv.vcl.VclToolkit" ); XToolkitRef xToolkit( xMSF->createInstance( L"stardiv.vcl.VclToolkit" ), USR_QUERY ); DBG_ASSERT( xToolkit, "No Toolkit!" ); @@ -180,7 +180,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) xModelProv = xProv->queryServiceProvider( L"stardiv.vcl.control.ControlContainer" ); XInterfaceRef xCCRef( xModelProv->createInstance(), USR_QUERY ); xCCRef->queryInterface( XControlContainer::getSmartUik(), xCont ); - + XControlModelRef xCM( xContModel, USR_QUERY ); XControlRef xContControl( xCont, USR_QUERY ); xContControl->setModel( xCM ); @@ -188,14 +188,14 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) xContComp->setPosSize( 0, 0, 500, 600, PosSize_POSSIZE ); // Zwei EditControls auf einem Model... -// xModelProv = xProv->queryServiceProvider( L"stardiv.uno.awt.UnoControlEditModel" ); +// xModelProv = xProv->queryServiceProvider( L"stardiv.uno.awt.UnoControlEditModel" ); XInterfaceRef xModel( xMSF->createInstance(L"stardiv.uno.awt.UnoControlEditModel") ); DBG_ASSERT( xModel, "No Model!" ); XPropertySetRef xPSet( xModel, USR_QUERY ); xPSet->setPropertyValue( L"Text", UsrAny( UString( L"Hallo!" ) ) ); xPSet->setPropertyValue( L"FontName", UsrAny( UString( L"Times New Roman" ) ) ); -// xPSet->setPropertyValue( L"FontWeight", UsrAny( 200 ) ); +// xPSet->setPropertyValue( L"FontWeight", UsrAny( 200 ) ); XServiceProviderRef xEditCtrlProv = xProv->queryServiceProvider( L"stardiv.uno.awt.UnoControlEdit" ); // Edit1 @@ -211,7 +211,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) xEdit2->setModel( xCM ); XWindowRef xEditCmp2( xEdit2, USR_QUERY ); XLayoutConstrainsRef xL( xEdit2, USR_QUERY ); - if ( xL.is() ) + if ( xL.is() ) { Size aSz = xL->getPreferredSize(); xEditCmp2->setPosSize( 100, 180, aSz.Width(), aSz.Height(), PosSize_POSSIZE ); @@ -232,7 +232,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) XWindowRef xNumFieldWin( xNumField, USR_QUERY ); xNumFieldWin->setPosSize( 50, 250, 100, 60, PosSize_POSSIZE ); xCont->addControl( L"", xNumField ); - + XMultiPropertySetRef xPSet2( xNumModel, USR_QUERY ); Sequence<UString> Names( 2 ); Names.getArray()[0] = L"Value"; @@ -242,7 +242,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) Values.getArray()[1] = UsrAny( -2000000.0 ); xPSet2->setPropertyValues( Names, Values ); - + // Button... xModelProv = xProv->queryServiceProvider( L"stardiv.vcl.controlmodel.Button" ); xModelProv->createInstance()->queryInterface( XInterface::getSmartUik(), xModel ); @@ -264,11 +264,11 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) xCont->addControl( L"", xButton1 ); /* - + // ListBox... xModelProv = xProv->queryServiceProvider( L"stardiv.vcl.controlmodel.ListBox" ); xModel = (XInterface*)xModelProv->createInstance()->queryInterface( XInterface::getSmartUik() ); - + xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() ); Sequence<UString> aSeq( 7 ); aSeq.getArray()[0] = L"Item1"; @@ -325,10 +325,10 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) XWindowRef xGroupBoxCmp1 = (XWindow*)xGroupBox1->queryInterface( XWindow::getSmartUik() ); xGroupBoxCmp1->setPosSize( 30, 410, 100, 130, PosSize_POSSIZE ); xCont->addControl( L"", xGroupBox1 ); - + XServiceProviderRef xRadioButtonModelProv = xProv->queryServiceProvider( L"stardiv.vcl.controlmodel.RadioButton" ); XServiceProviderRef xRadioButtonCtrlProv = xProv->queryServiceProvider( L"stardiv.vcl.control.RadioButton" ); - + xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() ); XControlRef xT1 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() ); xT1->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) ); @@ -338,7 +338,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() ); xPSet->setPropertyValue( L"Label", UsrAny( L"Radio1" ) ); xPSet->setPropertyValue( L"State", UsrAny_UINT16( 1 ) ); - + xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() ); XControlRef xT2 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() ); xT2->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) ); @@ -347,7 +347,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) xCont->addControl( L"", xT2 ); xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() ); xPSet->setPropertyValue( L"Label", UsrAny( L"Radio2" ) ); - + xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() ); XControlRef xT3 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() ); xT3->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) ); @@ -356,7 +356,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) xCont->addControl( L"", xT3 ); xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() ); xPSet->setPropertyValue( L"Label", UsrAny( L"Radio3" ) ); - + xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() ); XControlRef xT4 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() ); xT4->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) ); @@ -385,26 +385,26 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) aControls.getArray()[3] = xT2->getModel(); aControls.getArray()[4] = xT4->getModel(); xTCModel->setControls( aControls ); - + Sequence<XControlModelRef> aGroup( 3 ); aGroup.getArray()[0] = xT1->getModel(); aGroup.getArray()[1] = xT3->getModel(); aGroup.getArray()[2] = xT2->getModel(); xTCModel->setGroup( aGroup, L"test" ); -*/ +*/ // Container anzeigen... // Als Child zu diesem Fenster - xContControl->createPeer( XToolkitRef(), GetComponentInterface( TRUE ) ); + xContControl->createPeer( XToolkitRef(), GetComponentInterface( TRUE ) ); XDeviceRef xD( xContControl->getPeer(), USR_QUERY ); xG = xD->createGraphics(); XViewRef xV ( xDrawCtrl, USR_QUERY ); xV->setGraphics( xG ); -// ((UnoControl*)(XControl*)xNumField))->updateFromModel(); +// ((UnoControl*)(XControl*)xNumField))->updateFromModel(); /* - // TEST: + // TEST: WindowDecriptor aDescr; aDescr.ComponentServiceName = "window"; aDescr.Type = VCLCOMPONENTTYPE_CONTAINER; @@ -412,7 +412,7 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) aDescr.WindowAttributes = WA_SHOW|WA_BORDER; aDescr.Bounds = Rectangle( Point( 500, 50 ), Size( 300, 200 ) ); XVclWindowPeerRef xSPWin = xToolkit->createComponent( aDescr ); - + WindowDecriptor aDescr2; aDescr2.ComponentServiceName = "scrollbar"; aDescr2.Type = VCLCOMPONENTTYPE_SIMPLE; @@ -438,13 +438,13 @@ void MyWin::Resize() void MyWin::Paint( const Rectangle& r ) { // Muss ueber PaintListener geschehen... - if ( xDrawCtrl.is() ) + if ( xDrawCtrl.is() ) { XViewRef xV( xDrawCtrl, USR_QUERY ); XWindowRef xC( xDrawCtrl, USR_QUERY ); xV->draw( xC->getPosSize().Left(), xC->getPosSize().Top() ); } - + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/workben/layout/editor-normal.xml b/toolkit/workben/layout/editor-normal.xml index 7f0dc0b69e74..daefa961c9b9 100644 --- a/toolkit/workben/layout/editor-normal.xml +++ b/toolkit/workben/layout/editor-normal.xml @@ -46,7 +46,7 @@ </vbox> <hbox cnt:expand="false"> <vbox><fixedline /><fixedline /><fixedline /><fixedline /></vbox> -<!-- <pushbutton id="import-button" label="Import..." cnt:expand="false"/>--> +<!-- <pushbutton id="import-button" label="Import..." cnt:expand="false"/>--> <pushbutton id="export-button" label="Export (stdout)" cnt:expand="false"/> </hbox> </vbox> diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx index f93731ab9c0a..10a2cdf8b5e3 100644 --- a/toolkit/workben/layout/editor.cxx +++ b/toolkit/workben/layout/editor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #undef NDEBUG -/* +/* #include <stdio.h> #include <string.h> */ @@ -175,11 +175,11 @@ public: OSL_ASSERT( xContainer.is() ); xParent = uno::Reference< awt::XLayoutContainer >( xContainer->getParent(), uno::UNO_QUERY ); } - + mxWidget = WidgetFactory::createWidget( xToolkit, xParent, unoName, nAttrbs ); OSL_ASSERT( mxWidget.is() ); mxContainer = uno::Reference< awt::XLayoutContainer >( mxWidget, uno::UNO_QUERY ); - + mrLabel = mrUnoName = unoName; // try to get a nicer label for the widget for ( int i = 0; i < WIDGETS_SPECS_LEN; i++ ) @@ -189,11 +189,11 @@ public: mrLabel = rtl::OUString( label, strlen( label ), RTL_TEXTENCODING_UTF8 ); break; } - + // set default Text property // TODO: disable editing of text fields, check boxes selected, etc... - + // store original properties { PropertyIterator it( this, WINDOW_PROPERTY ); @@ -245,7 +245,7 @@ public: virtual void setChildProperties( LayoutWidget *pChild, const PropList &rProps ) { - maOriChildProps = rProps; + maOriChildProps = rProps; LayoutWidget::setChildProperties( pChild, rProps ); } @@ -493,7 +493,7 @@ public: } using LayoutWidget::setProperty; - + void setProperty( rtl::OUString rPropName, PropertyKind rKind, uno::Any rValue ) { switch ( rKind ) { @@ -756,7 +756,7 @@ class PropertiesList : public layout::Table void checkProperty() { bool flag = mpWidget->isPropertyTouched( maPropName, maPropKind ); - + if ( mpFlag && mpFlag->IsChecked() != (BOOL)flag ) { CheckFlag( flag, true ); @@ -960,7 +960,7 @@ class PropertiesList : public layout::Table void setLabel() { SetText( String::CreateFromAscii( IsChecked() ? "true" : "false" ) ); - } + } }; struct AnyListBox : public AnyWidget, layout::ListBox diff --git a/toolkit/workben/layout/editor.hxx b/toolkit/workben/layout/editor.hxx index c977941703fa..3f97f54f81ce 100644 --- a/toolkit/workben/layout/editor.hxx +++ b/toolkit/workben/layout/editor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/workben/layout/editor.xml b/toolkit/workben/layout/editor.xml index 4126dea8b289..03f2ad7c107a 100644 --- a/toolkit/workben/layout/editor.xml +++ b/toolkit/workben/layout/editor.xml @@ -45,7 +45,7 @@ </vbox> <hbox cnt:expand="false"> <vbox><fixedline /><fixedline /><fixedline /><fixedline /></vbox> -<!-- <pushbutton id="import-button" label="Import..." cnt:expand="false"/>--> +<!-- <pushbutton id="import-button" label="Import..." cnt:expand="false"/>--> <pushbutton id="export-button" label="Export (stdout)" cnt:expand="false"/> </hbox> </vbox> diff --git a/toolkit/workben/layout/non-interactable-containers.xml b/toolkit/workben/layout/non-interactable-containers.xml index 29b37b6a7a49..6acebb7df2d9 100644 --- a/toolkit/workben/layout/non-interactable-containers.xml +++ b/toolkit/workben/layout/non-interactable-containers.xml @@ -30,7 +30,7 @@ </flow> <hfixedline/> <hbox cnt:expand="false"> -<!-- <align> +<!-- <align> <okbutton cnt:hfill="0.2" cnt:halign="0.2" /> </align> <align> diff --git a/toolkit/workben/layout/plugin.cxx b/toolkit/workben/layout/plugin.cxx index 65af2e510021..2734892a86d3 100644 --- a/toolkit/workben/layout/plugin.cxx +++ b/toolkit/workben/layout/plugin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/workben/layout/plugin.hxx b/toolkit/workben/layout/plugin.hxx index 862e6f6dc85a..f309416faa14 100644 --- a/toolkit/workben/layout/plugin.hxx +++ b/toolkit/workben/layout/plugin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/workben/layout/recover.cxx b/toolkit/workben/layout/recover.cxx index c776ec0bd8d2..523ba22c20ff 100644 --- a/toolkit/workben/layout/recover.cxx +++ b/toolkit/workben/layout/recover.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/workben/layout/recover.hxx b/toolkit/workben/layout/recover.hxx index de3a63c84510..82d4dc16eaab 100644 --- a/toolkit/workben/layout/recover.hxx +++ b/toolkit/workben/layout/recover.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/workben/layout/recover.xml b/toolkit/workben/layout/recover.xml index b7387b687de2..58b21173092b 100644 --- a/toolkit/workben/layout/recover.xml +++ b/toolkit/workben/layout/recover.xml @@ -14,7 +14,7 @@ <fixedtext id="FT_HEADER" _label="OpenOffice.org Document Restore"/> </hbox> <fixedline id="FL_HEADER"/> - <!-- mockup: fixedtext multiline=true" does not work? + <!-- mockup: fixedtext multiline=true" does not work? <multilineedit id="MLE_RECOVER" has_border="false" foobar="x" _text="At least one document was found that was not stored safely to the media. Uncheck any documents you do not want to restore (information may be lost)."/> <fixedtext id="FT_RECOVER" has_border="false" multi-line="true" font-word-line-mode="true" word-break="true" _label="At least one document was found that was not stored safely to the media. Uncheck any documents you do not want to restore (information may be lost). LINE TEST"/> @@ -28,7 +28,7 @@ LINE TEST"/> <fixedtext id="FT_DOC" _label="My document"/> </hbox> <hbox> - <checkbox id="CB_SHEET" state="1" cnt:expand="false" scale="false" /> + <checkbox id="CB_SHEET" state="1" cnt:expand="false" scale="false" /> <fixedimage id="FI_SHEET" cnt:expand="false" scale="false" graphic="res/commandimagelist/lc_inserttable.png" /> <fixedtext id="FT_SHEET" _label="My spreadsheet"/> </hbox> @@ -51,7 +51,7 @@ LINE TEST"/> <fixedtext id="FT_PROGRESS" _label="Restore progress (idle)"/> <hbox height="40" cnt:expand="true"> <progressbar cnt:expand="true" cnt:fill="true" id="PB_RECOVER" has_border="true" border="10" fill-color="#ccccff" background-color="#ffffff" progress-value-min="0" progress-value-max="100" progress-value="50" /> - <!-- FIXME: cannot set progress bar's height, use space as strut... !--> + <!-- FIXME: cannot set progress bar's height, use space as strut... !--> <fixedtext label="" height="10" cnt:expand="false" cnt:fill="false"/> </hbox> </vbox> diff --git a/toolkit/workben/layout/simple-paragraph.cxx b/toolkit/workben/layout/simple-paragraph.cxx index 05391046862a..aade63d7b768 100644 --- a/toolkit/workben/layout/simple-paragraph.cxx +++ b/toolkit/workben/layout/simple-paragraph.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/workben/layout/simple-paragraph.hxx b/toolkit/workben/layout/simple-paragraph.hxx index d4feff479135..4af36717fe10 100644 --- a/toolkit/workben/layout/simple-paragraph.hxx +++ b/toolkit/workben/layout/simple-paragraph.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/workben/layout/sortdlg.cxx b/toolkit/workben/layout/sortdlg.cxx index 84b42f5a2656..a43662f9157a 100644 --- a/toolkit/workben/layout/sortdlg.cxx +++ b/toolkit/workben/layout/sortdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,23 +44,23 @@ #include <layout/layout-pre.hxx> #endif -ScSortDlg::ScSortDlg( Window* pParent, +ScSortDlg::ScSortDlg( Window* pParent, const SfxItemSet* pArgSet ) : SfxTabDialog( pParent, ScResId( RID_SCDLG_SORT ), pArgSet ), - bIsHeaders ( FALSE ), - bIsByRows ( FALSE ) + bIsHeaders ( FALSE ), + bIsByRows ( FALSE ) { #if LAYOUT_SFX_TABDIALOG_BROKEN - AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 ); - AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 ); + AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 ); + AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 ); #else /* !LAYOUT_SFX_TABDIALOG_BROKEN */ String fields = rtl::OUString::createFromAscii ("fields"); AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND); String options = rtl::OUString::createFromAscii ("options"); - AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND); + AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND); #endif /* !LAYOUT_SFX_TABDIALOG_BROKEN */ FreeResource(); } diff --git a/toolkit/workben/layout/sortdlg.hrc b/toolkit/workben/layout/sortdlg.hrc index 0cecd39e8541..1bae1ef908a3 100644 --- a/toolkit/workben/layout/sortdlg.hrc +++ b/toolkit/workben/layout/sortdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,32 +34,32 @@ // -> SCSTR_FIELD /* -#define RID_SCDLG_SORT 256 -#define RID_SCPAGE_SORT_FIELDS 257 -#define RID_SCPAGE_SORT_OPTIONS 258 +#define RID_SCDLG_SORT 256 +#define RID_SCPAGE_SORT_FIELDS 257 +#define RID_SCPAGE_SORT_OPTIONS 258 */ -#define TP_FIELDS 1 -#define TP_OPTIONS 2 +#define TP_FIELDS 1 +#define TP_OPTIONS 2 // TP_SORT_FIELDS: #define FL_SORT1 1 #define FL_SORT2 2 #define FL_SORT3 3 -#define LB_SORT1 4 -#define LB_SORT2 5 -#define LB_SORT3 6 -#define BTN_UP1 7 -#define BTN_UP2 8 -#define BTN_UP3 9 -#define BTN_DOWN1 10 -#define BTN_DOWN2 11 -#define BTN_DOWN3 12 +#define LB_SORT1 4 +#define LB_SORT2 5 +#define LB_SORT3 6 +#define BTN_UP1 7 +#define BTN_UP2 8 +#define BTN_UP3 9 +#define BTN_DOWN1 10 +#define BTN_DOWN2 11 +#define BTN_DOWN3 12 // TP_SORT_OPTIONS: -#define FL_DIRECTION 1 -#define LB_SORT_USER 2 -#define LB_OUTAREA 3 +#define FL_DIRECTION 1 +#define LB_SORT_USER 2 +#define LB_OUTAREA 3 #define ED_OUTAREA 4 //#define FT_AREA_LABEL 5 //#define FT_AREA 6 @@ -76,7 +76,7 @@ #define LB_LANGUAGE 17 #define FT_ALGORITHM 18 #define LB_ALGORITHM 19 -#define BTN_NATURALSORT 20 +#define BTN_NATURALSORT 20 diff --git a/toolkit/workben/layout/sortdlg.hxx b/toolkit/workben/layout/sortdlg.hxx index c63f24989aca..637c45f5b695 100644 --- a/toolkit/workben/layout/sortdlg.hxx +++ b/toolkit/workben/layout/sortdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,25 +47,25 @@ class ScSortDlg : public SfxTabDialog { public: - ScSortDlg( Window* pParent, + ScSortDlg( Window* pParent, const SfxItemSet* pArgSet ); ~ScSortDlg(); - void SetHeaders( BOOL bHeaders ); - void SetByRows ( BOOL bByRows ); - BOOL GetHeaders() const; - BOOL GetByRows () const; + void SetHeaders( BOOL bHeaders ); + void SetByRows ( BOOL bByRows ); + BOOL GetHeaders() const; + BOOL GetByRows () const; private: - BOOL bIsHeaders; - BOOL bIsByRows; + BOOL bIsHeaders; + BOOL bIsByRows; }; -inline void ScSortDlg::SetHeaders( BOOL bHeaders ) { bIsHeaders = bHeaders; } -inline void ScSortDlg::SetByRows ( BOOL bByRows ) { bIsByRows = bByRows; } -inline BOOL ScSortDlg::GetHeaders() const { return bIsHeaders; } -inline BOOL ScSortDlg::GetByRows () const { return bIsByRows; } +inline void ScSortDlg::SetHeaders( BOOL bHeaders ) { bIsHeaders = bHeaders; } +inline void ScSortDlg::SetByRows ( BOOL bByRows ) { bIsByRows = bByRows; } +inline BOOL ScSortDlg::GetHeaders() const { return bIsHeaders; } +inline BOOL ScSortDlg::GetByRows () const { return bIsByRows; } #if !LAYOUT_SFX_TABDIALOG_BROKEN #include <layout/layout-post.hxx> diff --git a/toolkit/workben/layout/sortdlg.src b/toolkit/workben/layout/sortdlg.src index 5e855962af96..1d03abd0d19c 100644 --- a/toolkit/workben/layout/sortdlg.src +++ b/toolkit/workben/layout/sortdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx index 2a6be01f4557..e0adb6da0e0e 100644 --- a/toolkit/workben/layout/test.cxx +++ b/toolkit/workben/layout/test.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,7 +116,7 @@ static uno::Reference< lang::XSingleServiceFactory > get_factory( char const *se } #define GET_FACTORY(x) get_factory( #x ) - + void LayoutTest::LoadFile( const OUString &aTestFile ) { fprintf( stderr, "TEST: layout instance\n" ); @@ -221,7 +221,7 @@ void LayoutTest::ParseCommandLine() if ( mFiles.size() <= 0 ) mFiles.push_back( OUString::createFromAscii( "layout.xml" ) ); -} +} void LayoutTest::RunEditor() { @@ -313,7 +313,7 @@ void LayoutTest::RunFiles() for ( std::list< OUString >::iterator i = mFiles.begin(); i != mFiles.end(); i++ ) LoadFile( *i ); fprintf( stderr, "TEST: executing\n" ); - Execute(); + Execute(); fprintf( stderr, "TEST: done executing\n" ); } diff --git a/toolkit/workben/layout/tpsort.cxx b/toolkit/workben/layout/tpsort.cxx index 95bae7c0392f..be1d256e62c3 100644 --- a/toolkit/workben/layout/tpsort.cxx +++ b/toolkit/workben/layout/tpsort.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ static USHORT pSortRanges[] = * * virtual BOOL HasExchangeSupport() const; -> return TRUE; * virtual void ActivatePage(const SfxItemSet &); - * virtual int DeactivatePage(SfxItemSet * = 0); + * virtual int DeactivatePage(SfxItemSet * = 0); * * muss noch geaendert werden! */ @@ -97,49 +97,49 @@ static USHORT pSortRanges[] = //======================================================================== // Sortierkriterien-Tabpage: -ScTabPageSortFields::ScTabPageSortFields( Window* pParent, +ScTabPageSortFields::ScTabPageSortFields( Window* pParent, const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_SORT_FIELDS ), rArgSet ), // aFlSort1 ( this, ScResId( FL_SORT1 ) ), - aLbSort1 ( this, ScResId( LB_SORT1 ) ), + aLbSort1 ( this, ScResId( LB_SORT1 ) ), aBtnUp1 ( this, ScResId( BTN_UP1 ) ), - aBtnDown1 ( this, ScResId( BTN_DOWN1 ) ), + aBtnDown1 ( this, ScResId( BTN_DOWN1 ) ), // aFlSort2 ( this, ScResId( FL_SORT2 ) ), - aLbSort2 ( this, ScResId( LB_SORT2 ) ), + aLbSort2 ( this, ScResId( LB_SORT2 ) ), aBtnUp2 ( this, ScResId( BTN_UP2 ) ), - aBtnDown2 ( this, ScResId( BTN_DOWN2 ) ), + aBtnDown2 ( this, ScResId( BTN_DOWN2 ) ), // aFlSort3 ( this, ScResId( FL_SORT3 ) ), - aLbSort3 ( this, ScResId( LB_SORT3 ) ), + aLbSort3 ( this, ScResId( LB_SORT3 ) ), aBtnUp3 ( this, ScResId( BTN_UP3 ) ), - aBtnDown3 ( this, ScResId( BTN_DOWN3 ) ), + aBtnDown3 ( this, ScResId( BTN_DOWN3 ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), - aStrColumn ( ScResId( SCSTR_COLUMN ) ), - aStrRow ( ScResId( SCSTR_ROW ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrColumn ( ScResId( SCSTR_COLUMN ) ), + aStrRow ( ScResId( SCSTR_ROW ) ), // #if !TEST_LAYOUT - nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), + nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), #else /* TEST_LAYOUT */ - nWhichSort ( 0 ), + nWhichSort ( 0 ), #endif /* TEST_LAYOUT */ - pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ), - pViewData ( NULL ), + pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ), + pViewData ( NULL ), #if !TEST_LAYOUT - rSortData ( ((const ScSortItem&) + rSortData ( ((const ScSortItem&) rArgSet.Get( nWhichSort )). GetSortData() ), #else /* TEST_LAYOUT */ - rSortData ( *new ScSortParam() ), + rSortData ( *new ScSortParam() ), #endif /* TEST_LAYOUT */ - nFieldCount ( 0 ), - bHasHeader ( FALSE ), - bSortByRows ( FALSE ) + nFieldCount ( 0 ), + bHasHeader ( FALSE ), + bSortByRows ( FALSE ) { Init(); FreeResource(); @@ -176,15 +176,15 @@ void ScTabPageSortFields::Init() aLbSort2.Clear(); aLbSort3.Clear(); - aSortLbArr[0] = &aLbSort1; - aSortLbArr[1] = &aLbSort2; - aSortLbArr[2] = &aLbSort3; - aDirBtnArr[0][0] = &aBtnUp1; - aDirBtnArr[0][1] = &aBtnDown1; - aDirBtnArr[1][0] = &aBtnUp2; - aDirBtnArr[1][1] = &aBtnDown2; - aDirBtnArr[2][0] = &aBtnUp3; - aDirBtnArr[2][1] = &aBtnDown3; + aSortLbArr[0] = &aLbSort1; + aSortLbArr[1] = &aLbSort2; + aSortLbArr[2] = &aLbSort3; + aDirBtnArr[0][0] = &aBtnUp1; + aDirBtnArr[0][1] = &aBtnDown1; + aDirBtnArr[1][0] = &aBtnUp2; + aDirBtnArr[1][1] = &aBtnDown2; + aDirBtnArr[2][0] = &aBtnUp3; + aDirBtnArr[2][1] = &aBtnDown3; aFlArr[0] = &aFlSort1; aFlArr[1] = &aFlSort2; aFlArr[2] = &aFlSort3; @@ -199,8 +199,8 @@ USHORT* __EXPORT ScTabPageSortFields::GetRanges() // ----------------------------------------------------------------------- -SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent, - const SfxItemSet& rArgSet ) +SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTabPageSortFields( pParent, rArgSet ) ); } @@ -210,7 +210,7 @@ SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent, void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) { bSortByRows = rSortData.bByRow; - bHasHeader = rSortData.bHasHeader; + bHasHeader = rSortData.bHasHeader; if ( aLbSort1.GetEntryCount() == 0 ) FillFieldLists(); @@ -227,13 +227,13 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) GetFieldSelPos( rSortData.nField[i] ) ); (rSortData.bAscending[i]) - ? aDirBtnArr[i][0]->Check() // Up - : aDirBtnArr[i][1]->Check(); // Down + ? aDirBtnArr[i][0]->Check() // Up + : aDirBtnArr[i][1]->Check(); // Down } else { aSortLbArr[i]->SelectEntryPos( 0 ); // "keiner" selektieren - aDirBtnArr[i][0]->Check(); // Up + aDirBtnArr[i][0]->Check(); // Up } } @@ -278,9 +278,9 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) theSortData = ((const ScSortItem*)pItem)->GetSortData(); } - USHORT nSort1Pos = aLbSort1.GetSelectEntryPos(); - USHORT nSort2Pos = aLbSort2.GetSelectEntryPos(); - USHORT nSort3Pos = aLbSort3.GetSelectEntryPos(); + USHORT nSort1Pos = aLbSort1.GetSelectEntryPos(); + USHORT nSort2Pos = aLbSort2.GetSelectEntryPos(); + USHORT nSort3Pos = aLbSort3.GetSelectEntryPos(); DBG_ASSERT( (nSort1Pos <= SC_MAXFIELDS) && (nSort2Pos <= SC_MAXFIELDS) @@ -319,7 +319,7 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) theSortData.bAscending[0] = aBtnUp1.IsChecked(); theSortData.bAscending[1] = aBtnUp2.IsChecked(); theSortData.bAscending[2] = aBtnUp3.IsChecked(); - // bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert + // bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert } else { @@ -345,11 +345,11 @@ void __EXPORT ScTabPageSortFields::ActivatePage() if ( bHasHeader != pDlg->GetHeaders() || bSortByRows != pDlg->GetByRows() ) { - USHORT nCurSel1 = aLbSort1.GetSelectEntryPos(); - USHORT nCurSel2 = aLbSort2.GetSelectEntryPos(); - USHORT nCurSel3 = aLbSort3.GetSelectEntryPos(); + USHORT nCurSel1 = aLbSort1.GetSelectEntryPos(); + USHORT nCurSel2 = aLbSort2.GetSelectEntryPos(); + USHORT nCurSel3 = aLbSort3.GetSelectEntryPos(); - bHasHeader = pDlg->GetHeaders(); + bHasHeader = pDlg->GetHeaders(); bSortByRows = pDlg->GetByRows(); FillFieldLists(); aLbSort1.SelectEntryPos( nCurSel1 ); @@ -386,7 +386,7 @@ void ScTabPageSortFields::DisableField( USHORT nField ) if ( nField<=2 ) { - aSortLbArr[nField] ->Disable(); + aSortLbArr[nField] ->Disable(); aDirBtnArr[nField][0]->Disable(); aDirBtnArr[nField][1]->Disable(); aFlArr[nField] ->Disable(); @@ -401,7 +401,7 @@ void ScTabPageSortFields::EnableField( USHORT nField ) if ( nField<=2 ) { - aSortLbArr[nField] ->Enable(); + aSortLbArr[nField] ->Enable(); aDirBtnArr[nField][0]->Enable(); aDirBtnArr[nField][1]->Enable(); aFlArr[nField] ->Enable(); @@ -425,23 +425,23 @@ void ScTabPageSortFields::FillFieldLists() aLbSort2.InsertEntry( aStrUndefined, 0 ); aLbSort3.InsertEntry( aStrUndefined, 0 ); - SCCOL nFirstSortCol = rSortData.nCol1; - SCROW nFirstSortRow = rSortData.nRow1; - SCTAB nTab = pViewData->GetTabNo(); - USHORT i = 1; + SCCOL nFirstSortCol = rSortData.nCol1; + SCROW nFirstSortRow = rSortData.nRow1; + SCTAB nTab = pViewData->GetTabNo(); + USHORT i = 1; if ( bSortByRows ) { - String aFieldName; - SCCOL nMaxCol = rSortData.nCol2; - SCCOL col; + String aFieldName; + SCCOL nMaxCol = rSortData.nCol2; + SCCOL col; for ( col=nFirstSortCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ ) { pDoc->GetString( col, nFirstSortRow, nTab, aFieldName ); if ( !bHasHeader || (aFieldName.Len() == 0) ) { - aFieldName = aStrColumn; + aFieldName = aStrColumn; aFieldName += ' '; aFieldName += ColToAlpha( col ); } @@ -454,16 +454,16 @@ void ScTabPageSortFields::FillFieldLists() } else { - String aFieldName; - SCROW nMaxRow = rSortData.nRow2; - SCROW row; + String aFieldName; + SCROW nMaxRow = rSortData.nRow2; + SCROW row; for ( row=nFirstSortRow; row<=nMaxRow && i<SC_MAXFIELDS; row++ ) { pDoc->GetString( nFirstSortCol, row, nTab, aFieldName ); if ( !bHasHeader || (aFieldName.Len() == 0) ) { - aFieldName = aStrRow; + aFieldName = aStrRow; aFieldName += ' '; aFieldName += String::CreateFromInt32( row+1 ); } @@ -483,8 +483,8 @@ void ScTabPageSortFields::FillFieldLists() USHORT ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField ) { - USHORT nFieldPos = 0; - BOOL bFound = FALSE; + USHORT nFieldPos = 0; + BOOL bFound = FALSE; for ( USHORT n=1; n<nFieldCount && !bFound; n++ ) { @@ -555,55 +555,55 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) #define SfxTabPage( parent, id, args ) SfxTabPage( parent, "sort-options.xml", id, &args ) #endif /* ENABLE_LAYOUT */ -ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, - const SfxItemSet& rArgSet ) +ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, + const SfxItemSet& rArgSet ) - : SfxTabPage ( pParent, + : SfxTabPage ( pParent, ScResId( RID_SCPAGE_SORT_OPTIONS ), rArgSet ), // - aBtnCase ( this, ScResId( BTN_CASESENSITIVE ) ), - aBtnHeader ( this, ScResId( BTN_LABEL ) ), - aBtnFormats ( this, ScResId( BTN_FORMATS ) ), - aBtnCopyResult ( this, ScResId( BTN_COPYRESULT ) ), - aBtnNaturalSort ( this, ScResId( BTN_NATURALSORT ) ), - aLbOutPos ( this, ScResId( LB_OUTAREA ) ), - aEdOutPos ( this, ScResId( ED_OUTAREA ) ), - aBtnSortUser ( this, ScResId( BTN_SORT_USER ) ), - aLbSortUser ( this, ScResId( LB_SORT_USER ) ), + aBtnCase ( this, ScResId( BTN_CASESENSITIVE ) ), + aBtnHeader ( this, ScResId( BTN_LABEL ) ), + aBtnFormats ( this, ScResId( BTN_FORMATS ) ), + aBtnCopyResult ( this, ScResId( BTN_COPYRESULT ) ), + aBtnNaturalSort ( this, ScResId( BTN_NATURALSORT ) ), + aLbOutPos ( this, ScResId( LB_OUTAREA ) ), + aEdOutPos ( this, ScResId( ED_OUTAREA ) ), + aBtnSortUser ( this, ScResId( BTN_SORT_USER ) ), + aLbSortUser ( this, ScResId( LB_SORT_USER ) ), aFtLanguage ( this, ScResId( FT_LANGUAGE ) ), - aLbLanguage ( this, ScResId( LB_LANGUAGE ) ), + aLbLanguage ( this, ScResId( LB_LANGUAGE ) ), aFtAlgorithm ( this, ScResId( FT_ALGORITHM ) ), - aLbAlgorithm ( this, ScResId( LB_ALGORITHM ) ), - aLineDirection ( this, ScResId( FL_DIRECTION ) ), - aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ), - aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ), -// aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ), -// aFtArea ( this, ScResId( FT_AREA ) ), + aLbAlgorithm ( this, ScResId( LB_ALGORITHM ) ), + aLineDirection ( this, ScResId( FL_DIRECTION ) ), + aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ), + aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ), +// aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ), +// aFtArea ( this, ScResId( FT_AREA ) ), // #if ENABLE_LAYOUT #undef this #undef ScResId #define ScResId(x) this, #x #endif /* ENABLE_LAYOUT */ - aStrRowLabel ( ScResId( STR_ROW_LABEL ) ), - aStrColLabel ( ScResId( STR_COL_LABEL ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), - aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), + aStrRowLabel ( ScResId( STR_ROW_LABEL ) ), + aStrColLabel ( ScResId( STR_COL_LABEL ) ), + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), + aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), // #if !TEST_LAYOUT - nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), - rSortData ( ((const ScSortItem&) + nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), + rSortData ( ((const ScSortItem&) rArgSet.Get( nWhichSort )).GetSortData() ), #else /* TEST_LAYOUT */ - nWhichSort ( 0 ), - rSortData ( *new ScSortParam() ), + nWhichSort ( 0 ), + rSortData ( *new ScSortParam() ), #endif /* TEST_LAYOUT */ - pViewData ( NULL ), - pDoc ( NULL ), - pDlg ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ), - pColRes ( NULL ), - pColWrap ( NULL ) + pViewData ( NULL ), + pDoc ( NULL ), + pDlg ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ), + pColRes ( NULL ), + pColWrap ( NULL ) { #if TEST_LAYOUT (void) rArgSet; @@ -625,49 +625,49 @@ __EXPORT ScTabPageSortOptions::~ScTabPageSortOptions() #endif /* !TEST_LAYOUT */ delete pColRes; - delete pColWrap; //! not if from document + delete pColWrap; //! not if from document } // ----------------------------------------------------------------------- void ScTabPageSortOptions::Init() { -// aStrAreaLabel = aFtAreaLabel.GetText(); -// aStrAreaLabel.Append( (sal_Unicode) ' ' ); +// aStrAreaLabel = aFtAreaLabel.GetText(); +// aStrAreaLabel.Append( (sal_Unicode) ' ' ); - // CollatorRessource has user-visible names for sort algorithms + // CollatorRessource has user-visible names for sort algorithms pColRes = new CollatorRessource(); - //! use CollatorWrapper from document? + //! use CollatorWrapper from document? pColWrap = new CollatorWrapper( comphelper::getProcessServiceFactory() ); #if !TEST_LAYOUT - const ScSortItem& rSortItem = (const ScSortItem&) + const ScSortItem& rSortItem = (const ScSortItem&) GetItemSet().Get( nWhichSort ); #endif /* !TEST_LAYOUT */ - aLbOutPos.SetSelectHdl ( LINK( this, ScTabPageSortOptions, SelOutPosHdl ) ); + aLbOutPos.SetSelectHdl ( LINK( this, ScTabPageSortOptions, SelOutPosHdl ) ); aBtnCopyResult.SetClickHdl( LINK( this, ScTabPageSortOptions, EnableHdl ) ); aBtnSortUser.SetClickHdl ( LINK( this, ScTabPageSortOptions, EnableHdl ) ); - aBtnTopDown.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) ); + aBtnTopDown.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) ); aBtnLeftRight.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) ); aLbLanguage.SetSelectHdl ( LINK( this, ScTabPageSortOptions, FillAlgorHdl ) ); #if !TEST_LAYOUT pViewData = rSortItem.GetViewData(); #endif /* TEST_LAYOUT */ - pDoc = pViewData ? pViewData->GetDocument() : NULL; + pDoc = pViewData ? pViewData->GetDocument() : NULL; DBG_ASSERT( pViewData, "ViewData not found! :-/" ); #if !TEST_LAYOUT if ( pViewData && pDoc ) { - String theArea; - ScDBCollection* pDBColl = pDoc->GetDBCollection(); - String theDbArea; - String theDbName = aStrNoName; - const SCTAB nCurTab = pViewData->GetTabNo(); + String theArea; + ScDBCollection* pDBColl = pDoc->GetDBCollection(); + String theDbArea; + String theDbName = aStrNoName; + const SCTAB nCurTab = pViewData->GetTabNo(); const ScAddress::Convention eConv = pDoc->GetAddressConvention(); #endif /* !TEST_LAYOUT */ @@ -730,7 +730,7 @@ void ScTabPageSortOptions::Init() FillUserSortListBox(); - // get available languages + // get available languages aLbLanguage.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE ); aLbLanguage.InsertLanguage( LANGUAGE_SYSTEM ); @@ -749,8 +749,8 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges() #undef SfxTabPage #endif /* ENABLE_LAYOUT */ SfxTabPage* __EXPORT ScTabPageSortOptions::Create( - Window* pParent, - const SfxItemSet& rArgSet ) + Window* pParent, + const SfxItemSet& rArgSet ) { return ( new ScTabPageSortOptions( pParent, rArgSet ) ); } @@ -772,10 +772,10 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) aLbSortUser.SelectEntryPos( 0 ); } - aBtnCase.Check ( rSortData.bCaseSens ); - aBtnFormats.Check ( rSortData.bIncludePattern ); - aBtnHeader.Check ( rSortData.bHasHeader ); - aBtnNaturalSort.Check ( rSortData.bNaturalSort ); + aBtnCase.Check ( rSortData.bCaseSens ); + aBtnFormats.Check ( rSortData.bIncludePattern ); + aBtnHeader.Check ( rSortData.bHasHeader ); + aBtnNaturalSort.Check ( rSortData.bNaturalSort ); if ( rSortData.bByRow ) { @@ -792,7 +792,7 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) if ( eLang == LANGUAGE_DONTKNOW ) eLang = LANGUAGE_SYSTEM; aLbLanguage.SelectLanguage( eLang ); - FillAlgorHdl( &aLbLanguage ); // get algorithms, select default + FillAlgorHdl( &aLbLanguage ); // get algorithms, select default if ( rSortData.aCollatorAlgorithm.Len() ) aLbAlgorithm.SelectEntry( pColRes->GetTranslation( rSortData.aCollatorAlgorithm ) ); @@ -838,17 +838,17 @@ BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) theSortData = ((const ScSortItem*)pItem)->GetSortData(); } - theSortData.bByRow = aBtnTopDown.IsChecked(); - theSortData.bHasHeader = aBtnHeader.IsChecked(); - theSortData.bCaseSens = aBtnCase.IsChecked(); - theSortData.bNaturalSort = aBtnNaturalSort.IsChecked(); + theSortData.bByRow = aBtnTopDown.IsChecked(); + theSortData.bHasHeader = aBtnHeader.IsChecked(); + theSortData.bCaseSens = aBtnCase.IsChecked(); + theSortData.bNaturalSort = aBtnNaturalSort.IsChecked(); theSortData.bIncludePattern = aBtnFormats.IsChecked(); - theSortData.bInplace = !aBtnCopyResult.IsChecked(); - theSortData.nDestCol = theOutPos.Col(); - theSortData.nDestRow = theOutPos.Row(); - theSortData.nDestTab = theOutPos.Tab(); - theSortData.bUserDef = aBtnSortUser.IsChecked(); - theSortData.nUserIndex = (aBtnSortUser.IsChecked()) + theSortData.bInplace = !aBtnCopyResult.IsChecked(); + theSortData.nDestCol = theOutPos.Col(); + theSortData.nDestRow = theOutPos.Row(); + theSortData.nDestTab = theOutPos.Tab(); + theSortData.bUserDef = aBtnSortUser.IsChecked(); + theSortData.nUserIndex = (aBtnSortUser.IsChecked()) ? aLbSortUser.GetSelectEntryPos() : 0; @@ -907,17 +907,17 @@ int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) if ( aBtnCopyResult.IsChecked() ) { - String thePosStr = aEdOutPos.GetText(); - ScAddress thePos; - xub_StrLen nColonPos = thePosStr.Search( ':' ); + String thePosStr = aEdOutPos.GetText(); + ScAddress thePos; + xub_StrLen nColonPos = thePosStr.Search( ':' ); if ( STRING_NOTFOUND != nColonPos ) thePosStr.Erase( nColonPos ); if ( pViewData ) { - // visible table is default for input without table - // must be changed to GetRefTabNo when sorting has RefInput! + // visible table is default for input without table + // must be changed to GetRefTabNo when sorting has RefInput! thePos.SetTab( pViewData->GetTabNo() ); } @@ -1009,8 +1009,8 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) { if ( pLb == &aLbOutPos ) { - String aString; - USHORT nSelPos = aLbOutPos.GetSelectEntryPos(); + String aString; + USHORT nSelPos = aLbOutPos.GetSelectEntryPos(); if ( nSelPos > 0 ) aString = *(String*)aLbOutPos.GetEntryData( nSelPos ); @@ -1041,15 +1041,15 @@ void __EXPORT ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) { if ( pEd == &aEdOutPos ) { - String theCurPosStr = aEdOutPos.GetText(); - USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); + String theCurPosStr = aEdOutPos.GetText(); + USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); if ( SCA_VALID == (nResult & SCA_VALID) ) { - String* pStr = NULL; - BOOL bFound = FALSE; - USHORT i = 0; - USHORT nCount = aLbOutPos.GetEntryCount(); + String* pStr = NULL; + BOOL bFound = FALSE; + USHORT i = 0; + USHORT nCount = aLbOutPos.GetEntryCount(); for ( i=2; i<nCount && !bFound; i++ ) { @@ -1075,11 +1075,11 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG ) LanguageType eLang = aLbLanguage.GetSelectLanguage(); if ( eLang == LANGUAGE_SYSTEM ) { - // for LANGUAGE_SYSTEM no algorithm can be selected because - // it wouldn't necessarily exist for other languages - // -> leave list box empty if LANGUAGE_SYSTEM is selected + // for LANGUAGE_SYSTEM no algorithm can be selected because + // it wouldn't necessarily exist for other languages + // -> leave list box empty if LANGUAGE_SYSTEM is selected aFtAlgorithm.Enable( FALSE ); // nothing to select - aLbAlgorithm.Enable( FALSE ); // nothing to select + aLbAlgorithm.Enable( FALSE ); // nothing to select } else { @@ -1094,9 +1094,9 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG ) String sUser = pColRes->GetTranslation( sAlg ); aLbAlgorithm.InsertEntry( sUser, LISTBOX_APPEND ); } - aLbAlgorithm.SelectEntryPos( 0 ); // first entry is default + aLbAlgorithm.SelectEntryPos( 0 ); // first entry is default aFtAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice - aLbAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice + aLbAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice } aLbAlgorithm.SetUpdateMode( TRUE ); diff --git a/toolkit/workben/layout/tpsort.hxx b/toolkit/workben/layout/tpsort.hxx index 64e4f4b6de42..bd3d0a592358 100644 --- a/toolkit/workben/layout/tpsort.hxx +++ b/toolkit/workben/layout/tpsort.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ //------------------------------------------------------------------------ // +1 because one field is reserved for the "- undefined -" entry -#define SC_MAXFIELDS MAXCOLCOUNT+1 +#define SC_MAXFIELDS MAXCOLCOUNT+1 class ScViewData; class ScSortDlg; @@ -56,66 +56,66 @@ struct ScSortParam; class ScTabPageSortFields : public SfxTabPage { public: - ScTabPageSortFields( Window* pParent, - const SfxItemSet& rArgSet ); + ScTabPageSortFields( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTabPageSortFields(); - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); protected: // fuer Datenaustausch (sollte noch umgestellt werden!) -// virtual void ActivatePage ( const SfxItemSet& rSet ); +// virtual void ActivatePage ( const SfxItemSet& rSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage (); - virtual int DeactivatePage ( SfxItemSet* pSet = 0); + virtual void ActivatePage (); + virtual int DeactivatePage ( SfxItemSet* pSet = 0); private: FixedLine aFlSort1; - ListBox aLbSort1; - RadioButton aBtnUp1; - RadioButton aBtnDown1; + ListBox aLbSort1; + RadioButton aBtnUp1; + RadioButton aBtnDown1; FixedLine aFlSort2; - ListBox aLbSort2; - RadioButton aBtnUp2; - RadioButton aBtnDown2; + ListBox aLbSort2; + RadioButton aBtnUp2; + RadioButton aBtnDown2; FixedLine aFlSort3; - ListBox aLbSort3; - RadioButton aBtnUp3; - RadioButton aBtnDown3; - - String aStrUndefined; - String aStrColumn; - String aStrRow; - - const USHORT nWhichSort; - ScSortDlg* pDlg; - ScViewData* pViewData; - const ScSortParam& rSortData; - SCCOLROW nFieldArr[SC_MAXFIELDS]; - USHORT nFieldCount; - SCCOL nFirstCol; - SCROW nFirstRow; - BOOL bHasHeader; - BOOL bSortByRows; - - ListBox* aSortLbArr[3]; - RadioButton* aDirBtnArr[3][2]; + ListBox aLbSort3; + RadioButton aBtnUp3; + RadioButton aBtnDown3; + + String aStrUndefined; + String aStrColumn; + String aStrRow; + + const USHORT nWhichSort; + ScSortDlg* pDlg; + ScViewData* pViewData; + const ScSortParam& rSortData; + SCCOLROW nFieldArr[SC_MAXFIELDS]; + USHORT nFieldCount; + SCCOL nFirstCol; + SCROW nFirstRow; + BOOL bHasHeader; + BOOL bSortByRows; + + ListBox* aSortLbArr[3]; + RadioButton* aDirBtnArr[3][2]; FixedLine* aFlArr[3]; #ifdef _TPSORT_CXX private: - void Init (); - void DisableField ( USHORT nField ); - void EnableField ( USHORT nField ); - void FillFieldLists (); - USHORT GetFieldSelPos ( SCCOLROW nField ); + void Init (); + void DisableField ( USHORT nField ); + void EnableField ( USHORT nField ); + void FillFieldLists (); + USHORT GetFieldSelPos ( SCCOLROW nField ); // Handler ------------------------ DECL_LINK( SelectHdl, ListBox * ); @@ -136,25 +136,25 @@ class CollatorWrapper; class ScTabPageSortOptions : public SfxTabPage { public: - ScTabPageSortOptions( Window* pParent, - const SfxItemSet& rArgSet ); + ScTabPageSortOptions( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTabPageSortOptions(); #undef SfxTabPage #define SfxTabPage ::SfxTabPage - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); protected: // fuer Datenaustausch (sollte noch umgestellt werden!) -// virtual void ActivatePage ( const SfxItemSet& rSet ); +// virtual void ActivatePage ( const SfxItemSet& rSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage (); - virtual int DeactivatePage ( SfxItemSet* pSet = 0); + virtual void ActivatePage (); + virtual int DeactivatePage ( SfxItemSet* pSet = 0); private: @@ -163,7 +163,7 @@ private: CheckBox aBtnFormats; CheckBox aBtnCopyResult; - CheckBox aBtnNaturalSort; + CheckBox aBtnNaturalSort; ListBox aLbOutPos; Edit aEdOutPos; @@ -187,26 +187,26 @@ private: String aStrNoName; String aStrAreaLabel; - const USHORT nWhichSort; - const ScSortParam& rSortData; - ScViewData* pViewData; - ScDocument* pDoc; - ScSortDlg* pDlg; - ScAddress theOutPos; + const USHORT nWhichSort; + const ScSortParam& rSortData; + ScViewData* pViewData; + ScDocument* pDoc; + ScSortDlg* pDlg; + ScAddress theOutPos; - CollatorRessource* pColRes; - CollatorWrapper* pColWrap; + CollatorRessource* pColRes; + CollatorWrapper* pColWrap; #ifdef _TPSORT_CXX private: - void Init (); - void FillUserSortListBox (); - void FillOutPosList (); + void Init (); + void FillUserSortListBox (); + void FillOutPosList (); // Handler ------------------------ DECL_LINK( EnableHdl, CheckBox * ); DECL_LINK( SelOutPosHdl, ListBox * ); - void EdOutPosModHdl ( Edit* pEd ); + void EdOutPosModHdl ( Edit* pEd ); DECL_LINK( SortDirHdl, RadioButton * ); DECL_LINK( FillAlgorHdl, void * ); #endif diff --git a/toolkit/workben/layout/uno.hxx b/toolkit/workben/layout/uno.hxx index d89024ff8468..99f2b570672a 100644 --- a/toolkit/workben/layout/uno.hxx +++ b/toolkit/workben/layout/uno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/workben/layout/wordcountdialog.cxx b/toolkit/workben/layout/wordcountdialog.cxx index da0083e09456..f14f0c8dfbab 100644 --- a/toolkit/workben/layout/wordcountdialog.cxx +++ b/toolkit/workben/layout/wordcountdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/workben/layout/wordcountdialog.hxx b/toolkit/workben/layout/wordcountdialog.hxx index 5c6dbabea04f..3d640caac2dd 100644 --- a/toolkit/workben/layout/wordcountdialog.hxx +++ b/toolkit/workben/layout/wordcountdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ class SwWordCountDialog : public SfxModalDialog OKButton aOK; HelpButton aHelp; -public: +public: SwWordCountDialog(Window* pParent); ~SwWordCountDialog(); diff --git a/toolkit/workben/layout/zoom.cxx b/toolkit/workben/layout/zoom.cxx index 0fa756a33f03..9ab3cce86d5e 100644 --- a/toolkit/workben/layout/zoom.cxx +++ b/toolkit/workben/layout/zoom.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,7 +118,7 @@ static USHORT pRanges[] = 0 }; -#define SPECIAL_FACTOR ((USHORT)0xFFFF) +#define SPECIAL_FACTOR ((USHORT)0xFFFF) // class SvxZoomDialog --------------------------------------------------- @@ -270,13 +270,13 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : aBottomFl ( this, SVX_RES( FL_BOTTOM ) ), aOKBtn ( this, SVX_RES( BTN_ZOOM_OK ) ), aCancelBtn ( this, SVX_RES( BTN_ZOOM_CANCEL ) ), - aHelpBtn ( this, SVX_RES( BTN_ZOOM_HELP ) ), + aHelpBtn ( this, SVX_RES( BTN_ZOOM_HELP ) ), #if !TEST_LAYOUT - rSet ( rCoreSet ), + rSet ( rCoreSet ), #endif /* !TEST_LAYOUT */ pOutSet ( NULL ), - bModified ( FALSE ) + bModified ( FALSE ) { #if ENABLE_LAYOUT diff --git a/toolkit/workben/layout/zoom.hrc b/toolkit/workben/layout/zoom.hrc index 49412ad085f0..0fb3a8afc6c5 100644 --- a/toolkit/workben/layout/zoom.hrc +++ b/toolkit/workben/layout/zoom.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/toolkit/workben/layout/zoom.hxx b/toolkit/workben/layout/zoom.hxx index 0fab50eb1ced..44694b1c9924 100644 --- a/toolkit/workben/layout/zoom.hxx +++ b/toolkit/workben/layout/zoom.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,9 +38,9 @@ // define ---------------------------------------------------------------- /* CHINA001 -#define ZOOMBTN_OPTIMAL ((USHORT)0x0001) -#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002) -#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004) +#define ZOOMBTN_OPTIMAL ((USHORT)0x0001) +#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002) +#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004) */ #include "zoom_def.hxx" // class SvxZoomDialog --------------------------------------------------- @@ -51,7 +51,7 @@ Mit diesem Dialog wird ein Zoom-Faktor eingestellt. [Items] - SvxZoomItem <SID_ATTR_ZOOM> + SvxZoomItem <SID_ATTR_ZOOM> */ #include <layout/layout-pre.hxx> @@ -62,10 +62,10 @@ private: FixedLine aZoomFl; RadioButton aOptimalBtn; RadioButton aWholePageBtn; - RadioButton aPageWidthBtn; + RadioButton aPageWidthBtn; RadioButton a100Btn; RadioButton aUserBtn; - MetricField aUserEdit; + MetricField aUserEdit; FixedLine aViewLayoutFl; RadioButton aAutomaticBtn; @@ -76,14 +76,14 @@ private: FixedLine aBottomFl; OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; #if !TEST_LAYOUT - const SfxItemSet& rSet; + const SfxItemSet& rSet; #endif /* !TEST_LAYOUT */ - SfxItemSet* pOutSet; - BOOL bModified; + SfxItemSet* pOutSet; + BOOL bModified; #ifdef _SVX_ZOOM_CXX DECL_LINK( UserHdl, RadioButton* ); @@ -102,16 +102,16 @@ public: #endif /* !TEST_LAYOUT */ ~SvxZoomDialog(); - static USHORT* GetRanges(); - const SfxItemSet* GetOutputItemSet() const { return pOutSet; } + static USHORT* GetRanges(); + const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - USHORT GetFactor() const; - void SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 ); + USHORT GetFactor() const; + void SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 ); - void SetButtonText( USHORT nBtnId, const String& aNewTxt ); - void HideButton( USHORT nBtnId ); - void SetLimits( USHORT nMin, USHORT nMax ); - void SetSpinSize( USHORT nNewSpin ); + void SetButtonText( USHORT nBtnId, const String& aNewTxt ); + void HideButton( USHORT nBtnId ); + void SetLimits( USHORT nMin, USHORT nMax ); + void SetSpinSize( USHORT nNewSpin ); }; #include <layout/layout-post.hxx> diff --git a/toolkit/workben/layout/zoom_def.hxx b/toolkit/workben/layout/zoom_def.hxx index 84b2db945a6e..9226384275fd 100644 --- a/toolkit/workben/layout/zoom_def.hxx +++ b/toolkit/workben/layout/zoom_def.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,9 +29,9 @@ #ifndef _SVX_ZOOM_DEF_HXX #define _SVX_ZOOM_DEF_HXX -#define ZOOMBTN_OPTIMAL ((USHORT)0x0001) -#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002) -#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004) +#define ZOOMBTN_OPTIMAL ((USHORT)0x0001) +#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002) +#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004) #endif diff --git a/toolkit/workben/unodialog.cxx b/toolkit/workben/unodialog.cxx index d2203bba1384..b53e0e59301a 100644 --- a/toolkit/workben/unodialog.cxx +++ b/toolkit/workben/unodialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <svtools/unoiface.hxx> // InitExtToolkit +#include <svtools/unoiface.hxx> // InitExtToolkit #include <comphelper/processfactory.hxx> #include <cppuhelper/servicefactory.hxx> @@ -70,7 +70,7 @@ using namespace ::com::sun::star::lang; { ::rtl::OUString localRegistry = ::comphelper::getPathToUserRegistry(); ::rtl::OUString systemRegistry = ::comphelper::getPathToSystemRegistry(); - + Reference< XSimpleRegistry > xLocalRegistry( ::cppu::createSimpleRegistry() ); Reference< XSimpleRegistry > xSystemRegistry( ::cppu::createSimpleRegistry() ); if ( xLocalRegistry.is() && (localRegistry.getLength() > 0) ) @@ -82,14 +82,14 @@ using namespace ::com::sun::star::lang; catch ( InvalidRegistryException& ) { } - + if ( !xLocalRegistry->isValid() ) xLocalRegistry->open(localRegistry, sal_True, sal_True); } - + if ( xSystemRegistry.is() && (systemRegistry.getLength() > 0) ) xSystemRegistry->open( systemRegistry, sal_True, sal_False); - + if ( (xLocalRegistry.is() && xLocalRegistry->isValid()) && (xSystemRegistry.is() && xSystemRegistry->isValid()) ) { @@ -99,7 +99,7 @@ using namespace ::com::sun::star::lang; seqAnys[1] <<= xSystemRegistry ; Reference< XInitialization > xInit( xReg, UNO_QUERY ); xInit->initialize( seqAnys ); - + Reference< XComponentContext > xContext( ::cppu::bootstrap_InitialComponentContext( xReg ) ); return Reference< XMultiServiceFactory >( xContext->getServiceManager(), UNO_QUERY ); } @@ -107,7 +107,7 @@ using namespace ::com::sun::star::lang; catch( ::com::sun::star::uno::Exception& ) { } - + return ::cppu::createServiceFactory(); } @@ -147,7 +147,7 @@ private: public: MyWin() : WorkWindow( NULL, WB_APP|WB_STDWORK ) {;} void Paint( const Rectangle& r ); - void SetXView( uno::Reference< awt::XView > xV ) { mxView = xV; } + void SetXView( uno::Reference< awt::XView > xV ) { mxView = xV; } }; @@ -156,7 +156,7 @@ public: void Main( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMSF ) { ::comphelper::setProcessServiceFactory( xMSF ); - + //uno::Reference< awt::XToolkit> xToolkit( xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.ExtToolkit" ) ) ), uno::UNO_QUERY ); uno::Reference< awt::XToolkit> xToolkit( xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ) ), uno::UNO_QUERY ); @@ -243,7 +243,7 @@ void Main( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMult Reference< XComponent > xT( xToolkit, uno::UNO_QUERY ); xT->dispose(); - + Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); if (xProps.is()) { |