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 | |
| 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')
57 files changed, 1896 insertions, 1917 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: diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index f5631c041a45..14876ea27730 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -190,7 +190,7 @@ namespace toolkit { // collect the image sizes of the different image sets const Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); - const Reference< XGraphicProvider > xGraphicProvider( com::sun::star::graphic::GraphicProvider::create(xContext) ); + const Reference< XGraphicProvider > xGraphicProvider( css::graphic::GraphicProvider::create(xContext) ); const bool isHighContrast = pThrobber->GetSettings().GetStyleSettings().GetHighContrastMode(); diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index 776d9c6d2836..9faaf0c5f25f 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -42,13 +42,13 @@ class AsyncCallback: public: AsyncCallback() {} - // ::com::sun::star::lang::XServiceInfo: + // css::lang::XServiceInfo: 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; - // ::com::sun::star::awt::XRequestCallback: - virtual void SAL_CALL addCallback(const css::uno::Reference< css::awt::XCallback > & xCallback, const ::com::sun::star::uno::Any & aData) throw (css::uno::RuntimeException, std::exception) override; + // css::awt::XRequestCallback: + virtual void SAL_CALL addCallback(const css::uno::Reference< css::awt::XCallback > & xCallback, const css::uno::Any & aData) throw (css::uno::RuntimeException, std::exception) override; private: @@ -84,8 +84,8 @@ css::uno::Sequence< OUString > SAL_CALL AsyncCallback::getSupportedServiceNames( return s; } -// ::com::sun::star::awt::XRequestCallback: -void SAL_CALL AsyncCallback::addCallback(const css::uno::Reference< css::awt::XCallback > & xCallback, const ::com::sun::star::uno::Any & aData) throw (css::uno::RuntimeException, std::exception) +// css::awt::XRequestCallback: +void SAL_CALL AsyncCallback::addCallback(const css::uno::Reference< css::awt::XCallback > & xCallback, const css::uno::Any & aData) throw (css::uno::RuntimeException, std::exception) { if ( Application::IsInMain() ) { diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx index cd408d31724b..cc2c77135c75 100644 --- a/toolkit/source/awt/scrollabledialog.cxx +++ b/toolkit/source/awt/scrollabledialog.cxx @@ -26,8 +26,8 @@ namespace toolkit // Using WB_AUTOHSCROLL, WB_AUTOVSCROLL here sucks big time, there is a // problem in the toolkit class where there are some clashing IDs -// ( ::com::sun::star::awt::VclWindowPeerAttribute::VSCROLL has the same value -// as ::com::sun::star::awt::WindowAttribute::NODECORATION and they are used +// ( css::awt::VclWindowPeerAttribute::VSCROLL has the same value +// as css::awt::WindowAttribute::NODECORATION and they are used // in the same bitmap :-( WB_VSCROLL & WB_HSCROLL apparently are only for // child classes ( whole thing is a mess if you ask me ) template< class T> diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx index 05a337cc060a..7237ede2ef19 100644 --- a/toolkit/source/awt/stylesettings.hxx +++ b/toolkit/source/awt/stylesettings.hxx @@ -42,7 +42,7 @@ namespace toolkit //= WindowStyleSettings struct WindowStyleSettings_Data; - typedef ::cppu::WeakImplHelper < ::com::sun::star::awt::XStyleSettings + typedef ::cppu::WeakImplHelper < css::awt::XStyleSettings > WindowStyleSettings_Base; class WindowStyleSettings : public WindowStyleSettings_Base { @@ -53,116 +53,116 @@ namespace toolkit void dispose(); // XStyleSettings - virtual ::sal_Int32 SAL_CALL getActiveBorderColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveBorderColor( ::sal_Int32 _activebordercolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getActiveColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveColor( ::sal_Int32 _activecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getActiveTabColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveTabColor( ::sal_Int32 _activetabcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getActiveTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveTextColor( ::sal_Int32 _activetextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getButtonRolloverTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getButtonTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setButtonTextColor( ::sal_Int32 _buttontextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCheckedColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCheckedColor( ::sal_Int32 _checkedcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDarkShadowColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDarkShadowColor( ::sal_Int32 _darkshadowcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDeactiveBorderColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDeactiveBorderColor( ::sal_Int32 _deactivebordercolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDeactiveColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDeactiveColor( ::sal_Int32 _deactivecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDeactiveTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDeactiveTextColor( ::sal_Int32 _deactivetextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDialogColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDialogColor( ::sal_Int32 _dialogcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDialogTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDialogTextColor( ::sal_Int32 _dialogtextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDisableColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisableColor( ::sal_Int32 _disablecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getFaceColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFaceColor( ::sal_Int32 _facecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getFaceGradientColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getFieldColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFieldColor( ::sal_Int32 _fieldcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getFieldRolloverTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFieldRolloverTextColor( ::sal_Int32 _fieldrollovertextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getFieldTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFieldTextColor( ::sal_Int32 _fieldtextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getGroupTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroupTextColor( ::sal_Int32 _grouptextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getHelpColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpColor( ::sal_Int32 _helpcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getHelpTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpTextColor( ::sal_Int32 _helptextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getHighlightColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHighlightColor( ::sal_Int32 _highlightcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getHighlightTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHighlightTextColor( ::sal_Int32 _highlighttextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getInactiveTabColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInactiveTabColor( ::sal_Int32 _inactivetabcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getInfoTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInfoTextColor( ::sal_Int32 _infotextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLabelTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLabelTextColor( ::sal_Int32 _labeltextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLightColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLightColor( ::sal_Int32 _lightcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMenuBarColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMenuBarColor( ::sal_Int32 _menubarcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMenuBarTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMenuBarTextColor( ::sal_Int32 _menubartextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMenuBorderColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMenuBorderColor( ::sal_Int32 _menubordercolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMenuColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMenuColor( ::sal_Int32 _menucolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMenuHighlightColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMenuHighlightColor( ::sal_Int32 _menuhighlightcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMenuHighlightTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMenuHighlightTextColor( ::sal_Int32 _menuhighlighttextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMenuTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMenuTextColor( ::sal_Int32 _menutextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMonoColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMonoColor( ::sal_Int32 _monocolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getRadioCheckTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRadioCheckTextColor( ::sal_Int32 _radiochecktextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getSeparatorColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getShadowColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShadowColor( ::sal_Int32 _shadowcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getWindowColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWindowColor( ::sal_Int32 _windowcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getWindowTextColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWindowTextColor( ::sal_Int32 _windowtextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getWorkspaceColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWorkspaceColor( ::sal_Int32 _workspacecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getHighContrastMode() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHighContrastMode( sal_Bool _highcontrastmode ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getApplicationFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setApplicationFont( const ::com::sun::star::awt::FontDescriptor& _applicationfont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getHelpFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpFont( const ::com::sun::star::awt::FontDescriptor& _helpfont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getTitleFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTitleFont( const ::com::sun::star::awt::FontDescriptor& _titlefont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFloatTitleFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloatTitleFont( const ::com::sun::star::awt::FontDescriptor& _floattitlefont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getMenuFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMenuFont( const ::com::sun::star::awt::FontDescriptor& _menufont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getToolFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setToolFont( const ::com::sun::star::awt::FontDescriptor& _toolfont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getGroupFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroupFont( const ::com::sun::star::awt::FontDescriptor& _groupfont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getLabelFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLabelFont( const ::com::sun::star::awt::FontDescriptor& _labelfont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getInfoFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInfoFont( const ::com::sun::star::awt::FontDescriptor& _infofont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getRadioCheckFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRadioCheckFont( const ::com::sun::star::awt::FontDescriptor& _radiocheckfont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getPushButtonFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPushButtonFont( const ::com::sun::star::awt::FontDescriptor& _pushbuttonfont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFieldFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFieldFont( const ::com::sun::star::awt::FontDescriptor& _fieldfont ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addStyleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStyleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getActiveBorderColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActiveBorderColor( ::sal_Int32 _activebordercolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getActiveColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActiveColor( ::sal_Int32 _activecolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getActiveTabColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActiveTabColor( ::sal_Int32 _activetabcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getActiveTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActiveTextColor( ::sal_Int32 _activetextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getButtonRolloverTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getButtonTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setButtonTextColor( ::sal_Int32 _buttontextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCheckedColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCheckedColor( ::sal_Int32 _checkedcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDarkShadowColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDarkShadowColor( ::sal_Int32 _darkshadowcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDeactiveBorderColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDeactiveBorderColor( ::sal_Int32 _deactivebordercolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDeactiveColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDeactiveColor( ::sal_Int32 _deactivecolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDeactiveTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDeactiveTextColor( ::sal_Int32 _deactivetextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDialogColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDialogColor( ::sal_Int32 _dialogcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDialogTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDialogTextColor( ::sal_Int32 _dialogtextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDisableColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDisableColor( ::sal_Int32 _disablecolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getFaceColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFaceColor( ::sal_Int32 _facecolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getFaceGradientColor() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getFieldColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFieldColor( ::sal_Int32 _fieldcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getFieldRolloverTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFieldRolloverTextColor( ::sal_Int32 _fieldrollovertextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getFieldTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFieldTextColor( ::sal_Int32 _fieldtextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getGroupTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setGroupTextColor( ::sal_Int32 _grouptextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getHelpColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHelpColor( ::sal_Int32 _helpcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getHelpTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHelpTextColor( ::sal_Int32 _helptextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getHighlightColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHighlightColor( ::sal_Int32 _highlightcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getHighlightTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHighlightTextColor( ::sal_Int32 _highlighttextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getInactiveTabColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInactiveTabColor( ::sal_Int32 _inactivetabcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getInfoTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInfoTextColor( ::sal_Int32 _infotextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getLabelTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLabelTextColor( ::sal_Int32 _labeltextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getLightColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLightColor( ::sal_Int32 _lightcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMenuBarColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMenuBarColor( ::sal_Int32 _menubarcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMenuBarTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMenuBarTextColor( ::sal_Int32 _menubartextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMenuBorderColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMenuBorderColor( ::sal_Int32 _menubordercolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMenuColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMenuColor( ::sal_Int32 _menucolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMenuHighlightColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMenuHighlightColor( ::sal_Int32 _menuhighlightcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMenuHighlightTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMenuHighlightTextColor( ::sal_Int32 _menuhighlighttextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMenuTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMenuTextColor( ::sal_Int32 _menutextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMonoColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMonoColor( ::sal_Int32 _monocolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getRadioCheckTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRadioCheckTextColor( ::sal_Int32 _radiochecktextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getSeparatorColor() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getShadowColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setShadowColor( ::sal_Int32 _shadowcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getWindowColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setWindowColor( ::sal_Int32 _windowcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getWindowTextColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setWindowTextColor( ::sal_Int32 _windowtextcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getWorkspaceColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setWorkspaceColor( ::sal_Int32 _workspacecolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getHighContrastMode() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHighContrastMode( sal_Bool _highcontrastmode ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getApplicationFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setApplicationFont( const css::awt::FontDescriptor& _applicationfont ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getHelpFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHelpFont( const css::awt::FontDescriptor& _helpfont ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getTitleFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitleFont( const css::awt::FontDescriptor& _titlefont ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getFloatTitleFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFloatTitleFont( const css::awt::FontDescriptor& _floattitlefont ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getMenuFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMenuFont( const css::awt::FontDescriptor& _menufont ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getToolFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setToolFont( const css::awt::FontDescriptor& _toolfont ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getGroupFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setGroupFont( const css::awt::FontDescriptor& _groupfont ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getLabelFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLabelFont( const css::awt::FontDescriptor& _labelfont ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getInfoFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInfoFont( const css::awt::FontDescriptor& _infofont ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getRadioCheckFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRadioCheckFont( const css::awt::FontDescriptor& _radiocheckfont ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getPushButtonFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPushButtonFont( const css::awt::FontDescriptor& _pushbuttonfont ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::FontDescriptor SAL_CALL getFieldFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFieldFont( const css::awt::FontDescriptor& _fieldfont ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addStyleChangeListener( const css::uno::Reference< css::awt::XStyleChangeListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeStyleChangeListener( const css::uno::Reference< css::awt::XStyleChangeListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; private: std::unique_ptr< WindowStyleSettings_Data > m_pData; diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index 670dcd5f76b3..daa0cabe47c9 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -29,52 +29,52 @@ // class VCLXBitmap -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXBitmap::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXBitmap::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XBitmap* >(this)), - (static_cast< ::com::sun::star::awt::XDisplayBitmap* >(this)), - (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)), - (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XBitmap* >(this)), + (static_cast< css::awt::XDisplayBitmap* >(this)), + (static_cast< css::lang::XUnoTunnel* >(this)), + (static_cast< css::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } -// ::com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel IMPL_XUNOTUNNEL( VCLXBitmap ) -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXBitmap ) - cppu::UnoType<com::sun::star::awt::XBitmap>::get(), - cppu::UnoType<com::sun::star::awt::XDisplayBitmap>::get() + cppu::UnoType<css::awt::XBitmap>::get(), + cppu::UnoType<css::awt::XDisplayBitmap>::get() IMPL_XTYPEPROVIDER_END -// ::com::sun::star::awt::XBitmap -::com::sun::star::awt::Size VCLXBitmap::getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XBitmap +css::awt::Size VCLXBitmap::getSize() throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::awt::Size aSize( maBitmap.GetSizePixel().Width(), maBitmap.GetSizePixel().Height() ); + css::awt::Size aSize( maBitmap.GetSizePixel().Width(), maBitmap.GetSizePixel().Height() ); return aSize; } -::com::sun::star::uno::Sequence< sal_Int8 > VCLXBitmap::getDIB() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int8 > VCLXBitmap::getDIB() throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); SvMemoryStream aMem; WriteDIB(maBitmap.GetBitmap(), aMem, false, true); - return ::com::sun::star::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() ); + return css::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() ); } -::com::sun::star::uno::Sequence< sal_Int8 > VCLXBitmap::getMaskDIB() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int8 > VCLXBitmap::getMaskDIB() throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); SvMemoryStream aMem; WriteDIB(maBitmap.GetMask(), aMem, false, true); - return ::com::sun::star::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() ); + return css::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index ca66dbc6c042..42b98bbb35eb 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -47,57 +47,57 @@ VCLXContainer::~VCLXContainer() { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXContainer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXContainer::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XVclContainer* >(this)), - (static_cast< ::com::sun::star::awt::XVclContainerPeer* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XVclContainer* >(this)), + (static_cast< css::awt::XVclContainerPeer* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXContainer ) - cppu::UnoType<com::sun::star::awt::XVclContainer>::get(), - cppu::UnoType<com::sun::star::awt::XVclContainerPeer>::get(), + cppu::UnoType<css::awt::XVclContainer>::get(), + cppu::UnoType<css::awt::XVclContainerPeer>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END -// ::com::sun::star::awt::XVclContainer -void VCLXContainer::addVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XVclContainer +void VCLXContainer::addVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetContainerListeners().addInterface( rxListener ); } -void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXContainer::removeVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetContainerListeners().removeInterface( rxListener ); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > VCLXContainer::getWindows( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Reference< css::awt::XWindow > > VCLXContainer::getWindows( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // Request container interface from all children - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aSeq; + css::uno::Sequence< css::uno::Reference< css::awt::XWindow > > aSeq; vcl::Window* pWindow = GetWindow(); if ( pWindow ) { sal_uInt16 nChildren = pWindow->GetChildCount(); if ( nChildren ) { - aSeq = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >( nChildren ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pChildRefs = aSeq.getArray(); + aSeq = css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >( nChildren ); + css::uno::Reference< css::awt::XWindow > * pChildRefs = aSeq.getArray(); for ( sal_uInt16 n = 0; n < nChildren; n++ ) { vcl::Window* pChild = pWindow->GetChild( n ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xWP = pChild->GetComponentInterface(); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xW( xWP, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::awt::XWindowPeer > xWP = pChild->GetComponentInterface(); + css::uno::Reference< css::awt::XWindow > xW( xWP, css::uno::UNO_QUERY ); pChildRefs[n] = xW; } } @@ -106,8 +106,8 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref } -// ::com::sun::star::awt::XVclContainerPeer -void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XVclContainerPeer +void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -123,21 +123,21 @@ void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::st } } -void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Components, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Tabs, sal_Bool bGroupControl ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXContainer::setTabOrder( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& Components, const css::uno::Sequence< css::uno::Any >& Tabs, sal_Bool bGroupControl ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt32 nCount = Components.getLength(); DBG_ASSERT( nCount == (sal_uInt32)Tabs.getLength(), "setTabOrder: TabCount != ComponentCount" ); - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pComps = Components.getConstArray(); - const ::com::sun::star::uno::Any* pTabs = Tabs.getConstArray(); + const css::uno::Reference< css::awt::XWindow > * pComps = Components.getConstArray(); + const css::uno::Any* pTabs = Tabs.getConstArray(); vcl::Window* pPrevWin = NULL; for ( sal_uInt32 n = 0; n < nCount; n++ ) { - // ::com::sun::star::style::TabStop + // css::style::TabStop vcl::Window* pWin = VCLUnoHelper::GetWindow( pComps[n] ); - // May be NULL if a ::com::sun::star::uno::Sequence is originated from TabController and is missing a peer! + // May be NULL if a css::uno::Sequence is originated from TabController and is missing a peer! if ( pWin ) { // Order windows before manipulating their style, because elements such as the @@ -147,7 +147,7 @@ void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::s WinBits nStyle = pWin->GetStyle(); nStyle &= ~(WB_TABSTOP|WB_NOTABSTOP|WB_GROUP); - if ( pTabs[n].getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN ) + if ( pTabs[n].getValueType().getTypeClass() == css::uno::TypeClass_BOOLEAN ) { bool bTab = false; pTabs[n] >>= bTab; @@ -168,12 +168,12 @@ void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::s } } -void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Components ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXContainer::setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& Components ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt32 nCount = Components.getLength(); - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pComps = Components.getConstArray(); + const css::uno::Reference< css::awt::XWindow > * pComps = Components.getConstArray(); vcl::Window* pPrevWin = NULL; vcl::Window* pPrevRadio = NULL; @@ -227,8 +227,8 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun: void SAL_CALL VCLXContainer::setProperty( const OUString& PropertyName, - const ::com::sun::star::uno::Any& Value ) -throw(::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Any& Value ) +throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index aff22613f286..70c8af992381 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -63,33 +63,33 @@ void VCLXDevice::SetCreatedWithToolkit( bool bCreatedWithToolkit ) nFlags &= ~FLAGS_CREATEDWITHTOOLKIT; } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXDevice::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXDevice::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XDevice* >(this)), - (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)), - (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)), - (static_cast< ::com::sun::star::awt::XUnitConversion* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XDevice* >(this)), + (static_cast< css::lang::XUnoTunnel* >(this)), + (static_cast< css::lang::XTypeProvider* >(this)), + (static_cast< css::awt::XUnitConversion* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } -// ::com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel IMPL_XUNOTUNNEL( VCLXDevice ) -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXDevice ) - cppu::UnoType<com::sun::star::awt::XDevice>::get(), - cppu::UnoType<com::sun::star::awt::XUnitConversion>::get() + cppu::UnoType<css::awt::XDevice>::get(), + cppu::UnoType<css::awt::XUnitConversion>::get() IMPL_XTYPEPROVIDER_END -// ::com::sun::star::awt::XDevice, -::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > VCLXDevice::createGraphics( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XDevice, +css::uno::Reference< css::awt::XGraphics > VCLXDevice::createGraphics( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > xRef; + css::uno::Reference< css::awt::XGraphics > xRef; if ( mpOutputDevice ) xRef = mpOutputDevice->CreateUnoGraphics(); @@ -97,11 +97,11 @@ IMPL_XTYPEPROVIDER_END return xRef; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXDevice::createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XDevice > VCLXDevice::createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > xRef; + css::uno::Reference< css::awt::XDevice > xRef; if ( GetOutputDevice() ) { VCLXVirtualDevice* pVDev = new VCLXVirtualDevice; @@ -113,11 +113,11 @@ IMPL_XTYPEPROVIDER_END return xRef; } -::com::sun::star::awt::DeviceInfo VCLXDevice::getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::DeviceInfo VCLXDevice::getInfo() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::awt::DeviceInfo aInfo; + css::awt::DeviceInfo aInfo; if( mpOutputDevice ) { @@ -158,24 +158,24 @@ IMPL_XTYPEPROVIDER_END aInfo.Capabilities = 0; if ( mpOutputDevice->GetOutDevType() != OUTDEV_PRINTER ) - aInfo.Capabilities = ::com::sun::star::awt::DeviceCapability::RASTEROPERATIONS|::com::sun::star::awt::DeviceCapability::GETBITS; + aInfo.Capabilities = css::awt::DeviceCapability::RASTEROPERATIONS|css::awt::DeviceCapability::GETBITS; } return aInfo; } -::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor > VCLXDevice::getFontDescriptors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::awt::FontDescriptor > VCLXDevice::getFontDescriptors( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor> aFonts; + css::uno::Sequence< css::awt::FontDescriptor> aFonts; if( mpOutputDevice ) { int nFonts = mpOutputDevice->GetDevFontCount(); if ( nFonts ) { - aFonts = ::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor>( nFonts ); - ::com::sun::star::awt::FontDescriptor* pFonts = aFonts.getArray(); + aFonts = css::uno::Sequence< css::awt::FontDescriptor>( nFonts ); + css::awt::FontDescriptor* pFonts = aFonts.getArray(); for ( int n = 0; n < nFonts; n++ ) pFonts[n] = VCLUnoHelper::CreateFontDescriptor( mpOutputDevice->GetDevFont( n ) ); } @@ -183,11 +183,11 @@ IMPL_XTYPEPROVIDER_END return aFonts; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > VCLXDevice::getFont( const ::com::sun::star::awt::FontDescriptor& rDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XFont > VCLXDevice::getFont( const css::awt::FontDescriptor& rDescriptor ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > xRef; + css::uno::Reference< css::awt::XFont > xRef; if( mpOutputDevice ) { VCLXFont* pMetric = new VCLXFont; @@ -197,11 +197,11 @@ IMPL_XTYPEPROVIDER_END return xRef; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > VCLXDevice::createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XBitmap > VCLXDevice::createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp; + css::uno::Reference< css::awt::XBitmap > xBmp; if( mpOutputDevice ) { Bitmap aBmp = mpOutputDevice->GetBitmap( Point( nX, nY ), Size( nWidth, nHeight ) ); @@ -213,14 +213,14 @@ IMPL_XTYPEPROVIDER_END return xBmp; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap > VCLXDevice::createDisplayBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& rxBitmap ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XDisplayBitmap > VCLXDevice::createDisplayBitmap( const css::uno::Reference< css::awt::XBitmap >& rxBitmap ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; BitmapEx aBmp = VCLUnoHelper::GetBitmap( rxBitmap ); VCLXBitmap* pBmp = new VCLXBitmap; pBmp->SetBitmap( aBmp ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap > xDBmp = pBmp; + css::uno::Reference< css::awt::XDisplayBitmap > xDBmp = pBmp; return xDBmp; } @@ -231,19 +231,19 @@ VCLXVirtualDevice::~VCLXVirtualDevice() mpOutputDevice.disposeAndClear(); } -// Interface implementation of ::com::sun::star::awt::XUnitConversion +// Interface implementation of css::awt::XUnitConversion -::com::sun::star::awt::Point SAL_CALL VCLXDevice::convertPointToLogic( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Point SAL_CALL VCLXDevice::convertPointToLogic( const css::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { (void)aPoint; SolarMutexGuard aGuard; - if (TargetUnit == com::sun::star::util::MeasureUnit::PERCENT ) + if (TargetUnit == css::util::MeasureUnit::PERCENT ) { // percentage not allowed here - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } - ::com::sun::star::awt::Point aAWTPoint(0,0); + css::awt::Point aAWTPoint(0,0); // X,Y if( mpOutputDevice ) @@ -258,18 +258,18 @@ VCLXVirtualDevice::~VCLXVirtualDevice() } -::com::sun::star::awt::Point SAL_CALL VCLXDevice::convertPointToPixel( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Point SAL_CALL VCLXDevice::convertPointToPixel( const css::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { (void)aPoint; SolarMutexGuard aGuard; - if (SourceUnit == com::sun::star::util::MeasureUnit::PERCENT || - SourceUnit == com::sun::star::util::MeasureUnit::PIXEL ) + if (SourceUnit == css::util::MeasureUnit::PERCENT || + SourceUnit == css::util::MeasureUnit::PIXEL ) { // pixel or percentage not allowed here - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } - ::com::sun::star::awt::Point aAWTPoint(0,0); + css::awt::Point aAWTPoint(0,0); if( mpOutputDevice ) { @@ -282,17 +282,17 @@ VCLXVirtualDevice::~VCLXVirtualDevice() return aAWTPoint; } -::com::sun::star::awt::Size SAL_CALL VCLXDevice::convertSizeToLogic( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size SAL_CALL VCLXDevice::convertSizeToLogic( const css::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { (void)aSize; SolarMutexGuard aGuard; - if (TargetUnit == com::sun::star::util::MeasureUnit::PERCENT) + if (TargetUnit == css::util::MeasureUnit::PERCENT) { // percentage not allowed here - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } - ::com::sun::star::awt::Size aAWTSize(0,0); + css::awt::Size aAWTSize(0,0); // Width, Height @@ -307,18 +307,18 @@ VCLXVirtualDevice::~VCLXVirtualDevice() return aAWTSize; } -::com::sun::star::awt::Size SAL_CALL VCLXDevice::convertSizeToPixel( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size SAL_CALL VCLXDevice::convertSizeToPixel( const css::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { (void)aSize; SolarMutexGuard aGuard; - if (SourceUnit == com::sun::star::util::MeasureUnit::PERCENT || - SourceUnit == com::sun::star::util::MeasureUnit::PIXEL) + if (SourceUnit == css::util::MeasureUnit::PERCENT || + SourceUnit == css::util::MeasureUnit::PIXEL) { // pixel or percentage not allowed here - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } - ::com::sun::star::awt::Size aAWTSize(0,0); + css::awt::Size aAWTSize(0,0); // Width, Height if( mpOutputDevice ) { diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index acdae579408d..83e811962370 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -43,7 +43,7 @@ VCLXFont::~VCLXFont() delete mpFontMetric; } -void VCLXFont::Init( ::com::sun::star::awt::XDevice& rxDev, const vcl::Font& rFont ) +void VCLXFont::Init( css::awt::XDevice& rxDev, const vcl::Font& rFont ) { mxDevice = &rxDev; @@ -70,27 +70,27 @@ bool VCLXFont::ImplAssertValidFontMetric() } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXFont::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXFont::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XFont* >(this)), - (static_cast< ::com::sun::star::awt::XFont2* >(this)), - (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)), - (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XFont* >(this)), + (static_cast< css::awt::XFont2* >(this)), + (static_cast< css::lang::XUnoTunnel* >(this)), + (static_cast< css::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } -// ::com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel IMPL_XUNOTUNNEL( VCLXFont ) -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXFont ) - cppu::UnoType<com::sun::star::awt::XFont2>::get() + cppu::UnoType<css::awt::XFont2>::get() IMPL_XTYPEPROVIDER_END -::com::sun::star::awt::FontDescriptor VCLXFont::getFontDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::FontDescriptor VCLXFont::getFontDescriptor( ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -98,17 +98,17 @@ IMPL_XTYPEPROVIDER_END } -::com::sun::star::awt::SimpleFontMetric VCLXFont::getFontMetric( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::SimpleFontMetric VCLXFont::getFontMetric( ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::awt::SimpleFontMetric aFM; + css::awt::SimpleFontMetric aFM; if ( ImplAssertValidFontMetric() ) aFM = VCLUnoHelper::CreateFontMetric( *mpFontMetric ); return aFM; } -sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -127,11 +127,11 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::R return nRet; } -::com::sun::star::uno::Sequence< sal_Int16 > VCLXFont::getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int16 > VCLXFont::getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::uno::Sequence<sal_Int16> aSeq; + css::uno::Sequence<sal_Int16> aSeq; OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( mxDevice ); if ( pOutDev ) { @@ -139,7 +139,7 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::R pOutDev->SetFont( maFont ); sal_Int16 nCount = nLast-nFirst + 1; - aSeq = ::com::sun::star::uno::Sequence<sal_Int16>( nCount ); + aSeq = css::uno::Sequence<sal_Int16>( nCount ); for ( sal_uInt16 n = 0; n < nCount; n++ ) { aSeq.getArray()[n] = sal::static_int_cast< sal_Int16 >( @@ -152,7 +152,7 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::R return aSeq; } -sal_Int32 VCLXFont::getStringWidth( const OUString& str ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 VCLXFont::getStringWidth( const OUString& str ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -168,7 +168,7 @@ sal_Int32 VCLXFont::getStringWidth( const OUString& str ) throw(::com::sun::star return nRet; } -sal_Int32 VCLXFont::getStringWidthArray( const OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 VCLXFont::getStringWidthArray( const OUString& str, css::uno::Sequence< sal_Int32 >& rDXArray ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -180,7 +180,7 @@ sal_Int32 VCLXFont::getStringWidthArray( const OUString& str, ::com::sun::star:: pOutDev->SetFont( maFont ); std::unique_ptr<long []> pDXA(new long[str.getLength()]); nRet = pOutDev->GetTextArray( str, pDXA.get() ); - rDXArray = ::com::sun::star::uno::Sequence<sal_Int32>( str.getLength() ); + rDXArray = css::uno::Sequence<sal_Int32>( str.getLength() ); for(int i = 0; i < str.getLength(); i++) { rDXArray[i] = pDXA[i]; @@ -190,14 +190,14 @@ sal_Int32 VCLXFont::getStringWidthArray( const OUString& str, ::com::sun::star:: return nRet; } -void VCLXFont::getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& /*rnChars1*/, ::com::sun::star::uno::Sequence< sal_Unicode >& /*rnChars2*/, ::com::sun::star::uno::Sequence< sal_Int16 >& /*rnKerns*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXFont::getKernPairs( css::uno::Sequence< sal_Unicode >& /*rnChars1*/, css::uno::Sequence< sal_Unicode >& /*rnChars2*/, css::uno::Sequence< sal_Int16 >& /*rnKerns*/ ) throw(css::uno::RuntimeException, std::exception) { // NOTE: this empty method is just used for keeping the related UNO-API stable } -// ::com::sun::star::awt::XFont2 +// css::awt::XFont2 sal_Bool VCLXFont::hasGlyphs( const OUString& aText ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); SolarMutexGuard aSolarGuard; diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index 4e2268f9dc73..683db6b71734 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -43,9 +43,9 @@ using namespace com::sun::star; uno::Any VCLXGraphics::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XGraphics* >(this)), - (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)), - (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)) ); + (static_cast< css::awt::XGraphics* >(this)), + (static_cast< css::lang::XTypeProvider* >(this)), + (static_cast< css::lang::XUnoTunnel* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx index c6560d8ae89b..9e9590f359ff 100644 --- a/toolkit/source/awt/vclxpointer.cxx +++ b/toolkit/source/awt/vclxpointer.cxx @@ -30,17 +30,17 @@ VCLXPointer::~VCLXPointer() { } -// ::com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel IMPL_XUNOTUNNEL( VCLXPointer ) -void VCLXPointer::setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXPointer::setType( sal_Int32 nType ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maPointer = Pointer( (PointerStyle)nType ); } -sal_Int32 VCLXPointer::getType() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 VCLXPointer::getType() throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index b5fbf456b876..314dceb145e4 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -40,22 +40,22 @@ #define PROPERTY_Orientation 0 #define PROPERTY_Horizontal 1 -::com::sun::star::beans::Property* ImplGetProperties( sal_uInt16& rElementCount ) +css::beans::Property* ImplGetProperties( sal_uInt16& rElementCount ) { - static ::com::sun::star::beans::Property* pProperties = NULL; + static css::beans::Property* pProperties = NULL; static sal_uInt16 nElements = 0; if( !pProperties ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !pProperties ) { - static ::com::sun::star::beans::Property aPropTable[] = + static css::beans::Property aPropTable[] = { - ::com::sun::star::beans::Property( OUString("Orientation"), PROPERTY_Orientation, cppu::UnoType<sal_Int16>::get(), 0 ), - ::com::sun::star::beans::Property( OUString("Horizontal"), PROPERTY_Horizontal, cppu::UnoType<bool>::get(), 0 ) + css::beans::Property( OUString("Orientation"), PROPERTY_Orientation, cppu::UnoType<sal_Int16>::get(), 0 ), + css::beans::Property( OUString("Horizontal"), PROPERTY_Horizontal, cppu::UnoType<bool>::get(), 0 ) }; pProperties = aPropTable; - nElements = sizeof( aPropTable ) / sizeof( ::com::sun::star::beans::Property ); + nElements = sizeof( aPropTable ) / sizeof( css::beans::Property ); } } rElementCount = nElements; @@ -85,7 +85,7 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet() mxPrinter.reset(); } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXPrinterPropertySet::GetDevice() +css::uno::Reference< css::awt::XDevice > VCLXPrinterPropertySet::GetDevice() { if ( !mxPrnDevice.is() ) { @@ -96,9 +96,9 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet() return mxPrnDevice; } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > VCLXPrinterPropertySet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > VCLXPrinterPropertySet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { - static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } @@ -111,14 +111,14 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet() if( !pPropertyArrayHelper ) { sal_uInt16 nElements; - ::com::sun::star::beans::Property* pProps = ImplGetProperties( nElements ); + css::beans::Property* pProps = ImplGetProperties( nElements ); pPropertyArrayHelper = new ::cppu::OPropertyArrayHelper( pProps, nElements, sal_False ); } } return *pPropertyArrayHelper ; } -sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException) +sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException) { ::osl::MutexGuard aGuard( Mutex ); @@ -155,7 +155,7 @@ sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno return bDifferent; } -void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) +void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) { ::osl::MutexGuard aGuard( Mutex ); @@ -178,7 +178,7 @@ void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle } } -void VCLXPrinterPropertySet::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const +void VCLXPrinterPropertySet::getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const { ::osl::MutexGuard aGuard( const_cast<VCLXPrinterPropertySet*>(this)->Mutex ); @@ -197,22 +197,22 @@ void VCLXPrinterPropertySet::getFastPropertyValue( ::com::sun::star::uno::Any& r } } -// ::com::sun::star::awt::XPrinterPropertySet -void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XPrinterPropertySet +void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( Mutex ); - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; aValue <<= bHorizontal; setFastPropertyValue( PROPERTY_Horizontal, aValue ); } -::com::sun::star::uno::Sequence< OUString > VCLXPrinterPropertySet::getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > VCLXPrinterPropertySet::getFormDescriptions( ) throw(css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( Mutex ); sal_uInt16 nPaperBinCount = GetPrinter()->GetPaperBinCount(); - ::com::sun::star::uno::Sequence< OUString > aDescriptions( nPaperBinCount ); + css::uno::Sequence< OUString > aDescriptions( nPaperBinCount ); for ( sal_uInt16 n = 0; n < nPaperBinCount; n++ ) { // Format: <DisplayFormName;FormNameId;DisplayPaperBinName;PaperBinNameId;DisplayPaperName;PaperNameId> @@ -227,7 +227,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com:: return aDescriptions; } -void VCLXPrinterPropertySet::selectForm( const OUString& rFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +void VCLXPrinterPropertySet::selectForm( const OUString& rFormDescription ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( Mutex ); @@ -237,17 +237,17 @@ void VCLXPrinterPropertySet::selectForm( const OUString& rFormDescription ) thro GetPrinter()->SetPaperBin( nPaperBin ); } -::com::sun::star::uno::Sequence< sal_Int8 > VCLXPrinterPropertySet::getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int8 > VCLXPrinterPropertySet::getBinarySetup( ) throw(css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( Mutex ); SvMemoryStream aMem; aMem.WriteUInt32( BINARYSETUPMARKER ); WriteJobSetup( aMem, GetPrinter()->GetJobSetup() ); - return ::com::sun::star::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() ); + return css::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() ); } -void VCLXPrinterPropertySet::setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +void VCLXPrinterPropertySet::setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( Mutex ); @@ -276,7 +276,7 @@ VCLXPrinter::~VCLXPrinter() { } -sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(css::awt::PrinterException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( Mutex ); @@ -290,7 +290,7 @@ sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/ return bDone; } -void VCLXPrinter::end( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception) +void VCLXPrinter::end( ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( Mutex ); @@ -301,14 +301,14 @@ void VCLXPrinter::end( ) throw(::com::sun::star::awt::PrinterException, ::com:: } } -void VCLXPrinter::terminate( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXPrinter::terminate( ) throw(css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( Mutex ); mxListener.reset(); } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXPrinter::startPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XDevice > VCLXPrinter::startPage( ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( Mutex ); @@ -319,7 +319,7 @@ void VCLXPrinter::terminate( ) throw(::com::sun::star::uno::RuntimeException, s return GetDevice(); } -void VCLXPrinter::endPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception) +void VCLXPrinter::endPage( ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( Mutex ); @@ -343,8 +343,8 @@ VCLXInfoPrinter::~VCLXInfoPrinter() { } -// ::com::sun::star::awt::XInfoPrinter -::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXInfoPrinter::createDevice( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XInfoPrinter +css::uno::Reference< css::awt::XDevice > VCLXInfoPrinter::createDevice( ) throw(css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( Mutex ); @@ -355,29 +355,29 @@ VCLXInfoPrinter::~VCLXInfoPrinter() // class VCLXPrinterServer // ---------------------------------------------------- -// ::com::sun::star::awt::XPrinterServer -::com::sun::star::uno::Sequence< OUString > VCLXPrinterServer::getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XPrinterServer +css::uno::Sequence< OUString > VCLXPrinterServer::getPrinterNames( ) throw(css::uno::RuntimeException, std::exception) { const std::vector<OUString>& rQueues = Printer::GetPrinterQueues(); sal_uInt32 nPrinters = rQueues.size(); - ::com::sun::star::uno::Sequence< OUString > aNames( nPrinters ); + css::uno::Sequence< OUString > aNames( nPrinters ); for ( sal_uInt32 n = 0; n < nPrinters; n++ ) aNames.getArray()[n] = rQueues[n]; return aNames; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > VCLXPrinterServer::createPrinter( const OUString& rPrinterName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XPrinter > VCLXPrinterServer::createPrinter( const OUString& rPrinterName ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > xP; + css::uno::Reference< css::awt::XPrinter > xP; xP = new VCLXPrinter( rPrinterName ); return xP; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > VCLXPrinterServer::createInfoPrinter( const OUString& rPrinterName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XInfoPrinter > VCLXPrinterServer::createInfoPrinter( const OUString& rPrinterName ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > xP; + css::uno::Reference< css::awt::XInfoPrinter > xP; xP = new VCLXInfoPrinter( rPrinterName ); return xP; } diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index c2344b720237..2fd56d4c5f16 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -37,76 +37,76 @@ VCLXRegion::~VCLXRegion() { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXRegion::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXRegion::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XRegion* >(this)), - (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)), - (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XRegion* >(this)), + (static_cast< css::lang::XUnoTunnel* >(this)), + (static_cast< css::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } -// ::com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel IMPL_XUNOTUNNEL( VCLXRegion ) -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXRegion ) - cppu::UnoType<com::sun::star::awt::XRegion>::get() + cppu::UnoType<css::awt::XRegion>::get() IMPL_XTYPEPROVIDER_END -::com::sun::star::awt::Rectangle VCLXRegion::getBounds() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Rectangle VCLXRegion::getBounds() throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return AWTRectangle( maRegion.GetBoundRect() ); } -void VCLXRegion::clear() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRegion::clear() throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maRegion.SetEmpty(); } -void VCLXRegion::move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRegion::move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maRegion.Move( nHorzMove, nVertMove ); } -void VCLXRegion::unionRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRegion::unionRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maRegion.Union( VCLRectangle( rRect ) ); } -void VCLXRegion::intersectRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRegion::intersectRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maRegion.Intersect( VCLRectangle( rRect ) ); } -void VCLXRegion::excludeRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRegion::excludeRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maRegion.Exclude( VCLRectangle( rRect ) ); } -void VCLXRegion::xOrRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRegion::xOrRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maRegion.XOr( VCLRectangle( rRect ) ); } -void VCLXRegion::unionRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRegion::unionRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -114,7 +114,7 @@ void VCLXRegion::unionRegion( const ::com::sun::star::uno::Reference< ::com::sun maRegion.Union( VCLUnoHelper::GetRegion( rxRegion ) ); } -void VCLXRegion::intersectRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRegion::intersectRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -122,7 +122,7 @@ void VCLXRegion::intersectRegion( const ::com::sun::star::uno::Reference< ::com: maRegion.Intersect( VCLUnoHelper::GetRegion( rxRegion ) ); } -void VCLXRegion::excludeRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRegion::excludeRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -130,7 +130,7 @@ void VCLXRegion::excludeRegion( const ::com::sun::star::uno::Reference< ::com::s maRegion.Exclude( VCLUnoHelper::GetRegion( rxRegion ) ); } -void VCLXRegion::xOrRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRegion::xOrRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -138,7 +138,7 @@ void VCLXRegion::xOrRegion( const ::com::sun::star::uno::Reference< ::com::sun:: maRegion.XOr( VCLUnoHelper::GetRegion( rxRegion ) ); } -::com::sun::star::uno::Sequence< ::com::sun::star::awt::Rectangle > VCLXRegion::getRectangles() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::awt::Rectangle > VCLXRegion::getRectangles() throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -146,7 +146,7 @@ void VCLXRegion::xOrRegion( const ::com::sun::star::uno::Reference< ::com::sun:: maRegion.GetRegionRectangles(aRectangles); // sal_uLong nRects = maRegion.GetRectCount(); - ::com::sun::star::uno::Sequence< ::com::sun::star::awt::Rectangle > aRects(aRectangles.size()); + css::uno::Sequence< css::awt::Rectangle > aRects(aRectangles.size()); sal_uInt32 a(0); for(RectangleVector::const_iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); ++aRectIter) diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 1ee5600b65c6..488119109b40 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -49,26 +49,26 @@ VCLXSystemDependentWindow::~VCLXSystemDependentWindow() { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXSystemDependentWindow::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXSystemDependentWindow::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XSystemDependentWindowPeer* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XSystemDependentWindowPeer* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXSystemDependentWindow ) - cppu::UnoType<com::sun::star::awt::XSystemDependentWindowPeer>::get(), + cppu::UnoType<css::awt::XSystemDependentWindowPeer>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END -::com::sun::star::uno::Any VCLXSystemDependentWindow::getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXSystemDependentWindow::getWindowHandle( const css::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // TODO, check the process id - ::com::sun::star::uno::Any aRet; + css::uno::Any aRet; vcl::Window* pWindow = GetWindow(); if ( pWindow ) { @@ -76,12 +76,12 @@ IMPL_XTYPEPROVIDER_END if( pSysData ) { #if (defined WNT) - if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32 ) + if( SystemType == css::lang::SystemDependent::SYSTEM_WIN32 ) { aRet <<= reinterpret_cast<sal_IntPtr>(pSysData->hWnd); } #elif (defined MACOSX) - if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) + if( SystemType == css::lang::SystemDependent::SYSTEM_MAC ) { aRet <<= reinterpret_cast<sal_IntPtr>(pSysData->mpNSView); } @@ -92,9 +92,9 @@ IMPL_XTYPEPROVIDER_END // Nothing (void) SystemType; #elif (defined UNX) - if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW ) + if( SystemType == css::lang::SystemDependent::SYSTEM_XWINDOW ) { - ::com::sun::star::awt::SystemDependentXWindow aSD; + css::awt::SystemDependentXWindow aSD; aSD.DisplayPointer = sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(pSysData->pDisplay)); aSD.WindowHandle = pSysData->aWindow; aRet <<= aSD; diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index cd2790129380..2d295655d3a7 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -77,9 +77,9 @@ void SAL_CALL VCLXTabPageContainer::draw( sal_Int32 nX, sal_Int32 nY ) throw(Run VCLXWindow::draw( nX, nY ); } -::com::sun::star::awt::DeviceInfo VCLXTabPageContainer::getInfo() throw(RuntimeException, std::exception) +css::awt::DeviceInfo VCLXTabPageContainer::getInfo() throw(RuntimeException, std::exception) { - ::com::sun::star::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); + css::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); return aInfo; } @@ -115,17 +115,17 @@ sal_Bool SAL_CALL VCLXTabPageContainer::isTabPageActive( ::sal_Int16 tabPageInde return (getActiveTabPageID() == tabPageIndex); } -Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception) +Reference< css::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception) { return (tabPageIndex >= 0 && tabPageIndex < static_cast<sal_Int16>(m_aTabPages.size())) ? m_aTabPages[tabPageIndex] : NULL; } -Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException, std::exception) +Reference< css::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; - Reference< ::com::sun::star::awt::tab::XTabPage > xTabPage; - ::std::vector< Reference< ::com::sun::star::awt::tab::XTabPage > >::iterator aIter = m_aTabPages.begin(); - ::std::vector< Reference< ::com::sun::star::awt::tab::XTabPage > >::iterator aEnd = m_aTabPages.end(); + Reference< css::awt::tab::XTabPage > xTabPage; + ::std::vector< Reference< css::awt::tab::XTabPage > >::iterator aIter = m_aTabPages.begin(); + ::std::vector< Reference< css::awt::tab::XTabPage > >::iterator aEnd = m_aTabPages.end(); for(;aIter != aEnd;++aIter) { Reference< awt::XControl > xControl(*aIter,UNO_QUERY ); @@ -139,12 +139,12 @@ Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer: return xTabPage; } -void SAL_CALL VCLXTabPageContainer::addTabPageContainerListener( const Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) +void SAL_CALL VCLXTabPageContainer::addTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) { m_aTabPageListeners.addInterface( listener ); } -void SAL_CALL VCLXTabPageContainer::removeTabPageContainerListener( const Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) +void SAL_CALL VCLXTabPageContainer::removeTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) { m_aTabPageListeners.removeInterface( listener ); } @@ -171,14 +171,14 @@ void VCLXTabPageContainer::ProcessWindowEvent( const VclWindowEvent& _rVclWindow } } } -void SAL_CALL VCLXTabPageContainer::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXTabPageContainer::disposing( const css::lang::EventObject& /*Source*/ ) throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL VCLXTabPageContainer::elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXTabPageContainer::elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr<TabControl> pTabCtrl = GetAs<TabControl>(); - Reference< ::com::sun::star::awt::tab::XTabPage > xTabPage(Event.Element,uno::UNO_QUERY); + Reference< css::awt::tab::XTabPage > xTabPage(Event.Element,uno::UNO_QUERY); if ( pTabCtrl && xTabPage.is() ) { Reference< awt::XControl > xControl(xTabPage,UNO_QUERY ); @@ -198,11 +198,11 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const ::com::sun::star::con m_aTabPages.push_back(xTabPage); } } -void SAL_CALL VCLXTabPageContainer::elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXTabPageContainer::elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr<TabControl> pTabCtrl = GetAs<TabControl>(); - Reference< ::com::sun::star::awt::tab::XTabPage > xTabPage(Event.Element,uno::UNO_QUERY); + Reference< css::awt::tab::XTabPage > xTabPage(Event.Element,uno::UNO_QUERY); if ( pTabCtrl && xTabPage.is() ) { Reference< awt::XControl > xControl(xTabPage,UNO_QUERY ); @@ -211,7 +211,7 @@ void SAL_CALL VCLXTabPageContainer::elementRemoved( const ::com::sun::star::cont m_aTabPages.erase(::std::remove(m_aTabPages.begin(),m_aTabPages.end(),xTabPage)); } } -void SAL_CALL VCLXTabPageContainer::elementReplaced( const ::com::sun::star::container::ContainerEvent& /*Event*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXTabPageContainer::elementReplaced( const css::container::ContainerEvent& /*Event*/ ) throw (css::uno::RuntimeException, std::exception) { } diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 5fd1fb7150f6..10013ed8f633 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -124,11 +124,11 @@ #define VCLWINDOW_SYSTEMCHILDWINDOW 0x1001 #if (defined WNT) -#define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32 +#define SYSTEM_DEPENDENT_TYPE css::lang::SystemDependent::SYSTEM_WIN32 #elif (defined MACOSX) -#define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_MAC +#define SYSTEM_DEPENDENT_TYPE css::lang::SystemDependent::SYSTEM_MAC #elif (defined UNX) -#define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW +#define SYSTEM_DEPENDENT_TYPE css::lang::SystemDependent::SYSTEM_XWINDOW #endif namespace { @@ -193,7 +193,7 @@ public: // css::awt::XToolkitExperimental virtual void SAL_CALL processEventsToIdle() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // css::awt::XToolkit css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getDesktopWindow( ) throw(css::uno::RuntimeException, std::exception) override; @@ -331,79 +331,79 @@ WinBits ImplGetWinBits( sal_uInt32 nComponentAttribs, sal_uInt16 nCompType ) bDecoratedWindow = true; } - if( nComponentAttribs & ::com::sun::star::awt::WindowAttribute::BORDER ) + if( nComponentAttribs & css::awt::WindowAttribute::BORDER ) nWinBits |= WB_BORDER; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::NOBORDER ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::NOBORDER ) nWinBits |= WB_NOBORDER; - if( nComponentAttribs & ::com::sun::star::awt::WindowAttribute::SIZEABLE ) + if( nComponentAttribs & css::awt::WindowAttribute::SIZEABLE ) nWinBits |= WB_SIZEABLE; - if( nComponentAttribs & ::com::sun::star::awt::WindowAttribute::MOVEABLE ) + if( nComponentAttribs & css::awt::WindowAttribute::MOVEABLE ) nWinBits |= WB_MOVEABLE; - if( nComponentAttribs & ::com::sun::star::awt::WindowAttribute::CLOSEABLE ) + if( nComponentAttribs & css::awt::WindowAttribute::CLOSEABLE ) nWinBits |= WB_CLOSEABLE; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::HSCROLL ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::HSCROLL ) nWinBits |= WB_HSCROLL; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::VSCROLL ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::VSCROLL ) nWinBits |= WB_VSCROLL; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::LEFT ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::LEFT ) nWinBits |= WB_LEFT; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::CENTER ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::CENTER ) nWinBits |= WB_CENTER; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::RIGHT ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::RIGHT ) nWinBits |= WB_RIGHT; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::SPIN ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::SPIN ) nWinBits |= WB_SPIN; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::SORT ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::SORT ) nWinBits |= WB_SORT; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::DROPDOWN ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::DROPDOWN ) nWinBits |= WB_DROPDOWN; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::DEFBUTTON ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::DEFBUTTON ) nWinBits |= WB_DEFBUTTON; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::READONLY ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::READONLY ) nWinBits |= WB_READONLY; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::CLIPCHILDREN ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::CLIPCHILDREN ) nWinBits |= WB_CLIPCHILDREN; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::GROUP ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::GROUP ) nWinBits |= WB_GROUP; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::NOLABEL ) //added for issue79712 + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::NOLABEL ) //added for issue79712 nWinBits |= WB_NOLABEL; // These bits are not uniqe if ( bMessBox ) { - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::OK ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::OK ) nWinBits |= WB_OK; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::OK_CANCEL ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::OK_CANCEL ) nWinBits |= WB_OK_CANCEL; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::YES_NO ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::YES_NO ) nWinBits |= WB_YES_NO; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::YES_NO_CANCEL ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::YES_NO_CANCEL ) nWinBits |= WB_YES_NO_CANCEL; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::RETRY_CANCEL ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::RETRY_CANCEL ) nWinBits |= WB_RETRY_CANCEL; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::DEF_OK ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::DEF_OK ) nWinBits |= WB_DEF_OK; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::DEF_CANCEL ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::DEF_CANCEL ) nWinBits |= WB_DEF_CANCEL; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::DEF_RETRY ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::DEF_RETRY ) nWinBits |= WB_DEF_RETRY; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::DEF_YES ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::DEF_YES ) nWinBits |= WB_DEF_YES; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::DEF_NO ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::DEF_NO ) nWinBits |= WB_DEF_NO; } if ( nCompType == WINDOW_MULTILINEEDIT || nCompType == WINDOW_DIALOG || nCompType == WINDOW_GROUPBOX ) { - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::AUTOHSCROLL ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::AUTOHSCROLL ) nWinBits |= WB_AUTOHSCROLL; - if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::AUTOVSCROLL ) + if( nComponentAttribs & css::awt::VclWindowPeerAttribute::AUTOVSCROLL ) nWinBits |= WB_AUTOVSCROLL; } if ( bDecoratedWindow ) { - if( nComponentAttribs & ::com::sun::star::awt::WindowAttribute::NODECORATION ) + if( nComponentAttribs & css::awt::WindowAttribute::NODECORATION ) { // No decoration removes several window attributes and must // set WB_NOBORDER! @@ -649,7 +649,7 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs ) { pTk->dispose(); } - catch( com::sun::star::uno::Exception & ) + catch( css::uno::Exception & ) { } DeInitVCL(); @@ -665,9 +665,9 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs ) // constructor, which might initialize VCL VCLXToolkit::VCLXToolkit(): cppu::WeakComponentImplHelper< - ::com::sun::star::awt::XToolkitExperimental, - ::com::sun::star::awt::XToolkitRobot, - ::com::sun::star::lang::XServiceInfo>( GetMutex() ), + css::awt::XToolkitExperimental, + css::awt::XToolkitRobot, + css::lang::XServiceInfo>( GetMutex() ), m_aTopWindowListeners(rBHelper.rMutex), m_aKeyHandlers(rBHelper.rMutex), m_aFocusListeners(rBHelper.rMutex), @@ -736,18 +736,18 @@ void SAL_CALL VCLXToolkit::disposing() } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > VCLXToolkit::getDesktopWindow( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::getDesktopWindow( ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xRef; + css::uno::Reference< css::awt::XWindowPeer > xRef; // 07/00: AppWindow doesn't exist anymore... return xRef; } -::com::sun::star::awt::Rectangle VCLXToolkit::getWorkArea( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Rectangle VCLXToolkit::getWorkArea( ) throw(css::uno::RuntimeException, std::exception) { sal_Int32 nDisplay = Application::GetDisplayBuiltInScreen(); Rectangle aWorkRect = Application::GetScreenPosSizePixel( nDisplay ); - com::sun::star::awt::Rectangle aNotherRect; + css::awt::Rectangle aNotherRect; aNotherRect.X = aWorkRect.getX(); aNotherRect.Y = aWorkRect.getY(); aNotherRect.Width = aWorkRect.getWidth(); @@ -755,16 +755,16 @@ void SAL_CALL VCLXToolkit::disposing() return aNotherRect; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > VCLXToolkit::createWindow( const ::com::sun::star::awt::WindowDescriptor& rDescriptor ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::createWindow( const css::awt::WindowDescriptor& rDescriptor ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { return ImplCreateWindow( rDescriptor, WinBits(0) ); } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXToolkit::createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XDevice > VCLXToolkit::createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > xRef; + css::uno::Reference< css::awt::XDevice > xRef; VCLXVirtualDevice* pVDev = new VCLXVirtualDevice; SolarMutexGuard aSolarGuard; @@ -777,16 +777,16 @@ void SAL_CALL VCLXToolkit::disposing() return xRef; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion > VCLXToolkit::createRegion( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XRegion > VCLXToolkit::createRegion( ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion > xRef = new VCLXRegion; + css::uno::Reference< css::awt::XRegion > xRef = new VCLXRegion; return xRef; } vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, - const ::com::sun::star::awt::WindowDescriptor& rDescriptor, + const css::awt::WindowDescriptor& rDescriptor, vcl::Window* pParent, WinBits nWinBits ) { OUString aServiceName( rDescriptor.WindowServiceName ); @@ -805,7 +805,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, if ( !pParent ) { // Wenn die Component einen Parent braucht, dann NULL zurueckgeben, - // spaeter mal ::com::sun::star::uno::Exception... + // spaeter mal css::uno::Exception... bool bException = true; if ( ( nType == WINDOW_DIALOG ) || ( nType == WINDOW_MODALDIALOG ) @@ -821,7 +821,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, ( nType == WINDOW_WORKWINDOW ) || ( nType == VCLWINDOW_FRAMEWINDOW ) ) { - if ( rDescriptor.Type == ::com::sun::star::awt::WindowClass_TOP ) + if ( rDescriptor.Type == css::awt::WindowClass_TOP ) bException = false; } @@ -1085,7 +1085,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, case WINDOW_WINDOW: case VCLWINDOW_FRAMEWINDOW: case WINDOW_DOCKINGWINDOW: - if ( rDescriptor.Type == ::com::sun::star::awt::WindowClass_TOP ) + if ( rDescriptor.Type == css::awt::WindowClass_TOP ) { if (nType == WINDOW_DOCKINGWINDOW ) pNewWindow = VclPtr<DockingWindow>::Create( pParent, nWinBits ); @@ -1094,7 +1094,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, if ((pParent == NULL) && rDescriptor.Parent.is()) { // try to get a system dependent window handle - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSystemDependentWindowPeer > xSystemDepParent(rDescriptor.Parent, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::awt::XSystemDependentWindowPeer > xSystemDepParent(rDescriptor.Parent, css::uno::UNO_QUERY); if (xSystemDepParent.is()) { @@ -1102,9 +1102,9 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, rtl_getGlobalProcessId( reinterpret_cast<sal_uInt8*>(processID) ); - ::com::sun::star::uno::Sequence<sal_Int8> processIdSeq(processID, 16); + css::uno::Sequence<sal_Int8> processIdSeq(processID, 16); - ::com::sun::star::uno::Any anyHandle = xSystemDepParent->getWindowHandle(processIdSeq, SYSTEM_DEPENDENT_TYPE); + css::uno::Any anyHandle = xSystemDepParent->getWindowHandle(processIdSeq, SYSTEM_DEPENDENT_TYPE); // use sal_Int64 here to accommodate all int types // uno::Any shift operator whill upcast if necessary @@ -1158,7 +1158,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, *ppNewComp = new VCLXTopWindow( pNewWindow->GetType() == WINDOW_WORKWINDOW ); } - else if ( rDescriptor.Type == ::com::sun::star::awt::WindowClass_CONTAINER ) + else if ( rDescriptor.Type == css::awt::WindowClass_CONTAINER ) { if (nType == WINDOW_DOCKINGWINDOW ) pNewWindow = VclPtr<DockingWindow>::Create( pParent, nWinBits ); @@ -1203,7 +1203,7 @@ extern "C" { static void SAL_CALL thisModule() {} } #else -extern "C" vcl::Window* SAL_CALL CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, vcl::Window* pParent, WinBits nWinBits ); +extern "C" vcl::Window* SAL_CALL CreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor* pDescriptor, vcl::Window* pParent, WinBits nWinBits ); #endif @@ -1215,7 +1215,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( SolarMutexGuard aSolarGuard; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xRef; + css::uno::Reference< css::awt::XWindowPeer > xRef; vcl::Window* pParent = NULL; if ( rDescriptor.Parent.is() ) @@ -1274,11 +1274,11 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( pNewWindow->SetCreatedWithToolkit( true ); //pNewWindow->SetPosPixel( Point() ); // do not force (0,0) position, keep default pos instead - if ( rDescriptor.WindowAttributes & ::com::sun::star::awt::WindowAttribute::MINSIZE ) + if ( rDescriptor.WindowAttributes & css::awt::WindowAttribute::MINSIZE ) { pNewWindow->SetSizePixel( Size() ); } - else if ( rDescriptor.WindowAttributes & ::com::sun::star::awt::WindowAttribute::FULLSIZE ) + else if ( rDescriptor.WindowAttributes & css::awt::WindowAttribute::FULLSIZE ) { if ( pParent ) pNewWindow->SetSizePixel( pParent->GetOutputSizePixel() ); @@ -1303,22 +1303,22 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( DBG_ASSERT( pNewWindow->GetComponentInterface( false ) == xRef, "VCLXToolkit::createWindow: did #133706# resurge?" ); - if ( rDescriptor.WindowAttributes & ::com::sun::star::awt::WindowAttribute::SHOW ) + if ( rDescriptor.WindowAttributes & css::awt::WindowAttribute::SHOW ) pNewWindow->Show(); } return xRef; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > > VCLXToolkit::createWindows( const ::com::sun::star::uno::Sequence< ::com::sun::star::awt::WindowDescriptor >& rDescriptors ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Reference< css::awt::XWindowPeer > > VCLXToolkit::createWindows( const css::uno::Sequence< css::awt::WindowDescriptor >& rDescriptors ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); sal_uInt32 nComponents = rDescriptors.getLength(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > > aSeq( nComponents ); + css::uno::Sequence< css::uno::Reference< css::awt::XWindowPeer > > aSeq( nComponents ); for ( sal_uInt32 n = 0; n < nComponents; n++ ) { - ::com::sun::star::awt::WindowDescriptor aDescr = rDescriptors.getConstArray()[n]; + css::awt::WindowDescriptor aDescr = rDescriptors.getConstArray()[n]; if ( aDescr.ParentIndex == (-1) ) aDescr.Parent = NULL; @@ -1329,8 +1329,8 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( return aSeq; } -// ::com::sun::star::awt::XSystemChildFactory -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > VCLXToolkit::createSystemChild( const ::com::sun::star::uno::Any& Parent, const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 nSystemType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XSystemChildFactory +css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::createSystemChild( const css::uno::Any& Parent, const css::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 nSystemType ) throw(css::uno::RuntimeException, std::exception) { VclPtr<vcl::Window> pChildWindow; if ( nSystemType == SYSTEM_DEPENDENT_TYPE ) @@ -1381,7 +1381,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( { pChildWindow.reset( VclPtr<WorkWindow>::Create( &aParentData ) ); } - catch ( const ::com::sun::star::uno::RuntimeException & rEx ) + catch ( const css::uno::RuntimeException & rEx ) { // system child window could not be created OSL_TRACE( @@ -1392,13 +1392,13 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( } } } - else if (nSystemType == com::sun::star::lang::SystemDependent::SYSTEM_JAVA) + else if (nSystemType == css::lang::SystemDependent::SYSTEM_JAVA) { SolarMutexGuard aGuard; pChildWindow.reset(VclPtr<WorkWindow>::Create(nullptr, Parent)); } - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer; + css::uno::Reference< css::awt::XWindowPeer > xPeer; if ( pChildWindow ) { VCLXTopWindow* pPeer = new VCLXTopWindow(true); @@ -1410,15 +1410,15 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( return xPeer; } -// ::com::sun::star::awt::XMessageBoxFactory -::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL VCLXToolkit::createMessageBox( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent, - ::com::sun::star::awt::MessageBoxType eType, +// css::awt::XMessageBoxFactory +css::uno::Reference< css::awt::XMessageBox > SAL_CALL VCLXToolkit::createMessageBox( + const css::uno::Reference< css::awt::XWindowPeer >& aParent, + css::awt::MessageBoxType eType, ::sal_Int32 aButtons, const OUString& aTitle, - const OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException, std::exception) + const OUString& aMessage ) throw (css::uno::RuntimeException, std::exception) { - ::com::sun::star::awt::WindowDescriptor aDescriptor; + css::awt::WindowDescriptor aDescriptor; sal_Int32 nWindowAttributes = css::awt::WindowAttribute::BORDER|css::awt::WindowAttribute::MOVEABLE|css::awt::WindowAttribute::CLOSEABLE; @@ -1462,7 +1462,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( aDescriptor.ParentIndex = -1; aDescriptor.Parent = aParent; aDescriptor.WindowAttributes = nWindowAttributes; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > xMsgBox( + css::uno::Reference< css::awt::XMessageBox > xMsgBox( ImplCreateWindow( aDescriptor, nAddWinBits ), css::uno::UNO_QUERY ); css::uno::Reference< css::awt::XWindow > xWindow( xMsgBox, css::uno::UNO_QUERY ); if ( xMsgBox.is() && xWindow.is() ) @@ -1479,7 +1479,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( return xMsgBox; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL VCLXToolkit::getDragGestureRecognizer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL VCLXToolkit::getDragGestureRecognizer( const css::uno::Reference< css::awt::XWindow >& window ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1488,10 +1488,10 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( if( pWindow ) return pWindow->GetDragGestureRecognizer(); - return ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer >(); + return css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer >(); } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > SAL_CALL VCLXToolkit::getDragSource( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::datatransfer::dnd::XDragSource > SAL_CALL VCLXToolkit::getDragSource( const css::uno::Reference< css::awt::XWindow >& window ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1500,10 +1500,10 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( if( pWindow ) return pWindow->GetDragSource(); - return ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >(); + return css::uno::Reference< css::datatransfer::dnd::XDragSource >(); } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > SAL_CALL VCLXToolkit::getDropTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::datatransfer::dnd::XDropTarget > SAL_CALL VCLXToolkit::getDropTarget( const css::uno::Reference< css::awt::XWindow >& window ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1512,10 +1512,10 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( if( pWindow ) return pWindow->GetDropTarget(); - return ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >(); + return css::uno::Reference< css::datatransfer::dnd::XDropTarget >(); } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL VCLXToolkit::getClipboard( const OUString& clipboardName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL VCLXToolkit::getClipboard( const OUString& clipboardName ) throw(css::uno::RuntimeException, std::exception) { if( clipboardName.isEmpty() ) { @@ -1534,21 +1534,21 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( return mxSelection; } - return ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >(); + return css::uno::Reference< css::datatransfer::clipboard::XClipboard >(); } // XServiceInfo -OUString VCLXToolkit::getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXToolkit::getImplementationName() throw(css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.VCLXToolkit"); } -sal_Bool VCLXToolkit::supportsService( const OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXToolkit::supportsService( const OUString& rServiceName ) throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -::com::sun::star::uno::Sequence< OUString > VCLXToolkit::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > VCLXToolkit::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ "com.sun.star.awt.Toolkit", "stardiv.vcl.VclToolkit"}; @@ -1697,17 +1697,17 @@ void SAL_CALL VCLXToolkit::removeFocusListener( // virtual void SAL_CALL VCLXToolkit::fireFocusGained( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > const &) - throw (::com::sun::star::uno::RuntimeException, std::exception) + css::uno::Reference< + css::uno::XInterface > const &) + throw (css::uno::RuntimeException, std::exception) { } // virtual void SAL_CALL VCLXToolkit::fireFocusLost( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > const &) - throw (::com::sun::star::uno::RuntimeException, std::exception) + css::uno::Reference< + css::uno::XInterface > const &) + throw (css::uno::RuntimeException, std::exception) { } @@ -1900,14 +1900,14 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent, // css::awt::XReschedule: void SAL_CALL VCLXToolkit::reschedule() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; Application::Reschedule(true); } void SAL_CALL VCLXToolkit::processEventsToIdle() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; Scheduler::ProcessTaskScheduling(false); diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index 06cba55f05dc..c46b8c27a978 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -57,7 +57,7 @@ VCLXTopWindow_Base::~VCLXTopWindow_Base() Any VCLXTopWindow_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet( VCLXTopWindow_XBase::queryInterface( rType ) ); + css::uno::Any aRet( VCLXTopWindow_XBase::queryInterface( rType ) ); // do not expose XSystemDependentWindowPeer if we do not have a system window handle if ( !aRet.hasValue() && m_bWHWND ) @@ -74,12 +74,12 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException, std::exc return aTypes; } -::com::sun::star::uno::Any VCLXTopWindow_Base::getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXTopWindow_Base::getWindowHandle( const css::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // TODO, check the process id - ::com::sun::star::uno::Any aRet; + css::uno::Any aRet; vcl::Window* pWindow = GetWindowImpl(); if ( pWindow ) { @@ -87,12 +87,12 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException, std::exc if( pSysData ) { #if (defined WNT) - if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32 ) + if( SystemType == css::lang::SystemDependent::SYSTEM_WIN32 ) { aRet <<= reinterpret_cast<sal_IntPtr>(pSysData->hWnd); } #elif (defined MACOSX) - if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) + if( SystemType == css::lang::SystemDependent::SYSTEM_MAC ) { aRet <<= reinterpret_cast<sal_IntPtr>(pSysData->mpNSView); } @@ -103,9 +103,9 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException, std::exc // Nothing (void) SystemType; #elif (defined UNX) - if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW ) + if( SystemType == css::lang::SystemDependent::SYSTEM_XWINDOW ) { - ::com::sun::star::awt::SystemDependentXWindow aSD; + css::awt::SystemDependentXWindow aSD; aSD.DisplayPointer = sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(pSysData->pDisplay)); aSD.WindowHandle = pSysData->aWindow; aRet <<= aSD; @@ -116,21 +116,21 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException, std::exc return aRet; } -void VCLXTopWindow_Base::addTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTopWindow_Base::addTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetTopWindowListenersImpl().addInterface( rxListener ); } -void VCLXTopWindow_Base::removeTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTopWindow_Base::removeTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetTopWindowListenersImpl().removeInterface( rxListener ); } -void VCLXTopWindow_Base::toFront( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTopWindow_Base::toFront( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -139,11 +139,11 @@ void VCLXTopWindow_Base::toFront( ) throw(::com::sun::star::uno::RuntimeExcepti static_cast<WorkWindow*>(pWindow)->ToTop( ToTopFlags::RestoreWhenMin ); } -void VCLXTopWindow_Base::toBack( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTopWindow_Base::toBack( ) throw(css::uno::RuntimeException, std::exception) { } -void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& rxMenu ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTopWindow_Base::setMenuBar( const css::uno::Reference< css::awt::XMenuBar >& rxMenu ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -265,10 +265,10 @@ vcl::Window* VCLXTopWindow::GetWindowImpl() return GetTopWindowListeners(); } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXTopWindow::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXTopWindow::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet( VCLXTopWindow_Base::queryInterface( rType ) ); + css::uno::Any aRet( VCLXTopWindow_Base::queryInterface( rType ) ); if ( !aRet.hasValue() ) aRet = VCLXContainer::queryInterface( rType ); @@ -276,12 +276,12 @@ vcl::Window* VCLXTopWindow::GetWindowImpl() return aRet; } -::com::sun::star::uno::Sequence< sal_Int8 > VCLXTopWindow::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int8 > VCLXTopWindow::getImplementationId() throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > VCLXTopWindow::getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > VCLXTopWindow::getTypes() throw(css::uno::RuntimeException, std::exception) { return ::comphelper::concatSequences( VCLXTopWindow_Base::getTypes(), VCLXContainer::getTypes() ); } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 94a2f7c49367..0432b7c6e60a 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -124,13 +124,13 @@ public: UnoPropertyArrayHelper* mpPropHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer > + css::uno::Reference< css::awt::XPointer > mxPointer; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > mxAccessibleContext; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > + css::uno::Reference< css::awt::XGraphics > mxViewGraphics; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > + css::uno::Reference< css::awt::XStyleSettings > mxWindowStyleSettings; public: @@ -237,7 +237,7 @@ void VCLXWindowImpl::disposing() mbDisposed= true; - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source = mrAntiImpl; maDockableWindowListeners.disposeAndClear( aEvent ); @@ -319,7 +319,7 @@ Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() // Uses an out-parameter instead of return value, due to the object reference -void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, vcl::Window* pWindow ) +void ImplInitWindowEvent( css::awt::WindowEvent& rEvent, vcl::Window* pWindow ) { Point aPos = pWindow->GetPosPixel(); Size aSz = pWindow->GetSizePixel(); @@ -436,7 +436,7 @@ namespace void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xThis( static_cast<cppu::OWeakObject*>(this) ); + css::uno::Reference< css::uno::XInterface > xThis( static_cast<cppu::OWeakObject*>(this) ); switch ( rVclWindowEvent.GetId() ) { @@ -456,7 +456,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getPaintListeners().getLength() ) { - ::com::sun::star::awt::PaintEvent aEvent; + css::awt::PaintEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.UpdateRect = AWTRectangle( *static_cast<Rectangle*>(rVclWindowEvent.GetData()) ); aEvent.Count = 0; @@ -468,7 +468,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getWindowListeners().getLength() ) { - ::com::sun::star::awt::WindowEvent aEvent; + css::awt::WindowEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); ImplInitWindowEvent( aEvent, rVclWindowEvent.GetWindow() ); mpImpl->getWindowListeners().windowMoved( aEvent ); @@ -479,7 +479,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getWindowListeners().getLength() ) { - ::com::sun::star::awt::WindowEvent aEvent; + css::awt::WindowEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); ImplInitWindowEvent( aEvent, rVclWindowEvent.GetWindow() ); mpImpl->getWindowListeners().windowResized( aEvent ); @@ -490,7 +490,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getWindowListeners().getLength() ) { - ::com::sun::star::awt::WindowEvent aEvent; + css::awt::WindowEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); ImplInitWindowEvent( aEvent, rVclWindowEvent.GetWindow() ); mpImpl->getWindowListeners().windowShown( aEvent ); @@ -499,7 +499,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // For TopWindows this means opened... if ( mpImpl->getTopWindowListeners().getLength() ) { - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); mpImpl->getTopWindowListeners().windowOpened( aEvent ); } @@ -509,7 +509,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getWindowListeners().getLength() ) { - ::com::sun::star::awt::WindowEvent aEvent; + css::awt::WindowEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); ImplInitWindowEvent( aEvent, rVclWindowEvent.GetWindow() ); mpImpl->getWindowListeners().windowHidden( aEvent ); @@ -518,7 +518,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // For TopWindows this means closed... if ( mpImpl->getTopWindowListeners().getLength() ) { - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); mpImpl->getTopWindowListeners().windowClosed( aEvent ); } @@ -528,7 +528,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getTopWindowListeners().getLength() ) { - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); mpImpl->getTopWindowListeners().windowActivated( aEvent ); } @@ -538,7 +538,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getTopWindowListeners().getLength() ) { - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); mpImpl->getTopWindowListeners().windowDeactivated( aEvent ); } @@ -548,13 +548,13 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getDockableWindowListeners().getLength() ) { - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); mpImpl->getDockableWindowListeners().notifyEach( &XDockableWindowListener::closed, aEvent ); } if ( mpImpl->getTopWindowListeners().getLength() ) { - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); mpImpl->getTopWindowListeners().windowClosing( aEvent ); } @@ -573,7 +573,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getFocusListeners().getLength() ) { - ::com::sun::star::awt::FocusEvent aEvent; + css::awt::FocusEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.FocusFlags = static_cast<sal_Int16>(rVclWindowEvent.GetWindow()->GetGetFocusFlags()); aEvent.Temporary = sal_False; @@ -595,7 +595,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getFocusListeners().getLength() ) { - ::com::sun::star::awt::FocusEvent aEvent; + css::awt::FocusEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.FocusFlags = static_cast<sal_Int16>(rVclWindowEvent.GetWindow()->GetGetFocusFlags()); aEvent.Temporary = sal_False; @@ -622,7 +622,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getTopWindowListeners().getLength() ) { - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); mpImpl->getTopWindowListeners().windowMinimized( aEvent ); } @@ -632,7 +632,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getTopWindowListeners().getLength() ) { - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); mpImpl->getTopWindowListeners().windowNormalized( aEvent ); } @@ -642,7 +642,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getKeyListeners().getLength() ) { - ::com::sun::star::awt::KeyEvent aEvent( VCLUnoHelper::createKeyEvent( + css::awt::KeyEvent aEvent( VCLUnoHelper::createKeyEvent( *static_cast<KeyEvent*>(rVclWindowEvent.GetData()), *this ) ); mpImpl->getKeyListeners().keyPressed( aEvent ); @@ -653,7 +653,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getKeyListeners().getLength() ) { - ::com::sun::star::awt::KeyEvent aEvent( VCLUnoHelper::createKeyEvent( + css::awt::KeyEvent aEvent( VCLUnoHelper::createKeyEvent( *static_cast<KeyEvent*>(rVclWindowEvent.GetData()), *this ) ); mpImpl->getKeyListeners().keyReleased( aEvent ); @@ -744,7 +744,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) if( pData ) { - ::com::sun::star::awt::DockingEvent aEvent; + css::awt::DockingEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.TrackingRectangle = AWTRectangle( pData->maTrackRect ); aEvent.MousePos.X = pData->maMousePos.X(); @@ -765,7 +765,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) if( pData ) { - ::com::sun::star::awt::DockingEvent aEvent; + css::awt::DockingEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.TrackingRectangle = AWTRectangle( pData->maTrackRect ); aEvent.MousePos.X = pData->maMousePos.X(); @@ -780,7 +780,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) xFirstListener.set( aIter.next(), UNO_QUERY ); } - ::com::sun::star::awt::DockingData aDockingData = + css::awt::DockingData aDockingData = xFirstListener->docking( aEvent ); pData->maTrackRect = VCLRectangle( aDockingData.TrackingRectangle ); pData->mbFloating = aDockingData.bFloating; @@ -796,7 +796,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) if( pData ) { - ::com::sun::star::awt::EndDockingEvent aEvent; + css::awt::EndDockingEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.WindowRectangle = AWTRectangle( pData->maWindowRect ); aEvent.bFloating = pData->mbFloating; @@ -812,7 +812,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { sal_Bool *p_bFloating = static_cast<sal_Bool*>(rVclWindowEvent.GetData()); - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); Reference< XDockableWindowListener > xFirstListener; @@ -830,7 +830,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( mpImpl->getDockableWindowListeners().getLength() ) { - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); mpImpl->getDockableWindowListeners().notifyEach( &XDockableWindowListener::toggleFloatingMode, aEvent ); } @@ -844,7 +844,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) if( pData ) { - ::com::sun::star::awt::EndPopupModeEvent aEvent; + css::awt::EndPopupModeEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.FloatingPosition.X = pData->maFloatingPos.X(); aEvent.FloatingPosition.Y = pData->maFloatingPos.Y(); @@ -890,8 +890,8 @@ Size VCLXWindow::ImplCalcWindowSize( const Size& rOutSz ) const } -// ::com::sun::star::lang::XUnoTunnel -sal_Int64 VCLXWindow::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::lang::XUnoTunnel +sal_Int64 VCLXWindow::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) { if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( VCLXWindow::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) { @@ -903,21 +903,21 @@ namespace { class theVCLXWindowUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theVCLXWindowUnoTunnelId> {}; } -const ::com::sun::star::uno::Sequence< sal_Int8 >& VCLXWindow::GetUnoTunnelId() throw() +const css::uno::Sequence< sal_Int8 >& VCLXWindow::GetUnoTunnelId() throw() { return theVCLXWindowUnoTunnelId::get().getSeq(); } -VCLXWindow* VCLXWindow::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) +VCLXWindow* VCLXWindow::GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) { - ::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<VCLXWindow*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( VCLXWindow::GetUnoTunnelId() ))) : NULL; } -// ::com::sun::star::lang::Component -void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::lang::Component +void VCLXWindow::dispose( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -942,11 +942,11 @@ void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException, std: // for VCLEVENT_WINDOW_CHILDDESTROYED contains a reference to an already disposed accessible object try { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComponent( mpImpl->mxAccessibleContext, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent > xComponent( mpImpl->mxAccessibleContext, css::uno::UNO_QUERY ); if ( xComponent.is() ) xComponent->dispose(); } - catch ( const ::com::sun::star::uno::Exception& ) + catch ( const css::uno::Exception& ) { OSL_FAIL( "VCLXWindow::dispose: could not dispose the accessible context!" ); } @@ -956,14 +956,14 @@ void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException, std: } } -void VCLXWindow::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getEventListeners().addInterface( rxListener ); } -void VCLXWindow::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -971,8 +971,8 @@ void VCLXWindow::removeEventListener( const ::com::sun::star::uno::Reference< :: } -// ::com::sun::star::awt::XWindow -void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XWindow +void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -985,11 +985,11 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3 } } -::com::sun::star::awt::Rectangle VCLXWindow::getPosSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Rectangle VCLXWindow::getPosSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::awt::Rectangle aBounds; + css::awt::Rectangle aBounds; if ( GetWindow() ) { if( vcl::Window::GetDockingManager()->IsDockable( GetWindow() ) ) @@ -1001,7 +1001,7 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3 return aBounds; } -void VCLXWindow::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::setVisible( sal_Bool bVisible ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1013,7 +1013,7 @@ void VCLXWindow::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::Ru } } -void VCLXWindow::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::setEnable( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1025,7 +1025,7 @@ void VCLXWindow::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::Runt } } -void VCLXWindow::setFocus( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::setFocus( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1033,7 +1033,7 @@ void VCLXWindow::setFocus( ) throw(::com::sun::star::uno::RuntimeException, std GetWindow()->GrabFocus(); } -void VCLXWindow::addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1048,7 +1048,7 @@ void VCLXWindow::addWindowListener( const ::com::sun::star::uno::Reference< ::co GetWindow()->EnableAllResize(); } -void VCLXWindow::removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1059,75 +1059,75 @@ void VCLXWindow::removeWindowListener( const ::com::sun::star::uno::Reference< : mpImpl->getWindowListeners().removeInterface( rxListener ); } -void VCLXWindow::addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getFocusListeners().addInterface( rxListener ); } -void VCLXWindow::removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getFocusListeners().removeInterface( rxListener ); } -void VCLXWindow::addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getKeyListeners().addInterface( rxListener ); } -void VCLXWindow::removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getKeyListeners().removeInterface( rxListener ); } -void VCLXWindow::addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getMouseListeners().addInterface( rxListener ); } -void VCLXWindow::removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getMouseListeners().removeInterface( rxListener ); } -void VCLXWindow::addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getMouseMotionListeners().addInterface( rxListener ); } -void VCLXWindow::removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getMouseMotionListeners().removeInterface( rxListener ); } -void VCLXWindow::addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getPaintListeners().addInterface( rxListener ); } -void VCLXWindow::removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getPaintListeners().removeInterface( rxListener ); } -// ::com::sun::star::awt::XWindowPeer -::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > VCLXWindow::getToolkit( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XWindowPeer +css::uno::Reference< css::awt::XToolkit > VCLXWindow::getToolkit( ) throw(css::uno::RuntimeException, std::exception) { // no guard. nothing to guard here. // 82463 - 12/21/00 - fs return Application::GetVCLToolkit(); } -void VCLXWindow::setPointer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer >& rxPointer ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::setPointer( const css::uno::Reference< css::awt::XPointer >& rxPointer ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1140,7 +1140,7 @@ void VCLXWindow::setPointer( const ::com::sun::star::uno::Reference< ::com::sun: } } -void VCLXWindow::setBackground( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::setBackground( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1160,7 +1160,7 @@ void VCLXWindow::setBackground( sal_Int32 nColor ) throw(::com::sun::star::uno:: } } -void VCLXWindow::invalidate( sal_Int16 nInvalidateFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::invalidate( sal_Int16 nInvalidateFlags ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1168,7 +1168,7 @@ void VCLXWindow::invalidate( sal_Int16 nInvalidateFlags ) throw(::com::sun::star GetWindow()->Invalidate( static_cast<InvalidateFlags>(nInvalidateFlags) ); } -void VCLXWindow::invalidateRect( const ::com::sun::star::awt::Rectangle& rRect, sal_Int16 nInvalidateFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::invalidateRect( const css::awt::Rectangle& rRect, sal_Int16 nInvalidateFlags ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1177,8 +1177,8 @@ void VCLXWindow::invalidateRect( const ::com::sun::star::awt::Rectangle& rRect, } -// ::com::sun::star::awt::XVclWindowPeer -sal_Bool VCLXWindow::isChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& rxPeer ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XVclWindowPeer +sal_Bool VCLXWindow::isChild( const css::uno::Reference< css::awt::XWindowPeer >& rxPeer ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1193,20 +1193,20 @@ sal_Bool VCLXWindow::isChild( const ::com::sun::star::uno::Reference< ::com::sun return bIsChild; } -void VCLXWindow::setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::setDesignMode( sal_Bool bOn ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->mbDesignMode = bOn; } -sal_Bool VCLXWindow::isDesignMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXWindow::isDesignMode( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpImpl->mbDesignMode; } -void VCLXWindow::enableClipSiblings( sal_Bool bClip ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::enableClipSiblings( sal_Bool bClip ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1214,7 +1214,7 @@ void VCLXWindow::enableClipSiblings( sal_Bool bClip ) throw(::com::sun::star::un GetWindow()->EnableClipSiblings( bClip ); } -void VCLXWindow::setForeground( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::setForeground( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1225,7 +1225,7 @@ void VCLXWindow::setForeground( sal_Int32 nColor ) throw(::com::sun::star::uno:: } } -void VCLXWindow::setControlFont( const ::com::sun::star::awt::FontDescriptor& rFont ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::setControlFont( const css::awt::FontDescriptor& rFont ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1233,7 +1233,7 @@ void VCLXWindow::setControlFont( const ::com::sun::star::awt::FontDescriptor& rF GetWindow()->SetControlFont( VCLUnoHelper::CreateFont( rFont, GetWindow()->GetControlFont() ) ); } -void VCLXWindow::getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::getStyles( sal_Int16 nType, css::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1243,14 +1243,14 @@ void VCLXWindow::getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescript switch ( nType ) { - case ::com::sun::star::awt::Style::FRAME: + case css::awt::Style::FRAME: { Font = VCLUnoHelper::CreateFontDescriptor( rStyleSettings.GetAppFont() ); ForegroundColor = rStyleSettings.GetWindowTextColor().GetColor(); BackgroundColor = rStyleSettings.GetWindowColor().GetColor(); } break; - case ::com::sun::star::awt::Style::DIALOG: + case css::awt::Style::DIALOG: { Font = VCLUnoHelper::CreateFontDescriptor( rStyleSettings.GetAppFont() ); ForegroundColor = rStyleSettings.GetDialogTextColor().GetColor(); @@ -1265,7 +1265,7 @@ void VCLXWindow::getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescript namespace toolkit { - static void setColorSettings( vcl::Window* _pWindow, const ::com::sun::star::uno::Any& _rValue, + static void setColorSettings( vcl::Window* _pWindow, const css::uno::Any& _rValue, void (StyleSettings::*pSetter)( const Color& ), const Color& (StyleSettings::*pGetter)( ) const ) { sal_Int32 nColor = 0; @@ -1387,8 +1387,8 @@ namespace } } -void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) - throw(::com::sun::star::uno::RuntimeException, +void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any& Value ) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1397,7 +1397,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st if ( !pWindow ) return; - bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; + bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; WindowType eWinType = pWindow->GetType(); sal_uInt16 nPropType = GetPropertyId( PropertyName ); @@ -1550,7 +1550,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st pWindow->SetControlFont( vcl::Font() ); else { - ::com::sun::star::awt::FontDescriptor aFont; + css::awt::FontDescriptor aFont; if ( Value >>= aFont ) pWindow->SetControlFont( VCLUnoHelper::CreateFont( aFont, pWindow->GetControlFont() ) ); } @@ -1917,11 +1917,11 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st } } -::com::sun::star::uno::Any VCLXWindow::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; if ( GetWindow() ) { WindowType eWinType = GetWindow()->GetType(); @@ -2010,7 +2010,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st case BASEPROPERTY_FONTDESCRIPTOR: { vcl::Font aFont = GetWindow()->GetControlFont(); - ::com::sun::star::awt::FontDescriptor aFD = VCLUnoHelper::CreateFontDescriptor( aFont ); + css::awt::FontDescriptor aFD = VCLUnoHelper::CreateFontDescriptor( aFont ); aProp <<= aFD; } break; @@ -2146,13 +2146,13 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st } -// ::com::sun::star::awt::XLayoutConstrains -::com::sun::star::awt::Size VCLXWindow::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XLayoutConstrains +css::awt::Size VCLXWindow::getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // Use this method only for those components which can be created through - // ::com::sun::star::awt::Toolkit , but do not have an interface + // css::awt::Toolkit , but do not have an interface Size aSz; if ( GetWindow() ) @@ -2182,20 +2182,20 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st } } - return ::com::sun::star::awt::Size( aSz.Width(), aSz.Height() ); + return css::awt::Size( aSz.Width(), aSz.Height() ); } -::com::sun::star::awt::Size VCLXWindow::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXWindow::getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) { return getMinimumSize(); } -::com::sun::star::awt::Size VCLXWindow::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXWindow::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::awt::Size aNewSize( rNewSize ); - ::com::sun::star::awt::Size aMinSize = getMinimumSize(); + css::awt::Size aNewSize( rNewSize ); + css::awt::Size aMinSize = getMinimumSize(); if ( aNewSize.Width < aMinSize.Width ) aNewSize.Width = aMinSize.Width; @@ -2206,8 +2206,8 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st } -// ::com::sun::star::awt::XView -sal_Bool VCLXWindow::setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& rxDevice ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XView +sal_Bool VCLXWindow::setGraphics( const css::uno::Reference< css::awt::XGraphics >& rxDevice ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2219,24 +2219,24 @@ sal_Bool VCLXWindow::setGraphics( const ::com::sun::star::uno::Reference< ::com: return mpImpl->mxViewGraphics.is(); } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > VCLXWindow::getGraphics( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XGraphics > VCLXWindow::getGraphics( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpImpl->mxViewGraphics; } -::com::sun::star::awt::Size VCLXWindow::getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXWindow::getSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Size aSz; if ( GetWindow() ) aSz = GetWindow()->GetSizePixel(); - return ::com::sun::star::awt::Size( aSz.Width(), aSz.Height() ); + return css::awt::Size( aSz.Width(), aSz.Height() ); } -void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2330,7 +2330,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno: } } -void VCLXWindow::setZoom( float fZoomX, float /*fZoomY*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXWindow::setZoom( float fZoomX, float /*fZoomY*/ ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2346,8 +2346,8 @@ void VCLXWindow::setZoom( float fZoomX, float /*fZoomY*/ ) throw(::com::sun::sta } } -// ::com::sun::star::lang::XEventListener -void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::lang::XEventListener +void SAL_CALL VCLXWindow::disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2361,8 +2361,8 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject& } } -// ::com::sun::star::accessibility::XAccessible -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXWindow::getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::accessibility::XAccessible +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXWindow::getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) { using namespace ::com::sun::star; @@ -2387,8 +2387,8 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject& return mpImpl->mxAccessibleContext; } -// ::com::sun::star::awt::XDockable -void SAL_CALL VCLXWindow::addDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XDockable +void SAL_CALL VCLXWindow::addDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2397,14 +2397,14 @@ void SAL_CALL VCLXWindow::addDockableWindowListener( const ::com::sun::star::uno } -void SAL_CALL VCLXWindow::removeDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXWindow::removeDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; mpImpl->getDockableWindowListeners().removeInterface( xListener ); } -void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2413,7 +2413,7 @@ void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable ) throw (::com::sun::s pWindow->EnableDocking( bEnable ); } -sal_Bool SAL_CALL VCLXWindow::isFloating( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXWindow::isFloating( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2424,7 +2424,7 @@ sal_Bool SAL_CALL VCLXWindow::isFloating( ) throw (::com::sun::star::uno::Runti return sal_False; } -void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2433,7 +2433,7 @@ void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating ) throw (::com::su vcl::Window::GetDockingManager()->SetFloatingMode( pWindow, bFloating ); } -sal_Bool SAL_CALL VCLXWindow::isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXWindow::isLocked( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2444,7 +2444,7 @@ sal_Bool SAL_CALL VCLXWindow::isLocked( ) throw (::com::sun::star::uno::Runtime return sal_False; } -void SAL_CALL VCLXWindow::lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXWindow::lock( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2453,7 +2453,7 @@ void SAL_CALL VCLXWindow::lock( ) throw (::com::sun::star::uno::RuntimeExceptio vcl::Window::GetDockingManager()->Lock( pWindow ); } -void SAL_CALL VCLXWindow::unlock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXWindow::unlock( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2461,14 +2461,14 @@ void SAL_CALL VCLXWindow::unlock( ) throw (::com::sun::star::uno::RuntimeExcept if( pWindow && !vcl::Window::GetDockingManager()->IsFloating( pWindow ) ) vcl::Window::GetDockingManager()->Unlock( pWindow ); } -void SAL_CALL VCLXWindow::startPopupMode( const ::com::sun::star::awt::Rectangle& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXWindow::startPopupMode( const css::awt::Rectangle& ) throw (css::uno::RuntimeException, std::exception) { // TODO: remove interface in the next incompatible build SolarMutexGuard aGuard; } -sal_Bool SAL_CALL VCLXWindow::isInPopupMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXWindow::isInPopupMode( ) throw (css::uno::RuntimeException, std::exception) { // TODO: remove interface in the next incompatible build SolarMutexGuard aGuard; @@ -2476,9 +2476,9 @@ sal_Bool SAL_CALL VCLXWindow::isInPopupMode( ) throw (::com::sun::star::uno::Ru } -// ::com::sun::star::awt::XWindow2 +// css::awt::XWindow2 -void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXWindow::setOutputSize( const css::awt::Size& aSize ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; vcl::Window *pWindow; @@ -2492,7 +2492,7 @@ void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSiz } } -::com::sun::star::awt::Size SAL_CALL VCLXWindow::getOutputSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size SAL_CALL VCLXWindow::getOutputSize( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; vcl::Window *pWindow; @@ -2505,10 +2505,10 @@ void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSiz return AWTSize( pWindow->GetOutputSizePixel() ); } else - return ::com::sun::star::awt::Size(); + return css::awt::Size(); } -sal_Bool SAL_CALL VCLXWindow::isVisible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXWindow::isVisible( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( GetWindow() ) @@ -2517,7 +2517,7 @@ sal_Bool SAL_CALL VCLXWindow::isVisible( ) throw (::com::sun::star::uno::Runtim return sal_False; } -sal_Bool SAL_CALL VCLXWindow::isActive( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXWindow::isActive( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( GetWindow() ) @@ -2527,7 +2527,7 @@ sal_Bool SAL_CALL VCLXWindow::isActive( ) throw (::com::sun::star::uno::Runtime } -sal_Bool SAL_CALL VCLXWindow::isEnabled( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXWindow::isEnabled( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( GetWindow() ) @@ -2536,7 +2536,7 @@ sal_Bool SAL_CALL VCLXWindow::isEnabled( ) throw (::com::sun::star::uno::Runtim return sal_False; } -sal_Bool SAL_CALL VCLXWindow::hasFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXWindow::hasFocus( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( GetWindow() ) @@ -2545,7 +2545,7 @@ sal_Bool SAL_CALL VCLXWindow::hasFocus( ) throw (::com::sun::star::uno::Runtime return sal_False; } -// ::com::sun::star::beans::XPropertySetInfo +// css::beans::XPropertySetInfo UnoPropertyArrayHelper * VCLXWindow::GetPropHelper() @@ -2560,19 +2560,19 @@ VCLXWindow::GetPropHelper() return mpImpl->mpPropHelper; } -::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL -VCLXWindow::getProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::beans::Property > SAL_CALL +VCLXWindow::getProperties() throw (css::uno::RuntimeException, std::exception) { return GetPropHelper()->getProperties(); } -::com::sun::star::beans::Property SAL_CALL -VCLXWindow::getPropertyByName( const OUString& rName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) +css::beans::Property SAL_CALL +VCLXWindow::getPropertyByName( const OUString& rName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { return GetPropHelper()->getPropertyByName( rName ); } sal_Bool SAL_CALL -VCLXWindow::hasPropertyByName( const OUString& rName ) throw (::com::sun::star::uno::RuntimeException, std::exception) +VCLXWindow::hasPropertyByName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) { return GetPropHelper()->hasPropertyByName( rName ); } diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 46b2e72be883..f6783b1068cd 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -34,13 +34,13 @@ #include <vcl/sysdata.hxx> /// helper method to set a window handle into a SystemParentData struct -void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) +void VCLXWindow::SetSystemParent_Impl( const css::uno::Any& rHandle ) { // does only work for WorkWindows vcl::Window *pWindow = GetWindow(); if ( pWindow->GetType() != WINDOW_WORKWINDOW ) { - com::sun::star::uno::RuntimeException aException; + css::uno::RuntimeException aException; aException.Message = "not a work window"; throw aException; } @@ -52,11 +52,11 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) bool bThrow = false; if( ! (rHandle >>= nHandle) ) { - com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > aProps; + css::uno::Sequence< css::beans::NamedValue > aProps; if( rHandle >>= aProps ) { const int nProps = aProps.getLength(); - const com::sun::star::beans::NamedValue* pProps = aProps.getConstArray(); + const css::beans::NamedValue* pProps = aProps.getConstArray(); for( int i = 0; i < nProps; i++ ) { if ( pProps[i].Name == "WINDOW" ) @@ -70,7 +70,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) } if( bThrow ) { - com::sun::star::uno::RuntimeException aException; + css::uno::RuntimeException aException; aException.Message = "incorrect window handle type"; throw aException; } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 36edbfaad2ae..76c0559a8329 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -95,7 +95,7 @@ namespace toolkit { /** sets the "face color" for button like controls (scroll bar, spin button) */ - void setButtonLikeFaceColor( vcl::Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue ) + void setButtonLikeFaceColor( vcl::Window* _pWindow, const css::uno::Any& _rColorValue ) { AllSettings aSettings = _pWindow->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); @@ -216,7 +216,7 @@ void VCLXGraphicControl::ImplSetNewImage() pButton->SetModeImage( GetImage() ); } -void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, short Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, short Flags ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -229,7 +229,7 @@ void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, } } -void VCLXGraphicControl::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXGraphicControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -282,11 +282,11 @@ void VCLXGraphicControl::setProperty( const OUString& PropertyName, const ::com: } } -::com::sun::star::uno::Any VCLXGraphicControl::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXGraphicControl::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; if ( !GetWindow() ) return aProp; @@ -379,47 +379,47 @@ VCLXButton::~VCLXButton() { } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXButton::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXButton::CreateAccessibleContext() { return getAccessibleFactory().createAccessibleContext( this ); } -void VCLXButton::dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXButton::dispose() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::lang::EventObject aObj; + css::lang::EventObject aObj; aObj.Source = static_cast<cppu::OWeakObject*>(this); maActionListeners.disposeAndClear( aObj ); maItemListeners.disposeAndClear( aObj ); VCLXGraphicControl::dispose(); } -void VCLXButton::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l )throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXButton::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l )throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.addInterface( l ); } -void VCLXButton::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXButton::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.removeInterface( l ); } -void VCLXButton::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l )throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXButton::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l )throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maItemListeners.addInterface( l ); } -void VCLXButton::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXButton::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maItemListeners.removeInterface( l ); } -void VCLXButton::setLabel( const OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXButton::setLabel( const OUString& rLabel ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -428,14 +428,14 @@ void VCLXButton::setLabel( const OUString& rLabel ) throw(::com::sun::star::uno: pWindow->SetText( rLabel ); } -void VCLXButton::setActionCommand( const OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXButton::setActionCommand( const OUString& rCommand ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionCommand = rCommand; } -::com::sun::star::awt::Size VCLXButton::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXButton::getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -446,15 +446,15 @@ void VCLXButton::setActionCommand( const OUString& rCommand ) throw(::com::sun:: return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXButton::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXButton::getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::awt::Size aSz = getMinimumSize(); + css::awt::Size aSz = getMinimumSize(); aSz.Width += 16; aSz.Height += 10; return aSz; } -::com::sun::star::awt::Size VCLXButton::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXButton::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -482,7 +482,7 @@ void VCLXButton::setActionCommand( const OUString& rCommand ) throw(::com::sun:: return AWTSize(aSz); } -void VCLXButton::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXButton::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -527,11 +527,11 @@ void VCLXButton::setProperty( const OUString& PropertyName, const ::com::sun::st } } -::com::sun::star::uno::Any VCLXButton::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXButton::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; VclPtr< Button > pButton = GetAs< Button >(); if ( pButton ) { @@ -574,14 +574,14 @@ void VCLXButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { case VCLEVENT_BUTTON_CLICK: { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this ); + css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed // during the listener call. To prevent the resulting crashs, we keep us // alive as long as we're here if ( maActionListeners.getLength() ) { - ::com::sun::star::awt::ActionEvent aEvent; + css::awt::ActionEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.ActionCommand = maActionCommand; @@ -597,10 +597,10 @@ void VCLXButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { PushButton& rButton = dynamic_cast< PushButton& >( *rVclWindowEvent.GetWindow() ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this ); + css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); if ( maItemListeners.getLength() ) { - ::com::sun::star::awt::ItemEvent aEvent; + css::awt::ItemEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.Selected = ( rButton.GetState() == TRISTATE_TRUE ) ? 1 : 0; maItemListeners.itemStateChanged( aEvent ); @@ -656,7 +656,7 @@ void VCLXImageControl::ImplSetNewImage() pControl->SetImage( GetImage() ); } -::com::sun::star::awt::Size VCLXImageControl::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXImageControl::getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -666,17 +666,17 @@ void VCLXImageControl::ImplSetNewImage() return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXImageControl::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXImageControl::getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) { return getMinimumSize(); } -::com::sun::star::awt::Size VCLXImageControl::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXImageControl::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::awt::Size aSz = rNewSize; - ::com::sun::star::awt::Size aMinSz = getMinimumSize(); + css::awt::Size aSz = rNewSize; + css::awt::Size aMinSz = getMinimumSize(); if ( aSz.Width < aMinSz.Width ) aSz.Width = aMinSz.Width; if ( aSz.Height < aMinSz.Height ) @@ -684,7 +684,7 @@ void VCLXImageControl::ImplSetNewImage() return aSz; } -void VCLXImageControl::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXImageControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -720,11 +720,11 @@ void VCLXImageControl::setProperty( const OUString& PropertyName, const ::com::s } } -::com::sun::star::uno::Any VCLXImageControl::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXImageControl::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; VclPtr< ImageControl > pImageControl = GetAs< ImageControl >(); sal_uInt16 nPropType = GetPropertyId( PropertyName ); @@ -783,68 +783,68 @@ VCLXCheckBox::VCLXCheckBox() : maActionListeners( *this ), maItemListeners( *th { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXCheckBox::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXCheckBox::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XButton* >(this)), - (static_cast< ::com::sun::star::awt::XCheckBox* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XButton* >(this)), + (static_cast< css::awt::XCheckBox* >(this)) ); return (aRet.hasValue() ? aRet : VCLXGraphicControl::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXCheckBox ) - cppu::UnoType<com::sun::star::awt::XButton>::get(), - cppu::UnoType<com::sun::star::awt::XCheckBox>::get(), + cppu::UnoType<css::awt::XButton>::get(), + cppu::UnoType<css::awt::XCheckBox>::get(), VCLXGraphicControl::getTypes() IMPL_XTYPEPROVIDER_END -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXCheckBox::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXCheckBox::CreateAccessibleContext() { return getAccessibleFactory().createAccessibleContext( this ); } -void VCLXCheckBox::dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCheckBox::dispose() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::lang::EventObject aObj; + css::lang::EventObject aObj; aObj.Source = static_cast<cppu::OWeakObject*>(this); maItemListeners.disposeAndClear( aObj ); VCLXGraphicControl::dispose(); } -void VCLXCheckBox::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCheckBox::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maItemListeners.addInterface( l ); } -void VCLXCheckBox::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCheckBox::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maItemListeners.removeInterface( l ); } -void VCLXCheckBox::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l )throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCheckBox::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l )throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.addInterface( l ); } -void VCLXCheckBox::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCheckBox::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.removeInterface( l ); } -void VCLXCheckBox::setActionCommand( const OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCheckBox::setActionCommand( const OUString& rCommand ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionCommand = rCommand; } -void VCLXCheckBox::setLabel( const OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCheckBox::setLabel( const OUString& rLabel ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -853,7 +853,7 @@ void VCLXCheckBox::setLabel( const OUString& rLabel ) throw(::com::sun::star::un pWindow->SetText( rLabel ); } -void VCLXCheckBox::setState( short n ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCheckBox::setState( short n ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -881,7 +881,7 @@ void VCLXCheckBox::setState( short n ) throw(::com::sun::star::uno::RuntimeExcep } } -short VCLXCheckBox::getState() throw(::com::sun::star::uno::RuntimeException, std::exception) +short VCLXCheckBox::getState() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -901,7 +901,7 @@ short VCLXCheckBox::getState() throw(::com::sun::star::uno::RuntimeException, st return nState; } -void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCheckBox::enableTriState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -910,7 +910,7 @@ void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::Run pCheckBox->EnableTriState( b ); } -::com::sun::star::awt::Size VCLXCheckBox::getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXCheckBox::getMinimumSize() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -921,12 +921,12 @@ void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::Run return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXCheckBox::getPreferredSize() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXCheckBox::getPreferredSize() throw(css::uno::RuntimeException, std::exception) { return getMinimumSize(); } -::com::sun::star::awt::Size VCLXCheckBox::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXCheckBox::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -943,7 +943,7 @@ void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::Run return AWTSize(aSz); } -void VCLXCheckBox::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCheckBox::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -979,11 +979,11 @@ void VCLXCheckBox::setProperty( const OUString& PropertyName, const ::com::sun:: } } -::com::sun::star::uno::Any VCLXCheckBox::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXCheckBox::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; VclPtr< CheckBox > pCheckBox = GetAs< CheckBox >(); if ( pCheckBox ) { @@ -1014,7 +1014,7 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { case VCLEVENT_CHECKBOX_TOGGLE: { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this ); + css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed // in during the listener call. To prevent the resulting crashs, we keep us // alive as long as we're here @@ -1024,7 +1024,7 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( maItemListeners.getLength() ) { - ::com::sun::star::awt::ItemEvent aEvent; + css::awt::ItemEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.Highlighted = 0; aEvent.Selected = pCheckBox->GetState(); @@ -1032,7 +1032,7 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } if ( !IsSynthesizingVCLEvent() && maActionListeners.getLength() ) { - ::com::sun::star::awt::ActionEvent aEvent; + css::awt::ActionEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.ActionCommand = maActionCommand; maActionListeners.actionPerformed( aEvent ); @@ -1084,38 +1084,38 @@ VCLXRadioButton::VCLXRadioButton() : maItemListeners( *this ), maActionListeners { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXRadioButton::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXRadioButton::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XRadioButton* >(this)), - (static_cast< ::com::sun::star::awt::XButton* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XRadioButton* >(this)), + (static_cast< css::awt::XButton* >(this)) ); return (aRet.hasValue() ? aRet : VCLXGraphicControl::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXRadioButton ) - cppu::UnoType<com::sun::star::awt::XRadioButton>::get(), - cppu::UnoType<com::sun::star::awt::XButton>::get(), + cppu::UnoType<css::awt::XRadioButton>::get(), + cppu::UnoType<css::awt::XButton>::get(), VCLXGraphicControl::getTypes() IMPL_XTYPEPROVIDER_END -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXRadioButton::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXRadioButton::CreateAccessibleContext() { return getAccessibleFactory().createAccessibleContext( this ); } -void VCLXRadioButton::dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRadioButton::dispose() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::lang::EventObject aObj; + css::lang::EventObject aObj; aObj.Source = static_cast<cppu::OWeakObject*>(this); maItemListeners.disposeAndClear( aObj ); VCLXGraphicControl::dispose(); } -void VCLXRadioButton::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRadioButton::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1157,11 +1157,11 @@ void VCLXRadioButton::setProperty( const OUString& PropertyName, const ::com::su } } -::com::sun::star::uno::Any VCLXRadioButton::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXRadioButton::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; VclPtr< RadioButton > pButton = GetAs< RadioButton >(); if ( pButton ) { @@ -1186,31 +1186,31 @@ void VCLXRadioButton::setProperty( const OUString& PropertyName, const ::com::su return aProp; } -void VCLXRadioButton::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRadioButton::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maItemListeners.addInterface( l ); } -void VCLXRadioButton::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRadioButton::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maItemListeners.removeInterface( l ); } -void VCLXRadioButton::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l )throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRadioButton::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l )throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.addInterface( l ); } -void VCLXRadioButton::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRadioButton::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.removeInterface( l ); } -void VCLXRadioButton::setLabel( const OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRadioButton::setLabel( const OUString& rLabel ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1219,13 +1219,13 @@ void VCLXRadioButton::setLabel( const OUString& rLabel ) throw(::com::sun::star: pWindow->SetText( rLabel ); } -void VCLXRadioButton::setActionCommand( const OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRadioButton::setActionCommand( const OUString& rCommand ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionCommand = rCommand; } -void VCLXRadioButton::setState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXRadioButton::setState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1244,7 +1244,7 @@ void VCLXRadioButton::setState( sal_Bool b ) throw(::com::sun::star::uno::Runtim } } -sal_Bool VCLXRadioButton::getState() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXRadioButton::getState() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1252,7 +1252,7 @@ sal_Bool VCLXRadioButton::getState() throw(::com::sun::star::uno::RuntimeExcepti return pRadioButton && pRadioButton->IsChecked(); } -::com::sun::star::awt::Size VCLXRadioButton::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXRadioButton::getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1263,12 +1263,12 @@ sal_Bool VCLXRadioButton::getState() throw(::com::sun::star::uno::RuntimeExcepti return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXRadioButton::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXRadioButton::getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) { return getMinimumSize(); } -::com::sun::star::awt::Size VCLXRadioButton::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXRadioButton::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1287,7 +1287,7 @@ sal_Bool VCLXRadioButton::getState() throw(::com::sun::star::uno::RuntimeExcepti void VCLXRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this ); + css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed // in during the listener call. To prevent the resulting crashs, we keep us // alive as long as we're here @@ -1297,7 +1297,7 @@ void VCLXRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent case VCLEVENT_BUTTON_CLICK: if ( !IsSynthesizingVCLEvent() && maActionListeners.getLength() ) { - ::com::sun::star::awt::ActionEvent aEvent; + css::awt::ActionEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.ActionCommand = maActionCommand; maActionListeners.actionPerformed( aEvent ); @@ -1322,7 +1322,7 @@ void VCLXRadioButton::ImplClickedOrToggled( bool bToggled ) VclPtr< RadioButton > pRadioButton = GetAs< RadioButton >(); if ( pRadioButton && ( pRadioButton->IsRadioCheckEnabled() == bToggled ) && ( bToggled || pRadioButton->IsStateChanged() ) && maItemListeners.getLength() ) { - ::com::sun::star::awt::ItemEvent aEvent; + css::awt::ItemEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.Highlighted = 0; aEvent.Selected = pRadioButton->IsChecked() ? 1 : 0; @@ -1345,33 +1345,33 @@ VCLXSpinField::VCLXSpinField() : maSpinListeners( *this ) { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXSpinField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXSpinField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XSpinField* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XSpinField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXEdit::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXSpinField ) - cppu::UnoType<com::sun::star::awt::XSpinField>::get(), + cppu::UnoType<css::awt::XSpinField>::get(), VCLXEdit::getTypes() IMPL_XTYPEPROVIDER_END -void VCLXSpinField::addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXSpinField::addSpinListener( const css::uno::Reference< css::awt::XSpinListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maSpinListeners.addInterface( l ); } -void VCLXSpinField::removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXSpinField::removeSpinListener( const css::uno::Reference< css::awt::XSpinListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maSpinListeners.removeInterface( l ); } -void VCLXSpinField::up() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXSpinField::up() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1380,7 +1380,7 @@ void VCLXSpinField::up() throw(::com::sun::star::uno::RuntimeException, std::exc pSpinField->Up(); } -void VCLXSpinField::down() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXSpinField::down() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1389,7 +1389,7 @@ void VCLXSpinField::down() throw(::com::sun::star::uno::RuntimeException, std::e pSpinField->Down(); } -void VCLXSpinField::first() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXSpinField::first() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1398,7 +1398,7 @@ void VCLXSpinField::first() throw(::com::sun::star::uno::RuntimeException, std:: pSpinField->First(); } -void VCLXSpinField::last() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXSpinField::last() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1407,7 +1407,7 @@ void VCLXSpinField::last() throw(::com::sun::star::uno::RuntimeException, std::e pSpinField->Last(); } -void VCLXSpinField::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXSpinField::enableRepeat( sal_Bool bRepeat ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1432,14 +1432,14 @@ void VCLXSpinField::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) case VCLEVENT_SPINFIELD_FIRST: case VCLEVENT_SPINFIELD_LAST: { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this ); + css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed // in during the listener call. To prevent the resulting crashs, we keep us // alive as long as we're here if ( maSpinListeners.getLength() ) { - ::com::sun::star::awt::SpinEvent aEvent; + css::awt::SpinEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); switch ( rVclWindowEvent.GetId() ) { @@ -1505,42 +1505,42 @@ VCLXListBox::VCLXListBox() { } -void VCLXListBox::dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::dispose() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::lang::EventObject aObj; + css::lang::EventObject aObj; aObj.Source = static_cast<cppu::OWeakObject*>(this); maItemListeners.disposeAndClear( aObj ); maActionListeners.disposeAndClear( aObj ); VCLXWindow::dispose(); } -void VCLXListBox::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maItemListeners.addInterface( l ); } -void VCLXListBox::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maItemListeners.removeInterface( l ); } -void VCLXListBox::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.addInterface( l ); } -void VCLXListBox::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.removeInterface( l ); } -void VCLXListBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< ListBox > pBox = GetAs< ListBox >(); @@ -1548,7 +1548,7 @@ void VCLXListBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com:: pBox->InsertEntry( aItem, nPos ); } -void VCLXListBox::addItems( const ::com::sun::star::uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::addItems( const css::uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< ListBox > pBox = GetAs< ListBox >(); @@ -1571,7 +1571,7 @@ void VCLXListBox::addItems( const ::com::sun::star::uno::Sequence< OUString>& aI } } -void VCLXListBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< ListBox > pBox = GetAs< ListBox >(); @@ -1582,7 +1582,7 @@ void VCLXListBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::s } } -sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXListBox::getItemCount() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1590,7 +1590,7 @@ sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcept return pBox ? pBox->GetEntryCount() : 0; } -OUString VCLXListBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXListBox::getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1601,16 +1601,16 @@ OUString VCLXListBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::Run return aItem; } -::com::sun::star::uno::Sequence< OUString> VCLXListBox::getItems() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString> VCLXListBox::getItems() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Sequence< OUString> aSeq; + css::uno::Sequence< OUString> aSeq; VclPtr< ListBox > pBox = GetAs< ListBox >(); if ( pBox ) { auto n = pBox->GetEntryCount(); - aSeq = ::com::sun::star::uno::Sequence< OUString>( n ); + aSeq = css::uno::Sequence< OUString>( n ); while (n) { --n; @@ -1620,30 +1620,30 @@ OUString VCLXListBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::Run return aSeq; } -sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXListBox::getSelectedItemPos() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< ListBox > pBox = GetAs< ListBox >(); return pBox ? pBox->GetSelectEntryPos() : 0; } -::com::sun::star::uno::Sequence<sal_Int16> VCLXListBox::getSelectedItemsPos() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence<sal_Int16> VCLXListBox::getSelectedItemsPos() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Sequence<sal_Int16> aSeq; + css::uno::Sequence<sal_Int16> aSeq; VclPtr< ListBox > pBox = GetAs< ListBox >(); if ( pBox ) { const sal_Int32 nSelEntries = pBox->GetSelectEntryCount(); - aSeq = ::com::sun::star::uno::Sequence<sal_Int16>( nSelEntries ); + aSeq = css::uno::Sequence<sal_Int16>( nSelEntries ); for ( sal_Int32 n = 0; n < nSelEntries; ++n ) aSeq.getArray()[n] = pBox->GetSelectEntryPos( n ); } return aSeq; } -OUString VCLXListBox::getSelectedItem() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXListBox::getSelectedItem() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1654,23 +1654,23 @@ OUString VCLXListBox::getSelectedItem() throw(::com::sun::star::uno::RuntimeExce return aItem; } -::com::sun::star::uno::Sequence< OUString> VCLXListBox::getSelectedItems() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString> VCLXListBox::getSelectedItems() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Sequence< OUString> aSeq; + css::uno::Sequence< OUString> aSeq; VclPtr< ListBox > pBox = GetAs< ListBox >(); if ( pBox ) { const sal_Int32 nSelEntries = pBox->GetSelectEntryCount(); - aSeq = ::com::sun::star::uno::Sequence< OUString>( nSelEntries ); + aSeq = css::uno::Sequence< OUString>( nSelEntries ); for ( sal_Int32 n = 0; n < nSelEntries; ++n ) aSeq.getArray()[n] = pBox->GetSelectEntry( n ); } return aSeq; } -void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1689,7 +1689,7 @@ void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com: } } -void VCLXListBox::selectItemsPos( const ::com::sun::star::uno::Sequence<sal_Int16>& aPositions, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::selectItemsPos( const css::uno::Sequence<sal_Int16>& aPositions, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1720,7 +1720,7 @@ void VCLXListBox::selectItemsPos( const ::com::sun::star::uno::Sequence<sal_Int1 } } -void VCLXListBox::selectItem( const OUString& rItemText, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::selectItem( const OUString& rItemText, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1732,7 +1732,7 @@ void VCLXListBox::selectItem( const OUString& rItemText, sal_Bool bSelect ) thro } } -void VCLXListBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< ListBox > pBox = GetAs< ListBox >(); @@ -1740,7 +1740,7 @@ void VCLXListBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::sta pBox->SetDropDownLineCount( nLines ); } -sal_Int16 VCLXListBox::getDropDownLineCount() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXListBox::getDropDownLineCount() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1751,7 +1751,7 @@ sal_Int16 VCLXListBox::getDropDownLineCount() throw(::com::sun::star::uno::Runti return nLines; } -sal_Bool VCLXListBox::isMutipleMode() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXListBox::isMutipleMode() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bMulti = false; @@ -1761,7 +1761,7 @@ sal_Bool VCLXListBox::isMutipleMode() throw(::com::sun::star::uno::RuntimeExcept return bMulti; } -void VCLXListBox::setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::setMultipleMode( sal_Bool bMulti ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< ListBox > pBox = GetAs< ListBox >(); @@ -1769,7 +1769,7 @@ void VCLXListBox::setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno pBox->EnableMultiSelection( bMulti ); } -void VCLXListBox::makeVisible( sal_Int16 nEntry ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::makeVisible( sal_Int16 nEntry ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< ListBox > pBox = GetAs< ListBox >(); @@ -1779,7 +1779,7 @@ void VCLXListBox::makeVisible( sal_Int16 nEntry ) throw(::com::sun::star::uno::R void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this ); + css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed // in during the listener call. To prevent the resulting crashs, we keep us // alive as long as we're here @@ -1795,7 +1795,7 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) if ( bDropDown && !IsSynthesizingVCLEvent() && maActionListeners.getLength() ) { // Call ActionListener on DropDown event - ::com::sun::star::awt::ActionEvent aEvent; + css::awt::ActionEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.ActionCommand = pListBox->GetSelectEntry(); maActionListeners.actionPerformed( aEvent ); @@ -1812,7 +1812,7 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) case VCLEVENT_LISTBOX_DOUBLECLICK: if ( GetWindow() && maActionListeners.getLength() ) { - ::com::sun::star::awt::ActionEvent aEvent; + css::awt::ActionEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.ActionCommand = GetAs<ListBox>()->GetSelectEntry(); maActionListeners.actionPerformed( aEvent ); @@ -1825,14 +1825,14 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXListBox::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXListBox::CreateAccessibleContext() { SolarMutexGuard aGuard; return getAccessibleFactory().createAccessibleContext( this ); } -void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< ListBox > pListBox = GetAs< ListBox >(); @@ -1874,7 +1874,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s break; case BASEPROPERTY_STRINGITEMLIST: { - ::com::sun::star::uno::Sequence< OUString> aItems; + css::uno::Sequence< OUString> aItems; if ( Value >>= aItems ) { pListBox->Clear(); @@ -1884,7 +1884,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s break; case BASEPROPERTY_SELECTEDITEMS: { - ::com::sun::star::uno::Sequence<sal_Int16> aItems; + css::uno::Sequence<sal_Int16> aItems; if ( Value >>= aItems ) { for ( auto n = pListBox->GetEntryCount(); n; ) @@ -1908,10 +1908,10 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s } } -::com::sun::star::uno::Any VCLXListBox::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXListBox::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; VclPtr< ListBox > pListBox = GetAs< ListBox >(); if ( pListBox ) { @@ -1944,7 +1944,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s case BASEPROPERTY_STRINGITEMLIST: { const sal_Int32 nItems = pListBox->GetEntryCount(); - ::com::sun::star::uno::Sequence< OUString> aSeq( nItems ); + css::uno::Sequence< OUString> aSeq( nItems ); OUString* pStrings = aSeq.getArray(); for ( sal_Int32 n = 0; n < nItems; ++n ) pStrings[n] = pListBox->GetEntry( n ); @@ -1961,7 +1961,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s return aProp; } -::com::sun::star::awt::Size VCLXListBox::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXListBox::getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Size aSz; @@ -1971,7 +1971,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXListBox::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXListBox::getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Size aSz; @@ -1985,7 +1985,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXListBox::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXListBox::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Size aSz = VCLSize(rNewSize); @@ -1995,7 +1995,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXListBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXListBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Size aSz; @@ -2005,7 +2005,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s return AWTSize(aSz); } -void VCLXListBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXListBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; nCols = nLines = 0; @@ -2024,7 +2024,7 @@ void VCLXListBox::ImplCallItemListeners() VclPtr< ListBox > pListBox = GetAs< ListBox >(); if ( pListBox && maItemListeners.getLength() ) { - ::com::sun::star::awt::ItemEvent aEvent; + css::awt::ItemEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.Highlighted = 0; @@ -2170,21 +2170,21 @@ VCLXMessageBox::~VCLXMessageBox() { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXMessageBox::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXMessageBox::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XMessageBox* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XMessageBox* >(this)) ); return (aRet.hasValue() ? aRet : VCLXTopWindow::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXMessageBox ) - cppu::UnoType<com::sun::star::awt::XMessageBox>::get(), + cppu::UnoType<css::awt::XMessageBox>::get(), VCLXTopWindow::getTypes() IMPL_XTYPEPROVIDER_END -void VCLXMessageBox::setCaptionText( const OUString& rText ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXMessageBox::setCaptionText( const OUString& rText ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2193,7 +2193,7 @@ void VCLXMessageBox::setCaptionText( const OUString& rText ) throw(::com::sun::s pWindow->SetText( rText ); } -OUString VCLXMessageBox::getCaptionText() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXMessageBox::getCaptionText() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2204,7 +2204,7 @@ OUString VCLXMessageBox::getCaptionText() throw(::com::sun::star::uno::RuntimeEx return aText; } -void VCLXMessageBox::setMessageText( const OUString& rText ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXMessageBox::setMessageText( const OUString& rText ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< MessBox > pBox = GetAs< MessBox >(); @@ -2212,7 +2212,7 @@ void VCLXMessageBox::setMessageText( const OUString& rText ) throw(::com::sun::s pBox->SetMessText( rText ); } -OUString VCLXMessageBox::getMessageText() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXMessageBox::getMessageText() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aText; @@ -2222,17 +2222,17 @@ OUString VCLXMessageBox::getMessageText() throw(::com::sun::star::uno::RuntimeEx return aText; } -sal_Int16 VCLXMessageBox::execute() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXMessageBox::execute() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< MessBox > pBox = GetAs< MessBox >(); return pBox ? pBox->Execute() : 0; } -::com::sun::star::awt::Size SAL_CALL VCLXMessageBox::getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size SAL_CALL VCLXMessageBox::getMinimumSize() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return ::com::sun::star::awt::Size( 250, 100 ); + return css::awt::Size( 250, 100 ); } @@ -2253,19 +2253,19 @@ VCLXDialog::~VCLXDialog() OSL_TRACE ("%s", __FUNCTION__); } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXDialog::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXDialog::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XDialog2* >(this)), - (static_cast< ::com::sun::star::awt::XDialog* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XDialog2* >(this)), + (static_cast< css::awt::XDialog* >(this)) ); return (aRet.hasValue() ? aRet : VCLXTopWindow::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXDialog ) - cppu::UnoType<com::sun::star::awt::XDialog2>::get(), - cppu::UnoType<com::sun::star::awt::XDialog>::get(), + cppu::UnoType<css::awt::XDialog2>::get(), + cppu::UnoType<css::awt::XDialog>::get(), VCLXTopWindow::getTypes() IMPL_XTYPEPROVIDER_END @@ -2285,7 +2285,7 @@ void SAL_CALL VCLXDialog::setHelpId( const OUString& rId ) throw (RuntimeExcepti pWindow->SetHelpId( OUStringToOString( rId, RTL_TEXTENCODING_UTF8 ) ); } -void VCLXDialog::setTitle( const OUString& Title ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXDialog::setTitle( const OUString& Title ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< vcl::Window > pWindow = GetWindow(); @@ -2293,7 +2293,7 @@ void VCLXDialog::setTitle( const OUString& Title ) throw(::com::sun::star::uno:: pWindow->SetText( Title ); } -OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXDialog::getTitle() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2304,7 +2304,7 @@ OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException, s return aTitle; } -sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXDialog::execute() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2336,12 +2336,12 @@ sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException, s return nRet; } -void VCLXDialog::endExecute() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXDialog::endExecute() throw(css::uno::RuntimeException, std::exception) { endDialog(0); } -void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< vcl::Window > pWindow = GetWindow(); @@ -2358,9 +2358,9 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::s } } -::com::sun::star::awt::DeviceInfo VCLXDialog::getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::DeviceInfo VCLXDialog::getInfo() throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); + css::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); SolarMutexGuard aGuard; VclPtr< Dialog > pDlg = GetAs< Dialog >(); @@ -2372,14 +2372,14 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::s void SAL_CALL VCLXDialog::setProperty( const OUString& PropertyName, - const ::com::sun::star::uno::Any& Value ) -throw(::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Any& Value ) +throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< Dialog > pDialog = GetAs< Dialog >(); if ( pDialog ) { - bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; + bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -2449,31 +2449,31 @@ void VCLXMultiPage::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) VCLXMultiPage::~VCLXMultiPage() { } -void SAL_CALL VCLXMultiPage::dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL VCLXMultiPage::dispose() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::lang::EventObject aObj; + css::lang::EventObject aObj; aObj.Source = static_cast<cppu::OWeakObject*>(this); maTabListeners.disposeAndClear( aObj ); VCLXContainer::dispose(); } -::com::sun::star::uno::Any SAL_CALL VCLXMultiPage::queryInterface(const ::com::sun::star::uno::Type & rType ) -throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL VCLXMultiPage::queryInterface(const css::uno::Type & rType ) +throw(css::uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, static_cast< awt::XSimpleTabController*>( this ) ); return ( aRet.hasValue() ? aRet : VCLXContainer::queryInterface( rType ) ); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXMultiPage ) VCLXContainer::getTypes() IMPL_XTYPEPROVIDER_END -// ::com::sun::star::awt::XView +// css::awt::XView void SAL_CALL VCLXMultiPage::draw( sal_Int32 nX, sal_Int32 nY ) -throw(::com::sun::star::uno::RuntimeException, std::exception) +throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< vcl::Window > pWindow = GetWindow(); @@ -2491,21 +2491,21 @@ throw(::com::sun::star::uno::RuntimeException, std::exception) } } -// ::com::sun::star::awt::XDevice, -::com::sun::star::awt::DeviceInfo SAL_CALL VCLXMultiPage::getInfo() -throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XDevice, +css::awt::DeviceInfo SAL_CALL VCLXMultiPage::getInfo() +throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); + css::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); return aInfo; } -uno::Any SAL_CALL VCLXMultiPage::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +uno::Any SAL_CALL VCLXMultiPage::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OSL_TRACE(" **** VCLXMultiPage::getProperty( %s )", OUStringToOString( PropertyName, RTL_TEXTENCODING_UTF8 ).getStr() ); - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) { @@ -2523,8 +2523,8 @@ uno::Any SAL_CALL VCLXMultiPage::getProperty( const OUString& PropertyName ) thr void SAL_CALL VCLXMultiPage::setProperty( const OUString& PropertyName, - const ::com::sun::star::uno::Any& Value ) -throw(::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Any& Value ) +throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OSL_TRACE(" **** VCLXMultiPage::setProperty( %s )", OUStringToOString( PropertyName, RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -2532,7 +2532,7 @@ throw(::com::sun::star::uno::RuntimeException, std::exception) VclPtr< TabControl > pTabControl = GetAs< TabControl >(); if ( pTabControl ) { - bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; + bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -2677,7 +2677,7 @@ uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int3 } void VCLXMultiPage::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this ); + css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); switch ( rVclWindowEvent.GetId() ) { case VCLEVENT_TABPAGE_DEACTIVATE: @@ -2731,20 +2731,20 @@ VCLXTabPage::~VCLXTabPage() { } -::com::sun::star::uno::Any SAL_CALL VCLXTabPage::queryInterface(const ::com::sun::star::uno::Type & rType ) -throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL VCLXTabPage::queryInterface(const css::uno::Type & rType ) +throw(css::uno::RuntimeException, std::exception) { return VCLXContainer::queryInterface( rType ); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXTabPage ) VCLXContainer::getTypes() IMPL_XTYPEPROVIDER_END -// ::com::sun::star::awt::XView +// css::awt::XView void SAL_CALL VCLXTabPage::draw( sal_Int32 nX, sal_Int32 nY ) -throw(::com::sun::star::uno::RuntimeException, std::exception) +throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< vcl::Window > pWindow = GetWindow(); @@ -2762,24 +2762,24 @@ throw(::com::sun::star::uno::RuntimeException, std::exception) } } -// ::com::sun::star::awt::XDevice, -::com::sun::star::awt::DeviceInfo SAL_CALL VCLXTabPage::getInfo() -throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XDevice, +css::awt::DeviceInfo SAL_CALL VCLXTabPage::getInfo() +throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); + css::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); return aInfo; } void SAL_CALL VCLXTabPage::setProperty( const OUString& PropertyName, - const ::com::sun::star::uno::Any& Value ) -throw(::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Any& Value ) +throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< TabPage > pTabPage = GetAs< TabPage >(); if ( pTabPage ) { - bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; + bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -2847,27 +2847,27 @@ VCLXFixedHyperlink::~VCLXFixedHyperlink() { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXFixedHyperlink::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXFixedHyperlink::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XFixedHyperlink* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XFixedHyperlink* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } -void VCLXFixedHyperlink::dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXFixedHyperlink::dispose() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::lang::EventObject aObj; + css::lang::EventObject aObj; aObj.Source = static_cast<cppu::OWeakObject*>(this); maActionListeners.disposeAndClear( aObj ); VCLXWindow::dispose(); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXFixedHyperlink ) - cppu::UnoType<com::sun::star::awt::XFixedHyperlink>::get(), + cppu::UnoType<css::awt::XFixedHyperlink>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END @@ -2879,7 +2879,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve { if ( maActionListeners.getLength() ) { - ::com::sun::star::awt::ActionEvent aEvent; + css::awt::ActionEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); maActionListeners.actionPerformed( aEvent ); } @@ -2890,7 +2890,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve VclPtr< FixedHyperlink > pBase = GetAs< FixedHyperlink >(); if ( pBase ) sURL = pBase->GetURL(); - Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute( ::com::sun::star::system::SystemShellExecute::create( + Reference< css::system::XSystemShellExecute > xSystemShellExecute( css::system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) ); if ( !sURL.isEmpty() ) { @@ -2898,7 +2898,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve { // start browser xSystemShellExecute->execute( - sURL, OUString(), ::com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + sURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); } catch( uno::Exception& ) { @@ -2913,12 +2913,12 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve } } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXFixedHyperlink::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXFixedHyperlink::CreateAccessibleContext() { return getAccessibleFactory().createAccessibleContext( this ); } -void VCLXFixedHyperlink::setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXFixedHyperlink::setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< FixedHyperlink > pBase = GetAs< FixedHyperlink >(); @@ -2926,7 +2926,7 @@ void VCLXFixedHyperlink::setText( const OUString& Text ) throw(::com::sun::star: pBase->SetText(Text); } -OUString VCLXFixedHyperlink::getText() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXFixedHyperlink::getText() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2937,7 +2937,7 @@ OUString VCLXFixedHyperlink::getText() throw(::com::sun::star::uno::RuntimeExcep return aText; } -void VCLXFixedHyperlink::setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXFixedHyperlink::setURL( const OUString& URL ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< FixedHyperlink > pBase = GetAs< FixedHyperlink >(); @@ -2945,7 +2945,7 @@ void VCLXFixedHyperlink::setURL( const OUString& URL ) throw(::com::sun::star::u pBase->SetURL( URL ); } -OUString VCLXFixedHyperlink::getURL( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXFixedHyperlink::getURL( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2956,7 +2956,7 @@ OUString VCLXFixedHyperlink::getURL( ) throw(::com::sun::star::uno::RuntimeExce return aText; } -void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2964,9 +2964,9 @@ void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(::com::sun::star::un if ( pWindow ) { WinBits nNewBits = 0; - if ( nAlign == ::com::sun::star::awt::TextAlign::LEFT ) + if ( nAlign == css::awt::TextAlign::LEFT ) nNewBits = WB_LEFT; - else if ( nAlign == ::com::sun::star::awt::TextAlign::CENTER ) + else if ( nAlign == css::awt::TextAlign::CENTER ) nNewBits = WB_CENTER; else nNewBits = WB_RIGHT; @@ -2977,7 +2977,7 @@ void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(::com::sun::star::un } } -short VCLXFixedHyperlink::getAlignment() throw(::com::sun::star::uno::RuntimeException, std::exception) +short VCLXFixedHyperlink::getAlignment() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2987,28 +2987,28 @@ short VCLXFixedHyperlink::getAlignment() throw(::com::sun::star::uno::RuntimeExc { WinBits nStyle = pWindow->GetStyle(); if ( nStyle & WB_LEFT ) - nAlign = ::com::sun::star::awt::TextAlign::LEFT; + nAlign = css::awt::TextAlign::LEFT; else if ( nStyle & WB_CENTER ) - nAlign = ::com::sun::star::awt::TextAlign::CENTER; + nAlign = css::awt::TextAlign::CENTER; else - nAlign = ::com::sun::star::awt::TextAlign::RIGHT; + nAlign = css::awt::TextAlign::RIGHT; } return nAlign; } -void VCLXFixedHyperlink::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l )throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXFixedHyperlink::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l )throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.addInterface( l ); } -void VCLXFixedHyperlink::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXFixedHyperlink::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.removeInterface( l ); } -::com::sun::star::awt::Size VCLXFixedHyperlink::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXFixedHyperlink::getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Size aSz; @@ -3018,24 +3018,24 @@ void VCLXFixedHyperlink::removeActionListener( const ::com::sun::star::uno::Refe return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXFixedHyperlink::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXFixedHyperlink::getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) { return getMinimumSize(); } -::com::sun::star::awt::Size VCLXFixedHyperlink::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXFixedHyperlink::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::awt::Size aSz = rNewSize; - ::com::sun::star::awt::Size aMinSz = getMinimumSize(); + css::awt::Size aSz = rNewSize; + css::awt::Size aMinSz = getMinimumSize(); if ( aSz.Height != aMinSz.Height ) aSz.Height = aMinSz.Height; return aSz; } -void VCLXFixedHyperlink::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXFixedHyperlink::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3069,11 +3069,11 @@ void VCLXFixedHyperlink::setProperty( const OUString& PropertyName, const ::com: } } -::com::sun::star::uno::Any VCLXFixedHyperlink::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXFixedHyperlink::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; VclPtr< FixedHyperlink > pBase = GetAs< FixedHyperlink >(); if ( pBase ) { @@ -3158,26 +3158,26 @@ VCLXFixedText::~VCLXFixedText() { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXFixedText::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXFixedText::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XFixedText* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XFixedText* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXFixedText ) - cppu::UnoType<com::sun::star::awt::XFixedText>::get(), + cppu::UnoType<css::awt::XFixedText>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXFixedText::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXFixedText::CreateAccessibleContext() { return getAccessibleFactory().createAccessibleContext( this ); } -void VCLXFixedText::setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXFixedText::setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3186,7 +3186,7 @@ void VCLXFixedText::setText( const OUString& Text ) throw(::com::sun::star::uno: pWindow->SetText( Text ); } -OUString VCLXFixedText::getText() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXFixedText::getText() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3197,7 +3197,7 @@ OUString VCLXFixedText::getText() throw(::com::sun::star::uno::RuntimeException, return aText; } -void VCLXFixedText::setAlignment( short nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXFixedText::setAlignment( short nAlign ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3205,9 +3205,9 @@ void VCLXFixedText::setAlignment( short nAlign ) throw(::com::sun::star::uno::Ru if ( pWindow ) { WinBits nNewBits = 0; - if ( nAlign == ::com::sun::star::awt::TextAlign::LEFT ) + if ( nAlign == css::awt::TextAlign::LEFT ) nNewBits = WB_LEFT; - else if ( nAlign == ::com::sun::star::awt::TextAlign::CENTER ) + else if ( nAlign == css::awt::TextAlign::CENTER ) nNewBits = WB_CENTER; else nNewBits = WB_RIGHT; @@ -3218,7 +3218,7 @@ void VCLXFixedText::setAlignment( short nAlign ) throw(::com::sun::star::uno::Ru } } -short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeException, std::exception) +short VCLXFixedText::getAlignment() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3228,16 +3228,16 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio { WinBits nStyle = pWindow->GetStyle(); if ( nStyle & WB_LEFT ) - nAlign = ::com::sun::star::awt::TextAlign::LEFT; + nAlign = css::awt::TextAlign::LEFT; else if ( nStyle & WB_CENTER ) - nAlign = ::com::sun::star::awt::TextAlign::CENTER; + nAlign = css::awt::TextAlign::CENTER; else - nAlign = ::com::sun::star::awt::TextAlign::RIGHT; + nAlign = css::awt::TextAlign::RIGHT; } return nAlign; } -::com::sun::star::awt::Size VCLXFixedText::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXFixedText::getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3248,12 +3248,12 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXFixedText::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXFixedText::getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) { return getMinimumSize(); } -::com::sun::star::awt::Size VCLXFixedText::calcAdjustedSize( const ::com::sun::star::awt::Size& rMaxSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXFixedText::calcAdjustedSize( const css::awt::Size& rMaxSize ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3300,50 +3300,50 @@ VCLXScrollBar::VCLXScrollBar() : maAdjustmentListeners( *this ) { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXScrollBar::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXScrollBar::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XScrollBar* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XScrollBar* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXScrollBar ) - cppu::UnoType<com::sun::star::awt::XScrollBar>::get(), + cppu::UnoType<css::awt::XScrollBar>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXScrollBar::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXScrollBar::CreateAccessibleContext() { return getAccessibleFactory().createAccessibleContext( this ); } -// ::com::sun::star::lang::XComponent -void VCLXScrollBar::dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::lang::XComponent +void VCLXScrollBar::dispose() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::lang::EventObject aObj; + css::lang::EventObject aObj; aObj.Source = static_cast<cppu::OWeakObject*>(this); maAdjustmentListeners.disposeAndClear( aObj ); VCLXWindow::dispose(); } -// ::com::sun::star::awt::XScrollbar -void VCLXScrollBar::addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XScrollbar +void VCLXScrollBar::addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maAdjustmentListeners.addInterface( l ); } -void VCLXScrollBar::removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXScrollBar::removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maAdjustmentListeners.removeInterface( l ); } -void VCLXScrollBar::setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXScrollBar::setValue( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3352,7 +3352,7 @@ void VCLXScrollBar::setValue( sal_Int32 n ) throw(::com::sun::star::uno::Runtime pScrollBar->DoScroll( n ); } -void VCLXScrollBar::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXScrollBar::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3365,7 +3365,7 @@ void VCLXScrollBar::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 n } } -sal_Int32 VCLXScrollBar::getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 VCLXScrollBar::getValue() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3373,7 +3373,7 @@ sal_Int32 VCLXScrollBar::getValue() throw(::com::sun::star::uno::RuntimeExceptio return pScrollBar ? pScrollBar->GetThumbPos() : 0; } -void VCLXScrollBar::setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXScrollBar::setMaximum( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3382,7 +3382,7 @@ void VCLXScrollBar::setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::Runti pScrollBar->SetRangeMax( n ); } -sal_Int32 VCLXScrollBar::getMaximum() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 VCLXScrollBar::getMaximum() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3390,7 +3390,7 @@ sal_Int32 VCLXScrollBar::getMaximum() throw(::com::sun::star::uno::RuntimeExcept return pScrollBar ? pScrollBar->GetRangeMax() : 0; } -void VCLXScrollBar::setMinimum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) +void VCLXScrollBar::setMinimum( sal_Int32 n ) throw(css::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3399,7 +3399,7 @@ void VCLXScrollBar::setMinimum( sal_Int32 n ) throw(::com::sun::star::uno::Runti pScrollBar->SetRangeMin( n ); } -sal_Int32 VCLXScrollBar::getMinimum() throw(::com::sun::star::uno::RuntimeException) +sal_Int32 VCLXScrollBar::getMinimum() throw(css::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3407,7 +3407,7 @@ sal_Int32 VCLXScrollBar::getMinimum() throw(::com::sun::star::uno::RuntimeExcept return pScrollBar ? pScrollBar->GetRangeMin() : 0; } -void VCLXScrollBar::setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXScrollBar::setLineIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3416,7 +3416,7 @@ void VCLXScrollBar::setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno: pScrollBar->SetLineSize( n ); } -sal_Int32 VCLXScrollBar::getLineIncrement() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 VCLXScrollBar::getLineIncrement() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3424,7 +3424,7 @@ sal_Int32 VCLXScrollBar::getLineIncrement() throw(::com::sun::star::uno::Runtime return pScrollBar ? pScrollBar->GetLineSize() : 0; } -void VCLXScrollBar::setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXScrollBar::setBlockIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3433,7 +3433,7 @@ void VCLXScrollBar::setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno pScrollBar->SetPageSize( n ); } -sal_Int32 VCLXScrollBar::getBlockIncrement() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 VCLXScrollBar::getBlockIncrement() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3441,7 +3441,7 @@ sal_Int32 VCLXScrollBar::getBlockIncrement() throw(::com::sun::star::uno::Runtim return pScrollBar ? pScrollBar->GetPageSize() : 0; } -void VCLXScrollBar::setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXScrollBar::setVisibleSize( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3450,7 +3450,7 @@ void VCLXScrollBar::setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::R pScrollBar->SetVisibleSize( n ); } -sal_Int32 VCLXScrollBar::getVisibleSize() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 VCLXScrollBar::getVisibleSize() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3458,7 +3458,7 @@ sal_Int32 VCLXScrollBar::getVisibleSize() throw(::com::sun::star::uno::RuntimeEx return pScrollBar ? pScrollBar->GetVisibleSize() : 0; } -void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3467,7 +3467,7 @@ void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::R { WinBits nStyle = pWindow->GetStyle(); nStyle &= ~(WB_HORZ|WB_VERT); - if ( n == ::com::sun::star::awt::ScrollBarOrientation::HORIZONTAL ) + if ( n == css::awt::ScrollBarOrientation::HORIZONTAL ) nStyle |= WB_HORZ; else nStyle |= WB_VERT; @@ -3477,7 +3477,7 @@ void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::R } } -sal_Int32 VCLXScrollBar::getOrientation() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 VCLXScrollBar::getOrientation() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3487,23 +3487,23 @@ sal_Int32 VCLXScrollBar::getOrientation() throw(::com::sun::star::uno::RuntimeEx { WinBits nStyle = pWindow->GetStyle(); if ( nStyle & WB_HORZ ) - n = ::com::sun::star::awt::ScrollBarOrientation::HORIZONTAL; + n = css::awt::ScrollBarOrientation::HORIZONTAL; else - n = ::com::sun::star::awt::ScrollBarOrientation::VERTICAL; + n = css::awt::ScrollBarOrientation::VERTICAL; } return n; } -// ::com::sun::star::awt::VclWindowPeer -void VCLXScrollBar::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::VclWindowPeer +void VCLXScrollBar::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< ScrollBar > pScrollBar = GetAs< ScrollBar >(); if ( pScrollBar ) { - bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; + bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -3611,11 +3611,11 @@ void VCLXScrollBar::setProperty( const OUString& PropertyName, const ::com::sun: } } -::com::sun::star::uno::Any VCLXScrollBar::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXScrollBar::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; VclPtr< ScrollBar > pScrollBar = GetAs< ScrollBar >(); if ( pScrollBar ) { @@ -3686,7 +3686,7 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { case VCLEVENT_SCROLLBAR_SCROLL: { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this ); + css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed // in during the listener call. To prevent the resulting crashs, we keep us // alive as long as we're here @@ -3697,7 +3697,7 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) if( pScrollBar ) { - ::com::sun::star::awt::AdjustmentEvent aEvent; + css::awt::AdjustmentEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.Value = pScrollBar->GetThumbPos(); @@ -3705,15 +3705,15 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) ScrollType aType = pScrollBar->GetType(); if ( aType == SCROLL_LINEUP || aType == SCROLL_LINEDOWN ) { - aEvent.Type = ::com::sun::star::awt::AdjustmentType_ADJUST_LINE; + aEvent.Type = css::awt::AdjustmentType_ADJUST_LINE; } else if ( aType == SCROLL_PAGEUP || aType == SCROLL_PAGEDOWN ) { - aEvent.Type = ::com::sun::star::awt::AdjustmentType_ADJUST_PAGE; + aEvent.Type = css::awt::AdjustmentType_ADJUST_PAGE; } else if ( aType == SCROLL_DRAG ) { - aEvent.Type = ::com::sun::star::awt::AdjustmentType_ADJUST_ABS; + aEvent.Type = css::awt::AdjustmentType_ADJUST_ABS; } maAdjustmentListeners.adjustmentValueChanged( aEvent ); @@ -3728,13 +3728,13 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -::com::sun::star::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( vcl::Window* p ) throw(::com::sun::star::uno::RuntimeException) +css::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( vcl::Window* p ) throw(css::uno::RuntimeException) { long n = p->GetSettings().GetStyleSettings().GetScrollBarSize(); - return ::com::sun::star::awt::Size( n, n ); + return css::awt::Size( n, n ); } -::com::sun::star::awt::Size SAL_CALL VCLXScrollBar::getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size SAL_CALL VCLXScrollBar::getMinimumSize() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return implGetMinimumSize( GetWindow() ); @@ -3784,52 +3784,52 @@ VCLXEdit::VCLXEdit() : maTextListeners( *this ) { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXEdit::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXEdit::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XTextComponent* >(this)), - (static_cast< ::com::sun::star::awt::XTextEditField* >(this)), - (static_cast< ::com::sun::star::awt::XTextLayoutConstrains* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XTextComponent* >(this)), + (static_cast< css::awt::XTextEditField* >(this)), + (static_cast< css::awt::XTextLayoutConstrains* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXEdit ) - cppu::UnoType<com::sun::star::awt::XTextComponent>::get(), - cppu::UnoType<com::sun::star::awt::XTextEditField>::get(), - cppu::UnoType<com::sun::star::awt::XTextLayoutConstrains>::get(), + cppu::UnoType<css::awt::XTextComponent>::get(), + cppu::UnoType<css::awt::XTextEditField>::get(), + cppu::UnoType<css::awt::XTextLayoutConstrains>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXEdit::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXEdit::CreateAccessibleContext() { return getAccessibleFactory().createAccessibleContext( this ); } -void VCLXEdit::dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXEdit::dispose() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::lang::EventObject aObj; + css::lang::EventObject aObj; aObj.Source = static_cast<cppu::OWeakObject*>(this); maTextListeners.disposeAndClear( aObj ); VCLXWindow::dispose(); } -void VCLXEdit::addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXEdit::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetTextListeners().addInterface( l ); } -void VCLXEdit::removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXEdit::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetTextListeners().removeInterface( l ); } -void VCLXEdit::setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXEdit::setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3846,7 +3846,7 @@ void VCLXEdit::setText( const OUString& aText ) throw(::com::sun::star::uno::Run } } -void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXEdit::insertText( const css::awt::Selection& rSel, const OUString& aText ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3864,7 +3864,7 @@ void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const O } } -OUString VCLXEdit::getText() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXEdit::getText() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3875,7 +3875,7 @@ OUString VCLXEdit::getText() throw(::com::sun::star::uno::RuntimeException, std: return aText; } -OUString VCLXEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXEdit::getSelectedText() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3887,7 +3887,7 @@ OUString VCLXEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeExcepti } -void VCLXEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXEdit::setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3896,7 +3896,7 @@ void VCLXEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection pEdit->SetSelection( Selection( aSelection.Min, aSelection.Max ) ); } -::com::sun::star::awt::Selection VCLXEdit::getSelection() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Selection VCLXEdit::getSelection() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3904,10 +3904,10 @@ void VCLXEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection VclPtr< Edit > pEdit = GetAs< Edit >(); if ( pEdit ) aSel = pEdit->GetSelection(); - return ::com::sun::star::awt::Selection( aSel.Min(), aSel.Max() ); + return css::awt::Selection( aSel.Min(), aSel.Max() ); } -sal_Bool VCLXEdit::isEditable() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXEdit::isEditable() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3915,7 +3915,7 @@ sal_Bool VCLXEdit::isEditable() throw(::com::sun::star::uno::RuntimeException, s return pEdit && !pEdit->IsReadOnly() && pEdit->IsEnabled(); } -void VCLXEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXEdit::setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3925,7 +3925,7 @@ void VCLXEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::Ru } -void VCLXEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXEdit::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3934,7 +3934,7 @@ void VCLXEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::Runt pEdit->SetMaxTextLen( nLen ); } -sal_Int16 VCLXEdit::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXEdit::getMaxTextLen() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3942,7 +3942,7 @@ sal_Int16 VCLXEdit::getMaxTextLen() throw(::com::sun::star::uno::RuntimeExceptio return pEdit ? pEdit->GetMaxTextLen() : 0; } -void VCLXEdit::setEchoChar( sal_Unicode cEcho ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXEdit::setEchoChar( sal_Unicode cEcho ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3951,7 +3951,7 @@ void VCLXEdit::setEchoChar( sal_Unicode cEcho ) throw(::com::sun::star::uno::Run pEdit->SetEchoChar( cEcho ); } -void VCLXEdit::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXEdit::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3996,11 +3996,11 @@ void VCLXEdit::setProperty( const OUString& PropertyName, const ::com::sun::star } } -::com::sun::star::uno::Any VCLXEdit::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXEdit::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; VclPtr< Edit > pEdit = GetAs< Edit >(); if ( pEdit ) { @@ -4028,7 +4028,7 @@ void VCLXEdit::setProperty( const OUString& PropertyName, const ::com::sun::star return aProp; } -::com::sun::star::awt::Size VCLXEdit::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXEdit::getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4039,7 +4039,7 @@ void VCLXEdit::setProperty( const OUString& PropertyName, const ::com::sun::star return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXEdit::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXEdit::getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4053,19 +4053,19 @@ void VCLXEdit::setProperty( const OUString& PropertyName, const ::com::sun::star return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXEdit::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXEdit::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::awt::Size aSz = rNewSize; - ::com::sun::star::awt::Size aMinSz = getMinimumSize(); + css::awt::Size aSz = rNewSize; + css::awt::Size aMinSz = getMinimumSize(); if ( aSz.Height != aMinSz.Height ) aSz.Height = aMinSz.Height; return aSz; } -::com::sun::star::awt::Size VCLXEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4081,7 +4081,7 @@ void VCLXEdit::setProperty( const OUString& PropertyName, const ::com::sun::star return AWTSize(aSz); } -void VCLXEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4098,14 +4098,14 @@ void VCLXEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { case VCLEVENT_EDIT_MODIFY: { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this ); + css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed // during the listener call. To prevent the resulting crashs, we keep us // alive as long as we're here if ( GetTextListeners().getLength() ) { - ::com::sun::star::awt::TextEvent aEvent; + css::awt::TextEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); GetTextListeners().textChanged( aEvent ); } @@ -4166,18 +4166,18 @@ VCLXComboBox::~VCLXComboBox() OSL_TRACE ("%s", __FUNCTION__); } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXComboBox::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXComboBox::CreateAccessibleContext() { SolarMutexGuard aGuard; return getAccessibleFactory().createAccessibleContext( this ); } -void VCLXComboBox::dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXComboBox::dispose() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::lang::EventObject aObj; + css::lang::EventObject aObj; aObj.Source = static_cast<cppu::OWeakObject*>(this); maItemListeners.disposeAndClear( aObj ); maActionListeners.disposeAndClear( aObj ); @@ -4185,31 +4185,31 @@ void VCLXComboBox::dispose() throw(::com::sun::star::uno::RuntimeException, std: } -void VCLXComboBox::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXComboBox::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maItemListeners.addInterface( l ); } -void VCLXComboBox::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXComboBox::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maItemListeners.removeInterface( l ); } -void VCLXComboBox::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXComboBox::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.addInterface( l ); } -void VCLXComboBox::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXComboBox::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maActionListeners.removeInterface( l ); } -void VCLXComboBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXComboBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4218,7 +4218,7 @@ void VCLXComboBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com: pBox->InsertEntry( aItem, nPos ); } -void VCLXComboBox::addItems( const ::com::sun::star::uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXComboBox::addItems( const css::uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4239,7 +4239,7 @@ void VCLXComboBox::addItems( const ::com::sun::star::uno::Sequence< OUString>& a } } -void VCLXComboBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXComboBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4251,7 +4251,7 @@ void VCLXComboBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com:: } } -sal_Int16 VCLXComboBox::getItemCount() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXComboBox::getItemCount() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4259,7 +4259,7 @@ sal_Int16 VCLXComboBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcep return pBox ? pBox->GetEntryCount() : 0; } -OUString VCLXComboBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXComboBox::getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4270,16 +4270,16 @@ OUString VCLXComboBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::Ru return aItem; } -::com::sun::star::uno::Sequence< OUString> VCLXComboBox::getItems() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString> VCLXComboBox::getItems() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Sequence< OUString> aSeq; + css::uno::Sequence< OUString> aSeq; VclPtr< ComboBox > pBox = GetAs< ComboBox >(); if ( pBox ) { auto n = pBox->GetEntryCount(); - aSeq = ::com::sun::star::uno::Sequence< OUString>( n ); + aSeq = css::uno::Sequence< OUString>( n ); while ( n ) { --n; @@ -4289,7 +4289,7 @@ OUString VCLXComboBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::Ru return aSeq; } -void VCLXComboBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXComboBox::setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4298,7 +4298,7 @@ void VCLXComboBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::st pBox->SetDropDownLineCount( nLines ); } -sal_Int16 VCLXComboBox::getDropDownLineCount() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXComboBox::getDropDownLineCount() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4309,7 +4309,7 @@ sal_Int16 VCLXComboBox::getDropDownLineCount() throw(::com::sun::star::uno::Runt return nLines; } -void VCLXComboBox::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXComboBox::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4341,7 +4341,7 @@ void VCLXComboBox::setProperty( const OUString& PropertyName, const ::com::sun:: break; case BASEPROPERTY_STRINGITEMLIST: { - ::com::sun::star::uno::Sequence< OUString> aItems; + css::uno::Sequence< OUString> aItems; if ( Value >>= aItems ) { pComboBox->Clear(); @@ -4365,11 +4365,11 @@ void VCLXComboBox::setProperty( const OUString& PropertyName, const ::com::sun:: } } -::com::sun::star::uno::Any VCLXComboBox::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXComboBox::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; VclPtr< ComboBox > pComboBox = GetAs< ComboBox >(); if ( pComboBox ) { @@ -4389,7 +4389,7 @@ void VCLXComboBox::setProperty( const OUString& PropertyName, const ::com::sun:: case BASEPROPERTY_STRINGITEMLIST: { const sal_Int32 nItems = pComboBox->GetEntryCount(); - ::com::sun::star::uno::Sequence< OUString> aSeq( nItems ); + css::uno::Sequence< OUString> aSeq( nItems ); OUString* pStrings = aSeq.getArray(); for ( sal_Int32 n = 0; n < nItems; ++n ) pStrings[n] = pComboBox->GetEntry( n ); @@ -4408,7 +4408,7 @@ void VCLXComboBox::setProperty( const OUString& PropertyName, const ::com::sun:: void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this ); + css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed // during the listener call. To prevent the resulting crashs, we keep us // alive as long as we're here @@ -4423,7 +4423,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( !pComboBox->IsTravelSelect() ) { - ::com::sun::star::awt::ItemEvent aEvent; + css::awt::ItemEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); aEvent.Highlighted = 0; @@ -4439,7 +4439,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) case VCLEVENT_COMBOBOX_DOUBLECLICK: if ( maActionListeners.getLength() ) { - ::com::sun::star::awt::ActionEvent aEvent; + css::awt::ActionEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); // aEvent.ActionCommand = ...; maActionListeners.actionPerformed( aEvent ); @@ -4452,7 +4452,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -::com::sun::star::awt::Size VCLXComboBox::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXComboBox::getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4463,7 +4463,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXComboBox::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXComboBox::getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4478,7 +4478,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXComboBox::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXComboBox::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4489,7 +4489,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) return AWTSize(aSz); } -::com::sun::star::awt::Size VCLXComboBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size VCLXComboBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4500,7 +4500,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) return AWTSize(aSz); } -void VCLXComboBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXComboBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4650,7 +4650,7 @@ bool VCLXFormattedSpinField::isStrictFormat() } -void VCLXFormattedSpinField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXFormattedSpinField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4689,11 +4689,11 @@ void VCLXFormattedSpinField::setProperty( const OUString& PropertyName, const :: } } -::com::sun::star::uno::Any VCLXFormattedSpinField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXFormattedSpinField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; FormatterBase* pFormatter = GetFormatter(); if ( pFormatter ) { @@ -4770,7 +4770,7 @@ VCLXDateField::~VCLXDateField() } //change the window type here to match the role -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXDateField::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXDateField::CreateAccessibleContext() { VclPtr< vcl::Window > pWindow = GetWindow(); if ( pWindow ) @@ -4780,27 +4780,27 @@ VCLXDateField::~VCLXDateField() return getAccessibleFactory().createAccessibleContext( this ); } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXDateField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXDateField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XDateField* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XDateField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXDateField ) - cppu::UnoType<com::sun::star::awt::XDateField>::get(), + cppu::UnoType<css::awt::XDateField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END -void VCLXDateField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXDateField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( GetWindow() ) { - bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; + bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -4863,11 +4863,11 @@ void VCLXDateField::setProperty( const OUString& PropertyName, const ::com::sun: } } -::com::sun::star::uno::Any VCLXDateField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXDateField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; FormatterBase* pFormatter = GetFormatter(); if ( pFormatter ) { @@ -4909,7 +4909,7 @@ void VCLXDateField::setProperty( const OUString& PropertyName, const ::com::sun: } -void VCLXDateField::setDate( const util::Date& aDate ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXDateField::setDate( const util::Date& aDate ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4926,7 +4926,7 @@ void VCLXDateField::setDate( const util::Date& aDate ) throw(::com::sun::star::u } } -util::Date VCLXDateField::getDate() throw(::com::sun::star::uno::RuntimeException, std::exception) +util::Date VCLXDateField::getDate() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4937,7 +4937,7 @@ util::Date VCLXDateField::getDate() throw(::com::sun::star::uno::RuntimeExceptio return util::Date(); } -void VCLXDateField::setMin( const util::Date& aDate ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXDateField::setMin( const util::Date& aDate ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4946,7 +4946,7 @@ void VCLXDateField::setMin( const util::Date& aDate ) throw(::com::sun::star::un pDateField->SetMin( aDate ); } -util::Date VCLXDateField::getMin() throw(::com::sun::star::uno::RuntimeException, std::exception) +util::Date VCLXDateField::getMin() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4957,7 +4957,7 @@ util::Date VCLXDateField::getMin() throw(::com::sun::star::uno::RuntimeException return util::Date(); } -void VCLXDateField::setMax( const util::Date& aDate ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXDateField::setMax( const util::Date& aDate ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4966,7 +4966,7 @@ void VCLXDateField::setMax( const util::Date& aDate ) throw(::com::sun::star::un pDateField->SetMax( aDate ); } -util::Date VCLXDateField::getMax() throw(::com::sun::star::uno::RuntimeException, std::exception) +util::Date VCLXDateField::getMax() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4977,7 +4977,7 @@ util::Date VCLXDateField::getMax() throw(::com::sun::star::uno::RuntimeException return util::Date(); } -void VCLXDateField::setFirst( const util::Date& aDate ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXDateField::setFirst( const util::Date& aDate ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4986,7 +4986,7 @@ void VCLXDateField::setFirst( const util::Date& aDate ) throw(::com::sun::star:: pDateField->SetFirst( aDate ); } -util::Date VCLXDateField::getFirst() throw(::com::sun::star::uno::RuntimeException, std::exception) +util::Date VCLXDateField::getFirst() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4997,7 +4997,7 @@ util::Date VCLXDateField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti return util::Date(); } -void VCLXDateField::setLast( const util::Date& aDate ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXDateField::setLast( const util::Date& aDate ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5006,7 +5006,7 @@ void VCLXDateField::setLast( const util::Date& aDate ) throw(::com::sun::star::u pDateField->SetLast( aDate ); } -util::Date VCLXDateField::getLast() throw(::com::sun::star::uno::RuntimeException, std::exception) +util::Date VCLXDateField::getLast() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5017,7 +5017,7 @@ util::Date VCLXDateField::getLast() throw(::com::sun::star::uno::RuntimeExceptio return util::Date(); } -void VCLXDateField::setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXDateField::setLongFormat( sal_Bool bLong ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5026,7 +5026,7 @@ void VCLXDateField::setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno: pDateField->SetLongFormat( bLong ); } -sal_Bool VCLXDateField::isLongFormat() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXDateField::isLongFormat() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5034,7 +5034,7 @@ sal_Bool VCLXDateField::isLongFormat() throw(::com::sun::star::uno::RuntimeExcep return pDateField && pDateField->IsLongFormat(); } -void VCLXDateField::setEmpty() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXDateField::setEmpty() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5051,7 +5051,7 @@ void VCLXDateField::setEmpty() throw(::com::sun::star::uno::RuntimeException, st } } -sal_Bool VCLXDateField::isEmpty() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXDateField::isEmpty() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5059,12 +5059,12 @@ sal_Bool VCLXDateField::isEmpty() throw(::com::sun::star::uno::RuntimeException, return pDateField && pDateField->IsEmptyDate(); } -void VCLXDateField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXDateField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) { VCLXFormattedSpinField::setStrictFormat( bStrict ); } -sal_Bool VCLXDateField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXDateField::isStrictFormat() throw(css::uno::RuntimeException, std::exception) { return VCLXFormattedSpinField::isStrictFormat(); } @@ -5118,7 +5118,7 @@ VCLXTimeField::~VCLXTimeField() } //change the window type here to match the role -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXTimeField::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXTimeField::CreateAccessibleContext() { VclPtr< vcl::Window > pWindow = GetWindow(); if ( pWindow ) @@ -5128,21 +5128,21 @@ VCLXTimeField::~VCLXTimeField() return getAccessibleFactory().createAccessibleContext( this ); } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXTimeField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXTimeField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XTimeField* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XTimeField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXTimeField ) - cppu::UnoType<com::sun::star::awt::XTimeField>::get(), + cppu::UnoType<css::awt::XTimeField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END -void VCLXTimeField::setTime( const util::Time& aTime ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTimeField::setTime( const util::Time& aTime ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5159,7 +5159,7 @@ void VCLXTimeField::setTime( const util::Time& aTime ) throw(::com::sun::star::u } } -util::Time VCLXTimeField::getTime() throw(::com::sun::star::uno::RuntimeException, std::exception) +util::Time VCLXTimeField::getTime() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5170,7 +5170,7 @@ util::Time VCLXTimeField::getTime() throw(::com::sun::star::uno::RuntimeExceptio return util::Time(); } -void VCLXTimeField::setMin( const util::Time& aTime ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTimeField::setMin( const util::Time& aTime ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5179,7 +5179,7 @@ void VCLXTimeField::setMin( const util::Time& aTime ) throw(::com::sun::star::un pTimeField->SetMin( aTime ); } -util::Time VCLXTimeField::getMin() throw(::com::sun::star::uno::RuntimeException, std::exception) +util::Time VCLXTimeField::getMin() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5190,7 +5190,7 @@ util::Time VCLXTimeField::getMin() throw(::com::sun::star::uno::RuntimeException return util::Time(); } -void VCLXTimeField::setMax( const util::Time& aTime ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTimeField::setMax( const util::Time& aTime ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5199,7 +5199,7 @@ void VCLXTimeField::setMax( const util::Time& aTime ) throw(::com::sun::star::un pTimeField->SetMax( aTime ); } -util::Time VCLXTimeField::getMax() throw(::com::sun::star::uno::RuntimeException, std::exception) +util::Time VCLXTimeField::getMax() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5210,7 +5210,7 @@ util::Time VCLXTimeField::getMax() throw(::com::sun::star::uno::RuntimeException return util::Time(); } -void VCLXTimeField::setFirst( const util::Time& aTime ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTimeField::setFirst( const util::Time& aTime ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5219,7 +5219,7 @@ void VCLXTimeField::setFirst( const util::Time& aTime ) throw(::com::sun::star:: pTimeField->SetFirst( aTime ); } -util::Time VCLXTimeField::getFirst() throw(::com::sun::star::uno::RuntimeException, std::exception) +util::Time VCLXTimeField::getFirst() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5230,7 +5230,7 @@ util::Time VCLXTimeField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti return util::Time(); } -void VCLXTimeField::setLast( const util::Time& aTime ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTimeField::setLast( const util::Time& aTime ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5239,7 +5239,7 @@ void VCLXTimeField::setLast( const util::Time& aTime ) throw(::com::sun::star::u pTimeField->SetLast( aTime ); } -util::Time VCLXTimeField::getLast() throw(::com::sun::star::uno::RuntimeException, std::exception) +util::Time VCLXTimeField::getLast() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5250,7 +5250,7 @@ util::Time VCLXTimeField::getLast() throw(::com::sun::star::uno::RuntimeExceptio return util::Time(); } -void VCLXTimeField::setEmpty() throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTimeField::setEmpty() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5259,7 +5259,7 @@ void VCLXTimeField::setEmpty() throw(::com::sun::star::uno::RuntimeException, st pTimeField->SetEmptyTime(); } -sal_Bool VCLXTimeField::isEmpty() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXTimeField::isEmpty() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5267,24 +5267,24 @@ sal_Bool VCLXTimeField::isEmpty() throw(::com::sun::star::uno::RuntimeException, return pTimeField && pTimeField->IsEmptyTime(); } -void VCLXTimeField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTimeField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) { VCLXFormattedSpinField::setStrictFormat( bStrict ); } -sal_Bool VCLXTimeField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXTimeField::isStrictFormat() throw(css::uno::RuntimeException, std::exception) { return VCLXFormattedSpinField::isStrictFormat(); } -void VCLXTimeField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXTimeField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( GetWindow() ) { - bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; + bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -5340,11 +5340,11 @@ void VCLXTimeField::setProperty( const OUString& PropertyName, const ::com::sun: } } -::com::sun::star::uno::Any VCLXTimeField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXTimeField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; if ( GetWindow() ) { sal_uInt16 nPropType = GetPropertyId( PropertyName ); @@ -5427,21 +5427,21 @@ VCLXNumericField::~VCLXNumericField() { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXNumericField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXNumericField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XNumericField* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XNumericField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXNumericField ) - cppu::UnoType<com::sun::star::awt::XNumericField>::get(), + cppu::UnoType<css::awt::XNumericField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END -void VCLXNumericField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXNumericField::setValue( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5466,7 +5466,7 @@ void VCLXNumericField::setValue( double Value ) throw(::com::sun::star::uno::Run } } -double VCLXNumericField::getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXNumericField::getValue() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5476,7 +5476,7 @@ double VCLXNumericField::getValue() throw(::com::sun::star::uno::RuntimeExceptio : 0; } -void VCLXNumericField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXNumericField::setMin( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5486,7 +5486,7 @@ void VCLXNumericField::setMin( double Value ) throw(::com::sun::star::uno::Runti (long)ImplCalcLongValue( Value, pNumericFormatter->GetDecimalDigits() ) ); } -double VCLXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXNumericField::getMin() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5496,7 +5496,7 @@ double VCLXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException, : 0; } -void VCLXNumericField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXNumericField::setMax( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5506,7 +5506,7 @@ void VCLXNumericField::setMax( double Value ) throw(::com::sun::star::uno::Runti (long)ImplCalcLongValue( Value, pNumericFormatter->GetDecimalDigits() ) ); } -double VCLXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXNumericField::getMax() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5516,7 +5516,7 @@ double VCLXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException, : 0; } -void VCLXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXNumericField::setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5526,7 +5526,7 @@ void VCLXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::Run (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) ); } -double VCLXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXNumericField::getFirst() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5536,7 +5536,7 @@ double VCLXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio : 0; } -void VCLXNumericField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXNumericField::setLast( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5546,7 +5546,7 @@ void VCLXNumericField::setLast( double Value ) throw(::com::sun::star::uno::Runt (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) ); } -double VCLXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXNumericField::getLast() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5556,18 +5556,18 @@ double VCLXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException : 0; } -void VCLXNumericField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXNumericField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) { VCLXFormattedSpinField::setStrictFormat( bStrict ); } -sal_Bool VCLXNumericField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXNumericField::isStrictFormat() throw(css::uno::RuntimeException, std::exception) { return VCLXFormattedSpinField::isStrictFormat(); } -void VCLXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXNumericField::setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5577,7 +5577,7 @@ void VCLXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno:: (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) ); } -double VCLXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXNumericField::getSpinSize() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5587,7 +5587,7 @@ double VCLXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeExcep : 0; } -void VCLXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXNumericField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5600,7 +5600,7 @@ void VCLXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::sta } } -sal_Int16 VCLXNumericField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXNumericField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5608,13 +5608,13 @@ sal_Int16 VCLXNumericField::getDecimalDigits() throw(::com::sun::star::uno::Runt return pNumericFormatter ? pNumericFormatter->GetDecimalDigits() : 0; } -void VCLXNumericField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXNumericField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( GetWindow() ) { - bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; + bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -5677,11 +5677,11 @@ void VCLXNumericField::setProperty( const OUString& PropertyName, const ::com::s } } -::com::sun::star::uno::Any VCLXNumericField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXNumericField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; FormatterBase* pFormatter = GetFormatter(); if ( pFormatter ) { @@ -5768,33 +5768,33 @@ VCLXMetricField::~VCLXMetricField() { } -MetricFormatter *VCLXMetricField::GetMetricFormatter() throw(::com::sun::star::uno::RuntimeException) +MetricFormatter *VCLXMetricField::GetMetricFormatter() throw(css::uno::RuntimeException) { MetricFormatter *pFormatter = static_cast<MetricFormatter *>(GetFormatter()); if (!pFormatter) - throw ::com::sun::star::uno::RuntimeException(); + throw css::uno::RuntimeException(); return pFormatter; } -MetricField *VCLXMetricField::GetMetricField() throw(::com::sun::star::uno::RuntimeException) +MetricField *VCLXMetricField::GetMetricField() throw(css::uno::RuntimeException) { VclPtr< MetricField > pField = GetAs< MetricField >(); if (!pField) - throw ::com::sun::star::uno::RuntimeException(); + throw css::uno::RuntimeException(); return pField; } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXMetricField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXMetricField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XMetricField* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XMetricField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXMetricField ) - cppu::UnoType<com::sun::star::awt::XMetricField>::get(), + cppu::UnoType<css::awt::XMetricField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END @@ -5802,12 +5802,12 @@ IMPL_XTYPEPROVIDER_END #define MetricUnitUnoToVcl(a) ((FieldUnit)(a)) #define METRIC_MAP_PAIR(method,parent) \ - sal_Int64 VCLXMetricField::get##method( sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + sal_Int64 VCLXMetricField::get##method( sal_Int16 nUnit ) throw (css::uno::RuntimeException, std::exception) \ { \ SolarMutexGuard aGuard; \ return GetMetric##parent()->Get##method( MetricUnitUnoToVcl( nUnit ) ); \ } \ - void VCLXMetricField::set##method( sal_Int64 nValue, sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + void VCLXMetricField::set##method( sal_Int64 nValue, sal_Int16 nUnit ) throw (css::uno::RuntimeException, std::exception) \ { \ SolarMutexGuard aGuard; \ GetMetric##parent()->Set##method( nValue, MetricUnitUnoToVcl( nUnit ) ); \ @@ -5820,13 +5820,13 @@ METRIC_MAP_PAIR(Last, Field) #undef METRIC_MAP_PAIR -::sal_Int64 VCLXMetricField::getValue( ::sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int64 VCLXMetricField::getValue( ::sal_Int16 nUnit ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return GetMetricFormatter()->GetValue( MetricUnitUnoToVcl( nUnit ) ); } -::sal_Int64 VCLXMetricField::getCorrectedValue( ::sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int64 VCLXMetricField::getCorrectedValue( ::sal_Int16 nUnit ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return GetMetricFormatter()->GetCorrectedValue( MetricUnitUnoToVcl( nUnit ) ); @@ -5846,49 +5846,49 @@ void VCLXMetricField::CallListeners() } } -void VCLXMetricField::setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void VCLXMetricField::setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetMetricFormatter()->SetValue( Value, MetricUnitUnoToVcl( Unit ) ); CallListeners(); } -void VCLXMetricField::setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void VCLXMetricField::setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetMetricFormatter()->SetUserValue( Value, MetricUnitUnoToVcl( Unit ) ); CallListeners(); } -void VCLXMetricField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXMetricField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) { VCLXFormattedSpinField::setStrictFormat( bStrict ); } -sal_Bool VCLXMetricField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXMetricField::isStrictFormat() throw(css::uno::RuntimeException, std::exception) { return VCLXFormattedSpinField::isStrictFormat(); } -void VCLXMetricField::setSpinSize( sal_Int64 Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXMetricField::setSpinSize( sal_Int64 Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetMetricField()->SetSpinSize( Value ); } -sal_Int64 VCLXMetricField::getSpinSize() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 VCLXMetricField::getSpinSize() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return GetMetricField()->GetSpinSize(); } -void VCLXMetricField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXMetricField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetMetricFormatter()->SetDecimalDigits( Value ); } -sal_Int16 VCLXMetricField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXMetricField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5896,7 +5896,7 @@ sal_Int16 VCLXMetricField::getDecimalDigits() throw(::com::sun::star::uno::Runti return pNumericFormatter ? pNumericFormatter->GetDecimalDigits() : 0; } -void VCLXMetricField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXMetricField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5942,11 +5942,11 @@ void VCLXMetricField::setProperty( const OUString& PropertyName, const ::com::su } } -::com::sun::star::uno::Any VCLXMetricField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXMetricField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; FormatterBase* pFormatter = GetFormatter(); if ( pFormatter ) { @@ -6023,21 +6023,21 @@ VCLXCurrencyField::~VCLXCurrencyField() { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXCurrencyField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXCurrencyField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XCurrencyField* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XCurrencyField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXCurrencyField ) - cppu::UnoType<com::sun::star::awt::XCurrencyField>::get(), + cppu::UnoType<css::awt::XCurrencyField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END -void VCLXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCurrencyField::setValue( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6062,7 +6062,7 @@ void VCLXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::Ru } } -double VCLXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXCurrencyField::getValue() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6072,7 +6072,7 @@ double VCLXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeExcepti : 0; } -void VCLXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCurrencyField::setMin( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6082,7 +6082,7 @@ void VCLXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::Runt ImplCalcLongValue( Value, pCurrencyFormatter->GetDecimalDigits() ) ); } -double VCLXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXCurrencyField::getMin() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6092,7 +6092,7 @@ double VCLXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException : 0; } -void VCLXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCurrencyField::setMax( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6102,7 +6102,7 @@ void VCLXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::Runt ImplCalcLongValue( Value, pCurrencyFormatter->GetDecimalDigits() ) ); } -double VCLXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXCurrencyField::getMax() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6112,7 +6112,7 @@ double VCLXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException : 0; } -void VCLXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCurrencyField::setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6122,7 +6122,7 @@ void VCLXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::Ru ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) ); } -double VCLXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXCurrencyField::getFirst() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6132,7 +6132,7 @@ double VCLXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti : 0; } -void VCLXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCurrencyField::setLast( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6142,7 +6142,7 @@ void VCLXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::Run ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) ); } -double VCLXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXCurrencyField::getLast() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6152,7 +6152,7 @@ double VCLXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeExceptio : 0; } -void VCLXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCurrencyField::setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6162,7 +6162,7 @@ void VCLXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno: ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) ); } -double VCLXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeException, std::exception) +double VCLXCurrencyField::getSpinSize() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6172,18 +6172,18 @@ double VCLXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeExce : 0; } -void VCLXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) { VCLXFormattedSpinField::setStrictFormat( bStrict ); } -sal_Bool VCLXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXCurrencyField::isStrictFormat() throw(css::uno::RuntimeException, std::exception) { return VCLXFormattedSpinField::isStrictFormat(); } -void VCLXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6196,7 +6196,7 @@ void VCLXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::st } } -sal_Int16 VCLXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 VCLXCurrencyField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6204,13 +6204,13 @@ sal_Int16 VCLXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::Run return pCurrencyFormatter ? pCurrencyFormatter->GetDecimalDigits() : 0; } -void VCLXCurrencyField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXCurrencyField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( GetWindow() ) { - bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; + bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -6280,11 +6280,11 @@ void VCLXCurrencyField::setProperty( const OUString& PropertyName, const ::com:: } } -::com::sun::star::uno::Any VCLXCurrencyField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXCurrencyField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; FormatterBase* pFormatter = GetFormatter(); if ( pFormatter ) { @@ -6372,21 +6372,21 @@ VCLXPatternField::~VCLXPatternField() { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any VCLXPatternField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any VCLXPatternField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XPatternField* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XPatternField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXPatternField ) - cppu::UnoType<com::sun::star::awt::XPatternField>::get(), + cppu::UnoType<css::awt::XPatternField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END -void VCLXPatternField::setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXPatternField::setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6397,7 +6397,7 @@ void VCLXPatternField::setMasks( const OUString& EditMask, const OUString& Liter } } -void VCLXPatternField::getMasks( OUString& EditMask, OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXPatternField::getMasks( OUString& EditMask, OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6409,7 +6409,7 @@ void VCLXPatternField::getMasks( OUString& EditMask, OUString& LiteralMask ) thr } } -void VCLXPatternField::setString( const OUString& Str ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXPatternField::setString( const OUString& Str ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< PatternField > pPatternField = GetAs< PatternField >(); @@ -6417,7 +6417,7 @@ void VCLXPatternField::setString( const OUString& Str ) throw(::com::sun::star:: pPatternField->SetString( Str ); } -OUString VCLXPatternField::getString() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString VCLXPatternField::getString() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6428,17 +6428,17 @@ OUString VCLXPatternField::getString() throw(::com::sun::star::uno::RuntimeExcep return aString; } -void VCLXPatternField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXPatternField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) { VCLXFormattedSpinField::setStrictFormat( bStrict ); } -sal_Bool VCLXPatternField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool VCLXPatternField::isStrictFormat() throw(css::uno::RuntimeException, std::exception) { return VCLXFormattedSpinField::isStrictFormat(); } -void VCLXPatternField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException, std::exception) +void VCLXPatternField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6471,11 +6471,11 @@ void VCLXPatternField::setProperty( const OUString& PropertyName, const ::com::s } } -::com::sun::star::uno::Any VCLXPatternField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any VCLXPatternField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Any aProp; + css::uno::Any aProp; if ( GetWindow() ) { sal_uInt16 nPropType = GetPropertyId( PropertyName ); @@ -6512,7 +6512,7 @@ VCLXToolBox::~VCLXToolBox() { } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXToolBox::CreateAccessibleContext() +css::uno::Reference< css::accessibility::XAccessibleContext > VCLXToolBox::CreateAccessibleContext() { return getAccessibleFactory().createAccessibleContext( this ); } @@ -6545,20 +6545,20 @@ VCLXFrame::~VCLXFrame() { } -::com::sun::star::uno::Any SAL_CALL VCLXFrame::queryInterface(const ::com::sun::star::uno::Type & rType ) -throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL VCLXFrame::queryInterface(const css::uno::Type & rType ) +throw(css::uno::RuntimeException, std::exception) { return VCLXContainer::queryInterface( rType ); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXFrame ) VCLXContainer::getTypes() IMPL_XTYPEPROVIDER_END -// ::com::sun::star::awt::XView +// css::awt::XView void SAL_CALL VCLXFrame::draw( sal_Int32 nX, sal_Int32 nY ) -throw(::com::sun::star::uno::RuntimeException, std::exception) +throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr< vcl::Window > pWindow = GetWindow(); @@ -6576,18 +6576,18 @@ throw(::com::sun::star::uno::RuntimeException, std::exception) } } -// ::com::sun::star::awt::XDevice, -::com::sun::star::awt::DeviceInfo SAL_CALL VCLXFrame::getInfo() -throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XDevice, +css::awt::DeviceInfo SAL_CALL VCLXFrame::getInfo() +throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); + css::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); return aInfo; } void SAL_CALL VCLXFrame::setProperty( const OUString& PropertyName, - const ::com::sun::star::uno::Any& Value ) -throw(::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Any& Value ) +throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -6596,7 +6596,7 @@ throw(::com::sun::star::uno::RuntimeException, std::exception) void VCLXFrame::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this ); + css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); VCLXContainer::ProcessWindowEvent( rVclWindowEvent ); } diff --git a/toolkit/source/awt/vclxwindows_internal.hxx b/toolkit/source/awt/vclxwindows_internal.hxx index a6506b18ab8e..91b6fae9e228 100644 --- a/toolkit/source/awt/vclxwindows_internal.hxx +++ b/toolkit/source/awt/vclxwindows_internal.hxx @@ -22,8 +22,8 @@ namespace toolkit { - void setButtonLikeFaceColor( vcl::Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue ); - ::com::sun::star::uno::Any getButtonLikeFaceColor( const vcl::Window* _pWindow ); + void setButtonLikeFaceColor( vcl::Window* _pWindow, const css::uno::Any& _rColorValue ); + css::uno::Any getButtonLikeFaceColor( const vcl::Window* _pWindow ); } #endif // INCLUDED_TOOLKIT_SOURCE_AWT_VCLXWINDOWS_INTERNAL_HXX diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index f17066cc3af9..3c23acff6f89 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -310,7 +310,7 @@ namespace toolkit } - sal_Int32 SAL_CALL OAccessibleControlContext::getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleControlContext::getForeground( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; // want to do some VCL stuff here ... @@ -336,7 +336,7 @@ namespace toolkit } - sal_Int32 SAL_CALL OAccessibleControlContext::getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleControlContext::getBackground( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; // want to do some VCL stuff here ... diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index 898787674d21..55df02f25af3 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -240,7 +240,7 @@ namespace toolkit { } - AnimatedImagesControlModel::AnimatedImagesControlModel( Reference< com::sun::star::uno::XComponentContext > const & i_factory ) + AnimatedImagesControlModel::AnimatedImagesControlModel( Reference< css::uno::XComponentContext > const & i_factory ) :AnimatedImagesControlModel_Base( i_factory ) ,m_xData( new AnimatedImagesControlModel_Data ) { diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 859fde50fb72..0e615ec2c5fe 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -768,7 +768,7 @@ void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XC } ////----- XInitialization ------------------------------------------------------------------- -void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArguments) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { if ( rArguments.getLength() == 1 ) { @@ -780,19 +780,19 @@ void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArgum else m_nTabPageId = -1; } -::sal_Int16 SAL_CALL ControlModelContainerBase::getTabPageID() throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int16 SAL_CALL ControlModelContainerBase::getTabPageID() throw (css::uno::RuntimeException, std::exception) { return m_nTabPageId; } -sal_Bool SAL_CALL ControlModelContainerBase::getEnabled() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ControlModelContainerBase::getEnabled() throw (css::uno::RuntimeException, std::exception) { return m_bEnabled; } -void SAL_CALL ControlModelContainerBase::setEnabled( sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) { m_bEnabled = _enabled; } -OUString SAL_CALL ControlModelContainerBase::getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL ControlModelContainerBase::getTitle() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XPropertySet> xThis(*this,UNO_QUERY); @@ -800,25 +800,25 @@ OUString SAL_CALL ControlModelContainerBase::getTitle() throw (::com::sun::star: xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle; return sTitle; } -void SAL_CALL ControlModelContainerBase::setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::setTitle( const OUString& _title ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XPropertySet> xThis(*this,UNO_QUERY); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),makeAny(_title)); } -OUString SAL_CALL ControlModelContainerBase::getImageURL() throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL ControlModelContainerBase::getImageURL() throw (css::uno::RuntimeException, std::exception) { return m_sImageURL; } -void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& _imageurl ) throw (css::uno::RuntimeException, std::exception) { m_sImageURL = _imageurl; } -OUString SAL_CALL ControlModelContainerBase::getToolTip() throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL ControlModelContainerBase::getToolTip() throw (css::uno::RuntimeException, std::exception) { return m_sTooltip; } -void SAL_CALL ControlModelContainerBase::setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::setToolTip( const OUString& _tooltip ) throw (css::uno::RuntimeException, std::exception) { m_sTooltip = _tooltip; } @@ -1845,7 +1845,7 @@ void ControlContainerBase::ImplUpdateResourceResolver() //// Helper Method to convert relative url to physical location //// ---------------------------------------------------- -OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ) +OUString getPhysicalLocation( const css::uno::Any& rbase, const css::uno::Any& rUrl ) { OUString baseLocation; @@ -1875,7 +1875,7 @@ OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::c } void -ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation, const css::uno::Reference< css::awt::XControlModel >& xTarget ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { if ( Operation < Insert || Operation > Remove ) throw IllegalArgumentException(); diff --git a/toolkit/source/controls/controlmodelcontainerbase_internal.hxx b/toolkit/source/controls/controlmodelcontainerbase_internal.hxx index 528922d5561d..09e1a1aebf2f 100644 --- a/toolkit/source/controls/controlmodelcontainerbase_internal.hxx +++ b/toolkit/source/controls/controlmodelcontainerbase_internal.hxx @@ -21,7 +21,7 @@ #define INCLUDED_TOOLKIT_SOURCE_CONTROLS_CONTROLMODELCONTAINERBASE_INTERNAL_HXX ////HELPER -OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); +OUString getPhysicalLocation( const css::uno::Any& rbase, const css::uno::Any& rUrl ); #endif // INCLUDED_TOOLKIT_SOURCE_CONTROLS_CONTROLMODELCONTAINERBASE_INTERNAL_HXX diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index acdffa2e4115..48b5db568b88 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -81,7 +81,7 @@ class SimpleNamedThingContainer : public ::cppu::WeakImplHelper< container::XNam NamedThingsHash things; ::osl::Mutex m_aMutex; public: - // ::com::sun::star::container::XNameContainer, XNameReplace, XNameAccess + // css::container::XNameContainer, XNameReplace, XNameAccess virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override { ::osl::MutexGuard aGuard( m_aMutex ); @@ -293,7 +293,7 @@ Reference< XPropertySetInfo > UnoControlDialogModel::getPropertySetInfo( ) thro return xInfo; } -void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) +void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) { ControlModelContainerBase::setFastPropertyValue_NoBroadcast( nHandle, rValue ); try @@ -305,7 +305,7 @@ void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( mxGrfObj, sImageURL ) ) ); } } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { OSL_ENSURE( false, "UnoControlDialogModel::setFastPropertyValue_NoBroadcast: caught an exception while setting ImageURL properties!" ); } @@ -416,7 +416,7 @@ css::uno::Sequence<OUString> UnoDialogControl::getSupportedServiceNames() "stardiv.vcl.control.Dialog"}; } -void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ) +void UnoDialogControl::PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ) { UnoControlContainer::PrepareWindowDescriptor( rDesc ); bool bDecoration( true ); @@ -424,7 +424,7 @@ void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDes if ( !bDecoration ) { // Now we have to manipulate the WindowDescriptor - rDesc.WindowAttributes = rDesc.WindowAttributes | ::com::sun::star::awt::WindowAttribute::NODECORATION; + rDesc.WindowAttributes = rDesc.WindowAttributes | css::awt::WindowAttribute::NODECORATION; } // We have to set the graphic property before the peer @@ -505,9 +505,9 @@ static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize ::Size aTmp = pOutDev->PixelToLogic( aSize, MAP_APPFONT ); return aTmp; } -// ::com::sun::star::awt::XWindowListener -void SAL_CALL UnoDialogControl::windowResized( const ::com::sun::star::awt::WindowEvent& e ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XWindowListener +void SAL_CALL UnoDialogControl::windowResized( const css::awt::WindowEvent& e ) +throw (css::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -547,8 +547,8 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } } -void SAL_CALL UnoDialogControl::windowMoved( const ::com::sun::star::awt::WindowEvent& e ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UnoDialogControl::windowMoved( const css::awt::WindowEvent& e ) +throw (css::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -724,7 +724,7 @@ void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException, std::excep ControlContainerBase::dispose(); } -// com::sun::star::awt::XSimpleTabController +// css::awt::XSimpleTabController ::sal_Int32 SAL_CALL UnoMultiPageControl::insertTab() throw (RuntimeException, std::exception) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); @@ -928,7 +928,7 @@ UnoMultiPageModel::Clone() const return pClone; } -OUString UnoMultiPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoMultiPageModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString( "com.sun.star.awt.UnoMultiPageModel" ); } @@ -1048,7 +1048,7 @@ UnoPageModel::Clone() const return pClone; } -OUString UnoPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoPageModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString( "com.sun.star.awt.UnoPageModel" ); } @@ -1213,7 +1213,7 @@ UnoFrameModel::Clone() const return pClone; } -OUString UnoFrameModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoFrameModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString( "com.sun.star.awt.UnoFrameModel" ); } diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index d00befb2f685..b480f5eedfff 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -174,12 +174,12 @@ void NameContainer_Impl::removeByName( const OUString& Name ) } // Methods XContainer -void NameContainer_Impl::addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void NameContainer_Impl::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) throw(css::uno::RuntimeException, std::exception) { maContainerListeners.addInterface( l ); } -void NameContainer_Impl::removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void NameContainer_Impl::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) throw(css::uno::RuntimeException, std::exception) { maContainerListeners.removeInterface( l ); } diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index e2dda4bae288..600c8d81930e 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -69,7 +69,7 @@ //= OGeometryControlModel_Base - OGeometryControlModel_Base::OGeometryControlModel_Base(::com::sun::star::uno::XAggregation* _pAggregateInstance) + OGeometryControlModel_Base::OGeometryControlModel_Base(css::uno::XAggregation* _pAggregateInstance) :OPropertySetAggregationHelper( m_aBHelper ) ,OPropertyContainer( m_aBHelper ) ,OGCM_Base( m_aMutex ) @@ -182,9 +182,9 @@ } - ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetDefaultValueByHandle(sal_Int32 nHandle) + css::uno::Any OGeometryControlModel_Base::ImplGetDefaultValueByHandle(sal_Int32 nHandle) { - ::com::sun::star::uno::Any aDefault; + css::uno::Any aDefault; switch ( nHandle ) { @@ -204,9 +204,9 @@ } - ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetPropertyValueByHandle(sal_Int32 nHandle) const + css::uno::Any OGeometryControlModel_Base::ImplGetPropertyValueByHandle(sal_Int32 nHandle) const { - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; switch ( nHandle ) { @@ -226,7 +226,7 @@ } - void OGeometryControlModel_Base::ImplSetPropertyValueByHandle(sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue) + void OGeometryControlModel_Base::ImplSetPropertyValueByHandle(sal_Int32 nHandle, const css::uno::Any& aValue) { switch ( nHandle ) { @@ -328,12 +328,12 @@ } - ::com::sun::star::beans::PropertyState OGeometryControlModel_Base::getPropertyStateByHandle(sal_Int32 nHandle) + css::beans::PropertyState OGeometryControlModel_Base::getPropertyStateByHandle(sal_Int32 nHandle) { - ::com::sun::star::uno::Any aValue = ImplGetPropertyValueByHandle( nHandle ); - ::com::sun::star::uno::Any aDefault = ImplGetDefaultValueByHandle( nHandle ); + css::uno::Any aValue = ImplGetPropertyValueByHandle( nHandle ); + css::uno::Any aDefault = ImplGetDefaultValueByHandle( nHandle ); - return CompareProperties( aValue, aDefault ) ? ::com::sun::star::beans::PropertyState_DEFAULT_VALUE : ::com::sun::star::beans::PropertyState_DIRECT_VALUE; + return CompareProperties( aValue, aDefault ) ? css::beans::PropertyState_DEFAULT_VALUE : css::beans::PropertyState_DIRECT_VALUE; } @@ -343,7 +343,7 @@ } - ::com::sun::star::uno::Any OGeometryControlModel_Base::getPropertyDefaultByHandle( sal_Int32 nHandle ) const + css::uno::Any OGeometryControlModel_Base::getPropertyDefaultByHandle( sal_Int32 nHandle ) const { return ImplGetDefaultValueByHandle( nHandle ); } @@ -390,17 +390,17 @@ // Clone event container - Reference< ::com::sun::star::script::XScriptEventsSupplier > xEventsSupplier = - static_cast< ::com::sun::star::script::XScriptEventsSupplier* >( this ); - Reference< ::com::sun::star::script::XScriptEventsSupplier > xCloneEventsSupplier = - static_cast< ::com::sun::star::script::XScriptEventsSupplier* >( pOwnClone ); + Reference< css::script::XScriptEventsSupplier > xEventsSupplier = + static_cast< css::script::XScriptEventsSupplier* >( this ); + Reference< css::script::XScriptEventsSupplier > xCloneEventsSupplier = + static_cast< css::script::XScriptEventsSupplier* >( pOwnClone ); if( xEventsSupplier.is() && xCloneEventsSupplier.is() ) { Reference< XNameContainer > xEventCont = xEventsSupplier->getEvents(); Reference< XNameContainer > xCloneEventCont = xCloneEventsSupplier->getEvents(); - ::com::sun::star::uno::Sequence< OUString > aNames = + css::uno::Sequence< OUString > aNames = xEventCont->getElementNames(); const OUString* pNames = aNames.getConstArray(); sal_Int32 i, nNameCount = aNames.getLength(); @@ -408,7 +408,7 @@ for( i = 0 ; i < nNameCount ; i++ ) { OUString aName = pNames[ i ]; - ::com::sun::star::uno::Any aElement = xEventCont->getByName( aName ); + css::uno::Any aElement = xEventCont->getByName( aName ); xCloneEventCont->insertByName( aName, aElement ); } } @@ -441,7 +441,7 @@ typedef std::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int; - typedef std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; + typedef std::vector< css::uno::Sequence< css::beans::Property > > PropSeqArray; typedef std::vector< ::std::vector< sal_Int32 > > IntArrayArray; // for creating class-unique PropertySetInfo's, we need some info: diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index 06e08152c752..2249a20dd4b5 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -148,14 +148,14 @@ private: } - ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (css::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return impl_getRowCount_nolck(); } - ::sal_Int32 SAL_CALL DefaultGridDataModel::getColumnCount() throw (::com::sun::star::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL DefaultGridDataModel::getColumnCount() throw (css::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nColumnCount; @@ -468,7 +468,7 @@ private: void SAL_CALL DefaultGridDataModel::disposing() { - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source.set( *this ); rBHelper.aLC.disposeAndClear( aEvent ); diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 6a41fc875373..39eaa564c270 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -93,67 +93,67 @@ namespace toolkit } - ::com::sun::star::uno::Any SAL_CALL GridColumn::getIdentifier() throw (::com::sun::star::uno::RuntimeException, std::exception) + css::uno::Any SAL_CALL GridColumn::getIdentifier() throw (css::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_aIdentifier; } - void SAL_CALL GridColumn::setIdentifier(const ::com::sun::star::uno::Any & value) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setIdentifier(const css::uno::Any & value) throw (css::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); m_aIdentifier = value; } - ::sal_Int32 SAL_CALL GridColumn::getColumnWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL GridColumn::getColumnWidth() throw (css::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nColumnWidth; } - void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value) throw (css::uno::RuntimeException, std::exception) { impl_set( m_nColumnWidth, value, "ColumnWidth" ); } - ::sal_Int32 SAL_CALL GridColumn::getMaxWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL GridColumn::getMaxWidth() throw (css::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nMaxWidth; } - void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value) throw (css::uno::RuntimeException, std::exception) { impl_set( m_nMaxWidth, value, "MaxWidth" ); } - ::sal_Int32 SAL_CALL GridColumn::getMinWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL GridColumn::getMinWidth() throw (css::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nMinWidth; } - void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value) throw (css::uno::RuntimeException, std::exception) { impl_set( m_nMinWidth, value, "MinWidth" ); } - OUString SAL_CALL GridColumn::getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception) + OUString SAL_CALL GridColumn::getTitle() throw (css::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_sTitle; } - void SAL_CALL GridColumn::setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setTitle(const OUString & value) throw (css::uno::RuntimeException, std::exception) { impl_set( m_sTitle, value, "Title" ); } @@ -172,14 +172,14 @@ namespace toolkit } - sal_Bool SAL_CALL GridColumn::getResizeable() throw (::com::sun::star::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL GridColumn::getResizeable() throw (css::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_bResizeable; } - void SAL_CALL GridColumn::setResizeable(sal_Bool value) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setResizeable(sal_Bool value) throw (css::uno::RuntimeException, std::exception) { impl_set( m_bResizeable, bool(value), "Resizeable" ); } @@ -200,14 +200,14 @@ namespace toolkit } - HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException, std::exception) + HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() throw (css::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_eHorizontalAlign; } - void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) throw (css::uno::RuntimeException, std::exception) { impl_set( m_eHorizontalAlign, align, "HorizontalAlign" ); } @@ -271,7 +271,7 @@ namespace toolkit return cppu::supportsService(this, i_serviceName); } - ::com::sun::star::uno::Sequence< OUString > SAL_CALL GridColumn::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + css::uno::Sequence< OUString > SAL_CALL GridColumn::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { const OUString aServiceName("com.sun.star.awt.grid.GridColumn"); const Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx index 09cb24169239..b4329fd6fee2 100644 --- a/toolkit/source/controls/grid/gridcolumn.hxx +++ b/toolkit/source/controls/grid/gridcolumn.hxx @@ -37,9 +37,9 @@ namespace toolkit { -typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::awt::grid::XGridColumn - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XUnoTunnel +typedef ::cppu::WeakComponentImplHelper < css::awt::grid::XGridColumn + , css::lang::XServiceInfo + , css::lang::XUnoTunnel > GridColumn_Base; class GridColumn :public ::cppu::BaseMutex ,public GridColumn_Base @@ -49,46 +49,46 @@ public: GridColumn( GridColumn const & i_copySource ); virtual ~GridColumn(); - // ::com::sun::star::awt::grid::XGridColumn - virtual ::com::sun::star::uno::Any SAL_CALL getIdentifier() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setIdentifier(const ::com::sun::star::uno::Any & value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getColumnWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMaxWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaxWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMinWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getResizeable() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setResizeable(sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getFlexibility() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFlexibility( ::sal_Int32 _flexibility ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getHelpText() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpText(const OUString & value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getIndex() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDataColumnIndex() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::style::HorizontalAlignment SAL_CALL getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHorizontalAlign(::com::sun::star::style::HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addGridColumnListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeGridColumnListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::grid::XGridColumn + virtual css::uno::Any SAL_CALL getIdentifier() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIdentifier(const css::uno::Any & value) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getColumnWidth() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setColumnWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMaxWidth() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMaxWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMinWidth() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMinWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getResizeable() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setResizeable(sal_Bool the_value) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getFlexibility() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFlexibility( ::sal_Int32 _flexibility ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle(const OUString & value) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getHelpText() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHelpText(const OUString & value) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDataColumnIndex() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::style::HorizontalAlignment SAL_CALL getHorizontalAlign() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHorizontalAlign(css::style::HorizontalAlignment align) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addGridColumnListener( const css::uno::Reference< css::awt::grid::XGridColumnListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeGridColumnListener( const css::uno::Reference< css::awt::grid::XGridColumnListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // OComponentHelper virtual void SAL_CALL disposing() override; // XCloneable (base of XGridColumn) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) 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 and friends - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& i_identifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelId() throw(); - static GridColumn* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_component ); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& i_identifier ) throw(css::uno::RuntimeException, std::exception) override; + static css::uno::Sequence< sal_Int8 > getUnoTunnelId() throw(); + static GridColumn* getImplementation( const css::uno::Reference< css::uno::XInterface >& i_component ); // attribute access void setIndex( sal_Int32 const i_index ); @@ -110,20 +110,20 @@ private: TYPE const aOldValue( io_attribute ); io_attribute = i_newValue; - broadcast_changed( i_attributeName, ::com::sun::star::uno::makeAny( aOldValue ), ::com::sun::star::uno::makeAny( io_attribute ), aGuard ); + broadcast_changed( i_attributeName, css::uno::makeAny( aOldValue ), css::uno::makeAny( io_attribute ), aGuard ); } - ::com::sun::star::uno::Any m_aIdentifier; - sal_Int32 m_nIndex; - sal_Int32 m_nDataColumnIndex; - sal_Int32 m_nColumnWidth; - sal_Int32 m_nMaxWidth; - sal_Int32 m_nMinWidth; - sal_Int32 m_nFlexibility; - bool m_bResizeable; - OUString m_sTitle; - OUString m_sHelpText; - ::com::sun::star::style::HorizontalAlignment m_eHorizontalAlign; + css::uno::Any m_aIdentifier; + sal_Int32 m_nIndex; + sal_Int32 m_nDataColumnIndex; + sal_Int32 m_nColumnWidth; + sal_Int32 m_nMaxWidth; + sal_Int32 m_nMinWidth; + sal_Int32 m_nFlexibility; + bool m_bResizeable; + OUString m_sTitle; + OUString m_sHelpText; + css::style::HorizontalAlignment m_eHorizontalAlign; }; } diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 9bb77f8cb0d0..3fb05f95790c 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -70,7 +70,7 @@ namespace } -UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) +UnoGridModel::UnoGridModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -359,14 +359,14 @@ sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_ } -::sal_Int32 UnoGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int32 UnoGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getRowAtPoint( x, y ); } -::sal_Int32 UnoGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int32 UnoGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getColumnAtPoint( x, y ); @@ -400,7 +400,7 @@ void SAL_CALL UnoGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (Runtime } -void SAL_CALL UnoGridControl::selectAllRows() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UnoGridControl::selectAllRows() throw (css::uno::RuntimeException, std::exception) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->selectAllRows(); } @@ -412,37 +412,37 @@ void SAL_CALL UnoGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (Runti } -void SAL_CALL UnoGridControl::deselectAllRows() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UnoGridControl::deselectAllRows() throw (css::uno::RuntimeException, std::exception) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->deselectAllRows(); } -::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL UnoGridControl::getSelectedRows() throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< ::sal_Int32 > SAL_CALL UnoGridControl::getSelectedRows() throw (css::uno::RuntimeException, std::exception) { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->getSelectedRows(); } -sal_Bool SAL_CALL UnoGridControl::hasSelectedRows() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL UnoGridControl::hasSelectedRows() throw (css::uno::RuntimeException, std::exception) { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->hasSelectedRows(); } -sal_Bool SAL_CALL UnoGridControl::isRowSelected(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL UnoGridControl::isRowSelected(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception) { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->isRowSelected( index ); } -void SAL_CALL UnoGridControl::addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UnoGridControl::addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) { m_aSelectionListeners.addInterface( listener ); } -void SAL_CALL UnoGridControl::removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UnoGridControl::removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) { m_aSelectionListeners.removeInterface( listener ); } diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index 91918f11f7a2..32a34c4d9073 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -43,26 +43,26 @@ class GridEventForwarder; class UnoGridModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - explicit UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); + explicit UnoGridModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ); UnoGridModel( const UnoGridModel& rModel ); UnoControlModel* Clone() const override; - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; // OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) override; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; // XServiceInfo OUString SAL_CALL getImplementationName() @@ -84,8 +84,8 @@ public: // = UnoGridControl typedef ::cppu::ImplInheritanceHelper < UnoControlBase - , ::com::sun::star::awt::grid::XGridControl - , ::com::sun::star::awt::grid::XGridRowSelection + , css::awt::grid::XGridControl + , css::awt::grid::XGridRowSelection > UnoGridControl_Base; class UnoGridControl : public UnoGridControl_Base { @@ -93,32 +93,32 @@ public: UnoGridControl(); OUString GetComponentServiceName() override; - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XControl - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::grid::XGridControl - virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCurrentColumn( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCurrentRow( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::util::VetoException, std::exception) override; - - // ::com::sun::star::awt::grid::XGridRowSelection - virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override; - virtual void SAL_CALL selectAllRows() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override; - virtual void SAL_CALL deselectAllRows() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasSelectedRows() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XServiceInfo + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XControl + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& rxModel ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::grid::XGridControl + virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCurrentColumn( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCurrentRow( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, css::util::VetoException, std::exception) override; + + // css::awt::grid::XGridRowSelection + virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override; + virtual void SAL_CALL selectAllRows() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override; + virtual void SAL_CALL deselectAllRows() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasSelectedRows() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) override; + + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override { return OUString("stardiv.Toolkit.GridControl"); } diff --git a/toolkit/source/controls/grid/grideventforwarder.hxx b/toolkit/source/controls/grid/grideventforwarder.hxx index f8e9640791ac..da9a6cd269f3 100644 --- a/toolkit/source/controls/grid/grideventforwarder.hxx +++ b/toolkit/source/controls/grid/grideventforwarder.hxx @@ -36,8 +36,8 @@ namespace toolkit //= GridEventForwarder - typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::grid::XGridDataListener - , ::com::sun::star::container::XContainerListener + typedef ::cppu::ImplHelper2 < css::awt::grid::XGridDataListener + , css::container::XContainerListener > GridEventForwarder_Base; class GridEventForwarder : public GridEventForwarder_Base @@ -52,18 +52,18 @@ namespace toolkit virtual void SAL_CALL release() throw() override; // XGridDataListener - virtual void SAL_CALL rowsInserted( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rowsRemoved( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dataChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rowHeadingChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; // 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; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException, std::exception) override; private: UnoGridControl& m_parent; diff --git a/toolkit/source/controls/grid/initguard.hxx b/toolkit/source/controls/grid/initguard.hxx index 2a175a131fca..d9c30bf396c2 100644 --- a/toolkit/source/controls/grid/initguard.hxx +++ b/toolkit/source/controls/grid/initguard.hxx @@ -40,7 +40,7 @@ namespace toolkit :comphelper::ComponentGuard( i_component, i_broadcastHelper ) { if ( !i_component.isInitialized() ) - throw ::com::sun::star::lang::NotInitializedException( OUString(), *&i_component ); + throw css::lang::NotInitializedException( OUString(), *&i_component ); } ~InitGuard() diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 31b25b9d679c..139d2fdaef94 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -127,7 +127,7 @@ static void lcl_throwIndexOutOfBoundsException( ) } - Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstance( ) throw (Exception, ::com::sun::star::uno::RuntimeException, std::exception) + Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstance( ) throw (Exception, css::uno::RuntimeException, std::exception) { ORoadmapEntry* pRoadmapItem = new ORoadmapEntry(); Reference< XInterface > xNewRoadmapItem = static_cast<cppu::OWeakObject*>(pRoadmapItem); @@ -148,7 +148,7 @@ static void lcl_throwIndexOutOfBoundsException( ) - ::com::sun::star::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) + css::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType ); if ( !aRet.hasValue() ) @@ -359,12 +359,12 @@ static void lcl_throwIndexOutOfBoundsException( ) } - void SAL_CALL UnoControlRoadmapModel::addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL UnoControlRoadmapModel::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { maContainerListeners.addInterface( xListener ); } - void SAL_CALL UnoControlRoadmapModel::removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL UnoControlRoadmapModel::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { maContainerListeners.removeInterface( xListener ); } diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index ef93f3067e0f..d8734a03a656 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -29,23 +29,23 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( ) // registerProperty or registerMayBeVoidProperty or registerPropertyNoMember registerProperty( "Label", RM_PROPERTY_ID_LABEL, - ::com::sun::star::beans::PropertyAttribute::BOUND | - ::com::sun::star::beans::PropertyAttribute::CONSTRAINED, + css::beans::PropertyAttribute::BOUND | + css::beans::PropertyAttribute::CONSTRAINED, & m_sLabel, cppu::UnoType<decltype(m_sLabel)>::get() ); m_nID = -1; registerProperty( "ID", RM_PROPERTY_ID_ID, - ::com::sun::star::beans::PropertyAttribute::BOUND | - ::com::sun::star::beans::PropertyAttribute::CONSTRAINED, + css::beans::PropertyAttribute::BOUND | + css::beans::PropertyAttribute::CONSTRAINED, & m_nID, cppu::UnoType<decltype(m_nID)>::get() ); m_bEnabled = true; registerProperty( "Enabled", RM_PROPERTY_ID_ENABLED, - ::com::sun::star::beans::PropertyAttribute::BOUND | - ::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT, + css::beans::PropertyAttribute::BOUND | + css::beans::PropertyAttribute::MAYBEDEFAULT, & m_bEnabled, cppu::UnoType<decltype(m_bEnabled)>::get() ); registerProperty( "Interactive", RM_PROPERTY_ID_INTERACTIVE, - ::com::sun::star::beans::PropertyAttribute::BOUND | - ::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT, + css::beans::PropertyAttribute::BOUND | + css::beans::PropertyAttribute::MAYBEDEFAULT, & m_bInteractive, cppu::UnoType<decltype(m_bInteractive)>::get() ); @@ -69,28 +69,28 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelpe // whose XInterface and XTypeProvider implementations should be merged -::com::sun::star::uno::Reference< ::com::sun::star:: beans::XPropertySetInfo > SAL_CALL +css::uno::Reference< css:: beans::XPropertySetInfo > SAL_CALL ORoadmapEntry::getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { - return ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >( + return css::uno::Reference< css::beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } -OUString SAL_CALL ORoadmapEntry::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL ORoadmapEntry::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) { OUString aStr("com.sun.star.comp.toolkit.RoadmapItem"); return aStr; } -sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Sequence< OUString > aRet(1); + css::uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); pArray[0] = "com.sun.star.awt.RoadmapItem"; return aRet; @@ -104,7 +104,7 @@ sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName ) ::cppu::IPropertyArrayHelper* ORoadmapEntry::createArrayHelper() const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; + css::uno::Sequence< css::beans::Property > aProps; // describes all properties which have been registered in the ctor describeProperties( aProps ); diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index 1f2f33cc3ecb..139307a2822c 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -115,7 +115,7 @@ sal_uInt32 StdTabControllerModel::ImplGetControlCount( const UnoControlModelEntr return nCount; } -void StdTabControllerModel::ImplGetControlModels( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > ** ppRefs, const UnoControlModelEntryList& rList ) const +void StdTabControllerModel::ImplGetControlModels( css::uno::Reference< css::awt::XControlModel > ** ppRefs, const UnoControlModelEntryList& rList ) const { size_t nEntries = rList.size(); for ( size_t n = 0; n < nEntries; n++ ) @@ -131,21 +131,21 @@ void StdTabControllerModel::ImplGetControlModels( ::com::sun::star::uno::Referen } } -void StdTabControllerModel::ImplSetControlModels( UnoControlModelEntryList& rList, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) +void StdTabControllerModel::ImplSetControlModels( UnoControlModelEntryList& rList, const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ) { - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > * pRefs = Controls.getConstArray(); + const css::uno::Reference< css::awt::XControlModel > * pRefs = Controls.getConstArray(); sal_uInt32 nControls = Controls.getLength(); for ( sal_uInt32 n = 0; n < nControls; n++ ) { UnoControlModelEntry* pNewEntry = new UnoControlModelEntry; pNewEntry->bGroup = false; - pNewEntry->pxControl = new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > ; + pNewEntry->pxControl = new css::uno::Reference< css::awt::XControlModel > ; *pNewEntry->pxControl = pRefs[n]; rList.push_back( pNewEntry ); } } -sal_uInt32 StdTabControllerModel::ImplGetControlPos( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rCtrl, const UnoControlModelEntryList& rList ) +sal_uInt32 StdTabControllerModel::ImplGetControlPos( const css::uno::Reference< css::awt::XControlModel >& rCtrl, const UnoControlModelEntryList& rList ) { for ( size_t n = rList.size(); n; ) { @@ -156,9 +156,9 @@ sal_uInt32 StdTabControllerModel::ImplGetControlPos( const ::com::sun::star::uno return CONTROLPOS_NOTFOUND; } -void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rCtrls ) +void ImplWriteControls( const css::uno::Reference< css::io::XObjectOutputStream > & OutStream, const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rCtrls ) { - ::com::sun::star::uno::Reference< ::com::sun::star::io::XMarkableStream > xMark( OutStream, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::io::XMarkableStream > xMark( OutStream, css::uno::UNO_QUERY ); DBG_ASSERT( xMark.is(), "write: no XMarkableStream!" ); sal_uInt32 nStoredControls = 0; @@ -170,8 +170,8 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star sal_uInt32 nCtrls = rCtrls.getLength(); for ( sal_uInt32 n = 0; n < nCtrls; n++ ) { - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > xI = rCtrls.getConstArray()[n]; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject > xPO( xI, ::com::sun::star::uno::UNO_QUERY ); + const css::uno::Reference< css::awt::XControlModel > xI = rCtrls.getConstArray()[n]; + css::uno::Reference< css::io::XPersistObject > xPO( xI, css::uno::UNO_QUERY ); DBG_ASSERT( xPO.is(), "write: Control doesn't support XPersistObject" ); if ( xPO.is() ) { @@ -187,9 +187,9 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star xMark->deleteMark(nDataBeginMark); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > ImplReadControls( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream > & InStream ) +css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > ImplReadControls( const css::uno::Reference< css::io::XObjectInputStream > & InStream ) { - ::com::sun::star::uno::Reference< ::com::sun::star::io::XMarkableStream > xMark( InStream, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::io::XMarkableStream > xMark( InStream, css::uno::UNO_QUERY ); DBG_ASSERT( xMark.is(), "write: no XMarkableStream!" ); sal_Int32 nDataBeginMark = xMark->createMark(); @@ -197,11 +197,11 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star sal_Int32 nDataLen = InStream->readLong(); sal_uInt32 nCtrls = InStream->readLong(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq( nCtrls ); + css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > aSeq( nCtrls ); for ( sal_uInt32 n = 0; n < nCtrls; n++ ) { - ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject > xObj = InStream->readObject(); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > xI( xObj, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::io::XPersistObject > xObj = InStream->readObject(); + css::uno::Reference< css::awt::XControlModel > xI( xObj, css::uno::UNO_QUERY ); aSeq.getArray()[n] = xI; } @@ -213,39 +213,39 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any StdTabControllerModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any StdTabControllerModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::awt::XTabControllerModel* >(this)), - (static_cast< ::com::sun::star::lang::XServiceInfo* >(this)), - (static_cast< ::com::sun::star::io::XPersistObject* >(this)), - (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::awt::XTabControllerModel* >(this)), + (static_cast< css::lang::XServiceInfo* >(this)), + (static_cast< css::io::XPersistObject* >(this)), + (static_cast< css::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType )); } -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( StdTabControllerModel ) - cppu::UnoType<com::sun::star::awt::XTabControllerModel>::get(), - cppu::UnoType<com::sun::star::lang::XServiceInfo>::get(), - cppu::UnoType<com::sun::star::io::XPersistObject>::get() + cppu::UnoType<css::awt::XTabControllerModel>::get(), + cppu::UnoType<css::lang::XServiceInfo>::get(), + cppu::UnoType<css::io::XPersistObject>::get() IMPL_XTYPEPROVIDER_END -sal_Bool StdTabControllerModel::getGroupControl( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool StdTabControllerModel::getGroupControl( ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mbGroupControl; } -void StdTabControllerModel::setGroupControl( sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void StdTabControllerModel::setGroupControl( sal_Bool GroupControl ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); mbGroupControl = GroupControl; } -void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void StdTabControllerModel::setControlModels( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -253,17 +253,17 @@ void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Seque ImplSetControlModels( maControls, Controls ); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > StdTabControllerModel::getControlModels( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > StdTabControllerModel::getControlModels( ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq( ImplGetControlCount( maControls ) ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > * pRefs = aSeq.getArray(); + css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > aSeq( ImplGetControlCount( maControls ) ); + css::uno::Reference< css::awt::XControlModel > * pRefs = aSeq.getArray(); ImplGetControlModels( &pRefs, maControls ); return aSeq; } -void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void StdTabControllerModel::setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, const OUString& GroupName ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -301,7 +301,7 @@ void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::c maControls.push_back( pNewEntry ); } -sal_Int32 StdTabControllerModel::getGroupCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 StdTabControllerModel::getGroupCount( ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -319,11 +319,11 @@ sal_Int32 StdTabControllerModel::getGroupCount( ) throw(::com::sun::star::uno:: return nGroups; } -void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup, OUString& rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void StdTabControllerModel::getGroup( sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rGroup, OUString& rName ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq; + css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > aSeq; sal_uInt32 nG = 0; size_t nEntries = maControls.size(); for ( size_t n = 0; n < nEntries; n++ ) @@ -334,8 +334,8 @@ void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::S if ( nG == (sal_uInt32)nGroup ) { sal_uInt32 nCount = ImplGetControlCount( *pEntry->pGroup ); - aSeq = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >( nCount ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > * pRefs = aSeq.getArray(); + aSeq = css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >( nCount ); + css::uno::Reference< css::awt::XControlModel > * pRefs = aSeq.getArray(); ImplGetControlModels( &pRefs, *pEntry->pGroup ); rName = pEntry->pGroup->GetName(); break; @@ -346,7 +346,7 @@ void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::S rGroup = aSeq; } -void StdTabControllerModel::getGroupByName( const OUString& rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void StdTabControllerModel::getGroupByName( const OUString& rName, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rGroup ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -369,29 +369,29 @@ void StdTabControllerModel::getGroupByName( const OUString& rName, ::com::sun::s } -// ::com::sun::star::io::XPersistObject -OUString StdTabControllerModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::io::XPersistObject +OUString StdTabControllerModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_TabControllerModel ); } -void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void StdTabControllerModel::write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XMarkableStream > xMark( OutStream, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::io::XMarkableStream > xMark( OutStream, css::uno::UNO_QUERY ); DBG_ASSERT( xMark.is(), "write: no XMarkableStream!" ); OutStream->writeShort( UNOCONTROL_STREAMVERSION ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aCtrls = getControlModels(); + css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > aCtrls = getControlModels(); ImplWriteControls( OutStream, aCtrls ); sal_uInt32 nGroups = getGroupCount(); OutStream->writeLong( nGroups ); for ( sal_uInt32 n = 0; n < nGroups; n++ ) { - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aGroupCtrls; + css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > aGroupCtrls; OUString aGroupName; getGroup( n, aGroupCtrls, aGroupName ); OutStream->writeUTF( aGroupName ); @@ -399,18 +399,18 @@ void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com } } -void StdTabControllerModel::read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void StdTabControllerModel::read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aSeq = ImplReadControls( InStream ); + css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > aSeq = ImplReadControls( InStream ); setControlModels( aSeq ); sal_uInt32 nGroups = InStream->readLong(); for ( sal_uInt32 n = 0; n < nGroups; n++ ) { OUString aGroupName = InStream->readUTF(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aCtrlSeq = ImplReadControls( InStream ); + css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > aCtrlSeq = ImplReadControls( InStream ); setGroup( aCtrlSeq, aGroupName ); } } diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index e5363402dd84..68cbdda95621 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::view; using ::com::sun::star::awt::tab::XTabPageModel; -#define WRONG_TYPE_EXCEPTION "Type must be ::com::sun::star::awt::tab::XTabPageModel!" +#define WRONG_TYPE_EXCEPTION "Type must be css::awt::tab::XTabPageModel!" // class UnoControlTabPageContainerModel @@ -84,14 +84,14 @@ uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - com::sun::star::uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + css::uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; } -Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlTabPageContainerModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > UnoControlTabPageContainerModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) { - static Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + static Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } @@ -144,7 +144,7 @@ Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage return lcl_createTabPageModel( m_xContext, aInitArgs, this ); } -void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex, const com::sun::star::uno::Any& aElement) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex, const css::uno::Any& aElement) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; uno::Reference < XTabPageModel > xTabPageModel; @@ -196,7 +196,7 @@ uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nInde // XElementAccess uno::Type SAL_CALL UnoControlTabPageContainerModel::getElementType( ) throw (uno::RuntimeException, std::exception) { - return cppu::UnoType<com::sun::star::awt::XControlModel>::get(); + return cppu::UnoType<css::awt::XControlModel>::get(); } sal_Bool SAL_CALL UnoControlTabPageContainerModel::hasElements( ) throw (uno::RuntimeException, std::exception) @@ -273,19 +273,19 @@ sal_Bool SAL_CALL UnoControlTabPageContainer::isTabPageActive( ::sal_Int16 tabPa Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->isTabPageActive(tabPageIndex); } -Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception) +Reference< css::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->getTabPage(tabPageIndex); } -Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException, std::exception) +Reference< css::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->getTabPageByID(tabPageID); } -void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) { m_aTabPageListeners.addInterface( listener ); if( getPeer().is() && m_aTabPageListeners.getLength() == 1 ) @@ -294,7 +294,7 @@ void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Ref xTabPageContainer->addTabPageContainerListener( &m_aTabPageListeners ); } } -void SAL_CALL UnoControlTabPageContainer::removeTabPageContainerListener( const Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainer::removeTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) { if( getPeer().is() && m_aTabPageListeners.getLength() == 1 ) { @@ -322,7 +322,7 @@ void UnoControlTabPageContainer::updateFromModel() xContainerListener->elementInserted( aEvent ); } } -void SAL_CALL UnoControlTabPageContainer::addControl( const OUString& Name, const Reference< ::com::sun::star::awt::XControl >& Control ) throw (RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainer::addControl( const OUString& Name, const Reference< css::awt::XControl >& Control ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ControlContainerBase::addControl(Name,Control); diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 1a495931319d..175f06392324 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -111,7 +111,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTabPageModel::getPropertySet } ////----- XInitialization ------------------------------------------------------------------- void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArguments) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { sal_Int16 nPageId = -1; if ( rArguments.getLength() == 1 ) @@ -238,9 +238,9 @@ static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize ::Size aTmp = pOutDev->PixelToLogic( aSize, MAP_APPFONT ); return aTmp; } -// ::com::sun::star::awt::XWindowListener -void SAL_CALL UnoControlTabPage::windowResized( const ::com::sun::star::awt::WindowEvent& e ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XWindowListener +void SAL_CALL UnoControlTabPage::windowResized( const css::awt::WindowEvent& e ) +throw (css::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -277,8 +277,8 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } } -void SAL_CALL UnoControlTabPage::windowMoved( const ::com::sun::star::awt::WindowEvent& e ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UnoControlTabPage::windowMoved( const css::awt::WindowEvent& e ) +throw (css::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -303,14 +303,14 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } } -void SAL_CALL UnoControlTabPage::windowShown( const ::com::sun::star::lang::EventObject& e ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UnoControlTabPage::windowShown( const css::lang::EventObject& e ) +throw (css::uno::RuntimeException, std::exception) { (void)e; } -void SAL_CALL UnoControlTabPage::windowHidden( const ::com::sun::star::lang::EventObject& e ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UnoControlTabPage::windowHidden( const css::lang::EventObject& e ) +throw (css::uno::RuntimeException, std::exception) { (void)e; } diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index 114b04fe15fc..b08216cb2d8a 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -44,7 +44,7 @@ namespace toolkit } - OUString UnoControlScrollBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) + OUString UnoControlScrollBarModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlScrollBarModel ); } @@ -114,7 +114,7 @@ namespace toolkit return OUString("ScrollBar"); } - // ::com::sun::star::uno::XInterface + // css::uno::XInterface uno::Any UnoScrollBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, @@ -123,7 +123,7 @@ namespace toolkit return (aRet.hasValue() ? aRet : UnoControlBase::queryAggregation( rType )); } - // ::com::sun::star::lang::XTypeProvider + // css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoScrollBarControl ) cppu::UnoType<awt::XAdjustmentListener>::get(), cppu::UnoType<awt::XScrollBar>::get(), @@ -146,14 +146,14 @@ namespace toolkit xScrollBar->addAdjustmentListener( this ); } - // ::com::sun::star::awt::XAdjustmentListener - void UnoScrollBarControl::adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) + // css::awt::XAdjustmentListener + void UnoScrollBarControl::adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) { switch ( rEvent.Type ) { - case ::com::sun::star::awt::AdjustmentType_ADJUST_LINE: - case ::com::sun::star::awt::AdjustmentType_ADJUST_PAGE: - case ::com::sun::star::awt::AdjustmentType_ADJUST_ABS: + case css::awt::AdjustmentType_ADJUST_LINE: + case css::awt::AdjustmentType_ADJUST_PAGE: + case css::awt::AdjustmentType_ADJUST_ABS: { uno::Reference< awt::XScrollBar > xScrollBar( getPeer(), uno::UNO_QUERY ); @@ -176,23 +176,23 @@ namespace toolkit maAdjustmentListeners.adjustmentValueChanged( rEvent ); } - // ::com::sun::star::awt::XScrollBar - void UnoScrollBarControl::addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) + // css::awt::XScrollBar + void UnoScrollBarControl::addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) throw(css::uno::RuntimeException, std::exception) { maAdjustmentListeners.addInterface( l ); } - void UnoScrollBarControl::removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void UnoScrollBarControl::removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) throw(css::uno::RuntimeException, std::exception) { maAdjustmentListeners.removeInterface( l ); } - void UnoScrollBarControl::setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setValue( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), uno::makeAny( n ), true ); } - void UnoScrollBarControl::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= nValue; @@ -203,7 +203,7 @@ namespace toolkit ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), aAny, true ); } - sal_Int32 UnoScrollBarControl::getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getValue() throw(css::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) @@ -214,12 +214,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setMaximum( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getMaximum() throw(::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getMaximum() throw(css::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) @@ -230,12 +230,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setLineIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINEINCREMENT ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getLineIncrement() throw(::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getLineIncrement() throw(css::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) @@ -246,12 +246,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setBlockIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BLOCKINCREMENT ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getBlockIncrement() throw(::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getBlockIncrement() throw(css::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) @@ -262,12 +262,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setVisibleSize( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VISIBLESIZE ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getVisibleSize() throw(::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getVisibleSize() throw(css::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) @@ -278,12 +278,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setOrientation( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getOrientation() throw(::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getOrientation() throw(css::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index 9b3866a08873..7f46bc83c3b5 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -117,7 +117,7 @@ public: //= UnoSpinButtonModel - UnoSpinButtonModel::UnoSpinButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ) + UnoSpinButtonModel::UnoSpinButtonModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ) :UnoControlModel( i_factory ) { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index ba13b62a6c1a..70196f6ccb5f 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -44,7 +44,7 @@ namespace toolkit // class UnoTreeModel -UnoTreeModel::UnoTreeModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ) +UnoTreeModel::UnoTreeModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ) :UnoControlModel( i_factory ) { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -204,7 +204,7 @@ OUString UnoTreeControl::GetComponentServiceName() } -// ::com::sun::star::view::XSelectionSupplier +// css::view::XSelectionSupplier sal_Bool SAL_CALL UnoTreeControl::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) @@ -246,7 +246,7 @@ void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XS } -// ::com::sun::star::view::XMultiSelectionSupplier +// css::view::XMultiSelectionSupplier sal_Bool SAL_CALL UnoTreeControl::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) @@ -488,7 +488,7 @@ void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk } -void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNode >& Node ) throw (RuntimeException, ::com::sun::star::util::VetoException, std::exception) +void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNode >& Node ) throw (RuntimeException, css::util::VetoException, std::exception) { ::cppu::OInterfaceIteratorHelper aIt( *this ); while( aIt.hasMoreElements() ) diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx index 0b7f06bac3d8..6b014d84d5e1 100644 --- a/toolkit/source/controls/tree/treecontrol.hxx +++ b/toolkit/source/controls/tree/treecontrol.hxx @@ -37,16 +37,16 @@ protected: ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - explicit UnoTreeModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); + explicit UnoTreeModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ); UnoTreeModel( const UnoTreeModel& rModel ); UnoControlModel* Clone() const override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo OUString SAL_CALL getImplementationName() diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index bb773f0d05ea..ad9a9031909a 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -59,13 +59,13 @@ public: void broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >* pNodes, sal_Int32 nNodes ); // XMutableTreeDataModel - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode > SAL_CALL createNode( const ::com::sun::star::uno::Any& DisplayValue, sal_Bool ChildrenOnDemand ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRoot( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode >& RootNode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tree::XMutableTreeNode > SAL_CALL createNode( const css::uno::Any& DisplayValue, sal_Bool ChildrenOnDemand ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRoot( const css::uno::Reference< css::awt::tree::XMutableTreeNode >& RootNode ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XTreeDataModel - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getRoot( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addTreeDataModelListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModelListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTreeDataModelListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModelListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getRoot( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTreeDataModelListener( const css::uno::Reference< css::awt::tree::XTreeDataModelListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTreeDataModelListener( const css::uno::Reference< css::awt::tree::XTreeDataModelListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose( ) throw (RuntimeException, std::exception) override; @@ -95,27 +95,27 @@ public: void broadcast_changes(const Reference< XTreeNode >& xNode, bool bNew); // XMutableTreeNode - virtual ::com::sun::star::uno::Any SAL_CALL getDataValue() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataValue( const ::com::sun::star::uno::Any& _datavalue ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode >& ChildNode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertChildByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode >& ChildNode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChildByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHasChildrenOnDemand( sal_Bool ChildrenOnDemand ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayValue( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNodeGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setExpandedGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCollapsedGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getDataValue() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDataValue( const css::uno::Any& _datavalue ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL appendChild( const css::uno::Reference< css::awt::tree::XMutableTreeNode >& ChildNode ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertChildByIndex( ::sal_Int32 Index, const css::uno::Reference< css::awt::tree::XMutableTreeNode >& ChildNode ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeChildByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHasChildrenOnDemand( sal_Bool ChildrenOnDemand ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDisplayValue( const css::uno::Any& Value ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNodeGraphicURL( const OUString& URL ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setExpandedGraphicURL( const OUString& URL ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCollapsedGraphicURL( const OUString& URL ) throw (css::uno::RuntimeException, std::exception) override; // XTreeNode - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getChildAt( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasChildrenOnDemand( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getDisplayValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeGraphicURL( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExpandedGraphicURL( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCollapsedGraphicURL( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getChildAt( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getIndex( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasChildrenOnDemand( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getDisplayValue( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNodeGraphicURL( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getExpandedGraphicURL( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCollapsedGraphicURL( ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; @@ -230,7 +230,7 @@ void SAL_CALL MutableTreeDataModel::dispose() throw (RuntimeException, std::exce if( !mbDisposed ) { mbDisposed = true; - ::com::sun::star::lang::EventObject aEvent; + css::lang::EventObject aEvent; aEvent.Source.set( static_cast< ::cppu::OWeakObject* >( this ) ); BrdcstHelper.aLC.disposeAndClear( aEvent ); } diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx index 7cfec1dc6373..e29cd7fced5b 100644 --- a/toolkit/source/controls/unocontrolbase.cxx +++ b/toolkit/source/controls/unocontrolbase.cxx @@ -40,19 +40,19 @@ bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId ) bool UnoControlBase::ImplHasProperty( const OUString& aPropertyName ) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet( mxModel, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XPropertySet > xPSet( mxModel, css::uno::UNO_QUERY ); if ( !xPSet.is() ) return false; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); + css::uno::Reference< css::beans::XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); if ( !xInfo.is() ) return false; return xInfo->hasPropertyByName( aPropertyName ); } -void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, bool bUpdateThis ) +void UnoControlBase::ImplSetPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues, bool bUpdateThis ) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > xMPS( mxModel, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XMultiPropertySet > xMPS( mxModel, css::uno::UNO_QUERY ); if ( !mxModel.is() ) return; @@ -66,7 +66,7 @@ void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequenc { xMPS->setPropertyValues( aPropertyNames, aValues ); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { if ( !bUpdateThis ) ImplLockPropertyChangeNotifications( aPropertyNames, false ); @@ -81,12 +81,12 @@ void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequenc } } -void UnoControlBase::ImplSetPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, bool bUpdateThis ) +void UnoControlBase::ImplSetPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue, bool bUpdateThis ) { // Model might be logged off already but an event still fires if ( mxModel.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet( mxModel, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XPropertySet > xPSet( mxModel, css::uno::UNO_QUERY ); if ( !bUpdateThis ) ImplLockPropertyChangeNotification( aPropertyName, true ); @@ -94,7 +94,7 @@ void UnoControlBase::ImplSetPropertyValue( const OUString& aPropertyName, const { xPSet->setPropertyValue( aPropertyName, aValue ); } - catch( const com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { if ( !bUpdateThis ) ImplLockPropertyChangeNotification( aPropertyName, false ); @@ -105,13 +105,13 @@ void UnoControlBase::ImplSetPropertyValue( const OUString& aPropertyName, const } } -::com::sun::star::uno::Any UnoControlBase::ImplGetPropertyValue( const OUString& aPropertyName ) +css::uno::Any UnoControlBase::ImplGetPropertyValue( const OUString& aPropertyName ) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet( mxModel, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XPropertySet > xPSet( mxModel, css::uno::UNO_QUERY ); if ( xPSet.is() ) return xPSet->getPropertyValue( aPropertyName ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } template <typename T> T UnoControlBase::ImplGetPropertyValuePOD( sal_uInt16 nProp ) @@ -119,7 +119,7 @@ template <typename T> T UnoControlBase::ImplGetPropertyValuePOD( sal_uInt16 nPro T t(0); if ( mxModel.is() ) { - ::com::sun::star::uno::Any aVal = ImplGetPropertyValue( GetPropertyName( nProp ) ); + css::uno::Any aVal = ImplGetPropertyValue( GetPropertyName( nProp ) ); aVal >>= t; } return t; @@ -130,7 +130,7 @@ template <typename T> T UnoControlBase::ImplGetPropertyValueClass( sal_uInt16 nP T t; if ( mxModel.is() ) { - ::com::sun::star::uno::Any aVal = ImplGetPropertyValue( GetPropertyName( nProp ) ); + css::uno::Any aVal = ImplGetPropertyValue( GetPropertyName( nProp ) ); aVal >>= t; } return t; @@ -171,14 +171,14 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp ) return ImplGetPropertyValueClass<util::Time>(nProp); } -::com::sun::star::awt::Size UnoControlBase::Impl_getMinimumSize() +css::awt::Size UnoControlBase::Impl_getMinimumSize() { - ::com::sun::star::awt::Size aSz; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); + css::awt::Size aSz; + css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); DBG_ASSERT( xP.is(), "Layout: No Peer!" ); if ( xP.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XLayoutConstrains > xL( xP, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::awt::XLayoutConstrains > xL( xP, css::uno::UNO_QUERY ); if ( xL.is() ) aSz = xL->getMinimumSize(); @@ -188,14 +188,14 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp ) return aSz; } -::com::sun::star::awt::Size UnoControlBase::Impl_getPreferredSize() +css::awt::Size UnoControlBase::Impl_getPreferredSize() { - ::com::sun::star::awt::Size aSz; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); + css::awt::Size aSz; + css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); DBG_ASSERT( xP.is(), "Layout: No Peer!" ); if ( xP.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XLayoutConstrains > xL( xP, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::awt::XLayoutConstrains > xL( xP, css::uno::UNO_QUERY ); if ( xL.is() ) aSz = xL->getPreferredSize(); @@ -205,14 +205,14 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp ) return aSz; } -::com::sun::star::awt::Size UnoControlBase::Impl_calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) +css::awt::Size UnoControlBase::Impl_calcAdjustedSize( const css::awt::Size& rNewSize ) { - ::com::sun::star::awt::Size aSz; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); + css::awt::Size aSz; + css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); DBG_ASSERT( xP.is(), "Layout: No Peer!" ); if ( xP.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XLayoutConstrains > xL( xP, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::awt::XLayoutConstrains > xL( xP, css::uno::UNO_QUERY ); if ( xL.is() ) aSz = xL->calcAdjustedSize( rNewSize ); @@ -222,14 +222,14 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp ) return aSz; } -::com::sun::star::awt::Size UnoControlBase::Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) +css::awt::Size UnoControlBase::Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) { - ::com::sun::star::awt::Size aSz; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); + css::awt::Size aSz; + css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); DBG_ASSERT( xP.is(), "Layout: No Peer!" ); if ( xP.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextLayoutConstrains > xL( xP, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::awt::XTextLayoutConstrains > xL( xP, css::uno::UNO_QUERY ); if ( xL.is() ) aSz = xL->getMinimumSize( nCols, nLines ); @@ -241,11 +241,11 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp ) void UnoControlBase::Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); + css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); DBG_ASSERT( xP.is(), "Layout: No Peer!" ); if ( xP.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextLayoutConstrains > xL( xP, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::awt::XTextLayoutConstrains > xL( xP, css::uno::UNO_QUERY ); if ( xL.is() ) xL->getColumnsAndLines( nCols, nLines ); diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 6e9287c938db..5cc00ea55ff3 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -776,7 +776,7 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT OUString aPropName( "Step" ); if ( xInfo->hasPropertyByName( aPropName ) ) { - ::com::sun::star::uno::Any aVal = xPSet->getPropertyValue( aPropName ); + css::uno::Any aVal = xPSet->getPropertyValue( aPropName ); sal_Int32 nDialogStep = 0; aVal >>= nDialogStep; uno::Reference< awt::XControlContainer > xContainer = @@ -833,24 +833,24 @@ css::uno::Sequence<OUString> UnoControlContainer::getSupportedServiceNames() return s; } -void UnoControlContainer::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ) +void UnoControlContainer::PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ) { // HACK due to the fact that we can't really use VSCROLL & HSCROLL - // for Dialog ( ::com::sun::star::awt::VclWindowPeerAttribute::VSCROLL + // for Dialog ( css::awt::VclWindowPeerAttribute::VSCROLL // has the same value as - // ::com::sun::star::awt::WindowAttribute::NODECORATION ) + // css::awt::WindowAttribute::NODECORATION ) // For convenience in the PropBrowse using HSCROLL and VSCROLL ensures // the Correct text. We exchange them here and the control knows // about this hack ( it sucks badly I know ) - if ( rDesc.WindowAttributes & ::com::sun::star::awt::VclWindowPeerAttribute::VSCROLL ) + if ( rDesc.WindowAttributes & css::awt::VclWindowPeerAttribute::VSCROLL ) { - rDesc.WindowAttributes &= ~::com::sun::star::awt::VclWindowPeerAttribute::VSCROLL; - rDesc.WindowAttributes |= ::com::sun::star::awt::VclWindowPeerAttribute::AUTOVSCROLL; + rDesc.WindowAttributes &= ~css::awt::VclWindowPeerAttribute::VSCROLL; + rDesc.WindowAttributes |= css::awt::VclWindowPeerAttribute::AUTOVSCROLL; } - if ( rDesc.WindowAttributes & ::com::sun::star::awt::VclWindowPeerAttribute::HSCROLL ) + if ( rDesc.WindowAttributes & css::awt::VclWindowPeerAttribute::HSCROLL ) { - rDesc.WindowAttributes &= ~::com::sun::star::awt::VclWindowPeerAttribute::HSCROLL; - rDesc.WindowAttributes |= ::com::sun::star::awt::VclWindowPeerAttribute::AUTOHSCROLL; + rDesc.WindowAttributes &= ~css::awt::VclWindowPeerAttribute::HSCROLL; + rDesc.WindowAttributes |= css::awt::VclWindowPeerAttribute::AUTOHSCROLL; } } diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index 5784645fc29e..864a07738cf1 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -26,7 +26,7 @@ // class UnoControlContainerModel -UnoControlContainerModel::UnoControlContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ) +UnoControlContainerModel::UnoControlContainerModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ) :UnoControlModel( i_factory ) { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); @@ -40,7 +40,7 @@ UnoControlContainerModel::UnoControlContainerModel( const ::com::sun::star::uno: ImplRegisterProperty( BASEPROPERTY_TEXT ); } -OUString UnoControlContainerModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlContainerModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlContainerModel ); } @@ -62,9 +62,9 @@ UnoControlContainerModel::getSupportedServiceNames() return s; } -::com::sun::star::uno::Any UnoControlContainerModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const +css::uno::Any UnoControlContainerModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { - ::com::sun::star::uno::Any aDefault; + css::uno::Any aDefault; if ( nPropId == BASEPROPERTY_BORDER ) aDefault <<= (sal_Int16) 0; else @@ -73,9 +73,9 @@ UnoControlContainerModel::getSupportedServiceNames() } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlContainerModel::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > UnoControlContainerModel::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { - static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } @@ -86,7 +86,7 @@ UnoControlContainerModel::getSupportedServiceNames() static UnoPropertyArrayHelper* pHelper = NULL; if ( !pHelper ) { - ::com::sun::star::uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); + css::uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); pHelper = new UnoPropertyArrayHelper( aIDs ); } return *pHelper; diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 62095125dd86..75add058c1d3 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -84,7 +84,7 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT: rValue >>= rFD.Weight; break; case BASEPROPERTY_FONTDESCRIPTORPART_SLANT: if ( rValue >>= nExtractShort ) - rFD.Slant = (::com::sun::star::awt::FontSlant)nExtractShort; + rFD.Slant = (css::awt::FontSlant)nExtractShort; else rValue >>= rFD.Slant; break; @@ -134,10 +134,10 @@ UnoControlModel::UnoControlModel( const UnoControlModel& rModel ) { } -::com::sun::star::uno::Sequence<sal_Int32> UnoControlModel::ImplGetPropertyIds() const +css::uno::Sequence<sal_Int32> UnoControlModel::ImplGetPropertyIds() const { sal_uInt32 nIDs = maData.size(); - ::com::sun::star::uno::Sequence<sal_Int32> aIDs( nIDs ); + css::uno::Sequence<sal_Int32> aIDs( nIDs ); sal_Int32* pIDs = aIDs.getArray(); sal_uInt32 n = 0; for ( ImplPropertyTable::const_iterator it = maData.begin(); it != maData.end(); ++it ) @@ -153,9 +153,9 @@ bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const return maData.find( nPropId ) != maData.end(); } -::com::sun::star::uno::Any UnoControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const +css::uno::Any UnoControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { - ::com::sun::star::uno::Any aDefault; + css::uno::Any aDefault; if ( (nPropId == BASEPROPERTY_FONTDESCRIPTOR) || @@ -304,14 +304,14 @@ bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_STRINGITEMLIST: { - ::com::sun::star::uno::Sequence< OUString> aStringSeq; + css::uno::Sequence< OUString> aStringSeq; aDefault <<= aStringSeq; } break; case BASEPROPERTY_SELECTEDITEMS: { - ::com::sun::star::uno::Sequence<sal_Int16> aINT16Seq; + css::uno::Sequence<sal_Int16> aINT16Seq; aDefault <<= aINT16Seq; } break; @@ -378,7 +378,7 @@ bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const return aDefault; } -void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId, const ::com::sun::star::uno::Any& rDefault ) +void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId, const css::uno::Any& rDefault ) { maData[ nPropId ] = rDefault; } @@ -410,8 +410,8 @@ void UnoControlModel::ImplRegisterProperties( const std::list< sal_uInt16 > &rId } } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any UnoControlModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any UnoControlModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { Any aRet = UnoControlModel_Base::queryAggregation( rType ); if ( !aRet.hasValue() ) @@ -419,30 +419,30 @@ void UnoControlModel::ImplRegisterProperties( const std::list< sal_uInt16 > &rId return aRet; } -// ::com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel IMPL_XUNOTUNNEL_MINIMAL( UnoControlModel ) // XInterface IMPLEMENT_FORWARD_REFCOUNT( UnoControlModel, UnoControlModel_Base ) -// ::com::sun::star::lang::XTypeProvider +// css::lang::XTypeProvider IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlModel, UnoControlModel_Base, ::cppu::OPropertySetHelper ) -uno::Reference< util::XCloneable > UnoControlModel::createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< util::XCloneable > UnoControlModel::createClone() throw(css::uno::RuntimeException, std::exception) { UnoControlModel* pClone = Clone(); uno::Reference< util::XCloneable > xClone( static_cast<cppu::OWeakObject*>(pClone), uno::UNO_QUERY ); return xClone; } -// ::com::sun::star::lang::XComponent -void UnoControlModel::dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::lang::XComponent +void UnoControlModel::dispose( ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::lang::EventObject aEvt; - aEvt.Source = static_cast<com::sun::star::uno::XAggregation*>(static_cast<cppu::OWeakAggObject*>(this)); + css::lang::EventObject aEvt; + aEvt.Source = static_cast<css::uno::XAggregation*>(static_cast<cppu::OWeakAggObject*>(this)); maDisposeListeners.disposeAndClear( aEvt ); BrdcstHelper.aLC.disposeAndClear( aEvt ); @@ -451,14 +451,14 @@ void UnoControlModel::dispose( ) throw(::com::sun::star::uno::RuntimeException, OPropertySetHelper::disposing(); } -void UnoControlModel::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void UnoControlModel::addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maDisposeListeners.addInterface( rxListener ); } -void UnoControlModel::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void UnoControlModel::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -466,28 +466,28 @@ void UnoControlModel::removeEventListener( const ::com::sun::star::uno::Referenc } -// ::com::sun::star::beans::XPropertyState -::com::sun::star::beans::PropertyState UnoControlModel::getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) +// css::beans::XPropertyState +css::beans::PropertyState UnoControlModel::getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); sal_uInt16 nPropId = GetPropertyId( PropertyName ); - ::com::sun::star::uno::Any aValue = getPropertyValue( PropertyName ); - ::com::sun::star::uno::Any aDefault = ImplGetDefaultValue( nPropId ); + css::uno::Any aValue = getPropertyValue( PropertyName ); + css::uno::Any aDefault = ImplGetDefaultValue( nPropId ); - return CompareProperties( aValue, aDefault ) ? ::com::sun::star::beans::PropertyState_DEFAULT_VALUE : ::com::sun::star::beans::PropertyState_DIRECT_VALUE; + return CompareProperties( aValue, aDefault ) ? css::beans::PropertyState_DEFAULT_VALUE : css::beans::PropertyState_DIRECT_VALUE; } -::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > UnoControlModel::getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::beans::PropertyState > UnoControlModel::getPropertyStates( const css::uno::Sequence< OUString >& PropertyNames ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); sal_uInt32 nNames = PropertyNames.getLength(); const OUString* pNames = PropertyNames.getConstArray(); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > aStates( nNames ); - ::com::sun::star::beans::PropertyState* pStates = aStates.getArray(); + css::uno::Sequence< css::beans::PropertyState > aStates( nNames ); + css::beans::PropertyState* pStates = aStates.getArray(); for ( sal_uInt32 n = 0; n < nNames; n++ ) pStates[n] = getPropertyState( pNames[n] ); @@ -495,7 +495,7 @@ void UnoControlModel::removeEventListener( const ::com::sun::star::uno::Referenc return aStates; } -void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) +void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { Any aDefaultValue; { @@ -505,7 +505,7 @@ void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw setPropertyValue( PropertyName, aDefaultValue ); } -::com::sun::star::uno::Any UnoControlModel::getPropertyDefault( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any UnoControlModel::getPropertyDefault( const OUString& rPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -513,8 +513,8 @@ void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw } -// ::com::sun::star::io::XPersistObjec -OUString UnoControlModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::io::XPersistObjec +OUString UnoControlModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -522,12 +522,12 @@ OUString UnoControlModel::getServiceName( ) throw(::com::sun::star::uno::Runtim return OUString(); } -void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XMarkableStream > xMark( OutStream, ::com::sun::star::uno::UNO_QUERY ); - DBG_ASSERT( xMark.is(), "write: no ::com::sun::star::io::XMarkableStream!" ); + css::uno::Reference< css::io::XMarkableStream > xMark( OutStream, css::uno::UNO_QUERY ); + DBG_ASSERT( xMark.is(), "write: no css::io::XMarkableStream!" ); OutStream->writeShort( UNOCONTROL_STREAMVERSION ); @@ -535,8 +535,8 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: for (ImplPropertyTable::const_iterator it = maData.begin(); it != maData.end(); ++it ) { - if ( ( ( GetPropertyAttribs( it->first ) & ::com::sun::star::beans::PropertyAttribute::TRANSIENT ) == 0 ) - && ( getPropertyState( GetPropertyName( it->first ) ) != ::com::sun::star::beans::PropertyState_DEFAULT_VALUE ) ) + if ( ( ( GetPropertyAttribs( it->first ) & css::beans::PropertyAttribute::TRANSIENT ) == 0 ) + && ( getPropertyState( GetPropertyName( it->first ) ) != css::beans::PropertyState_DEFAULT_VALUE ) ) { aProps.insert( it->first ); } @@ -552,17 +552,17 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: sal_Int32 nPropDataBeginMark = xMark->createMark(); OutStream->writeLong( 0L ); // DataLen - const ::com::sun::star::uno::Any* pProp = &(maData[*it]); + const css::uno::Any* pProp = &(maData[*it]); OutStream->writeShort( *it ); - bool bVoid = pProp->getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; + bool bVoid = pProp->getValueType().getTypeClass() == css::uno::TypeClass_VOID; OutStream->writeBoolean( bVoid ); if ( !bVoid ) { - const ::com::sun::star::uno::Any& rValue = *pProp; - const ::com::sun::star::uno::Type& rType = rValue.getValueType(); + const css::uno::Any& rValue = *pProp; + const css::uno::Type& rType = rValue.getValueType(); if ( rType == cppu::UnoType< bool >::get() ) { @@ -606,9 +606,9 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: rValue >>= n; OutStream->writeDouble( n ); } - else if ( rType == cppu::UnoType< ::com::sun::star::awt::FontDescriptor >::get() ) + else if ( rType == cppu::UnoType< css::awt::FontDescriptor >::get() ) { - ::com::sun::star::awt::FontDescriptor aFD; + css::awt::FontDescriptor aFD; rValue >>= aFD; OutStream->writeUTF( aFD.Name ); OutStream->writeShort( aFD.Height ); @@ -643,9 +643,9 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: t.NanoSeconds / 1000000 + 100 * t.Seconds + 10000 * t.Minutes + 1000000 * t.Hours); // HHMMSShh } - else if ( rType == cppu::UnoType< ::com::sun::star::uno::Sequence< OUString> >::get() ) + else if ( rType == cppu::UnoType< css::uno::Sequence< OUString> >::get() ) { - ::com::sun::star::uno::Sequence< OUString> aSeq; + css::uno::Sequence< OUString> aSeq; rValue >>= aSeq; long nEntries = aSeq.getLength(); OutStream->writeLong( nEntries ); @@ -654,16 +654,16 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: } else if ( rType == cppu::UnoType< cppu::UnoSequenceType<cppu::UnoUnsignedShortType> >::get() ) { - ::com::sun::star::uno::Sequence<sal_uInt16> aSeq; + css::uno::Sequence<sal_uInt16> aSeq; rValue >>= aSeq; long nEntries = aSeq.getLength(); OutStream->writeLong( nEntries ); for ( long n = 0; n < nEntries; n++ ) OutStream->writeShort( aSeq.getConstArray()[n] ); } - else if ( rType == cppu::UnoType< ::com::sun::star::uno::Sequence<sal_Int16> >::get() ) + else if ( rType == cppu::UnoType< css::uno::Sequence<sal_Int16> >::get() ) { - ::com::sun::star::uno::Sequence<sal_Int16> aSeq; + css::uno::Sequence<sal_Int16> aSeq; rValue >>= aSeq; long nEntries = aSeq.getLength(); OutStream->writeLong( nEntries ); @@ -700,9 +700,9 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: if ( aProps.find( BASEPROPERTY_FONTDESCRIPTOR ) != aProps.end() ) { - const ::com::sun::star::uno::Any* pProp = &maData[ BASEPROPERTY_FONTDESCRIPTOR ]; + const css::uno::Any* pProp = &maData[ BASEPROPERTY_FONTDESCRIPTOR ]; // Until 5.0 export arrives, write old format.. - ::com::sun::star::awt::FontDescriptor aFD; + css::awt::FontDescriptor aFD; (*pProp) >>= aFD; for ( sal_uInt16 n = BASEPROPERTY_FONT_TYPE; n <= BASEPROPERTY_FONT_ATTRIBS; n++ ) @@ -755,24 +755,24 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: } } -void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XMarkableStream > xMark( InStream, ::com::sun::star::uno::UNO_QUERY ); - DBG_ASSERT( xMark.is(), "read: no ::com::sun::star::io::XMarkableStream!" ); + css::uno::Reference< css::io::XMarkableStream > xMark( InStream, css::uno::UNO_QUERY ); + DBG_ASSERT( xMark.is(), "read: no css::io::XMarkableStream!" ); short nVersion = InStream->readShort(); sal_uInt32 nProps = (sal_uInt32)InStream->readLong(); - ::com::sun::star::uno::Sequence< OUString> aProps( nProps ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> aValues( nProps ); + css::uno::Sequence< OUString> aProps( nProps ); + css::uno::Sequence< css::uno::Any> aValues( nProps ); bool bInvalidEntries = false; // Unfortunately, there's no mark for the whole block, thus only properties may be changed. // No data for the model may be added following the properties - // Used for import of old parts in ::com::sun::star::awt::FontDescriptor - ::com::sun::star::awt::FontDescriptor* pFD = NULL; + // Used for import of old parts in css::awt::FontDescriptor + css::awt::FontDescriptor* pFD = NULL; sal_uInt32 i; for ( i = 0; i < nProps; i++ ) @@ -782,13 +782,13 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: sal_uInt16 nPropId = (sal_uInt16)InStream->readShort(); - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; bool bIsVoid = InStream->readBoolean(); if ( !bIsVoid ) { if ( maData.find( nPropId ) != maData.end() ) { - const ::com::sun::star::uno::Type* pType = GetPropertyType( nPropId ); + const css::uno::Type* pType = GetPropertyType( nPropId ); if ( *pType == cppu::UnoType<bool>::get() ) { bool b = InStream->readBoolean(); @@ -824,9 +824,9 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: double n = InStream->readDouble(); aValue <<= n; } - else if ( *pType == cppu::UnoType< ::com::sun::star::awt::FontDescriptor >::get() ) + else if ( *pType == cppu::UnoType< css::awt::FontDescriptor >::get() ) { - ::com::sun::star::awt::FontDescriptor aFD; + css::awt::FontDescriptor aFD; aFD.Name = InStream->readUTF(); aFD.Height = InStream->readShort(); aFD.Width = InStream->readShort(); @@ -836,7 +836,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: aFD.Pitch = InStream->readShort(); aFD.CharacterWidth = (float)InStream->readDouble(); aFD.Weight = (float)InStream->readDouble(); - aFD.Slant = (::com::sun::star::awt::FontSlant)InStream->readShort(); + aFD.Slant = (css::awt::FontSlant)InStream->readShort(); aFD.Underline = InStream->readShort(); aFD.Strikeout = InStream->readShort(); aFD.Orientation = (float)InStream->readDouble(); @@ -858,10 +858,10 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: (n % 100) * 1000000, (n / 100) % 100, (n / 10000) % 100, n / 1000000, false); } - else if ( *pType == cppu::UnoType< ::com::sun::star::uno::Sequence< OUString> >::get() ) + else if ( *pType == cppu::UnoType< css::uno::Sequence< OUString> >::get() ) { long nEntries = InStream->readLong(); - ::com::sun::star::uno::Sequence< OUString> aSeq( nEntries ); + css::uno::Sequence< OUString> aSeq( nEntries ); for ( long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = InStream->readUTF(); aValue <<= aSeq; @@ -871,15 +871,15 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { long nEntries = InStream->readLong(); - ::com::sun::star::uno::Sequence<sal_uInt16> aSeq( nEntries ); + css::uno::Sequence<sal_uInt16> aSeq( nEntries ); for ( long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = (sal_uInt16)InStream->readShort(); aValue <<= aSeq; } - else if ( *pType == cppu::UnoType< ::com::sun::star::uno::Sequence<sal_Int16> >::get() ) + else if ( *pType == cppu::UnoType< css::uno::Sequence<sal_Int16> >::get() ) { long nEntries = InStream->readLong(); - ::com::sun::star::uno::Sequence<sal_Int16> aSeq( nEntries ); + css::uno::Sequence<sal_Int16> aSeq( nEntries ); for ( long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = (sal_Int16)InStream->readShort(); aValue <<= aSeq; @@ -912,7 +912,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { if ( !pFD ) { - pFD = new ::com::sun::star::awt::FontDescriptor; + pFD = new css::awt::FontDescriptor; if ( maData.find( BASEPROPERTY_FONTDESCRIPTOR ) != maData.end() ) // wegen den Defaults... maData[ BASEPROPERTY_FONTDESCRIPTOR ] >>= *pFD; } @@ -929,15 +929,15 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { if ( !pFD ) { - pFD = new ::com::sun::star::awt::FontDescriptor; + pFD = new css::awt::FontDescriptor; if ( maData.find(BASEPROPERTY_FONTDESCRIPTOR) != maData.end() ) // due to defaults... maData[BASEPROPERTY_FONTDESCRIPTOR] >>= *pFD; } pFD->Width = (sal_Int16)InStream->readLong(); pFD->Height = (sal_Int16)InStream->readLong(); - InStream->readShort(); // ignore ::com::sun::star::awt::FontWidth - it was + InStream->readShort(); // ignore css::awt::FontWidth - it was // misspelled and is no longer needed - pFD->CharacterWidth = ::com::sun::star::awt::FontWidth::DONTKNOW; + pFD->CharacterWidth = css::awt::FontWidth::DONTKNOW; } } else if ( nPropId == BASEPROPERTY_FONT_ATTRIBS ) @@ -946,12 +946,12 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: { if ( !pFD ) { - pFD = new ::com::sun::star::awt::FontDescriptor; + pFD = new css::awt::FontDescriptor; if ( maData.find(BASEPROPERTY_FONTDESCRIPTOR) != maData.end() ) // due to defaults... maData[BASEPROPERTY_FONTDESCRIPTOR] >>= *pFD; } pFD->Weight = VCLUnoHelper::ConvertFontWeight( (FontWeight) InStream->readShort() ); - pFD->Slant = (::com::sun::star::awt::FontSlant)InStream->readShort(); + pFD->Slant = (css::awt::FontSlant)InStream->readShort(); pFD->Underline = InStream->readShort(); pFD->Strikeout = InStream->readShort(); pFD->Orientation = ( (float)(double)InStream->readShort() ) / 10; @@ -1013,7 +1013,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: if ( pFD ) { - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; aValue <<= *pFD; setPropertyValue( GetPropertyName( BASEPROPERTY_FONTDESCRIPTOR ), aValue ); delete pFD; @@ -1021,20 +1021,20 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: } -// ::com::sun::star::lang::XServiceInfo -OUString UnoControlModel::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::lang::XServiceInfo +OUString UnoControlModel::getImplementationName( ) throw(css::uno::RuntimeException, std::exception) { OSL_FAIL( "This method should be overridden!" ); return OUString(); } -sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -::com::sun::star::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) { OUString sName( "com.sun.star.awt.UnoControlModel" ); return Sequence< OUString >( &sName, 1 ); @@ -1044,14 +1044,14 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - bool bVoid = rValue.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; + bool bVoid = rValue.getValueType().getTypeClass() == css::uno::TypeClass_VOID; if ( bVoid ) { rConvertedValue.clear(); } else { - const ::com::sun::star::uno::Type* pDestType = GetPropertyType( (sal_uInt16)nPropId ); + const css::uno::Type* pDestType = GetPropertyType( (sal_uInt16)nPropId ); if ( pDestType->getTypeClass() == TypeClass_ANY ) { rConvertedValue = rValue; @@ -1152,9 +1152,9 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & aErrorMessage.append( "\n" ); aErrorMessage.append( "Found type: " ); aErrorMessage.append ( rValue.getValueType().getTypeName() ); - throw ::com::sun::star::lang::IllegalArgumentException( + throw css::lang::IllegalArgumentException( aErrorMessage.makeStringAndClear(), - static_cast< ::com::sun::star::beans::XPropertySet* >(this), + static_cast< css::beans::XPropertySet* >(this), 1); } } @@ -1166,31 +1166,31 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & return !CompareProperties( rConvertedValue, rOldValue ); } -void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) +void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) { // Missing: the fake solo properties of the FontDescriptor ImplPropertyTable::const_iterator it = maData.find( nPropId ); - const ::com::sun::star::uno::Any* pProp = it == maData.end() ? NULL : &(it->second); + const css::uno::Any* pProp = it == maData.end() ? NULL : &(it->second); ENSURE_OR_RETURN_VOID( pProp, "UnoControlModel::setFastPropertyValue_NoBroadcast: invalid property id!" ); - DBG_ASSERT( ( rValue.getValueType().getTypeClass() != ::com::sun::star::uno::TypeClass_VOID ) || ( GetPropertyAttribs( (sal_uInt16)nPropId ) & ::com::sun::star::beans::PropertyAttribute::MAYBEVOID ), "Property darf nicht VOID sein!" ); + DBG_ASSERT( ( rValue.getValueType().getTypeClass() != css::uno::TypeClass_VOID ) || ( GetPropertyAttribs( (sal_uInt16)nPropId ) & css::beans::PropertyAttribute::MAYBEVOID ), "Property darf nicht VOID sein!" ); maData[ nPropId ] = rValue; } -void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nPropId ) const +void UnoControlModel::getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nPropId ) const { ::osl::Guard< ::osl::Mutex > aGuard( const_cast<UnoControlModel*>(this)->GetMutex() ); ImplPropertyTable::const_iterator it = maData.find( nPropId ); - const ::com::sun::star::uno::Any* pProp = it == maData.end() ? NULL : &(it->second); + const css::uno::Any* pProp = it == maData.end() ? NULL : &(it->second); if ( pProp ) rValue = *pProp; else if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) { pProp = &( maData.find( BASEPROPERTY_FONTDESCRIPTOR )->second ); - ::com::sun::star::awt::FontDescriptor aFD; + css::awt::FontDescriptor aFD; (*pProp) >>= aFD; switch ( nPropId ) { @@ -1235,8 +1235,8 @@ void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, } } -// ::com::sun::star::beans::XPropertySet -void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue ) 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) +// css::beans::XPropertySet +void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { sal_Int32 nPropId = 0; { @@ -1247,11 +1247,11 @@ void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const ::c if( nPropId ) setFastPropertyValue( nPropId, rValue ); else - throw ::com::sun::star::beans::UnknownPropertyException(); + throw css::beans::UnknownPropertyException(); } -// ::com::sun::star::beans::XFastPropertySet -void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) 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) +// css::beans::XFastPropertySet +void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) { @@ -1260,7 +1260,7 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun: Any aOldSingleValue; getFastPropertyValue( aOldSingleValue, BASEPROPERTY_FONTDESCRIPTORPART_START ); - ::com::sun::star::uno::Any* pProp = &maData[ BASEPROPERTY_FONTDESCRIPTOR ]; + css::uno::Any* pProp = &maData[ BASEPROPERTY_FONTDESCRIPTOR ]; FontDescriptor aOldFontDescriptor; (*pProp) >>= aOldFontDescriptor; @@ -1285,14 +1285,14 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun: setFastPropertyValues( 1, &nPropId, &rValue, 1 ); } -// ::com::sun::star::beans::XMultiPropertySet -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlModel::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::beans::XMultiPropertySet +css::uno::Reference< css::beans::XPropertySetInfo > UnoControlModel::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { OSL_FAIL( "UnoControlModel::getPropertySetInfo() not possible!" ); - return ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >(); + return css::uno::Reference< css::beans::XPropertySetInfo >(); } -void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -1320,7 +1320,7 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< { if ( !pFD.get() ) { - ::com::sun::star::uno::Any* pProp = &maData[ BASEPROPERTY_FONTDESCRIPTOR ]; + css::uno::Any* pProp = &maData[ BASEPROPERTY_FONTDESCRIPTOR ]; pFD.reset( new awt::FontDescriptor ); (*pProp) >>= *pFD; } @@ -1347,7 +1347,7 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< // Don't merge FD property into array, as it is sorted if ( pFD.get() ) { - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; aValue <<= *pFD; sal_Int32 nHandle = BASEPROPERTY_FONTDESCRIPTOR; setFastPropertyValues( 1, &nHandle, &aValue, 1 ); diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 58dd96d61df4..2e691041a740 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -86,7 +86,7 @@ ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< graphic: return ImageHelper::getGraphicFromURL_nothrow( _rURL ); } -::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > +css::uno::Reference< css::graphic::XGraphic > ImageHelper::getGraphicFromURL_nothrow( const OUString& _rURL ) { uno::Reference< graphic::XGraphic > xGraphic; @@ -118,7 +118,7 @@ UnoControlEditModel::UnoControlEditModel( const Reference< XComponentContext >& UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit ); } -OUString UnoControlEditModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlEditModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlEditModel ); } @@ -537,7 +537,7 @@ UnoControlFileControlModel::UnoControlFileControlModel( const Reference< XCompon ImplRegisterProperty( BASEPROPERTY_HIDEINACTIVESELECTION ); } -OUString UnoControlFileControlModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlFileControlModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlFileControlModel ); } @@ -644,7 +644,7 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return UnoControlModel::ImplGetDefaultValue( nPropId ); } -void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) +void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -696,7 +696,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n break; } } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { OSL_FAIL( "GraphicControlModel::setFastPropertyValue_NoBroadcast: caught an exception while aligning the ImagePosition/ImageAlign properties!" ); DBG_UNHANDLED_EXCEPTION(); @@ -721,7 +721,7 @@ UnoControlButtonModel::UnoControlButtonModel( const Reference< XComponentContext osl_atomic_decrement( &m_refCount ); } -OUString UnoControlButtonModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlButtonModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlButtonModel ); } @@ -959,7 +959,7 @@ UnoControlImageControlModel::UnoControlImageControlModel( const Reference< XComp UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXImageControl ); } -OUString UnoControlImageControlModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlImageControlModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlImageControlModel ); } @@ -1012,7 +1012,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlImageControlModel::getProper return xInfo; } -void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception, std::exception) +void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw (css::uno::Exception, std::exception) { GraphicControlModel::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); @@ -1138,7 +1138,7 @@ UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< XCompon UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton ); } -OUString UnoControlRadioButtonModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlRadioButtonModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlRadioButtonModel ); } @@ -1395,7 +1395,7 @@ UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< XComponentCon UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox ); } -OUString UnoControlCheckBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlCheckBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlCheckBoxModel ); } @@ -1626,7 +1626,7 @@ UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< X UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink ); } -OUString UnoControlFixedHyperlinkModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlFixedHyperlinkModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString( "com.sun.star.awt.UnoControlFixedHyperlinkModel" ); } @@ -1730,14 +1730,14 @@ OUString UnoFixedHyperlinkControl::getText() throw(uno::RuntimeException, std::e return ImplGetPropertyValue_UString( BASEPROPERTY_LABEL ); } -void UnoFixedHyperlinkControl::setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void UnoFixedHyperlinkControl::setURL( const OUString& URL ) throw(css::uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= URL; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_URL ), aAny, true ); } -OUString UnoFixedHyperlinkControl::getURL( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoFixedHyperlinkControl::getURL( ) throw(css::uno::RuntimeException, std::exception) { return ImplGetPropertyValue_UString( BASEPROPERTY_URL ); } @@ -1829,7 +1829,7 @@ UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentC UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedText ); } -OUString UnoControlFixedTextModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlFixedTextModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString( "stardiv.vcl.controlmodel.FixedText" ); } @@ -2018,7 +2018,7 @@ UnoControlGroupBoxModel::UnoControlGroupBoxModel( const Reference< XComponentCon ImplRegisterProperty( BASEPROPERTY_CONTEXT_WRITING_MODE ); } -OUString UnoControlGroupBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlGroupBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlGroupBoxModel ); } @@ -2264,7 +2264,7 @@ css::uno::Sequence<OUString> UnoControlListBoxModel::getSupportedServiceNames() return s; } -OUString UnoControlListBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlListBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlListBoxModel ); } @@ -2422,7 +2422,7 @@ void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) thro } -void SAL_CALL UnoControlListBoxModel::removeAllItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::removeAllItems( ) throw (css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -3179,7 +3179,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySe } -OUString UnoControlComboBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlComboBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlComboBoxModel ); } @@ -3604,8 +3604,8 @@ void UnoSpinFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rx xField->addSpinListener( &maSpinListeners ); } - // ::com::sun::star::awt::XSpinField -void UnoSpinFieldControl::addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) + // css::awt::XSpinField +void UnoSpinFieldControl::addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) { maSpinListeners.addInterface( l ); if( getPeer().is() && maSpinListeners.getLength() == 1 ) @@ -3615,7 +3615,7 @@ void UnoSpinFieldControl::addSpinListener( const ::com::sun::star::uno::Referenc } } -void UnoSpinFieldControl::removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) { if( getPeer().is() && maSpinListeners.getLength() == 1 ) { @@ -3625,35 +3625,35 @@ void UnoSpinFieldControl::removeSpinListener( const ::com::sun::star::uno::Refer maSpinListeners.removeInterface( l ); } -void UnoSpinFieldControl::up() throw(::com::sun::star::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::up() throw(css::uno::RuntimeException, std::exception) { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->up(); } -void UnoSpinFieldControl::down() throw(::com::sun::star::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::down() throw(css::uno::RuntimeException, std::exception) { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->down(); } -void UnoSpinFieldControl::first() throw(::com::sun::star::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::first() throw(css::uno::RuntimeException, std::exception) { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->first(); } -void UnoSpinFieldControl::last() throw(::com::sun::star::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::last() throw(css::uno::RuntimeException, std::exception) { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->last(); } -void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(css::uno::RuntimeException, std::exception) { mbRepeat = bRepeat; @@ -3671,7 +3671,7 @@ UnoControlDateFieldModel::UnoControlDateFieldModel( const Reference< XComponentC UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXDateField ); } -OUString UnoControlDateFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlDateFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlDateFieldModel ); } @@ -3960,7 +3960,7 @@ UnoControlTimeFieldModel::UnoControlTimeFieldModel( const Reference< XComponentC UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXTimeField ); } -OUString UnoControlTimeFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlTimeFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlTimeFieldModel ); } @@ -4208,7 +4208,7 @@ UnoControlNumericFieldModel::UnoControlNumericFieldModel( const Reference< XComp UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXNumericField ); } -OUString UnoControlNumericFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlNumericFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlNumericFieldModel ); } @@ -4453,7 +4453,7 @@ UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference< XCo UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCurrencyField ); } -OUString UnoControlCurrencyFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlCurrencyFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlCurrencyFieldModel ); } @@ -4704,7 +4704,7 @@ UnoControlPatternFieldModel::UnoControlPatternFieldModel( const Reference< XComp UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXPatternField ); } -OUString UnoControlPatternFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlPatternFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlPatternFieldModel ); } @@ -4897,7 +4897,7 @@ UnoControlProgressBarModel::UnoControlProgressBarModel( const Reference< XCompon ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE_MIN ); } -OUString UnoControlProgressBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlProgressBarModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlProgressBarModel ); } @@ -4984,29 +4984,29 @@ IMPL_XTYPEPROVIDER_START( UnoProgressBarControl ) UnoControlBase::getTypes() IMPL_XTYPEPROVIDER_END -// ::com::sun::star::awt::XProgressBar -void UnoProgressBarControl::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::awt::XProgressBar +void UnoProgressBarControl::setForegroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= nColor; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_FILLCOLOR ), aAny, true ); } -void UnoProgressBarControl::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void UnoProgressBarControl::setBackgroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= nColor; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BACKGROUNDCOLOR ), aAny, true ); } -void UnoProgressBarControl::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void UnoProgressBarControl::setValue( sal_Int32 nValue ) throw(css::uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= nValue; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE ), aAny, true ); } -void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception ) +void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception ) { uno::Any aMin; uno::Any aMax; @@ -5028,7 +5028,7 @@ void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::c ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE_MAX ), aMax, true ); } -sal_Int32 UnoProgressBarControl::getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 UnoProgressBarControl::getValue() throw(css::uno::RuntimeException, std::exception) { return ImplGetPropertyValue_INT32( BASEPROPERTY_PROGRESSVALUE ); } @@ -5075,7 +5075,7 @@ UnoControlFixedLineModel::UnoControlFixedLineModel( const Reference< XComponentC ImplRegisterProperty( BASEPROPERTY_PRINTABLE ); } -OUString UnoControlFixedLineModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString UnoControlFixedLineModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlFixedLineModel ); } diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index c9c0a72a9428..4433f280e01f 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -61,62 +61,62 @@ namespace toolkit public: // IAccessibleFactory - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXButton* /*_pXWindow*/ ) override { return NULL; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXCheckBox* /*_pXWindow*/ ) override { return NULL; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXRadioButton* /*_pXWindow*/ ) override { return NULL; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXListBox* /*_pXWindow*/ ) override { return NULL; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXFixedHyperlink* /*_pXWindow*/ ) override { return NULL; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXFixedText* /*_pXWindow*/ ) override { return NULL; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXScrollBar* /*_pXWindow*/ ) override { return NULL; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXEdit* /*_pXWindow*/ ) override { return NULL; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXComboBox* /*_pXWindow*/ ) override { return NULL; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXToolBox* /*_pXWindow*/ ) override { return NULL; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXWindow* /*_pXWindow*/ ) override { return NULL; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > createAccessible( Menu* /*_pMenu*/, bool /*_bIsMenuBar*/ ) override { return NULL; diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index cd0dc5faef5a..13c82aa32e6a 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -32,10 +32,10 @@ ListenerMultiplexerBase::~ListenerMultiplexerBase() { } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any ListenerMultiplexerBase::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any ListenerMultiplexerBase::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - return ::cppu::queryInterface( rType, (static_cast< ::com::sun::star::uno::XInterface* >(this)) ); + return ::cppu::queryInterface( rType, (static_cast< css::uno::XInterface* >(this)) ); } @@ -56,132 +56,132 @@ void SAL_CALL EventListenerMultiplexer::release() throw () return ListenerMultiplexerBase::release(); } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any EventListenerMultiplexer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any EventListenerMultiplexer::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::lang::XEventListener* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::lang::XEventListener* >(this)) ); return (aRet.hasValue() ? aRet : ListenerMultiplexerBase::queryInterface( rType )); } -// ::com::sun::star::lang::XEventListener -void EventListenerMultiplexer::disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::lang::XEventListener +void EventListenerMultiplexer::disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) { } // class FocusListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener, focusGained, ::com::sun::star::awt::FocusEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener, focusLost, ::com::sun::star::awt::FocusEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( FocusListenerMultiplexer, css::awt::XFocusListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( FocusListenerMultiplexer, css::awt::XFocusListener, focusGained, css::awt::FocusEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( FocusListenerMultiplexer, css::awt::XFocusListener, focusLost, css::awt::FocusEvent ) // class WindowListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowResized, ::com::sun::star::awt::WindowEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowMoved, ::com::sun::star::awt::WindowEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowShown, ::com::sun::star::lang::EventObject ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener, windowHidden, ::com::sun::star::lang::EventObject ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( WindowListenerMultiplexer, css::awt::XWindowListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, css::awt::XWindowListener, windowResized, css::awt::WindowEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, css::awt::XWindowListener, windowMoved, css::awt::WindowEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, css::awt::XWindowListener, windowShown, css::lang::EventObject ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( WindowListenerMultiplexer, css::awt::XWindowListener, windowHidden, css::lang::EventObject ) // class VclContainerListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener, windowAdded, ::com::sun::star::awt::VclContainerEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener, windowRemoved, ::com::sun::star::awt::VclContainerEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( VclContainerListenerMultiplexer, css::awt::XVclContainerListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( VclContainerListenerMultiplexer, css::awt::XVclContainerListener, windowAdded, css::awt::VclContainerEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( VclContainerListenerMultiplexer, css::awt::XVclContainerListener, windowRemoved, css::awt::VclContainerEvent ) // class KeyListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener, keyPressed, ::com::sun::star::awt::KeyEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener, keyReleased, ::com::sun::star::awt::KeyEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( KeyListenerMultiplexer, css::awt::XKeyListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( KeyListenerMultiplexer, css::awt::XKeyListener, keyPressed, css::awt::KeyEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( KeyListenerMultiplexer, css::awt::XKeyListener, keyReleased, css::awt::KeyEvent ) // class MouseListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mousePressed, ::com::sun::star::awt::MouseEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseReleased, ::com::sun::star::awt::MouseEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseEntered, ::com::sun::star::awt::MouseEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener, mouseExited, ::com::sun::star::awt::MouseEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MouseListenerMultiplexer, css::awt::XMouseListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, css::awt::XMouseListener, mousePressed, css::awt::MouseEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, css::awt::XMouseListener, mouseReleased, css::awt::MouseEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, css::awt::XMouseListener, mouseEntered, css::awt::MouseEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseListenerMultiplexer, css::awt::XMouseListener, mouseExited, css::awt::MouseEvent ) // class MouseMotionListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener, mouseDragged, ::com::sun::star::awt::MouseEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener, mouseMoved, ::com::sun::star::awt::MouseEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MouseMotionListenerMultiplexer, css::awt::XMouseMotionListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseMotionListenerMultiplexer, css::awt::XMouseMotionListener, mouseDragged, css::awt::MouseEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MouseMotionListenerMultiplexer, css::awt::XMouseMotionListener, mouseMoved, css::awt::MouseEvent ) // class PaintListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener, windowPaint, ::com::sun::star::awt::PaintEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( PaintListenerMultiplexer, css::awt::XPaintListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( PaintListenerMultiplexer, css::awt::XPaintListener, windowPaint, css::awt::PaintEvent ) // class TopWindowListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowOpened, ::com::sun::star::lang::EventObject ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowClosing, ::com::sun::star::lang::EventObject ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowClosed, ::com::sun::star::lang::EventObject ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowMinimized, ::com::sun::star::lang::EventObject ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowNormalized, ::com::sun::star::lang::EventObject ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowActivated, ::com::sun::star::lang::EventObject ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener, windowDeactivated, ::com::sun::star::lang::EventObject ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TopWindowListenerMultiplexer, css::awt::XTopWindowListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, css::awt::XTopWindowListener, windowOpened, css::lang::EventObject ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, css::awt::XTopWindowListener, windowClosing, css::lang::EventObject ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, css::awt::XTopWindowListener, windowClosed, css::lang::EventObject ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, css::awt::XTopWindowListener, windowMinimized, css::lang::EventObject ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, css::awt::XTopWindowListener, windowNormalized, css::lang::EventObject ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, css::awt::XTopWindowListener, windowActivated, css::lang::EventObject ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TopWindowListenerMultiplexer, css::awt::XTopWindowListener, windowDeactivated, css::lang::EventObject ) // class TextListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener, textChanged, ::com::sun::star::awt::TextEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TextListenerMultiplexer, css::awt::XTextListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TextListenerMultiplexer, css::awt::XTextListener, textChanged, css::awt::TextEvent ) // class ActionListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener, actionPerformed, ::com::sun::star::awt::ActionEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ActionListenerMultiplexer, css::awt::XActionListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ActionListenerMultiplexer, css::awt::XActionListener, actionPerformed, css::awt::ActionEvent ) // class ItemListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener, itemStateChanged, ::com::sun::star::awt::ItemEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ItemListenerMultiplexer, css::awt::XItemListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ItemListenerMultiplexer, css::awt::XItemListener, itemStateChanged, css::awt::ItemEvent ) // class TabListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TabListenerMultiplexer, css::awt::XTabListener ) -void TabListenerMultiplexer::inserted( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) -IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, inserted, ::sal_Int32 ) +void TabListenerMultiplexer::inserted( sal_Int32 evt ) throw(css::uno::RuntimeException, std::exception) +IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, css::awt::XTabListener, inserted, ::sal_Int32 ) -void TabListenerMultiplexer::removed( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) -IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, removed, ::sal_Int32 ) +void TabListenerMultiplexer::removed( sal_Int32 evt ) throw(css::uno::RuntimeException, std::exception) +IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, css::awt::XTabListener, removed, ::sal_Int32 ) -void TabListenerMultiplexer::changed( sal_Int32 evt, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& evt2 ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void TabListenerMultiplexer::changed( sal_Int32 evt, const css::uno::Sequence< css::beans::NamedValue >& evt2 ) throw(css::uno::RuntimeException, std::exception) { sal_Int32 aMulti( evt ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > aMulti2( evt2 ); + css::uno::Sequence< css::beans::NamedValue > aMulti2( evt2 ); ::cppu::OInterfaceIteratorHelper aIt( *this ); while( aIt.hasMoreElements() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener > xListener( - static_cast< ::com::sun::star::awt::XTabListener* >( aIt.next() ) ); + css::uno::Reference< css::awt::XTabListener > xListener( + static_cast< css::awt::XTabListener* >( aIt.next() ) ); try { xListener->changed( aMulti, aMulti2 ); } - catch(const ::com::sun::star::lang::DisposedException& e) + catch(const css::lang::DisposedException& e) { OSL_ENSURE( e.Context.is(), "caught DisposedException with empty Context field" ); if ( e.Context == xListener || !e.Context.is() ) aIt.remove(); } - catch(const ::com::sun::star::uno::RuntimeException& e) + catch(const css::uno::RuntimeException& e) { DISPLAY_EXCEPTION( TabListenerMultiplexer, changed, e ) } @@ -189,74 +189,74 @@ void TabListenerMultiplexer::changed( sal_Int32 evt, const ::com::sun::star::uno } -void TabListenerMultiplexer::activated( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) -IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, activated, ::sal_Int32 ) +void TabListenerMultiplexer::activated( sal_Int32 evt ) throw(css::uno::RuntimeException, std::exception) +IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, css::awt::XTabListener, activated, ::sal_Int32 ) -void TabListenerMultiplexer::deactivated( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) -IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, deactivated, ::sal_Int32 ) +void TabListenerMultiplexer::deactivated( sal_Int32 evt ) throw(css::uno::RuntimeException, std::exception) +IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, css::awt::XTabListener, deactivated, ::sal_Int32 ) // class ContainerListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementInserted, ::com::sun::star::container::ContainerEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementRemoved, ::com::sun::star::container::ContainerEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener, elementReplaced, ::com::sun::star::container::ContainerEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ContainerListenerMultiplexer, css::container::XContainerListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, css::container::XContainerListener, elementInserted, css::container::ContainerEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, css::container::XContainerListener, elementRemoved, css::container::ContainerEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ContainerListenerMultiplexer, css::container::XContainerListener, elementReplaced, css::container::ContainerEvent ) // class SpinListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, up, ::com::sun::star::awt::SpinEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, down, ::com::sun::star::awt::SpinEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, first, ::com::sun::star::awt::SpinEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener, last, ::com::sun::star::awt::SpinEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( SpinListenerMultiplexer, css::awt::XSpinListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, css::awt::XSpinListener, up, css::awt::SpinEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, css::awt::XSpinListener, down, css::awt::SpinEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, css::awt::XSpinListener, first, css::awt::SpinEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SpinListenerMultiplexer, css::awt::XSpinListener, last, css::awt::SpinEvent ) // class AdjustmentListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener, adjustmentValueChanged, ::com::sun::star::awt::AdjustmentEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( AdjustmentListenerMultiplexer, css::awt::XAdjustmentListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( AdjustmentListenerMultiplexer, css::awt::XAdjustmentListener, adjustmentValueChanged, css::awt::AdjustmentEvent ) // class MenuListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, itemHighlighted, ::com::sun::star::awt::MenuEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, itemSelected, ::com::sun::star::awt::MenuEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, itemActivated, ::com::sun::star::awt::MenuEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener, itemDeactivated, ::com::sun::star::awt::MenuEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( MenuListenerMultiplexer, css::awt::XMenuListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, css::awt::XMenuListener, itemHighlighted, css::awt::MenuEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, css::awt::XMenuListener, itemSelected, css::awt::MenuEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, css::awt::XMenuListener, itemActivated, css::awt::MenuEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( MenuListenerMultiplexer, css::awt::XMenuListener, itemDeactivated, css::awt::MenuEvent ) // class TreeSelectionListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener, selectionChanged, ::com::sun::star::lang::EventObject ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeSelectionListenerMultiplexer, css::view::XSelectionChangeListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeSelectionListenerMultiplexer, css::view::XSelectionChangeListener, selectionChanged, css::lang::EventObject ) // class TreeSelectionListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, requestChildNodes, ::com::sun::star::awt::tree::TreeExpansionEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeExpanding, ::com::sun::star::awt::tree::TreeExpansionEvent, ::com::sun::star::awt::tree::ExpandVetoException ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeCollapsing, ::com::sun::star::awt::tree::TreeExpansionEvent, ::com::sun::star::awt::tree::ExpandVetoException ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeExpanded, ::com::sun::star::awt::tree::TreeExpansionEvent ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener, treeCollapsed, ::com::sun::star::awt::tree::TreeExpansionEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeExpansionListenerMultiplexer, css::awt::tree::XTreeExpansionListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, css::awt::tree::XTreeExpansionListener, requestChildNodes, css::awt::tree::TreeExpansionEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( TreeExpansionListenerMultiplexer, css::awt::tree::XTreeExpansionListener, treeExpanding, css::awt::tree::TreeExpansionEvent, css::awt::tree::ExpandVetoException ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( TreeExpansionListenerMultiplexer, css::awt::tree::XTreeExpansionListener, treeCollapsing, css::awt::tree::TreeExpansionEvent, css::awt::tree::ExpandVetoException ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, css::awt::tree::XTreeExpansionListener, treeExpanded, css::awt::tree::TreeExpansionEvent ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TreeExpansionListenerMultiplexer, css::awt::tree::XTreeExpansionListener, treeCollapsed, css::awt::tree::TreeExpansionEvent ) // class TreeEditListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeEditListenerMultiplexer, ::com::sun::star::awt::tree::XTreeEditListener ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TreeEditListenerMultiplexer, css::awt::tree::XTreeEditListener ) // class SelectionListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener, selectionChanged, ::com::sun::star::awt::grid::GridSelectionEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( SelectionListenerMultiplexer, css::awt::grid::XGridSelectionListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( SelectionListenerMultiplexer, css::awt::grid::XGridSelectionListener, selectionChanged, css::awt::grid::GridSelectionEvent ) // class SelectionListenerMultiplexer -IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TabPageListenerMultiplexer, ::com::sun::star::awt::tab::XTabPageContainerListener ) -IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TabPageListenerMultiplexer, ::com::sun::star::awt::tab::XTabPageContainerListener, tabPageActivated, ::com::sun::star::awt::tab::TabPageActivatedEvent ) +IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TabPageListenerMultiplexer, css::awt::tab::XTabPageContainerListener ) +IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( TabPageListenerMultiplexer, css::awt::tab::XTabPageContainerListener, tabPageActivated, css::awt::tab::TabPageActivatedEvent ) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index 2bc88c9fa886..93ab90fd702c 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -61,12 +61,12 @@ using namespace com::sun::star; struct ImplPropertyInfo { OUString aName; - sal_uInt16 nPropId; - ::com::sun::star::uno::Type aType; - sal_Int16 nAttribs; - bool bDependsOnOthers; // eg. VALUE depends on MIN/MAX and must be set after MIN/MAX. + sal_uInt16 nPropId; + css::uno::Type aType; + sal_Int16 nAttribs; + bool bDependsOnOthers; // eg. VALUE depends on MIN/MAX and must be set after MIN/MAX. - ImplPropertyInfo( OUString const & theName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType, + ImplPropertyInfo( OUString const & theName, sal_uInt16 nId, const css::uno::Type& rType, sal_Int16 nAttrs, bool bDepends = false ) : aName( theName ) { @@ -79,16 +79,16 @@ struct ImplPropertyInfo }; #define DECL_PROP_1( asciiname, id, type, attrib1 ) \ - ImplPropertyInfo( asciiname, BASEPROPERTY_##id, cppu::UnoType<type>::get(), ::com::sun::star::beans::PropertyAttribute::attrib1 ) + ImplPropertyInfo( asciiname, BASEPROPERTY_##id, cppu::UnoType<type>::get(), css::beans::PropertyAttribute::attrib1 ) #define DECL_PROP_2( asciiname, id, type, attrib1, attrib2 ) \ - ImplPropertyInfo( asciiname, BASEPROPERTY_##id, cppu::UnoType<type>::get(), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 ) + ImplPropertyInfo( asciiname, BASEPROPERTY_##id, cppu::UnoType<type>::get(), css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2 ) #define DECL_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \ - ImplPropertyInfo( asciiname, BASEPROPERTY_##id, cppu::UnoType<type>::get(), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3 ) + ImplPropertyInfo( asciiname, BASEPROPERTY_##id, cppu::UnoType<type>::get(), css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2 | css::beans::PropertyAttribute::attrib3 ) #define DECL_DEP_PROP_2( asciiname, id, type, attrib1, attrib2 ) \ - ImplPropertyInfo( asciiname, BASEPROPERTY_##id, cppu::UnoType<type>::get(), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, true ) + ImplPropertyInfo( asciiname, BASEPROPERTY_##id, cppu::UnoType<type>::get(), css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2, true ) #define DECL_DEP_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \ - ImplPropertyInfo( asciiname, BASEPROPERTY_##id, cppu::UnoType<type>::get(), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3, true ) + ImplPropertyInfo( asciiname, BASEPROPERTY_##id, cppu::UnoType<type>::get(), css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2 | css::beans::PropertyAttribute::attrib3, true ) ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) { @@ -140,7 +140,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_2 ( "FontEmphasisMark", FONTEMPHASISMARK, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "FontDescriptor", FONTDESCRIPTOR, FontDescriptor, BOUND, MAYBEDEFAULT ), - // Teile des ::com::sun::star::awt::FontDescriptor + // Teile des css::awt::FontDescriptor DECL_PROP_2 ( "FontName", FONTDESCRIPTORPART_NAME, OUString,BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "FontStyleName", FONTDESCRIPTORPART_STYLENAME, OUString,BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "FontFamily", FONTDESCRIPTORPART_FAMILY, sal_Int16, BOUND, MAYBEDEFAULT ), @@ -159,7 +159,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_2 ( "FontType", FONTDESCRIPTORPART_TYPE, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "FormatKey", FORMATKEY, sal_Int32, BOUND, MAYBEVOID, TRANSIENT ), - DECL_PROP_3 ( "FormatsSupplier", FORMATSSUPPLIER, Reference< ::com::sun::star::util::XNumberFormatsSupplier >, BOUND, MAYBEVOID, TRANSIENT ), + DECL_PROP_3 ( "FormatsSupplier", FORMATSSUPPLIER, Reference< css::util::XNumberFormatsSupplier >, BOUND, MAYBEVOID, TRANSIENT ), DECL_PROP_2 ( "Graphic", GRAPHIC, Reference< XGraphic >, BOUND, TRANSIENT ), DECL_PROP_2 ( "GroupName", GROUPNAME, OUString, BOUND, MAYBEDEFAULT ), @@ -251,9 +251,9 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_2 ( "StepTime", STEP_TIME, sal_Int32, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "Decoration", DECORATION, sal_Bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "SelectionType", TREE_SELECTIONTYPE, ::com::sun::star::view::SelectionType, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "SelectionType", TREE_SELECTIONTYPE, css::view::SelectionType, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "Editable", TREE_EDITABLE, sal_Bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_3 ( "DataModel", TREE_DATAMODEL, Reference< ::com::sun::star::awt::tree::XTreeDataModel >, BOUND, MAYBEDEFAULT, MAYBEVOID ), + DECL_PROP_3 ( "DataModel", TREE_DATAMODEL, Reference< css::awt::tree::XTreeDataModel >, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "RootDisplayed", TREE_ROOTDISPLAYED, sal_Bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "ShowsHandles", TREE_SHOWSHANDLES, sal_Bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "ShowsRootHandles", TREE_SHOWSROOTHANDLES, sal_Bool, BOUND, MAYBEDEFAULT ), @@ -267,9 +267,9 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_2 ( "RowHeaderWidth", ROW_HEADER_WIDTH, sal_Int32, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "ShowColumnHeader", GRID_SHOWCOLUMNHEADER, sal_Bool, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "ColumnHeaderHeight", COLUMN_HEADER_HEIGHT, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), - DECL_PROP_1 ( "GridDataModel", GRID_DATAMODEL, Reference< ::com::sun::star::awt::grid::XGridDataModel >, BOUND ), - DECL_PROP_1 ( "ColumnModel", GRID_COLUMNMODEL, Reference< ::com::sun::star::awt::grid::XGridColumnModel >, BOUND ), - DECL_PROP_3 ( "SelectionModel", GRID_SELECTIONMODE, ::com::sun::star::view::SelectionType, BOUND, MAYBEDEFAULT, MAYBEVOID ), + DECL_PROP_1 ( "GridDataModel", GRID_DATAMODEL, Reference< css::awt::grid::XGridDataModel >, BOUND ), + DECL_PROP_1 ( "ColumnModel", GRID_COLUMNMODEL, Reference< css::awt::grid::XGridColumnModel >, BOUND ), + DECL_PROP_3 ( "SelectionModel", GRID_SELECTIONMODE, css::view::SelectionType, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "EnableVisible", ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "ReferenceDevice", REFERENCE_DEVICE, Reference< XDevice >,BOUND, MAYBEDEFAULT, TRANSIENT ), DECL_PROP_3 ( "HeaderBackgroundColor", GRID_HEADER_BACKGROUND, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), @@ -278,7 +278,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_3 ( "RowBackgroundColors", GRID_ROW_BACKGROUND_COLORS, Sequence< sal_Int32 >, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "UseGridLines", USE_GRID_LINES, sal_Bool, BOUND, MAYBEDEFAULT ), DECL_DEP_PROP_3 ( "MultiPageValue", MULTIPAGEVALUE, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), - DECL_PROP_3 ( "AllDialogChildren", USERFORMCONTAINEES, Reference< ::com::sun::star::container::XNameContainer >, BOUND, MAYBEDEFAULT, MAYBEVOID ), + DECL_PROP_3 ( "AllDialogChildren", USERFORMCONTAINEES, Reference< css::container::XNameContainer >, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "ActiveSelectionBackgroundColor", ACTIVE_SEL_BACKGROUND_COLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "InactiveSelectionBackgroundColor", INACTIVE_SEL_BACKGROUND_COLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "ActiveSelectionTextColor", ACTIVE_SEL_TEXT_COLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), @@ -366,7 +366,7 @@ const OUString& GetPropertyName( sal_uInt16 nPropertyId ) return pImplPropertyInfo->aName; } -const ::com::sun::star::uno::Type* GetPropertyType( sal_uInt16 nPropertyId ) +const css::uno::Type* GetPropertyType( sal_uInt16 nPropertyId ) { const ImplPropertyInfo* pImplPropertyInfo = ImplGetImplPropertyInfo( nPropertyId ); DBG_ASSERT( pImplPropertyInfo, "Invalid PropertyId!" ); @@ -387,7 +387,7 @@ bool DoesDependOnOthers( sal_uInt16 nPropertyId ) return pImplPropertyInfo && pImplPropertyInfo->bDependsOnOthers; } -bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) +bool CompareProperties( const css::uno::Any& r1, const css::uno::Any& r2 ) { return r1 == r2; } diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx index c1c3c6a2c162..c67673d38347 100644 --- a/toolkit/source/helper/unopropertyarrayhelper.cxx +++ b/toolkit/source/helper/unopropertyarrayhelper.cxx @@ -26,7 +26,7 @@ // class UnoPropertyArrayHelper -UnoPropertyArrayHelper::UnoPropertyArrayHelper( const ::com::sun::star::uno::Sequence<sal_Int32>& rIDs ) +UnoPropertyArrayHelper::UnoPropertyArrayHelper( const css::uno::Sequence<sal_Int32>& rIDs ) { sal_Int32 nIDs = rIDs.getLength(); const sal_Int32* pIDs = rIDs.getConstArray(); @@ -64,7 +64,7 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( OUString * pPropNa return bValid; } -::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > UnoPropertyArrayHelper::getProperties() +css::uno::Sequence< css::beans::Property > UnoPropertyArrayHelper::getProperties() { // Sortiert nach Namen... @@ -83,8 +83,8 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( OUString * pPropNa } sal_uInt32 nProps = aSortedPropsIds.size(); // koennen jetzt mehr sein - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aProps( nProps ); - ::com::sun::star::beans::Property* pProps = aProps.getArray(); + css::uno::Sequence< css::beans::Property> aProps( nProps ); + css::beans::Property* pProps = aProps.getArray(); std::map<sal_Int32, sal_uInt16>::const_iterator it = aSortedPropsIds.begin(); for ( sal_uInt32 n = 0; n < nProps; n++, ++it ) @@ -99,9 +99,9 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( OUString * pPropNa return aProps; } -::com::sun::star::beans::Property UnoPropertyArrayHelper::getPropertyByName(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException) +css::beans::Property UnoPropertyArrayHelper::getPropertyByName(const OUString& rPropertyName) throw (css::beans::UnknownPropertyException) { - ::com::sun::star::beans::Property aProp; + css::beans::Property aProp; sal_uInt16 nId = GetPropertyId( rPropertyName ); if ( ImplHasProperty( nId ) ) { @@ -125,7 +125,7 @@ sal_Int32 UnoPropertyArrayHelper::getHandleByName( const OUString & rPropertyNam return nId ? nId : (-1); } -sal_Int32 UnoPropertyArrayHelper::fillHandles( sal_Int32* pHandles, const ::com::sun::star::uno::Sequence< OUString > & rPropNames ) +sal_Int32 UnoPropertyArrayHelper::fillHandles( sal_Int32* pHandles, const css::uno::Sequence< OUString > & rPropNames ) { const OUString* pNames = rPropNames.getConstArray(); sal_Int32 nValues = rPropNames.getLength(); diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index eafa53906d8f..0f9974cec6cc 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star; -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > CreateXWindow( vcl::Window* pWindow ) +css::uno::Reference< css::awt::XWindowPeer > CreateXWindow( vcl::Window* pWindow ) { switch ( pWindow->GetType() ) { @@ -131,7 +131,7 @@ TOOLKIT_DLLPUBLIC UnoWrapperBase* CreateUnoWrapper() } // extern "C" -UnoWrapper::UnoWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>& rxToolkit ) +UnoWrapper::UnoWrapper( const css::uno::Reference< css::awt::XToolkit>& rxToolkit ) { mxToolkit = rxToolkit; } @@ -145,16 +145,16 @@ UnoWrapper::~UnoWrapper() { } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> UnoWrapper::GetVCLToolkit() +css::uno::Reference< css::awt::XToolkit> UnoWrapper::GetVCLToolkit() { if ( !mxToolkit.is() ) mxToolkit = VCLUnoHelper::CreateToolkit(); return mxToolkit.get(); } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> UnoWrapper::GetWindowInterface( vcl::Window* pWindow, bool bCreate ) +css::uno::Reference< css::awt::XWindowPeer> UnoWrapper::GetWindowInterface( vcl::Window* pWindow, bool bCreate ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xPeer = pWindow->GetWindowPeer(); + css::uno::Reference< css::awt::XWindowPeer> xPeer = pWindow->GetWindowPeer(); if ( !xPeer.is() && bCreate ) { xPeer = CreateXWindow( pWindow ); @@ -163,14 +163,14 @@ UnoWrapper::~UnoWrapper() return xPeer; } -void UnoWrapper::SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) +void UnoWrapper::SetWindowInterface( vcl::Window* pWindow, css::uno::Reference< css::awt::XWindowPeer> xIFace ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( xIFace ); DBG_ASSERT( pVCLXWindow, "SetComponentInterface - unsupported type" ); if ( pVCLXWindow ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xPeer = pWindow->GetWindowPeer(); + css::uno::Reference< css::awt::XWindowPeer> xPeer = pWindow->GetWindowPeer(); if( xPeer.is() ) { bool bSameInstance( pVCLXWindow == dynamic_cast< VCLXWindow* >( xPeer.get() )); @@ -183,9 +183,9 @@ void UnoWrapper::SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno } } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics> UnoWrapper::CreateGraphics( OutputDevice* pOutDev ) +css::uno::Reference< css::awt::XGraphics> UnoWrapper::CreateGraphics( OutputDevice* pOutDev ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics> xGrf; + css::uno::Reference< css::awt::XGraphics> xGrf; VCLXGraphics* pGrf = new VCLXGraphics; xGrf = pGrf; pGrf->Init( pOutDev ); @@ -217,7 +217,7 @@ static bool lcl_ImplIsParent( vcl::Window* pParentWindow, vcl::Window* pPossible void UnoWrapper::WindowDestroyed( vcl::Window* pWindow ) { - // their still might be some children created with ::com::sun::star::loader::Java + // their still might be some children created with css::loader::Java // that would otherwise not be destroyed until the garbage collector cleans up VclPtr< vcl::Window > pChild = pWindow->GetWindow( GetWindowType::FirstChild ); while ( pChild ) @@ -227,7 +227,7 @@ void UnoWrapper::WindowDestroyed( vcl::Window* pWindow ) VclPtr< vcl::Window > pClient = pChild->GetWindow( GetWindowType::Client ); if ( pClient && pClient->GetWindowPeer() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( false ), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent > xComp( pClient->GetComponentInterface( false ), css::uno::UNO_QUERY ); xComp->dispose(); } @@ -246,7 +246,7 @@ void UnoWrapper::WindowDestroyed( vcl::Window* pWindow ) if ( pClient && pClient->GetWindowPeer() && lcl_ImplIsParent( pWindow, pClient ) ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( false ), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent > xComp( pClient->GetComponentInterface( false ), css::uno::UNO_QUERY ); xComp->dispose(); } @@ -296,7 +296,7 @@ void UnoWrapper::WindowDestroyed( vcl::Window* pWindow ) } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > UnoWrapper::CreateAccessible( Menu* pMenu, bool bIsMenuBar ) +css::uno::Reference< css::accessibility::XAccessible > UnoWrapper::CreateAccessible( Menu* pMenu, bool bIsMenuBar ) { return maAccessibleFactoryAccess.getFactory().createAccessible( pMenu, bIsMenuBar ); } diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 57d398158858..5dd97a9fc01f 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -60,18 +60,18 @@ using namespace ::com::sun::star; // class VCLUnoHelper -uno::Reference< ::com::sun::star::awt::XToolkit> VCLUnoHelper::CreateToolkit() +uno::Reference< css::awt::XToolkit> VCLUnoHelper::CreateToolkit() { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< awt::XToolkit> xToolkit( awt::Toolkit::create(xContext), uno::UNO_QUERY_THROW ); return xToolkit; } -BitmapEx VCLUnoHelper::GetBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>& rxBitmap ) +BitmapEx VCLUnoHelper::GetBitmap( const css::uno::Reference< css::awt::XBitmap>& rxBitmap ) { BitmapEx aBmp; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > xGraphic( rxBitmap, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::graphic::XGraphic > xGraphic( rxBitmap, css::uno::UNO_QUERY ); if( xGraphic.is() ) { Graphic aGraphic( xGraphic ); @@ -86,12 +86,12 @@ BitmapEx VCLUnoHelper::GetBitmap( const ::com::sun::star::uno::Reference< ::com: { Bitmap aDIB, aMask; { - ::com::sun::star::uno::Sequence<sal_Int8> aBytes = rxBitmap->getDIB(); + css::uno::Sequence<sal_Int8> aBytes = rxBitmap->getDIB(); SvMemoryStream aMem( aBytes.getArray(), aBytes.getLength(), StreamMode::READ ); ReadDIB(aDIB, aMem, true); } { - ::com::sun::star::uno::Sequence<sal_Int8> aBytes = rxBitmap->getMaskDIB(); + css::uno::Sequence<sal_Int8> aBytes = rxBitmap->getMaskDIB(); SvMemoryStream aMem( aBytes.getArray(), aBytes.getLength(), StreamMode::READ ); ReadDIB(aMask, aMem, true); } @@ -101,32 +101,32 @@ BitmapEx VCLUnoHelper::GetBitmap( const ::com::sun::star::uno::Reference< ::com: return aBmp; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap> VCLUnoHelper::CreateBitmap( const BitmapEx& rBitmap ) +css::uno::Reference< css::awt::XBitmap> VCLUnoHelper::CreateBitmap( const BitmapEx& rBitmap ) { Graphic aGraphic( rBitmap ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap> xBmp( aGraphic.GetXGraphic(), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::awt::XBitmap> xBmp( aGraphic.GetXGraphic(), css::uno::UNO_QUERY ); return xBmp; } -VclPtr< vcl::Window > VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ) +VclPtr< vcl::Window > VCLUnoHelper::GetWindow( const css::uno::Reference< css::awt::XWindow>& rxWindow ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow ); return pVCLXWindow ? pVCLXWindow->GetWindow() : VclPtr< vcl::Window >(); } -VclPtr< vcl::Window > VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow ) +VclPtr< vcl::Window > VCLUnoHelper::GetWindow( const css::uno::Reference< css::awt::XWindow2>& rxWindow ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow ); return pVCLXWindow ? pVCLXWindow->GetWindow() : VclPtr< vcl::Window >(); } -VclPtr< vcl::Window > VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindow ) +VclPtr< vcl::Window > VCLUnoHelper::GetWindow( const css::uno::Reference< css::awt::XWindowPeer>& rxWindow ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow ); return pVCLXWindow ? pVCLXWindow->GetWindow() : VclPtr< vcl::Window >(); } -vcl::Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) +vcl::Region VCLUnoHelper::GetRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) { vcl::Region aRegion; VCLXRegion* pVCLRegion = VCLXRegion::GetImplementation( rxRegion ); @@ -134,7 +134,7 @@ vcl::Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::c aRegion = pVCLRegion->GetRegion(); else { - ::com::sun::star::uno::Sequence< ::com::sun::star::awt::Rectangle > aRects = rxRegion->getRectangles(); + css::uno::Sequence< css::awt::Rectangle > aRects = rxRegion->getRectangles(); sal_Int32 nRects = aRects.getLength(); for ( sal_Int32 n = 0; n < nRects; n++ ) aRegion.Union( VCLRectangle( aRects.getArray()[n] ) ); @@ -142,18 +142,18 @@ vcl::Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::c return aRegion; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> VCLUnoHelper::GetInterface( vcl::Window* pWindow ) +css::uno::Reference< css::awt::XWindow> VCLUnoHelper::GetInterface( vcl::Window* pWindow ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWin; + css::uno::Reference< css::awt::XWindow > xWin; if ( pWindow ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xPeer = pWindow->GetComponentInterface(); + css::uno::Reference< css::awt::XWindowPeer> xPeer = pWindow->GetComponentInterface(); xWin.set(xPeer, css::uno::UNO_QUERY); } return xWin; } -OutputDevice* VCLUnoHelper::GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>& rxDevice ) +OutputDevice* VCLUnoHelper::GetOutputDevice( const css::uno::Reference< css::awt::XDevice>& rxDevice ) { OutputDevice* pOutDev = NULL; VCLXDevice* pDev = VCLXDevice::GetImplementation( rxDevice ); @@ -162,7 +162,7 @@ OutputDevice* VCLUnoHelper::GetOutputDevice( const ::com::sun::star::uno::Refere return pOutDev; } -OutputDevice* VCLUnoHelper::GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics>& rxGraphics ) +OutputDevice* VCLUnoHelper::GetOutputDevice( const css::uno::Reference< css::awt::XGraphics>& rxGraphics ) { OutputDevice* pOutDev = NULL; VCLXGraphics* pGrf = VCLXGraphics::GetImplementation( rxGraphics ); @@ -171,8 +171,8 @@ OutputDevice* VCLUnoHelper::GetOutputDevice( const ::com::sun::star::uno::Refere return pOutDev; } -tools::Polygon VCLUnoHelper::CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, - const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) +tools::Polygon VCLUnoHelper::CreatePolygon( const css::uno::Sequence< sal_Int32 >& DataX, + const css::uno::Sequence< sal_Int32 >& DataY ) { sal_Int32 nLen = DataX.getLength(); const sal_Int32* pDataX = DataX.getConstArray(); @@ -188,13 +188,13 @@ tools::Polygon VCLUnoHelper::CreatePolygon( const ::com::sun::star::uno::Sequenc return aPoly; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> VCLUnoHelper::CreateControlContainer( vcl::Window* pWindow ) +css::uno::Reference< css::awt::XControlContainer> VCLUnoHelper::CreateControlContainer( vcl::Window* pWindow ) { UnoControlContainer* pContainer = new UnoControlContainer( pWindow->GetComponentInterface() ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > x = pContainer; + css::uno::Reference< css::awt::XControlContainer > x = pContainer; UnoControlModel* pContainerModel = new UnoControlContainerModel( ::comphelper::getProcessComponentContext() ); - pContainer->setModel( static_cast<com::sun::star::awt::XControlModel*>(pContainerModel) ); + pContainer->setModel( static_cast<css::awt::XControlModel*>(pContainerModel) ); return x; } @@ -202,51 +202,51 @@ tools::Polygon VCLUnoHelper::CreatePolygon( const ::com::sun::star::uno::Sequenc float VCLUnoHelper::ConvertFontWidth( FontWidth eWidth ) { if( eWidth == WIDTH_DONTKNOW ) - return ::com::sun::star::awt::FontWidth::DONTKNOW; + return css::awt::FontWidth::DONTKNOW; else if( eWidth == WIDTH_ULTRA_CONDENSED ) - return ::com::sun::star::awt::FontWidth::ULTRACONDENSED; + return css::awt::FontWidth::ULTRACONDENSED; else if( eWidth == WIDTH_EXTRA_CONDENSED ) - return ::com::sun::star::awt::FontWidth::EXTRACONDENSED; + return css::awt::FontWidth::EXTRACONDENSED; else if( eWidth == WIDTH_CONDENSED ) - return ::com::sun::star::awt::FontWidth::CONDENSED; + return css::awt::FontWidth::CONDENSED; else if( eWidth == WIDTH_SEMI_CONDENSED ) - return ::com::sun::star::awt::FontWidth::SEMICONDENSED; + return css::awt::FontWidth::SEMICONDENSED; else if( eWidth == WIDTH_NORMAL ) - return ::com::sun::star::awt::FontWidth::NORMAL; + return css::awt::FontWidth::NORMAL; else if( eWidth == WIDTH_SEMI_EXPANDED ) - return ::com::sun::star::awt::FontWidth::SEMIEXPANDED; + return css::awt::FontWidth::SEMIEXPANDED; else if( eWidth == WIDTH_EXPANDED ) - return ::com::sun::star::awt::FontWidth::EXPANDED; + return css::awt::FontWidth::EXPANDED; else if( eWidth == WIDTH_EXTRA_EXPANDED ) - return ::com::sun::star::awt::FontWidth::EXTRAEXPANDED; + return css::awt::FontWidth::EXTRAEXPANDED; else if( eWidth == WIDTH_ULTRA_EXPANDED ) - return ::com::sun::star::awt::FontWidth::ULTRAEXPANDED; + return css::awt::FontWidth::ULTRAEXPANDED; OSL_FAIL( "Unknown FontWidth" ); - return ::com::sun::star::awt::FontWidth::DONTKNOW; + return css::awt::FontWidth::DONTKNOW; } FontWidth VCLUnoHelper::ConvertFontWidth( float f ) { - if( f <= ::com::sun::star::awt::FontWidth::DONTKNOW ) + if( f <= css::awt::FontWidth::DONTKNOW ) return WIDTH_DONTKNOW; - else if( f <= ::com::sun::star::awt::FontWidth::ULTRACONDENSED ) + else if( f <= css::awt::FontWidth::ULTRACONDENSED ) return WIDTH_ULTRA_CONDENSED; - else if( f <= ::com::sun::star::awt::FontWidth::EXTRACONDENSED ) + else if( f <= css::awt::FontWidth::EXTRACONDENSED ) return WIDTH_EXTRA_CONDENSED; - else if( f <= ::com::sun::star::awt::FontWidth::CONDENSED ) + else if( f <= css::awt::FontWidth::CONDENSED ) return WIDTH_CONDENSED; - else if( f <= ::com::sun::star::awt::FontWidth::SEMICONDENSED ) + else if( f <= css::awt::FontWidth::SEMICONDENSED ) return WIDTH_SEMI_CONDENSED; - else if( f <= ::com::sun::star::awt::FontWidth::NORMAL ) + else if( f <= css::awt::FontWidth::NORMAL ) return WIDTH_NORMAL; - else if( f <= ::com::sun::star::awt::FontWidth::SEMIEXPANDED ) + else if( f <= css::awt::FontWidth::SEMIEXPANDED ) return WIDTH_SEMI_EXPANDED; - else if( f <= ::com::sun::star::awt::FontWidth::EXPANDED ) + else if( f <= css::awt::FontWidth::EXPANDED ) return WIDTH_EXPANDED; - else if( f <= ::com::sun::star::awt::FontWidth::EXTRAEXPANDED ) + else if( f <= css::awt::FontWidth::EXTRAEXPANDED ) return WIDTH_EXTRA_EXPANDED; - else if( f <= ::com::sun::star::awt::FontWidth::ULTRAEXPANDED ) + else if( f <= css::awt::FontWidth::ULTRAEXPANDED ) return WIDTH_ULTRA_EXPANDED; OSL_FAIL( "Unknown FontWidth" ); @@ -256,51 +256,51 @@ FontWidth VCLUnoHelper::ConvertFontWidth( float f ) float VCLUnoHelper::ConvertFontWeight( FontWeight eWeight ) { if( eWeight == WEIGHT_DONTKNOW ) - return ::com::sun::star::awt::FontWeight::DONTKNOW; + return css::awt::FontWeight::DONTKNOW; else if( eWeight == WEIGHT_THIN ) - return ::com::sun::star::awt::FontWeight::THIN; + return css::awt::FontWeight::THIN; else if( eWeight == WEIGHT_ULTRALIGHT ) - return ::com::sun::star::awt::FontWeight::ULTRALIGHT; + return css::awt::FontWeight::ULTRALIGHT; else if( eWeight == WEIGHT_LIGHT ) - return ::com::sun::star::awt::FontWeight::LIGHT; + return css::awt::FontWeight::LIGHT; else if( eWeight == WEIGHT_SEMILIGHT ) - return ::com::sun::star::awt::FontWeight::SEMILIGHT; + return css::awt::FontWeight::SEMILIGHT; else if( ( eWeight == WEIGHT_NORMAL ) || ( eWeight == WEIGHT_MEDIUM ) ) - return ::com::sun::star::awt::FontWeight::NORMAL; + return css::awt::FontWeight::NORMAL; else if( eWeight == WEIGHT_SEMIBOLD ) - return ::com::sun::star::awt::FontWeight::SEMIBOLD; + return css::awt::FontWeight::SEMIBOLD; else if( eWeight == WEIGHT_BOLD ) - return ::com::sun::star::awt::FontWeight::BOLD; + return css::awt::FontWeight::BOLD; else if( eWeight == WEIGHT_ULTRABOLD ) - return ::com::sun::star::awt::FontWeight::ULTRABOLD; + return css::awt::FontWeight::ULTRABOLD; else if( eWeight == WEIGHT_BLACK ) - return ::com::sun::star::awt::FontWeight::BLACK; + return css::awt::FontWeight::BLACK; OSL_FAIL( "Unknown FontWeight" ); - return ::com::sun::star::awt::FontWeight::DONTKNOW; + return css::awt::FontWeight::DONTKNOW; } FontWeight VCLUnoHelper::ConvertFontWeight( float f ) { - if( f <= ::com::sun::star::awt::FontWeight::DONTKNOW ) + if( f <= css::awt::FontWeight::DONTKNOW ) return WEIGHT_DONTKNOW; - else if( f <= ::com::sun::star::awt::FontWeight::THIN ) + else if( f <= css::awt::FontWeight::THIN ) return WEIGHT_THIN; - else if( f <= ::com::sun::star::awt::FontWeight::ULTRALIGHT ) + else if( f <= css::awt::FontWeight::ULTRALIGHT ) return WEIGHT_ULTRALIGHT; - else if( f <= ::com::sun::star::awt::FontWeight::LIGHT ) + else if( f <= css::awt::FontWeight::LIGHT ) return WEIGHT_LIGHT; - else if( f <= ::com::sun::star::awt::FontWeight::SEMILIGHT ) + else if( f <= css::awt::FontWeight::SEMILIGHT ) return WEIGHT_SEMILIGHT; - else if( f <= ::com::sun::star::awt::FontWeight::NORMAL ) + else if( f <= css::awt::FontWeight::NORMAL ) return WEIGHT_NORMAL; - else if( f <= ::com::sun::star::awt::FontWeight::SEMIBOLD ) + else if( f <= css::awt::FontWeight::SEMIBOLD ) return WEIGHT_SEMIBOLD; - else if( f <= ::com::sun::star::awt::FontWeight::BOLD ) + else if( f <= css::awt::FontWeight::BOLD ) return WEIGHT_BOLD; - else if( f <= ::com::sun::star::awt::FontWeight::ULTRABOLD ) + else if( f <= css::awt::FontWeight::ULTRABOLD ) return WEIGHT_ULTRABOLD; - else if( f <= ::com::sun::star::awt::FontWeight::BLACK ) + else if( f <= css::awt::FontWeight::BLACK ) return WEIGHT_BLACK; OSL_FAIL( "Unknown FontWeight" ); @@ -363,9 +363,9 @@ FontItalic VCLUnoHelper::ConvertFontSlant(css::awt::FontSlant eSlant) return eRet; } -::com::sun::star::awt::FontDescriptor VCLUnoHelper::CreateFontDescriptor( const vcl::Font& rFont ) +css::awt::FontDescriptor VCLUnoHelper::CreateFontDescriptor( const vcl::Font& rFont ) { - ::com::sun::star::awt::FontDescriptor aFD; + css::awt::FontDescriptor aFD; aFD.Name = rFont.GetName(); aFD.StyleName = rFont.GetStyleName(); aFD.Height = (sal_Int16)rFont.GetSize().Height(); @@ -385,7 +385,7 @@ FontItalic VCLUnoHelper::ConvertFontSlant(css::awt::FontSlant eSlant) return aFD; } -vcl::Font VCLUnoHelper::CreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr, const vcl::Font& rInitFont ) +vcl::Font VCLUnoHelper::CreateFont( const css::awt::FontDescriptor& rDescr, const vcl::Font& rInitFont ) { vcl::Font aFont( rInitFont ); if ( !rDescr.Name.isEmpty() ) @@ -419,7 +419,7 @@ vcl::Font VCLUnoHelper::CreateFont( const ::com::sun::star::awt::FontDescriptor& return aFont; } -vcl::Font VCLUnoHelper::CreateFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ) +vcl::Font VCLUnoHelper::CreateFont( const css::uno::Reference< css::awt::XFont >& rxFont ) { vcl::Font aFont; VCLXFont* pVCLXFont = VCLXFont::GetImplementation( rxFont ); @@ -429,9 +429,9 @@ vcl::Font VCLUnoHelper::CreateFont( const ::com::sun::star::uno::Reference< ::co } -::com::sun::star::awt::SimpleFontMetric VCLUnoHelper::CreateFontMetric( const FontMetric& rFontMetric ) +css::awt::SimpleFontMetric VCLUnoHelper::CreateFontMetric( const FontMetric& rFontMetric ) { - ::com::sun::star::awt::SimpleFontMetric aFM; + css::awt::SimpleFontMetric aFM; aFM.Ascent = (sal_Int16)rFontMetric.GetAscent(); aFM.Descent = (sal_Int16)rFontMetric.GetDescent(); aFM.Leading = (sal_Int16)rFontMetric.GetIntLeading(); @@ -450,27 +450,27 @@ MapUnit VCLUnoHelper::UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit ) { switch( nUnoEmbedMapUnit ) { - case ::com::sun::star::embed::EmbedMapUnits::ONE_100TH_MM: + case css::embed::EmbedMapUnits::ONE_100TH_MM: return MAP_100TH_MM; - case ::com::sun::star::embed::EmbedMapUnits::ONE_10TH_MM: + case css::embed::EmbedMapUnits::ONE_10TH_MM: return MAP_10TH_MM; - case ::com::sun::star::embed::EmbedMapUnits::ONE_MM: + case css::embed::EmbedMapUnits::ONE_MM: return MAP_MM; - case ::com::sun::star::embed::EmbedMapUnits::ONE_CM: + case css::embed::EmbedMapUnits::ONE_CM: return MAP_CM; - case ::com::sun::star::embed::EmbedMapUnits::ONE_1000TH_INCH: + case css::embed::EmbedMapUnits::ONE_1000TH_INCH: return MAP_1000TH_INCH; - case ::com::sun::star::embed::EmbedMapUnits::ONE_100TH_INCH: + case css::embed::EmbedMapUnits::ONE_100TH_INCH: return MAP_100TH_INCH; - case ::com::sun::star::embed::EmbedMapUnits::ONE_10TH_INCH: + case css::embed::EmbedMapUnits::ONE_10TH_INCH: return MAP_10TH_INCH; - case ::com::sun::star::embed::EmbedMapUnits::ONE_INCH: + case css::embed::EmbedMapUnits::ONE_INCH: return MAP_INCH; - case ::com::sun::star::embed::EmbedMapUnits::POINT: + case css::embed::EmbedMapUnits::POINT: return MAP_POINT; - case ::com::sun::star::embed::EmbedMapUnits::TWIP: + case css::embed::EmbedMapUnits::TWIP: return MAP_TWIP; - case ::com::sun::star::embed::EmbedMapUnits::PIXEL: + case css::embed::EmbedMapUnits::PIXEL: return MAP_PIXEL; } @@ -483,27 +483,27 @@ sal_Int32 VCLUnoHelper::VCL2UnoEmbedMapUnit( MapUnit nVCLMapUnit ) switch( nVCLMapUnit ) { case MAP_100TH_MM: - return ::com::sun::star::embed::EmbedMapUnits::ONE_100TH_MM; + return css::embed::EmbedMapUnits::ONE_100TH_MM; case MAP_10TH_MM: - return ::com::sun::star::embed::EmbedMapUnits::ONE_10TH_MM; + return css::embed::EmbedMapUnits::ONE_10TH_MM; case MAP_MM: - return ::com::sun::star::embed::EmbedMapUnits::ONE_MM; + return css::embed::EmbedMapUnits::ONE_MM; case MAP_CM: - return ::com::sun::star::embed::EmbedMapUnits::ONE_CM; + return css::embed::EmbedMapUnits::ONE_CM; case MAP_1000TH_INCH: - return ::com::sun::star::embed::EmbedMapUnits::ONE_1000TH_INCH; + return css::embed::EmbedMapUnits::ONE_1000TH_INCH; case MAP_100TH_INCH: - return ::com::sun::star::embed::EmbedMapUnits::ONE_100TH_INCH; + return css::embed::EmbedMapUnits::ONE_100TH_INCH; case MAP_10TH_INCH: - return ::com::sun::star::embed::EmbedMapUnits::ONE_10TH_INCH; + return css::embed::EmbedMapUnits::ONE_10TH_INCH; case MAP_INCH: - return ::com::sun::star::embed::EmbedMapUnits::ONE_INCH; + return css::embed::EmbedMapUnits::ONE_INCH; case MAP_POINT: - return ::com::sun::star::embed::EmbedMapUnits::POINT; + return css::embed::EmbedMapUnits::POINT; case MAP_TWIP: - return ::com::sun::star::embed::EmbedMapUnits::TWIP; + return css::embed::EmbedMapUnits::TWIP; case MAP_PIXEL: - return ::com::sun::star::embed::EmbedMapUnits::PIXEL; + return css::embed::EmbedMapUnits::PIXEL; default: ; // avoid compiler warning } @@ -588,123 +588,102 @@ FieldUnit VCLUnoHelper::ConvertToFieldUnit( sal_Int16 _nMeasurementUnit, sal_Int } -MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.sun.star.util.MeasureUnit.* */ _nMeasureUnit) throw (::com::sun::star::lang::IllegalArgumentException) +MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.sun.star.util.MeasureUnit.* */ _nMeasureUnit) throw (css::lang::IllegalArgumentException) { MapUnit eMode; switch(_nMeasureUnit) { - case com::sun::star::util::MeasureUnit::MM_100TH: + case css::util::MeasureUnit::MM_100TH: eMode = MAP_100TH_MM; break; - - case com::sun::star::util::MeasureUnit::MM_10TH: + case css::util::MeasureUnit::MM_10TH: eMode = MAP_10TH_MM; break; - case com::sun::star::util::MeasureUnit::MM: + case css::util::MeasureUnit::MM: eMode = MAP_MM; break; - case com::sun::star::util::MeasureUnit::CM: + case css::util::MeasureUnit::CM: eMode = MAP_CM; break; - case com::sun::star::util::MeasureUnit::INCH_1000TH: + case css::util::MeasureUnit::INCH_1000TH: eMode = MAP_1000TH_INCH; break; - case com::sun::star::util::MeasureUnit::INCH_100TH: + case css::util::MeasureUnit::INCH_100TH: eMode = MAP_100TH_INCH; break; - case com::sun::star::util::MeasureUnit::INCH_10TH: + case css::util::MeasureUnit::INCH_10TH: eMode = MAP_10TH_INCH; break; - case com::sun::star::util::MeasureUnit::INCH: + case css::util::MeasureUnit::INCH: eMode = MAP_INCH; break; - case com::sun::star::util::MeasureUnit::POINT: + case css::util::MeasureUnit::POINT: eMode = MAP_POINT; break; - case com::sun::star::util::MeasureUnit::TWIP: + case css::util::MeasureUnit::TWIP: eMode = MAP_TWIP; break; - case com::sun::star::util::MeasureUnit::PIXEL: + case css::util::MeasureUnit::PIXEL: eMode = MAP_PIXEL; break; -/* - case com::sun::star::util::MeasureUnit::M: - break; - case com::sun::star::util::MeasureUnit::KM: - break; - case com::sun::star::util::MeasureUnit::PICA: - break; - case com::sun::star::util::MeasureUnit::FOOT: - break; - case com::sun::star::util::MeasureUnit::MILE: - break; - case com::sun::star::util::MeasureUnit::PERCENT: - break; -*/ - case com::sun::star::util::MeasureUnit::APPFONT: + case css::util::MeasureUnit::APPFONT: eMode = MAP_APPFONT; break; - case com::sun::star::util::MeasureUnit::SYSFONT: + case css::util::MeasureUnit::SYSFONT: eMode = MAP_SYSFONT; break; -/* - case com::sun::star::util::MeasureUnit::RELATIVE: - eMode = MAP_RELATIVE; - break; -*/ - default: - throw ::com::sun::star::lang::IllegalArgumentException("Unsupported measure unit.", NULL, 1 ); + throw css::lang::IllegalArgumentException("Unsupported measure unit.", NULL, 1 ); } return eMode; } -::Size VCLUnoHelper::ConvertToVCLSize(com::sun::star::awt::Size const& _aSize) +::Size VCLUnoHelper::ConvertToVCLSize(css::awt::Size const& _aSize) { ::Size aVCLSize(_aSize.Width, _aSize.Height); return aVCLSize; } -com::sun::star::awt::Size VCLUnoHelper::ConvertToAWTSize(::Size /* VCLSize */ const& _aSize) +css::awt::Size VCLUnoHelper::ConvertToAWTSize(::Size /* VCLSize */ const& _aSize) { - com::sun::star::awt::Size aAWTSize(_aSize.Width(), _aSize.Height()); + css::awt::Size aAWTSize(_aSize.Width(), _aSize.Height()); return aAWTSize; } -::Point VCLUnoHelper::ConvertToVCLPoint(com::sun::star::awt::Point const& _aPoint) +::Point VCLUnoHelper::ConvertToVCLPoint(css::awt::Point const& _aPoint) { ::Point aVCLPoint(_aPoint.X, _aPoint.Y); return aVCLPoint; } -com::sun::star::awt::Point VCLUnoHelper::ConvertToAWTPoint(::Point /* VCLPoint */ const& _aPoint) +css::awt::Point VCLUnoHelper::ConvertToAWTPoint(::Point /* VCLPoint */ const& _aPoint) { - com::sun::star::awt::Point aAWTPoint(_aPoint.X(), _aPoint.Y()); + css::awt::Point aAWTPoint(_aPoint.X(), _aPoint.Y()); return aAWTPoint; } -::Rectangle VCLUnoHelper::ConvertToVCLRect( ::com::sun::star::awt::Rectangle const & _rRect ) +::Rectangle VCLUnoHelper::ConvertToVCLRect( css::awt::Rectangle const & _rRect ) { return ::Rectangle( _rRect.X, _rRect.Y, _rRect.X + _rRect.Width - 1, _rRect.Y + _rRect.Height - 1 ); } -::com::sun::star::awt::Rectangle VCLUnoHelper::ConvertToAWTRect( ::Rectangle const & _rRect ) +css::awt::Rectangle VCLUnoHelper::ConvertToAWTRect( ::Rectangle const & _rRect ) { - return ::com::sun::star::awt::Rectangle( _rRect.Left(), _rRect.Top(), _rRect.GetWidth(), _rRect.GetHeight() ); + return css::awt::Rectangle( _rRect.Left(), _rRect.Top(), _rRect.GetWidth(), _rRect.GetHeight() ); } awt::MouseEvent VCLUnoHelper::createMouseEvent( const ::MouseEvent& _rVclEvent, const uno::Reference< uno::XInterface >& _rxContext ) @@ -714,19 +693,19 @@ awt::MouseEvent VCLUnoHelper::createMouseEvent( const ::MouseEvent& _rVclEvent, aMouseEvent.Modifiers = 0; if ( _rVclEvent.IsShift() ) - aMouseEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::SHIFT; + aMouseEvent.Modifiers |= css::awt::KeyModifier::SHIFT; if ( _rVclEvent.IsMod1() ) - aMouseEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD1; + aMouseEvent.Modifiers |= css::awt::KeyModifier::MOD1; if ( _rVclEvent.IsMod2() ) - aMouseEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD2; + aMouseEvent.Modifiers |= css::awt::KeyModifier::MOD2; aMouseEvent.Buttons = 0; if ( _rVclEvent.IsLeft() ) - aMouseEvent.Buttons |= ::com::sun::star::awt::MouseButton::LEFT; + aMouseEvent.Buttons |= css::awt::MouseButton::LEFT; if ( _rVclEvent.IsRight() ) - aMouseEvent.Buttons |= ::com::sun::star::awt::MouseButton::RIGHT; + aMouseEvent.Buttons |= css::awt::MouseButton::RIGHT; if ( _rVclEvent.IsMiddle() ) - aMouseEvent.Buttons |= ::com::sun::star::awt::MouseButton::MIDDLE; + aMouseEvent.Buttons |= css::awt::MouseButton::MIDDLE; aMouseEvent.X = _rVclEvent.GetPosPixel().X(); aMouseEvent.Y = _rVclEvent.GetPosPixel().Y(); |