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 | |
| 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')
58 files changed, 357 insertions, 363 deletions
diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx index 7e2ef1c918f7..4ea7fe1b8584 100644 --- a/vcl/source/app/dndhelp.cxx +++ b/vcl/source/app/dndhelp.cxx @@ -25,38 +25,38 @@ using namespace ::com::sun::star; vcl::unohelper::DragAndDropClient::~DragAndDropClient() {} -void vcl::unohelper::DragAndDropClient::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& /*dge*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& /*dge*/ ) + throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropClient::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& /*dsde*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& /*dsde*/ ) + throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropClient::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& /*dtde*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::drop( const css::datatransfer::dnd::DropTargetDropEvent& /*dtde*/ ) + throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropClient::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& /*dtdee*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& /*dtdee*/ ) + throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropClient::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& /*dte*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::dragExit( const css::datatransfer::dnd::DropTargetEvent& /*dte*/ ) + throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropClient::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& /*dtde*/ ) - throw (::com::sun::star::uno::RuntimeException, +void vcl::unohelper::DragAndDropClient::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& /*dtde*/ ) + throw (css::uno::RuntimeException, std::exception) { } @@ -74,77 +74,77 @@ vcl::unohelper::DragAndDropWrapper::~DragAndDropWrapper() uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::lang::XEventListener* >( static_cast<com::sun::star::datatransfer::dnd::XDragGestureListener*>(this)) ), - (static_cast< ::com::sun::star::datatransfer::dnd::XDragGestureListener* >(this)), - (static_cast< ::com::sun::star::datatransfer::dnd::XDragSourceListener* >(this)), - (static_cast< ::com::sun::star::datatransfer::dnd::XDropTargetListener* >(this)) ); + (static_cast< css::lang::XEventListener* >( static_cast<css::datatransfer::dnd::XDragGestureListener*>(this)) ), + (static_cast< css::datatransfer::dnd::XDragGestureListener* >(this)), + (static_cast< css::datatransfer::dnd::XDragSourceListener* >(this)), + (static_cast< css::datatransfer::dnd::XDropTargetListener* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } -// ::com::sun::star::lang::XEventListener -void vcl::unohelper::DragAndDropWrapper::disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::lang::XEventListener +void vcl::unohelper::DragAndDropWrapper::disposing( const css::lang::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) { // Empty Source means it's the client, because the client is not a XInterface if ( !rEvent.Source.is() ) mpClient = nullptr; } -// ::com::sun::star::datatransfer::dnd::XDragGestureListener -void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDragGestureListener +void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragGestureRecognized( rDGE ); } -// ::com::sun::star::datatransfer::dnd::XDragSourceListener -void vcl::unohelper::DragAndDropWrapper::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDragSourceListener +void vcl::unohelper::DragAndDropWrapper::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragDropEnd( rDSDE ); } -void vcl::unohelper::DragAndDropWrapper::dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropWrapper::dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DragSourceEvent& ) throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropWrapper::dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception) { } -void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception) { } -// ::com::sun::star::datatransfer::dnd::XDropTargetListener -void vcl::unohelper::DragAndDropWrapper::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDropTargetListener +void vcl::unohelper::DragAndDropWrapper::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->drop( rDTDE ); } -void vcl::unohelper::DragAndDropWrapper::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragEnter( rDTDEE ); } -void vcl::unohelper::DragAndDropWrapper::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragExit( dte ); } -void vcl::unohelper::DragAndDropWrapper::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragOver( rDTDE ); } -void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) throw (css::uno::RuntimeException, std::exception) { } diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 75176fb6bbb2..03d1bed10ad0 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; -vcl::I18nHelper::I18nHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ) +vcl::I18nHelper::I18nHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ) : maLanguageTag( rLanguageTag) { diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 3d7a76c41067..e910a92db274 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2889,7 +2889,7 @@ namespace if ( aNode.isValid() ) { bool bTmp = bool(); - ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("UIMirroring") ); + css::uno::Any aValue = aNode.getNodeValue( OUString("UIMirroring") ); if( aValue >>= bTmp ) { // found true or false; if it was nil, nothing is changed diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 09bbf2d5f25c..7f490b603c87 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1440,9 +1440,9 @@ SystemWindowFlags Application::GetSystemWindowMode() return ImplGetSVData()->maAppData.mnSysWinMode; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > Application::GetVCLToolkit() +css::uno::Reference< css::awt::XToolkit > Application::GetVCLToolkit() { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > xT; + css::uno::Reference< css::awt::XToolkit > xT; UnoWrapperBase* pWrapper = Application::GetUnoWrapper(); if ( pWrapper ) xT = pWrapper->GetVCLToolkit(); @@ -1494,7 +1494,7 @@ void Application::SetUnoWrapper( UnoWrapperBase* pWrapper ) pSVData->mpUnoWrapper = pWrapper; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayConnection > Application::GetDisplayConnection() +css::uno::Reference< css::awt::XDisplayConnection > Application::GetDisplayConnection() { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 06f08114ee7d..9cb3d2de7035 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -213,18 +213,18 @@ static Application * pOwnSvApp = nullptr; // Exception handler. pExceptionHandler != NULL => VCL already inited static oslSignalHandler pExceptionHandler = nullptr; -class DesktopEnvironmentContext: public cppu::WeakImplHelper< com::sun::star::uno::XCurrentContext > +class DesktopEnvironmentContext: public cppu::WeakImplHelper< css::uno::XCurrentContext > { public: - explicit DesktopEnvironmentContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx) + explicit DesktopEnvironmentContext( const css::uno::Reference< css::uno::XCurrentContext > & ctx) : m_xNextContext( ctx ) {} // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) + throw (css::uno::RuntimeException, std::exception) override; private: - com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_xNextContext; + css::uno::Reference< css::uno::XCurrentContext > m_xNextContext; }; uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Name) throw (uno::RuntimeException, std::exception) @@ -267,8 +267,8 @@ bool InitVCL() return false; // Desktop Environment context (to be able to get value of "system.desktop-environment" as soon as possible) - com::sun::star::uno::setCurrentContext( - new DesktopEnvironmentContext( com::sun::star::uno::getCurrentContext() ) ); + css::uno::setCurrentContext( + new DesktopEnvironmentContext( css::uno::getCurrentContext() ) ); // Initialize application instance (should be done after initialization of VCL SAL part) if( pSVData->mpApp ) @@ -312,7 +312,7 @@ namespace a bundled extension is registered/deregistered during startup, forcing exit while the app is still in splash screen.) */ -class VCLUnoWrapperDeleter : public cppu::WeakImplHelper<com::sun::star::lang::XEventListener> +class VCLUnoWrapperDeleter : public cppu::WeakImplHelper<css::lang::XEventListener> { virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception) override; }; diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index de5cf66dbee8..a515d6ed8a9f 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -44,20 +44,20 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte return i18n::CharacterClassification::create( comphelper::getProcessComponentContext() ); } -void vcl::unohelper::NotifyAccessibleStateEventGlobally( const ::com::sun::star::accessibility::AccessibleEventObject& rEventObject ) +void vcl::unohelper::NotifyAccessibleStateEventGlobally( const css::accessibility::AccessibleEventObject& rEventObject ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > xExtToolkit( Application::GetVCLToolkit(), uno::UNO_QUERY ); + css::uno::Reference< css::awt::XExtendedToolkit > xExtToolkit( Application::GetVCLToolkit(), uno::UNO_QUERY ); if ( xExtToolkit.is() ) { // Only for focus events - sal_Int16 nType = ::com::sun::star::accessibility::AccessibleStateType::INVALID; + sal_Int16 nType = css::accessibility::AccessibleStateType::INVALID; rEventObject.NewValue >>= nType; - if ( nType == ::com::sun::star::accessibility::AccessibleStateType::FOCUSED ) + if ( nType == css::accessibility::AccessibleStateType::FOCUSED ) xExtToolkit->fireFocusGained( rEventObject.Source ); else { rEventObject.OldValue >>= nType; - if ( nType == ::com::sun::star::accessibility::AccessibleStateType::FOCUSED ) + if ( nType == css::accessibility::AccessibleStateType::FOCUSED ) xExtToolkit->fireFocusLost( rEventObject.Source ); } diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index 73389919f4bf..0db903a57d3a 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -61,14 +61,14 @@ namespace vcl { namespace unohelper { } } - // ::com::sun::star::uno::XInterface + // css::uno::XInterface uno::Any TextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } - // ::com::sun::star::datatransfer::XTransferable + // css::datatransfer::XTransferable uno::Any TextDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception) { uno::Any aAny; 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 ); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index e905fba3df8b..dbd8233b0040 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1315,7 +1315,7 @@ void Edit::ImplCopyToSelectionClipboard() { if ( GetSelection().Len() ) { - ::com::sun::star::uno::Reference<com::sun::star::datatransfer::clipboard::XClipboard> aSelection(GetPrimarySelection()); + css::uno::Reference<css::datatransfer::clipboard::XClipboard> aSelection(GetPrimarySelection()); ImplCopy( aSelection ); } } @@ -1336,7 +1336,7 @@ void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC SolarMutexReleaser aReleaser; xDataObj = rxClipboard->getContents(); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } @@ -1353,7 +1353,7 @@ void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC ShowTruncationWarning( this ); ReplaceSelected( aText ); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } } @@ -1414,7 +1414,7 @@ void Edit::MouseButtonUp( const MouseEvent& rMEvt ) else if ( rMEvt.IsMiddle() && !mbReadOnly && ( GetSettings().GetMouseSettings().GetMiddleButtonAction() == MouseMiddleButtonAction::PasteSelection ) ) { - ::com::sun::star::uno::Reference<com::sun::star::datatransfer::clipboard::XClipboard> aSelection(Window::GetPrimarySelection()); + css::uno::Reference<css::datatransfer::clipboard::XClipboard> aSelection(Window::GetPrimarySelection()); ImplPaste( aSelection ); ImplModified(); } @@ -1534,7 +1534,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) { switch ( nCode ) { - case com::sun::star::awt::Key::SELECT_ALL: + case css::awt::Key::SELECT_ALL: { ImplSetSelection( Selection( 0, maText.getLength() ) ); bDone = true; @@ -1545,22 +1545,22 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) case KEY_RIGHT: case KEY_HOME: case KEY_END: - case com::sun::star::awt::Key::MOVE_WORD_FORWARD: - case com::sun::star::awt::Key::SELECT_WORD_FORWARD: - case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: - case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: - case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: - case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: + case css::awt::Key::MOVE_WORD_FORWARD: + case css::awt::Key::SELECT_WORD_FORWARD: + case css::awt::Key::MOVE_WORD_BACKWARD: + case css::awt::Key::SELECT_WORD_BACKWARD: + case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: + case css::awt::Key::MOVE_TO_END_OF_LINE: + case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: + case css::awt::Key::SELECT_TO_END_OF_LINE: + case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: { if ( !rKEvt.GetKeyCode().IsMod2() ) { @@ -1577,31 +1577,31 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) switch( nCode ) { - case com::sun::star::awt::Key::MOVE_WORD_FORWARD: + case css::awt::Key::MOVE_WORD_FORWARD: bGoRight = bWord = true;break; - case com::sun::star::awt::Key::SELECT_WORD_FORWARD: + case css::awt::Key::SELECT_WORD_FORWARD: bGoRight = bSelect = bWord = true;break; - case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: + case css::awt::Key::MOVE_WORD_BACKWARD: bGoLeft = bWord = true;break; - case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: + case css::awt::Key::SELECT_WORD_BACKWARD: bGoLeft = bSelect = bWord = true;break; - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: + case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: bSelect = true; // fallthrough intended - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: + case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: bGoHome = true;break; - case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_END_OF_LINE: + case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: bSelect = true; // fallthrough intended - case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_END_OF_LINE: + case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: bGoEnd = true;break; default: break; @@ -1673,10 +1673,10 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) } break; - case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: - case com::sun::star::awt::Key::DELETE_WORD_FORWARD: - case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: + case css::awt::Key::DELETE_WORD_BACKWARD: + case css::awt::Key::DELETE_WORD_FORWARD: + case css::awt::Key::DELETE_TO_BEGIN_OF_LINE: + case css::awt::Key::DELETE_TO_END_OF_LINE: case KEY_BACKSPACE: case KEY_DELETE: { @@ -1688,19 +1688,19 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) nMode = EDIT_DELMODE_RESTOFCONTENT; switch( nCode ) { - case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: + case css::awt::Key::DELETE_WORD_BACKWARD: nDel = EDIT_DEL_LEFT; nMode = EDIT_DELMODE_RESTOFWORD; break; - case com::sun::star::awt::Key::DELETE_WORD_FORWARD: + case css::awt::Key::DELETE_WORD_FORWARD: nDel = EDIT_DEL_RIGHT; nMode = EDIT_DELMODE_RESTOFWORD; break; - case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: + case css::awt::Key::DELETE_TO_BEGIN_OF_LINE: nDel = EDIT_DEL_LEFT; nMode = EDIT_DELMODE_RESTOFCONTENT; break; - case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: + case css::awt::Key::DELETE_TO_END_OF_LINE: nDel = EDIT_DEL_RIGHT; nMode = EDIT_DELMODE_RESTOFCONTENT; break; @@ -2641,14 +2641,14 @@ void Edit::Copy() { if ( !(GetStyle() & WB_PASSWORD ) ) { - ::com::sun::star::uno::Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipboard(GetClipboard()); + css::uno::Reference<css::datatransfer::clipboard::XClipboard> aClipboard(GetClipboard()); ImplCopy( aClipboard ); } } void Edit::Paste() { - ::com::sun::star::uno::Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipboard(GetClipboard()); + css::uno::Reference<css::datatransfer::clipboard::XClipboard> aClipboard(GetClipboard()); ImplPaste( aClipboard ); } @@ -2876,8 +2876,8 @@ void Edit::DeletePopupMenu( PopupMenu* pMenu ) delete pMenu; } -// ::com::sun::star::datatransfer::dnd::XDragGestureListener -void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDragGestureListener +void Edit::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -2913,8 +2913,8 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra } } -// ::com::sun::star::datatransfer::dnd::XDragSourceListener -void Edit::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDragSourceListener +void Edit::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -2939,8 +2939,8 @@ void Edit::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDro mpDDInfo = nullptr; } -// ::com::sun::star::datatransfer::dnd::XDropTargetListener -void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +// css::datatransfer::dnd::XDropTargetListener +void Edit::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -2987,14 +2987,14 @@ void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE.Context->dropComplete( bChanges ); } -void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void Edit::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { if ( !mpDDInfo ) { mpDDInfo = new DDInfo; } // search for string data type - const Sequence< com::sun::star::datatransfer::DataFlavor >& rFlavors( rDTDE.SupportedDataFlavors ); + const Sequence< css::datatransfer::DataFlavor >& rFlavors( rDTDE.SupportedDataFlavors ); sal_Int32 nEle = rFlavors.getLength(); mpDDInfo->bIsStringSupported = false; for( sal_Int32 i = 0; i < nEle; i++ ) @@ -3009,14 +3009,14 @@ void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragE } } -void Edit::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void Edit::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; ImplHideDDCursor(); } -void Edit::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void Edit::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 8fd5b2215899..b08bd78814d7 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -153,7 +153,7 @@ static bool ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask ) nType = ImplGetCharClass()->getStringType( aCharStr, 0, aCharStr.getLength(), Application::GetSettings().GetLanguageTag().getLocale() ); } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { SAL_WARN( "vcl.control", "ImplIsPatternChar: Exception caught!" ); DBG_UNHANDLED_EXCEPTION(); @@ -1428,7 +1428,7 @@ DateFormatter::~DateFormatter() mpCalendarWrapper = nullptr; } -void DateFormatter::SetLocale( const ::com::sun::star::lang::Locale& rLocale ) +void DateFormatter::SetLocale( const css::lang::Locale& rLocale ) { delete mpCalendarWrapper; mpCalendarWrapper = nullptr; diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 4574618834c0..e15d09e5add7 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -106,7 +106,7 @@ void ListBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) Control::ImplInit( pParent, nStyle, nullptr ); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener> xDrop = new DNDEventDispatcher(this); + css::uno::Reference< css::datatransfer::dnd::XDropTargetListener> xDrop = new DNDEventDispatcher(this); if( nStyle & WB_DROPDOWN ) { diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 7306868cd32f..dc711c9521c9 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -74,8 +74,8 @@ namespace ::std::vector< Image > aImages; ENSURE_OR_RETURN( i_imageSet != Throbber::IMAGES_NONE, "lcl_loadImageSet: illegal image set", aImages ); - const Reference< com::sun::star::uno::XComponentContext > aContext( ::comphelper::getProcessComponentContext() ); - const Reference< XGraphicProvider > xGraphicProvider( com::sun::star::graphic::GraphicProvider::create(aContext) ); + const Reference< css::uno::XComponentContext > aContext( ::comphelper::getProcessComponentContext() ); + const Reference< XGraphicProvider > xGraphicProvider( css::graphic::GraphicProvider::create(aContext) ); ::std::vector< OUString > aImageURLs( Throbber::getDefaultImageURLs( i_imageSet ) ); aImages.reserve( aImageURLs.size() ); diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 58e0bc9581ef..6763664329c1 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1669,7 +1669,7 @@ void TextEngine::ImpBreakLine( sal_uInt32 nPara, TextLine* pLine, TETextPortion* aUserOptions.allowPunctuationOutsideMargin = false; aUserOptions.allowHyphenateEnglish = false; - static const com::sun::star::lang::Locale aDefLocale; + static const css::lang::Locale aDefLocale; i18n::LineBreakResults aLBR = xBI->getLineBreak( pNode->GetText(), nMaxBreakPos, aDefLocale, pLine->GetStart(), aHyphOptions, aUserOptions ); sal_Int32 nBreakPos = aLBR.breakIndex; if ( nBreakPos <= pLine->GetStart() ) @@ -2839,14 +2839,14 @@ uno::Reference< i18n::XBreakIterator > TextEngine::GetBreakIterator() return mxBreakIterator; } -void TextEngine::SetLocale( const ::com::sun::star::lang::Locale& rLocale ) +void TextEngine::SetLocale( const css::lang::Locale& rLocale ) { maLocale = rLocale; delete mpLocaleDataWrapper; mpLocaleDataWrapper = nullptr; } -::com::sun::star::lang::Locale TextEngine::GetLocale() +css::lang::Locale TextEngine::GetLocale() { if ( maLocale.Language.isEmpty() ) { diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index cde8c85d6925..78bd880dde77 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star; -class TETextDataObject : public ::com::sun::star::datatransfer::XTransferable, +class TETextDataObject : public css::datatransfer::XTransferable, public ::cppu::OWeakObject { @@ -75,15 +75,15 @@ public: OUString& GetText() { return maText; } SvMemoryStream& GetHTMLStream() { return maHTMLStream; } - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::datatransfer::XTransferable - ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::datatransfer::XTransferable + css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) override; }; TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText ) @@ -163,7 +163,7 @@ struct ImpTextView SelectionEngine* mpSelEngine; TextSelFunctionSet* mpSelFuncSet; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener > mxDnDListener; + css::uno::Reference< css::datatransfer::dnd::XDragSourceListener > mxDnDListener; sal_uInt16 mnTravelXPos; @@ -610,22 +610,22 @@ bool TextView::KeyInput( const KeyEvent& rKeyEvent ) case KEY_END: case KEY_PAGEUP: case KEY_PAGEDOWN: - case com::sun::star::awt::Key::MOVE_WORD_FORWARD: - case com::sun::star::awt::Key::SELECT_WORD_FORWARD: - case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: - case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: - case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: - case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: + case css::awt::Key::MOVE_WORD_FORWARD: + case css::awt::Key::SELECT_WORD_FORWARD: + case css::awt::Key::MOVE_WORD_BACKWARD: + case css::awt::Key::SELECT_WORD_BACKWARD: + case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: + case css::awt::Key::MOVE_TO_END_OF_LINE: + case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: + case css::awt::Key::SELECT_TO_END_OF_LINE: + case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: { if ( ( !rKeyEvent.GetKeyCode().IsMod2() || ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) ) && !( rKeyEvent.GetKeyCode().IsMod1() && ( nCode == KEY_PAGEUP || nCode == KEY_PAGEDOWN ) ) ) @@ -645,10 +645,10 @@ bool TextView::KeyInput( const KeyEvent& rKeyEvent ) break; case KEY_BACKSPACE: case KEY_DELETE: - case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: - case com::sun::star::awt::Key::DELETE_WORD_FORWARD: - case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: + case css::awt::Key::DELETE_WORD_BACKWARD: + case css::awt::Key::DELETE_WORD_FORWARD: + case css::awt::Key::DELETE_TO_BEGIN_OF_LINE: + case css::awt::Key::DELETE_TO_END_OF_LINE: { if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsMod2() ) { @@ -659,19 +659,19 @@ bool TextView::KeyInput( const KeyEvent& rKeyEvent ) switch( nCode ) { - case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: + case css::awt::Key::DELETE_WORD_BACKWARD: nDel = DEL_LEFT; nMode = DELMODE_RESTOFWORD; break; - case com::sun::star::awt::Key::DELETE_WORD_FORWARD: + case css::awt::Key::DELETE_WORD_FORWARD: nDel = DEL_RIGHT; nMode = DELMODE_RESTOFWORD; break; - case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: + case css::awt::Key::DELETE_TO_BEGIN_OF_LINE: nDel = DEL_LEFT; nMode = DELMODE_RESTOFCONTENT; break; - case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: + case css::awt::Key::DELETE_TO_END_OF_LINE: nDel = DEL_RIGHT; nMode = DELMODE_RESTOFCONTENT; break; @@ -1133,7 +1133,7 @@ void TextView::Copy( uno::Reference< datatransfer::clipboard::XClipboard >& rxCl if( xFlushableClipboard.is() ) xFlushableClipboard->flushClipboard(); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } } @@ -1156,7 +1156,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC SolarMutexReleaser aReleaser; xDataObj = rxClipboard->getContents(); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } @@ -1180,7 +1180,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC if( bWasTruncated ) Edit::ShowTruncationWarning( mpImpl->mpWindow ); } - catch( const ::com::sun::star::datatransfer::UnsupportedFlavorException& ) + catch( const css::datatransfer::UnsupportedFlavorException& ) { } } @@ -1263,44 +1263,44 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent ) break; case KEY_RIGHT: aPaM = bCtrl ? CursorWordRight( aPaM ) : CursorRight( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (sal_uInt16)i18n::CharacterIteratorMode::SKIPCHARACTER : (sal_uInt16)i18n::CharacterIteratorMode::SKIPCELL ); break; - case com::sun::star::awt::Key::SELECT_WORD_FORWARD: + case css::awt::Key::SELECT_WORD_FORWARD: bSelect = true; // fallthrough intentional - case com::sun::star::awt::Key::MOVE_WORD_FORWARD: + case css::awt::Key::MOVE_WORD_FORWARD: aPaM = CursorWordRight( aPaM ); break; - case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: + case css::awt::Key::SELECT_WORD_BACKWARD: bSelect = true; // fallthrough intentional - case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: + case css::awt::Key::MOVE_WORD_BACKWARD: aPaM = CursorWordLeft( aPaM ); break; - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: + case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: bSelect = true; // fallthrough intentional - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: + case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: aPaM = CursorStartOfLine( aPaM ); break; - case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: + case css::awt::Key::SELECT_TO_END_OF_LINE: bSelect = true; // fallthrough intentional - case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: + case css::awt::Key::MOVE_TO_END_OF_LINE: aPaM = CursorEndOfLine( aPaM ); break; - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: bSelect = true; // falltthrough intentional - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: aPaM = CursorStartOfParagraph( aPaM ); break; - case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: bSelect = true; // falltthrough intentional - case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: aPaM = CursorEndOfParagraph( aPaM ); break; - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: bSelect = true; // falltthrough intentional - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: aPaM = CursorStartOfDoc(); break; - case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: bSelect = true; // falltthrough intentional - case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: aPaM = CursorEndOfDoc(); break; } @@ -1958,7 +1958,7 @@ bool TextView::ImplCheckTextLen( const OUString& rNewText ) return bOK; } -void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception) { if ( mpImpl->mbClickedInSelection ) { @@ -2005,14 +2005,14 @@ void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd: } } -void TextView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& ) throw (css::uno::RuntimeException, std::exception) { ImpHideDDCursor(); delete mpImpl->mpDDInfo; mpImpl->mpDDInfo = nullptr; } -void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -2119,17 +2119,17 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv rDTDE.Context->dropComplete( bChanges ); } -void TextView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& ) throw (css::uno::RuntimeException, std::exception) { } -void TextView::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; ImpHideDDCursor(); } -void TextView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void TextView::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index a2e075555368..67a67a0d00c6 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -767,7 +767,7 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent ) { bool bDone = false; sal_uInt16 nCode = rKEvent.GetKeyCode().GetCode(); - if ( nCode == com::sun::star::awt::Key::SELECT_ALL || + if ( nCode == css::awt::Key::SELECT_ALL || ( (nCode == KEY_A) && rKEvent.GetKeyCode().IsMod1() && !rKEvent.GetKeyCode().IsMod2() ) ) { diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx index e4c204b817e5..71661f2bbfc2 100644 --- a/vcl/source/filter/FilterConfigCache.hxx +++ b/vcl/source/filter/FilterConfigCache.hxx @@ -34,7 +34,7 @@ class FilterConfigCache { OUString sInternalFilterName; OUString sType; - ::com::sun::star::uno::Sequence< OUString > lExtensionList; + css::uno::Sequence< OUString > lExtensionList; OUString sUIName; OUString sDocumentService; OUString sFilterService; diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 428cf72225d6..4a7302f3998b 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -72,7 +72,7 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, co "com.sun.star.configuration.ConfigurationAccess", aArguments ); } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { bAvailable = false; } @@ -139,7 +139,7 @@ void FilterConfigItem::ImpInitTree( const OUString& rSubTree ) if ( xUpdatableView.is() ) xPropSet.set( xUpdatableView, UNO_QUERY ); } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not access configuration Key" ); } @@ -151,7 +151,7 @@ FilterConfigItem::FilterConfigItem( const OUString& rSubTree ) ImpInitTree( rSubTree ); } -FilterConfigItem::FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) +FilterConfigItem::FilterConfigItem( css::uno::Sequence< css::beans::PropertyValue >* pFilterData ) : bModified(false) { if ( pFilterData ) @@ -159,7 +159,7 @@ FilterConfigItem::FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun: } FilterConfigItem::FilterConfigItem( const OUString& rSubTree, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) + css::uno::Sequence< css::beans::PropertyValue >* pFilterData ) { ImpInitTree( rSubTree ); @@ -186,7 +186,7 @@ void FilterConfigItem::WriteModifiedConfig() xUpdateControl->commitChanges(); bModified = false; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not update configuration data" ); } @@ -211,7 +211,7 @@ bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XProper if ( aXPropSetInfo.is() ) bRetValue = aXPropSetInfo->hasPropertyByName( rString ); } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } @@ -224,7 +224,7 @@ bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XProper if ( !rAny.hasValue() ) bRetValue = false; } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { bRetValue = false; } @@ -361,7 +361,7 @@ void FilterConfigItem::WriteBool( const OUString& rKey, bool bNewValue ) xPropSet->setPropertyValue( rKey, aAny ); bModified = true; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { OSL_FAIL( "FilterConfigItem::WriteBool - could not set PropertyValue" ); } @@ -395,7 +395,7 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) xPropSet->setPropertyValue( rKey, aAny ); bModified = true; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { OSL_FAIL( "FilterConfigItem::WriteInt32 - could not set PropertyValue" ); } diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 653d5367a165..c86d070072a8 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1319,7 +1319,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rIStream, sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, GraphicFilterImportFlags nImportFlags, - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData, + css::uno::Sequence< css::beans::PropertyValue >* pFilterData, WMF_EXTERNALHEADER *pExtHeader ) { OUString aFilterName; @@ -2000,7 +2000,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString { if ( (*pFilterData)[ i ].Name == "AdditionalChunks" ) { - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aAdditionalChunkSequence; + css::uno::Sequence< css::beans::PropertyValue > aAdditionalChunkSequence; if ( (*pFilterData)[ i ].Value >>= aAdditionalChunkSequence ) { for ( j = 0; j < aAdditionalChunkSequence.getLength(); j++ ) @@ -2013,7 +2013,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString nChunkType <<= 8; nChunkType |= (sal_uInt8)aAdditionalChunkSequence[ j ].Name[ k ]; } - com::sun::star::uno::Sequence< sal_Int8 > aByteSeq; + css::uno::Sequence< sal_Int8 > aByteSeq; if ( aAdditionalChunkSequence[ j ].Value >>= aByteSeq ) { std::vector< vcl::PNGWriter::ChunkData >& rChunkData = aPNGWriter.GetChunks(); diff --git a/vcl/source/filter/jpeg/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx index a9f765a7c67e..edfa8acd391f 100644 --- a/vcl/source/filter/jpeg/JpegWriter.hxx +++ b/vcl/source/filter/jpeg/JpegWriter.hxx @@ -39,11 +39,11 @@ class JPEGWriter bool* mpExpWasGrey; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator; public: JPEGWriter( SvStream& rStream, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData, + const css::uno::Sequence< css::beans::PropertyValue >* pFilterData, bool* pExportWasGrey = nullptr ); virtual ~JPEGWriter() {}; diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx index e403dce69cfe..b2e46720790d 100644 --- a/vcl/source/filter/jpeg/jpeg.cxx +++ b/vcl/source/filter/jpeg/jpeg.cxx @@ -67,7 +67,7 @@ VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* } bool ExportJPEG(SvStream& rOutputStream, const Graphic& rGraphic, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>* pFilterData, + const css::uno::Sequence<css::beans::PropertyValue>* pFilterData, bool* pExportWasGrey) { JPEGWriter aJPEGWriter( rOutputStream, pFilterData, pExportWasGrey ); diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx index e53eab2be6b9..701a8eaa53dc 100644 --- a/vcl/source/filter/jpeg/jpeg.hxx +++ b/vcl/source/filter/jpeg/jpeg.hxx @@ -31,7 +31,7 @@ VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* bool ExportJPEG(SvStream& rOutputStream, const Graphic& rGraphic, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData, + const css::uno::Sequence< css::beans::PropertyValue >* pFilterData, bool* pExportWasGrey = nullptr); #endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_HXX diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index a55709b0176d..bb029b55ef43 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -953,18 +953,18 @@ bool EnhWMFReader::ReadEnhWMF() case PS_ENDCAP_ROUND : if ( aSize.Width() ) { - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_ROUND ); + aLineInfo.SetLineCap( css::drawing::LineCap_ROUND ); break; } case PS_ENDCAP_SQUARE : if ( aSize.Width() ) { - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_SQUARE ); + aLineInfo.SetLineCap( css::drawing::LineCap_SQUARE ); break; } case PS_ENDCAP_FLAT : default : - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_BUTT ); + aLineInfo.SetLineCap( css::drawing::LineCap_BUTT ); } switch( nStyle & 0xF000 ) { diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index ab7b1aefbddc..af179ba3d844 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -732,7 +732,7 @@ protected: FilterConfigItem* pFilterConfigItem; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; // assures aSampledBrush is the actual brush of the GDIMetaFile diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 29d2f5529829..64508ef7dbfa 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -855,14 +855,14 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) switch( nStyle & 0xF00 ) { case PS_ENDCAP_ROUND : - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_ROUND ); + aLineInfo.SetLineCap( css::drawing::LineCap_ROUND ); break; case PS_ENDCAP_SQUARE : - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_SQUARE ); + aLineInfo.SetLineCap( css::drawing::LineCap_SQUARE ); break; case PS_ENDCAP_FLAT : default : - aLineInfo.SetLineCap( com::sun::star::drawing::LineCap_BUTT ); + aLineInfo.SetLineCap( css::drawing::LineCap_BUTT ); } switch( nStyle & 0xF000 ) { diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index dd842400a174..32cf5cf6d1ae 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -55,7 +55,7 @@ private: sal_uLong nLastPercent; // with which number pCallback was called last time. - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; SvStream* pWMF; VclPtr<VirtualDevice> pVirDev; diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 5f836a20351b..906d3eb114fb 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -783,8 +783,7 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32 nY) const // Shift alpha transparent pixels between cppcanvas/ implementations // and vcl in a generally grotesque and under-performing fashion -bool BitmapEx::Create( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmapCanvas > &xBitmapCanvas, +bool BitmapEx::Create( const css::uno::Reference< css::rendering::XBitmapCanvas > &xBitmapCanvas, const Size &rSize ) { uno::Reference< beans::XFastPropertySet > xFastPropertySet( xBitmapCanvas, uno::UNO_QUERY ); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 7452856e3d0c..07ceea37ac5b 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -568,7 +568,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { sal_Int16 nLineCap(0); rIStm.ReadInt16( nLineCap ); - aLineInfo.SetLineCap((com::sun::star::drawing::LineCap)nLineCap); + aLineInfo.SetLineCap((css::drawing::LineCap)nLineCap); } break; @@ -1449,7 +1449,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const LineInfo& rInfo = pAct->GetLineInfo(); const bool bFatLine(!rInfo.IsDefault() && (LINE_NONE != rInfo.GetStyle())); const bool bLineJoin(bFatLine && basegfx::B2DLineJoin::Round != rInfo.GetLineJoin()); - const bool bLineCap(bFatLine && com::sun::star::drawing::LineCap_BUTT != rInfo.GetLineCap()); + const bool bLineCap(bFatLine && css::drawing::LineCap_BUTT != rInfo.GetLineCap()); const bool bLineDashDot(LINE_DASH == rInfo.GetStyle()); if( bFatLine ) @@ -1605,7 +1605,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const sal_uInt16 nPoints(aSimplePoly.GetSize()); const bool bFatLine(!rInfo.IsDefault() && (LINE_NONE != rInfo.GetStyle())); const bool bLineJoin(bFatLine && basegfx::B2DLineJoin::Round != rInfo.GetLineJoin()); - const bool bLineCap(bFatLine && com::sun::star::drawing::LineCap_BUTT != rInfo.GetLineCap()); + const bool bLineCap(bFatLine && css::drawing::LineCap_BUTT != rInfo.GetLineCap()); const bool bLineDashDot(LINE_DASH == rInfo.GetStyle()); if( bFatLine ) diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 3a1707100188..344c2e6835ea 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -220,7 +220,7 @@ Graphic::Graphic( const GDIMetaFile& rMtf ) mpImpGraphic = new ImpGraphic( rMtf ); } -Graphic::Graphic( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) +Graphic::Graphic( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ) { uno::Reference< lang::XUnoTunnel > xTunnel( rxGraphic, uno::UNO_QUERY ); const ::Graphic* pGraphic = ( xTunnel.is() ? diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 4a2b59d829b7..9e4c78aef6c4 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -357,22 +357,22 @@ void ImpGraphic::ImplClear() try { ::ucbhelper::Content aCnt( mpSwapFile->aSwapURL.GetMainURL( INetURLObject::NO_DECODE ), - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); aCnt.executeCommand( "delete", - ::com::sun::star::uno::makeAny( true ) ); + css::uno::makeAny( true ) ); } - catch( const ::com::sun::star::ucb::ContentCreationException& ) + catch( const css::ucb::ContentCreationException& ) { } - catch( const ::com::sun::star::uno::RuntimeException& ) + catch( const css::uno::RuntimeException& ) { } - catch( const ::com::sun::star::ucb::CommandAbortedException& ) + catch( const css::ucb::CommandAbortedException& ) { } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } @@ -1166,7 +1166,7 @@ bool ImpGraphic::ImplSwapOut() { xOStm.reset(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | StreamMode::SHARE_DENYWRITE )); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } if( xOStm ) @@ -1187,22 +1187,21 @@ bool ImpGraphic::ImplSwapOut() try { ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( "delete", - ::com::sun::star::uno::makeAny( true ) ); + aCnt.executeCommand( "delete", css::uno::makeAny( true ) ); } - catch( const ::com::sun::star::ucb::ContentCreationException& ) + catch( const css::ucb::ContentCreationException& ) { } - catch( const ::com::sun::star::uno::RuntimeException& ) + catch( const css::uno::RuntimeException& ) { } - catch( const ::com::sun::star::ucb::CommandAbortedException& ) + catch( const css::ucb::CommandAbortedException& ) { } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } } @@ -1264,7 +1263,7 @@ bool ImpGraphic::ImplSwapIn() { xIStm.reset(::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE | StreamMode::SHARE_DENYWRITE )); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } @@ -1285,22 +1284,21 @@ bool ImpGraphic::ImplSwapIn() try { ::ucbhelper::Content aCnt( aSwapURL, - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( "delete", - ::com::sun::star::uno::makeAny( true ) ); + aCnt.executeCommand( "delete", css::uno::makeAny( true ) ); } - catch( const ::com::sun::star::ucb::ContentCreationException& ) + catch( const css::ucb::ContentCreationException& ) { } - catch( const ::com::sun::star::uno::RuntimeException& ) + catch( const css::uno::RuntimeException& ) { } - catch( const ::com::sun::star::ucb::CommandAbortedException& ) + catch( const css::ucb::CommandAbortedException& ) { } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 55ec0ecdc8a2..302ecc732d63 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -38,7 +38,7 @@ ImplLineInfo::ImplLineInfo() : mnDotLen ( 0 ), mnDistance ( 0 ), meLineJoin ( basegfx::B2DLineJoin::Round ), - meLineCap ( com::sun::star::drawing::LineCap_BUTT ) + meLineCap ( css::drawing::LineCap_BUTT ) { } @@ -172,7 +172,7 @@ void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin) } } -void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap) +void LineInfo::SetLineCap(css::drawing::LineCap eLineCap) { if(eLineCap != mpImplLineInfo->meLineCap) { @@ -185,7 +185,7 @@ bool LineInfo::IsDefault() const { return( !mpImplLineInfo->mnWidth && ( LINE_SOLID == mpImplLineInfo->meStyle ) - && ( com::sun::star::drawing::LineCap_BUTT == mpImplLineInfo->meLineCap)); + && ( css::drawing::LineCap_BUTT == mpImplLineInfo->meLineCap)); } SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) @@ -218,7 +218,7 @@ SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) if( aCompat.GetVersion() >= 4 ) { // version 4 - rIStm.ReadUInt16( nTmp16 ); rImplLineInfo.meLineCap = (com::sun::star::drawing::LineCap) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImplLineInfo.meLineCap = (css::drawing::LineCap) nTmp16; } return rIStm; diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx index 46485b9ebde1..ef4250555ffa 100644 --- a/vcl/source/gdi/oldprintadaptor.cxx +++ b/vcl/source/gdi/oldprintadaptor.cxx @@ -24,12 +24,18 @@ #include <vector> +using namespace vcl; +using namespace cppu; +using namespace com::sun::star; +using namespace com::sun::star::uno; +using namespace com::sun::star::beans; + namespace vcl { struct AdaptorPage { - GDIMetaFile maPage; - com::sun::star::awt::Size maPageSize; + GDIMetaFile maPage; + css::awt::Size maPageSize; }; struct ImplOldStyleAdaptorData @@ -38,12 +44,6 @@ namespace vcl }; } -using namespace vcl; -using namespace cppu; -using namespace com::sun::star; -using namespace com::sun::star::uno; -using namespace com::sun::star::beans; - OldStylePrintAdaptor::OldStylePrintAdaptor( const VclPtr< Printer >& i_xPrinter ) : PrinterController( i_xPrinter ) , mpData( new ImplOldStyleAdaptorData() ) diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 5a1fd37f7c07..8212f8534338 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -516,7 +516,7 @@ PDFExtOutDevData::~PDFExtOutDevData() delete mpGlobalSyncData; } -void PDFExtOutDevData::SetDocumentLocale( const com::sun::star::lang::Locale& rLoc ) +void PDFExtOutDevData::SetDocumentLocale( const css::lang::Locale& rLoc ) { maDocLocale = rLoc; } diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index c90f41c7434c..6a22e4ac3836 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -27,7 +27,7 @@ PDFWriter::AnyWidget::~AnyWidget() { } -PDFWriter::PDFWriter( const PDFWriter::PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& xEnc ) +PDFWriter::PDFWriter( const PDFWriter::PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >& xEnc ) : xImplementation( new PDFWriterImpl( rContext, xEnc, *this ) ) { @@ -52,7 +52,7 @@ bool PDFWriter::Emit() return xImplementation->emit(); } -void PDFWriter::SetDocumentLocale( const com::sun::star::lang::Locale& rLoc ) +void PDFWriter::SetDocumentLocale( const css::lang::Locale& rLoc ) { xImplementation->setDocumentLocale( rLoc ); } @@ -456,7 +456,7 @@ std::set< PDFWriter::ErrorCode > PDFWriter::GetErrors() return xImplementation->getErrors(); } -com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > +css::uno::Reference< css::beans::XMaterialHolder > PDFWriter::InitEncryption( const OUString& i_rOwnerPassword, const OUString& i_rUserPassword, bool b128Bit diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 9fd3a127ab47..2384ef37cece 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -132,17 +132,17 @@ class PDFTestOutputStream : public PDFOutputStream { public: virtual ~PDFTestOutputStream(); - virtual void write( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xStream ); + virtual void write( const css::uno::Reference< css::io::XOutputStream >& xStream ); }; PDFTestOutputStream::~PDFTestOutputStream() { } -void PDFTestOutputStream::write( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xStream ) +void PDFTestOutputStream::write( const css::uno::Reference< css::io::XOutputStream >& xStream ) { OString aStr( "lalala\ntest\ntest\ntest" ); - com::sun::star::uno::Sequence< sal_Int8 > aData( aStr.getLength() ); + css::uno::Sequence< sal_Int8 > aData( aStr.getLength() ); memcpy( aData.getArray(), aStr.getStr(), aStr.getLength() ); xStream->writeBytes( aData ); } @@ -170,7 +170,7 @@ void doTestCode() aContext.SignReason = "Some valid reason to sign"; aContext.SignContact = "signer@example.com"; - com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > xEnc; + css::uno::Reference< css::beans::XMaterialHolder > xEnc; PDFWriter aWriter( aContext, xEnc ); aWriter.NewPage( 595, 842 ); aWriter.BeginStructureElement( PDFWriter::Document ); @@ -1643,7 +1643,7 @@ bool PDFWriterImpl::PDFPage::appendLineInfo( const LineInfo& rInfo, OStringBuffe return false; } - if(com::sun::star::drawing::LineCap_BUTT != rInfo.GetLineCap()) + if(css::drawing::LineCap_BUTT != rInfo.GetLineCap()) { // LineCap used, ExtLineInfo required return false; @@ -1734,7 +1734,7 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal } PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, - const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& xEnc, + const css::uno::Reference< css::beans::XMaterialHolder >& xEnc, PDFWriter& i_rOuterFace) : m_pReferenceDevice( nullptr ), @@ -6790,7 +6790,7 @@ bool PDFWriterImpl::finalizeSignature() } // 3- create the PKCS#7 object using NSS - com::sun::star::uno::Sequence< sal_Int8 > derEncoded = m_aContext.SignCertificate->getEncoded(); + css::uno::Sequence< sal_Int8 > derEncoded = m_aContext.SignCertificate->getEncoded(); if (!derEncoded.hasElements()) return false; @@ -8239,7 +8239,7 @@ void PDFWriterImpl::sortWidgets() namespace vcl { class PDFStreamIf : - public cppu::WeakImplHelper< com::sun::star::io::XOutputStream > + public cppu::WeakImplHelper< css::io::XOutputStream > { PDFWriterImpl* m_pWriter; bool m_bWrite; @@ -8247,7 +8247,7 @@ class PDFStreamIf : explicit PDFStreamIf( PDFWriterImpl* pWriter ) : m_pWriter( pWriter ), m_bWrite( true ) {} virtual ~PDFStreamIf(); - virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) override; + virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) override; virtual void SAL_CALL flush() throw(std::exception) override; virtual void SAL_CALL closeOutput() throw(std::exception) override; }; @@ -8257,7 +8257,7 @@ PDFStreamIf::~PDFStreamIf() { } -void SAL_CALL PDFStreamIf::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) +void SAL_CALL PDFStreamIf::writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) { if( m_bWrite && aData.getLength() ) { @@ -8307,7 +8307,7 @@ bool PDFWriterImpl::emitAdditionalStreams() beginCompression(); checkAndEnableStreamEncryption( rStream.m_nStreamObject ); - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xStream( new PDFStreamIf( this ) ); + css::uno::Reference< css::io::XOutputStream > xStream( new PDFStreamIf( this ) ); assert(rStream.m_pStream); if (!rStream.m_pStream) return false; @@ -10585,17 +10585,17 @@ void PDFWriterImpl::convertLineInfoToExtLineInfo( const LineInfo& rIn, PDFWriter // add LineCap switch(rIn.GetLineCap()) { - default: /* com::sun::star::drawing::LineCap_BUTT */ + default: /* css::drawing::LineCap_BUTT */ { rOut.m_eCap = PDFWriter::capButt; break; } - case com::sun::star::drawing::LineCap_ROUND: + case css::drawing::LineCap_ROUND: { rOut.m_eCap = PDFWriter::capRound; break; } - case com::sun::star::drawing::LineCap_SQUARE: + case css::drawing::LineCap_SQUARE: { rOut.m_eCap = PDFWriter::capSquare; break; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 23d27c54c526..3d7bf48b334e 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -521,9 +521,9 @@ public: std::list< PDFStructureElementKid > m_aKids; PDFStructAttributes m_aAttributes; Rectangle m_aBBox; - OUString m_aActualText; - OUString m_aAltText; - com::sun::star::lang::Locale m_aLocale; + OUString m_aActualText; + OUString m_aAltText; + css::lang::Locale m_aLocale; // m_aContents contains the element's marked content sequence // as pairs of (page nr, MCID) @@ -609,7 +609,7 @@ private: std::vector<PDFLink> m_aLinks; /* makes correctly encoded for export to PDF URLS */ - com::sun::star::uno::Reference< com::sun::star::util::XURLTransformer > m_xTrans; + css::uno::Reference< css::util::XURLTransformer > m_xTrans; /* maps arbitrary link ids for structure attributes to real link ids (for setLinkPropertyId) */ @@ -1007,7 +1007,7 @@ i12626 static sal_Int32 computeAccessPermissions( const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties, sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength ); void setupDocInfo(); - bool prepareEncryption( const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& ); + bool prepareEncryption( const css::uno::Reference< css::beans::XMaterialHolder >& ); // helper for playMetafile void implWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, @@ -1024,10 +1024,10 @@ i12626 void appendStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); void appendNonStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); public: - PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >&, PDFWriter& ); + PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >&, PDFWriter& ); ~PDFWriterImpl(); - static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > + static css::uno::Reference< css::beans::XMaterialHolder > initEncryption( const OUString& i_rOwnerPassword, const OUString& i_rUserPassword, bool b128Bit ); @@ -1053,7 +1053,7 @@ public: PDFWriter::PDFVersion getVersion() const { return m_aContext.Version; } - void setDocumentLocale( const com::sun::star::lang::Locale& rLoc ) + void setDocumentLocale( const css::lang::Locale& rLoc ) { m_aContext.DocumentLocale = rLoc; } /* graphics state */ diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 3477fa8ef56d..8e47b843b136 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -1069,7 +1069,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa is not sufficient, since an rtl MD5 digest cannot be created in an arbitrary state which would be needed in PDFWriterImpl::computeEncryptionKey. */ -class EncHashTransporter : public cppu::WeakImplHelper < com::sun::star::beans::XMaterialHolder > +class EncHashTransporter : public cppu::WeakImplHelper < css::beans::XMaterialHolder > { rtlDigest maUDigest; sal_IntPtr maID; diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 6c7490798905..6d04c1e29d5e 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -540,7 +540,7 @@ bool SalGraphics::DrawPolyLine( const basegfx::B2DPolygon& i_rPolygon, double i_fTransparency, const basegfx::B2DVector& i_rLineWidth, basegfx::B2DLineJoin i_eLineJoin, - com::sun::star::drawing::LineCap i_eLineCap, + css::drawing::LineCap i_eLineCap, const OutputDevice* i_pOutDev ) { bool bRet = false; diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index c6987c1d2cb1..41a604bb19ef 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -155,9 +155,9 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, if ( !mpVirDev ) { // do not abort but throw an exception, may be the current thread terminates anyway (plugin-scenario) - throw ::com::sun::star::uno::RuntimeException( + throw css::uno::RuntimeException( OUString( "Could not create system bitmap!" ), - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); + css::uno::Reference< css::uno::XInterface >() ); } mnBitCount = ( nBitCount ? nBitCount : pOutDev->GetBitCount() ); diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 55a25df62cda..19f8a754458a 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -417,7 +417,7 @@ namespace vcl namespace { - class StandardColorSpace : public cppu::WeakImplHelper< com::sun::star::rendering::XColorSpace > + class StandardColorSpace : public cppu::WeakImplHelper< css::rendering::XColorSpace > { private: uno::Sequence< sal_Int8 > m_aComponentTags; diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index cbe7cd1833b4..d53303d9bbab 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -256,7 +256,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, for( int nPolyIdx = 0; nPolyIdx < nPolyCount; ++nPolyIdx ) { const ::basegfx::B2DPolygon aOnePoly = aB2DPolyPolygon.getB2DPolygon( nPolyIdx ); - mpGraphics->DrawPolyLine( aOnePoly, fTransparency, aHairlineWidth, ::basegfx::B2DLineJoin::NONE, com::sun::star::drawing::LineCap_BUTT, this ); + mpGraphics->DrawPolyLine( aOnePoly, fTransparency, aHairlineWidth, ::basegfx::B2DLineJoin::NONE, css::drawing::LineCap_BUTT, this ); } } diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index e0a708f78ff9..87af1209a5e4 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -124,7 +124,7 @@ ImplAccessibleInfos::~ImplAccessibleInfos() namespace vcl { -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( bool bCreate ) +css::uno::Reference< css::accessibility::XAccessible > Window::GetAccessible( bool bCreate ) { // do not optimize hierarchy for the top level border win (ie, when there is no parent) /* // do not optimize accessible hierarchy at all to better reflect real VCL hierarchy @@ -144,13 +144,13 @@ namespace vcl { return mpWindowImpl->mxAccessible; } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > Window::CreateAccessible() { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc( GetComponentInterface(), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::accessibility::XAccessible > xAcc( GetComponentInterface(), css::uno::UNO_QUERY ); return xAcc; } -void Window::SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > x ) +void Window::SetAccessible( css::uno::Reference< css::accessibility::XAccessible > x ) { mpWindowImpl->mxAccessible = x; } diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index f65e69ec26d7..eb839d2298c8 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1726,7 +1726,7 @@ void ImplStdBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, sal void ImplBorderWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, sal_uInt16 nTypeStyle, - const ::com::sun::star::uno::Any& ) + const css::uno::Any& ) { ImplInit( pParent, nStyle, nTypeStyle, nullptr ); } @@ -1821,7 +1821,7 @@ ImplBorderWindow::ImplBorderWindow( vcl::Window* pParent, WinBits nStyle , sal_uInt16 nTypeStyle ) : Window( WINDOW_BORDERWINDOW ) { - ImplInit( pParent, nStyle, nTypeStyle, ::com::sun::star::uno::Any() ); + ImplInit( pParent, nStyle, nTypeStyle, css::uno::Any() ); } ImplBorderWindow::~ImplBorderWindow() diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 11f3c3c96fbd..3895ae2f4b50 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -396,7 +396,7 @@ vcl::Window* ImplFindAccelWindow( vcl::Window* pParent, sal_uInt16& rIndex, sal_ if ( !xCharClass.is() ) xCharClass = vcl::unohelper::CreateCharacterClassification(); - const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); + const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); cCharCode = xCharClass->toUpper( OUString(cCharCode), 0, 1, rLocale )[0]; if ( i < nFormEnd ) diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index a436bdefa002..050b74983766 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -444,7 +444,7 @@ sal_Int32 DNDEventDispatcher::fireDragGestureEvent( vcl::Window *pWindow, const Reference< XDragSource >& xSource, const Any& event, const Point& rOrigin, const sal_Int8 nDragAction ) - throw(::com::sun::star::uno::RuntimeException) + throw(css::uno::RuntimeException) { sal_Int32 n = 0; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index b3fc00522b08..20950c6f23e6 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -481,7 +481,7 @@ public: virtual ~ImplPopupFloatWin(); virtual void dispose() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; @@ -525,7 +525,7 @@ void ImplPopupFloatWin::dispose() FloatingWindow::dispose(); } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ImplPopupFloatWin::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > ImplPopupFloatWin::CreateAccessible() { // switch off direct accessibilty support for this window @@ -533,7 +533,7 @@ void ImplPopupFloatWin::dispose() // as this window is only used as a helper for subtoolbars that are not teared-off, the parent toolbar // has to provide accessibility support (as implemented in the toolkit) // so the contained toolbar should appear as child of the correponsing toolbar item of the parent toolbar - return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >(); + return css::uno::Reference< css::accessibility::XAccessible >(); } vcl::Window* ImplPopupFloatWin::GetPreferredKeyInputWindow() diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 62e9e4fd7682..e4efb2667270 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -28,7 +28,7 @@ VclContainer::VclContainer(vcl::Window *pParent, WinBits nStyle) sal_uInt16 VclContainer::getDefaultAccessibleRole() const { - return com::sun::star::accessibility::AccessibleRole::PANEL; + return css::accessibility::AccessibleRole::PANEL; } Size VclContainer::GetOptimalSize() const @@ -327,9 +327,9 @@ sal_uInt16 VclBox::getDefaultAccessibleRole() const #if defined(WNT) //fdo#74284 call Boxes Panels, keep then as "Filler" under //at least Linux seeing as that's what Gtk does for GtkBoxes - return com::sun::star::accessibility::AccessibleRole::PANEL; + return css::accessibility::AccessibleRole::PANEL; #else - return com::sun::star::accessibility::AccessibleRole::FILLER; + return css::accessibility::AccessibleRole::FILLER; #endif } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index f12a855d48b4..7c36353f5a4e 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -146,13 +146,13 @@ Menu::~Menu() MenuFloatingWindow* pFloat = static_cast<MenuFloatingWindow*>(pWindow.get()); if( pFloat->pMenu == this ) pFloat->pMenu = nullptr; - pWindow->SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() ); + pWindow->SetAccessible( css::uno::Reference< css::accessibility::XAccessible >() ); } // dispose accessible components if ( mxAccessible.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> xComponent( mxAccessible, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent> xComponent( mxAccessible, css::uno::UNO_QUERY ); if ( xComponent.is() ) xComponent->dispose(); } diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 327af121ba1d..2128f08cce28 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -87,7 +87,7 @@ void MenuFloatingWindow::doShutdown() } // free the reference to the accessible component - SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() ); + SetAccessible( css::uno::Reference< css::accessibility::XAccessible >() ); aHighlightChangedTimer.Stop(); diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index 9ccb441f2800..530e5ff626fa 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -72,7 +72,7 @@ sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey ) void MnemonicGenerator::RegisterMnemonic( const OUString& rKey ) { - const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); + const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass(); // Don't crash even when we don't have access to i18n service @@ -116,7 +116,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) if ( _rKey.isEmpty() || ImplFindMnemonic( _rKey ) ) return _rKey; - const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); + const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass(); // Don't crash even when we don't have access to i18n service diff --git a/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx index d4a493c71449..581c1643fc72 100644 --- a/vcl/source/window/mouseevent.cxx +++ b/vcl/source/window/mouseevent.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/awt/MouseButton.hpp> /** inits this vcl KeyEvent with all settings from the given awt event **/ -MouseEvent::MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent ) +MouseEvent::MouseEvent( const css::awt::MouseEvent& rEvent ) : maPos( rEvent.X, rEvent.Y ) , mnMode( MouseEventModifiers::NONE ) , mnClicks( static_cast< sal_uInt16 >( rEvent.ClickCount ) ) @@ -32,23 +32,23 @@ MouseEvent::MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent ) { if( rEvent.Modifiers ) { - if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::SHIFT) != 0 ) + if( (rEvent.Modifiers & css::awt::KeyModifier::SHIFT) != 0 ) mnCode |= KEY_SHIFT; - if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD1) != 0 ) + if( (rEvent.Modifiers & css::awt::KeyModifier::MOD1) != 0 ) mnCode |= KEY_MOD1; - if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD2) != 0 ) + if( (rEvent.Modifiers & css::awt::KeyModifier::MOD2) != 0 ) mnCode |= KEY_MOD2; - if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD3) != 0 ) + if( (rEvent.Modifiers & css::awt::KeyModifier::MOD3) != 0 ) mnCode |= KEY_MOD3; } if( rEvent.Buttons ) { - if( (rEvent.Buttons & ::com::sun::star::awt::MouseButton::LEFT) != 0 ) + if( (rEvent.Buttons & css::awt::MouseButton::LEFT) != 0 ) mnCode |= MOUSE_LEFT; - if( (rEvent.Buttons & ::com::sun::star::awt::MouseButton::RIGHT) != 0 ) + if( (rEvent.Buttons & css::awt::MouseButton::RIGHT) != 0 ) mnCode |= MOUSE_RIGHT; - if( (rEvent.Buttons & ::com::sun::star::awt::MouseButton::MIDDLE) != 0 ) + if( (rEvent.Buttons & css::awt::MouseButton::MIDDLE) != 0 ) mnCode |= MOUSE_MIDDLE; } } diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index e892c1d3c7be..6f84fbcd4778 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -456,7 +456,7 @@ Image ErrorBox::GetStandardImage() { ImplInitMsgBoxImageList(); } - catch (const ::com::sun::star::uno::Exception &) + catch (const css::uno::Exception &) { // During early bootstrap we can have no initialized // ucb and hence no ability to get this image, so nop. diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx index 500dede9626f..e54a4382c747 100644 --- a/vcl/source/window/settings.cxx +++ b/vcl/source/window/settings.cxx @@ -247,7 +247,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) "org.openoffice.Office.Common/Accessibility" ); // note: case sensitive ! if ( aNode.isValid() ) { - ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("AutoDetectSystemHC") ); + css::uno::Any aValue = aNode.getNodeValue( OUString("AutoDetectSystemHC") ); bool bTmp = false; if( aValue >>= bTmp ) bAutoHCMode = bTmp; diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index d353f4607d7d..218bcf6fcd60 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -922,7 +922,7 @@ void SystemWindow::SetMenuBar(MenuBar* pMenuBar) if ( pOldWindow ) { CallEventListeners( VCLEVENT_WINDOW_MENUBARREMOVED, static_cast<void*>(pOldMenuBar) ); - pOldWindow->SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() ); + pOldWindow->SetAccessible( css::uno::Reference< css::accessibility::XAccessible >() ); } if ( pMenuBar ) { diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 1de2f21de8d6..d8eb3289882f 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1997,7 +1997,7 @@ bool ToolBox::AlwaysLocked() { // feature enabled ? bool bStatesEnabled = bool(); - ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("StatesEnabled") ); + css::uno::Any aValue = aNode.getNodeValue( OUString("StatesEnabled") ); if( aValue >>= bStatesEnabled ) { if( bStatesEnabled ) @@ -2008,7 +2008,7 @@ bool ToolBox::AlwaysLocked() "/org.openoffice.Office.UI.GlobalSettings/Toolbars/States" ); // note: case sensitive ! bool bLocked = bool(); - ::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( OUString("Locked") ); + css::uno::Any aValue2 = aNode2.getNodeValue( OUString("Locked") ); if( aValue2 >>= bLocked ) nAlwaysLocked = bLocked ? 1 : 0; } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 544ea6e95d3a..ef4cb769e18e 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -475,9 +475,9 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool if( pMouseDownWin->ImplGetFrameData()->mbInternalDragGestureRecognizer ) { // query DropTarget from child window - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > xDragGestureRecognizer = - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > ( pMouseDownWin->ImplGetWindowImpl()->mxDNDListenerContainer, - ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > xDragGestureRecognizer = + css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > ( pMouseDownWin->ImplGetWindowImpl()->mxDNDListenerContainer, + css::uno::UNO_QUERY ); if( xDragGestureRecognizer.is() ) { @@ -487,10 +487,9 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool pMouseDownWin->ImplGetFrameData()->mnFirstMouseY ) ); // create a uno mouse event out of the available data - ::com::sun::star::awt::MouseEvent aMouseEvent( - static_cast < ::com::sun::star::uno::XInterface * > ( nullptr ), + css::awt::MouseEvent aMouseEvent( static_cast < css::uno::XInterface * > ( nullptr ), #ifdef MACOSX - nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3), + nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3), #else nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2), #endif @@ -503,12 +502,12 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool SolarMutexReleaser aReleaser; // FIXME: where do I get Action from ? - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > xDragSource = pMouseDownWin->GetDragSource(); + css::uno::Reference< css::datatransfer::dnd::XDragSource > xDragSource = pMouseDownWin->GetDragSource(); if( xDragSource.is() ) { static_cast < DNDListenerContainer * > ( xDragGestureRecognizer.get() )->fireDragGestureEvent( 0, - relLoc.X(), relLoc.Y(), xDragSource, ::com::sun::star::uno::makeAny( aMouseEvent ) ); + relLoc.X(), relLoc.Y(), xDragSource, css::uno::makeAny( aMouseEvent ) ); } } } diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 78dc4bb06e0d..cd32d25a8e57 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -67,11 +67,11 @@ void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentDat SetActivateMode( ActivateModeFlags::GrabFocus ); } -void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ) +void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const css::uno::Any& aSystemWorkWindowToken ) { if( aSystemWorkWindowToken.hasValue() ) { - ::com::sun::star::uno::Sequence< sal_Int8 > aSeq; + css::uno::Sequence< sal_Int8 > aSeq; aSystemWorkWindowToken >>= aSeq; SystemParentData* pData = reinterpret_cast<SystemParentData*>(aSeq.getArray()); DBG_ASSERT( aSeq.getLength() == sizeof( SystemParentData ) && pData->nSize == sizeof( SystemParentData ), "WorkWindow::WorkWindow( vcl::Window*, const Any&, WinBits ) called with invalid Any" ); @@ -95,7 +95,7 @@ WorkWindow::WorkWindow( vcl::Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -WorkWindow::WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : +WorkWindow::WorkWindow( vcl::Window* pParent, const css::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) { ImplInitWorkWindowData(); @@ -142,12 +142,10 @@ void WorkWindow::ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScr { // Dispose of the canvas implementation, which might rely on // screen-specific system data. - com::sun::star::uno::Reference< com::sun::star::rendering::XCanvas > xCanvas( mpWindowImpl->mxCanvas ); + css::uno::Reference< css::rendering::XCanvas > xCanvas( mpWindowImpl->mxCanvas ); if( xCanvas.is() ) { - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > - xCanvasComponent( xCanvas, - com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent > xCanvasComponent( xCanvas, css::uno::UNO_QUERY ); if( xCanvasComponent.is() ) xCanvasComponent->dispose(); } |