diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-18 10:11:06 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-18 09:03:16 +0000 |
commit | 5a4d508bd6711def27c7738f7ac68c2da478e48c (patch) | |
tree | c688427afbce033c04009d71c4b2c256ec784da2 /vcl/source/components | |
parent | d30a44aff1fb049a71e4eb2612be65a735fbe918 (diff) |
com::sun::star->css in vcl/
Change-Id: Ifad76177673cf93746ba221838be80ff76fed228
Reviewed-on: https://gerrit.libreoffice.org/20032
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/components')
-rw-r--r-- | vcl/source/components/dtranscomp.cxx | 36 | ||||
-rw-r--r-- | vcl/source/components/factory.cxx | 6 | ||||
-rw-r--r-- | vcl/source/components/fontident.cxx | 46 |
3 files changed, 44 insertions, 44 deletions
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 4d5c3d4a7a7c..18a104db05b6 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -57,9 +57,9 @@ class GenericClipboard : > { osl::Mutex m_aMutex; - Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents; - Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner; - std::list< Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener > > m_aListeners; + Reference< css::datatransfer::XTransferable > m_aContents; + Reference< css::datatransfer::clipboard::XClipboardOwner > m_aOwner; + std::list< Reference< css::datatransfer::clipboard::XClipboardListener > > m_aListeners; public: @@ -85,12 +85,12 @@ public: * XClipboard */ - virtual Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() + virtual Reference< css::datatransfer::XTransferable > SAL_CALL getContents() throw(RuntimeException, std::exception) override; virtual void SAL_CALL setContents( - const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, - const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) + const Reference< css::datatransfer::XTransferable >& xTrans, + const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw(RuntimeException, std::exception) override; virtual OUString SAL_CALL getName() @@ -107,11 +107,11 @@ public: * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( - const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) + const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) throw(RuntimeException, std::exception) override; virtual void SAL_CALL removeClipboardListener( - const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) + const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) throw(RuntimeException, std::exception) override; }; @@ -145,14 +145,14 @@ sal_Bool GenericClipboard::supportsService( const OUString& ServiceName ) throw( return cppu::supportsService(this, ServiceName); } -Reference< ::com::sun::star::datatransfer::XTransferable > GenericClipboard::getContents() throw( RuntimeException, std::exception ) +Reference< css::datatransfer::XTransferable > GenericClipboard::getContents() throw( RuntimeException, std::exception ) { return m_aContents; } void GenericClipboard::setContents( - const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, - const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) + const Reference< css::datatransfer::XTransferable >& xTrans, + const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw( RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -203,7 +203,7 @@ void GenericClipboard::removeClipboardListener( const Reference< datatransfer::c } class ClipboardFactory : public ::cppu::WeakComponentImplHelper< - com::sun::star::lang::XSingleServiceFactory + css::lang::XSingleServiceFactory > { osl::Mutex m_aMutex; @@ -220,7 +220,7 @@ public: ClipboardFactory::ClipboardFactory() : cppu::WeakComponentImplHelper< - com::sun::star::lang::XSingleServiceFactory + css::lang::XSingleServiceFactory >( m_aMutex ) { } @@ -286,7 +286,7 @@ public: ) throw(std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) override; + virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( css::uno::Exception, std::exception ) override; OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override @@ -395,8 +395,8 @@ public: virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ) override; // XDropTarget - virtual void SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; - virtual void SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; + virtual void SAL_CALL addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; + virtual void SAL_CALL removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; virtual sal_Bool SAL_CALL isActive() throw(std::exception) override; virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception) override; virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception) override; @@ -434,11 +434,11 @@ void GenericDropTarget::initialize( const Sequence< Any >& ) throw( Exception, s { } -void GenericDropTarget::addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) +void GenericDropTarget::addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) { } -void GenericDropTarget::removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) +void GenericDropTarget::removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) { } diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 856bddc23d35..c6096b46bb0b 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -42,10 +42,10 @@ extern "C" { if( pXUnoSMgr ) { - Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( - static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pXUnoSMgr ) + Reference< css::lang::XMultiServiceFactory > xMgr( + static_cast< css::lang::XMultiServiceFactory* >( pXUnoSMgr ) ); - Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory; + Reference< css::lang::XSingleServiceFactory > xFactory; if( vcl_session_getImplementationName().equalsAscii( pImplementationName ) ) { xFactory = ::cppu::createOneInstanceFactory( diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 11066c63ae9e..20aa9d1a705f 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -107,46 +107,46 @@ Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException, std::excep aFD.Type = 0; switch( m_aFont.GetFamily() ) { - case FAMILY_DECORATIVE: aFD.Family = com::sun::star::awt::FontFamily::DECORATIVE;break; - case FAMILY_MODERN: aFD.Family = com::sun::star::awt::FontFamily::MODERN;break; - case FAMILY_ROMAN: aFD.Family = com::sun::star::awt::FontFamily::ROMAN;break; - case FAMILY_SCRIPT: aFD.Family = com::sun::star::awt::FontFamily::SCRIPT;break; - case FAMILY_SWISS: aFD.Family = com::sun::star::awt::FontFamily::SWISS;break; - case FAMILY_SYSTEM: aFD.Family = com::sun::star::awt::FontFamily::SYSTEM;break; + case FAMILY_DECORATIVE: aFD.Family = css::awt::FontFamily::DECORATIVE;break; + case FAMILY_MODERN: aFD.Family = css::awt::FontFamily::MODERN;break; + case FAMILY_ROMAN: aFD.Family = css::awt::FontFamily::ROMAN;break; + case FAMILY_SCRIPT: aFD.Family = css::awt::FontFamily::SCRIPT;break; + case FAMILY_SWISS: aFD.Family = css::awt::FontFamily::SWISS;break; + case FAMILY_SYSTEM: aFD.Family = css::awt::FontFamily::SYSTEM;break; default: - aFD.Family = com::sun::star::awt::FontFamily::DONTKNOW; + aFD.Family = css::awt::FontFamily::DONTKNOW; break; } switch( m_aFont.GetPitch() ) { - case PITCH_VARIABLE: aFD.Pitch = com::sun::star::awt::FontPitch::VARIABLE;break; - case PITCH_FIXED: aFD.Pitch = com::sun::star::awt::FontPitch::FIXED;break; + case PITCH_VARIABLE: aFD.Pitch = css::awt::FontPitch::VARIABLE;break; + case PITCH_FIXED: aFD.Pitch = css::awt::FontPitch::FIXED;break; default: - aFD.Pitch = com::sun::star::awt::FontPitch::DONTKNOW; + aFD.Pitch = css::awt::FontPitch::DONTKNOW; break; } switch( m_aFont.GetWeight() ) { - case WEIGHT_THIN: aFD.Weight = com::sun::star::awt::FontWeight::THIN;break; - case WEIGHT_ULTRALIGHT: aFD.Weight = com::sun::star::awt::FontWeight::ULTRALIGHT;break; - case WEIGHT_LIGHT: aFD.Weight = com::sun::star::awt::FontWeight::LIGHT;break; - case WEIGHT_SEMILIGHT: aFD.Weight = com::sun::star::awt::FontWeight::SEMILIGHT;break; + case WEIGHT_THIN: aFD.Weight = css::awt::FontWeight::THIN;break; + case WEIGHT_ULTRALIGHT: aFD.Weight = css::awt::FontWeight::ULTRALIGHT;break; + case WEIGHT_LIGHT: aFD.Weight = css::awt::FontWeight::LIGHT;break; + case WEIGHT_SEMILIGHT: aFD.Weight = css::awt::FontWeight::SEMILIGHT;break; case WEIGHT_MEDIUM: - case WEIGHT_NORMAL: aFD.Weight = com::sun::star::awt::FontWeight::NORMAL;break; - case WEIGHT_SEMIBOLD: aFD.Weight = com::sun::star::awt::FontWeight::SEMIBOLD;break; - case WEIGHT_BOLD: aFD.Weight = com::sun::star::awt::FontWeight::BOLD;break; - case WEIGHT_ULTRABOLD: aFD.Weight = com::sun::star::awt::FontWeight::ULTRABOLD;break; - case WEIGHT_BLACK: aFD.Weight = com::sun::star::awt::FontWeight::BLACK;break; + case WEIGHT_NORMAL: aFD.Weight = css::awt::FontWeight::NORMAL;break; + case WEIGHT_SEMIBOLD: aFD.Weight = css::awt::FontWeight::SEMIBOLD;break; + case WEIGHT_BOLD: aFD.Weight = css::awt::FontWeight::BOLD;break; + case WEIGHT_ULTRABOLD: aFD.Weight = css::awt::FontWeight::ULTRABOLD;break; + case WEIGHT_BLACK: aFD.Weight = css::awt::FontWeight::BLACK;break; default: - aFD.Weight = com::sun::star::awt::FontWeight::DONTKNOW; + aFD.Weight = css::awt::FontWeight::DONTKNOW; break; } switch( m_aFont.GetItalic() ) { - case ITALIC_OBLIQUE: aFD.Slant = com::sun::star::awt::FontSlant_OBLIQUE;break; - case ITALIC_NORMAL: aFD.Slant = com::sun::star::awt::FontSlant_ITALIC;break; + case ITALIC_OBLIQUE: aFD.Slant = css::awt::FontSlant_OBLIQUE;break; + case ITALIC_NORMAL: aFD.Slant = css::awt::FontSlant_ITALIC;break; default: - aFD.Slant = com::sun::star::awt::FontSlant_DONTKNOW; + aFD.Slant = css::awt::FontSlant_DONTKNOW; break; } return makeAny( aFD ); |