diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-09 09:05:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-09 09:39:36 +0000 |
| commit | 4a00be7ade3235e18cab7706bcfe9a1adccb2462 (patch) | |
| tree | e7d43d09527869c129ccbb14bb3cf5ace9849da9 /toolkit/inc | |
| parent | 6c80a8fe89fadf9a2c7260a09c037a09462f53d1 (diff) | |
com::sun::star->css in toolkit/
Change-Id: Ia8feca46fa64a300235730e1248fa5fda0783ba2
Reviewed-on: https://gerrit.libreoffice.org/19853
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'toolkit/inc')
| -rw-r--r-- | toolkit/inc/helper/unopropertyarrayhelper.hxx | 8 | ||||
| -rw-r--r-- | toolkit/inc/helper/unowrapper.hxx | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx index 3632da575701..bbe53a474782 100644 --- a/toolkit/inc/helper/unopropertyarrayhelper.hxx +++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx @@ -38,16 +38,16 @@ protected: bool ImplHasProperty( sal_uInt16 nPropId ) const; public: - UnoPropertyArrayHelper( const ::com::sun::star::uno::Sequence<sal_Int32>& rIDs ); + UnoPropertyArrayHelper( const css::uno::Sequence<sal_Int32>& rIDs ); UnoPropertyArrayHelper( const std::list< sal_uInt16 > &rIDs ); // ::cppu::IPropertyArrayHelper sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() override; - ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException) override; + css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override; + css::beans::Property SAL_CALL getPropertyByName(const OUString& rPropertyName) throw (css::beans::UnknownPropertyException) override; sal_Bool SAL_CALL hasPropertyByName(const OUString& rPropertyName) override; sal_Int32 SAL_CALL getHandleByName( const OUString & rPropertyName ) override; - sal_Int32 SAL_CALL fillHandles( sal_Int32* pHandles, const ::com::sun::star::uno::Sequence< OUString > & rPropNames ) override; + sal_Int32 SAL_CALL fillHandles( sal_Int32* pHandles, const css::uno::Sequence< OUString > & rPropNames ) override; }; diff --git a/toolkit/inc/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx index 3efe62374e22..f110e3c81138 100644 --- a/toolkit/inc/helper/unowrapper.hxx +++ b/toolkit/inc/helper/unowrapper.hxx @@ -36,29 +36,29 @@ class UnoWrapper : public UnoWrapperBase { private: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> mxToolkit; - ::toolkit::AccessibilityClient maAccessibleFactoryAccess; + css::uno::Reference< css::awt::XToolkit> mxToolkit; + ::toolkit::AccessibilityClient maAccessibleFactoryAccess; public: - UnoWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>& rxToolkit ); + UnoWrapper( const css::uno::Reference< css::awt::XToolkit>& rxToolkit ); virtual void Destroy() override; // Toolkit - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> GetVCLToolkit() override; + virtual css::uno::Reference< css::awt::XToolkit> GetVCLToolkit() override; // Graphics - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics> CreateGraphics( OutputDevice* pOutDev ) override; - virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) override; + virtual css::uno::Reference< css::awt::XGraphics> CreateGraphics( OutputDevice* pOutDev ) override; + virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) override; // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) override; - virtual void SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) override; + virtual css::uno::Reference< css::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) override; + virtual void SetWindowInterface( vcl::Window* pWindow, css::uno::Reference< css::awt::XWindowPeer> xIFace ) override; void WindowDestroyed( vcl::Window* pWindow ) override; // Accessibility - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible( Menu* pMenu, bool bIsMenuBar ) override; private: |