diff options
175 files changed, 2458 insertions, 2458 deletions
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx index 3f01ce910728..778f6c35dac0 100644 --- a/framework/inc/classes/actiontriggercontainer.hxx +++ b/framework/inc/classes/actiontriggercontainer.hxx @@ -33,36 +33,36 @@ namespace framework { class FWE_DLLPUBLIC ActionTriggerContainer : public PropertySetContainer, - public com::sun::star::lang::XMultiServiceFactory, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::lang::XTypeProvider + public css::lang::XMultiServiceFactory, + public css::lang::XServiceInfo, + public css::lang::XTypeProvider { public: ActionTriggerContainer(); virtual ~ActionTriggerContainer(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; }; } diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index e3ab5cf08602..0b901422101f 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -39,8 +39,8 @@ namespace framework { class ActionTriggerPropertySet : private cppu::BaseMutex, - public ::com::sun::star::lang::XServiceInfo , - public ::com::sun::star::lang::XTypeProvider, + public css::lang::XServiceInfo , + public css::lang::XTypeProvider, public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper , // -> XPropertySet, XFastPropertySet, XMultiPropertySet public ::cppu::OWeakObject @@ -50,67 +50,67 @@ class ActionTriggerPropertySet : private cppu::BaseMutex, FWE_DLLPUBLIC virtual ~ActionTriggerPropertySet(); // XInterface - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual FWE_DLLPUBLIC css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw () override; virtual FWE_DLLPUBLIC void SAL_CALL release() throw () override; // XServiceInfo - virtual FWE_DLLPUBLIC OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual FWE_DLLPUBLIC OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual FWE_DLLPUBLIC css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual FWE_DLLPUBLIC css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual FWE_DLLPUBLIC css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; private: // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue, - com::sun::star::uno::Any& aOldValue, + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue, + css::uno::Any& aOldValue, sal_Int32 nHandle, - const com::sun::star::uno::Any& aValue ) - throw( com::sun::star::lang::IllegalArgumentException ) override; + const css::uno::Any& aValue ) + throw( css::lang::IllegalArgumentException ) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) - throw( com::sun::star::uno::Exception, std::exception ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) + throw( css::uno::Exception, std::exception ) override; using cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue, sal_Int32 nHandle ) const override; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue, sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw (css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); // helper - bool impl_tryToChangeProperty( const OUString& aCurrentValue , - const com::sun::star::uno::Any& aNewValue , - com::sun::star::uno::Any& aOldValue , - com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); + bool impl_tryToChangeProperty( const OUString& aCurrentValue , + const css::uno::Any& aNewValue , + css::uno::Any& aOldValue , + css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); - bool impl_tryToChangeProperty( const com::sun::star::uno::Reference< com::sun::star::awt::XBitmap > xBitmap, - const com::sun::star::uno::Any& aNewValue , - com::sun::star::uno::Any& aOldValue , - com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); + bool impl_tryToChangeProperty( const css::uno::Reference< css::awt::XBitmap > xBitmap, + const css::uno::Any& aNewValue , + css::uno::Any& aOldValue , + css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); - bool impl_tryToChangeProperty( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xInterface, - const com::sun::star::uno::Any& aNewValue , - com::sun::star::uno::Any& aOldValue , - com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); + bool impl_tryToChangeProperty( const css::uno::Reference< css::uno::XInterface > xInterface, + const css::uno::Any& aNewValue , + css::uno::Any& aOldValue , + css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); // members - OUString m_aCommandURL; - OUString m_aHelpURL; - OUString m_aText; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > m_xBitmap; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xActionTriggerContainer; + OUString m_aCommandURL; + OUString m_aHelpURL; + OUString m_aText; + css::uno::Reference< css::awt::XBitmap > m_xBitmap; + css::uno::Reference< css::uno::XInterface > m_xActionTriggerContainer; }; } diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx index 3a7027912cbf..c50555621571 100644 --- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx +++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx @@ -37,8 +37,8 @@ namespace framework { class ActionTriggerSeparatorPropertySet : private cppu::BaseMutex, - public ::com::sun::star::lang::XServiceInfo , - public ::com::sun::star::lang::XTypeProvider, + public css::lang::XServiceInfo , + public css::lang::XTypeProvider, public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper , // -> XPropertySet, XFastPropertySet, XMultiPropertySet public ::cppu::OWeakObject @@ -48,49 +48,49 @@ class ActionTriggerSeparatorPropertySet : private cppu::BaseMutex, virtual ~ActionTriggerSeparatorPropertySet(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; private: // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue, - com::sun::star::uno::Any& aOldValue, + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue, + css::uno::Any& aOldValue, sal_Int32 nHandle, - const com::sun::star::uno::Any& aValue ) - throw( com::sun::star::lang::IllegalArgumentException ) override; + const css::uno::Any& aValue ) + throw( css::lang::IllegalArgumentException ) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) - throw( com::sun::star::uno::Exception, std::exception ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) + throw( css::uno::Exception, std::exception ) override; using cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue, sal_Int32 nHandle ) const override; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue, sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw (css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); // helper bool impl_tryToChangeProperty( sal_Int16 aCurrentValue , - const com::sun::star::uno::Any& aNewValue , - com::sun::star::uno::Any& aOldValue , - com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); + const css::uno::Any& aNewValue , + css::uno::Any& aOldValue , + css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); // members diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx index 46239fb0e574..964907c17d96 100644 --- a/framework/inc/classes/imagewrapper.hxx +++ b/framework/inc/classes/imagewrapper.hxx @@ -31,8 +31,8 @@ namespace framework { class FWE_DLLPUBLIC ImageWrapper : - public ::cppu::WeakImplHelper< ::com::sun::star::awt::XBitmap, - ::com::sun::star::lang::XUnoTunnel > + public ::cppu::WeakImplHelper< css::awt::XBitmap, + css::lang::XUnoTunnel > { public: ImageWrapper( const Image& aImage ); @@ -43,15 +43,15 @@ class FWE_DLLPUBLIC ImageWrapper : return m_aImage; } - static ::com::sun::star::uno::Sequence< sal_Int8 > GetUnoTunnelId(); + static css::uno::Sequence< sal_Int8 > GetUnoTunnelId(); // XBitmap - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw (css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override; private: Image m_aImage; diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index ac7b6a33095a..f843e98e5d15 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -100,7 +100,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet * @param aProperty * describes the new property. * - * @throw [com::sun::star::beans::PropertyExistException] + * @throw [css::beans::PropertyExistException] * if a property with the same name already exists. * * Note: The consistence of the whole set of properties is not checked here. diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index b8a2097414c3..bc0fa2b204bf 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -35,78 +35,78 @@ namespace framework { class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, - public com::sun::star::lang::XMultiServiceFactory, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::lang::XUnoTunnel, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::container::XNamed + public css::lang::XMultiServiceFactory, + public css::lang::XServiceInfo, + public css::lang::XUnoTunnel, + public css::lang::XTypeProvider, + public css::container::XNamed { public: RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier); virtual ~RootActionTriggerContainer(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() + throw (css::uno::RuntimeException, std::exception) override; // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) + throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) + throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; private: void FillContainer(); - bool m_bContainerCreated; - bool m_bContainerChanged; - bool m_bInContainerCreation; - const Menu* m_pMenu; + bool m_bContainerCreated; + bool m_bContainerChanged; + bool m_bInContainerCreation; + const Menu* m_pMenu; const OUString* m_pMenuIdentifier; }; diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 7761e26ff86e..fcd5718104f0 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -88,11 +88,11 @@ class PopupMenuDispatcher : public ::cppu::WeakImplHelper< virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) throw( css::uno::Exception , css::uno::RuntimeException, std::exception) override; // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( - const ::com::sun::star::util::URL& aURL , + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( + const css::util::URL& aURL , const OUString& sTarget , sal_Int32 nFlags ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) @@ -128,7 +128,7 @@ class PopupMenuDispatcher : public ::cppu::WeakImplHelper< css::uno::Reference< css::container::XNameAccess > m_xPopupCtrlQuery; /// reference to query for popup controller css::uno::Reference< css::uri::XUriReferenceFactory > m_xUriRefFactory; /// reference to the uri reference factory css::uno::Reference< css::uno::XComponentContext > m_xContext; /// factory shared with our owner to create new services! - osl::Mutex m_mutex; + osl::Mutex m_mutex; IMPL_ListenerHashContainer m_aListenerContainer; /// hash table for listener at specified URLs bool m_bAlreadyDisposed; /// Protection against multiple disposing calls. bool m_bActivateListener; /// dispatcher is listener for frame activation diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx index 3b99e6d2b050..683f9b170faf 100644 --- a/framework/inc/helper/dockingareadefaultacceptor.hxx +++ b/framework/inc/helper/dockingareadefaultacceptor.hxx @@ -33,7 +33,7 @@ namespace framework{ -class DockingAreaDefaultAcceptor : public ::cppu::WeakImplHelper< ::com::sun::star::ui::XDockingAreaAcceptor > +class DockingAreaDefaultAcceptor : public ::cppu::WeakImplHelper< css::ui::XDockingAreaAcceptor > { public: diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index fd9c5179f4f8..4f5cf40a2782 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -112,25 +112,25 @@ inline void RetrieveTypeNameFromResourceURL( const OUString& aResourceURL, OUStr class FWI_DLLPUBLIC LanguageGuessingHelper { - mutable ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > m_xLanguageGuesser; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + mutable css::uno::Reference< css::linguistic2::XLanguageGuessing > m_xLanguageGuesser; + css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - LanguageGuessingHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext) : m_xContext(_xContext){} + LanguageGuessingHelper(const css::uno::Reference< css::uno::XComponentContext >& _xContext) : m_xContext(_xContext){} - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > GetGuesser() const; + css::uno::Reference< css::linguistic2::XLanguageGuessing > GetGuesser() const; }; FWI_DLLPUBLIC OUString RetrieveLabelFromCommand( const OUString& aCmdURL - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext - ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xUICommandLabels - ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame + ,const css::uno::Reference< css::uno::XComponentContext >& _xContext + ,css::uno::Reference< css::container::XNameAccess >& _xUICommandLabels + ,const css::uno::Reference< css::frame::XFrame >& _xFrame ,OUString& _rModuleIdentifier ,bool& _rIni ,const sal_Char* _pName); FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > &rxFrame, + const css::uno::Reference< css::frame::XFrame > &rxFrame, const LanguageGuessingHelper & rLangGuessHelper, SvtScriptType nScriptType, const OUString & rCurLang, @@ -150,13 +150,13 @@ FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems, //OriginalListener owns the Broadcaster which "owns" the WeakContainerListener //which forwards the events to the OriginalListener without taking ownership of //it. -class WeakContainerListener : public ::cppu::WeakImplHelper<com::sun::star::container::XContainerListener> +class WeakContainerListener : public ::cppu::WeakImplHelper<css::container::XContainerListener> { private: - com::sun::star::uno::WeakReference<com::sun::star::container::XContainerListener> mxOwner; + css::uno::WeakReference<css::container::XContainerListener> mxOwner; public: - WeakContainerListener(com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner) + WeakContainerListener(css::uno::Reference<css::container::XContainerListener> xOwner) : mxOwner(xOwner) { } @@ -166,52 +166,52 @@ class WeakContainerListener : public ::cppu::WeakImplHelper<com::sun::star::cont } // container.XContainerListener - virtual void SAL_CALL elementInserted(const com::sun::star::container::ContainerEvent& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) + throw(css::uno::RuntimeException, std::exception) override { - com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::container::XContainerListener> xOwner(mxOwner.get(), + css::uno::UNO_QUERY); if (xOwner.is()) xOwner->elementInserted(rEvent); } - virtual void SAL_CALL elementRemoved(const com::sun::star::container::ContainerEvent& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) + throw(css::uno::RuntimeException, std::exception) override { - com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::container::XContainerListener> xOwner(mxOwner.get(), + css::uno::UNO_QUERY); if (xOwner.is()) xOwner->elementRemoved(rEvent); } - virtual void SAL_CALL elementReplaced(const com::sun::star::container::ContainerEvent& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) + throw(css::uno::RuntimeException, std::exception) override { - com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::container::XContainerListener> xOwner(mxOwner.get(), + css::uno::UNO_QUERY); if (xOwner.is()) xOwner->elementReplaced(rEvent); } // lang.XEventListener - virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) + throw(css::uno::RuntimeException, std::exception) override { - com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::container::XContainerListener> xOwner(mxOwner.get(), + css::uno::UNO_QUERY); if (xOwner.is()) xOwner->disposing(rEvent); } }; -class WeakChangesListener : public ::cppu::WeakImplHelper<com::sun::star::util::XChangesListener> +class WeakChangesListener : public ::cppu::WeakImplHelper<css::util::XChangesListener> { private: - com::sun::star::uno::WeakReference<com::sun::star::util::XChangesListener> mxOwner; + css::uno::WeakReference<css::util::XChangesListener> mxOwner; public: - WeakChangesListener(com::sun::star::uno::Reference<com::sun::star::util::XChangesListener> xOwner) + WeakChangesListener(css::uno::Reference<css::util::XChangesListener> xOwner) : mxOwner(xOwner) { } @@ -221,34 +221,34 @@ class WeakChangesListener : public ::cppu::WeakImplHelper<com::sun::star::util:: } // util.XChangesListener - virtual void SAL_CALL changesOccurred(const com::sun::star::util::ChangesEvent& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& rEvent) + throw(css::uno::RuntimeException, std::exception) override { - com::sun::star::uno::Reference<com::sun::star::util::XChangesListener> xOwner(mxOwner.get(), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::util::XChangesListener> xOwner(mxOwner.get(), + css::uno::UNO_QUERY); if (xOwner.is()) xOwner->changesOccurred(rEvent); } // lang.XEventListener - virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) + throw(css::uno::RuntimeException, std::exception) override { - com::sun::star::uno::Reference<com::sun::star::util::XChangesListener> xOwner(mxOwner.get(), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::util::XChangesListener> xOwner(mxOwner.get(), + css::uno::UNO_QUERY); if (xOwner.is()) xOwner->disposing(rEvent); } }; -class WeakEventListener : public ::cppu::WeakImplHelper<com::sun::star::lang::XEventListener> +class WeakEventListener : public ::cppu::WeakImplHelper<css::lang::XEventListener> { private: - com::sun::star::uno::WeakReference<com::sun::star::lang::XEventListener> mxOwner; + css::uno::WeakReference<css::lang::XEventListener> mxOwner; public: - WeakEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> xOwner) + WeakEventListener(css::uno::Reference<css::lang::XEventListener> xOwner) : mxOwner(xOwner) { } @@ -258,24 +258,24 @@ class WeakEventListener : public ::cppu::WeakImplHelper<com::sun::star::lang::XE } // lang.XEventListener - virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) + throw(css::uno::RuntimeException, std::exception) override { - com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> xOwner(mxOwner.get(), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::lang::XEventListener> xOwner(mxOwner.get(), + css::uno::UNO_QUERY); if (xOwner.is()) xOwner->disposing(rEvent); } }; -class WeakDocumentEventListener : public ::cppu::WeakImplHelper<com::sun::star::document::XDocumentEventListener> +class WeakDocumentEventListener : public ::cppu::WeakImplHelper<css::document::XDocumentEventListener> { private: - com::sun::star::uno::WeakReference<com::sun::star::document::XDocumentEventListener> mxOwner; + css::uno::WeakReference<css::document::XDocumentEventListener> mxOwner; public: - WeakDocumentEventListener(com::sun::star::uno::Reference<com::sun::star::document::XDocumentEventListener> xOwner) + WeakDocumentEventListener(css::uno::Reference<css::document::XDocumentEventListener> xOwner) : mxOwner(xOwner) { } @@ -284,22 +284,22 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper<com::sun::star:: { } - virtual void SAL_CALL documentEventOccured(const com::sun::star::document::DocumentEvent& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& rEvent) + throw(css::uno::RuntimeException, std::exception) override { - com::sun::star::uno::Reference<com::sun::star::document::XDocumentEventListener> xOwner(mxOwner.get(), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::document::XDocumentEventListener> xOwner(mxOwner.get(), + css::uno::UNO_QUERY); if (xOwner.is()) xOwner->documentEventOccured(rEvent); } // lang.XEventListener - virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) + throw(css::uno::RuntimeException, std::exception) override { - com::sun::star::uno::Reference<com::sun::star::document::XDocumentEventListener> xOwner(mxOwner.get(), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::document::XDocumentEventListener> xOwner(mxOwner.get(), + css::uno::UNO_QUERY); if (xOwner.is()) xOwner->disposing(rEvent); diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index 78ff38d4f868..605629894051 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -54,7 +54,7 @@ namespace framework{ @devstatus ready to use *//*-*************************************************************************************************************/ -class OComponentAccess : public ::cppu::WeakImplHelper< ::com::sun::star::container::XEnumerationAccess > +class OComponentAccess : public ::cppu::WeakImplHelper< css::container::XEnumerationAccess > { // public methods diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index 77533e3d9ed7..6b2acd79443c 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -50,7 +50,7 @@ namespace framework{ @threadsafe yes *//*-*************************************************************************************************************/ -class OComponentEnumeration : public ::cppu::WeakImplHelper< ::com::sun::star::container::XEnumeration,::com::sun::star::lang::XEventListener > +class OComponentEnumeration : public ::cppu::WeakImplHelper< css::container::XEnumeration,css::lang::XEventListener > { // public methods diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index cde5d5576ddb..8664dde813b5 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -54,7 +54,7 @@ namespace framework{ @devstatus deprecated *//*-*************************************************************************************************************/ -class OFrames : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XFrames > +class OFrames : public ::cppu::WeakImplHelper< css::frame::XFrames > { public: diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx index 6dc589011b48..a04f2020e9a4 100644 --- a/framework/inc/helper/propertysetcontainer.hxx +++ b/framework/inc/helper/propertysetcontainer.hxx @@ -32,7 +32,7 @@ namespace framework { -class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIndexContainer , +class FWE_DLLPUBLIC PropertySetContainer : public css::container::XIndexContainer , public ::cppu::OWeakObject { public: @@ -40,41 +40,41 @@ class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIn virtual ~PropertySetContainer(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) + throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) + throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override { - return cppu::UnoType<com::sun::star::beans::XPropertySet>::get(); + return cppu::UnoType<css::beans::XPropertySet>::get(); } virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: - typedef std::vector< com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > > PropertySetVector; + typedef std::vector< css::uno::Reference< css::beans::XPropertySet > > PropertySetVector; PropertySetVector m_aPropertySetVector; }; diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index 7e427e9a1961..100a7b225213 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -43,12 +43,12 @@ namespace framework { typedef ::cppu::WeakImplHelper< - ::com::sun::star::ui::XUIElement, - ::com::sun::star::ui::XUIElementSettings, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::lang::XComponent, - ::com::sun::star::util::XUpdatable, - ::com::sun::star::ui::XUIConfigurationListener > UIConfigElementWrapperBase_BASE; + css::ui::XUIElement, + css::ui::XUIElementSettings, + css::lang::XInitialization, + css::lang::XComponent, + css::util::XUpdatable, + css::ui::XUIConfigurationListener > UIConfigElementWrapperBase_BASE; class UIConfigElementWrapperBase : private cppu::BaseMutex, public ::cppu::OBroadcastHelper , @@ -67,62 +67,62 @@ class UIConfigElementWrapperBase : private cppu::BaseMutex, { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () override { OWeakObject::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override = 0; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUIElementSettings - virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateSettings() throw (css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSettings( const css::uno::Reference< css::container::XIndexAccess >& UISettings ) throw (css::uno::RuntimeException, std::exception) override; // XUIElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getResourceURL() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override = 0; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; // XUIConfigurationListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener using cppu::OPropertySetHelper::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; // protected methods protected: // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , - com::sun::star::uno::Any& aOldValue , + virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue , + css::uno::Any& aOldValue , sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) override; + const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) override; + const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) override; using cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue , sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; virtual void impl_fillNewData(); - static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); sal_Int16 m_nType; bool m_bPersistent : 1, @@ -132,11 +132,11 @@ class UIConfigElementWrapperBase : private cppu::BaseMutex, m_bDisposed : 1, m_bNoClose : 1; OUString m_aResourceURL; - com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xConfigSource; - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xConfigData; - com::sun::star::uno::WeakReference< com::sun::star::frame::XFrame > m_xWeakFrame; - com::sun::star::uno::Reference< com::sun::star::awt::XMenuBar > m_xMenuBar; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + css::uno::Reference< css::ui::XUIConfigurationManager > m_xConfigSource; + css::uno::Reference< css::container::XIndexAccess > m_xConfigData; + css::uno::WeakReference< css::frame::XFrame > m_xWeakFrame; + css::uno::Reference< css::awt::XMenuBar > m_xMenuBar; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener }; } // namespace framework diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index 89ef32ca9023..92473f891a90 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -39,10 +39,10 @@ namespace framework { typedef ::cppu::WeakImplHelper< - ::com::sun::star::ui::XUIElement, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::lang::XComponent, - ::com::sun::star::util::XUpdatable > UIElementWrapperBase_BASE; + css::ui::XUIElement, + css::lang::XInitialization, + css::lang::XComponent, + css::util::XUpdatable > UIElementWrapperBase_BASE; class UIElementWrapperBase : private cppu::BaseMutex, public ::cppu::OBroadcastHelper , @@ -61,53 +61,53 @@ class UIElementWrapperBase : private cppu::BaseMutex, { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () override { OWeakObject::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override = 0; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; // XUIElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getResourceURL() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override = 0; // protected methods protected: // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , - com::sun::star::uno::Any& aOldValue , + virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue , + css::uno::Any& aOldValue , sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) override; + const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) override; + const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) override; using cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue , sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; - static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener - OUString m_aResourceURL; - com::sun::star::uno::WeakReference< com::sun::star::frame::XFrame > m_xWeakFrame; - sal_Int16 m_nType; - bool m_bInitialized : 1, - m_bDisposed; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + OUString m_aResourceURL; + css::uno::WeakReference< css::frame::XFrame > m_xWeakFrame; + sal_Int16 m_nType; + bool m_bInitialized : 1, + m_bDisposed; }; } // namespace framework diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index 8076f978d7b5..6b9841d9109c 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -41,7 +41,7 @@ namespace framework{ @author as96863 */ -class HelpOnStartup : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,::com::sun::star::lang::XEventListener,::com::sun::star::task::XJob > +class HelpOnStartup : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::lang::XEventListener,css::task::XJob > { // member diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index 86b67b9dd1f0..89ebaa84520e 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -105,7 +105,7 @@ class JobResult public: JobResult( ); - JobResult( const com::sun::star::uno::Any& aResult ); + JobResult( const css::uno::Any& aResult ); JobResult( const JobResult& rCopy ); virtual ~JobResult( ); diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index a75cb4807c5c..aa54eaf60cc7 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -45,7 +45,7 @@ namespace framework{ @author as96863 */ -class ShellJob : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,::com::sun::star::task::XJob > +class ShellJob : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::task::XJob > { // member diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 836e09716d3f..44273cd192d9 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -64,9 +64,9 @@ ________________________________________________________________________________ ) \ { \ /* Define variables which are used in following macros. */ \ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xFactory; \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager; \ - xServiceManager = static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ); \ + css::uno::Reference< css::uno::XInterface > xFactory; \ + css::uno::Reference< css::lang::XMultiServiceFactory > xServiceManager; \ + xServiceManager = static_cast< css::lang::XMultiServiceFactory* >( pServiceManager ); \ /* These parameter will expand to */ \ /* "IF_NAME_CREATECOMPONENTFACTORY(a) */ \ /* else */ \ diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx index 041ead524b11..4adf324cbfcc 100644 --- a/framework/inc/macros/xinterface.hxx +++ b/framework/inc/macros/xinterface.hxx @@ -66,11 +66,11 @@ ________________________________________________________________________________ // implementation of XInterface::queryInterface() with max. 12 other interfaces! #define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE( CLASS, BASECLASS, INTERFACES ) \ - ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) \ + css::uno::Any SAL_CALL CLASS::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) \ { \ /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \ /* Ask for my own supported interfaces ... */ \ - ::com::sun::star::uno::Any aReturn ( ::cppu::queryInterface INTERFACES \ + css::uno::Any aReturn ( ::cppu::queryInterface INTERFACES \ ); \ /* If searched interface not supported by this class ... */ \ if ( !aReturn.hasValue() ) \ @@ -86,11 +86,11 @@ ________________________________________________________________________________ // implementation of XInterface::queryInterface() with more than 12 other interfaces! #define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) \ - ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) \ + css::uno::Any SAL_CALL CLASS::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) \ { \ /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \ /* Ask for my own supported interfaces ... */ \ - ::com::sun::star::uno::Any aReturn ( ::cppu::queryInterface INTERFACES_FIRST \ + css::uno::Any aReturn ( ::cppu::queryInterface INTERFACES_FIRST \ ); \ /* If searched interface not supported by first group ... */ \ if ( !aReturn.hasValue() ) \ @@ -189,7 +189,7 @@ ________________________________________________________________________________ // declaration of XInterface #define FWK_DECLARE_XINTERFACE \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; \ + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) override; \ virtual void SAL_CALL acquire ( ) throw() override; \ virtual void SAL_CALL release ( ) throw() override; diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx index 4f287281cff3..f977c6b323d0 100644 --- a/framework/inc/macros/xtypeprovider.hxx +++ b/framework/inc/macros/xtypeprovider.hxx @@ -53,7 +53,7 @@ ________________________________________________________________________________ // implementation of XTypeProvider::getImplementationId() #define PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CLASS::getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) \ + css::uno::Sequence< sal_Int8 > SAL_CALL CLASS::getImplementationId() throw( css::uno::RuntimeException, std::exception ) \ { \ return css::uno::Sequence<sal_Int8>(); \ } @@ -62,7 +62,7 @@ ________________________________________________________________________________ // implementation of XTypeProvider::getTypes() with max. 12 interfaces! #define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, TYPES ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) \ + css::uno::Sequence< css::uno::Type > SAL_CALL CLASS::getTypes() throw( css::uno::RuntimeException, std::exception ) \ { \ /* Optimize this method ! */ \ /* We initialize a static variable only one time. */ \ @@ -91,14 +91,14 @@ ________________________________________________________________________________ // implementation of XTypeProvider::getTypes() with more than 12 interfaces! #define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) \ + css::uno::Sequence< css::uno::Type > SAL_CALL CLASS::getTypes() throw( css::uno::RuntimeException, std::exception ) \ { \ /* Optimize this method ! */ \ /* We initialize a static variable only one time. */ \ /* And we don't must use a mutex at every call! */ \ /* For the first call; pTypeCollection is NULL - */ \ /* for the second call pTypeCollection is different from NULL! */ \ - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >* pTypeCollection = NULL; \ + static css::uno::Sequence< css::uno::Type >* pTypeCollection = NULL; \ if ( pTypeCollection == NULL ) \ { \ /* Ready for multithreading; get global mutex for first call of this method only! see before */ \ @@ -111,13 +111,13 @@ ________________________________________________________________________________ ::cppu::OTypeCollection aTypeCollection1 TYPES_FIRST; \ ::cppu::OTypeCollection aTypeCollection2 TYPES_SECOND; \ /* Copy all items from both sequences to one result list! */ \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes1 = aTypeCollection1.getTypes(); \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes2 = aTypeCollection2.getTypes(); \ - sal_Int32 nCount1 = seqTypes1.getLength(); \ - sal_Int32 nCount2 = seqTypes2.getLength(); \ - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqResult ( nCount1+nCount2 ); \ - sal_Int32 nSource = 0; \ - sal_Int32 nDestination= 0; \ + css::uno::Sequence< css::uno::Type > seqTypes1 = aTypeCollection1.getTypes(); \ + css::uno::Sequence< css::uno::Type > seqTypes2 = aTypeCollection2.getTypes(); \ + sal_Int32 nCount1 = seqTypes1.getLength(); \ + sal_Int32 nCount2 = seqTypes2.getLength(); \ + static css::uno::Sequence< css::uno::Type > seqResult ( nCount1+nCount2 ); \ + sal_Int32 nSource = 0; \ + sal_Int32 nDestination= 0; \ while( nSource<nCount1 ) \ { \ seqResult[nDestination] = seqTypes1[nSource]; \ @@ -203,8 +203,8 @@ ________________________________________________________________________________ // declaration of XTypeProvider #define FWK_DECLARE_XTYPEPROVIDER \ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes () throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;\ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw( css::uno::RuntimeException, std::exception ) override;\ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; // public // implementation of XTypeProvider diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index 16a1b3f354d9..0c3389b4f410 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -72,15 +72,15 @@ class DispatchRecorder virtual void SAL_CALL endRecording () throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getRecordedMacro () throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32) throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::WrappedTargetException, com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32) throw (css::uno::RuntimeException, css::lang::WrappedTargetException, css::lang::IndexOutOfBoundsException, std::exception) override; - virtual void SAL_CALL replaceByIndex(sal_Int32, const com::sun::star::uno::Any&) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex(sal_Int32, const css::uno::Any&) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // private functions private: diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index e73f0e686f69..6379e41f933f 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -131,10 +131,10 @@ class Desktop : private cppu::BaseMutex, { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () override { OWeakObject::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; /** @interface XDesktop diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx index 359798bba9d8..05f6dd19870b 100644 --- a/framework/inc/services/dispatchhelper.hxx +++ b/framework/inc/services/dispatchhelper.hxx @@ -45,7 +45,7 @@ namespace framework{ All these steps are done inside one method call here. */ -class DispatchHelper : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,::com::sun::star::frame::XDispatchHelper,::com::sun::star::frame::XDispatchResultListener > +class DispatchHelper : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::frame::XDispatchHelper,css::frame::XDispatchResultListener > { // member diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 11ff3d30c543..767186d1c032 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -67,9 +67,9 @@ namespace framework { class InfoHelperBuilder; } - typedef ::cppu::WeakImplHelper < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::frame::XLayoutManager2 - , ::com::sun::star::awt::XWindowListener + typedef ::cppu::WeakImplHelper < css::lang::XServiceInfo + , css::frame::XLayoutManager2 + , css::awt::XWindowListener > LayoutManager_Base; typedef ::comphelper::OPropertyContainer LayoutManager_PBase; class LayoutManager : public LayoutManager_Base , @@ -86,7 +86,7 @@ namespace framework }; enum { DOCKINGAREAS_COUNT = 4 }; - LayoutManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + LayoutManager( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~LayoutManager(); /** declaration of XInterface, XTypeProvider, XServiceInfo */ @@ -113,43 +113,43 @@ namespace framework } // XLayoutManager - virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCurrentDockingArea( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor > SAL_CALL getDockingAreaAcceptor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDockingAreaAcceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor >& xDockingAreaAcceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL createElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL destroyElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL requestElement( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL getElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > > SAL_CALL getElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL showElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hideElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dockWindow( const OUString& aName, ::com::sun::star::ui::DockingArea DockingArea, const ::com::sun::star::awt::Point& Pos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dockAllWindows( ::sal_Int16 nElementType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL floatWindow( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL lockWindow( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL unlockWindow( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setElementSize( const OUString& aName, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setElementPos( const OUString& aName, const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setElementPosSize( const OUString& aName, const ::com::sun::star::awt::Point& aPos, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isElementVisible( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isElementFloating( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isElementDocked( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isElementLocked( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getElementSize( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getElementPos( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL doLayout( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isVisible() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getCurrentDockingArea( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::ui::XDockingAreaAcceptor > SAL_CALL getDockingAreaAcceptor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDockingAreaAcceptor( const css::uno::Reference< css::ui::XDockingAreaAcceptor >& xDockingAreaAcceptor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL createElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL destroyElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL requestElement( const OUString& ResourceURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL getElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::ui::XUIElement > > SAL_CALL getElements( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL showElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hideElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL dockWindow( const OUString& aName, css::ui::DockingArea DockingArea, const css::awt::Point& Pos ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL dockAllWindows( ::sal_Int16 nElementType ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL floatWindow( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL lockWindow( const OUString& ResourceURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL unlockWindow( const OUString& ResourceURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setElementSize( const OUString& aName, const css::awt::Size& aSize ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setElementPos( const OUString& aName, const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setElementPosSize( const OUString& aName, const css::awt::Point& aPos, const css::awt::Size& aSize ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isElementVisible( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isElementFloating( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isElementDocked( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isElementLocked( const OUString& ResourceURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getElementSize( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getElementPos( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lock( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unlock( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doLayout( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isVisible() throw (css::uno::RuntimeException, std::exception) override; // XMenuBarMergingAcceptor - virtual sal_Bool SAL_CALL setMergedMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xMergedMenuBar ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMergedMenuBar( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setMergedMenuBar( const css::uno::Reference< css::container::XIndexAccess >& xMergedMenuBar ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeMergedMenuBar( ) throw (css::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; @@ -165,13 +165,13 @@ namespace framework virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; // XUIConfigurationListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; // XLayoutManagerEventBroadcaster - virtual void SAL_CALL addLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addLayoutManagerEventListener( const css::uno::Reference< css::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeLayoutManagerEventListener( const css::uno::Reference< css::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (css::uno::RuntimeException, std::exception) override; DECL_LINK_TYPED( MenuBarClose, void *, void); DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); @@ -206,24 +206,24 @@ namespace framework // query - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const OUString& aName ); + css::uno::Reference< css::ui::XUIElement > implts_findElement( const OUString& aName ); bool implts_readWindowStateData( const OUString& rName, UIElement& rElementData ); void implts_writeWindowStateData( const OUString& rName, const UIElement& rElementData ); void implts_destroyElements(); void implts_toggleFloatingUIElementsVisibility( bool bActive ); void implts_reparentChildWindows(); - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createDockingWindow( const OUString& aElementName ); + css::uno::Reference< css::ui::XUIElement > implts_createDockingWindow( const OUString& aElementName ); bool implts_isEmbeddedLayoutManager() const; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createElement( const OUString& aName ); + css::uno::Reference< css::ui::XUIElement > implts_createElement( const OUString& aName ); // layouting methods - bool implts_resizeContainerWindow( const ::com::sun::star::awt::Size& rContainerSize, const ::com::sun::star::awt::Point& rComponentPos ); + bool implts_resizeContainerWindow( const css::awt::Size& rContainerSize, const css::awt::Point& rComponentPos ); ::Size implts_getContainerWindowOutputSize(); void implts_setDockingAreaWindowSizes( const css::awt::Rectangle& rBorderSpace ); - ::com::sun::star::awt::Rectangle implts_calcDockingAreaSizes(); + css::awt::Rectangle implts_calcDockingAreaSizes(); bool implts_doLayout( bool bForceRequestBorderSpace, bool bOuterResize ); void implts_doLayout_notify( bool bOuterResize ); @@ -243,10 +243,10 @@ namespace framework void implts_setOffset( const sal_Int32 nBottomOffset ); void implts_setInplaceMenuBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xMergedMenuBar ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + const css::uno::Reference< css::container::XIndexAccess >& xMergedMenuBar ) + throw (css::uno::RuntimeException, std::exception); void implts_resetInplaceMenuBar() - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); void implts_setVisibleState( bool bShow ); void implts_updateUIElementsVisibleState( bool bShow ); @@ -255,59 +255,59 @@ namespace framework // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , - com::sun::star::uno::Any& aOldValue , + virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue , + css::uno::Any& aOldValue , sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) override; + const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) override; + const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) override; using cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue , sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - css::uno::Reference< css::uno::XComponentContext > m_xContext; /** reference to factory, which has created this instance. */ - css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; - css::uno::Reference< css::frame::XFrame > m_xFrame; - css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xModuleCfgMgr; - css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xDocCfgMgr; - css::uno::WeakReference< css::frame::XModel > m_xModel; - css::uno::Reference< css::awt::XWindow > m_xContainerWindow; - css::uno::Reference< css::awt::XTopWindow2 > m_xContainerTopWindow; - sal_Int32 m_nLockCount; - bool m_bActive; - bool m_bInplaceMenuSet; - bool m_bMenuVisible; - bool m_bComponentAttached; - bool m_bDoLayout; - bool m_bVisible; - bool m_bParentWindowVisible; - bool m_bMustDoLayout; - bool m_bAutomaticToolbars; - bool m_bStoreWindowState; - bool m_bHideCurrentUI; - bool m_bGlobalSettings; - bool m_bPreserveContentSize; - bool m_bMenuBarCloseButton; - css::awt::Rectangle m_aDockingArea; - css::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor > m_xDockingAreaAcceptor; - css::uno::Reference< ::com::sun::star::lang::XComponent > m_xInplaceMenuBar; - MenuBarManager* m_pInplaceMenuBar; - css::uno::Reference< ::com::sun::star::ui::XUIElement > m_xMenuBar; - UIElement m_aStatusBarElement; - UIElement m_aProgressBarElement; - com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > m_xProgressBarBackup; - css::uno::Reference< ::com::sun::star::frame::XModuleManager2 > m_xModuleManager; - css::uno::Reference< ::com::sun::star::ui::XUIElementFactoryManager > m_xUIElementFactoryManager; - css::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; - css::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowStateSupplier; - GlobalSettings* m_pGlobalSettings; - OUString m_aModuleIdentifier; - Timer m_aAsyncLayoutTimer; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; // container for ALL Listener - ToolbarLayoutManager* m_pToolbarManager; - css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener > m_xToolbarManager; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; + + css::uno::Reference< css::uno::XComponentContext > m_xContext; /** reference to factory, which has created this instance. */ + css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; + css::uno::Reference< css::frame::XFrame > m_xFrame; + css::uno::Reference< css::ui::XUIConfigurationManager > m_xModuleCfgMgr; + css::uno::Reference< css::ui::XUIConfigurationManager > m_xDocCfgMgr; + css::uno::WeakReference< css::frame::XModel > m_xModel; + css::uno::Reference< css::awt::XWindow > m_xContainerWindow; + css::uno::Reference< css::awt::XTopWindow2 > m_xContainerTopWindow; + sal_Int32 m_nLockCount; + bool m_bActive; + bool m_bInplaceMenuSet; + bool m_bMenuVisible; + bool m_bComponentAttached; + bool m_bDoLayout; + bool m_bVisible; + bool m_bParentWindowVisible; + bool m_bMustDoLayout; + bool m_bAutomaticToolbars; + bool m_bStoreWindowState; + bool m_bHideCurrentUI; + bool m_bGlobalSettings; + bool m_bPreserveContentSize; + bool m_bMenuBarCloseButton; + css::awt::Rectangle m_aDockingArea; + css::uno::Reference< css::ui::XDockingAreaAcceptor > m_xDockingAreaAcceptor; + css::uno::Reference< css::lang::XComponent > m_xInplaceMenuBar; + MenuBarManager* m_pInplaceMenuBar; + css::uno::Reference< css::ui::XUIElement > m_xMenuBar; + UIElement m_aStatusBarElement; + UIElement m_aProgressBarElement; + css::uno::Reference< css::ui::XUIElement > m_xProgressBarBackup; + css::uno::Reference< css::frame::XModuleManager2 > m_xModuleManager; + css::uno::Reference< css::ui::XUIElementFactoryManager > m_xUIElementFactoryManager; + css::uno::Reference< css::container::XNameAccess > m_xPersistentWindowState; + css::uno::Reference< css::container::XNameAccess > m_xPersistentWindowStateSupplier; + GlobalSettings* m_pGlobalSettings; + OUString m_aModuleIdentifier; + Timer m_aAsyncLayoutTimer; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; // container for ALL Listener + ToolbarLayoutManager* m_pToolbarManager; + css::uno::Reference< css::ui::XUIConfigurationListener > m_xToolbarManager; friend class detail::InfoHelperBuilder; }; diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index c3fa74350cc9..da705be1efba 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -44,7 +44,7 @@ namespace framework{ @devstatus deprecated *//*-*************************************************************************************************************/ -class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper< ::com::sun::star::util::XStringMapping, css::lang::XServiceInfo> +class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper< css::util::XStringMapping, css::lang::XServiceInfo> { // public methods diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx index ea30bfe80ecb..999728c95a2d 100644 --- a/framework/inc/services/uriabbreviation.hxx +++ b/framework/inc/services/uriabbreviation.hxx @@ -34,15 +34,15 @@ namespace framework { -class UriAbbreviation: public ::cppu::WeakImplHelper< ::com::sun::star::util::XStringAbbreviation, css::lang::XServiceInfo> +class UriAbbreviation: public ::cppu::WeakImplHelper< css::util::XStringAbbreviation, css::lang::XServiceInfo> { public: - explicit UriAbbreviation(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); + explicit UriAbbreviation(css::uno::Reference< css::uno::XComponentContext > const & context); DECLARE_XSERVICEINFO - // ::com::sun::star::util::XStringAbbreviation: - virtual OUString SAL_CALL abbreviateString(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::util::XStringAbbreviation: + virtual OUString SAL_CALL abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (css::uno::RuntimeException, std::exception) override; private: UriAbbreviation(UriAbbreviation &) = delete; @@ -50,7 +50,7 @@ private: virtual ~UriAbbreviation() {} - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; }; } // namespace framework diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index 16b410c51f46..8ad8a4731391 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -48,20 +48,20 @@ namespace framework { -class TabWindow : public ::com::sun::star::lang::XTypeProvider , - public ::com::sun::star::lang::XServiceInfo , - public ::com::sun::star::lang::XInitialization , - public ::com::sun::star::lang::XComponent , - public ::com::sun::star::awt::XWindowListener , - public ::com::sun::star::awt::XTopWindowListener , - public ::com::sun::star::awt::XSimpleTabController , +class TabWindow : public css::lang::XTypeProvider , + public css::lang::XServiceInfo , + public css::lang::XInitialization , + public css::lang::XComponent , + public css::awt::XWindowListener , + public css::awt::XTopWindowListener , + public css::awt::XSimpleTabController , private cppu::BaseMutex, public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper , // => XPropertySet / XFastPropertySet / XMultiPropertySet public ::cppu::OWeakObject { public: - TabWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + TabWindow( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~TabWindow(); // XInterface, XTypeProvider, XServiceInfo @@ -73,34 +73,34 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , using ::cppu::OPropertySetHelper::getFastPropertyValue; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XSimpleTabController - virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getActiveTabID( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL insertTab() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getActiveTabID( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; // XTopWindowListener - virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; @@ -116,18 +116,18 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue , - com::sun::star::uno::Any& aOldValue , + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue , + css::uno::Any& aOldValue , sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) override; + const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) override; - virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , + const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) override; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue , sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; - static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); private: enum Notification @@ -141,22 +141,22 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , void implts_LayoutWindows() const; void impl_SetTitle( const OUString& rTitle ); - TabControl* impl_GetTabControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xTabControlWindow ) const; + TabControl* impl_GetTabControl( const css::uno::Reference< css::awt::XWindow >& xTabControlWindow ) const; void implts_SendNotification( Notification eNotify, sal_Int32 ID ) const; - void implts_SendNotification( Notification eNotify, sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rSeq ) const; + void implts_SendNotification( Notification eNotify, sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& rSeq ) const; typedef std::vector< sal_uInt16 > PageIdVector; - bool m_bInitialized : 1, - m_bDisposed : 1; - sal_Int32 m_nNextTabID; - OUString m_aTitlePropName; - OUString m_aPosPropName; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindow > m_xTopWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xContainerWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xTabControlWindow; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; // container for ALL Listener + bool m_bInitialized : 1, + m_bDisposed : 1; + sal_Int32 m_nNextTabID; + OUString m_aTitlePropName; + OUString m_aPosPropName; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::awt::XTopWindow > m_xTopWindow; + css::uno::Reference< css::awt::XWindow > m_xContainerWindow; + css::uno::Reference< css::awt::XWindow > m_xTabControlWindow; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; // container for ALL Listener }; } diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx index 3d1cab80cc2c..d0410707cc05 100644 --- a/framework/inc/tabwin/tabwinfactory.hxx +++ b/framework/inc/tabwin/tabwinfactory.hxx @@ -40,22 +40,22 @@ namespace framework { -class TabWinFactory : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XSingleComponentFactory, com::sun::star::lang::XServiceInfo> +class TabWinFactory : public ::cppu::WeakImplHelper< css::lang::XSingleComponentFactory, css::lang::XServiceInfo> { public: - TabWinFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + TabWinFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~TabWinFactory(); // XInterface, XTypeProvider, XServiceInfo DECLARE_XSERVICEINFO // XSingleComponentFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit2 > m_xToolkit; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::awt::XToolkit2 > m_xToolkit; }; } diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx index 9bddcce46d87..5ea735599771 100644 --- a/framework/inc/uiconfiguration/globalsettings.hxx +++ b/framework/inc/uiconfiguration/globalsettings.hxx @@ -42,7 +42,7 @@ namespace framework class GlobalSettings { public: - GlobalSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + GlobalSettings( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); ~GlobalSettings(); enum UIElementType @@ -60,13 +60,13 @@ class GlobalSettings // settings access bool HasStatesInfo( UIElementType eElementType ); - bool GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ); + bool GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, css::uno::Any& aValue ); private: GlobalSettings(const GlobalSettings&) = delete; GlobalSettings& operator=(const GlobalSettings& ) = delete; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; }; } // namespace framework diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx index 24b46923b8ee..b299b8493015 100644 --- a/framework/inc/uiconfiguration/graphicnameaccess.hxx +++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx @@ -28,33 +28,33 @@ namespace framework { - class GraphicNameAccess : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess > + class GraphicNameAccess : public ::cppu::WeakImplHelper< css::container::XNameAccess > { public: GraphicNameAccess(); virtual ~GraphicNameAccess(); - void addElement( const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rElement ); + void addElement( const OUString& rName, const css::uno::Reference< css::graphic::XGraphic >& rElement ); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess virtual sal_Bool SAL_CALL hasElements() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) + throw(css::uno::RuntimeException, std::exception) override; private: - typedef BaseHash< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > NameGraphicHashMap; - NameGraphicHashMap m_aNameToElementMap; - ::com::sun::star::uno::Sequence< OUString > m_aSeq; + typedef BaseHash< css::uno::Reference< css::graphic::XGraphic > > NameGraphicHashMap; + NameGraphicHashMap m_aNameToElementMap; + css::uno::Sequence< OUString > m_aSeq; }; } diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx index 71666cb7ab05..fba820963309 100644 --- a/framework/inc/uiconfiguration/imagemanager.hxx +++ b/framework/inc/uiconfiguration/imagemanager.hxx @@ -48,10 +48,10 @@ namespace framework { class ImageManagerImpl; - class ImageManager : public ::cppu::WeakImplHelper< ::com::sun::star::ui::XImageManager, css::lang::XServiceInfo> + class ImageManager : public ::cppu::WeakImplHelper< css::ui::XImageManager, css::lang::XServiceInfo> { public: - ImageManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + ImageManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ImageManager(); virtual OUString SAL_CALL getImplementationName() @@ -75,38 +75,38 @@ namespace framework } // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XImageManager virtual void SAL_CALL reset() throw (css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; // XUIConfiguration - virtual void SAL_CALL addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; // XUIConfigurationPersistence - virtual void SAL_CALL reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isModified() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override; // Non-UNO methods - void setStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException); + void setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::RuntimeException); private: ::std::unique_ptr<ImageManagerImpl> m_pImpl; diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx index 4badb2a26842..a16fe6f9ec1b 100644 --- a/framework/inc/uiconfiguration/moduleimagemanager.hxx +++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx @@ -53,42 +53,42 @@ namespace framework { class ImageManagerImpl; - class ModuleImageManager : public ::cppu::WeakImplHelper< ::com::sun::star::ui::XImageManager> + class ModuleImageManager : public ::cppu::WeakImplHelper< css::ui::XImageManager> { public: - ModuleImageManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + ModuleImageManager( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~ModuleImageManager(); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XImageManager virtual void SAL_CALL reset() throw (css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; // XUIConfiguration - virtual void SAL_CALL addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; // XUIConfigurationPersistence - virtual void SAL_CALL reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isModified() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override; private: ::std::unique_ptr<ImageManagerImpl> m_pImpl; diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index 930f9fd10e30..b10a2fd8b5a4 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -44,18 +44,18 @@ namespace framework class AddonsToolBarManager : public ToolBarManager { public: - AddonsToolBarManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + AddonsToolBarManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceName, ToolBox* pToolBar ); virtual ~AddonsToolBarManager(); // XComponent - void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; virtual void RefreshImages() override; using ToolBarManager::FillToolbar; - void FillToolbar( const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rAddonToolbar ); + void FillToolbar( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rAddonToolbar ); protected: DECL_LINK_TYPED(Click, ToolBox *, void); diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx index f3278d7df64d..6fb3c625a89e 100644 --- a/framework/inc/uielement/addonstoolbarwrapper.hxx +++ b/framework/inc/uielement/addonstoolbarwrapper.hxx @@ -33,26 +33,26 @@ class AddonsToolBarManager; class AddonsToolBarWrapper : public UIElementWrapperBase { public: - AddonsToolBarWrapper( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + AddonsToolBarWrapper( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~AddonsToolBarWrapper(); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUIElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override; // cf. ToolbarLayoutManager void populateImages(); private: - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xToolBarManager; - com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aConfigData; - bool m_bCreatedImages; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::lang::XComponent > m_xToolBarManager; + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > m_aConfigData; + bool m_bCreatedImages; }; } diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx index 51939ecafa17..01ffc853d27f 100644 --- a/framework/inc/uielement/buttontoolbarcontroller.hxx +++ b/framework/inc/uielement/buttontoolbarcontroller.hxx @@ -41,57 +41,57 @@ class ToolBox; namespace framework { -class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener, - public ::com::sun::star::frame::XToolbarController, - public ::com::sun::star::lang::XInitialization, - public ::com::sun::star::util::XUpdatable, - public ::com::sun::star::lang::XComponent, +class ButtonToolbarController : public css::frame::XStatusListener, + public css::frame::XToolbarController, + public css::lang::XInitialization, + public css::util::XUpdatable, + public css::lang::XComponent, public ::comphelper::OBaseMutex, public ::cppu::OWeakObject { public: - ButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, + ButtonToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ToolBox* pToolBar, const OUString& aCommand ); virtual ~ButtonToolbarController(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override; private: - bool m_bInitialized : 1, - m_bDisposed : 1; - OUString m_aCommandURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - VclPtr<ToolBox> m_pToolbar; + bool m_bInitialized : 1, + m_bDisposed : 1; + OUString m_aCommandURL; + css::uno::Reference< css::frame::XFrame > m_xFrame; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; + VclPtr<ToolBox> m_pToolbar; }; } diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx index bd1e47e19a90..a96e3bed8544 100644 --- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx @@ -37,8 +37,8 @@ class ComboboxToolbarController : public ComplexToolbarController { public: - ComboboxToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + ComboboxToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, sal_Int32 nWidth, @@ -46,7 +46,7 @@ class ComboboxToolbarController : public ComplexToolbarController virtual ~ComboboxToolbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; // called from ComboBoxControl void Select(); @@ -58,8 +58,8 @@ class ComboboxToolbarController : public ComplexToolbarController bool PreNotify( NotifyEvent& rNEvt ); protected: - virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override; + virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override; + virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override; private: VclPtr<ComboBoxControl> m_pComboBox; diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx index d3cb57323cc5..dbf62d229c70 100644 --- a/framework/inc/uielement/complextoolbarcontroller.hxx +++ b/framework/inc/uielement/complextoolbarcontroller.hxx @@ -38,61 +38,61 @@ namespace framework struct ExecuteInfo { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; - ::com::sun::star::util::URL aTargetURL; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + css::uno::Reference< css::frame::XDispatch > xDispatch; + css::util::URL aTargetURL; + css::uno::Sequence< css::beans::PropertyValue > aArgs; }; struct NotifyInfo { - OUString aEventName; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XControlNotificationListener > xNotifyListener; - ::com::sun::star::util::URL aSourceURL; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > aInfoSeq; + OUString aEventName; + css::uno::Reference< css::frame::XControlNotificationListener > xNotifyListener; + css::util::URL aSourceURL; + css::uno::Sequence< css::beans::NamedValue > aInfoSeq; }; class ComplexToolbarController : public svt::ToolboxController { public: - ComplexToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + ComplexToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand ); virtual ~ComplexToolbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; DECL_STATIC_LINK_TYPED( ComplexToolbarController, ExecuteHdl_Impl, void*, void ); DECL_STATIC_LINK_TYPED( ComplexToolbarController, Notify_Impl, void*, void); protected: static sal_Int32 getFontSizePixel( const vcl::Window* pWindow ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommand( const OUString& aCommand ) const; + css::uno::Reference< css::frame::XDispatch > getDispatchFromCommand( const OUString& aCommand ) const; void addNotifyInfo( const OUString& aEventName, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& xDispatch, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rInfo ); + const css::uno::Reference< css::frame::XDispatch >& xDispatch, + const css::uno::Sequence< css::beans::NamedValue >& rInfo ); - virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) = 0; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const; - const ::com::sun::star::util::URL& getInitializedURL(); + virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) = 0; + virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const; + const css::util::URL& getInitializedURL(); void notifyFocusGet(); void notifyFocusLost(); void notifyTextChanged( const OUString& aText ); - VclPtr<ToolBox> m_pToolbar; - sal_uInt16 m_nID; - bool m_bMadeInvisible; - mutable ::com::sun::star::util::URL m_aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; + VclPtr<ToolBox> m_pToolbar; + sal_uInt16 m_nID; + bool m_bMadeInvisible; + mutable css::util::URL m_aURL; + css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; }; } diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index cb44522f1621..97c9555036d9 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -56,54 +56,54 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper< public: ConstItemContainer(); ConstItemContainer( const ItemContainer& rtemContainer ); - ConstItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSourceContainer, bool bFastCopy = false ); + ConstItemContainer( const css::uno::Reference< css::container::XIndexAccess >& rSourceContainer, bool bFastCopy = false ); virtual ~ConstItemContainer(); // XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static ConstItemContainer* 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, std::exception) override; + static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static ConstItemContainer* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override { - return cppu::UnoType<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >>::get(); + return cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(); } virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; private: ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); - static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties ); + const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); + static css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties ); - void copyItemContainer( const std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rSourceVector ); - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer ); + void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector ); + css::uno::Reference< css::container::XIndexAccess > deepCopyContainer( const css::uno::Reference< css::container::XIndexAccess >& rSubContainer ); - std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector; - OUString m_aUIName; + std::vector< css::uno::Sequence< css::beans::PropertyValue > > m_aItemVector; + OUString m_aUIName; }; } diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx index adf27d7fa15a..e661d7974128 100644 --- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx @@ -39,8 +39,8 @@ class DropdownToolbarController : public ComplexToolbarController { public: - DropdownToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + DropdownToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, sal_Int32 nWidth, @@ -48,7 +48,7 @@ class DropdownToolbarController : public ComplexToolbarController virtual ~DropdownToolbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; // called from ListBoxControl void Select(); @@ -58,8 +58,8 @@ class DropdownToolbarController : public ComplexToolbarController bool PreNotify( NotifyEvent& rNEvt ); protected: - virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override; + virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override; + virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override; private: VclPtr<ListBoxControl> m_pListBoxControl; diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index 9cc382d35bf7..dba12c1aeab0 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -38,8 +38,8 @@ class EditToolbarController : public ComplexToolbarController { public: - EditToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + EditToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, sal_Int32 nWidth, @@ -47,7 +47,7 @@ class EditToolbarController : public ComplexToolbarController virtual ~EditToolbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; // called from EditControl void Modify(); @@ -57,8 +57,8 @@ class EditToolbarController : public ComplexToolbarController bool PreNotify( NotifyEvent& rNEvt ); protected: - virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override; + virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override; + virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override; private: VclPtr<EditControl> m_pEditControl; diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx index de646245e72a..0fe79589bc71 100644 --- a/framework/inc/uielement/fontmenucontroller.hxx +++ b/framework/inc/uielement/fontmenucontroller.hxx @@ -44,30 +44,30 @@ namespace framework using svt::PopupMenuControllerBase::disposing; public: - FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + FontMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~FontMenuController(); // XServiceInfo DECLARE_XSERVICEINFO // XPopupMenuController - virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XMenuListener - virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; private: virtual void impl_setPopupMenu() override; - void fillPopupMenu( const com::sun::star::uno::Sequence< OUString >& rFontNameSeq, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); + void fillPopupMenu( const css::uno::Sequence< OUString >& rFontNameSeq, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); - OUString m_aFontFamilyName; - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xFontListDispatch; + OUString m_aFontFamilyName; + css::uno::Reference< css::frame::XDispatch > m_xFontListDispatch; }; } diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx index 98f97f5aac76..fdbd716153f3 100644 --- a/framework/inc/uielement/fontsizemenucontroller.hxx +++ b/framework/inc/uielement/fontsizemenucontroller.hxx @@ -45,31 +45,31 @@ namespace framework using svt::PopupMenuControllerBase::disposing; public: - FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + FontSizeMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~FontSizeMenuController(); // XServiceInfo DECLARE_XSERVICEINFO // XPopupMenuController - virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; private: virtual void impl_setPopupMenu() override; - void setCurHeight( long nHeight, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); - void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); - OUString retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); + void setCurHeight( long nHeight, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); + void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); + OUString retrievePrinterName( css::uno::Reference< css::frame::XFrame >& rFrame ); - long* m_pHeightArray; - com::sun::star::awt::FontDescriptor m_aFontDescriptor; - ::com::sun::star::frame::status::FontHeight m_aFontHeight; - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xCurrentFontDispatch; + long* m_pHeightArray; + css::awt::FontDescriptor m_aFontDescriptor; + css::frame::status::FontHeight m_aFontHeight; + css::uno::Reference< css::frame::XDispatch > m_xCurrentFontDispatch; }; } diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx index 039d1361ae0c..afd61f7cdf2f 100644 --- a/framework/inc/uielement/footermenucontroller.hxx +++ b/framework/inc/uielement/footermenucontroller.hxx @@ -27,7 +27,7 @@ namespace framework class FooterMenuController : public HeaderMenuController { public: - FooterMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + FooterMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~FooterMenuController(); // XServiceInfo diff --git a/framework/inc/uielement/genericstatusbarcontroller.hxx b/framework/inc/uielement/genericstatusbarcontroller.hxx index af1b80119a5a..abb5702cb6b4 100644 --- a/framework/inc/uielement/genericstatusbarcontroller.hxx +++ b/framework/inc/uielement/genericstatusbarcontroller.hxx @@ -31,26 +31,26 @@ struct AddonStatusbarItemData; class GenericStatusbarController : public svt::StatusbarController { public: - GenericStatusbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - const com::sun::star::uno::Reference< com::sun::star::ui::XStatusbarItem >& rxItem, + GenericStatusbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, + const css::uno::Reference< css::ui::XStatusbarItem >& rxItem, AddonStatusbarItemData *pItemData ); virtual ~GenericStatusbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL paint( const css::uno::Reference< css::awt::XGraphics >& xGraphics, + const css::awt::Rectangle& rOutputRectangle, + ::sal_Int32 nStyle ) throw (css::uno::RuntimeException, std::exception) override; protected: - bool m_bEnabled; - bool m_bOwnerDraw; - AddonStatusbarItemData *m_pItemData; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > m_xGraphic; + bool m_bEnabled; + bool m_bOwnerDraw; + AddonStatusbarItemData* m_pItemData; + css::uno::Reference< css::graphic::XGraphic > m_xGraphic; }; } diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index a9bd37fbe284..016c5920d52f 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -35,21 +35,21 @@ struct ExecuteInfo; class GenericToolbarController : public svt::ToolboxController { public: - GenericToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + GenericToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand ); virtual ~GenericToolbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; DECL_STATIC_LINK_TYPED( GenericToolbarController, ExecuteHdl_Impl, void*, void ); @@ -63,23 +63,23 @@ class GenericToolbarController : public svt::ToolboxController class MenuToolbarController : public GenericToolbarController { - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xMenuDesc; - PopupMenu* pMenu; - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuManager; - OUString m_aModuleIdentifier; + css::uno::Reference< css::container::XIndexAccess > m_xMenuDesc; + PopupMenu* pMenu; + css::uno::Reference< css::lang::XComponent > m_xMenuManager; + OUString m_aModuleIdentifier; public: - MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + MenuToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand, const OUString& aModuleIdentifier, - const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc ); + const css::uno::Reference< css::container::XIndexAccess >& xMenuDesc ); virtual ~MenuToolbarController(); // XToolbarController - virtual void SAL_CALL click() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click() throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx index a948a2724c5f..6a7295489e71 100644 --- a/framework/inc/uielement/headermenucontroller.hxx +++ b/framework/inc/uielement/headermenucontroller.hxx @@ -46,26 +46,26 @@ namespace framework using svt::PopupMenuControllerBase::disposing; public: - HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, bool _bFooter = false ); + HeaderMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext, bool _bFooter = false ); virtual ~HeaderMenuController(); // XServiceInfo DECLARE_XSERVICEINFO // XPopupMenuController - virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; private: - void fillPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); + void fillPopupMenu( const css::uno::Reference< css::frame::XModel >& rModel, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - bool m_bFooter; + css::uno::Reference< css::frame::XModel > m_xModel; + bool m_bFooter; }; } diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx index f9be5b006a2a..04aa0f94410a 100644 --- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx @@ -36,18 +36,18 @@ class ImageButtonToolbarController : public ComplexToolbarController { public: - ImageButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + ImageButtonToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand ); virtual ~ImageButtonToolbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; protected: - virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) override; + virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override; private: bool ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage ); diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx index 804702ff030b..924b3237558f 100644 --- a/framework/inc/uielement/itemcontainer.hxx +++ b/framework/inc/uielement/itemcontainer.hxx @@ -38,57 +38,57 @@ namespace framework { class ConstItemContainer; -class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper< ::com::sun::star::container::XIndexContainer> +class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper< css::container::XIndexContainer> { friend class ConstItemContainer; public: ItemContainer( const ShareableMutex& ); ItemContainer( const ConstItemContainer& rConstItemContainer, const ShareableMutex& rMutex ); - ItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer, const ShareableMutex& rMutex ); + ItemContainer( const css::uno::Reference< css::container::XIndexAccess >& rItemAccessContainer, const ShareableMutex& rMutex ); virtual ~ItemContainer(); // XInterface, XTypeProvider // XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static ItemContainer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static ItemContainer* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw(); // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) + throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) + throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override { - return cppu::UnoType<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >>::get(); + return cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(); } virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: ItemContainer(); - void copyItemContainer( const std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rSourceVector, const ShareableMutex& rMutex ); - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer, const ShareableMutex& rMutex ); + void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector, const ShareableMutex& rMutex ); + css::uno::Reference< css::container::XIndexAccess > deepCopyContainer( const css::uno::Reference< css::container::XIndexAccess >& rSubContainer, const ShareableMutex& rMutex ); mutable ShareableMutex m_aShareMutex; - std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector; + std::vector< css::uno::Sequence< css::beans::PropertyValue > > m_aItemVector; }; } diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx index 8a73bd6a5dee..94f9c6ce80eb 100644 --- a/framework/inc/uielement/langselectionmenucontroller.hxx +++ b/framework/inc/uielement/langselectionmenucontroller.hxx @@ -47,23 +47,23 @@ namespace framework using svt::PopupMenuControllerBase::disposing; public: - LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + LanguageSelectionMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~LanguageSelectionMenuController(); // XServiceInfo DECLARE_XSERVICEINFO // XPopupMenuController - virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; private: virtual void impl_setPopupMenu() override; @@ -74,22 +74,22 @@ namespace framework MODE_SetLanguageAllTextMenu }; - bool m_bShowMenu; - OUString m_aLangStatusCommandURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xLanguageDispatch; - OUString m_aMenuCommandURL_Lang; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_Lang; - OUString m_aMenuCommandURL_Font; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_Font; - OUString m_aMenuCommandURL_CharDlgForParagraph; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_CharDlgForParagraph; - OUString m_aCurLang; - SvtScriptType m_nScriptType; - OUString m_aKeyboardLang; - OUString m_aGuessedTextLang; - LanguageGuessingHelper m_aLangGuessHelper; - - void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const Mode rMode ); + bool m_bShowMenu; + OUString m_aLangStatusCommandURL; + css::uno::Reference< css::frame::XDispatch > m_xLanguageDispatch; + OUString m_aMenuCommandURL_Lang; + css::uno::Reference< css::frame::XDispatch > m_xMenuDispatch_Lang; + OUString m_aMenuCommandURL_Font; + css::uno::Reference< css::frame::XDispatch > m_xMenuDispatch_Font; + OUString m_aMenuCommandURL_CharDlgForParagraph; + css::uno::Reference< css::frame::XDispatch > m_xMenuDispatch_CharDlgForParagraph; + OUString m_aCurLang; + SvtScriptType m_nScriptType; + OUString m_aKeyboardLang; + OUString m_aGuessedTextLang; + LanguageGuessingHelper m_aLangGuessHelper; + + void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu, const Mode rMode ); }; } diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index 08e4fa493f5a..a46c822e898d 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -46,30 +46,30 @@ namespace framework struct ExecuteInfo { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; - ::com::sun::star::util::URL aTargetURL; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + css::uno::Reference< css::frame::XDispatch > xDispatch; + css::util::URL aTargetURL; + css::uno::Sequence< css::beans::PropertyValue > aArgs; }; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider; - OUString m_aModuleIdentifier; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchProvider; + OUString m_aModuleIdentifier; + css::uno::Reference< css::container::XNameAccess > m_xUICommandLabels; public: - MacrosMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + MacrosMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~MacrosMenuController(); // XServiceInfo DECLARE_XSERVICEINFO // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; private: - void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); + void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); OUString RetrieveLabelFromCommand(const OUString& rCmdURL); void addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId ); }; diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 25f197544f47..b7e37d2cad62 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -61,7 +61,7 @@ namespace framework struct PopupControllerEntry { - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider; + css::uno::WeakReference< css::frame::XDispatchProvider > m_xDispatchProvider; }; typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash, std::equal_to< OUString > > PopupControllerCache; @@ -69,18 +69,18 @@ typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash, std::e class BmkMenu; class AddonMenu; class AddonPopupMenu; -class MenuBarManager : public com::sun::star::frame::XStatusListener , - public com::sun::star::frame::XFrameActionListener , - public com::sun::star::ui::XUIConfigurationListener , - public com::sun::star::lang::XComponent , - public com::sun::star::awt::XSystemDependentMenuPeer , +class MenuBarManager : public css::frame::XStatusListener , + public css::frame::XFrameActionListener , + public css::ui::XUIConfigurationListener , + public css::lang::XComponent , + public css::awt::XSystemDependentMenuPeer , public ::cppu::OWeakObject { protected: MenuBarManager( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, - const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer, + const css::uno::Reference< css::uno::XComponentContext >& xContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, + const css::uno::Reference< css::util::XURLTransformer >& _xURLTransformer, Menu* pAddonMenu, bool bDelete, bool bDeleteChildren, @@ -88,10 +88,10 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener public: MenuBarManager( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, + const css::uno::Reference< css::uno::XComponentContext >& xContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, + const css::uno::Reference< css::util::XURLTransformer >& _xURLTransformer, + const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, const OUString& aModuleIdentifier, Menu* pMenu, bool bDelete, @@ -102,29 +102,29 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener // XInterface virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XFrameActionListener - virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw ( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; // XUIConfigurationListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; // XSystemDependentMenuPeer - virtual ::com::sun::star::uno::Any SAL_CALL getMenuHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getMenuHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw (css::uno::RuntimeException, std::exception) override; DECL_LINK_TYPED( Select, Menu *, bool ); @@ -133,21 +133,21 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener // Configuration methods static void FillMenuWithConfiguration( sal_uInt16& nId, Menu* pMenu, const OUString& rModuleIdentifier, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer ); + const css::uno::Reference< css::container::XIndexAccess >& rItemContainer, + const css::uno::Reference< css::util::XURLTransformer >& rTransformer ); static void FillMenu( sal_uInt16& nId, Menu* pMenu, const OUString& rModuleIdentifier, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider ); + const css::uno::Reference< css::container::XIndexAccess >& rItemContainer, + const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider ); void FillMenuManager( Menu* pMenu, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, + const css::uno::Reference< css::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, const OUString& rModuleIdentifier, bool bDelete, bool bDeleteChildren ); - void SetItemContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer ); + void SetItemContainer( const css::uno::Reference< css::container::XIndexAccess >& rItemContainer ); void GetPopupController( PopupControllerCache& rPopupController ); protected: @@ -159,7 +159,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener void RemoveListener(); void RequestImages(); void RetrieveImageManagers(); - static bool MustBeHidden( PopupMenu* pPopupMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer ); + static bool MustBeHidden( PopupMenu* pPopupMenu, const css::uno::Reference< css::util::XURLTransformer >& rTransformer ); OUString RetrieveLabelFromCommand(const OUString& rCmdURL); private: @@ -169,31 +169,31 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener struct MenuItemHandler { MenuItemHandler( sal_uInt16 aItemId, - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xManager, - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : + css::uno::Reference< css::frame::XStatusListener >& xManager, + css::uno::Reference< css::frame::XDispatch >& rDispatch ) : nItemId( aItemId ), bCheckHide( true ), xSubMenuManager( xManager ), xMenuItemDispatch( rDispatch ) {} - sal_uInt16 nItemId; - bool bCheckHide; - OUString aTargetFrame; - OUString aMenuItemURL; - OUString aFilter; - OUString aPassword; - OUString aTitle; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xSubMenuManager; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xMenuItemDispatch; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XPopupMenuController > xPopupMenuController; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > xPopupMenu; - vcl::KeyCode aKeyCode; + sal_uInt16 nItemId; + bool bCheckHide; + OUString aTargetFrame; + OUString aMenuItemURL; + OUString aFilter; + OUString aPassword; + OUString aTitle; + css::uno::Reference< css::frame::XStatusListener > xSubMenuManager; + css::uno::Reference< css::frame::XDispatch > xMenuItemDispatch; + css::uno::Reference< css::frame::XPopupMenuController > xPopupMenuController; + css::uno::Reference< css::awt::XPopupMenu > xPopupMenu; + vcl::KeyCode aKeyCode; }; void RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuShortCuts ); void CheckAndAddMenuExtension( Menu* pMenu ); - static void impl_RetrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, - const ::com::sun::star::uno::Sequence< OUString >& rCommands, + static void impl_RetrieveShortcutsFromConfiguration( const css::uno::Reference< css::ui::XAcceleratorConfiguration >& rAccelCfg, + const css::uno::Sequence< OUString >& rCommands, std::vector< MenuItemHandler* >& aMenuShortCuts ); static void MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const OUString& aModuleIdentifier ); @@ -201,39 +201,39 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener bool CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ); void AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sItemCommand,sal_uInt16 _nItemId); sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const; - void Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,Menu* pAddonMenu,bool bDelete,bool bDeleteChildren,bool _bHandlePopUp); + void Init(const css::uno::Reference< css::frame::XFrame >& rFrame,Menu* pAddonMenu,bool bDelete,bool bDeleteChildren,bool _bHandlePopUp); void SetHdl(); - bool m_bDisposed : 1, - m_bInitialized : 1, - m_bDeleteMenu : 1, - m_bDeleteChildren : 1, - m_bActive : 1, - m_bIsBookmarkMenu : 1, - m_bShowMenuImages : 1; - bool m_bRetrieveImages : 1, - m_bAcceleratorCfg : 1; - bool m_bModuleIdentified; - OUString m_aMenuItemCommand; - OUString m_aModuleIdentifier; - Menu* m_pVCLMenu; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUIControllerFactory > m_xPopupMenuControllerFactory; - ::std::vector< MenuItemHandler* > m_aMenuItemHandlerVector; - osl::Mutex m_mutex; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xDocImageManager; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xModuleImageManager; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xDeferedItemContainer; - OUString m_sIconTheme; - Timer m_aAsyncSettingsTimer; + bool m_bDisposed : 1, + m_bInitialized : 1, + m_bDeleteMenu : 1, + m_bDeleteChildren : 1, + m_bActive : 1, + m_bIsBookmarkMenu : 1, + m_bShowMenuImages : 1; + bool m_bRetrieveImages : 1, + m_bAcceleratorCfg : 1; + bool m_bModuleIdentified; + OUString m_aMenuItemCommand; + OUString m_aModuleIdentifier; + Menu* m_pVCLMenu; + css::uno::Reference< css::frame::XFrame > m_xFrame; + css::uno::Reference< css::container::XNameAccess > m_xUICommandLabels; + css::uno::Reference< css::frame::XUIControllerFactory > m_xPopupMenuControllerFactory; + ::std::vector< MenuItemHandler* > m_aMenuItemHandlerVector; + osl::Mutex m_mutex; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchProvider; + css::uno::Reference< css::ui::XImageManager > m_xDocImageManager; + css::uno::Reference< css::ui::XImageManager > m_xModuleImageManager; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; + css::uno::Reference< css::container::XIndexAccess > m_xDeferedItemContainer; + OUString m_sIconTheme; + Timer m_aAsyncSettingsTimer; }; } // namespace diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx index 3006fea468bd..354c0fdb6b9e 100644 --- a/framework/inc/uielement/menubarmerger.hxx +++ b/framework/inc/uielement/menubarmerger.hxx @@ -66,9 +66,9 @@ namespace MenuBarMerger ReferencePathInfo FindReferencePath( const std::vector< OUString >& aReferencePath, Menu* pMenu ); sal_uInt16 FindMenuItem( const OUString& rCmd, Menu* pMenu ); - void GetMenuEntry( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rAddonMenuEntry, + void GetMenuEntry( const css::uno::Sequence< css::beans::PropertyValue >& rAddonMenuEntry, AddonMenuItem& aAddonMenu ); - void GetSubMenu( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rSubMenuEntries, + void GetSubMenu( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSubMenuEntries, AddonMenuContainer& rSubMenu ); bool ProcessMergeOperation( Menu* pMenu, sal_uInt16 nPos, diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index 25a32ed77aa9..fbf972fb10f4 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -33,12 +33,12 @@ namespace framework { class MenuBarWrapper : public UIConfigElementWrapperBase, - public ::com::sun::star::container::XNameAccess + public css::container::XNameAccess { public: MenuBarWrapper( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~MenuBarWrapper(); // XInterface, XTypeProvider @@ -49,34 +49,34 @@ class MenuBarWrapper : public UIConfigElementWrapperBase, MenuBarManager* GetMenuBarManager() const { return static_cast< MenuBarManager* >( m_xMenuBarManager.get() ); } // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUIElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override; // XUIElementSettings - virtual void SAL_CALL updateSettings( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateSettings( ) throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; private: virtual void impl_fillNewData() override; void fillPopupControllerCache(); - bool m_bRefreshPopupControllerCache : 1; - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuBarManager; - PopupControllerCache m_aPopupControllerCache; - com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + bool m_bRefreshPopupControllerCache : 1; + css::uno::Reference< css::lang::XComponent > m_xMenuBarManager; + PopupControllerCache m_aPopupControllerCache; + css::uno::Reference< css::uno::XComponentContext > m_xContext; }; } // namespace framework diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index 1f067c237dc3..23b324b13e82 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -48,9 +48,9 @@ namespace framework { struct NewDocument { - ::com::sun::star::util::URL aTargetURL; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgSeq; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; + css::util::URL aTargetURL; + css::uno::Sequence< css::beans::PropertyValue > aArgSeq; + css::uno::Reference< css::frame::XDispatch > xDispatch; }; class NewMenuController : public svt::PopupMenuControllerBase @@ -58,33 +58,33 @@ namespace framework using svt::PopupMenuControllerBase::disposing; public: - NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + NewMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~NewMenuController(); // XServiceInfo DECLARE_XSERVICEINFO // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XMenuListener - virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; DECL_STATIC_LINK_TYPED( NewMenuController, ExecuteHdl_Impl, void*, void ); private: virtual void impl_setPopupMenu() override; - void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); - void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, - const ::com::sun::star::uno::Sequence< OUString >& rCommands, + void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); + void retrieveShortcutsFromConfiguration( const css::uno::Reference< css::ui::XAcceleratorConfiguration >& rAccelCfg, + const css::uno::Sequence< OUString >& rCommands, std::vector< vcl::KeyCode >& aMenuShortCuts ); void setAccelerators( PopupMenu* pPopupMenu ); void determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const vcl::KeyCode& rKeyCode ); @@ -92,17 +92,17 @@ namespace framework private: // members - bool m_bShowImages : 1, - m_bNewMenu : 1, - m_bModuleIdentified : 1, - m_bAcceleratorCfg : 1; - OUString m_aTargetFrame; - OUString m_aModuleIdentifier; - OUString m_aEmptyDocURL; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager; + bool m_bShowImages : 1, + m_bNewMenu : 1, + m_bModuleIdentified : 1, + m_bAcceleratorCfg : 1; + OUString m_aTargetFrame; + OUString m_aModuleIdentifier; + OUString m_aEmptyDocURL; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager; }; } diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx index bdfca9b61a10..f4bbc173290e 100644 --- a/framework/inc/uielement/progressbarwrapper.hxx +++ b/framework/inc/uielement/progressbarwrapper.hxx @@ -43,10 +43,10 @@ class ProgressBarWrapper : public UIElementWrapperBase virtual ~ProgressBarWrapper(); // public interfaces - void setStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& rStatusBar, bool bOwnsInstance = false ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getStatusBar() const; + void setStatusBar( const css::uno::Reference< css::awt::XWindow >& rStatusBar, bool bOwnsInstance = false ); + css::uno::Reference< css::awt::XWindow > getStatusBar() const; - // wrapped methods of ::com::sun::star::task::XStatusIndicator + // wrapped methods of css::task::XStatusIndicator void start( const OUString& Text, ::sal_Int32 Range ) throw (css::uno::RuntimeException, std::exception); void end() throw (css::uno::RuntimeException, std::exception); void setText( const OUString& Text ) throw (css::uno::RuntimeException, std::exception); @@ -55,27 +55,27 @@ class ProgressBarWrapper : public UIElementWrapperBase // UNO interfaces // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; // XUIElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override; // variables // (should be private everyway!) private: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xStatusBar; // Reference to our status bar XWindow - ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > m_xProgressBarIfacWrapper; - bool m_bOwnsInstance; // Indicator that we are owner of the XWindow - sal_Int32 m_nRange; - sal_Int32 m_nValue; - OUString m_aText; + css::uno::Reference< css::awt::XWindow > m_xStatusBar; // Reference to our status bar XWindow + css::uno::WeakReference< css::uno::XInterface > m_xProgressBarIfacWrapper; + bool m_bOwnsInstance; // Indicator that we are owner of the XWindow + sal_Int32 m_nRange; + sal_Int32 m_nValue; + OUString m_aText; }; // class ProgressBarWrapper } // namespace framework diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index 2f7594764da1..64d87e3642b2 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -58,7 +58,7 @@ class RootItemContainer : private cppu::BaseMutex, public: FWI_DLLPUBLIC RootItemContainer(); - FWI_DLLPUBLIC RootItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer ); + FWI_DLLPUBLIC RootItemContainer( const css::uno::Reference< css::container::XIndexAccess >& rItemAccessContainer ); virtual FWI_DLLPUBLIC ~RootItemContainer(); // XInterface @@ -66,73 +66,73 @@ class RootItemContainer : private cppu::BaseMutex, { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () override { OWeakObject::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - static FWI_DLLPUBLIC const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static FWI_DLLPUBLIC RootItemContainer* 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, std::exception) override; + static FWI_DLLPUBLIC const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static FWI_DLLPUBLIC RootItemContainer* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) + throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) + throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override { - return cppu::UnoType<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >>::get(); + return cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(); } virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XSingleComponentFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; protected: // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , - com::sun::star::uno::Any& aOldValue , + virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue , + css::uno::Any& aOldValue , sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) override; + const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) override; + const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) override; using cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue , sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; - static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); private: RootItemContainer& operator=( const RootItemContainer& ) = delete; RootItemContainer( const RootItemContainer& ) = delete; - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer ); + css::uno::Reference< css::container::XIndexAccess > deepCopyContainer( const css::uno::Reference< css::container::XIndexAccess >& rSubContainer ); - mutable ShareableMutex m_aShareMutex; - std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector; - OUString m_aUIName; + mutable ShareableMutex m_aShareMutex; + std::vector< css::uno::Sequence< css::beans::PropertyValue > > m_aItemVector; + OUString m_aUIName; }; } diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index df45eff65fb2..8d25ef88f9ae 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -39,8 +39,8 @@ class SpinfieldToolbarController : public ComplexToolbarController { public: - SpinfieldToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + SpinfieldToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, sal_Int32 nWidth, @@ -48,7 +48,7 @@ class SpinfieldToolbarController : public ComplexToolbarController virtual ~SpinfieldToolbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; // called from SpinfieldControl void Up(); @@ -63,11 +63,11 @@ class SpinfieldToolbarController : public ComplexToolbarController bool PreNotify( NotifyEvent& rNEvt ); protected: - virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override; + virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override; + virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override; private: - bool impl_getValue( const ::com::sun::star::uno::Any& rAny, sal_Int32& nValue, double& fValue, bool& bFloat ); + bool impl_getValue( const css::uno::Any& rAny, sal_Int32& nValue, double& fValue, bool& bFloat ); OUString impl_formatOutputString( double fValue ); bool m_bFloat, diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx index 49feed8b135e..8c73bffb308d 100644 --- a/framework/inc/uielement/statusbaritem.hxx +++ b/framework/inc/uielement/statusbaritem.hxx @@ -31,7 +31,7 @@ namespace framework struct AddonStatusbarItemData; -typedef cppu::WeakComponentImplHelper< com::sun::star::ui::XStatusbarItem > StatusbarItem_Base; +typedef cppu::WeakComponentImplHelper< css::ui::XStatusbarItem > StatusbarItem_Base; class StatusbarItem : protected cppu::BaseMutex, public StatusbarItem_Base @@ -46,26 +46,26 @@ public: void SAL_CALL disposing() override; - // com::sun::star::ui::XStatusbarItem Attributes - virtual ::rtl::OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_uInt16 SAL_CALL getItemId() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_uInt32 SAL_CALL getWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_uInt16 SAL_CALL getStyle() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getOffset() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getItemRect() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getHelpText() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpText( const rtl::OUString& rHelpText ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getQuickHelpText() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setQuickHelpText( const rtl::OUString& rQuickHelpText ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAccessibleName( const rtl::OUString& rAccessibleName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getVisible() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::ui::XStatusbarItem Attributes + virtual ::rtl::OUString SAL_CALL getCommand() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_uInt16 SAL_CALL getItemId() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_uInt32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_uInt16 SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getOffset() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getItemRect() throw (css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getHelpText() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHelpText( const rtl::OUString& rHelpText ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getQuickHelpText() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setQuickHelpText( const rtl::OUString& rQuickHelpText ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAccessibleName( const rtl::OUString& rAccessibleName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) override; - // com::sun::star::ui::XStatusbarItem Methods - virtual void SAL_CALL repaint( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::ui::XStatusbarItem Methods + virtual void SAL_CALL repaint( ) throw (css::uno::RuntimeException, std::exception) override; private: VclPtr<StatusBar> m_pStatusBar; diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index bac6f0bd7528..31c47cbe1a8c 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -53,8 +53,8 @@ class StatusBarManager : public ::cppu::WeakImplHelper< friend class FrameworkStatusBar; public: - StatusBarManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + StatusBarManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceName, StatusBar* pStatusBar ); virtual ~StatusBarManager(); @@ -62,22 +62,22 @@ class StatusBarManager : public ::cppu::WeakImplHelper< StatusBar* GetStatusBar() const; // XFrameActionListener - virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw ( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; // XUIConfigurationListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; - void SAL_CALL addEventListener( const com::sun::star::uno::Reference< XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; - void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; + void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; + void SAL_CALL addEventListener( const css::uno::Reference< XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override; + void SAL_CALL removeEventListener( const css::uno::Reference< XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override; - void FillStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rStatusBarData ); + void FillStatusBar( const css::uno::Reference< css::container::XIndexAccess >& rStatusBarData ); protected: void DataChanged( const DataChangedEvent& rDCEvt ); @@ -94,25 +94,25 @@ class StatusBarManager : public ::cppu::WeakImplHelper< void CreateControllers(); void UpdateControllers(); void AddFrameActionListener(); - void MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL ::com::sun::star::frame::XStatusbarController::*_pMethod )(const ::com::sun::star::awt::MouseEvent&)); + void MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL css::frame::XStatusbarController::*_pMethod )(const css::awt::MouseEvent&)); protected: - typedef std::map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusbarController > > StatusBarControllerMap; - - bool m_bDisposed : 1, - m_bFrameActionRegistered : 1, - m_bUpdateControllers : 1; - bool m_bModuleIdentified; - VclPtr<StatusBar> m_pStatusBar; - OUString m_aModuleIdentifier; - OUString m_aResourceName; - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame; - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels; - StatusBarControllerMap m_aControllerMap; - osl::Mutex m_mutex; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener - ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUIControllerFactory > m_xStatusbarControllerFactory; + typedef std::map< sal_uInt16, css::uno::Reference< css::frame::XStatusbarController > > StatusBarControllerMap; + + bool m_bDisposed : 1, + m_bFrameActionRegistered : 1, + m_bUpdateControllers : 1; + bool m_bModuleIdentified; + VclPtr<StatusBar> m_pStatusBar; + OUString m_aModuleIdentifier; + OUString m_aResourceName; + css::uno::Reference< css::frame::XFrame > m_xFrame; + css::uno::Reference< css::container::XNameAccess > m_xUICommandLabels; + StatusBarControllerMap m_aControllerMap; + osl::Mutex m_mutex; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::frame::XUIControllerFactory > m_xStatusbarControllerFactory; }; } diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx index 2bc02fa5d0a7..6ecd128198a8 100644 --- a/framework/inc/uielement/statusbarwrapper.hxx +++ b/framework/inc/uielement/statusbarwrapper.hxx @@ -34,24 +34,24 @@ class StatusBarWrapper : public UIConfigElementWrapperBase { public: StatusBarWrapper( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~StatusBarWrapper(); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUIElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override; // XUIElementSettings - virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateSettings() throw (css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xStatusBarManager; - com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::lang::XComponent > m_xStatusBarManager; + css::uno::Reference< css::uno::XComponentContext > m_xContext; }; } // namespace framework diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx index e3df5db68424..10370a83d50d 100644 --- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx +++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx @@ -36,25 +36,25 @@ namespace framework { -class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper< ::com::sun::star::task::XStatusIndicator> +class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper< css::task::XStatusIndicator> { public: - StatusIndicatorInterfaceWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rStatusIndicatorImpl ); + StatusIndicatorInterfaceWrapper( const css::uno::Reference< css::lang::XComponent >& rStatusIndicatorImpl ); virtual ~StatusIndicatorInterfaceWrapper(); // XStatusIndicator virtual void SAL_CALL start ( const OUString& sText , - sal_Int32 nRange ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL end ( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL reset ( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setText ( const OUString& sText ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + sal_Int32 nRange ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL end ( ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL reset ( ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setText ( const OUString& sText ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override; private: StatusIndicatorInterfaceWrapper(); - ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XComponent > m_xStatusIndicatorImpl; + css::uno::WeakReference< css::lang::XComponent > m_xStatusIndicatorImpl; }; } diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx index 096d46d5f676..fd34368d5ef4 100644 --- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx @@ -44,8 +44,8 @@ class ToggleButtonToolbarController : public ComplexToolbarController STYLE_TOGGLE_DROPDOWNBUTTON }; - ToggleButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + ToggleButtonToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, Style eStyle, @@ -53,19 +53,19 @@ class ToggleButtonToolbarController : public ComplexToolbarController virtual ~ToggleButtonToolbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; protected: - virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override; + virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override; + virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override; private: DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool); - Style m_eStyle; + Style m_eStyle; OUString m_aCurrentSelection; std::vector< OUString > m_aDropdownMenuList; }; diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 115feab05f99..07085a8f1632 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -61,17 +61,17 @@ namespace framework { typedef ::cppu::WeakImplHelper< - ::com::sun::star::frame::XFrameActionListener, - ::com::sun::star::frame::XStatusListener, - ::com::sun::star::lang::XComponent, - ::com::sun::star::ui::XUIConfigurationListener + css::frame::XFrameActionListener, + css::frame::XStatusListener, + css::lang::XComponent, + css::ui::XUIConfigurationListener > ToolbarManager_Base; class ToolBarManager : public ToolbarManager_Base { public: - ToolBarManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + ToolBarManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceName, ToolBox* pToolBar ); virtual ~ToolBarManager(); @@ -79,27 +79,27 @@ class ToolBarManager : public ToolbarManager_Base ToolBox* GetToolBar() const; // XFrameActionListener - virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; // XUIConfigurationListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; - void SAL_CALL addEventListener( const com::sun::star::uno::Reference< XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; - void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; + void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; + void SAL_CALL addEventListener( const css::uno::Reference< XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override; + void SAL_CALL removeEventListener( const css::uno::Reference< XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override; void CheckAndUpdateImages(); virtual void RefreshImages(); - void FillToolbar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolBarData ); + void FillToolbar( const css::uno::Reference< css::container::XIndexAccess >& rToolBarData ); void notifyRegisteredControllers( const OUString& aUIElementName, const OUString& aCommand ); void Destroy(); @@ -114,10 +114,10 @@ class ToolBarManager : public ToolbarManager_Base struct ExecuteInfo { - OUString aToolbarResName; - ExecuteCommand nCmd; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow; + OUString aToolbarResName; + ExecuteCommand nCmd; + css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; + css::uno::Reference< css::awt::XWindow > xWindow; }; struct ControllerParams { @@ -147,11 +147,11 @@ class ToolBarManager : public ToolbarManager_Base void RemoveControllers(); OUString RetrieveLabelFromCommand( const OUString& aCmdURL ); sal_Int32 RetrievePropertiesFromCommand( const OUString& aCmdURL ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropsForCommand( const OUString& rCmdURL ); + css::uno::Sequence< css::beans::PropertyValue > GetPropsForCommand( const OUString& rCmdURL ); void CreateControllers(); void UpdateControllers(); //for update controller via Support Visiable - void UpdateController( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XToolbarController > xController); + void UpdateController( css::uno::Reference< css::frame::XToolbarController > xController); //end void AddFrameActionListener(); void AddImageOrientationListener(); @@ -159,22 +159,22 @@ class ToolBarManager : public ToolbarManager_Base void ImplClearPopupMenu( ToolBox *pToolBar ); void RequestImages(); ToolBoxItemBits ConvertStyleToToolboxItemBits( sal_Int32 nStyle ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const; + css::uno::Reference< css::frame::XModel > GetModelFromFrame() const; bool IsPluginMode() const; Image QueryAddonsImage( const OUString& aCommandURL, bool bBigImages ); - long HandleClick(void ( SAL_CALL ::com::sun::star::frame::XToolbarController::*_pClick )( )); + long HandleClick(void ( SAL_CALL css::frame::XToolbarController::*_pClick )( )); void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter); - void impl_elementChanged(bool _bRemove,const ::com::sun::star::ui::ConfigurationEvent& Event ); + void impl_elementChanged(bool _bRemove,const css::ui::ConfigurationEvent& Event ); - static bool impl_RetrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, const OUString& rCommand, OUString& rShortCut ); + static bool impl_RetrieveShortcutsFromConfiguration( const css::uno::Reference< css::ui::XAcceleratorConfiguration >& rAccelCfg, const OUString& rCommand, OUString& rShortCut ); bool RetrieveShortcut( const OUString& rCommandURL, OUString& rShortCut ); protected: - typedef std::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap; - typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector; + typedef std::unordered_map< sal_uInt16, css::uno::Reference< css::frame::XStatusListener > > ToolBarControllerMap; + typedef ::std::vector< css::uno::Reference< css::frame::XSubToolbarController > > SubToolBarControllerVector; typedef BaseHash< SubToolBarControllerVector > SubToolBarToSubToolBarControllerMap; - typedef std::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap; + typedef std::unordered_map< sal_uInt16, css::uno::Reference< css::container::XIndexAccess > > MenuDescriptionMap; bool m_bDisposed : 1, m_bSmallSymbols : 1, @@ -189,22 +189,22 @@ class ToolBarManager : public ToolbarManager_Base VclPtr<ToolBox> m_pToolBar; - OUString m_aModuleIdentifier; - OUString m_aResourceName; - - com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame; - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels; - ToolBarControllerMap m_aControllerMap; - osl::Mutex m_mutex; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener - ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUIControllerFactory > m_xToolbarControllerFactory; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xModuleImageManager; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xDocImageManager; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xImageOrientationListener; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xUICfgMgr; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xDocUICfgMgr; + OUString m_aModuleIdentifier; + OUString m_aResourceName; + + css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; + css::uno::Reference< css::frame::XFrame > m_xFrame; + css::uno::Reference< css::container::XNameAccess > m_xUICommandLabels; + ToolBarControllerMap m_aControllerMap; + osl::Mutex m_mutex; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::frame::XUIControllerFactory > m_xToolbarControllerFactory; + css::uno::Reference< css::ui::XImageManager > m_xModuleImageManager; + css::uno::Reference< css::ui::XImageManager > m_xDocImageManager; + css::uno::Reference< css::lang::XComponent > m_xImageOrientationListener; + css::uno::Reference< css::ui::XUIConfigurationManager > m_xUICfgMgr; + css::uno::Reference< css::ui::XUIConfigurationManager > m_xDocUICfgMgr; CommandToInfoMap m_aCommandMap; SubToolBarToSubToolBarControllerMap m_aSubToolBarControllerMap; @@ -212,9 +212,9 @@ class ToolBarManager : public ToolbarManager_Base OUString m_sIconTheme; MenuDescriptionMap m_aMenuMap; bool m_bAcceleratorCfg; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager; }; } diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index 4c47d349d6a1..bf4c586a5ab8 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -86,7 +86,7 @@ class ToolBarMerger static ReferenceToolbarPathInfo FindReferencePoint( ToolBox* pToolbar, const OUString& rReferencePoint ); - static bool ProcessMergeOperation( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + static bool ProcessMergeOperation( const css::uno::Reference< css::frame::XFrame >& xFrame, ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16& rItemId, @@ -96,7 +96,7 @@ class ToolBarMerger const OUString& rMergeCommandParameter, const AddonToolbarItemContainer& rItems ); - static bool ProcessMergeFallback( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + static bool ProcessMergeFallback( const css::uno::Reference< css::frame::XFrame >& xFrame, ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16& rItemId, @@ -106,7 +106,7 @@ class ToolBarMerger const OUString& rMergeFallback, const AddonToolbarItemContainer& rItems ); - static bool MergeItems( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + static bool MergeItems( const css::uno::Reference< css::frame::XFrame >& xFrame, ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16 nModIndex, @@ -115,7 +115,7 @@ class ToolBarMerger const OUString& rModuleIdentifier, const AddonToolbarItemContainer& rAddonToolbarItems ); - static bool ReplaceItem( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + static bool ReplaceItem( const css::uno::Reference< css::frame::XFrame >& xFrame, ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16& rItemId, @@ -128,8 +128,8 @@ class ToolBarMerger const OUString& rMergeCommandParameter ); static ::cppu::OWeakObject* CreateController( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::frame::XFrame > & xFrame, ToolBox* pToolbar, const OUString& rCommandURL, sal_uInt16 nId, diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 56aa17b8594e..f16a4e4032f7 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -51,57 +51,57 @@ namespace framework using svt::PopupMenuControllerBase::disposing; public: - ToolbarsMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + ToolbarsMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~ToolbarsMenuController(); // XServiceInfo DECLARE_XSERVICEINFO // XPopupMenuController - virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XMenuListener - virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; struct ExecuteInfo { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; - ::com::sun::star::util::URL aTargetURL; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + css::uno::Reference< css::frame::XDispatch > xDispatch; + css::util::URL aTargetURL; + css::uno::Sequence< css::beans::PropertyValue > aArgs; }; DECL_STATIC_LINK_TYPED( ToolbarsMenuController, ExecuteHdl_Impl, void*, void ); private: - void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager ); + void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > getLayoutManagerToolbars( const css::uno::Reference< css::frame::XLayoutManager >& rLayoutManager ); OUString getUINameFromCommand( const OUString& rCommandURL ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const OUString& rCommandURL ); - void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& aLabel ); + css::uno::Reference< css::frame::XDispatch > getDispatchFromCommandURL( const OUString& rCommandURL ); + void addCommand( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& aLabel ); bool isContextSensitiveToolbarNonVisible() { return m_bResetActive;} - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandDescription; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xModuleCfgMgr; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xDocCfgMgr; - OUString m_aModuleIdentifier; - OUString m_aPropUIName; - OUString m_aPropResourceURL; - bool m_bModuleIdentified; - bool m_bResetActive; - std::vector< OUString > m_aCommandVector; - IntlWrapper m_aIntlWrapper; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::container::XNameAccess > m_xPersistentWindowState; + css::uno::Reference< css::container::XNameAccess > m_xUICommandDescription; + css::uno::Reference< css::ui::XUIConfigurationManager > m_xModuleCfgMgr; + css::uno::Reference< css::ui::XUIConfigurationManager > m_xDocCfgMgr; + OUString m_aModuleIdentifier; + OUString m_aPropUIName; + OUString m_aPropResourceURL; + bool m_bModuleIdentified; + bool m_bResetActive; + std::vector< OUString > m_aCommandVector; + IntlWrapper m_aIntlWrapper; }; } diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx index c17122d33d49..79278b25fc43 100644 --- a/framework/inc/uielement/toolbarwrapper.hxx +++ b/framework/inc/uielement/toolbarwrapper.hxx @@ -32,49 +32,49 @@ namespace framework { class ToolBarManager; -class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener, +class ToolBarWrapper : public css::ui::XUIFunctionListener, public UIConfigElementWrapperBase { public: - ToolBarWrapper( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + ToolBarWrapper( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~ToolBarWrapper(); // XInterface virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUIElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; // XUIElementSettings - virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateSettings() throw (css::uno::RuntimeException, std::exception) override; // XUIFunctionListener - virtual void SAL_CALL functionExecute( const OUString& aUIElementName, const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL functionExecute( const OUString& aUIElementName, const OUString& aCommand ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener using cppu::OPropertySetHelper::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; // protected methods protected: - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) override; virtual void impl_fillNewData() override; private: - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xToolBarManager; - com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::lang::XComponent > m_xToolBarManager; + css::uno::Reference< css::uno::XComponentContext > m_xContext; }; } diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index b1c67d9a6b4e..4179474119c6 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -34,14 +34,14 @@ namespace framework { -typedef ::cppu::WeakComponentImplHelper< com::sun::star::lang::XServiceInfo, - com::sun::star::container::XNameAccess > UICommandDescription_BASE; +typedef ::cppu::WeakComponentImplHelper< css::lang::XServiceInfo, + css::container::XNameAccess > UICommandDescription_BASE; class UICommandDescription : private cppu::BaseMutex, public UICommandDescription_BASE { public: - UICommandDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UICommandDescription( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~UICommandDescription(); virtual OUString SAL_CALL getImplementationName() @@ -66,20 +66,20 @@ class UICommandDescription : private cppu::BaseMutex, private: // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: typedef std::unordered_map< OUString, @@ -93,16 +93,16 @@ public: std::equal_to< OUString > > UICommandsHashMap; protected: - UICommandDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, bool ); + UICommandDescription( const css::uno::Reference< css::uno::XComponentContext>& rxContext, bool ); void impl_fillElements(const sal_Char* _pName); - bool m_bConfigRead; - OUString m_aPrivateResourceURL; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ModuleToCommandFileMap m_aModuleToCommandFileMap; - UICommandsHashMap m_aUICommandsHashMap; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xGenericUICommands; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager2 > m_xModuleManager; + bool m_bConfigRead; + OUString m_aPrivateResourceURL; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + ModuleToCommandFileMap m_aModuleToCommandFileMap; + UICommandsHashMap m_aUICommandsHashMap; + css::uno::Reference< css::container::XNameAccess > m_xGenericUICommands; + css::uno::Reference< css::frame::XModuleManager2 > m_xModuleManager; }; } // namespace framework diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx index bbec95ab92ba..105c386b9232 100644 --- a/framework/inc/uielement/uielement.hxx +++ b/framework/inc/uielement/uielement.hxx @@ -34,11 +34,11 @@ namespace framework struct DockedData { DockedData() : m_aPos( SAL_MAX_INT32, SAL_MAX_INT32 ), - m_nDockedArea( ::com::sun::star::ui::DockingArea_DOCKINGAREA_TOP ), + m_nDockedArea( css::ui::DockingArea_DOCKINGAREA_TOP ), m_bLocked( false ) {} - com::sun::star::awt::Point m_aPos; - com::sun::star::awt::Size m_aSize; + css::awt::Point m_aPos; + css::awt::Size m_aSize; sal_Int16 m_nDockedArea; bool m_bLocked; }; @@ -49,10 +49,10 @@ struct FloatingData m_nLines( 1 ), m_bIsHorizontal( true ) {} - com::sun::star::awt::Point m_aPos; - com::sun::star::awt::Size m_aSize; - sal_Int16 m_nLines; - bool m_bIsHorizontal; + css::awt::Point m_aPos; + css::awt::Size m_aSize; + sal_Int16 m_nLines; + bool m_bIsHorizontal; }; struct UIElement @@ -73,7 +73,7 @@ struct UIElement UIElement( const OUString& rName, const OUString& rType, - const com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& rUIElement, + const css::uno::Reference< css::ui::XUIElement >& rUIElement, bool bFloating = false ) : m_aType( rType ), m_aName( rName ), @@ -97,7 +97,7 @@ struct UIElement OUString m_aType; OUString m_aName; OUString m_aUIName; - com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > m_xUIElement; + css::uno::Reference< css::ui::XUIElement > m_xUIElement; bool m_bFloating, m_bVisible, m_bUserActive, diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx index 9ef651c67944..24e61278aa48 100644 --- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx +++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx @@ -35,10 +35,10 @@ namespace framework { - class ConfigurationAccess_FactoryManager : public ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener> + class ConfigurationAccess_FactoryManager : public ::cppu::WeakImplHelper< css::container::XContainerListener> { public: - ConfigurationAccess_FactoryManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, const OUString& _sRoot ); + ConfigurationAccess_FactoryManager( const css::uno::Reference< css::uno::XComponentContext>& rxContext, const OUString& _sRoot ); virtual ~ConfigurationAccess_FactoryManager(); void readConfigurationData(); @@ -46,15 +46,15 @@ namespace framework { OUString getFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ) const; void addFactorySpecifierToTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule, const OUString& aServiceSpecifier ); void removeFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > getFactoriesDescription() const; + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > getFactoriesDescription() const; // container.XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; // lang.XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: class FactoryManagerMap : public std::unordered_map<OUString, @@ -64,19 +64,19 @@ namespace framework { { }; - bool impl_getElementProps( const ::com::sun::star::uno::Any& rElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const; + bool impl_getElementProps( const css::uno::Any& rElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const; - mutable osl::Mutex m_aMutex; + mutable osl::Mutex m_aMutex; OUString m_aPropType; OUString m_aPropName; OUString m_aPropModule; OUString m_aPropFactory; - OUString m_sRoot; - FactoryManagerMap m_aFactoryManagerMap; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xConfigListener; - bool m_bConfigAccessInitialized; + OUString m_sRoot; + FactoryManagerMap m_aFactoryManagerMap; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigProvider; + css::uno::Reference< css::container::XNameAccess > m_xConfigAccess; + css::uno::Reference< css::container::XContainerListener > m_xConfigListener; + bool m_bConfigAccessInitialized; }; } // namespace framework diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index a2d51a862368..a9b2f12a5d9b 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -43,10 +43,10 @@ namespace framework // Configuration access class for PopupMenuControllerFactory implementation class ConfigurationAccess_ControllerFactory : // interfaces - public ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener> + public ::cppu::WeakImplHelper< css::container::XContainerListener> { public: - ConfigurationAccess_ControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const OUString& _sRoot ); + ConfigurationAccess_ControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& _sRoot ); virtual ~ConfigurationAccess_ControllerFactory(); void readConfigurationData(); @@ -58,12 +58,12 @@ public: void removeServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ); // container.XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; // lang.XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: struct ControllerInfo @@ -80,18 +80,18 @@ private: { }; - bool impl_getElementProps( const ::com::sun::star::uno::Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const; + bool impl_getElementProps( const css::uno::Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const; - mutable osl::Mutex m_mutex; + mutable osl::Mutex m_mutex; OUString m_aPropCommand; OUString m_aPropModule; OUString m_aPropController; OUString m_aPropValue; OUString m_sRoot; - MenuControllerMap m_aMenuControllerMap; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xConfigAccessListener; + MenuControllerMap m_aMenuControllerMap; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigProvider; + css::uno::Reference< css::container::XNameAccess > m_xConfigAccess; + css::uno::Reference< css::container::XContainerListener > m_xConfigAccessListener; bool m_bConfigAccessInitialized; }; diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx index 979d1f89ef0d..f1007cfdbaa4 100644 --- a/framework/inc/uifactory/menubarfactory.hxx +++ b/framework/inc/uifactory/menubarfactory.hxx @@ -39,7 +39,7 @@ typedef ::cppu::WeakImplHelper< class MenuBarFactory : public MenuBarFactory_BASE { public: - MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + MenuBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~MenuBarFactory(); virtual OUString SAL_CALL getImplementationName() @@ -63,17 +63,17 @@ typedef ::cppu::WeakImplHelper< } // XUIElementFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; static void CreateUIElement(const OUString& ResourceURL - ,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args + ,const css::uno::Sequence< css::beans::PropertyValue >& Args ,const char* _pExtraMode ,const OUString& ResourceType - ,const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& _xMenuBar - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + ,const css::uno::Reference< css::ui::XUIElement >& _xMenuBar + ,const css::uno::Reference< css::uno::XComponentContext >& _rxContext); protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; }; } diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index 90d8f3932b37..f5866c4278c0 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -91,13 +91,13 @@ class ImagesConfiguration { public: static bool LoadImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::io::XInputStream >& rInputStream, ImageListsDescriptor& rItems ); static bool StoreImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::io::XOutputStream >& rOutputStream, const ImageListsDescriptor& rItems ); }; diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 88a58389ae78..6802369abb50 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -35,7 +35,7 @@ namespace framework{ // Hash code function for using in all hash maps of follow implementation. -class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XDocumentHandler > +class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > { public: enum Image_XML_Entry @@ -68,42 +68,42 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< ::com::sun::st // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement( const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw (::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) + throw (css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endElement(const OUString& aName) - throw (::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, + throw (css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDocumentLocator( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XLocator > &xLocator) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; private: OUString getErrorLineString(); @@ -115,21 +115,21 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< ::com::sun::st { }; - bool m_bImageContainerStartFound; - bool m_bImageContainerEndFound; - bool m_bImagesStartFound; - bool m_bImagesEndFound; - bool m_bImageStartFound; - bool m_bExternalImagesStartFound; - bool m_bExternalImagesEndFound; - bool m_bExternalImageStartFound; - sal_Int32 m_nHashMaskModeBitmap; - sal_Int32 m_nHashMaskModeColor; - ImageHashMap m_aImageMap; - ImageListsDescriptor& m_aImageList; - ImageListItemDescriptor* m_pImages; - ExternalImageItemListDescriptor* m_pExternalImages; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; + bool m_bImageContainerStartFound; + bool m_bImageContainerEndFound; + bool m_bImagesStartFound; + bool m_bImagesEndFound; + bool m_bImageStartFound; + bool m_bExternalImagesStartFound; + bool m_bExternalImagesEndFound; + bool m_bExternalImageStartFound; + sal_Int32 m_nHashMaskModeBitmap; + sal_Int32 m_nHashMaskModeColor; + ImageHashMap m_aImageMap; + ImageListsDescriptor& m_aImageList; + ImageListItemDescriptor* m_pImages; + ExternalImageItemListDescriptor* m_pExternalImages; + css::uno::Reference< css::xml::sax::XLocator > m_xLocator; }; class OWriteImagesDocumentHandler @@ -137,38 +137,38 @@ class OWriteImagesDocumentHandler public: OWriteImagesDocumentHandler( const ImageListsDescriptor& aItems, - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > ); + css::uno::Reference< css::xml::sax::XDocumentHandler > ); virtual ~OWriteImagesDocumentHandler(); void WriteImagesDocument() throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); protected: void WriteImageList( const ImageListItemDescriptor* ) throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); void WriteExternalImageList( const ExternalImageItemListDescriptor* ) throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); void WriteImage( const ImageItemDescriptor* ) throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); void WriteExternalImage( const ExternalImageItemDescriptor* ) throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); - - const ImageListsDescriptor& m_aImageListsItems; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - OUString m_aXMLXlinkNS; - OUString m_aXMLImageNS; - OUString m_aAttributeType; - OUString m_aAttributeXlinkType; - OUString m_aAttributeValueSimple; + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); + + const ImageListsDescriptor& m_aImageListsItems; + css::uno::Reference< css::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; + css::uno::Reference< css::xml::sax::XAttributeList > m_xEmptyList; + OUString m_aXMLXlinkNS; + OUString m_aXMLImageNS; + OUString m_aAttributeType; + OUString m_aAttributeXlinkType; + OUString m_aAttributeValueSimple; }; } // namespace framework diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 9b6feb6855a7..087836f556af 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -35,7 +35,7 @@ namespace framework{ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : - public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XDocumentHandler > + public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > { public: ReadMenuDocumentHandlerBase(); @@ -43,47 +43,47 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override = 0; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override = 0; virtual void SAL_CALL startElement( const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override = 0; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override = 0; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override = 0; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDocumentLocator( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XLocator > &xLocator) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; protected: OUString getErrorLineString(); - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> m_xReader; - void initPropertyCommon( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &rProps, + css::uno::Reference< css::xml::sax::XLocator > m_xLocator; + css::uno::Reference< css::xml::sax::XDocumentHandler> m_xReader; + void initPropertyCommon( css::uno::Sequence< css::beans::PropertyValue > &rProps, const OUString &rCommandURL, const OUString &rHelpId, const OUString &rLabel, sal_Int16 nItemStyleBits ); private: @@ -99,176 +99,176 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas { public: OReadMenuDocumentHandler( - const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rItemContainer ); + const css::uno::Reference< css::container::XIndexContainer >& rItemContainer ); virtual ~OReadMenuDocumentHandler(); // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement( const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; private: int m_nElementDepth; bool m_bMenuBarMode; - com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer; - com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; + css::uno::Reference< css::container::XIndexContainer > m_xMenuBarContainer; + css::uno::Reference< css::lang::XSingleComponentFactory > m_xContainerFactory; }; // OReadMenuDocumentHandler class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase { public: OReadMenuBarHandler( - const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuBarContainer, - const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory ); + const css::uno::Reference< css::container::XIndexContainer >& rMenuBarContainer, + const css::uno::Reference< css::lang::XSingleComponentFactory >& rContainerFactory ); virtual ~OReadMenuBarHandler(); // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement( const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; private: int m_nElementDepth; bool m_bMenuMode; - com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer; - com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; + css::uno::Reference< css::container::XIndexContainer > m_xMenuBarContainer; + css::uno::Reference< css::lang::XSingleComponentFactory > m_xContainerFactory; }; // OReadMenuBarHandler class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase { public: - OReadMenuHandler( const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuContainer, - const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory ); + OReadMenuHandler( const css::uno::Reference< css::container::XIndexContainer >& rMenuContainer, + const css::uno::Reference< css::lang::XSingleComponentFactory >& rContainerFactory ); virtual ~OReadMenuHandler(); // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement( const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; private: int m_nElementDepth; bool m_bMenuPopupMode; - com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuContainer; - com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; + css::uno::Reference< css::container::XIndexContainer > m_xMenuContainer; + css::uno::Reference< css::lang::XSingleComponentFactory > m_xContainerFactory; }; // OReadMenuHandler class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase { public: - OReadMenuPopupHandler( const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuContainer, - const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory ); + OReadMenuPopupHandler( const css::uno::Reference< css::container::XIndexContainer >& rMenuContainer, + const css::uno::Reference< css::lang::XSingleComponentFactory >& rContainerFactory ); virtual ~OReadMenuPopupHandler(); // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement( const OUString& aName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< + css::xml::sax::XAttributeList > &xAttribs) + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; private: enum NextElementClose { ELEM_CLOSE_NONE, ELEM_CLOSE_MENUITEM, ELEM_CLOSE_MENUSEPARATOR }; - int m_nElementDepth; - bool m_bMenuMode; - com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuContainer; - com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; - com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xComponentContext; - NextElementClose m_nNextElementExpected; + int m_nElementDepth; + bool m_bMenuMode; + css::uno::Reference< css::container::XIndexContainer > m_xMenuContainer; + css::uno::Reference< css::lang::XSingleComponentFactory > m_xContainerFactory; + css::uno::Reference< css::uno::XComponentContext > m_xComponentContext; + NextElementClose m_nNextElementExpected; }; // OReadMenuPopupHandler class FWE_DLLPUBLIC OWriteMenuDocumentHandler { public: OWriteMenuDocumentHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rMenuBarContainer, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rDocumentHandler ); + const css::uno::Reference< css::container::XIndexAccess >& rMenuBarContainer, + const css::uno::Reference< css::xml::sax::XDocumentHandler >& rDocumentHandler ); virtual ~OWriteMenuDocumentHandler(); void WriteMenuDocument() throw - ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); + ( css::xml::sax::SAXException, css::uno::RuntimeException ); protected: - void WriteMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rSubMenuContainer ) throw - ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); + void WriteMenu( const css::uno::Reference< css::container::XIndexAccess >& rSubMenuContainer ) throw + ( css::xml::sax::SAXException, css::uno::RuntimeException ); void WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle = 0 ); void WriteMenuSeparator(); - com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xMenuBarContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; + css::uno::Reference< css::container::XIndexAccess > m_xMenuBarContainer; + css::uno::Reference< css::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; + css::uno::Reference< css::xml::sax::XAttributeList > m_xEmptyList; OUString m_aAttributeType; }; diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index 685bf39c697f..c5ddc91ff889 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -33,58 +33,58 @@ namespace framework { class FWE_DLLPUBLIC SaxNamespaceFilter : - public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XDocumentHandler > + public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > { public: - SaxNamespaceFilter( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rSax1DocumentHandler ); + SaxNamespaceFilter( css::uno::Reference< css::xml::sax::XDocumentHandler >& rSax1DocumentHandler ); virtual ~SaxNamespaceFilter(); // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement( const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDocumentLocator( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XLocator > &xLocator) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; protected: typedef ::std::stack< XMLNamespaces > NamespaceStack; OUString getErrorLineString(); - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler; - NamespaceStack m_aNamespaceStack; - sal_Int32 m_nDepth; + css::uno::Reference< css::xml::sax::XLocator > m_xLocator; + css::uno::Reference< css::xml::sax::XDocumentHandler> xDocumentHandler; + NamespaceStack m_aNamespaceStack; + sal_Int32 m_nDepth; OUString m_aXMLAttributeNamespace; OUString m_aXMLAttributeType; diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index fa3331b0543b..8e3528c25c25 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -36,7 +36,7 @@ namespace framework{ // Hash code function for using in all hash maps of follow implementation. class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : - public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XDocumentHandler > + public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > { public: enum StatusBar_XML_Entry @@ -61,45 +61,45 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : SB_XML_NAMESPACES_COUNT }; - OReadStatusBarDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& aStatusBarItems ); + OReadStatusBarDocumentHandler( const css::uno::Reference< css::container::XIndexContainer >& aStatusBarItems ); virtual ~OReadStatusBarDocumentHandler(); // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement( const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDocumentLocator( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XLocator > &xLocator) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; private: OUString getErrorLineString(); @@ -111,25 +111,25 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : { }; - bool m_bStatusBarStartFound; - bool m_bStatusBarEndFound; - bool m_bStatusBarItemStartFound; - StatusBarHashMap m_aStatusBarMap; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_aStatusBarItems; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; + bool m_bStatusBarStartFound; + bool m_bStatusBarEndFound; + bool m_bStatusBarItemStartFound; + StatusBarHashMap m_aStatusBarMap; + css::uno::Reference< css::container::XIndexContainer > m_aStatusBarItems; + css::uno::Reference< css::xml::sax::XLocator > m_xLocator; }; class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler { public: OWriteStatusBarDocumentHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rStatusBarItems, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rWriteDocHandler ); + const css::uno::Reference< css::container::XIndexAccess >& rStatusBarItems, + const css::uno::Reference< css::xml::sax::XDocumentHandler >& rWriteDocHandler ); virtual ~OWriteStatusBarDocumentHandler(); void WriteStatusBarDocument() throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); protected: void WriteStatusBarItem( @@ -138,16 +138,16 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler sal_Int16 nOffset, sal_Int16 nStyle, sal_Int16 nWidth ) throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); - - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_aStatusBarItems; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - OUString m_aXMLStatusBarNS; - OUString m_aXMLXlinkNS; - OUString m_aAttributeType; - OUString m_aAttributeURL; + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); + + css::uno::Reference< css::container::XIndexAccess > m_aStatusBarItems; + css::uno::Reference< css::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; + css::uno::Reference< css::xml::sax::XAttributeList > m_xEmptyList; + OUString m_aXMLStatusBarNS; + OUString m_aXMLXlinkNS; + OUString m_aAttributeType; + OUString m_aAttributeURL; }; } // namespace framework diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 2d77ed9434ff..58769fc8bc29 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -35,7 +35,7 @@ namespace framework{ // Hash code function for using in all hash maps of follow implementation. class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : - public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XDocumentHandler > + public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > { public: enum ToolBox_XML_Entry @@ -66,45 +66,45 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : TB_XML_NAMESPACES_COUNT }; - OReadToolBoxDocumentHandler( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rItemContainer ); + OReadToolBoxDocumentHandler( const css::uno::Reference< css::container::XIndexContainer >& rItemContainer ); virtual ~OReadToolBoxDocumentHandler(); // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement( const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDocumentLocator( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XLocator > &xLocator) + throw( css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception ) override; private: OUString getErrorLineString(); @@ -116,67 +116,67 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : { }; - bool m_bToolBarStartFound : 1; - bool m_bToolBarEndFound : 1; - bool m_bToolBarItemStartFound : 1; - bool m_bToolBarSpaceStartFound : 1; - bool m_bToolBarBreakStartFound : 1; - bool m_bToolBarSeparatorStartFound : 1; - ToolBoxHashMap m_aToolBoxMap; - com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > m_rItemContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; - - sal_Int32 m_nHashCode_Style_Radio; - sal_Int32 m_nHashCode_Style_Auto; - sal_Int32 m_nHashCode_Style_Left; - sal_Int32 m_nHashCode_Style_AutoSize; - sal_Int32 m_nHashCode_Style_DropDown; - sal_Int32 m_nHashCode_Style_Repeat; - sal_Int32 m_nHashCode_Style_DropDownOnly; - sal_Int32 m_nHashCode_Style_Text; - sal_Int32 m_nHashCode_Style_Image; - OUString m_aType; - OUString m_aLabel; - OUString m_aStyle; - OUString m_aHelpURL; - OUString m_aTooltip; - OUString m_aIsVisible; - OUString m_aCommandURL; + bool m_bToolBarStartFound : 1; + bool m_bToolBarEndFound : 1; + bool m_bToolBarItemStartFound : 1; + bool m_bToolBarSpaceStartFound : 1; + bool m_bToolBarBreakStartFound : 1; + bool m_bToolBarSeparatorStartFound : 1; + ToolBoxHashMap m_aToolBoxMap; + css::uno::Reference< css::container::XIndexContainer > m_rItemContainer; + css::uno::Reference< css::xml::sax::XLocator > m_xLocator; + + sal_Int32 m_nHashCode_Style_Radio; + sal_Int32 m_nHashCode_Style_Auto; + sal_Int32 m_nHashCode_Style_Left; + sal_Int32 m_nHashCode_Style_AutoSize; + sal_Int32 m_nHashCode_Style_DropDown; + sal_Int32 m_nHashCode_Style_Repeat; + sal_Int32 m_nHashCode_Style_DropDownOnly; + sal_Int32 m_nHashCode_Style_Text; + sal_Int32 m_nHashCode_Style_Image; + OUString m_aType; + OUString m_aLabel; + OUString m_aStyle; + OUString m_aHelpURL; + OUString m_aTooltip; + OUString m_aIsVisible; + OUString m_aCommandURL; }; class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler { public: OWriteToolBoxDocumentHandler( - const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccess, - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rDocumentHandler ); + const css::uno::Reference< css::container::XIndexAccess >& rItemAccess, + css::uno::Reference< css::xml::sax::XDocumentHandler >& rDocumentHandler ); virtual ~OWriteToolBoxDocumentHandler(); void WriteToolBoxDocument() throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); protected: void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, const OUString& aTooltip, sal_Int16 nStyle, sal_Int16 nWidth, bool bVisible ) throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); void WriteToolBoxSpace() throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); void WriteToolBoxBreak() throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); void WriteToolBoxSeparator() throw - ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ( css::xml::sax::SAXException, + css::uno::RuntimeException ); - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_rItemAccess; + css::uno::Reference< css::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; + css::uno::Reference< css::xml::sax::XAttributeList > m_xEmptyList; + css::uno::Reference< css::container::XIndexAccess > m_rItemAccess; OUString m_aXMLToolbarNS; OUString m_aXMLXlinkNS; OUString m_aAttributeType; diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx index e56b11a747ae..fab1dd2b8f68 100644 --- a/framework/inc/xml/xmlnamespaces.hxx +++ b/framework/inc/xml/xmlnamespaces.hxx @@ -36,21 +36,21 @@ class FWE_DLLPUBLIC XMLNamespaces virtual ~XMLNamespaces(); void addNamespace( const OUString& aName, const OUString& aValue ) - throw( ::com::sun::star::xml::sax::SAXException ); + throw( css::xml::sax::SAXException ); OUString applyNSToAttributeName( const OUString& ) const - throw( ::com::sun::star::xml::sax::SAXException, std::exception ); + throw( css::xml::sax::SAXException, std::exception ); OUString applyNSToElementName( const OUString& ) const - throw( ::com::sun::star::xml::sax::SAXException, std::exception ); + throw( css::xml::sax::SAXException, std::exception ); private: typedef ::std::map< OUString, OUString > NamespaceMap; OUString getNamespaceValue( const OUString& aNamespace ) const - throw( ::com::sun::star::xml::sax::SAXException ); + throw( css::xml::sax::SAXException ); - OUString m_aDefaultNamespace; - OUString m_aXMLAttributeNamespace; + OUString m_aDefaultNamespace; + OUString m_aXMLAttributeNamespace; NamespaceMap m_aNamespaceMap; }; diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 74ea13ffb1d5..d6ef53c6c6d6 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -1059,13 +1059,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::dispose() // nop } -void SAL_CALL XCUBasedAcceleratorConfiguration::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ ) +void SAL_CALL XCUBasedAcceleratorConfiguration::addEventListener( const css::uno::Reference< css::lang::XEventListener >& /*xListener*/ ) throw(css::uno::RuntimeException, std::exception) { // nop } -void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ ) +void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& /*xListener*/ ) throw(css::uno::RuntimeException, std::exception) { // nop diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 1db35686eac2..f9c059e187c7 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -111,7 +111,7 @@ private: DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lArguments) + const css::uno::Sequence< css::uno::Any >& lArguments) : DocumentAcceleratorConfiguration_BASE(xContext) { { diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 0d570a6b0974..cd48610c0fbe 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -78,7 +78,7 @@ public: } // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; /// This has to be called after when the instance is acquire()'d. void fillCache(); diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 87aa55344b87..582a1ad82580 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -66,7 +66,7 @@ public: */ ModuleAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lArguments); + const css::uno::Sequence< css::uno::Any >& lArguments); /** TODO */ virtual ~ModuleAcceleratorConfiguration(); @@ -104,7 +104,7 @@ private: ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lArguments) + const css::uno::Sequence< css::uno::Any >& lArguments) : ModuleAcceleratorConfiguration_BASE(xContext) { SolarMutexGuard g; diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 7c5649b382e6..e342560fa169 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -133,7 +133,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro if ( xFrame.is() && pMenuBar ) { - uno::Reference< ::com::sun::star::awt::XWindow >xContainerWindow = xFrame->getContainerWindow(); + uno::Reference< css::awt::XWindow >xContainerWindow = xFrame->getContainerWindow(); aGuard.reset(); { @@ -214,7 +214,7 @@ bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource uno::Reference< XFrame > xFrame( m_xOwnerWeak.get(), UNO_QUERY ); if ( xFrame.is() ) { - uno::Reference< ::com::sun::star::awt::XWindow >xContainerWindow = xFrame->getContainerWindow(); + uno::Reference< css::awt::XWindow >xContainerWindow = xFrame->getContainerWindow(); vcl::Window* pWindow = NULL; SolarMutexGuard aSolarGuard; @@ -237,7 +237,7 @@ bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource // remove listener before we destruct ourself, so we cannot be called back afterwards m_pMenuManager->RemoveListener(); - (static_cast< ::com::sun::star::uno::XInterface* >(static_cast<OWeakObject*>(m_pMenuManager)))->release(); + (static_cast< css::uno::XInterface* >(static_cast<OWeakObject*>(m_pMenuManager)))->release(); m_pMenuManager = 0; } diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 85aa8e12e82c..9839fd5933f8 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -74,7 +74,7 @@ Oxt_Handler::~Oxt_Handler() } /*-************************************************************************************************************ - @interface ::com::sun::star::frame::XDispatch + @interface css::frame::XDispatch @short try to load audio file @descr This method try to load given audio file by URL and play it. We use vcl/Sound class to do that. @@ -127,7 +127,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& } /*-************************************************************************************************************ - @interface ::com::sun::star::document::XExtendedFilterDetection + @interface css::document::XExtendedFilterDetection @short try to detect file (given as argument included in "lDescriptor") @descr We try to detect, if given file could be handled by this class and is a well known one. diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index 7cc366ff72f3..e4b7b0139f53 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -71,7 +71,7 @@ void ActionTriggerContainer::release() throw() // XMultiServiceFactory Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstance( const OUString& aServiceSpecifier ) -throw ( ::com::sun::star::uno::Exception, RuntimeException, std::exception) +throw ( css::uno::Exception, RuntimeException, std::exception) { if ( aServiceSpecifier == SERVICENAME_ACTIONTRIGGER ) return static_cast<OWeakObject *>( new ActionTriggerPropertySet()); @@ -80,7 +80,7 @@ throw ( ::com::sun::star::uno::Exception, RuntimeException, std::exception) else if ( aServiceSpecifier == SERVICENAME_ACTIONTRIGGERSEPARATOR ) return static_cast<OWeakObject *>( new ActionTriggerSeparatorPropertySet()); else - throw com::sun::star::uno::RuntimeException("Unknown service specifier!", static_cast<OWeakObject *>(this) ); + throw css::uno::RuntimeException("Unknown service specifier!", static_cast<OWeakObject *>(this) ); } Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 5161e62cc978..bce03cef00d9 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -47,7 +47,7 @@ const sal_uInt16 SID_HELPMENU = (SID_SFX_START + 410); namespace framework { -AddonMenu::AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) : +AddonMenu::AddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame ) : m_xFrame( rFrame ) { } @@ -70,7 +70,7 @@ bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL ) return aCmdURL.startsWith( ADDONSPOPUPMENU_URL_PREFIX_STR ); } -AddonPopupMenu::AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ) : +AddonPopupMenu::AddonPopupMenu( const css::uno::Reference< css::frame::XFrame >& rFrame ) : AddonMenu( rFrame ) { } diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx index 7ab6fd8221ce..1924eeb1c136 100644 --- a/framework/source/fwe/classes/imagewrapper.cxx +++ b/framework/source/fwe/classes/imagewrapper.cxx @@ -35,7 +35,7 @@ namespace framework static Sequence< sal_Int8 > impl_getStaticIdentifier() { static const sal_uInt8 pGUID[16] = { 0x46, 0xAD, 0x69, 0xFB, 0xA7, 0xBE, 0x44, 0x83, 0xB2, 0xA7, 0xB3, 0xEC, 0x59, 0x4A, 0xB7, 0x00 }; - static ::com::sun::star::uno::Sequence< sal_Int8 > seqID(reinterpret_cast<const sal_Int8*>(pGUID), 16); + static css::uno::Sequence< sal_Int8 > seqID(reinterpret_cast<const sal_Int8*>(pGUID), 16); return seqID; } @@ -53,14 +53,14 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId() } // XBitmap -com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException, std::exception ) +css::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; BitmapEx aBitmapEx( m_aImage.GetBitmapEx() ); Size aBitmapSize( aBitmapEx.GetSizePixel() ); - return com::sun::star::awt::Size( aBitmapSize.Width(), aBitmapSize.Height() ); + return css::awt::Size( aBitmapSize.Width(), aBitmapSize.Height() ); } Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException, std::exception ) diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 59a5102b2ca4..1ca2215404c3 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -40,7 +40,7 @@ namespace framework static Sequence< sal_Int8 > impl_getStaticIdentifier() { static const sal_uInt8 pGUID[16] = { 0x17, 0x0F, 0xA2, 0xC9, 0xCA, 0x50, 0x4A, 0xD3, 0xA6, 0x3B, 0x39, 0x99, 0xC5, 0x96, 0x43, 0x27 }; - static ::com::sun::star::uno::Sequence< sal_Int8 > seqID(reinterpret_cast<const sal_Int8*>(pGUID), 16); + static css::uno::Sequence< sal_Int8 > seqID(reinterpret_cast<const sal_Int8*>(pGUID), 16); return seqID; } @@ -99,7 +99,7 @@ throw ( Exception, RuntimeException, std::exception ) else if ( aServiceSpecifier == SERVICENAME_ACTIONTRIGGERSEPARATOR ) return static_cast<OWeakObject *>( new ActionTriggerSeparatorPropertySet()); else - throw com::sun::star::uno::RuntimeException("Unknown service specifier!", static_cast<OWeakObject *>(this) ); + throw css::uno::RuntimeException("Unknown service specifier!", static_cast<OWeakObject *>(this) ); } Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) @@ -196,13 +196,13 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std // XElementAccess Type SAL_CALL RootActionTriggerContainer::getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return cppu::UnoType<XPropertySet>::get(); } sal_Bool SAL_CALL RootActionTriggerContainer::hasElements() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { if ( m_pMenu ) { diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx index c04105ce2f5d..cc127bb3ca0a 100644 --- a/framework/source/fwe/classes/sfxhelperfunctions.cxx +++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx @@ -89,7 +89,7 @@ pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars p return pOldFunc; } -void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) +void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame >& rFrame ) { pfunc_getRefreshToolbars pCallback = NULL; { @@ -110,7 +110,7 @@ pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingW return pOldFunc; } -void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rResourceURL ) +void SAL_CALL CreateDockingWindow( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL ) { pfunc_createDockingWindow pFactory = NULL; { @@ -131,7 +131,7 @@ pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDocking return pOldFunc; } -bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rResourceURL ) +bool SAL_CALL IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL ) { pfunc_isDockingWindowVisible pCall = NULL; { @@ -153,7 +153,7 @@ pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i return pOldFunc; } -void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ) +void SAL_CALL ActivateToolPanel( const css::uno::Reference< css::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ) { pfunc_activateToolPanel pActivator = NULL; { diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 155d3f2e2b16..140dfafeea5e 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -45,7 +45,7 @@ namespace framework{ @devstatus ready to use @threadsafe no (used on once position only!) *//*-*************************************************************************************************************/ -class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterSelect > +class ContinuationFilterSelect : public comphelper::OInteraction< css::document::XInteractionFilterSelect > { // c++ interface public: @@ -53,8 +53,8 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st // uno interface public: - virtual void SAL_CALL setFilter( const OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getFilter( ) throw( css::uno::RuntimeException, std::exception ) override; // member private: @@ -83,7 +83,7 @@ OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::Runtime return m_sFilter; } -class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::task::XInteractionRequest > +class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper< css::task::XInteractionRequest > { public: RequestFilterSelect_Impl( const OUString& sURL ); @@ -91,14 +91,14 @@ public: OUString getFilter() const; public: - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getRequest() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override; private: - ::com::sun::star::uno::Any m_aRequest; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; - comphelper::OInteractionAbort* m_pAbort; - ContinuationFilterSelect* m_pFilter; + css::uno::Any m_aRequest; + css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > m_lContinuations; + comphelper::OInteractionAbort* m_pAbort; + ContinuationFilterSelect* m_pFilter; }; // initialize instance with all necessary information @@ -187,14 +187,14 @@ uno::Reference < task::XInteractionRequest > RequestFilterSelect::GetRequest() return uno::Reference < task::XInteractionRequest > (pImp); } -class InteractionRequest_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::task::XInteractionRequest > +class InteractionRequest_Impl : public ::cppu::WeakImplHelper< css::task::XInteractionRequest > { uno::Any m_aRequest; - uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations; + uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > m_lContinuations; public: - InteractionRequest_Impl( const ::com::sun::star::uno::Any& aRequest, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& lContinuations ) + InteractionRequest_Impl( const css::uno::Any& aRequest, + const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >& lContinuations ) { m_aRequest = aRequest; m_lContinuations = lContinuations; diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx index 24cd403b3a42..197456a3acae 100644 --- a/framework/source/fwe/helper/imageproducer.cxx +++ b/framework/source/fwe/helper/imageproducer.cxx @@ -33,7 +33,7 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc ) } Image SAL_CALL GetImageFromURL( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& aURL, bool bBig ) diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx index c9bde036021c..7b867d1df361 100644 --- a/framework/source/fwe/helper/propertysetcontainer.cxx +++ b/framework/source/fwe/helper/propertysetcontainer.cxx @@ -73,7 +73,7 @@ throw ( RuntimeException, std::exception ) } // XIndexContainer -void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) +void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { SolarMutexGuard g; @@ -120,7 +120,7 @@ void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex ) } // XIndexReplace -void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) +void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { if ( (sal_Int32)m_aPropertySetVector.size() > Index ) @@ -169,7 +169,7 @@ Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index ) // XElementAccess sal_Bool SAL_CALL PropertySetContainer::hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 1d2a8dd78cac..b2b378eaf787 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -44,7 +44,7 @@ namespace framework { MenuConfiguration::MenuConfiguration( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : m_xContext( rxContext ) { } @@ -94,7 +94,7 @@ Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML( else throw WrappedTargetException( aWrappedSAXException.Message, Reference< XInterface >(), Any() ); } - catch( const ::com::sun::star::io::IOException& e ) + catch( const css::io::IOException& e ) { throw WrappedTargetException( e.Message, Reference< XInterface >(), Any() ); } @@ -133,7 +133,7 @@ void MenuConfiguration::StoreMenuBarConfigurationToXML( { throw WrappedTargetException( e.Message, Reference< XInterface >(), Any() ); } - catch ( const ::com::sun::star::io::IOException& e ) + catch ( const css::io::IOException& e ) { throw WrappedTargetException( e.Message, Reference< XInterface >(), Any() ); } diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 976553c73cca..7c1247e9bb2a 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -100,9 +100,9 @@ struct MenuStyleItem }; MenuStyleItem MenuItemStyles[ ] = { - { ::com::sun::star::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE }, - { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT }, - { ::com::sun::star::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO } + { css::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE }, + { css::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT }, + { css::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO } }; sal_Int32 nMenuStyleItemEntries = (sizeof (MenuItemStyles) / sizeof (MenuItemStyles[0])); @@ -211,7 +211,7 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon( rProps[2].Value <<= Reference< XIndexContainer >(); rProps[3].Value <<= rLabel; rProps[4].Value <<= nItemStyleBits; - rProps[5].Value <<= ::com::sun::star::ui::ItemType::DEFAULT; + rProps[5].Value <<= css::ui::ItemType::DEFAULT; } OReadMenuDocumentHandler::OReadMenuDocumentHandler( @@ -364,11 +364,11 @@ throw( SAXException, RuntimeException, std::exception ) if ( !aToken.isEmpty() ) { if ( aToken == ATTRIBUTE_ITEMSTYLE_TEXT ) - nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT; + nItemBits |= css::ui::ItemStyle::TEXT; else if ( aToken == ATTRIBUTE_ITEMSTYLE_IMAGE ) - nItemBits |= ::com::sun::star::ui::ItemStyle::ICON; + nItemBits |= css::ui::ItemStyle::ICON; else if ( aToken == ATTRIBUTE_ITEMSTYLE_RADIO ) - nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; + nItemBits |= css::ui::ItemStyle::RADIO_CHECK; } } while ( nIndex >= 0 ); @@ -575,11 +575,11 @@ throw( SAXException, RuntimeException, std::exception ) if ( !aToken.isEmpty() ) { if ( aToken == ATTRIBUTE_ITEMSTYLE_TEXT ) - nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT; + nItemBits |= css::ui::ItemStyle::TEXT; else if ( aToken == ATTRIBUTE_ITEMSTYLE_IMAGE ) - nItemBits |= ::com::sun::star::ui::ItemStyle::ICON; + nItemBits |= css::ui::ItemStyle::ICON; else if ( aToken == ATTRIBUTE_ITEMSTYLE_RADIO ) - nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; + nItemBits |= css::ui::ItemStyle::RADIO_CHECK; } } while ( nIndex >= 0 ); @@ -632,11 +632,11 @@ throw( SAXException, RuntimeException, std::exception ) if ( !aToken.isEmpty() ) { if ( aToken == ATTRIBUTE_ITEMSTYLE_TEXT ) - nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT; + nItemBits |= css::ui::ItemStyle::TEXT; else if ( aToken == ATTRIBUTE_ITEMSTYLE_IMAGE ) - nItemBits |= ::com::sun::star::ui::ItemStyle::ICON; + nItemBits |= css::ui::ItemStyle::ICON; else if ( aToken == ATTRIBUTE_ITEMSTYLE_RADIO ) - nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; + nItemBits |= css::ui::ItemStyle::RADIO_CHECK; } } while ( nIndex >= 0 ); @@ -659,7 +659,7 @@ throw( SAXException, RuntimeException, std::exception ) { Sequence< PropertyValue > aMenuSeparator( 1 ); aMenuSeparator[0].Name = ITEM_DESCRIPTOR_TYPE; - aMenuSeparator[0].Value <<= ::com::sun::star::ui::ItemType::SEPARATOR_LINE; + aMenuSeparator[0].Value <<= css::ui::ItemType::SEPARATOR_LINE; m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(), makeAny( aMenuSeparator ) ); @@ -792,7 +792,7 @@ throw ( SAXException, RuntimeException ) OUString aCommandURL; OUString aLabel; OUString aHelpURL; - sal_Int16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); + sal_Int16 nType( css::ui::ItemType::DEFAULT ); sal_Int16 nItemBits( 0 ); Reference< XIndexAccess > xSubMenu; @@ -837,7 +837,7 @@ throw ( SAXException, RuntimeException ) } else { - if ( nType == ::com::sun::star::ui::ItemType::DEFAULT ) + if ( nType == css::ui::ItemType::DEFAULT ) { if ( !aCommandURL.isEmpty() ) { diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 69aaf0c097c6..2615f241dee8 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -71,7 +71,7 @@ bool StatusBarConfiguration::LoadStatusBar( { return false; } - catch( const ::com::sun::star::io::IOException& ) + catch( const css::io::IOException& ) { return false; } @@ -99,7 +99,7 @@ bool StatusBarConfiguration::StoreStatusBar( { return false; } - catch ( const ::com::sun::star::io::IOException& ) + catch ( const css::io::IOException& ) { return false; } diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index ff10d0278a9a..323b34a1b1ab 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -385,7 +385,7 @@ throw( SAXException, RuntimeException, std::exception ) aStatusbarItemProp[2].Value <<= nOffset; aStatusbarItemProp[3].Value <<= nItemBits; aStatusbarItemProp[4].Value <<= nWidth; - aStatusbarItemProp[5].Value = makeAny( ::com::sun::star::ui::ItemType::DEFAULT ); + aStatusbarItemProp[5].Value = makeAny( css::ui::ItemType::DEFAULT ); m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) ); } diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index 013702dec886..11460f9a0a73 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -41,9 +41,9 @@ namespace framework { bool ToolBoxConfiguration::LoadToolBox( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration ) + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::io::XInputStream >& rInputStream, + const css::uno::Reference< css::container::XIndexContainer >& rToolbarConfiguration ) { Reference< XParser > xParser = Parser::create(rxContext); @@ -72,16 +72,16 @@ bool ToolBoxConfiguration::LoadToolBox( { return false; } - catch( const ::com::sun::star::io::IOException& ) + catch( const css::io::IOException& ) { return false; } } bool ToolBoxConfiguration::StoreToolBox( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolbarConfiguration ) + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::io::XOutputStream >& rOutputStream, + const css::uno::Reference< css::container::XIndexAccess >& rToolbarConfiguration ) { Reference< XWriter > xWriter = Writer::create(rxContext); xWriter->setOutputStream( rOutputStream ); @@ -101,7 +101,7 @@ bool ToolBoxConfiguration::StoreToolBox( { return false; } - catch ( const ::com::sun::star::io::IOException& ) + catch ( const css::io::IOException& ) { return false; } diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 013fad37f77f..922fe4497d9d 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -96,14 +96,14 @@ struct ToolboxStyleItem }; ToolboxStyleItem Styles[ ] = { - { ::com::sun::star::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO }, - { ::com::sun::star::ui::ItemStyle::ALIGN_LEFT, ATTRIBUTE_ITEMSTYLE_LEFT }, - { ::com::sun::star::ui::ItemStyle::AUTO_SIZE, ATTRIBUTE_ITEMSTYLE_AUTO }, - { ::com::sun::star::ui::ItemStyle::REPEAT, ATTRIBUTE_ITEMSTYLE_REPEAT }, - { ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY, ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY }, - { ::com::sun::star::ui::ItemStyle::DROP_DOWN, ATTRIBUTE_ITEMSTYLE_DROPDOWN }, - { ::com::sun::star::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE }, - { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT }, + { css::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO }, + { css::ui::ItemStyle::ALIGN_LEFT, ATTRIBUTE_ITEMSTYLE_LEFT }, + { css::ui::ItemStyle::AUTO_SIZE, ATTRIBUTE_ITEMSTYLE_AUTO }, + { css::ui::ItemStyle::REPEAT, ATTRIBUTE_ITEMSTYLE_REPEAT }, + { css::ui::ItemStyle::DROPDOWN_ONLY, ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY }, + { css::ui::ItemStyle::DROP_DOWN, ATTRIBUTE_ITEMSTYLE_DROPDOWN }, + { css::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE }, + { css::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT }, }; sal_Int32 nStyleItemEntries = sizeof (Styles) / sizeof (Styles[0]); @@ -372,21 +372,21 @@ throw( SAXException, RuntimeException, std::exception ) { sal_Int32 nHashCode = aToken.hashCode(); if ( nHashCode == m_nHashCode_Style_Radio ) - nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; + nItemBits |= css::ui::ItemStyle::RADIO_CHECK; else if ( nHashCode == m_nHashCode_Style_Left ) - nItemBits |= ::com::sun::star::ui::ItemStyle::ALIGN_LEFT; + nItemBits |= css::ui::ItemStyle::ALIGN_LEFT; else if ( nHashCode == m_nHashCode_Style_AutoSize ) - nItemBits |= ::com::sun::star::ui::ItemStyle::AUTO_SIZE; + nItemBits |= css::ui::ItemStyle::AUTO_SIZE; else if ( nHashCode == m_nHashCode_Style_Repeat ) - nItemBits |= ::com::sun::star::ui::ItemStyle::REPEAT; + nItemBits |= css::ui::ItemStyle::REPEAT; else if ( nHashCode == m_nHashCode_Style_DropDownOnly ) - nItemBits |= ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY; + nItemBits |= css::ui::ItemStyle::DROPDOWN_ONLY; else if ( nHashCode == m_nHashCode_Style_DropDown ) - nItemBits |= ::com::sun::star::ui::ItemStyle::DROP_DOWN; + nItemBits |= css::ui::ItemStyle::DROP_DOWN; else if ( nHashCode == m_nHashCode_Style_Text ) - nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT; + nItemBits |= css::ui::ItemStyle::TEXT; else if ( nHashCode == m_nHashCode_Style_Image ) - nItemBits |= ::com::sun::star::ui::ItemStyle::ICON; + nItemBits |= css::ui::ItemStyle::ICON; } } while ( nIndex >= 0 ); @@ -438,7 +438,7 @@ throw( SAXException, RuntimeException, std::exception ) aToolbarItemProp[0].Value <<= aCommandURL; aToolbarItemProp[1].Value <<= aHelpURL; aToolbarItemProp[2].Value <<= aLabel; - aToolbarItemProp[3].Value = makeAny( ::com::sun::star::ui::ItemType::DEFAULT ); + aToolbarItemProp[3].Value = makeAny( css::ui::ItemType::DEFAULT ); aToolbarItemProp[4].Value <<= nItemBits; aToolbarItemProp[5].Value <<= bVisible; aToolbarItemProp[6].Value <<= aTooltip; @@ -467,7 +467,7 @@ throw( SAXException, RuntimeException, std::exception ) aToolbarItemProp[1].Name = m_aType; aToolbarItemProp[0].Value <<= OUString(); - aToolbarItemProp[1].Value <<= ::com::sun::star::ui::ItemType::SEPARATOR_SPACE; + aToolbarItemProp[1].Value <<= css::ui::ItemType::SEPARATOR_SPACE; m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) ); } @@ -492,7 +492,7 @@ throw( SAXException, RuntimeException, std::exception ) aToolbarItemProp[1].Name = m_aType; aToolbarItemProp[0].Value <<= OUString(); - aToolbarItemProp[1].Value <<= ::com::sun::star::ui::ItemType::SEPARATOR_LINEBREAK; + aToolbarItemProp[1].Value <<= css::ui::ItemType::SEPARATOR_LINEBREAK; m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) ); } @@ -517,7 +517,7 @@ throw( SAXException, RuntimeException, std::exception ) aToolbarItemProp[1].Name = m_aType; aToolbarItemProp[0].Value <<= OUString(); - aToolbarItemProp[1].Value <<= ::com::sun::star::ui::ItemType::SEPARATOR_LINE; + aToolbarItemProp[1].Value <<= css::ui::ItemType::SEPARATOR_LINE; m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) ); } @@ -729,18 +729,18 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw OUString aHelpURL; OUString aTooltip; bool bVisible( true ); - sal_Int16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); + sal_Int16 nType( css::ui::ItemType::DEFAULT ); sal_Int16 nWidth( 0 ); sal_Int16 nStyle( 0 ); ExtractToolbarParameters( aProps, aCommandURL, aLabel, aHelpURL, aTooltip, nStyle, nWidth, bVisible, nType ); - if ( nType == ::com::sun::star::ui::ItemType::DEFAULT ) + if ( nType == css::ui::ItemType::DEFAULT ) WriteToolBoxItem( aCommandURL, aLabel, aHelpURL, aTooltip, nStyle, nWidth, bVisible ); - else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_SPACE ) + else if ( nType == css::ui::ItemType::SEPARATOR_SPACE ) WriteToolBoxSpace(); - else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_LINE ) + else if ( nType == css::ui::ItemType::SEPARATOR_LINE ) WriteToolBoxSeparator(); - else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_LINEBREAK ) + else if ( nType == css::ui::ItemType::SEPARATOR_LINEBREAK ) WriteToolBoxBreak(); } } diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx index 06cc06131f29..7201de053ba9 100644 --- a/framework/source/fwi/helper/mischelper.cxx +++ b/framework/source/fwi/helper/mischelper.cxx @@ -122,7 +122,7 @@ OUString RetrieveLabelFromCommand( aLabel = aStr; } } - catch ( const com::sun::star::uno::Exception& ) + catch ( const css::uno::Exception& ) { } } @@ -166,7 +166,7 @@ void FillLangItems( std::set< OUString > &rLangItems, uno::Reference< linguistic2::XLanguageGuessing > xLangGuesser( rLangGuessHelper.GetGuesser() ); if ( xLangGuesser.is() && !rGuessedTextLang.isEmpty()) { - ::com::sun::star::lang::Locale aLocale(xLangGuesser->guessPrimaryLanguage( rGuessedTextLang, 0, rGuessedTextLang.getLength()) ); + css::lang::Locale aLocale(xLangGuesser->guessPrimaryLanguage( rGuessedTextLang, 0, rGuessedTextLang.getLength()) ); LanguageType nLang = LanguageTag( aLocale ).makeFallback().getLanguageType(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_NONE && nLang != LANGUAGE_SYSTEM && IsScriptTypeMatchingToLanguage( nScriptType, nLang )) @@ -181,10 +181,10 @@ void FillLangItems( std::set< OUString > &rLangItems, } //6--all languages used in current document - Reference< com::sun::star::frame::XModel > xModel; + Reference< css::frame::XModel > xModel; if ( rxFrame.is() ) { - Reference< com::sun::star::frame::XController > xController( rxFrame->getController(), UNO_QUERY ); + Reference< css::frame::XController > xController( rxFrame->getController(), UNO_QUERY ); if ( xController.is() ) xModel = xController->getModel(); } diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index d2a4b07f3c90..75e1e0e991c9 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -163,7 +163,7 @@ Reference< XIndexAccess > ConstItemContainer::deepCopyContainer( const Reference } // XUnoTunnel -sal_Int64 ConstItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 ConstItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) { if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ConstItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) { @@ -182,9 +182,9 @@ const Sequence< sal_Int8 >& ConstItemContainer::GetUnoTunnelId() throw() return theConstItemContainerUnoTunnelId::get().getSeq(); } -ConstItemContainer* ConstItemContainer::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw() +ConstItemContainer* ConstItemContainer::GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw() { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY ); return xUT.is() ? reinterpret_cast< ConstItemContainer* >(sal::static_int_cast< sal_IntPtr >( xUT->getSomething( ConstItemContainer::GetUnoTunnelId() ))) : NULL; } @@ -214,7 +214,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std // XPropertySet Reference< XPropertySetInfo > SAL_CALL ConstItemContainer::getPropertySetInfo() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -239,12 +239,12 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } void SAL_CALL ConstItemContainer::setPropertyValue( const OUString&, const Any& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } Any SAL_CALL ConstItemContainer::getPropertyValue( const OUString& PropertyName ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if ( PropertyName == PROPNAME_UINAME ) return makeAny( m_aUIName ); @@ -252,37 +252,37 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang throw UnknownPropertyException(); } -void SAL_CALL ConstItemContainer::addPropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ConstItemContainer::addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) +throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } -void SAL_CALL ConstItemContainer::removePropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ConstItemContainer::removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) +throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { // Only read-only properties - do nothing } -void SAL_CALL ConstItemContainer::addVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ConstItemContainer::addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) +throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { // Only read-only properties - do nothing } -void SAL_CALL ConstItemContainer::removeVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ConstItemContainer::removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) +throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { // Only read-only properties - do nothing } // XFastPropertySet -void SAL_CALL ConstItemContainer::setFastPropertyValue( sal_Int32, const ::com::sun::star::uno::Any& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ConstItemContainer::setFastPropertyValue( sal_Int32, const css::uno::Any& ) +throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if ( nHandle == PROPHANDLE_UINAME ) return makeAny( m_aUIName ); @@ -316,7 +316,7 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang return(*pInfoHelper); } -const com::sun::star::uno::Sequence< com::sun::star::beans::Property > ConstItemContainer::impl_getStaticPropertyDescriptor() +const css::uno::Sequence< css::beans::Property > ConstItemContainer::impl_getStaticPropertyDescriptor() { // Create a property array to initialize sequence! // Table of all predefined properties of this class. Its used from OPropertySetHelper-class! @@ -325,14 +325,14 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > ConstItem // ATTENTION: // YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!! - const com::sun::star::beans::Property pProperties[] = + const css::beans::Property pProperties[] = { - com::sun::star::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , + css::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , cppu::UnoType<OUString>::get(), - com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) + css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! - const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT ); + const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT ); // Return "PropertyDescriptor" return lPropertyDescriptor; } diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index e2bfbb5490c2..92e96a493fd0 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -27,7 +27,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; -const char WRONG_TYPE_EXCEPTION[] = "Type must be com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >"; +const char WRONG_TYPE_EXCEPTION[] = "Type must be css::uno::Sequence< css::beans::PropertyValue >"; namespace framework { @@ -139,9 +139,9 @@ const Sequence< sal_Int8 >& ItemContainer::GetUnoTunnelId() throw() return theItemContainerUnoTunnelId::get().getSeq(); } -ItemContainer* ItemContainer::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw() +ItemContainer* ItemContainer::GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw() { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY ); return xUT.is() ? reinterpret_cast< ItemContainer* >(sal::static_int_cast< sal_IntPtr >( xUT->getSomething( ItemContainer::GetUnoTunnelId() ))) : NULL; } diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 2b2cf4e2ab4e..c08a1ca58e73 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; -const char WRONG_TYPE_EXCEPTION[] = "Type must be com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >"; +const char WRONG_TYPE_EXCEPTION[] = "Type must be css::uno::Sequence< css::beans::PropertyValue >"; const int PROPHANDLE_UINAME = 1; const int PROPCOUNT = 1; @@ -140,7 +140,7 @@ Reference< XIndexAccess > RootItemContainer::deepCopyContainer( const Reference< } // XUnoTunnel -sal_Int64 RootItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 RootItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) { if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( RootItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this )); @@ -157,9 +157,9 @@ const Sequence< sal_Int8 >& RootItemContainer::GetUnoTunnelId() throw() return theRootItemContainerUnoTunnelId::get().getSeq(); } -RootItemContainer* RootItemContainer::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw() +RootItemContainer* RootItemContainer::GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw() { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY ); return xUT.is() ? reinterpret_cast< RootItemContainer* >(sal::static_int_cast< sal_IntPtr >( xUT->getSomething( RootItemContainer::GetUnoTunnelId() ))) : NULL; } @@ -258,7 +258,7 @@ sal_Bool SAL_CALL RootItemContainer::convertFastPropertyValue( Any& aConve Any& aOldValue , sal_Int32 nHandle , const Any& aValue ) -throw( com::sun::star::lang::IllegalArgumentException ) +throw( css::lang::IllegalArgumentException ) { // Initialize state with sal_False !!! // (Handle can be invalid) @@ -268,7 +268,7 @@ throw( com::sun::star::lang::IllegalArgumentException ) { case PROPHANDLE_UINAME: bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_aUIName), + css::uno::makeAny(m_aUIName), aValue, aOldValue, aConvertedValue); @@ -280,8 +280,8 @@ throw( com::sun::star::lang::IllegalArgumentException ) } void SAL_CALL RootItemContainer::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) -throw( com::sun::star::uno::Exception, std::exception ) + const css::uno::Any& aValue ) +throw( css::uno::Exception, std::exception ) { switch( nHandle ) { @@ -291,7 +291,7 @@ throw( com::sun::star::uno::Exception, std::exception ) } } -void SAL_CALL RootItemContainer::getFastPropertyValue( com::sun::star::uno::Any& aValue , +void SAL_CALL RootItemContainer::getFastPropertyValue( css::uno::Any& aValue , sal_Int32 nHandle ) const { switch( nHandle ) @@ -328,13 +328,13 @@ void SAL_CALL RootItemContainer::getFastPropertyValue( com::sun::star::uno::Any& return(*pInfoHelper); } -com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL RootItemContainer::getPropertySetInfo() -throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL RootItemContainer::getPropertySetInfo() +throw (css::uno::RuntimeException, std::exception) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >* pInfo = NULL; + static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = NULL; if( pInfo == NULL ) { @@ -345,7 +345,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) { // Create structure of propertysetinfo for baseclass "OPropertySetHelper". // (Use method "getInfoHelper()".) - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); pInfo = &xInfo; } } @@ -353,7 +353,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) return (*pInfo); } -const com::sun::star::uno::Sequence< com::sun::star::beans::Property > RootItemContainer::impl_getStaticPropertyDescriptor() +const css::uno::Sequence< css::beans::Property > RootItemContainer::impl_getStaticPropertyDescriptor() { // Create a property array to initialize sequence! // Table of all predefined properties of this class. Its used from OPropertySetHelper-class! @@ -362,14 +362,14 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > RootItemC // ATTENTION: // YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!! - const com::sun::star::beans::Property pProperties[] = + const css::beans::Property pProperties[] = { - com::sun::star::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , + css::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , cppu::UnoType<OUString>::get(), - com::sun::star::beans::PropertyAttribute::TRANSIENT ) + css::beans::PropertyAttribute::TRANSIENT ) }; // Use it to initialize sequence! - const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT ); + const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT ); // Return "PropertyDescriptor" return lPropertyDescriptor; } diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index a31cdb20e70b..9343024d351b 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -93,12 +93,12 @@ Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( ) throw(Runtime } // XComponent -void SAL_CALL UIConfigElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigElementWrapperBase::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } -void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) { m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), aListener ); } @@ -145,22 +145,22 @@ throw ( Exception, RuntimeException, std::exception ) } // XUpdatable -void SAL_CALL UIConfigElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigElementWrapperBase::update() throw (css::uno::RuntimeException, std::exception) { // can be implemented by derived class } -void SAL_CALL UIConfigElementWrapperBase::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigElementWrapperBase::elementInserted( const css::ui::ConfigurationEvent& ) throw (css::uno::RuntimeException, std::exception) { // can be implemented by derived class } -void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const css::ui::ConfigurationEvent& ) throw (css::uno::RuntimeException, std::exception) { // can be implemented by derived class } -void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const css::ui::ConfigurationEvent& ) throw (css::uno::RuntimeException, std::exception) { // can be implemented by derived class } @@ -169,7 +169,7 @@ void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const ::com::sun::sta sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& aConvertedValue , Any& aOldValue , sal_Int32 nHandle , - const Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) + const Any& aValue ) throw( css::lang::IllegalArgumentException ) { // Initialize state with sal_False !!! // (Handle can be invalid) @@ -179,7 +179,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& { case UIELEMENT_PROPHANDLE_CONFIGLISTENER: bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_bConfigListener), + css::uno::makeAny(m_bConfigListener), aValue, aOldValue, aConvertedValue); @@ -187,7 +187,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& case UIELEMENT_PROPHANDLE_CONFIGSOURCE: bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_xConfigSource), + css::uno::makeAny(m_xConfigSource), aValue, aOldValue, aConvertedValue); @@ -197,7 +197,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& { Reference< XFrame > xFrame( m_xWeakFrame ); bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(xFrame), + css::uno::makeAny(xFrame), aValue, aOldValue, aConvertedValue); @@ -206,7 +206,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& case UIELEMENT_PROPHANDLE_PERSISTENT: bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_bPersistent), + css::uno::makeAny(m_bPersistent), aValue, aOldValue, aConvertedValue); @@ -214,7 +214,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& case UIELEMENT_PROPHANDLE_RESOURCEURL: bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_aResourceURL), + css::uno::makeAny(m_aResourceURL), aValue, aOldValue, aConvertedValue); @@ -222,7 +222,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& case UIELEMENT_PROPHANDLE_TYPE : bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_nType), + css::uno::makeAny(m_nType), aValue, aOldValue, aConvertedValue); @@ -230,7 +230,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& case UIELEMENT_PROPHANDLE_XMENUBAR : bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_xMenuBar), + css::uno::makeAny(m_xMenuBar), aValue, aOldValue, aConvertedValue); @@ -238,7 +238,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& case UIELEMENT_PROPHANDLE_NOCLOSE: bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_bNoClose), + css::uno::makeAny(m_bNoClose), aValue, aOldValue, aConvertedValue); @@ -250,7 +250,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& } void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) + const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) { switch( nHandle ) { @@ -338,7 +338,7 @@ void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sa } } -void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( com::sun::star::uno::Any& aValue , +void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( css::uno::Any& aValue , sal_Int32 nHandle ) const { switch( nHandle ) @@ -399,12 +399,12 @@ void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( com::sun::star:: return(*pInfoHelper); } -com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >* pInfo = NULL; + static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = NULL; if( pInfo == NULL ) { @@ -415,7 +415,7 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CA { // Create structure of propertysetinfo for baseclass "OPropertySetHelper". // (Use method "getInfoHelper()".) - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); pInfo = &xInfo; } } @@ -423,7 +423,7 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CA return (*pInfo); } -const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigElementWrapperBase::impl_getStaticPropertyDescriptor() +const css::uno::Sequence< css::beans::Property > UIConfigElementWrapperBase::impl_getStaticPropertyDescriptor() { // Create property array to initialize sequence! // Table of all predefined properties of this class. Its used from OPropertySetHelper-class! @@ -432,19 +432,19 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigE // ATTENTION: // YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!! - const com::sun::star::beans::Property pProperties[] = + const css::beans::Property pProperties[] = { - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , cppu::UnoType<sal_Bool>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE , cppu::UnoType<com::sun::star::ui::XUIConfigurationManager>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , cppu::UnoType<com::sun::star::frame::XFrame>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE , cppu::UnoType<sal_Bool>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT , cppu::UnoType<sal_Bool>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , cppu::UnoType<OUString>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , cppu::UnoType<OUString>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR , cppu::UnoType<com::sun::star::awt::XMenuBar>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) + css::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , cppu::UnoType<sal_Bool>::get(), css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE , cppu::UnoType<css::ui::XUIConfigurationManager>::get(), css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , cppu::UnoType<css::frame::XFrame>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE , cppu::UnoType<sal_Bool>::get(), css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT , cppu::UnoType<sal_Bool>::get(), css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR , cppu::UnoType<css::awt::XMenuBar>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! - const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); + const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); // Return "PropertyDescriptor" return lPropertyDescriptor; } diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index b8780f214440..adcf2a85392b 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -73,12 +73,12 @@ Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( ) throw(RuntimeExcept ); } -void SAL_CALL UIElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIElementWrapperBase::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } -void SAL_CALL UIElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIElementWrapperBase::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } @@ -111,24 +111,24 @@ throw ( Exception, RuntimeException, std::exception ) } // XUIElement -::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( m_xWeakFrame ); + css::uno::Reference< css::frame::XFrame > xFrame( m_xWeakFrame ); return xFrame; } -OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (css::uno::RuntimeException, std::exception) { return m_aResourceURL; } -::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (css::uno::RuntimeException, std::exception) { return m_nType; } // XUpdatable -void SAL_CALL UIElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIElementWrapperBase::update() throw (css::uno::RuntimeException, std::exception) { // can be implemented by derived class } @@ -137,7 +137,7 @@ void SAL_CALL UIElementWrapperBase::update() throw (::com::sun::star::uno::Runti sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any& /*aConvertedValue*/ , Any& /*aOldValue*/ , sal_Int32 /*nHandle*/ , - const Any& /*aValue*/ ) throw( com::sun::star::lang::IllegalArgumentException ) + const Any& /*aValue*/ ) throw( css::lang::IllegalArgumentException ) { // Initialize state with sal_False !!! // (Handle can be invalid) @@ -145,11 +145,11 @@ sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any& /*a } void SAL_CALL UIElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/ , - const com::sun::star::uno::Any& /*aValue*/ ) throw( com::sun::star::uno::Exception, std::exception ) + const css::uno::Any& /*aValue*/ ) throw( css::uno::Exception, std::exception ) { } -void SAL_CALL UIElementWrapperBase::getFastPropertyValue( com::sun::star::uno::Any& aValue , +void SAL_CALL UIElementWrapperBase::getFastPropertyValue( css::uno::Any& aValue , sal_Int32 nHandle ) const { switch( nHandle ) @@ -193,12 +193,12 @@ void SAL_CALL UIElementWrapperBase::getFastPropertyValue( com::sun::star::uno::A return(*pInfoHelper); } -com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >* pInfo = NULL; + static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = NULL; if( pInfo == NULL ) { @@ -209,7 +209,7 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CA { // Create structure of propertysetinfo for baseclass "OPropertySetHelper". // (Use method "getInfoHelper()".) - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); pInfo = &xInfo; } } @@ -217,7 +217,7 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CA return (*pInfo); } -const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIElementWrapperBase::impl_getStaticPropertyDescriptor() +const css::uno::Sequence< css::beans::Property > UIElementWrapperBase::impl_getStaticPropertyDescriptor() { // Create a property array to initialize sequence! // Table of all predefined properties of this class. Its used from OPropertySetHelper-class! @@ -226,14 +226,14 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIElement // ATTENTION: // YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!! - const com::sun::star::beans::Property pProperties[] = + const css::beans::Property pProperties[] = { - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , cppu::UnoType<XFrame>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , cppu::UnoType<sal_Int16>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , cppu::UnoType<OUString>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) + css::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , cppu::UnoType<XFrame>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , cppu::UnoType<sal_Int16>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! - const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); + const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); // Return "PropertyDescriptor" return lPropertyDescriptor; } diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 4d5da66ee75e..be267721a675 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -354,9 +354,9 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper< throw(css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // helper for derived classes diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 6ea5cd4f4b56..79d0ff84a1ce 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -215,7 +215,7 @@ class PresetHandler cached then internally till the last instance of such PresetHandler dies. - @return com::sun::star::embed::XStorage + @return css::embed::XStorage which represent a root storage. */ css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageShare(); @@ -226,7 +226,7 @@ class PresetHandler @descr Working storages are the "lowest" storages, where the preset and target files exists. - @return com::sun::star::embed::XStorage + @return css::embed::XStorage which the current working storage. */ css::uno::Reference< css::embed::XStorage > getWorkingStorageShare(); @@ -238,7 +238,7 @@ class PresetHandler @param xChild the child storage where a paranet storage should be searched for. - @return com::sun::star::embed::XStorage + @return css::embed::XStorage A valid storage if a paranet exists. NULL otherwise. */ css::uno::Reference< css::embed::XStorage > getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& xChild); @@ -275,7 +275,7 @@ class PresetHandler will work in default mode - means "no locale" - automatically. e.g. "/default.xml" - @throw com::sun::star::uno::RuntimeException(!) + @throw css::uno::RuntimeException(!) if the specified resource couldn't be located. */ void connectToResource( EConfigType eConfigType , @@ -298,10 +298,10 @@ class PresetHandler @param sTarget the ALIAS name of the target. - @throw com::sun::star::container::NoSuchElementException + @throw css::container::NoSuchElementException if the specified preset does not exists. - @throw com::sun::star::io::IOException + @throw css::io::IOException if copying failed. */ void copyPresetToTarget(const OUString& sPreset, diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index 8f72381482f6..69404486885c 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -26,7 +26,7 @@ namespace framework{ /** @short implements a guard, which can use the interface - <type scope="com::sun::star::document">XActionLockable</type>. + <type scope="css::document">XActionLockable</type>. @descr This guard should be used to be sure, that any lock will be released. Otherwise the locked document can hinder the office on shutdown! diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 84ed9ca17988..b637b66bc200 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -77,7 +77,7 @@ private: ConfigAccess m_aConfig; /** helper to allow us listen to the configuration without a cyclic dependency */ - com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> m_xConfigListener; + css::uno::Reference<css::container::XContainerListener> m_xConfigListener; virtual void SAL_CALL disposing() override; diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 5fdbf9a06c9e..898a0e43c6b8 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -39,17 +39,17 @@ using namespace com::sun::star; namespace framework { -bool hasEmptySize( const ::com::sun::star::awt::Size& rSize ) +bool hasEmptySize( const css::awt::Size& rSize ) { return ( rSize.Width == 0 ) && ( rSize.Height == 0 ); } -bool hasDefaultPosValue( const ::com::sun::star::awt::Point& rPos ) +bool hasDefaultPosValue( const css::awt::Point& rPos ) { return (( rPos.X == SAL_MAX_INT32 ) || ( rPos.Y == SAL_MAX_INT32 )); } -bool isDefaultPos( const ::com::sun::star::awt::Point& rPos ) +bool isDefaultPos( const css::awt::Point& rPos ) { return (( rPos.X == SAL_MAX_INT32 ) && ( rPos.Y == SAL_MAX_INT32 )); } @@ -224,7 +224,7 @@ void parseResourceURL( const OUString& aResourceURL, OUString& aElementType, OUS } } -::com::sun::star::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect ) +css::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect ) { css::awt::Rectangle aRect; aRect.X = rRect.Left(); @@ -235,7 +235,7 @@ void parseResourceURL( const OUString& aResourceURL, OUString& aElementType, OUS return aRect; } -::Rectangle putAWTToRectangle( const ::com::sun::star::awt::Rectangle& rRect ) +::Rectangle putAWTToRectangle( const css::awt::Rectangle& rRect ) { ::Rectangle aRect; aRect.Left() = rRect.X; diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx index dbb017661176..921a50a98c0b 100644 --- a/framework/source/layoutmanager/helpers.hxx +++ b/framework/source/layoutmanager/helpers.hxx @@ -44,31 +44,31 @@ namespace framework { -bool hasEmptySize( const ::com::sun::star::awt::Size& rSize ); -bool hasDefaultPosValue( const ::com::sun::star::awt::Point& rPos ); -bool isDefaultPos( const ::com::sun::star::awt::Point& rPos ); +bool hasEmptySize( const css::awt::Size& rSize ); +bool hasDefaultPosValue( const css::awt::Point& rPos ); +bool isDefaultPos( const css::awt::Point& rPos ); bool isToolboxHorizontalAligned( ToolBox* pToolBox ); bool isReverseOrderDockingArea( const sal_Int32 nDockArea ); bool isHorizontalDockingArea( const sal_Int32 nDockArea ); -bool isHorizontalDockingArea( const ::com::sun::star::ui::DockingArea& nDockArea ); +bool isHorizontalDockingArea( const css::ui::DockingArea& nDockArea ); OUString retrieveToolbarNameFromHelpURL( vcl::Window* pWindow ); ToolBox* getToolboxPtr( vcl::Window* pWindow ); -vcl::Window* getWindowFromXUIElement( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& xUIElement ); -SystemWindow* getTopSystemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xWindow ); +vcl::Window* getWindowFromXUIElement( const css::uno::Reference< css::ui::XUIElement >& xUIElement ); +SystemWindow* getTopSystemWindow( const css::uno::Reference< css::awt::XWindow >& xWindow ); bool equalRectangles( const css::awt::Rectangle& rRect1, const css::awt::Rectangle& rRect2 ); void setZeroRectangle( ::Rectangle& rRect ); -bool lcl_checkUIElement(const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& xUIElement,::com::sun::star::awt::Rectangle& _rPosSize, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xWindow); -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > createToolkitWindow( const css::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const css::uno::Reference< ::com::sun::star::awt::XWindowPeer >& rParent, const char* pService ); +bool lcl_checkUIElement(const css::uno::Reference< css::ui::XUIElement >& xUIElement,css::awt::Rectangle& _rPosSize, css::uno::Reference< css::awt::XWindow >& _xWindow); +css::uno::Reference< css::awt::XWindowPeer > createToolkitWindow( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::awt::XWindowPeer >& rParent, const char* pService ); WindowAlign ImplConvertAlignment( sal_Int16 aAlignment ); OUString getElementTypeFromResourceURL( const OUString& aResourceURL ); void parseResourceURL( const OUString& aResourceURL, OUString& aElementType, OUString& aElementName ); -::Rectangle putAWTToRectangle( const ::com::sun::star::awt::Rectangle& rRect ); -::com::sun::star::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect ); -::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > impl_getModelFromFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); -bool implts_isPreviewModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); -bool implts_isFrameOrWindowTop( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); -void impl_setDockingWindowVisibility( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName, bool bVisible ); -void impl_addWindowListeners( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xThis, const ::com::sun::star::uno::Reference< css::ui::XUIElement >& xUIElement ); +::Rectangle putAWTToRectangle( const css::awt::Rectangle& rRect ); +css::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect ); +css::uno::Reference< css::frame::XModel > impl_getModelFromFrame( const css::uno::Reference< css::frame::XFrame >& rFrame ); +bool implts_isPreviewModel( const css::uno::Reference< css::frame::XModel >& xModel ); +bool implts_isFrameOrWindowTop( const css::uno::Reference< css::frame::XFrame >& xFrame ); +void impl_setDockingWindowVisibility( const css::uno::Reference< css::uno::XComponentContext>& rxContext, const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName, bool bVisible ); +void impl_addWindowListeners( const css::uno::Reference< css::uno::XInterface >& xThis, const css::uno::Reference< css::ui::XUIElement >& xUIElement ); } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 597cf4a34d9a..4567f6647796 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -58,9 +58,9 @@ namespace framework { -class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::awt::XDockableWindowListener, - ::com::sun::star::ui::XUIConfigurationListener, - ::com::sun::star::awt::XWindowListener > +class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableWindowListener, + css::ui::XUIConfigurationListener, + css::awt::XWindowListener > { public: enum { DOCKINGAREAS_COUNT = 4 }; @@ -72,24 +72,24 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::aw PREVIEWFRAME_YES }; - ToolbarLayoutManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElementFactory >& xUIElementFactory, + ToolbarLayoutManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::ui::XUIElementFactory >& xUIElementFactory, LayoutManager* pParentLayouter ); virtual ~ToolbarLayoutManager(); void reset(); - void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >& xModuleCfgMgr, - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >& xDocCfgMgr, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xPersistentWindowState ); + void attach( const css::uno::Reference< css::frame::XFrame >& xFrame, + const css::uno::Reference< css::ui::XUIConfigurationManager >& xModuleCfgMgr, + const css::uno::Reference< css::ui::XUIConfigurationManager >& xDocCfgMgr, + const css::uno::Reference< css::container::XNameAccess >& xPersistentWindowState ); - void setParentWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentWindow ); + void setParentWindow( const css::uno::Reference< css::awt::XWindowPeer >& xParentWindow ); void setDockingAreaOffsets(const ::Rectangle& rOffsets); void resetDockingArea(); - ::com::sun::star::awt::Rectangle getDockingArea(); - void setDockingArea( const ::com::sun::star::awt::Rectangle& rDockingArea ); + css::awt::Rectangle getDockingArea(); + void setDockingArea( const css::awt::Rectangle& rDockingArea ); bool isPreviewFrame(); @@ -114,22 +114,22 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::aw void setVisible(bool bVisible); // docking and further functions - bool dockToolbar( const OUString& rResourceURL, ::com::sun::star::ui::DockingArea eDockingArea, const ::com::sun::star::awt::Point& aPos ); + bool dockToolbar( const OUString& rResourceURL, css::ui::DockingArea eDockingArea, const css::awt::Point& aPos ); bool dockAllToolbars(); bool floatToolbar( const OUString& rResoureURL ); bool lockToolbar( const OUString& rResourceURL ); bool unlockToolbar( const OUString& rResourceURL ); - void setToolbarPos( const OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos ); - void setToolbarSize( const OUString& rResourceURL, const ::com::sun::star::awt::Size& aSize ); - void setToolbarPosSize( const OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos, const ::com::sun::star::awt::Size& aSize ); + void setToolbarPos( const OUString& rResourceURL, const css::awt::Point& aPos ); + void setToolbarSize( const OUString& rResourceURL, const css::awt::Size& aSize ); + void setToolbarPosSize( const OUString& rResourceURL, const css::awt::Point& aPos, const css::awt::Size& aSize ); bool isToolbarVisible( const OUString& rResourceURL ); bool isToolbarFloating( const OUString& rResourceURL ); bool isToolbarDocked( const OUString& rResourceURL ); bool isToolbarLocked( const OUString& rResourceURL ); - ::com::sun::star::awt::Point getToolbarPos( const OUString& rResourceURL ); - ::com::sun::star::awt::Size getToolbarSize( const OUString& rResourceURL ); - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > getToolbar( const OUString& aName ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > > getToolbars(); + css::awt::Point getToolbarPos( const OUString& rResourceURL ); + css::awt::Size getToolbarSize( const OUString& rResourceURL ); + css::uno::Reference< css::ui::XUIElement > getToolbar( const OUString& aName ); + css::uno::Sequence< css::uno::Reference< css::ui::XUIElement > > getToolbars(); // child window notifications long childWindowEvent( VclSimpleEvent* pEvent ); @@ -138,7 +138,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::aw virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override; // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; @@ -150,18 +150,18 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::aw virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; // XDockableWindowListener - virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocking( const css::awt::DockingEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::DockingData SAL_CALL docking( const css::awt::DockingEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocking( const css::awt::EndDockingEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL toggleFloatingMode( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endPopupMode( const css::awt::EndPopupModeEvent& e ) throw (css::uno::RuntimeException, std::exception) override; // XUIConfigurationListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; private: enum DockingOperation @@ -181,15 +181,15 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::aw , nRowColumn(0) {} - std::vector< OUString > aUIElementNames; - std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aRowColumnWindows; - std::vector< ::com::sun::star::awt::Rectangle > aRowColumnWindowSizes; - std::vector< sal_Int32 > aRowColumnSpace; - ::com::sun::star::awt::Rectangle aRowColumnRect; - sal_Int32 nVarSize; - sal_Int32 nStaticSize; - sal_Int32 nSpace; - sal_Int32 nRowColumn; + std::vector< OUString > aUIElementNames; + std::vector< css::uno::Reference< css::awt::XWindow > > aRowColumnWindows; + std::vector< css::awt::Rectangle > aRowColumnWindowSizes; + std::vector< sal_Int32 > aRowColumnSpace; + css::awt::Rectangle aRowColumnRect; + sal_Int32 nVarSize; + sal_Int32 nStaticSize; + sal_Int32 nSpace; + sal_Int32 nRowColumn; }; // internal helper methods @@ -198,15 +198,15 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::aw ::Rectangle implts_calcDockingArea(); void implts_sortUIElements(); void implts_reparentToolbars(); - OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const; - void implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow ); + OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const; + void implts_setElementData( UIElement& rUIElement, const css::uno::Reference< css::awt::XDockableWindow >& rDockWindow ); void implts_destroyDockingAreaWindows(); // layout methods - void implts_setDockingAreaWindowSizes( const ::com::sun::star::awt::Rectangle& rBorderSpace ); - ::com::sun::star::awt::Point implts_findNextCascadeFloatingPos(); - void implts_renumberRowColumnData( ::com::sun::star::ui::DockingArea eDockingArea, DockingOperation eDockingOperation, const UIElement& rUIElement ); + void implts_setDockingAreaWindowSizes( const css::awt::Rectangle& rBorderSpace ); + css::awt::Point implts_findNextCascadeFloatingPos(); + void implts_renumberRowColumnData( css::ui::DockingArea eDockingArea, DockingOperation eDockingOperation, const UIElement& rUIElement ); void implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockingArea, sal_Int32 nOffset, SingleRowColumnWindowData& rRowColumnWindowData, @@ -217,10 +217,10 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::aw // lookup/container methods UIElement implts_findToolbar( const OUString& aName ); - UIElement implts_findToolbar( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xToolbar ); + UIElement implts_findToolbar( const css::uno::Reference< css::uno::XInterface >& xToolbar ); UIElement& impl_findToolbar( const OUString& aName ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > implts_getXWindow( const OUString& aName ); - vcl::Window* implts_getWindow( const OUString& aName ); + css::uno::Reference< css::awt::XWindow > implts_getXWindow( const OUString& aName ); + vcl::Window* implts_getWindow( const OUString& aName ); bool implts_insertToolbar( const UIElement& rUIElement ); void implts_setToolbar( const UIElement& rUIElement ); ::Size implts_getTopBottomDockingAreaSizes(); @@ -230,31 +230,31 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::aw ::Rectangle implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset ); void implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::Rectangle& rTrackingRect, const Point& rMousePos ); - DockingOperation implts_determineDockingOperation( ::com::sun::star::ui::DockingArea DockingArea, const ::Rectangle& rRowColRect, const Point& rMousePos ); - ::Rectangle implts_getWindowRectFromRowColumn( ::com::sun::star::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const OUString& rExcludeElementName ); - ::Rectangle implts_determineFrontDockingRect( ::com::sun::star::ui::DockingArea eDockingArea, + DockingOperation implts_determineDockingOperation( css::ui::DockingArea DockingArea, const ::Rectangle& rRowColRect, const Point& rMousePos ); + ::Rectangle implts_getWindowRectFromRowColumn( css::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const OUString& rExcludeElementName ); + ::Rectangle implts_determineFrontDockingRect( css::ui::DockingArea eDockingArea, sal_Int32 nRowCol, const ::Rectangle& rDockedElementRect, const OUString& rMovedElementName, const ::Rectangle& rMovedElementRect ); - ::Rectangle implts_calcTrackingAndElementRect( ::com::sun::star::ui::DockingArea eDockingArea, + ::Rectangle implts_calcTrackingAndElementRect( css::ui::DockingArea eDockingArea, sal_Int32 nRowCol, UIElement& rUIElement, const ::Rectangle& rTrackingRect, const ::Rectangle& rRowColumnRect, const ::Size& rContainerWinSize ); - void implts_getDockingAreaElementInfos( ::com::sun::star::ui::DockingArea DockingArea, std::vector< SingleRowColumnWindowData >& rRowColumnsWindowData ); - void implts_getDockingAreaElementInfoOnSingleRowCol( ::com::sun::star::ui::DockingArea, sal_Int32 nRowCol, SingleRowColumnWindowData& rRowColumnWindowData ); - void implts_findNextDockingPos( ::com::sun::star::ui::DockingArea DockingArea, const ::Size& aUIElementSize, ::com::sun::star::awt::Point& rVirtualPos, ::Point& rPixelPos ); - void implts_setTrackingRect( ::com::sun::star::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::Rectangle& rTrackingRect ); + void implts_getDockingAreaElementInfos( css::ui::DockingArea DockingArea, std::vector< SingleRowColumnWindowData >& rRowColumnsWindowData ); + void implts_getDockingAreaElementInfoOnSingleRowCol( css::ui::DockingArea, sal_Int32 nRowCol, SingleRowColumnWindowData& rRowColumnWindowData ); + void implts_findNextDockingPos( css::ui::DockingArea DockingArea, const ::Size& aUIElementSize, css::awt::Point& rVirtualPos, ::Point& rPixelPos ); + void implts_setTrackingRect( css::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::Rectangle& rTrackingRect ); // creation methods void implts_createAddonsToolBars(); void implts_createCustomToolBars(); void implts_createNonContextSensitiveToolBars(); - void implts_createCustomToolBars( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& aCustomTbxSeq ); + void implts_createCustomToolBars( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& aCustomTbxSeq ); void implts_createCustomToolBar( const OUString& aTbxResName, const OUString& aTitle ); void implts_setToolbarCreation( bool bStart = true ); bool implts_isToolbarCreationActive(); @@ -270,10 +270,10 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::aw css::uno::Reference< css::frame::XFrame > m_xFrame; css::uno::Reference< css::awt::XWindow2 > m_xContainerWindow; css::uno::Reference< css::awt::XWindow > m_xDockAreaWindows[DOCKINGAREAS_COUNT]; - css::uno::Reference< ::com::sun::star::ui::XUIElementFactory > m_xUIElementFactoryManager; - css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xModuleCfgMgr; - css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xDocCfgMgr; - css::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; + css::uno::Reference< css::ui::XUIElementFactory > m_xUIElementFactoryManager; + css::uno::Reference< css::ui::XUIConfigurationManager > m_xModuleCfgMgr; + css::uno::Reference< css::ui::XUIConfigurationManager > m_xDocCfgMgr; + css::uno::Reference< css::container::XNameAccess > m_xPersistentWindowState; LayoutManager* m_pParentLayouter; UIElementVector m_aUIElements; diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 85b089b0ca74..51dd50f2232d 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -110,7 +110,7 @@ void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL, { OUString aTarget; - com::sun::star::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, sal_False ); + css::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, sal_False ); m_aStatements.push_back( aStatement ); } @@ -120,7 +120,7 @@ void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL& OUString aTarget; // last parameter must be set to true -> it's a comment - com::sun::star::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, sal_True ); + css::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, sal_True ); m_aStatements.push_back( aStatement ); } @@ -150,7 +150,7 @@ OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeE aScriptBuffer.append("document = ThisComponent.CurrentController.Frame\n"); aScriptBuffer.append("dispatcher = createUnoService(\"com.sun.star.frame.DispatchHelper\")\n\n"); - std::vector< com::sun::star::frame::DispatchStatement>::iterator p; + std::vector< css::frame::DispatchStatement>::iterator p; for ( p = m_aStatements.begin(); p != m_aStatements.end(); ++p ) implts_recordMacro( p->aCommand, p->aArgs, p->bIsComment, aScriptBuffer ); OUString sScript = aScriptBuffer.makeStringAndClear(); @@ -374,53 +374,53 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL, /* } */ } -com::sun::star::uno::Type SAL_CALL DispatchRecorder::getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Type SAL_CALL DispatchRecorder::getElementType() throw (css::uno::RuntimeException, std::exception) { - return cppu::UnoType<com::sun::star::frame::DispatchStatement>::get(); + return cppu::UnoType<css::frame::DispatchStatement>::get(); } -sal_Bool SAL_CALL DispatchRecorder::hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DispatchRecorder::hasElements() throw (css::uno::RuntimeException, std::exception) { return (! m_aStatements.empty()); } -sal_Int32 SAL_CALL DispatchRecorder::getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL DispatchRecorder::getCount() throw (css::uno::RuntimeException, std::exception) { return m_aStatements.size(); } -com::sun::star::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if (idx >= (sal_Int32)m_aStatements.size()) { - throw com::sun::star::lang::IndexOutOfBoundsException( "Dispatch recorder out of bounds" ); + throw css::lang::IndexOutOfBoundsException( "Dispatch recorder out of bounds" ); } Any element(&m_aStatements[idx], - cppu::UnoType<com::sun::star::frame::DispatchStatement>::get()); + cppu::UnoType<css::frame::DispatchStatement>::get()); return element; } -void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const com::sun::star::uno::Any& element) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const css::uno::Any& element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if (element.getValueType() != - cppu::UnoType<com::sun::star::frame::DispatchStatement>::get()) { - throw com::sun::star::lang::IllegalArgumentException( + cppu::UnoType<css::frame::DispatchStatement>::get()) { + throw css::lang::IllegalArgumentException( "Illegal argument in dispatch recorder", Reference< XInterface >(), 2 ); } if (idx >= (sal_Int32)m_aStatements.size()) { - throw com::sun::star::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "Dispatch recorder out of bounds" ); } - com::sun::star::frame::DispatchStatement const *pStatement; + css::frame::DispatchStatement const *pStatement; - pStatement = static_cast<com::sun::star::frame::DispatchStatement const *>(element.getValue()); + pStatement = static_cast<css::frame::DispatchStatement const *>(element.getValue()); - com::sun::star::frame::DispatchStatement aStatement( + css::frame::DispatchStatement aStatement( pStatement->aCommand, pStatement->aTarget, pStatement->aArgs, diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 7a5a71155b01..7d09db7ca614 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1470,7 +1470,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue , @return reference to object with information [XPropertySetInfo] @threadsafe yes *//*-*************************************************************************************************************/ -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 9d3aec94af4b..74d7f51c6d57 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -2670,7 +2670,7 @@ void Frame::impl_initializePropInfo() css::beans::Property( FRAME_PROPNAME_LAYOUTMANAGER, FRAME_PROPHANDLE_LAYOUTMANAGER, - cppu::UnoType<com::sun::star::frame::XLayoutManager>::get(), + cppu::UnoType<css::frame::XLayoutManager>::get(), css::beans::PropertyAttribute::TRANSIENT)); impl_addPropertyInfo( diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index f87ac62ab072..6764d1e1cbe7 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -443,8 +443,8 @@ private: virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue, sal_Int32 nHandle ) const override; // Avoid: - // warning: ‘virtual com::sun::star::uno::Any cppu::OPropertySetHelper::getFastPropertyValue(sal_Int32)’ was hidden [-Woverloaded-virtual] - // warning: by ‘virtual void {anonymous}::PathSettings::getFastPropertyValue(com::sun::star::uno::Any&, sal_Int32) const’ [-Woverloaded-virtual] + // warning: ‘virtual css::uno::Any cppu::OPropertySetHelper::getFastPropertyValue(sal_Int32)’ was hidden [-Woverloaded-virtual] + // warning: by ‘virtual void {anonymous}::PathSettings::getFastPropertyValue(css::uno::Any&, sal_Int32) const’ [-Woverloaded-virtual] using cppu::OPropertySetHelper::getFastPropertyValue; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index f02d3902207e..e3fdf1c59582 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -131,7 +131,7 @@ public: return aSeq; } - virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override; // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& args) throw (css::uno::RuntimeException, std::exception) override; @@ -148,10 +148,10 @@ public: // XSessionManagerListener2 virtual void SAL_CALL doQuit() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged(const com::sun::star::frame::FeatureStateEvent& event) + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& event) throw (css::uno::RuntimeException, std::exception) override; }; @@ -199,7 +199,7 @@ void SessionListener::StoreSession( bool bAsync ) Sequence< PropertyValue > args(1); args[0] = PropertyValue(OUString("DispatchAsynchron"),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE); xDispatch->dispatch(aURL, args); - } catch (const com::sun::star::uno::Exception& e) { + } catch (const css::uno::Exception& e) { SAL_WARN("fwk.session",e.Message); // save failed, but tell manager to go on if we havent yet dispatched the request // in case of synchronous saving the notification is done by the caller @@ -227,12 +227,12 @@ void SessionListener::QuitSessionQuietly() Sequence< PropertyValue > args(1); args[0] = PropertyValue(OUString("DispatchAsynchron"),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE); xDispatch->dispatch(aURL, args); - } catch (const com::sun::star::uno::Exception& e) { + } catch (const css::uno::Exception& e) { SAL_WARN("fwk.session",e.Message); } } -void SAL_CALL SessionListener::disposing(const com::sun::star::lang::EventObject&) throw (RuntimeException, std::exception) +void SAL_CALL SessionListener::disposing(const css::lang::EventObject&) throw (RuntimeException, std::exception) { SAL_INFO("fwk.session", "SessionListener::disposing"); } @@ -309,7 +309,7 @@ sal_Bool SAL_CALL SessionListener::doRestore() xDispatch->dispatch(aURL, args); m_bRestored = true; - } catch (const com::sun::star::uno::Exception& e) { + } catch (const css::uno::Exception& e) { SAL_WARN("fwk.session",e.Message); } diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index db337135a543..9f40be23b408 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -92,7 +92,7 @@ struct SubstituteRule SubstituteRule( const OUString& aVarName, const OUString& aValue, - const com::sun::star::uno::Any& aVal, + const css::uno::Any& aVal, EnvironmentType aType ) : aSubstVariable(aVarName) , aSubstValue(aValue) @@ -102,8 +102,8 @@ struct SubstituteRule OUString aSubstVariable; OUString aSubstValue; - com::sun::star::uno::Any aEnvValue; - EnvironmentType aEnvType; + css::uno::Any aEnvValue; + EnvironmentType aEnvType; }; typedef std::unordered_map<OUString, SubstituteRule, OUStringHash> @@ -123,7 +123,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem /** is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. */ - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; private: @@ -137,7 +137,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem bool FilterRuleSet(const SubstituteRuleVector& aRuleSet, SubstituteRule& aActiveRule); - void ReadSharePointsFromConfiguration(com::sun::star::uno::Sequence< OUString >& aSharePointsSeq); + void ReadSharePointsFromConfiguration(css::uno::Sequence< OUString >& aSharePointsSeq); void ReadSharePointRuleSetFromConfiguration(const OUString& aSharePointName, const OUString& aSharePointNodeName, SubstituteRuleVector& aRuleSet); @@ -227,7 +227,7 @@ class SubstitutePathVariables : private cppu::BaseMutex, friend class SubstitutePathVariables_Impl; public: - SubstitutePathVariables( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + SubstitutePathVariables( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~SubstitutePathVariables(); virtual OUString SAL_CALL getImplementationName() @@ -252,11 +252,11 @@ public: // XStringSubstitution virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; protected: void SetPredefinedPathVariables(); @@ -271,11 +271,11 @@ protected: // XStringSubstitution implementation methods OUString impl_substituteVariable( const OUString& aText, bool bSustRequired ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + throw (css::container::NoSuchElementException, css::uno::RuntimeException); OUString impl_reSubstituteVariables( const OUString& aText ) - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); OUString impl_getSubstituteVariableValue( const OUString& variable ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + throw (css::container::NoSuchElementException, css::uno::RuntimeException); private: typedef std::unordered_map<OUString, PreDefVariable, OUStringHash> @@ -448,7 +448,7 @@ void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSu } } -void SubstitutePathVariables_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& /*aPropertyNames*/ ) +void SubstitutePathVariables_Impl::Notify( const css::uno::Sequence< OUString >& /*aPropertyNames*/ ) { // NOT implemented yet! } diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index 1ef9391ac134..2491471cf17e 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -48,7 +48,7 @@ UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContex { } -// ::com::sun::star::util::XStringAbbreviation: +// css::util::XStringAbbreviation: OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (css::uno::RuntimeException, std::exception) { OUString aResult( aString ); diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 584112614f78..931b1873a222 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -802,7 +802,7 @@ throw( css::lang::IllegalArgumentException ) { case TABWINDOW_PROPHANDLE_PARENTWINDOW : bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny( m_xContainerWindow ), + css::uno::makeAny( m_xContainerWindow ), aValue, aOldValue, aConvertedValue); @@ -810,7 +810,7 @@ throw( css::lang::IllegalArgumentException ) case TABWINDOW_PROPHANDLE_TOPWINDOW : bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny( m_xTopWindow ), + css::uno::makeAny( m_xTopWindow ), aValue, aOldValue, aConvertedValue); @@ -901,18 +901,18 @@ const css::uno::Sequence< css::beans::Property > TabWindow::impl_getStaticProper // ATTENTION: // YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!! - const com::sun::star::beans::Property pProperties[] = + const css::beans::Property pProperties[] = { - com::sun::star::beans::Property( TABWINDOW_PROPNAME_PARENTWINDOW, + css::beans::Property( TABWINDOW_PROPNAME_PARENTWINDOW, TABWINDOW_PROPHANDLE_PARENTWINDOW, cppu::UnoType<css::awt::XWindow>::get(), - com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( TABWINDOW_PROPNAME_TOPWINDOW, + css::beans::PropertyAttribute::READONLY ), + css::beans::Property( TABWINDOW_PROPNAME_TOPWINDOW, TABWINDOW_PROPHANDLE_TOPWINDOW, cppu::UnoType<css::awt::XWindow>::get(), - com::sun::star::beans::PropertyAttribute::READONLY ) + css::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! - const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, TABWINDOW_PROPCOUNT ); + const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, TABWINDOW_PROPCOUNT ); // Return "PropertyDescriptor" return lPropertyDescriptor; diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index bcc705b2813d..08f8e77c2298 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -49,7 +49,7 @@ DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( TabWinFactory DEFINE_INIT_SERVICE ( TabWinFactory, {} ) -TabWinFactory::TabWinFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : +TabWinFactory::TabWinFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : m_xContext( xContext ) { } diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 86db75ebb792..6f54ba58f8d6 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -52,37 +52,37 @@ namespace framework // Configuration access class for WindowState supplier implementation class GlobalSettings_Access : public ::cppu::WeakImplHelper< - ::com::sun::star::lang::XComponent, - ::com::sun::star::lang::XEventListener> + css::lang::XComponent, + css::lang::XEventListener> { public: - GlobalSettings_Access( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~GlobalSettings_Access(); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // settings access bool HasStatesInfo( GlobalSettings::UIElementType eElementType ); - bool GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ); + bool GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, css::uno::Any& aValue ); private: bool impl_initConfigAccess(); - osl::Mutex m_mutex; - bool m_bDisposed : 1, - m_bConfigRead : 1; - OUString m_aNodeRefStates; - OUString m_aPropStatesEnabled; - OUString m_aPropLocked; - OUString m_aPropDocked; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; + osl::Mutex m_mutex; + bool m_bDisposed : 1, + m_bConfigRead : 1; + OUString m_aNodeRefStates; + OUString m_aPropStatesEnabled; + OUString m_aPropLocked; + OUString m_aPropDocked; + css::uno::Reference< css::container::XNameAccess > m_xConfigAccess; + css::uno::Reference< css::uno::XComponentContext> m_xContext; }; GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : @@ -166,7 +166,7 @@ bool GlobalSettings_Access::HasStatesInfo( GlobalSettings::UIElementType eElemen return false; } -bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ) +bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, css::uno::Any& aValue ) { osl::MutexGuard g(m_mutex); if ( eElementType == GlobalSettings::UIELEMENT_TYPE_DOCKWINDOW ) @@ -260,7 +260,7 @@ bool GlobalSettings_Access::impl_initConfigAccess() struct mutexGlobalSettings : public rtl::Static< osl::Mutex, mutexGlobalSettings > {}; static GlobalSettings_Access* pStaticSettings = 0; -static GlobalSettings_Access* GetGlobalSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) +static GlobalSettings_Access* GetGlobalSettings( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) { osl::MutexGuard aGuard(mutexGlobalSettings::get()); if ( !pStaticSettings ) @@ -268,7 +268,7 @@ static GlobalSettings_Access* GetGlobalSettings( const ::com::sun::star::uno::Re return pStaticSettings; } -GlobalSettings::GlobalSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) : +GlobalSettings::GlobalSettings( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : m_xContext( rxContext ) { } @@ -288,7 +288,7 @@ bool GlobalSettings::HasStatesInfo( UIElementType eElementType ) return false; } -bool GlobalSettings::GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ) +bool GlobalSettings::GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, css::uno::Any& aValue ) { GlobalSettings_Access* pSettings( GetGlobalSettings( m_xContext )); diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx index e81a79797181..69c083da09ba 100644 --- a/framework/source/uiconfiguration/graphicnameaccess.cxx +++ b/framework/source/uiconfiguration/graphicnameaccess.cxx @@ -53,7 +53,7 @@ throw( container::NoSuchElementException, } uno::Sequence< OUString > SAL_CALL GraphicNameAccess::getElementNames() -throw(::com::sun::star::uno::RuntimeException, std::exception) +throw(css::uno::RuntimeException, std::exception) { if ( m_aSeq.getLength() == 0 ) { @@ -72,7 +72,7 @@ throw(::com::sun::star::uno::RuntimeException, std::exception) } sal_Bool SAL_CALL GraphicNameAccess::hasByName( const OUString& aName ) -throw(::com::sun::star::uno::RuntimeException, std::exception) +throw(css::uno::RuntimeException, std::exception) { NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName ); return ( pIter != m_aNameToElementMap.end() ); diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index 20cac0ff8d2a..786ebae08d1a 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -68,17 +68,17 @@ ImageManager::~ImageManager() } // XComponent -void SAL_CALL ImageManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ImageManager::dispose() throw (css::uno::RuntimeException, std::exception) { m_pImpl->dispose(); } -void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { m_pImpl->addEventListener(xListener); } -void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_pImpl->removeEventListener(xListener); @@ -86,7 +86,7 @@ void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventLis // Non-UNO methods void ImageManager::setStorage( const uno::Reference< XStorage >& Storage ) -throw (::com::sun::star::uno::RuntimeException) +throw (css::uno::RuntimeException) { SolarMutexGuard g; @@ -111,13 +111,13 @@ void SAL_CALL ImageManager::reset() } Sequence< OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { return m_pImpl->getAllImageNames( nImageType ); } sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { return m_pImpl->hasImage(nImageType,aCommandURL); } @@ -125,7 +125,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) +throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) { return m_pImpl->getImages(nImageType,aCommandURLSequence); } @@ -134,39 +134,39 @@ void SAL_CALL ImageManager::replaceImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException, std::exception) +throw ( css::lang::IllegalArgumentException, + css::lang::IllegalAccessException, + css::uno::RuntimeException, std::exception) { m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence); } void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException, std::exception) +throw ( css::lang::IllegalArgumentException, + css::lang::IllegalAccessException, + css::uno::RuntimeException, std::exception) { m_pImpl->removeImages(nImageType,aCommandURLSequence); } void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) -throw ( ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException, std::exception) +throw ( css::container::ElementExistException, + css::lang::IllegalArgumentException, + css::lang::IllegalAccessException, + css::uno::RuntimeException, std::exception) { m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence); } // XUIConfiguration -void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener ) +throw (css::uno::RuntimeException, std::exception) { m_pImpl->addConfigurationListener(xListener); } -void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener ) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_pImpl->removeConfigurationListener(xListener); @@ -174,31 +174,31 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) // XUIConfigurationPersistence void SAL_CALL ImageManager::reload() -throw ( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception ) +throw ( css::uno::Exception, + css::uno::RuntimeException, std::exception ) { m_pImpl->reload(); } void SAL_CALL ImageManager::store() -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { m_pImpl->store(); } void SAL_CALL ImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { m_pImpl->storeToStorage(Storage); } sal_Bool SAL_CALL ImageManager::isModified() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { return m_pImpl->isModified(); } -sal_Bool SAL_CALL ImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ImageManager::isReadOnly() throw (css::uno::RuntimeException, std::exception) { return m_pImpl->isReadOnly(); } diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index a88bc651243f..2de5f0e9a90d 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -66,7 +66,7 @@ using namespace ::cppu; // Image sizes for our toolbars/menus const sal_Int32 IMAGE_SIZE_NORMAL = 16; const sal_Int32 IMAGE_SIZE_LARGE = 26; -const sal_Int16 MAX_IMAGETYPE_VALUE = ::com::sun::star::ui::ImageType::SIZE_LARGE; +const sal_Int16 MAX_IMAGETYPE_VALUE = css::ui::ImageType::SIZE_LARGE; static const char IMAGE_FOLDER[] = "images"; static const char BITMAPS_FOLDER[] = "Bitmaps"; @@ -369,7 +369,7 @@ static bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGraphic static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType ) { sal_Int16 nIndex( 0 ); - if ( nImageType & ::com::sun::star::ui::ImageType::SIZE_LARGE ) + if ( nImageType & css::ui::ImageType::SIZE_LARGE ) nIndex += 1; return nIndex; } @@ -400,19 +400,19 @@ void ImageManagerImpl::implts_initialize() nModes ); } } - catch ( const ::com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } - catch ( const ::com::sun::star::embed::InvalidStorageException& ) + catch ( const css::embed::InvalidStorageException& ) { } - catch ( const ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const css::lang::IllegalArgumentException& ) { } - catch ( const ::com::sun::star::io::IOException& ) + catch ( const css::io::IOException& ) { } - catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const css::embed::StorageWrappedTargetException& ) { } } @@ -472,19 +472,19 @@ bool ImageManagerImpl::implts_loadUserImages( } } } - catch ( const ::com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } - catch ( const ::com::sun::star::embed::InvalidStorageException& ) + catch ( const css::embed::InvalidStorageException& ) { } - catch ( const ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const css::lang::IllegalArgumentException& ) { } - catch ( const ::com::sun::star::io::IOException& ) + catch ( const css::io::IOException& ) { } - catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const css::embed::StorageWrappedTargetException& ) { } } @@ -569,7 +569,7 @@ bool ImageManagerImpl::implts_storeUserImages( { xUserImageStorage->removeElement( OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] )); } - catch ( const ::com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } @@ -577,7 +577,7 @@ bool ImageManagerImpl::implts_storeUserImages( { xUserBitmapsStorage->removeElement( OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] )); } - catch ( const ::com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } @@ -671,7 +671,7 @@ void ImageManagerImpl::dispose() } } -void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException) { { SolarMutexGuard g; @@ -684,7 +684,7 @@ void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener ); } -void ImageManagerImpl::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void ImageManagerImpl::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener ); @@ -736,7 +736,7 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments ) // XImageManagerImpl void ImageManagerImpl::reset() -throw (::com::sun::star::uno::RuntimeException, lang::IllegalAccessException) +throw (css::uno::RuntimeException, lang::IllegalAccessException) { SolarMutexGuard g; @@ -766,7 +766,7 @@ throw (::com::sun::star::uno::RuntimeException, lang::IllegalAccessException) } Sequence< OUString > ImageManagerImpl::getAllImageNames( ::sal_Int16 nImageType ) -throw (::com::sun::star::uno::RuntimeException) +throw (css::uno::RuntimeException) { SolarMutexGuard g; @@ -811,7 +811,7 @@ throw (::com::sun::star::uno::RuntimeException) } bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) { SolarMutexGuard g; @@ -844,7 +844,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: Sequence< uno::Reference< XGraphic > > ImageManagerImpl::getImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) +throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ) { SolarMutexGuard g; @@ -977,9 +977,9 @@ throw (css::lang::IllegalArgumentException, } void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) +throw ( css::lang::IllegalArgumentException, + css::lang::IllegalAccessException, + css::uno::RuntimeException) { CmdToXGraphicNameAccess* pRemovedImages( 0 ); CmdToXGraphicNameAccess* pReplacedImages( 0 ); @@ -1081,10 +1081,10 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, } void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) -throw ( ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) +throw ( css::container::ElementExistException, + css::lang::IllegalArgumentException, + css::lang::IllegalAccessException, + css::uno::RuntimeException) { replaceImages(nImageType,aCommandURLSequence,aGraphicSequence); } @@ -1243,8 +1243,8 @@ void ImageManagerImpl::reload() } void ImageManagerImpl::store() - throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1278,8 +1278,8 @@ void ImageManagerImpl::store() } void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage ) - throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1311,20 +1311,20 @@ void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage } bool ImageManagerImpl::isModified() -throw (::com::sun::star::uno::RuntimeException) +throw (css::uno::RuntimeException) { SolarMutexGuard g; return m_bModified; } -bool ImageManagerImpl::isReadOnly() throw (::com::sun::star::uno::RuntimeException) +bool ImageManagerImpl::isReadOnly() throw (css::uno::RuntimeException) { SolarMutexGuard g; return m_bReadOnly; } // XUIConfiguration -void ImageManagerImpl::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException) +void ImageManagerImpl::addConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener ) +throw (css::uno::RuntimeException) { { SolarMutexGuard g; @@ -1337,8 +1337,8 @@ throw (::com::sun::star::uno::RuntimeException) m_aListenerContainer.addInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener ); } -void ImageManagerImpl::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException) +void ImageManagerImpl::removeConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener ) +throw (css::uno::RuntimeException) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener ); @@ -1347,7 +1347,7 @@ throw (::com::sun::star::uno::RuntimeException) void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp ) { ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( - cppu::UnoType<com::sun::star::ui::XUIConfigurationListener>::get()); + cppu::UnoType<css::ui::XUIConfigurationListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pIterator( *pContainer ); @@ -1358,13 +1358,13 @@ void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& switch ( eOp ) { case NotifyOp_Replace: - static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent ); + static_cast< css::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent ); break; case NotifyOp_Insert: - static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent ); + static_cast< css::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent ); break; case NotifyOp_Remove: - static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent ); + static_cast< css::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent ); break; } } diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index fd384c571894..91cec796e0f5 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -55,7 +55,7 @@ namespace framework class CmdImageList { public: - CmdImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + CmdImageList( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& aModuleIdentifier ); virtual ~CmdImageList(); @@ -69,65 +69,65 @@ namespace framework std::vector< OUString >& impl_getImageCommandNameVector() { return m_aImageCommandNameVector;} private: - bool m_bVectorInit; - OUString m_aModuleIdentifier; - ImageList* m_pImageList[ImageType_COUNT]; - CommandToImageNameMap m_aCommandToImageNameMap; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::std::vector< OUString > m_aImageNameVector; - ::std::vector< OUString > m_aImageCommandNameVector; - OUString m_sIconTheme; + bool m_bVectorInit; + OUString m_aModuleIdentifier; + ImageList* m_pImageList[ImageType_COUNT]; + CommandToImageNameMap m_aCommandToImageNameMap; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + ::std::vector< OUString > m_aImageNameVector; + ::std::vector< OUString > m_aImageCommandNameVector; + OUString m_sIconTheme; }; class GlobalImageList : public CmdImageList, public salhelper::SimpleReferenceObject { public: - GlobalImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + GlobalImageList( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~GlobalImageList(); virtual Image getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL ) override; virtual bool hasImage( sal_Int16 nImageType, const OUString& rCommandURL ) override; - virtual ::std::vector< OUString >& getImageCommandNames() override; + virtual ::std::vector< OUString >& getImageCommandNames() override; }; class ImageManagerImpl { public: - ImageManagerImpl(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext + ImageManagerImpl(const css::uno::Reference< css::uno::XComponentContext >& rxContext ,::cppu::OWeakObject *pOwner ,bool _bUseGlobal); ~ImageManagerImpl(); void dispose(); - void initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ); - void addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + void initialize( const css::uno::Sequence< css::uno::Any >& aArguments ); + void addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException); + void removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException); // XImageManager - void reset() throw (::com::sun::star::uno::RuntimeException, css::lang::IllegalAccessException); - ::com::sun::star::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException); - bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - void replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception); - void removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); - void insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + void reset() throw (css::uno::RuntimeException, css::lang::IllegalAccessException); + css::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (css::uno::RuntimeException); + bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + void replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception); + void removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException); + void insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException); // XUIConfiguration - void addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); - void removeConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); + void addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException); + void removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException); // XUIConfigurationPersistence void reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception); void store() - throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception); - void storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) - throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, + void storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) + throw (css::uno::Exception, + css::uno::RuntimeException, std::exception); - bool isModified() throw (::com::sun::star::uno::RuntimeException); - bool isReadOnly() throw (::com::sun::star::uno::RuntimeException); + bool isModified() throw (css::uno::RuntimeException); + bool isReadOnly() throw (css::uno::RuntimeException); void clear(); @@ -150,25 +150,25 @@ namespace framework NotifyOp_Replace }; - typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer; + typedef ::std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer; void implts_initialize(); - void implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp ); + void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp ); ImageList* implts_getUserImageList( ImageType nImageType ); bool implts_loadUserImages( ImageType nImageType, - const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, - const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage ); + const css::uno::Reference< css::embed::XStorage >& xUserImageStorage, + const css::uno::Reference< css::embed::XStorage >& xUserBitmapsStorage ); bool implts_storeUserImages( ImageType nImageType, - const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, - const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage ); + const css::uno::Reference< css::embed::XStorage >& xUserImageStorage, + const css::uno::Reference< css::embed::XStorage >& xUserBitmapsStorage ); const rtl::Reference< GlobalImageList >& implts_getGlobalImageList(); CmdImageList* implts_getDefaultImageList(); - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xUserConfigStorage; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xUserImageStorage; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xUserBitmapsStorage; - com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject > m_xUserRootCommit; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::embed::XStorage > m_xUserConfigStorage; + css::uno::Reference< css::embed::XStorage > m_xUserImageStorage; + css::uno::Reference< css::embed::XStorage > m_xUserBitmapsStorage; + css::uno::Reference< css::embed::XTransactedObject > m_xUserRootCommit; + css::uno::Reference< css::uno::XComponentContext > m_xContext; ::cppu::OWeakObject* m_pOwner; rtl::Reference< GlobalImageList > m_pGlobalImageList; CmdImageList* m_pDefaultImageList; diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index d9979c6fead9..f3724e722fbc 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -76,17 +76,17 @@ ModuleImageManager::~ModuleImageManager() } // XComponent -void SAL_CALL ModuleImageManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleImageManager::dispose() throw (css::uno::RuntimeException, std::exception) { m_pImpl->dispose(); } -void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { m_pImpl->addEventListener(xListener); } -void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_pImpl->removeEventListener(xListener); @@ -108,13 +108,13 @@ void SAL_CALL ModuleImageManager::reset() } Sequence< OUString > SAL_CALL ModuleImageManager::getAllImageNames( ::sal_Int16 nImageType ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { return m_pImpl->getAllImageNames( nImageType ); } sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { return m_pImpl->hasImage(nImageType,aCommandURL); } @@ -122,7 +122,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) +throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) { SAL_INFO( "fwk", "framework: ModuleImageManager::getImages" ); return m_pImpl->getImages(nImageType,aCommandURLSequence); @@ -132,70 +132,70 @@ void SAL_CALL ModuleImageManager::replaceImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException, std::exception) +throw ( css::lang::IllegalArgumentException, + css::lang::IllegalAccessException, + css::uno::RuntimeException, std::exception) { m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence); } void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException, std::exception) +throw ( css::lang::IllegalArgumentException, + css::lang::IllegalAccessException, + css::uno::RuntimeException, std::exception) { m_pImpl->removeImages(nImageType,aCommandURLSequence); } void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) -throw ( ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException, std::exception) +throw ( css::container::ElementExistException, + css::lang::IllegalArgumentException, + css::lang::IllegalAccessException, + css::uno::RuntimeException, std::exception) { m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence); } // XUIConfiguration -void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener ) +throw (css::uno::RuntimeException, std::exception) { m_pImpl->addConfigurationListener(xListener); } -void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener ) +throw (css::uno::RuntimeException, std::exception) { m_pImpl->removeConfigurationListener(xListener); } // XUIConfigurationPersistence void SAL_CALL ModuleImageManager::reload() -throw ( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception ) +throw ( css::uno::Exception, + css::uno::RuntimeException, std::exception ) { m_pImpl->reload(); } void SAL_CALL ModuleImageManager::store() -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { m_pImpl->store(); } void SAL_CALL ModuleImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { m_pImpl->storeToStorage(Storage); } sal_Bool SAL_CALL ModuleImageManager::isModified() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { return m_pImpl->isModified(); } -sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (css::uno::RuntimeException, std::exception) { return m_pImpl->isReadOnly(); } diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 43d4bef949c6..6aa77d2a10fb 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -199,29 +199,29 @@ private: void impl_resetElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer ); void impl_reloadElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer ); - UIElementTypesVector m_aUIElements[LAYER_COUNT]; - PresetHandler* m_pStorageHandler[css::ui::UIElementType::COUNT]; + UIElementTypesVector m_aUIElements[LAYER_COUNT]; + PresetHandler* m_pStorageHandler[css::ui::UIElementType::COUNT]; css::uno::Reference< css::embed::XStorage > m_xDefaultConfigStorage; css::uno::Reference< css::embed::XStorage > m_xUserConfigStorage; - bool m_bReadOnly; - bool m_bModified; - bool m_bConfigRead; - bool m_bDisposed; - OUString m_aXMLPostfix; - OUString m_aPropUIName; - OUString m_aPropResourceURL; - OUString m_aModuleIdentifier; - OUString m_aModuleShortName; + bool m_bReadOnly; + bool m_bModified; + bool m_bConfigRead; + bool m_bDisposed; + OUString m_aXMLPostfix; + OUString m_aPropUIName; + OUString m_aPropResourceURL; + OUString m_aModuleIdentifier; + OUString m_aModuleShortName; css::uno::Reference< css::embed::XTransactedObject > m_xUserRootCommit; css::uno::Reference< css::uno::XComponentContext > m_xContext; - osl::Mutex m_mutex; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + osl::Mutex m_mutex; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener css::uno::Reference< css::lang::XComponent > m_xModuleImageManager; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager; }; // important: The order and position of the elements must match the constant -// definition of "::com::sun::star::ui::UIElementType" +// definition of "css::ui::UIElementType" static const char* UIELEMENTTYPENAMES[] = { "", // Dummy value for unknown! @@ -425,10 +425,10 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement { switch ( nElementType ) { - case ::com::sun::star::ui::UIElementType::UNKNOWN: + case css::ui::UIElementType::UNKNOWN: break; - case ::com::sun::star::ui::UIElementType::MENUBAR: + case css::ui::UIElementType::MENUBAR: { try { @@ -441,18 +441,18 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, true ) ), UNO_QUERY ); return; } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } break; - case ::com::sun::star::ui::UIElementType::POPUPMENU: + case css::ui::UIElementType::POPUPMENU: { break; } - case ::com::sun::star::ui::UIElementType::TOOLBAR: + case css::ui::UIElementType::TOOLBAR: { try { @@ -462,14 +462,14 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, true ) ), UNO_QUERY ); return; } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } break; } - case ::com::sun::star::ui::UIElementType::STATUSBAR: + case css::ui::UIElementType::STATUSBAR: { try { @@ -479,30 +479,30 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, true ) ), UNO_QUERY ); return; } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } break; } - case ::com::sun::star::ui::UIElementType::FLOATINGWINDOW: + case css::ui::UIElementType::FLOATINGWINDOW: { break; } } } } - catch ( const ::com::sun::star::embed::InvalidStorageException& ) + catch ( const css::embed::InvalidStorageException& ) { } - catch ( const ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const css::lang::IllegalArgumentException& ) { } - catch ( const ::com::sun::star::io::IOException& ) + catch ( const css::io::IOException& ) { } - catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const css::embed::StorageWrappedTargetException& ) { } } @@ -569,38 +569,38 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag { switch( rElementType.nElementType ) { - case ::com::sun::star::ui::UIElementType::MENUBAR: + case css::ui::UIElementType::MENUBAR: { try { MenuConfiguration aMenuCfg( m_xContext ); aMenuCfg.StoreMenuBarConfigurationToXML( rElement.xSettings, xOutputStream ); } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } break; - case ::com::sun::star::ui::UIElementType::TOOLBAR: + case css::ui::UIElementType::TOOLBAR: { try { ToolBoxConfiguration::StoreToolBox( m_xContext, xOutputStream, rElement.xSettings ); } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } break; - case ::com::sun::star::ui::UIElementType::STATUSBAR: + case css::ui::UIElementType::STATUSBAR: { try { StatusBarConfiguration::StoreStatusBar( m_xContext, xOutputStream, rElement.xSettings ); } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } @@ -788,7 +788,7 @@ void ModuleUIConfigurationManager::impl_Initialize() if ( m_xUserConfigStorage.is() ) { // Try to access our module sub folder - for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; + for ( sal_Int16 i = 1; i < css::ui::UIElementType::COUNT; i++ ) { Reference< XStorage > xElementTypeStorage; @@ -797,19 +797,19 @@ void ModuleUIConfigurationManager::impl_Initialize() if ( m_pStorageHandler[i] ) xElementTypeStorage = m_pStorageHandler[i]->getWorkingStorageUser(); } - catch ( const com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } - catch ( const ::com::sun::star::embed::InvalidStorageException& ) + catch ( const css::embed::InvalidStorageException& ) { } - catch ( const ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const css::lang::IllegalArgumentException& ) { } - catch ( const ::com::sun::star::io::IOException& ) + catch ( const css::io::IOException& ) { } - catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const css::embed::StorageWrappedTargetException& ) { } @@ -825,7 +825,7 @@ void ModuleUIConfigurationManager::impl_Initialize() Reference< XNameAccess > xNameAccess( m_xDefaultConfigStorage, UNO_QUERY_THROW ); // Try to access our module sub folder - for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; + for ( sal_Int16 i = 1; i < css::ui::UIElementType::COUNT; i++ ) { Reference< XStorage > xElementTypeStorage; @@ -835,7 +835,7 @@ void ModuleUIConfigurationManager::impl_Initialize() if( xNameAccess->hasByName( sName ) ) xNameAccess->getByName( sName ) >>= xElementTypeStorage; } - catch ( const com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } @@ -862,13 +862,13 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager( , m_xContext( xContext ) , m_aListenerContainer( m_mutex ) { - for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( int i = 0; i < css::ui::UIElementType::COUNT; i++ ) m_pStorageHandler[i] = 0; // Make sure we have a default initialized entry for every layer and user interface element type! // The following code depends on this! - m_aUIElements[LAYER_DEFAULT].resize( ::com::sun::star::ui::UIElementType::COUNT ); - m_aUIElements[LAYER_USERDEFINED].resize( ::com::sun::star::ui::UIElementType::COUNT ); + m_aUIElements[LAYER_DEFAULT].resize( css::ui::UIElementType::COUNT ); + m_aUIElements[LAYER_USERDEFINED].resize( css::ui::UIElementType::COUNT ); SolarMutexGuard g; @@ -882,14 +882,14 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager( m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString()); } - for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( int i = 1; i < css::ui::UIElementType::COUNT; i++ ) { OUString aResourceType; - if ( i == ::com::sun::star::ui::UIElementType::MENUBAR ) + if ( i == css::ui::UIElementType::MENUBAR ) aResourceType = RESOURCETYPE_MENUBAR; - else if ( i == ::com::sun::star::ui::UIElementType::TOOLBAR ) + else if ( i == css::ui::UIElementType::TOOLBAR ) aResourceType = RESOURCETYPE_TOOLBAR; - else if ( i == ::com::sun::star::ui::UIElementType::STATUSBAR ) + else if ( i == css::ui::UIElementType::STATUSBAR ) aResourceType = RESOURCETYPE_STATUSBAR; if ( !aResourceType.isEmpty() ) @@ -904,11 +904,11 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager( // initialize root storages for all resource types m_xUserRootCommit = css::uno::Reference< css::embed::XTransactedObject >( - m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty - m_xDefaultConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageShare( - m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare()); - m_xUserConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageUser( - m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageUser()); + m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty + m_xDefaultConfigStorage = m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getParentStorageShare( + m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getWorkingStorageShare()); + m_xUserConfigStorage = m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getParentStorageUser( + m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getWorkingStorageUser()); if ( m_xUserConfigStorage.is() ) { @@ -927,12 +927,12 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager( ModuleUIConfigurationManager::~ModuleUIConfigurationManager() { - for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( int i = 0; i < css::ui::UIElementType::COUNT; i++ ) delete m_pStorageHandler[i]; } // XComponent -void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleUIConfigurationManager::dispose() throw (css::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -968,7 +968,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::u } } -void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { { SolarMutexGuard g; @@ -981,14 +981,14 @@ void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< X m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener ); } -void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener ); } // XUIConfiguration -void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { { SolarMutexGuard g; @@ -1001,14 +1001,14 @@ void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Refe m_aListenerContainer.addInterface( cppu::UnoType<ui::XUIConfigurationListener>::get(), xListener ); } -void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( cppu::UnoType<ui::XUIConfigurationListener>::get(), xListener ); } // XUIConfigurationManager -void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleUIConfigurationManager::reset() throw (css::uno::RuntimeException, std::exception) { SolarMutexClearableGuard aGuard; @@ -1021,7 +1021,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno // Remove all elements from our user-defined storage! try { - for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( int i = 1; i < css::ui::UIElementType::COUNT; i++ ) { UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][i]; Reference< XStorage > xSubStorage( rElementType.xStorage, UNO_QUERY ); @@ -1049,7 +1049,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno // remove settings from user defined layer and notify listener about removed settings data! ConfigEventNotifyContainer aRemoveEventNotifyContainer; ConfigEventNotifyContainer aReplaceEventNotifyContainer; - for ( sal_Int16 j = 1; j < ::com::sun::star::ui::UIElementType::COUNT; j++ ) + for ( sal_Int16 j = 1; j < css::ui::UIElementType::COUNT; j++ ) { try { @@ -1080,16 +1080,16 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno for ( k = 0; k < aReplaceEventNotifyContainer.size(); k++ ) implts_notifyContainerListener( aReplaceEventNotifyContainer[k], NotifyOp_Replace ); } - catch ( const ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const css::lang::IllegalArgumentException& ) { } - catch ( const ::com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } - catch ( const ::com::sun::star::embed::InvalidStorageException& ) + catch ( const css::embed::InvalidStorageException& ) { } - catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const css::embed::StorageWrappedTargetException& ) { } } @@ -1098,7 +1098,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno Sequence< Sequence< PropertyValue > > SAL_CALL ModuleUIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType ) throw ( IllegalArgumentException, RuntimeException, std::exception ) { - if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( ElementType < 0 ) || ( ElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); SolarMutexGuard g; @@ -1108,9 +1108,9 @@ throw ( IllegalArgumentException, RuntimeException, std::exception ) Sequence< Sequence< PropertyValue > > aElementInfoSeq; UIElementInfoHashMap aUIElementInfoCollection; - if ( ElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) + if ( ElementType == css::ui::UIElementType::UNKNOWN ) { - for ( sal_Int16 i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( sal_Int16 i = 0; i < css::ui::UIElementType::COUNT; i++ ) impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, sal_Int16( i ) ); } else @@ -1135,7 +1135,7 @@ throw ( IllegalArgumentException, RuntimeException, std::exception ) return aElementInfoSeq; } -Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1147,12 +1147,12 @@ Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettin } sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const OUString& ResourceURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { @@ -1170,12 +1170,12 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: } Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { @@ -1198,13 +1198,13 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la throw NoSuchElementException(); } -void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< css::container::XIndexAccess >& aNewData ) +throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) throw IllegalAccessException(); @@ -1312,8 +1312,8 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) throw IllegalAccessException(); @@ -1391,8 +1391,8 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) throw IllegalAccessException(); @@ -1448,7 +1448,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, } } -Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1479,7 +1479,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() return Reference< XInterface >( m_xModuleImageManager, UNO_QUERY ); } -Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager::getShortCutManager() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1500,19 +1500,19 @@ Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager return m_xModuleAcceleratorManager; } -Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager() throw (css::uno::RuntimeException, std::exception) { return Reference< XInterface >(); } // XModuleUIConfigurationManager sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const OUString& ResourceURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { @@ -1530,12 +1530,12 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: } Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const OUString& ResourceURL ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { @@ -1563,7 +1563,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } // XUIConfigurationPersistence -void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleUIConfigurationManager::reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexClearableGuard aGuard; @@ -1575,7 +1575,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un // Try to access our module sub folder ConfigEventNotifyContainer aRemoveNotifyContainer; ConfigEventNotifyContainer aReplaceNotifyContainer; - for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( sal_Int16 i = 1; i < css::ui::UIElementType::COUNT; i++ ) { try { @@ -1604,7 +1604,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un } } -void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleUIConfigurationManager::store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1614,7 +1614,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly ) { // Try to access our module sub folder - for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( int i = 1; i < css::ui::UIElementType::COUNT; i++ ) { try { @@ -1637,7 +1637,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno } } -void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1647,7 +1647,7 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly ) { // Try to access our module sub folder - for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( int i = 1; i < css::ui::UIElementType::COUNT; i++ ) { try { @@ -1670,14 +1670,14 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt } } -sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; return m_bModified; } -sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1686,7 +1686,7 @@ sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun:: void ModuleUIConfigurationManager::implts_notifyContainerListener( const ui::ConfigurationEvent& aEvent, NotifyOp eOp ) { - ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<com::sun::star::ui::XUIConfigurationListener>::get()); + ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::ui::XUIConfigurationListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pIterator( *pContainer ); @@ -1697,13 +1697,13 @@ void ModuleUIConfigurationManager::implts_notifyContainerListener( const ui::Con switch ( eOp ) { case NotifyOp_Replace: - static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent ); + static_cast< css::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent ); break; case NotifyOp_Insert: - static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent ); + static_cast< css::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent ); break; case NotifyOp_Remove: - static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent ); + static_cast< css::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent ); break; } } diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index df0b39f1c319..2172f3e3cdff 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -70,21 +70,21 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess virtual ~ConfigurationAccess_UICategory(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // container.XContainerListener virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override; @@ -108,14 +108,14 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess bool initializeConfigAccess(); - OUString m_aConfigCategoryAccess; - OUString m_aPropUIName; + OUString m_aConfigCategoryAccess; + OUString m_aPropUIName; Reference< XNameAccess > m_xGenericUICategories; Reference< XMultiServiceFactory > m_xConfigProvider; Reference< XNameAccess > m_xConfigAccess; Reference< XContainerListener > m_xConfigListener; - bool m_bConfigAccessInitialized; - bool m_bCacheFilled; + bool m_bConfigAccessInitialized; + bool m_bCacheFilled; IdToInfoCache m_aIdCache; }; @@ -172,7 +172,7 @@ throw ( RuntimeException, std::exception ) } sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasByName( const OUString& rId ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { return getByName( rId ).hasValue(); } @@ -214,10 +214,10 @@ bool ConfigurationAccess_UICategory::fillCache() m_aIdCache.insert( IdToInfoCache::value_type( aNameSeq[i], aUIName )); } } - catch ( const com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } - catch ( const com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } } @@ -243,19 +243,19 @@ Any ConfigurationAccess_UICategory::getUINameFromID( const OUString& rId ) { return m_xGenericUICategories->getByName( rId ); } - catch ( const com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } - catch ( const com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } } } } - catch( const com::sun::star::container::NoSuchElementException& ) + catch( const css::container::NoSuchElementException& ) { } - catch ( const com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } @@ -309,10 +309,10 @@ Sequence< OUString > ConfigurationAccess_UICategory::getAllIds() return aNameSeq; } - catch( const com::sun::star::container::NoSuchElementException& ) + catch( const css::container::NoSuchElementException& ) { } - catch ( const com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 072449051aeb..153265749e10 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -192,14 +192,14 @@ private: OUString m_aPropResourceURL; OUString m_aModuleIdentifier; css::uno::Reference< css::uno::XComponentContext > m_xContext; - osl::Mutex m_mutex; + osl::Mutex m_mutex; cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener css::uno::Reference< css::lang::XComponent > m_xImageManager; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xAccConfig; }; // important: The order and position of the elements must match the constant -// definition of "::com::sun::star::ui::UIElementType" +// definition of "css::ui::UIElementType" static const char* UIELEMENTTYPENAMES[] = { "", // Dummy value for unknown! @@ -343,10 +343,10 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, { switch ( nElementType ) { - case ::com::sun::star::ui::UIElementType::UNKNOWN: + case css::ui::UIElementType::UNKNOWN: break; - case ::com::sun::star::ui::UIElementType::MENUBAR: + case css::ui::UIElementType::MENUBAR: { try { @@ -359,18 +359,18 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, true ) ), UNO_QUERY ); return; } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } break; - case ::com::sun::star::ui::UIElementType::POPUPMENU: + case css::ui::UIElementType::POPUPMENU: { break; } - case ::com::sun::star::ui::UIElementType::TOOLBAR: + case css::ui::UIElementType::TOOLBAR: { try { @@ -380,14 +380,14 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, true ) ), UNO_QUERY ); return; } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } break; } - case ::com::sun::star::ui::UIElementType::STATUSBAR: + case css::ui::UIElementType::STATUSBAR: { try { @@ -397,30 +397,30 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, true ) ), UNO_QUERY ); return; } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } break; } - case ::com::sun::star::ui::UIElementType::FLOATINGWINDOW: + case css::ui::UIElementType::FLOATINGWINDOW: { break; } } } } - catch ( const ::com::sun::star::embed::InvalidStorageException& ) + catch ( const css::embed::InvalidStorageException& ) { } - catch ( const ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const css::lang::IllegalArgumentException& ) { } - catch ( const ::com::sun::star::io::IOException& ) + catch ( const css::io::IOException& ) { } - catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const css::embed::StorageWrappedTargetException& ) { } } @@ -478,38 +478,38 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x { switch( rElementType.nElementType ) { - case ::com::sun::star::ui::UIElementType::MENUBAR: + case css::ui::UIElementType::MENUBAR: { try { MenuConfiguration aMenuCfg( m_xContext ); aMenuCfg.StoreMenuBarConfigurationToXML( rElement.xSettings, xOutputStream ); } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } break; - case ::com::sun::star::ui::UIElementType::TOOLBAR: + case css::ui::UIElementType::TOOLBAR: { try { ToolBoxConfiguration::StoreToolBox( m_xContext, xOutputStream, rElement.xSettings ); } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } break; - case ::com::sun::star::ui::UIElementType::STATUSBAR: + case css::ui::UIElementType::STATUSBAR: { try { StatusBarConfiguration::StoreStatusBar( m_xContext, xOutputStream, rElement.xSettings ); } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } @@ -646,7 +646,7 @@ void UIConfigurationManager::impl_Initialize() long nModes = m_bReadOnly ? ElementModes::READ : ElementModes::READWRITE; // Try to access our module sub folder - for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; + for ( sal_Int16 i = 1; i < css::ui::UIElementType::COUNT; i++ ) { Reference< XStorage > xElementTypeStorage; @@ -654,19 +654,19 @@ void UIConfigurationManager::impl_Initialize() { xElementTypeStorage = m_xDocConfigStorage->openStorageElement( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), nModes ); } - catch ( const com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } - catch ( const ::com::sun::star::embed::InvalidStorageException& ) + catch ( const css::embed::InvalidStorageException& ) { } - catch ( const ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const css::lang::IllegalArgumentException& ) { } - catch ( const ::com::sun::star::io::IOException& ) + catch ( const css::io::IOException& ) { } - catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const css::embed::StorageWrappedTargetException& ) { } @@ -679,12 +679,12 @@ void UIConfigurationManager::impl_Initialize() else { // We have no storage, just initialize ui element types with empty storage! - for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( int i = 1; i < css::ui::UIElementType::COUNT; i++ ) m_aUIElements[i].xStorage = m_xDocConfigStorage; } } -UIConfigurationManager::UIConfigurationManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext ) : +UIConfigurationManager::UIConfigurationManager( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) : m_xDocConfigStorage( 0 ) , m_bReadOnly( true ) , m_bModified( false ) @@ -698,7 +698,7 @@ UIConfigurationManager::UIConfigurationManager( const com::sun::star::uno::Refer { // Make sure we have a default initialized entry for every layer and user interface element type! // The following code depends on this! - m_aUIElements.resize( ::com::sun::star::ui::UIElementType::COUNT ); + m_aUIElements.resize( css::ui::UIElementType::COUNT ); } UIConfigurationManager::~UIConfigurationManager() @@ -706,7 +706,7 @@ UIConfigurationManager::~UIConfigurationManager() } // XComponent -void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigurationManager::dispose() throw (css::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -733,7 +733,7 @@ void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::Ru } } -void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { { SolarMutexGuard g; @@ -746,14 +746,14 @@ void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventL m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener ); } -void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener ); } // XUIConfigurationManager -void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { { SolarMutexGuard g; @@ -766,13 +766,13 @@ void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< m_aListenerContainer.addInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener ); } -void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener ); } -void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigurationManager::reset() throw (css::uno::RuntimeException, std::exception) { SolarMutexClearableGuard aGuard; @@ -789,7 +789,7 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt { // Remove all elements from our user-defined storage! bool bCommit( false ); - for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( int i = 1; i < css::ui::UIElementType::COUNT; i++ ) { UIElementType& rElementType = m_aUIElements[i]; Reference< XStorage > xSubStorage( rElementType.xStorage, UNO_QUERY ); @@ -825,7 +825,7 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt // remove settings from user defined layer and notify listener about removed settings data! // Try to access our module sub folder ConfigEventNotifyContainer aRemoveEventNotifyContainer; - for ( sal_Int16 j = 1; j < ::com::sun::star::ui::UIElementType::COUNT; j++ ) + for ( sal_Int16 j = 1; j < css::ui::UIElementType::COUNT; j++ ) { UIElementType& rDocElementType = m_aUIElements[j]; @@ -842,16 +842,16 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt for ( size_t k = 0; k < aRemoveEventNotifyContainer.size(); k++ ) implts_notifyContainerListener( aRemoveEventNotifyContainer[k], NotifyOp_Remove ); } - catch ( const ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const css::lang::IllegalArgumentException& ) { } - catch ( const ::com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } - catch ( const ::com::sun::star::embed::InvalidStorageException& ) + catch ( const css::embed::InvalidStorageException& ) { } - catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const css::embed::StorageWrappedTargetException& ) { } } @@ -860,7 +860,7 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType ) throw ( IllegalArgumentException, RuntimeException, std::exception ) { - if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( ElementType < 0 ) || ( ElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); SolarMutexGuard g; @@ -870,9 +870,9 @@ throw ( IllegalArgumentException, RuntimeException, std::exception ) Sequence< Sequence< PropertyValue > > aElementInfoSeq; UIElementInfoHashMap aUIElementInfoCollection; - if ( ElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) + if ( ElementType == css::ui::UIElementType::UNKNOWN ) { - for ( sal_Int16 i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( sal_Int16 i = 0; i < css::ui::UIElementType::COUNT; i++ ) impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, sal_Int16( i ) ); } else @@ -897,7 +897,7 @@ throw ( IllegalArgumentException, RuntimeException, std::exception ) return aElementInfoSeq; } -Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -909,12 +909,12 @@ Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() t } sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const OUString& ResourceURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { @@ -927,12 +927,12 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: } Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { @@ -955,13 +955,13 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la throw NoSuchElementException(); } -void SAL_CALL UIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< css::container::XIndexAccess >& aNewData ) +throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) throw IllegalAccessException(); @@ -1019,8 +1019,8 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) throw IllegalAccessException(); @@ -1077,8 +1077,8 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || - ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) + if (( nElementType == css::ui::UIElementType::UNKNOWN ) || + ( nElementType >= css::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) throw IllegalAccessException(); @@ -1146,7 +1146,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, } } -Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw (css::uno::RuntimeException, std::exception) { if ( m_bDisposed ) throw DisposedException(); @@ -1172,7 +1172,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw return Reference< XInterface >( m_xImageManager, UNO_QUERY ); } -Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager() throw (css::uno::RuntimeException, std::exception) { // SAFE -> SolarMutexGuard g; @@ -1191,13 +1191,13 @@ Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShort return m_xAccConfig; } -Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (css::uno::RuntimeException, std::exception) { return Reference< XInterface >(); } // XUIConfigurationStorage -void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1245,10 +1245,10 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S if ( a >>= nOpenMode ) m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } - catch ( const com::sun::star::beans::UnknownPropertyException& ) + catch ( const css::beans::UnknownPropertyException& ) { } - catch ( const com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } @@ -1257,7 +1257,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S impl_Initialize(); } -sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1268,7 +1268,7 @@ sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star:: } // XUIConfigurationPersistence -void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigurationManager::reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexClearableGuard aGuard; @@ -1280,7 +1280,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exc // Try to access our module sub folder ConfigEventNotifyContainer aRemoveNotifyContainer; ConfigEventNotifyContainer aReplaceNotifyContainer; - for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( sal_Int16 i = 1; i < css::ui::UIElementType::COUNT; i++ ) { try { @@ -1307,7 +1307,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exc } } -void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigurationManager::store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1317,7 +1317,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce if ( m_xDocConfigStorage.is() && m_bModified && !m_bReadOnly ) { // Try to access our module sub folder - for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( int i = 1; i < css::ui::UIElementType::COUNT; i++ ) { try { @@ -1340,7 +1340,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce } } -void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1350,7 +1350,7 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage if ( m_xDocConfigStorage.is() && m_bModified && !m_bReadOnly ) { // Try to access our module sub folder - for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) + for ( int i = 1; i < css::ui::UIElementType::COUNT; i++ ) { try { @@ -1373,14 +1373,14 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage } } -sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; return m_bModified; } -sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1389,7 +1389,7 @@ sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star:: void UIConfigurationManager::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp ) { - ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<com::sun::star::ui::XUIConfigurationListener>::get()); + ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::ui::XUIConfigurationListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pIterator( *pContainer ); @@ -1400,13 +1400,13 @@ void UIConfigurationManager::implts_notifyContainerListener( const Configuration switch ( eOp ) { case NotifyOp_Replace: - static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent ); + static_cast< css::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent ); break; case NotifyOp_Insert: - static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent ); + static_cast< css::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent ); break; case NotifyOp_Remove: - static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent ); + static_cast< css::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent ); break; } } diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index a972a514755a..bccb30d9795a 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -108,14 +108,14 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon virtual ~ConfigurationAccess_WindowState(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XNameContainer virtual void SAL_CALL removeByName( const OUString& sName ) @@ -129,11 +129,11 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // container.XContainerListener virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override; @@ -177,7 +177,7 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon , bNoClose(false) , bSoftClose(false) , bContextActive(false) - , aDockingArea(::com::sun::star::ui::DockingArea_DOCKINGAREA_TOP) + , aDockingArea(css::ui::DockingArea_DOCKINGAREA_TOP) , aDockPos(0, 0) , aPos(0, 0) , aSize(0, 0) @@ -195,12 +195,12 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon bNoClose : 1, bSoftClose : 1, bContextActive : 1; - ::com::sun::star::ui::DockingArea aDockingArea; - com::sun::star::awt::Point aDockPos; - com::sun::star::awt::Size aDockSize; - com::sun::star::awt::Point aPos; - com::sun::star::awt::Size aSize; - OUString aUIName; + css::ui::DockingArea aDockingArea; + css::awt::Point aDockPos; + css::awt::Size aDockSize; + css::awt::Point aPos; + css::awt::Size aSize; + OUString aUIName; sal_uInt32 nInternalState; sal_uInt16 nStyle; sal_uInt32 nMask; // see WindowStateMask @@ -212,7 +212,7 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon Any impl_getSequenceFromStruct( const WindowStateInfo& rWinStateInfo ); void impl_fillStructFromSequence( WindowStateInfo& rWinStateInfo, const Sequence< PropertyValue >& rSeq ); Any impl_getWindowStateFromResourceURL( const OUString& rResourceURL ); - bool impl_initializeConfigAccess(); + bool impl_initializeConfigAccess(); private: typedef std::unordered_map< OUString, @@ -220,13 +220,13 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon OUStringHash, std::equal_to< OUString > > ResourceURLToInfoCache; - osl::Mutex m_aMutex; - OUString m_aConfigWindowAccess; + osl::Mutex m_aMutex; + OUString m_aConfigWindowAccess; Reference< XMultiServiceFactory > m_xConfigProvider; Reference< XNameAccess > m_xConfigAccess; Reference< XContainerListener > m_xConfigListener; ResourceURLToInfoCache m_aResourceURLToInfoCache; - bool m_bConfigAccessInitialized : 1, + bool m_bConfigAccessInitialized : 1, m_bModified : 1; std::vector< OUString > m_aPropArray; }; @@ -298,7 +298,7 @@ throw ( RuntimeException, std::exception ) } sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasByName( const OUString& rResourceURL ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { // SAFE osl::MutexGuard g(m_aMutex); @@ -372,7 +372,7 @@ throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::ex xFlush->commitChanges(); } } - catch ( const com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } @@ -681,7 +681,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OU OUString aXStr = aString.getToken( 0, ',', nToken ); if ( nToken > 0 ) { - com::sun::star::awt::Point aPos; + css::awt::Point aPos; aPos.X = aXStr.toInt32(); aPos.Y = aString.getToken( 0, ',', nToken ).toInt32(); @@ -713,7 +713,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OU OUString aStr = aString.getToken( 0, ',', nToken ); if ( nToken > 0 ) { - com::sun::star::awt::Size aSize; + css::awt::Size aSize; aSize.Width = aStr.toInt32(); aSize.Height = aString.getToken( 0, ',', nToken ).toInt32(); if ( i == PROPERTY_SIZE ) @@ -783,10 +783,10 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OU aPropSeq[nIndex].Value = a; } } - catch( const com::sun::star::container::NoSuchElementException& ) + catch( const css::container::NoSuchElementException& ) { } - catch ( const com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } @@ -874,7 +874,7 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat OUString aXStr = aString.getToken( 0, ',', nToken ); if ( nToken > 0 ) { - com::sun::star::awt::Point aPos; + css::awt::Point aPos; aPos.X = aXStr.toInt32(); aPos.Y = aString.getToken( 0, ',', nToken ).toInt32(); @@ -903,7 +903,7 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat OUString aStr = aString.getToken( 0, ',', nToken ); if ( nToken > 0 ) { - com::sun::star::awt::Size aSize; + css::awt::Size aSize; aSize.Width = aStr.toInt32(); aSize.Height = aString.getToken( 0, ',', nToken ).toInt32(); if ( i == PROPERTY_SIZE ) @@ -958,10 +958,10 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat DBG_ASSERT( false, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" ); } } - catch( const com::sun::star::container::NoSuchElementException& ) + catch( const css::container::NoSuchElementException& ) { } - catch ( const com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } } @@ -990,10 +990,10 @@ Any ConfigurationAccess_WindowState::impl_getWindowStateFromResourceURL( const O return impl_insertCacheAndReturnSequence( rResourceURL, xNameAccess ); } } - catch( const com::sun::star::container::NoSuchElementException& ) + catch( const css::container::NoSuchElementException& ) { } - catch ( const com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } @@ -1061,7 +1061,7 @@ void ConfigurationAccess_WindowState::impl_fillStructFromSequence( WindowStateIn case PROPERTY_DOCKINGAREA: { - ::com::sun::star::ui::DockingArea eDockingArea; + css::ui::DockingArea eDockingArea; if ( rSeq[i].Value >>= eDockingArea ) { rWinStateInfo.aDockingArea = eDockingArea; @@ -1073,7 +1073,7 @@ void ConfigurationAccess_WindowState::impl_fillStructFromSequence( WindowStateIn case PROPERTY_POS: case PROPERTY_DOCKPOS: { - com::sun::star::awt::Point aPoint; + css::awt::Point aPoint; if ( rSeq[i].Value >>= aPoint ) { if ( j == PROPERTY_POS ) @@ -1093,7 +1093,7 @@ void ConfigurationAccess_WindowState::impl_fillStructFromSequence( WindowStateIn case PROPERTY_SIZE: case PROPERTY_DOCKSIZE: { - com::sun::star::awt::Size aSize; + css::awt::Size aSize; if ( rSeq[i].Value >>= aSize ) { if ( j == PROPERTY_SIZE ) @@ -1348,7 +1348,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XComponentC { aElementNames = xModuleManager->getElementNames(); } - catch (const ::com::sun::star::uno::RuntimeException &) + catch (const css::uno::RuntimeException &) { } Sequence< PropertyValue > aSeq; @@ -1391,7 +1391,7 @@ WindowStateConfiguration::~WindowStateConfiguration() } Any SAL_CALL WindowStateConfiguration::getByName( const OUString& aModuleIdentifier ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1423,7 +1423,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } Sequence< OUString > SAL_CALL WindowStateConfiguration::getElementNames() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1441,7 +1441,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } sal_Bool SAL_CALL WindowStateConfiguration::hasByName( const OUString& aName ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1451,13 +1451,13 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) // XElementAccess Type SAL_CALL WindowStateConfiguration::getElementType() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { return( cppu::UnoType<XNameAccess>::get()); } sal_Bool SAL_CALL WindowStateConfiguration::hasElements() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { // We always have at least one module. So it is valid to return true! return sal_True; diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 22393d27b537..1e57e9252d57 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -107,7 +107,7 @@ static bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& return false; } -static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame, +static Image RetrieveImage( Reference< css::frame::XFrame >& rFrame, const OUString& aImageId, const OUString& aURL, bool bBigImage diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 9d14b3a11a3a..b2d3e2864b01 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -67,7 +67,7 @@ void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exc { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); - com::sun::star::lang::EventObject aEvent( xThis ); + css::lang::EventObject aEvent( xThis ); m_aListenerContainer.disposeAndClear( aEvent ); SolarMutexGuard g; @@ -142,7 +142,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument } // XUIElement interface -Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index aaf068591354..fef0d1da3c9e 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -44,12 +44,12 @@ #include <svtools/miscopt.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::awt; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::util; +using namespace css::awt; +using namespace css::uno; +using namespace css::beans; +using namespace css::lang; +using namespace css::frame; +using namespace css::util; namespace framework { @@ -73,7 +73,7 @@ ButtonToolbarController::~ButtonToolbarController() // XInterface uno::Any SAL_CALL ButtonToolbarController::queryInterface( const uno::Type& rType ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { Any a = ::cppu::queryInterface( rType , @@ -101,8 +101,8 @@ void SAL_CALL ButtonToolbarController::release() throw () // XInitialization void SAL_CALL ButtonToolbarController::initialize( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Sequence< css::uno::Any >& aArguments ) +throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { bool bInitialized( true ); @@ -140,7 +140,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException } // XComponent -void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ButtonToolbarController::dispose() throw (css::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -158,22 +158,22 @@ void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::R } void SAL_CALL ButtonToolbarController::addEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& ) -throw (::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference< css::lang::XEventListener >& ) +throw (css::uno::RuntimeException, std::exception) { // do nothing } void SAL_CALL ButtonToolbarController::removeEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& ) -throw (::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference< css::lang::XEventListener >& ) +throw (css::uno::RuntimeException, std::exception) { // do nothing } // XUpdatable void SAL_CALL ButtonToolbarController::update() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) @@ -182,8 +182,8 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) // XEventListener void SAL_CALL ButtonToolbarController::disposing( - const com::sun::star::lang::EventObject& Source ) -throw ( ::com::sun::star::uno::RuntimeException, std::exception ) + const css::lang::EventObject& Source ) +throw ( css::uno::RuntimeException, std::exception ) { uno::Reference< uno::XInterface > xSource( Source.Source ); @@ -197,8 +197,8 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) m_xFrame.clear(); } -void SAL_CALL ButtonToolbarController::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& ) -throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL ButtonToolbarController::statusChanged( const css::frame::FeatureStateEvent& ) +throw ( css::uno::RuntimeException, std::exception ) { // do nothing if ( m_bDisposed ) @@ -207,13 +207,13 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) // XToolbarController void SAL_CALL ButtonToolbarController::execute( sal_Int16 KeyModifier ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { uno::Reference< frame::XDispatch > xDispatch; uno::Reference< frame::XFrame > xFrame; uno::Reference< util::XURLTransformer > xURLTransformer; OUString aCommandURL; - ::com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; { SolarMutexGuard aSolarMutexGuard; @@ -264,7 +264,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } void SAL_CALL ButtonToolbarController::click() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; @@ -276,7 +276,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } void SAL_CALL ButtonToolbarController::doubleClick() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { // do nothing if ( m_bDisposed ) @@ -284,7 +284,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createPopupWindow() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { if ( m_bDisposed ) throw DisposedException(); @@ -293,8 +293,8 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createItemWindow( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& ) -throw (::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference< css::awt::XWindow >& ) +throw (css::uno::RuntimeException, std::exception) { if ( m_bDisposed ) throw DisposedException(); diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 3d6f17b42788..a7ad8a36d529 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -36,12 +36,12 @@ #include <vcl/combobox.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::frame::status; -using namespace ::com::sun::star::util; +using namespace css::uno; +using namespace css::beans; +using namespace css::lang; +using namespace css::frame; +using namespace css::frame::status; +using namespace css::util; namespace framework { @@ -252,7 +252,7 @@ bool ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) return false; } -void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) +void ComboboxToolbarController::executeControlCommand( const css::frame::ControlCommand& rControlCommand ) { if ( rControlCommand.Command == "SetText" ) { @@ -379,7 +379,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f { if ( rControlCommand.Arguments[i].Name == "Color" ) { - com::sun::star::util::Color aColor(0); + css::util::Color aColor(0); if ( rControlCommand.Arguments[i].Value >>= aColor ) { ::Color aBackColor( static_cast< sal_uInt32 >( aColor )); @@ -395,7 +395,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f { if ( rControlCommand.Arguments[i].Name == "Color" ) { - com::sun::star::util::Color aColor(0); + css::util::Color aColor(0); if ( rControlCommand.Arguments[i].Value >>= aColor ) { ::Color aForeColor( static_cast< sal_uInt32 >( aColor )); diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 5ac9a3a1a59f..6ff709d180e7 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -38,13 +38,13 @@ #include <vcl/settings.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::awt; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::frame::status; -using namespace ::com::sun::star::util; +using namespace css::awt; +using namespace css::uno; +using namespace css::beans; +using namespace css::lang; +using namespace css::frame; +using namespace css::frame::status; +using namespace css::util; namespace framework { @@ -96,7 +96,7 @@ throw ( RuntimeException, std::exception ) Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; OUString aCommandURL; - ::com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; Sequence<PropertyValue> aArgs; { @@ -289,7 +289,7 @@ uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromComm return xDispatch; } -const ::com::sun::star::util::URL& ComplexToolbarController::getInitializedURL() +const css::util::URL& ComplexToolbarController::getInitializedURL() { if ( m_aURL.Complete.isEmpty() ) { diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index a35bce773da7..9f2970a97291 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -166,10 +166,10 @@ static const char* aCommands[] = }; using namespace css; -using namespace com::sun::star::uno; -using namespace com::sun::star::lang; -using namespace com::sun::star::frame; -using namespace com::sun::star::beans; +using namespace css::uno; +using namespace css::lang; +using namespace css::frame; +using namespace css::beans; namespace { @@ -240,7 +240,7 @@ private: UrlToDispatchMap m_aURLToDispatchMap; }; -ControlMenuController::ControlMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : +ControlMenuController::ControlMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), m_pResPopupMenu( 0 ) { @@ -407,7 +407,7 @@ void ControlMenuController::impl_setPopupMenu() } // if ( m_pResPopupMenu == 0 ) } -void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ControlMenuController::updatePopupMenu() throw (css::uno::RuntimeException, std::exception) { osl::ResettableMutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 939a8c962a29..4045384ec475 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -34,13 +34,13 @@ #include <vcl/toolbox.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::awt; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::frame::status; -using namespace ::com::sun::star::util; +using namespace css::awt; +using namespace css::uno; +using namespace css::beans; +using namespace css::lang; +using namespace css::frame; +using namespace css::frame::status; +using namespace css::util; namespace framework { @@ -203,7 +203,7 @@ bool DropdownToolbarController::PreNotify( NotifyEvent& /*rNEvt*/ ) return false; } -void DropdownToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) +void DropdownToolbarController::executeControlCommand( const css::frame::ControlCommand& rControlCommand ) { if ( rControlCommand.Command == "SetList" ) { diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 7970f10684af..b0134c4a2ca9 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -34,12 +34,12 @@ #include <vcl/toolbox.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::frame::status; -using namespace ::com::sun::star::util; +using namespace css::uno; +using namespace css::beans; +using namespace css::lang; +using namespace css::frame; +using namespace css::frame::status; +using namespace css::util; namespace framework { @@ -207,7 +207,7 @@ bool EditToolbarController::PreNotify( NotifyEvent& rNEvt ) return false; } -void EditToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) +void EditToolbarController::executeControlCommand( const css::frame::ControlCommand& rControlCommand ) { if ( rControlCommand.Command.startsWith( "SetText" )) { diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 70229e9357c1..6e529b734e88 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -37,11 +37,11 @@ // Defines -using namespace com::sun::star::uno; -using namespace com::sun::star::lang; -using namespace com::sun::star::frame; -using namespace com::sun::star::beans; -using namespace com::sun::star::util; +using namespace css::uno; +using namespace css::lang; +using namespace css::frame; +using namespace css::beans; +using namespace css::util; using namespace std; @@ -62,7 +62,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2 ( FontMenuController DEFINE_INIT_SERVICE ( FontMenuController, {} ) -FontMenuController::FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : +FontMenuController::FontMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ) { } @@ -130,7 +130,7 @@ void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( Runtim // XStatusListener void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { - com::sun::star::awt::FontDescriptor aFontDescriptor; + css::awt::FontDescriptor aFontDescriptor; Sequence< OUString > aFontNameSeq; if ( Event.State >>= aFontDescriptor ) @@ -188,20 +188,20 @@ void FontMenuController::impl_setPopupMenu() { Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; // Register for font list updates to get the current font list from the controller aTargetURL.Complete = ".uno:FontNameList"; m_xURLTransformer->parseStrict( aTargetURL ); m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } -void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL FontMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception ) { svt::PopupMenuControllerBase::updatePopupMenu(); osl::ClearableMutexGuard aLock( m_aMutex ); Reference< XDispatch > xDispatch( m_xFontListDispatch ); - com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; aTargetURL.Complete = ".uno:FontNameList"; m_xURLTransformer->parseStrict( aTargetURL ); aLock.clear(); diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index ec5cfa8a12f7..4f7d60eb67b7 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -58,7 +58,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2 ( FontSizeMenuController DEFINE_INIT_SERVICE ( FontSizeMenuController, {} ) -FontSizeMenuController::FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : +FontSizeMenuController::FontSizeMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), m_pHeightArray( 0 ) { @@ -70,7 +70,7 @@ FontSizeMenuController::~FontSizeMenuController() } // private function -OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ) +OUString FontSizeMenuController::retrievePrinterName( css::uno::Reference< css::frame::XFrame >& rFrame ) { OUString aPrinterName; @@ -253,8 +253,8 @@ void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( Ru // XStatusListener void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { - com::sun::star::awt::FontDescriptor aFontDescriptor; - ::com::sun::star::frame::status::FontHeight aFontHeight; + css::awt::FontDescriptor aFontDescriptor; + css::frame::status::FontHeight aFontHeight; if ( Event.State >>= aFontDescriptor ) { @@ -282,21 +282,21 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev void FontSizeMenuController::impl_setPopupMenu() { Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; // Register for font name updates which gives us info about the current font! aTargetURL.Complete = ".uno:CharFontName"; m_xURLTransformer->parseStrict( aTargetURL ); m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } -void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception ) { osl::ClearableMutexGuard aLock( m_aMutex ); throwIfDisposed(); Reference< XDispatch > xDispatch( m_xCurrentFontDispatch ); - com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; aTargetURL.Complete = ".uno:CharFontName"; m_xURLTransformer->parseStrict( aTargetURL ); aLock.clear(); diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index 95c195269a42..6cd00ff41112 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -56,7 +56,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2 ( FooterMenuController IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER ) -FooterMenuController::FooterMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : +FooterMenuController::FooterMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : HeaderMenuController( xContext,true ) { } diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index dddb2f16db1d..f9a89d928cc3 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -93,9 +93,9 @@ static OUString getMasterCommand( const OUString& rCommand ) struct ExecuteInfo { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; - ::com::sun::star::util::URL aTargetURL; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + css::uno::Reference< css::frame::XDispatch > xDispatch; + css::util::URL aTargetURL; + css::uno::Sequence< css::beans::PropertyValue > aArgs; }; GenericToolbarController::GenericToolbarController( const Reference< XComponentContext >& rxContext, @@ -157,7 +157,7 @@ throw ( RuntimeException, std::exception ) if ( xDispatch.is() && xURLTransformer.is() ) { - com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; Sequence<PropertyValue> aArgs( 1 ); // Add key modifier to argument list @@ -341,7 +341,7 @@ void SAL_CALL MenuToolbarController::click() throw (RuntimeException, std::excep } Reference< XWindow > SAL_CALL -MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) +MenuToolbarController::createPopupWindow() throw (css::uno::RuntimeException, std::exception) { if ( !pMenu ) { diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 757515577b7e..9e170df97dea 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -61,7 +61,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2 ( HeaderMenuController DEFINE_INIT_SERVICE ( HeaderMenuController, {} ) -HeaderMenuController::HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, bool _bFooter ) : +HeaderMenuController::HeaderMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext, bool _bFooter ) : svt::PopupMenuControllerBase( xContext ) ,m_bFooter(_bFooter) { @@ -72,7 +72,7 @@ HeaderMenuController::~HeaderMenuController() } // private function -void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::frame::XModel >& rModel, Reference< css::awt::XPopupMenu >& rPopupMenu ) +void HeaderMenuController::fillPopupMenu( const Reference< css::frame::XModel >& rModel, Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); PopupMenu* pVCLPopupMenu = 0; @@ -175,7 +175,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra } } } - catch ( const com::sun::star::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } } @@ -198,7 +198,7 @@ void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( Runt // XStatusListener void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { - Reference< com::sun::star::frame::XModel > xModel; + Reference< css::frame::XModel > xModel; if ( Event.State >>= xModel ) { @@ -210,13 +210,13 @@ void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Even } // XMenuListener -void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL HeaderMenuController::updatePopupMenu() throw (css::uno::RuntimeException, std::exception) { osl::ResettableMutexGuard aLock( m_aMutex ); throwIfDisposed(); - Reference< com::sun::star::frame::XModel > xModel( m_xModel ); + Reference< css::frame::XModel > xModel( m_xModel ); aLock.clear(); if ( !xModel.is() ) diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 5e6c19fd2bd0..b363833010d8 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -88,7 +88,7 @@ throw ( RuntimeException, std::exception ) ComplexToolbarController::dispose(); } -void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) +void ImageButtonToolbarController::executeControlCommand( const css::frame::ControlCommand& rControlCommand ) { SolarMutexGuard aSolarMutexGuard; // i73486 to be downward compatible use old and "wrong" also! diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 6cb7728976f8..034c985b245e 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -70,7 +70,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2 ( LanguageSelectionMenuController DEFINE_INIT_SERVICE ( LanguageSelectionMenuController, {} ) -LanguageSelectionMenuController::LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) +LanguageSelectionMenuController::LanguageSelectionMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase(xContext) , m_bShowMenu(true) , m_nScriptType(SvtScriptType::LATIN | SvtScriptType::ASIAN | SvtScriptType::COMPLEX) @@ -133,7 +133,7 @@ void LanguageSelectionMenuController::impl_setPopupMenu() { Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; // Register for language updates aTargetURL.Complete = m_aLangStatusCommandURL; @@ -240,14 +240,14 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup pPopupMenu->SetItemCommand( nItemId, aCmd_Dialog ); } -void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception ) { svt::PopupMenuControllerBase::updatePopupMenu(); // Force status update to get information about the current languages osl::ClearableMutexGuard aLock( m_aMutex ); Reference< XDispatch > xDispatch( m_xLanguageDispatch ); - com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; aTargetURL.Complete = m_aLangStatusCommandURL; m_xURLTransformer->parseStrict( aTargetURL ); aLock.clear(); diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 016f280b6a01..58b53b2bb983 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -206,8 +206,8 @@ throw (css::uno::RuntimeException, std::exception) // now display the popup menu and execute every command ... Reference< awt::XWindowPeer > xParent( m_xParentWindow, UNO_QUERY ); - com::sun::star::awt::Rectangle aRect( aPos.X, aPos.Y, 0, 0 ); - sal_Int16 nId = xPopupMenu->execute( xParent, aRect, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 ); + css::awt::Rectangle aRect( aPos.X, aPos.Y, 0, 0 ); + sal_Int16 nId = xPopupMenu->execute( xParent, aRect, css::awt::PopupMenuDirection::EXECUTE_UP+16 ); //click "More..." if ( nId && m_xFrame.is() ) { diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 132771b07f54..685e14a89a19 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -57,7 +57,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2 ( MacrosMenuController DEFINE_INIT_SERVICE ( MacrosMenuController, {} ) -MacrosMenuController::MacrosMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : +MacrosMenuController::MacrosMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), m_xContext( xContext) { diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index bf5c8c416ec1..9b14be816952 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -126,7 +126,7 @@ static sal_Int16 getImageTypeFromBools( bool bBig ) { sal_Int16 n( 0 ); if ( bBig ) - n |= ::com::sun::star::ui::ImageType::SIZE_LARGE; + n |= css::ui::ImageType::SIZE_LARGE; return n; } @@ -176,12 +176,12 @@ Any SAL_CALL MenuBarManager::queryInterface( const Type & rType ) throw ( Runtim { Any a = ::cppu::queryInterface( rType , - (static_cast< ::com::sun::star::frame::XStatusListener* >(this)), - (static_cast< ::com::sun::star::frame::XFrameActionListener* >(this)), - (static_cast< ::com::sun::star::ui::XUIConfigurationListener* >(this)), + (static_cast< css::frame::XStatusListener* >(this)), + (static_cast< css::frame::XFrameActionListener* >(this)), + (static_cast< css::ui::XUIConfigurationListener* >(this)), (static_cast< XEventListener* >(static_cast<XStatusListener *>(this))), (static_cast< XComponent* >(this)), - (static_cast< ::com::sun::star::awt::XSystemDependentMenuPeer* >(this))); + (static_cast< css::awt::XSystemDependentMenuPeer* >(this))); if ( a.hasValue() ) return a; @@ -204,7 +204,7 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces SolarMutexGuard aSolarGuard; if ( m_bDisposed ) - throw com::sun::star::lang::DisposedException(); + throw css::lang::DisposedException(); Any a; @@ -336,7 +336,7 @@ void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListen m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener ); } -void SAL_CALL MenuBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) +void SAL_CALL MenuBarManager::elementInserted( const css::ui::ConfigurationEvent& Event ) throw (RuntimeException, std::exception) { SolarMutexGuard g; @@ -352,13 +352,13 @@ throw (RuntimeException, std::exception) RequestImages(); } -void SAL_CALL MenuBarManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) +void SAL_CALL MenuBarManager::elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (RuntimeException, std::exception) { elementInserted(Event); } -void SAL_CALL MenuBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) +void SAL_CALL MenuBarManager::elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (RuntimeException, std::exception) { elementInserted(Event); @@ -371,7 +371,7 @@ throw ( RuntimeException, std::exception ) SolarMutexGuard g; if ( m_bDisposed ) - throw com::sun::star::lang::DisposedException(); + throw css::lang::DisposedException(); if ( Action.Action == FrameAction_CONTEXT_CHANGED ) { @@ -561,7 +561,7 @@ void MenuBarManager::RemoveListener() m_pVCLMenu->SetPopupMenu( pItemHandler->nItemId, 0 ); } - Reference< com::sun::star::lang::XEventListener > xEventListener( pItemHandler->xPopupMenuController, UNO_QUERY ); + Reference< css::lang::XEventListener > xEventListener( pItemHandler->xPopupMenuController, UNO_QUERY ); if ( xEventListener.is() ) { EventObject aEventObject; @@ -646,7 +646,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run pMenuItemDisposing->xMenuItemDispatch.clear(); if ( pMenuItemDisposing->xPopupMenu.is() ) { - Reference< com::sun::star::lang::XEventListener > xEventListener( pMenuItemDisposing->xPopupMenuController, UNO_QUERY ); + Reference< css::lang::XEventListener > xEventListener( pMenuItemDisposing->xPopupMenuController, UNO_QUERY ); if ( xEventListener.is() ) xEventListener->disposing( Source ); @@ -714,28 +714,28 @@ static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16 nItemId) namespace { class QuietInteractionContext: - public cppu::WeakImplHelper< com::sun::star::uno::XCurrentContext >, + public cppu::WeakImplHelper< css::uno::XCurrentContext >, private boost::noncopyable { public: QuietInteractionContext( - com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > + css::uno::Reference< css::uno::XCurrentContext > const & context): context_(context) {} private: virtual ~QuietInteractionContext() {} - virtual com::sun::star::uno::Any SAL_CALL getValueByName( + virtual css::uno::Any SAL_CALL getValueByName( OUString const & Name) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return Name != JAVA_INTERACTION_HANDLER_NAME && context_.is() ? context_->getValueByName(Name) - : com::sun::star::uno::Any(); + : css::uno::Any(); } - com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > + css::uno::Reference< css::uno::XCurrentContext > context_; }; @@ -745,9 +745,9 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool ) { if ( pMenu == m_pVCLMenu ) { - com::sun::star::uno::ContextLayer layer( + css::uno::ContextLayer layer( new QuietInteractionContext( - com::sun::star::uno::getCurrentContext())); + css::uno::getCurrentContext())); // set/unset hiding disabled menu entries bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); @@ -1223,7 +1223,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF VCLXPopupMenu* pVCLXPopupMenu = new VCLXPopupMenu; PopupMenu* pNewPopupMenu = static_cast<PopupMenu *>(pVCLXPopupMenu->GetMenu()); pMenu->SetPopupMenu( nItemId, pNewPopupMenu ); - pItemHandler->xPopupMenu = Reference< com::sun::star::awt::XPopupMenu >( static_cast<OWeakObject *>(pVCLXPopupMenu), UNO_QUERY ); + pItemHandler->xPopupMenu = Reference< css::awt::XPopupMenu >( static_cast<OWeakObject *>(pVCLXPopupMenu), UNO_QUERY ); pItemHandler->aMenuItemURL = aItemCommand; m_aMenuItemHandlerVector.push_back( pItemHandler ); delete pPopup; @@ -1353,7 +1353,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF VCLXPopupMenu* pVCLXPopupMenu = new VCLXPopupMenu; PopupMenu* pPopupMenu = static_cast<PopupMenu *>(pVCLXPopupMenu->GetMenu()); pMenu->SetPopupMenu( pItemHandler->nItemId, pPopupMenu ); - pItemHandler->xPopupMenu = Reference< com::sun::star::awt::XPopupMenu >( static_cast<OWeakObject *>(pVCLXPopupMenu), UNO_QUERY ); + pItemHandler->xPopupMenu = Reference< css::awt::XPopupMenu >( static_cast<OWeakObject *>(pVCLXPopupMenu), UNO_QUERY ); if ( bAccessibilityEnabled && CreatePopupMenuController( pItemHandler ) ) { @@ -1399,7 +1399,7 @@ void MenuBarManager::impl_RetrieveShortcutsFromConfiguration( { try { - com::sun::star::awt::KeyEvent aKeyEvent; + css::awt::KeyEvent aKeyEvent; Sequence< Any > aSeqKeyCode = rAccelCfg->getPreferredKeyEventsForCommandList( rCommands ); for ( sal_Int32 i = 0; i < aSeqKeyCode.getLength(); i++ ) { @@ -1648,7 +1648,7 @@ void MenuBarManager::FillMenu( aProp[i].Value >>= bEnabled; } - if ( nType == ::com::sun::star::ui::ItemType::DEFAULT ) + if ( nType == css::ui::ItemType::DEFAULT ) { pMenu->InsertItem( nId, aLabel ); pMenu->SetItemCommand( nId, aCommandURL ); @@ -1656,11 +1656,11 @@ void MenuBarManager::FillMenu( if ( nStyle ) { MenuItemBits nBits = pMenu->GetItemBits( nId ); - if ( nStyle & ::com::sun::star::ui::ItemStyle::ICON ) + if ( nStyle & css::ui::ItemStyle::ICON ) nBits |= MenuItemBits::ICON; - if ( nStyle & ::com::sun::star::ui::ItemStyle::TEXT ) + if ( nStyle & css::ui::ItemStyle::TEXT ) nBits |= MenuItemBits::TEXT; - if ( nStyle & ::com::sun::star::ui::ItemStyle::RADIO_CHECK ) + if ( nStyle & css::ui::ItemStyle::RADIO_CHECK ) nBits |= MenuItemBits::RADIOCHECK; pMenu->SetItemBits( nId, nBits ); } @@ -1957,7 +1957,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,Menu* pAddonMenu,boo VCLXPopupMenu* pVCLXPopupMenu = new VCLXPopupMenu; PopupMenu* pCtlPopupMenu = static_cast<PopupMenu *>(pVCLXPopupMenu->GetMenu()); pAddonMenu->SetPopupMenu( pMenuItemHandler->nItemId, pCtlPopupMenu ); - pMenuItemHandler->xPopupMenu = Reference< com::sun::star::awt::XPopupMenu >( static_cast<OWeakObject *>(pVCLXPopupMenu), UNO_QUERY ); + pMenuItemHandler->xPopupMenu = Reference< css::awt::XPopupMenu >( static_cast<OWeakObject *>(pVCLXPopupMenu), UNO_QUERY ); } } diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index e4260952a734..bc9acf4bec67 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -45,13 +45,13 @@ namespace framework Describes a context string list where all contexts are delimited by a colon. For more information about the module identifier used as context strings see the - IDL description of com::sun::star::frame::XModuleManager + IDL description of css::frame::XModuleManager @param rModuleIdentifier A string describing a module identifier. See IDL - description of com::sun::star::frame::XModuleManager. + description of css::frame::XModuleManager. */ bool MenuBarMerger::IsCorrectContext( const OUString& rContext, const OUString& rModuleIdentifier ) diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 05a8be6992fe..4e149cf97127 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -50,35 +50,35 @@ namespace framework // XInterface, XTypeProvider DEFINE_XINTERFACE_11 ( MenuBarWrapper , UIConfigElementWrapperBase , - DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), - DIRECT_INTERFACE( ::com::sun::star::ui::XUIElement ), - DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementSettings ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::lang::XInitialization ), - DIRECT_INTERFACE( ::com::sun::star::lang::XComponent ), - DIRECT_INTERFACE( ::com::sun::star::util::XUpdatable ), - DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationListener ), - DERIVED_INTERFACE( ::com::sun::star::container::XNameAccess, ::com::sun::star::container::XElementAccess ) + DIRECT_INTERFACE( css::lang::XTypeProvider ), + DIRECT_INTERFACE( css::ui::XUIElement ), + DIRECT_INTERFACE( css::ui::XUIElementSettings ), + DIRECT_INTERFACE( css::beans::XMultiPropertySet ), + DIRECT_INTERFACE( css::beans::XFastPropertySet ), + DIRECT_INTERFACE( css::beans::XPropertySet ), + DIRECT_INTERFACE( css::lang::XInitialization ), + DIRECT_INTERFACE( css::lang::XComponent ), + DIRECT_INTERFACE( css::util::XUpdatable ), + DIRECT_INTERFACE( css::ui::XUIConfigurationListener ), + DERIVED_INTERFACE( css::container::XNameAccess, css::container::XElementAccess ) ) DEFINE_XTYPEPROVIDER_11 ( MenuBarWrapper , - ::com::sun::star::lang::XTypeProvider , - ::com::sun::star::ui::XUIElement , - ::com::sun::star::ui::XUIElementSettings , - ::com::sun::star::beans::XMultiPropertySet , - ::com::sun::star::beans::XFastPropertySet , - ::com::sun::star::beans::XPropertySet , - ::com::sun::star::lang::XInitialization , - ::com::sun::star::lang::XComponent , - ::com::sun::star::util::XUpdatable , - ::com::sun::star::ui::XUIConfigurationListener , - ::com::sun::star::container::XNameAccess + css::lang::XTypeProvider , + css::ui::XUIElement , + css::ui::XUIElementSettings , + css::beans::XMultiPropertySet , + css::beans::XFastPropertySet , + css::beans::XPropertySet , + css::lang::XInitialization , + css::lang::XComponent , + css::util::XUpdatable , + css::ui::XUIConfigurationListener , + css::container::XNameAccess ) MenuBarWrapper::MenuBarWrapper( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : UIConfigElementWrapperBase( UIElementType::MENUBAR ), m_bRefreshPopupControllerCache( true ), @@ -90,11 +90,11 @@ MenuBarWrapper::~MenuBarWrapper() { } -void SAL_CALL MenuBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL MenuBarWrapper::dispose() throw (css::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); - com::sun::star::lang::EventObject aEvent( xThis ); + css::lang::EventObject aEvent( xThis ); m_aListenerContainer.disposeAndClear( aEvent ); SolarMutexGuard g; @@ -250,13 +250,13 @@ void MenuBarWrapper::fillPopupControllerCache() // XElementAccess Type SAL_CALL MenuBarWrapper::getElementType() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { return cppu::UnoType<XDispatchProvider>::get(); } sal_Bool SAL_CALL MenuBarWrapper::hasElements() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -293,7 +293,7 @@ throw ( container::NoSuchElementException, } Sequence< OUString > SAL_CALL MenuBarWrapper::getElementNames() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -317,7 +317,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) sal_Bool SAL_CALL MenuBarWrapper::hasByName( const OUString& aName ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 07e977e3e2b9..0788fd468d57 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -281,7 +281,7 @@ void NewMenuController::retrieveShortcutsFromConfiguration( { try { - com::sun::star::awt::KeyEvent aKeyEvent; + css::awt::KeyEvent aKeyEvent; Sequence< Any > aSeqKeyCode = rAccelCfg->getPreferredKeyEventsForCommandList( rCommands ); for ( sal_Int32 i = 0; i < aSeqKeyCode.getLength(); i++ ) { @@ -295,7 +295,7 @@ void NewMenuController::retrieveShortcutsFromConfiguration( } } -NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : +NewMenuController::NewMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), m_bShowImages( true ), m_bNewMenu( false ), diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index d27c2281e499..a73d61183891 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -92,7 +92,7 @@ private: css::uno::Reference< css::frame::XDispatch > m_xObjectUpdateDispatch; }; -ObjectMenuController::ObjectMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : +ObjectMenuController::ObjectMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ) { } @@ -102,7 +102,7 @@ ObjectMenuController::~ObjectMenuController() } // private function -void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed::VerbDescriptor >& rVerbCommandSeq, Reference< css::awt::XPopupMenu >& rPopupMenu ) +void ObjectMenuController::fillPopupMenu( const Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, Reference< css::awt::XPopupMenu >& rPopupMenu ) { const css::embed::VerbDescriptor* pVerbCommandArray = rVerbCommandSeq.getConstArray(); VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); @@ -119,8 +119,8 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed: const OUString aVerbCommand( ".uno:ObjectMenue?VerbID:short=" ); for ( sal_Int32 i = 0; i < rVerbCommandSeq.getLength(); i++ ) { - const com::sun::star::embed::VerbDescriptor& rVerb = pVerbCommandArray[i]; - if ( rVerb.VerbAttributes & com::sun::star::embed::VerbAttributes::MS_VERBATTR_ONCONTAINERMENU ) + const css::embed::VerbDescriptor& rVerb = pVerbCommandArray[i]; + if ( rVerb.VerbAttributes & css::embed::VerbAttributes::MS_VERBATTR_ONCONTAINERMENU ) { m_xPopupMenu->insertItem( i+1, rVerb.VerbName, 0, i ); // use VCL popup menu pointer to set vital information that are not part of the awt implementation @@ -151,7 +151,7 @@ void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( Runt // XStatusListener void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { - Sequence < com::sun::star::embed::VerbDescriptor > aVerbCommandSeq; + Sequence < css::embed::VerbDescriptor > aVerbCommandSeq; if ( Event.State >>= aVerbCommandSeq ) { osl::MutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index d753b9e72ec4..20ccae7d434d 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; namespace framework{ ProgressBarWrapper::ProgressBarWrapper() : -UIElementWrapperBase( ::com::sun::star::ui::UIElementType::PROGRESSBAR ) +UIElementWrapperBase( css::ui::UIElementType::PROGRESSBAR ) , m_bOwnsInstance( false ) , m_nRange( 100 ) , m_nValue( 0 ) @@ -82,7 +82,7 @@ uno::Reference< awt::XWindow > ProgressBarWrapper::getStatusBar() const return m_xStatusBar; } -// wrapped methods of ::com::sun::star::task::XStatusIndicator +// wrapped methods of css::task::XStatusIndicator void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range ) throw (uno::RuntimeException, std::exception) { diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 7fdf8e6846d7..7bdd262de1a4 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -98,7 +98,7 @@ public: virtual void SAL_CALL dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& seqProperties ) throw( uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) override; DECL_STATIC_LINK_TYPED( RecentFilesMenuController, ExecuteHdl_Impl, void*, void ); @@ -110,12 +110,12 @@ private: OUString aTitle; }; - void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); + void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); void executeEntry( sal_Int32 nIndex ); std::vector< RecentFile > m_aRecentFilesItems; - bool m_bDisabled : 1; - bool m_bShowRemote; + bool m_bDisabled : 1; + bool m_bShowRemote; }; RecentFilesMenuController::RecentFilesMenuController( const uno::Reference< uno::XComponentContext >& xContext, @@ -361,7 +361,7 @@ void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent SvtHistoryOptions().Clear( ePICKLIST ); dispatchCommand( "vnd.org.libreoffice.recentdocs:ClearRecentFileList", - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >() ); + css::uno::Sequence< css::beans::PropertyValue >() ); } else if ( aCommand == CMD_OPEN_REMOTE ) { diff --git a/framework/source/uielement/saveasmenucontroller.cxx b/framework/source/uielement/saveasmenucontroller.cxx index 85d47d1e3273..63bbbfc64cca 100644 --- a/framework/source/uielement/saveasmenucontroller.cxx +++ b/framework/source/uielement/saveasmenucontroller.cxx @@ -79,12 +79,12 @@ public: virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) override; private: virtual void impl_setPopupMenu() override; - void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); + void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); bool m_bDisabled : 1; }; diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 80f0e1d24911..b44899375fe7 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -323,7 +323,7 @@ bool SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt ) return false; } -void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) +void SpinfieldToolbarController::executeControlCommand( const css::frame::ControlCommand& rControlCommand ) { OUString aValue; OUString aMax; diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index b2af4348ad00..6b9fde6504e0 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -130,15 +130,15 @@ throw (RuntimeException, std::exception) return ::sal_Int32(0); } -::com::sun::star::awt::Rectangle SAL_CALL StatusbarItem::getItemRect() +css::awt::Rectangle SAL_CALL StatusbarItem::getItemRect() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::awt::Rectangle aAWTRect; + css::awt::Rectangle aAWTRect; if ( m_pStatusBar ) { Rectangle aRect = m_pStatusBar->GetItemRect( m_nId ); - return ::com::sun::star::awt::Rectangle( aRect.Left(), + return css::awt::Rectangle( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight() ); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index cd44aa1e34ca..8a0448f64c24 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -104,23 +104,23 @@ static sal_uInt16 impl_convertItemStyleToItemBits( sal_Int16 nStyle ) { sal_uInt16 nItemBits( 0 ); - if (( nStyle & ::com::sun::star::ui::ItemStyle::ALIGN_RIGHT ) == ::com::sun::star::ui::ItemStyle::ALIGN_RIGHT ) + if (( nStyle & css::ui::ItemStyle::ALIGN_RIGHT ) == css::ui::ItemStyle::ALIGN_RIGHT ) nItemBits |= SIB_RIGHT; - else if ( nStyle & ::com::sun::star::ui::ItemStyle::ALIGN_LEFT ) + else if ( nStyle & css::ui::ItemStyle::ALIGN_LEFT ) nItemBits |= SIB_LEFT; else nItemBits |= SIB_CENTER; - if (( nStyle & ::com::sun::star::ui::ItemStyle::DRAW_FLAT ) == ::com::sun::star::ui::ItemStyle::DRAW_FLAT ) + if (( nStyle & css::ui::ItemStyle::DRAW_FLAT ) == css::ui::ItemStyle::DRAW_FLAT ) nItemBits |= SIB_FLAT; - else if ( nStyle & ::com::sun::star::ui::ItemStyle::DRAW_OUT3D ) + else if ( nStyle & css::ui::ItemStyle::DRAW_OUT3D ) nItemBits |= SIB_OUT; else nItemBits |= SIB_IN; - if (( nStyle & ::com::sun::star::ui::ItemStyle::AUTO_SIZE ) == ::com::sun::star::ui::ItemStyle::AUTO_SIZE ) + if (( nStyle & css::ui::ItemStyle::AUTO_SIZE ) == css::ui::ItemStyle::AUTO_SIZE ) nItemBits |= SIB_AUTOSIZE; - if ( nStyle & ::com::sun::star::ui::ItemStyle::OWNER_DRAW ) + if ( nStyle & css::ui::ItemStyle::OWNER_DRAW ) nItemBits |= SIB_USERDRAW; return nItemBits; @@ -437,12 +437,12 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ ) { uno::Sequence< beans::PropertyValue > aProp; - OUString aCommandURL; - OUString aHelpURL; + OUString aCommandURL; + OUString aHelpURL; sal_Int16 nOffset( 0 ); sal_Int16 nStyle( 0 ); sal_Int16 nWidth( 0 ); - sal_uInt16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); + sal_uInt16 nType( css::ui::ItemType::DEFAULT ); try { @@ -476,7 +476,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc } } - if (( nType == ::com::sun::star::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() ) + if (( nType == css::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() ) { OUString aString( RetrieveLabelFromCommand( aCommandURL )); sal_uInt16 nItemBits( impl_convertItemStyleToItemBits( nStyle )); @@ -488,7 +488,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc } } } - catch ( const ::com::sun::star::lang::IndexOutOfBoundsException& ) + catch ( const css::lang::IndexOutOfBoundsException& ) { break; } @@ -620,7 +620,7 @@ void StatusBarManager::MouseMove( const MouseEvent& rMEvt ) MouseButton(rMEvt,&frame::XStatusbarController::mouseMove); } -void StatusBarManager::MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL frame::XStatusbarController::*_pMethod )(const ::com::sun::star::awt::MouseEvent&)) +void StatusBarManager::MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL frame::XStatusbarController::*_pMethod )(const css::awt::MouseEvent&)) { SolarMutexGuard g; @@ -633,7 +633,7 @@ void StatusBarManager::MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL uno::Reference< frame::XStatusbarController > xController( it->second ); if ( xController.is() ) { - ::com::sun::star::awt::MouseEvent aMouseEvent; + css::awt::MouseEvent aMouseEvent; aMouseEvent.Buttons = rMEvt.GetButtons(); aMouseEvent.X = rMEvt.GetPosPixel().X(); aMouseEvent.Y = rMEvt.GetPosPixel().Y(); diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index a4da08f1c792..6a4f6dae1bc2 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -51,7 +51,7 @@ namespace framework { StatusBarWrapper::StatusBarWrapper( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : UIConfigElementWrapperBase( UIElementType::STATUSBAR ), m_xContext( rxContext ) @@ -62,11 +62,11 @@ StatusBarWrapper::~StatusBarWrapper() { } -void SAL_CALL StatusBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL StatusBarWrapper::dispose() throw (css::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); - com::sun::star::lang::EventObject aEvent( xThis ); + css::lang::EventObject aEvent( xThis ); m_aListenerContainer.disposeAndClear( aEvent ); SolarMutexGuard g; diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx index 9108ceb13fc4..1ff930941b19 100644 --- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx +++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx @@ -32,7 +32,7 @@ namespace framework { StatusIndicatorInterfaceWrapper::StatusIndicatorInterfaceWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rStatusIndicatorImpl ) : + const css::uno::Reference< css::lang::XComponent >& rStatusIndicatorImpl ) : m_xStatusIndicatorImpl( rStatusIndicatorImpl ) { } @@ -44,7 +44,7 @@ StatusIndicatorInterfaceWrapper::~StatusIndicatorInterfaceWrapper() void SAL_CALL StatusIndicatorInterfaceWrapper::start( const OUString& sText, sal_Int32 nRange ) -throw( ::com::sun::star::uno::RuntimeException, std::exception ) +throw( css::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -56,7 +56,7 @@ throw( ::com::sun::star::uno::RuntimeException, std::exception ) } void SAL_CALL StatusIndicatorInterfaceWrapper::end() -throw( ::com::sun::star::uno::RuntimeException, std::exception ) +throw( css::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -68,7 +68,7 @@ throw( ::com::sun::star::uno::RuntimeException, std::exception ) } void SAL_CALL StatusIndicatorInterfaceWrapper::reset() -throw( ::com::sun::star::uno::RuntimeException, std::exception ) +throw( css::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -81,7 +81,7 @@ throw( ::com::sun::star::uno::RuntimeException, std::exception ) void SAL_CALL StatusIndicatorInterfaceWrapper::setText( const OUString& sText ) -throw( ::com::sun::star::uno::RuntimeException, std::exception ) +throw( css::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -94,7 +94,7 @@ throw( ::com::sun::star::uno::RuntimeException, std::exception ) void SAL_CALL StatusIndicatorInterfaceWrapper::setValue( sal_Int32 nValue ) -throw( ::com::sun::star::uno::RuntimeException, std::exception ) +throw( css::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 0ea0cbf90375..c4eef604393a 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -93,7 +93,7 @@ Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16 } uno::Reference< awt::XWindow > SAL_CALL ToggleButtonToolbarController::createPopupWindow() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { uno::Reference< awt::XWindow > xWindow; @@ -123,7 +123,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) return xWindow; } -void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) +void ToggleButtonToolbarController::executeControlCommand( const css::frame::ControlCommand& rControlCommand ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 9abac0fbaa84..524fa2ebdb9b 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -113,7 +113,7 @@ class ImageOrientationListener : public svt::FrameStatusListener const Reference< XFrame >& rFrame ); virtual ~ImageOrientationListener(); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; private: Reference< XStatusListener > m_xReceiver; @@ -143,14 +143,14 @@ static sal_Int16 getImageTypeFromBools( bool bBig ) { sal_Int16 n( 0 ); if ( bBig ) - n |= ::com::sun::star::ui::ImageType::SIZE_LARGE; + n |= css::ui::ImageType::SIZE_LARGE; return n; } -static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManagerFromFrame( - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) +static css::uno::Reference< css::frame::XLayoutManager > getLayoutManagerFromFrame( + css::uno::Reference< css::frame::XFrame >& rFrame ) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; Reference< XPropertySet > xPropSet( rFrame, UNO_QUERY ); if ( xPropSet.is() ) @@ -421,7 +421,7 @@ void ToolBarManager::UpdateControllers() Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY ); if ( xLayoutManager.is() && xDockable.is() ) { - ::com::sun::star::awt::Point aPoint; + css::awt::Point aPoint; aPoint.X = aPoint.Y = SAL_MAX_INT32; xLayoutManager->dockWindow( m_aResourceName, DockingArea_DOCKINGAREA_DEFAULT, aPoint ); xLayoutManager->lockWindow( m_aResourceName ); @@ -451,7 +451,7 @@ void ToolBarManager::UpdateControllers() } //for update toolbar controller via Support Visible -void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XToolbarController > xController) +void ToolBarManager::UpdateController( css::uno::Reference< css::frame::XToolbarController > xController) { if ( !m_bUpdateControllers ) @@ -483,8 +483,8 @@ throw ( RuntimeException, std::exception ) } } -void SAL_CALL ToolBarManager::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) -throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL ToolBarManager::statusChanged( const css::frame::FeatureStateEvent& Event ) +throw ( css::uno::RuntimeException, std::exception ) { SolarMutexGuard g; if ( m_bDisposed ) @@ -657,16 +657,16 @@ void SAL_CALL ToolBarManager::removeEventListener( const Reference< XEventListen } // XUIConfigurationListener -void SAL_CALL ToolBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ToolBarManager::elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) { impl_elementChanged(false,Event); } -void SAL_CALL ToolBarManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ToolBarManager::elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) { impl_elementChanged(true,Event); } -void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::ui::ConfigurationEvent& Event ) +void ToolBarManager::impl_elementChanged(bool _bRemove,const css::ui::ConfigurationEvent& Event ) { SolarMutexGuard g; @@ -733,7 +733,7 @@ void ToolBarManager::setToolBarImage(const Image& _aImage,const CommandToInfoMap ::std::for_each(_rIDs.begin(),_rIDs.end(),::boost::bind(&ToolBox::SetItemImage,m_pToolBar.get(),_1,_aImage)); } -void SAL_CALL ToolBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ToolBarManager::elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) { impl_elementChanged(false,Event); } @@ -1120,21 +1120,21 @@ void ToolBarManager::AddImageOrientationListener() ToolBoxItemBits ToolBarManager::ConvertStyleToToolboxItemBits( sal_Int32 nStyle ) { ToolBoxItemBits nItemBits( ToolBoxItemBits::NONE ); - if ( nStyle & ::com::sun::star::ui::ItemStyle::RADIO_CHECK ) + if ( nStyle & css::ui::ItemStyle::RADIO_CHECK ) nItemBits |= ToolBoxItemBits::RADIOCHECK; - if ( nStyle & ::com::sun::star::ui::ItemStyle::ALIGN_LEFT ) + if ( nStyle & css::ui::ItemStyle::ALIGN_LEFT ) nItemBits |= ToolBoxItemBits::LEFT; - if ( nStyle & ::com::sun::star::ui::ItemStyle::AUTO_SIZE ) + if ( nStyle & css::ui::ItemStyle::AUTO_SIZE ) nItemBits |= ToolBoxItemBits::AUTOSIZE; - if ( nStyle & ::com::sun::star::ui::ItemStyle::DROP_DOWN ) + if ( nStyle & css::ui::ItemStyle::DROP_DOWN ) nItemBits |= ToolBoxItemBits::DROPDOWN; - if ( nStyle & ::com::sun::star::ui::ItemStyle::REPEAT ) + if ( nStyle & css::ui::ItemStyle::REPEAT ) nItemBits |= ToolBoxItemBits::REPEAT; - if ( nStyle & ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY ) + if ( nStyle & css::ui::ItemStyle::DROPDOWN_ONLY ) nItemBits |= ToolBoxItemBits::DROPDOWNONLY; - if ( nStyle & ::com::sun::star::ui::ItemStyle::TEXT ) + if ( nStyle & css::ui::ItemStyle::TEXT ) nItemBits |= ToolBoxItemBits::TEXT_ONLY; - if ( nStyle & ::com::sun::star::ui::ItemStyle::ICON ) + if ( nStyle & css::ui::ItemStyle::ICON ) nItemBits |= ToolBoxItemBits::ICON_ONLY; return nItemBits; @@ -1201,11 +1201,11 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ ) { Sequence< PropertyValue > aProp; - OUString aCommandURL; - OUString aLabel; - OUString aHelpURL; - OUString aTooltip; - sal_uInt16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); + OUString aCommandURL; + OUString aLabel; + OUString aHelpURL; + OUString aTooltip; + sal_uInt16 nType( css::ui::ItemType::DEFAULT ); sal_uInt16 nWidth( 0 ); sal_uInt32 nStyle( 0 ); @@ -1271,7 +1271,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine aProp[i].Value >>= nStyle; } - if (( nType == ::com::sun::star::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() ) + if (( nType == css::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() ) { OUString aString( RetrieveLabelFromCommand( aCommandURL )); @@ -1328,21 +1328,21 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine ++nId; } - else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_LINE ) + else if ( nType == css::ui::ItemType::SEPARATOR_LINE ) { m_pToolBar->InsertSeparator(); } - else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_SPACE ) + else if ( nType == css::ui::ItemType::SEPARATOR_SPACE ) { m_pToolBar->InsertSpace(); } - else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_LINEBREAK ) + else if ( nType == css::ui::ItemType::SEPARATOR_LINEBREAK ) { m_pToolBar->InsertBreak(); } } } - catch (const ::com::sun::star::lang::IndexOutOfBoundsException&) + catch (const css::lang::IndexOutOfBoundsException&) { break; } @@ -1669,7 +1669,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const ImplClearPopupMenu( pToolBar ); // No config menu entries if command ".uno:ConfigureDialog" is not enabled Reference< XDispatch > xDisp; - com::sun::star::util::URL aURL; + css::util::URL aURL; if ( m_xFrame.is() ) { Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY ); @@ -1868,7 +1868,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool ) case MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR: { Reference< XDispatch > xDisp; - com::sun::star::util::URL aURL; + css::util::URL aURL; if ( m_xFrame.is() ) { Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY ); @@ -2141,7 +2141,7 @@ IMPL_STATIC_LINK_TYPED( ToolBarManager, ExecuteHdl_Impl, void*, p, void ) else if (( pExecuteInfo->nCmd == EXEC_CMD_DOCKTOOLBAR ) && ( pExecuteInfo->xLayoutManager.is() )) { - ::com::sun::star::awt::Point aPoint; + css::awt::Point aPoint; aPoint.X = aPoint.Y = SAL_MAX_INT32; pExecuteInfo->xLayoutManager->dockWindow( pExecuteInfo->aToolbarResName, DockingArea_DOCKINGAREA_DEFAULT, @@ -2175,7 +2175,7 @@ bool ToolBarManager::impl_RetrieveShortcutsFromConfiguration( { try { - com::sun::star::awt::KeyEvent aKeyEvent; + css::awt::KeyEvent aKeyEvent; Sequence< OUString > aCommands(1); aCommands[0] = rCommand; diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 60c49168769d..06a6658e3a97 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -67,13 +67,13 @@ using namespace ::com::sun::star; Describes a context string list where all contexts are delimited by a colon. For more information about the module identifier used as context strings see the - IDL description of com::sun::star::frame::XModuleManager + IDL description of css::frame::XModuleManager @param rModuleIdentifier A string describing a module identifier. See IDL - description of com::sun::star::frame::XModuleManager. + description of css::frame::XModuleManager. @result The result is true if the rContext is an empty string @@ -382,7 +382,7 @@ bool ToolBarMerger::ProcessMergeOperation( false. */ bool ToolBarMerger::ProcessMergeFallback( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + const css::uno::Reference< css::frame::XFrame >& xFrame, ToolBox* pToolbar, sal_uInt16 /*nPos*/, sal_uInt16& rItemId, diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 6305cea7f3d7..52a7cc1230b2 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -133,7 +133,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2 ( ToolbarsMenuController DEFINE_INIT_SERVICE ( ToolbarsMenuController, {} ) -ToolbarsMenuController::ToolbarsMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : +ToolbarsMenuController::ToolbarsMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), m_xContext( xContext ), m_aPropUIName( "UIName" ), @@ -255,7 +255,7 @@ OUString ToolbarsMenuController::getUINameFromCommand( const OUString& rCommandU return aLabel; } -static void fillHashMap( const Sequence< Sequence< ::com::sun::star::beans::PropertyValue > >& rSeqToolBars, +static void fillHashMap( const Sequence< Sequence< css::beans::PropertyValue > >& rSeqToolBars, ToolbarHashMap& rHashMap ) { for ( sal_Int32 i = 0; i < rSeqToolBars.getLength(); i++ ) @@ -278,7 +278,7 @@ static void fillHashMap( const Sequence< Sequence< ::com::sun::star::beans::Prop } // private function -Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuController::getLayoutManagerToolbars( const Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager ) +Sequence< Sequence< css::beans::PropertyValue > > ToolbarsMenuController::getLayoutManagerToolbars( const Reference< css::frame::XLayoutManager >& rLayoutManager ) { std::vector< ToolBarInfo > aToolBarArray; Sequence< Reference< XUIElement > > aUIElements = rLayoutManager->getElements(); @@ -295,7 +295,7 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl xPropSet->getPropertyValue("Type") >>= nType; xPropSet->getPropertyValue("ResourceURL") >>= aResName; - if (( nType == ::com::sun::star::ui::UIElementType::TOOLBAR ) && + if (( nType == css::ui::UIElementType::TOOLBAR ) && !aResName.isEmpty() ) { ToolBarInfo aToolBarInfo; @@ -317,11 +317,11 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl } } - Sequence< com::sun::star::beans::PropertyValue > aTbSeq( 2 ); + Sequence< css::beans::PropertyValue > aTbSeq( 2 ); aTbSeq[0].Name = m_aPropUIName; aTbSeq[1].Name = m_aPropResourceURL; - Sequence< Sequence< com::sun::star::beans::PropertyValue > > aSeq( aToolBarArray.size() ); + Sequence< Sequence< css::beans::PropertyValue > > aSeq( aToolBarArray.size() ); const sal_uInt32 nCount = aToolBarArray.size(); for ( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -355,14 +355,14 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r if ( m_xDocCfgMgr.is() ) { - Sequence< Sequence< com::sun::star::beans::PropertyValue > > aSeqDocToolBars = + Sequence< Sequence< css::beans::PropertyValue > > aSeqDocToolBars = m_xDocCfgMgr->getUIElementsInfo( UIElementType::TOOLBAR ); fillHashMap( aSeqDocToolBars, aToolbarHashMap ); } if ( m_xModuleCfgMgr.is() ) { - Sequence< Sequence< com::sun::star::beans::PropertyValue > > aSeqToolBars = + Sequence< Sequence< css::beans::PropertyValue > > aSeqToolBars = m_xModuleCfgMgr->getUIElementsInfo( UIElementType::TOOLBAR ); fillHashMap( aSeqToolBars, aToolbarHashMap ); } @@ -370,7 +370,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r std::vector< ToolBarEntry > aSortedTbs; OUString aStaticCmdPart( STATIC_CMD_PART ); - Sequence< Sequence< com::sun::star::beans::PropertyValue > > aSeqFrameToolBars = getLayoutManagerToolbars( xLayoutManager ); + Sequence< Sequence< css::beans::PropertyValue > > aSeqFrameToolBars = getLayoutManagerToolbars( xLayoutManager ); fillHashMap( aSeqFrameToolBars, aToolbarHashMap ); ToolbarHashMap::const_iterator pIter = aToolbarHashMap.begin(); @@ -819,7 +819,7 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume if ( m_bInitialized ) { Reference< XModuleManager2 > xModuleManager = ModuleManager::create( m_xContext ); - Reference< XNameAccess > xPersistentWindowStateSupplier = ::com::sun::star::ui::theWindowStateConfiguration::get( m_xContext ); + Reference< XNameAccess > xPersistentWindowStateSupplier = css::ui::theWindowStateConfiguration::get( m_xContext ); // Retrieve persistent window state reference for our module OUString aModuleIdentifier; diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 2456f32632e1..60740696d077 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -74,11 +74,11 @@ void SAL_CALL ToolBarWrapper::release() throw() } uno::Any SAL_CALL ToolBarWrapper::queryInterface( const uno::Type & rType ) -throw( ::com::sun::star::uno::RuntimeException, std::exception ) +throw( css::uno::RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( rType , - (static_cast< ::com::sun::star::ui::XUIFunctionListener* >(this)) ); + (static_cast< css::ui::XUIFunctionListener* >(this)) ); if( a.hasValue() ) return a; @@ -97,7 +97,7 @@ void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException, std::exception return; } - com::sun::star::lang::EventObject aEvent( xThis ); + css::lang::EventObject aEvent( xThis ); m_aListenerContainer.disposeAndClear( aEvent ); SolarMutexGuard g; @@ -192,13 +192,13 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th } // XEventListener -void SAL_CALL ToolBarWrapper::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ToolBarWrapper::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { // nothing todo } // XUpdatable -void SAL_CALL ToolBarWrapper::update() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ToolBarWrapper::update() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -211,7 +211,7 @@ void SAL_CALL ToolBarWrapper::update() throw (::com::sun::star::uno::RuntimeExce } // XUIElementSettings -void SAL_CALL ToolBarWrapper::updateSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ToolBarWrapper::updateSettings() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -250,7 +250,7 @@ void ToolBarWrapper::impl_fillNewData() } // XUIElement interface -Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -271,7 +271,7 @@ Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::c void SAL_CALL ToolBarWrapper::functionExecute( const OUString& aUIElementName, const OUString& aCommand ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -283,7 +283,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } } -void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) +void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) { SolarMutexResettableGuard aLock; bool bNoClose( m_bNoClose ); diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 8fe577a5fb52..efe4d042bc1c 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -87,21 +87,21 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa virtual ~ConfigurationAccess_UICommand(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // container.XContainerListener virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override; @@ -112,7 +112,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) override; protected: - ::com::sun::star::uno::Any SAL_CALL getByNameImpl( const OUString& aName ); + css::uno::Any SAL_CALL getByNameImpl( const OUString& aName ); struct CmdToInfoMap { @@ -120,9 +120,9 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa bCommandNameCreated( false ), nProperties( 0 ) {} - OUString aLabel; - OUString aContextLabel; - OUString aCommandName; + OUString aLabel; + OUString aContextLabel; + OUString aCommandName; bool bPopup : 1, bCommandNameCreated : 1; sal_Int32 nProperties; @@ -263,7 +263,7 @@ throw ( RuntimeException, std::exception ) } sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const OUString& rCommandURL ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { return getByNameImpl( rCommandURL ).hasValue(); } @@ -347,10 +347,10 @@ void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _x aImageMirrorVector.push_back( aNameSeq[i] ); } } - catch (const com::sun::star::lang::WrappedTargetException&) + catch (const css::lang::WrappedTargetException&) { } - catch (const com::sun::star::container::NoSuchElementException&) + catch (const css::container::NoSuchElementException&) { } } @@ -434,19 +434,19 @@ Any ConfigurationAccess_UICommand::getInfoFromCommand( const OUString& rCommandU { return m_xGenericUICommands->getByName( rCommandURL ); } - catch (const com::sun::star::lang::WrappedTargetException&) + catch (const css::lang::WrappedTargetException&) { } - catch (const com::sun::star::container::NoSuchElementException&) + catch (const css::container::NoSuchElementException&) { } } } } - catch (const com::sun::star::container::NoSuchElementException&) + catch (const css::container::NoSuchElementException&) { } - catch (const com::sun::star::lang::WrappedTargetException&) + catch (const css::lang::WrappedTargetException&) { } @@ -489,10 +489,10 @@ Sequence< OUString > ConfigurationAccess_UICommand::getAllCommands() return aNameSeq; } - catch (const com::sun::star::container::NoSuchElementException&) + catch (const css::container::NoSuchElementException&) { } - catch (const com::sun::star::lang::WrappedTargetException&) + catch (const css::lang::WrappedTargetException&) { } } @@ -658,7 +658,7 @@ void UICommandDescription::impl_fillElements(const sal_Char* _pName) } Any SAL_CALL UICommandDescription::getByName( const OUString& aName ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { Any a; @@ -699,7 +699,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } Sequence< OUString > SAL_CALL UICommandDescription::getElementNames() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(rBHelper.rMutex); @@ -717,7 +717,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } sal_Bool SAL_CALL UICommandDescription::hasByName( const OUString& aName ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(rBHelper.rMutex); @@ -727,13 +727,13 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) // XElementAccess Type SAL_CALL UICommandDescription::getElementType() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { return( cppu::UnoType<XNameAccess>::get()); } sal_Bool SAL_CALL UICommandDescription::hasElements() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { // generic UI commands are always available! return sal_True; diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index f5fd986af902..ba6d53f6cc77 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -90,7 +90,7 @@ private: }; AddonsToolBarFactory::AddonsToolBarFactory( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : + const css::uno::Reference< css::uno::XComponentContext >& xContext ) : m_xContext( xContext ) , m_xModuleManager( ModuleManager::create( xContext ) ) { @@ -172,9 +172,9 @@ bool AddonsToolBarFactory::hasButtonsInContext( Reference< XUIElement > SAL_CALL AddonsToolBarFactory::createUIElement( const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) -throw ( ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) +throw ( css::container::NoSuchElementException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -196,7 +196,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, throw IllegalArgumentException(); // Identify frame and determine module identifier to look for context based buttons - Reference< ::com::sun::star::ui::XUIElement > xToolBar; + Reference< css::ui::XUIElement > xToolBar; if ( xFrame.is() && ( aConfigData.getLength()> 0 ) && hasButtonsInContext( aConfigData, xFrame )) @@ -215,7 +215,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, SolarMutexGuard aGuard; AddonsToolBarWrapper* pToolBarWrapper = new AddonsToolBarWrapper( m_xContext ); - xToolBar = Reference< ::com::sun::star::ui::XUIElement >( static_cast<OWeakObject *>(pToolBarWrapper), UNO_QUERY ); + xToolBar = Reference< css::ui::XUIElement >( static_cast<OWeakObject *>(pToolBarWrapper), UNO_QUERY ); Reference< XInitialization > xInit( xToolBar, UNO_QUERY ); xInit->initialize( aPropSeq ); } diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index 2a7da9943082..7c7be1c67c25 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -277,11 +277,11 @@ bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aEl xPropertySet->getPropertyValue( m_aPropController ) >>= aServiceSpecifier; xPropertySet->getPropertyValue( m_aPropValue ) >>= aValue; } - catch ( const com::sun::star::beans::UnknownPropertyException& ) + catch ( const css::beans::UnknownPropertyException& ) { return false; } - catch ( const com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { return false; } diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index 75e5ca4647f1..e9d9f79ce5ab 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star::ui; namespace framework { -MenuBarFactory::MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) +MenuBarFactory::MenuBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : m_xContext( xContext ) { } @@ -56,9 +56,9 @@ MenuBarFactory::~MenuBarFactory() Reference< XUIElement > SAL_CALL MenuBarFactory::createUIElement( const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) -throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) +throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) { - Reference< ::com::sun::star::ui::XUIElement > xMenuBar( + Reference< css::ui::XUIElement > xMenuBar( static_cast<OWeakObject *>(new MenuBarWrapper(m_xContext)), UNO_QUERY); CreateUIElement(ResourceURL, Args, "MenuOnly", "private:resource/menubar/", xMenuBar, m_xContext); return xMenuBar; @@ -68,8 +68,8 @@ void MenuBarFactory::CreateUIElement(const OUString& ResourceURL ,const Sequence< PropertyValue >& Args ,const char* _pExtraMode ,const OUString& ResourceType - ,const Reference< ::com::sun::star::ui::XUIElement >& _xMenuBar - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) + ,const Reference< css::ui::XUIElement >& _xMenuBar + ,const css::uno::Reference< css::uno::XComponentContext >& _rxContext) { Reference< XUIConfigurationManager > xCfgMgr; Reference< XUIConfigurationManager > xConfigSource; @@ -116,7 +116,7 @@ void MenuBarFactory::CreateUIElement(const OUString& ResourceURL if ( !bHasSettings ) { - Reference< ::com::sun::star::frame::XModuleManager2 > xModuleManager = + Reference< css::frame::XModuleManager2 > xModuleManager = ModuleManager::create( _rxContext ); OUString aModuleIdentifier = xModuleManager->identify( Reference<XInterface>( xFrame, UNO_QUERY ) ); if ( !aModuleIdentifier.isEmpty() ) diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index 7a675beb669e..1cb00a3e06b4 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -66,7 +66,7 @@ public: virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; }; -StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : +StatusBarFactory::StatusBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : MenuBarFactory( xContext ) { } @@ -75,9 +75,9 @@ StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::co Reference< XUIElement > SAL_CALL StatusBarFactory::createUIElement( const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) -throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) +throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) { - Reference< ::com::sun::star::ui::XUIElement > xStatusBar( + Reference< css::ui::XUIElement > xStatusBar( static_cast<OWeakObject *>(new StatusBarWrapper(m_xContext)), UNO_QUERY); MenuBarFactory::CreateUIElement(ResourceURL, Args, NULL, "private:resource/statusbar/", xStatusBar, m_xContext); return xStatusBar; diff --git a/framework/source/uifactory/toolbarfactory.cxx b/framework/source/uifactory/toolbarfactory.cxx index 6762f422c522..8f4bd096eae0 100644 --- a/framework/source/uifactory/toolbarfactory.cxx +++ b/framework/source/uifactory/toolbarfactory.cxx @@ -66,7 +66,7 @@ public: throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; }; -ToolBarFactory::ToolBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : +ToolBarFactory::ToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : MenuBarFactory( xContext ) { } @@ -75,9 +75,9 @@ ToolBarFactory::ToolBarFactory( const ::com::sun::star::uno::Reference< ::com::s Reference< XUIElement > SAL_CALL ToolBarFactory::createUIElement( const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) -throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) +throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) { - Reference< ::com::sun::star::ui::XUIElement > xToolBar( + Reference< css::ui::XUIElement > xToolBar( static_cast<OWeakObject *>(new ToolBarWrapper(m_xContext)), UNO_QUERY); CreateUIElement(ResourceURL, Args, "PopupMode", "private:resource/toolbar/", xToolBar, m_xContext); return xToolBar; diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 74e9cb7db84c..c65e819b9c22 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -330,11 +330,11 @@ bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aEleme xPropertySet->getPropertyValue( m_aPropModule ) >>= rModule; xPropertySet->getPropertyValue( m_aPropFactory ) >>= rServiceSpecifier; } - catch ( const com::sun::star::beans::UnknownPropertyException& ) + catch ( const css::beans::UnknownPropertyException& ) { return false; } - catch ( const com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { return false; } @@ -424,7 +424,7 @@ void SAL_CALL UIElementFactoryManager::disposing() Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement( const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) -throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) +throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) { Reference< XFrame > xFrame; OUString aModuleId; diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index 69f3b58cf358..34af27d673fa 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -41,8 +41,8 @@ using namespace framework; namespace { typedef ::cppu::WeakComponentImplHelper< - com::sun::star::lang::XServiceInfo, - com::sun::star::lang::XSingleComponentFactory > WindowContentFactoryManager_BASE; + css::lang::XServiceInfo, + css::lang::XSingleComponentFactory > WindowContentFactoryManager_BASE; class WindowContentFactoryManager : private cppu::BaseMutex, public WindowContentFactoryManager_BASE diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index c8beaf3e3519..23e718e961ed 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -41,8 +41,8 @@ namespace framework { bool ImagesConfiguration::LoadImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::io::XInputStream >& rInputStream, ImageListsDescriptor& rItems ) { Reference< XParser > xParser = Parser::create( rxContext ); @@ -72,15 +72,15 @@ bool ImagesConfiguration::LoadImages( { return false; } - catch( const ::com::sun::star::io::IOException& ) + catch( const css::io::IOException& ) { return false; } } bool ImagesConfiguration::StoreImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::io::XOutputStream >& rOutputStream, const ImageListsDescriptor& rItems ) { Reference< XWriter > xWriter = Writer::create(rxContext); @@ -100,7 +100,7 @@ bool ImagesConfiguration::StoreImages( { return false; } - catch ( const ::com::sun::star::io::IOException& ) + catch ( const css::io::IOException& ) { return false; } |