diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-28 12:01:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-29 09:50:19 +0200 |
| commit | a2795356608c9de3679ccd3076c7df14cb549d8b (patch) | |
| tree | 327bd5f473f476ef96843438898e506964d50f38 /sd/source/ui | |
| parent | b0f7efe83096655348d32782636bf0f54d837834 (diff) | |
com::sun::star->css in sd
Change-Id: Ic0cbc857a3a9c66241b94c30bf8c859435f5a4b4
Diffstat (limited to 'sd/source/ui')
201 files changed, 1724 insertions, 1848 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index d10f3c415107..4b4e81536122 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -302,7 +302,7 @@ uno::Reference<XAccessible > SAL_CALL awt::Rectangle SAL_CALL AccessibleDocumentViewBase::getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -415,14 +415,14 @@ void SAL_CALL OUString SAL_CALL AccessibleDocumentViewBase::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleDocumentViewBase"); } -::com::sun::star::uno::Sequence< OUString> SAL_CALL +css::uno::Sequence< OUString> SAL_CALL AccessibleDocumentViewBase::getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return AccessibleContextBase::getSupportedServiceNames (); @@ -430,9 +430,9 @@ OUString SAL_CALL //===== XTypeProvider ======================================================= -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL +css::uno::Sequence< css::uno::Type> SAL_CALL AccessibleDocumentViewBase::getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -526,7 +526,7 @@ void AccessibleDocumentViewBase::impl_dispose() void SAL_CALL AccessibleDocumentViewBase::disposing (const lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -546,7 +546,7 @@ void SAL_CALL //===== XPropertyChangeListener ============================================= void SAL_CALL AccessibleDocumentViewBase::propertyChange (const beans::PropertyChangeEvent& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { // Empty } @@ -554,8 +554,8 @@ void SAL_CALL AccessibleDocumentViewBase::propertyChange (const beans::PropertyC //===== XWindowListener ===================================================== void SAL_CALL - AccessibleDocumentViewBase::windowResized (const ::com::sun::star::awt::WindowEvent& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + AccessibleDocumentViewBase::windowResized (const css::awt::WindowEvent& ) + throw (css::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -566,8 +566,8 @@ void SAL_CALL } void SAL_CALL - AccessibleDocumentViewBase::windowMoved (const ::com::sun::star::awt::WindowEvent& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + AccessibleDocumentViewBase::windowMoved (const css::awt::WindowEvent& ) + throw (css::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -578,8 +578,8 @@ void SAL_CALL } void SAL_CALL - AccessibleDocumentViewBase::windowShown (const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + AccessibleDocumentViewBase::windowShown (const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -590,8 +590,8 @@ void SAL_CALL } void SAL_CALL - AccessibleDocumentViewBase::windowHidden (const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + AccessibleDocumentViewBase::windowHidden (const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -603,16 +603,16 @@ void SAL_CALL //===== XFocusListener ================================================== -void AccessibleDocumentViewBase::focusGained (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception) +void AccessibleDocumentViewBase::focusGained (const css::awt::FocusEvent& e) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); if (e.Source == mxWindow) Activated (); } -void AccessibleDocumentViewBase::focusLost (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception) +void AccessibleDocumentViewBase::focusLost (const css::awt::FocusEvent& e) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); if (e.Source == mxWindow) @@ -632,7 +632,7 @@ void SAL_CALL AccessibleDocumentViewBase::disposing() /// Create a name for this view. OUString AccessibleDocumentViewBase::CreateAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString ("AccessibleDocumentViewBase"); } @@ -642,7 +642,7 @@ OUString */ OUString AccessibleDocumentViewBase::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { OUString sDescription; @@ -731,8 +731,8 @@ void } uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -856,11 +856,11 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() return anyAtrribute; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - SAL_CALL AccessibleDocumentViewBase::getAccFlowTo(const ::com::sun::star::uno::Any&, sal_Int32 ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +css::uno::Sequence< css::uno::Any > + SAL_CALL AccessibleDocumentViewBase::getAccFlowTo(const css::uno::Any&, sal_Int32 ) + throw ( css::uno::RuntimeException, std::exception ) { - ::com::sun::star::uno::Sequence< uno::Any> aRet; + css::uno::Sequence< uno::Any> aRet; return aRet; } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 1f209947f96d..3d00ab529778 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -238,7 +238,7 @@ uno::Reference<XAccessible> SAL_CALL OUString SAL_CALL AccessibleDrawDocumentView::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -276,7 +276,7 @@ OUString SAL_CALL void SAL_CALL AccessibleDrawDocumentView::disposing (const lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -294,7 +294,7 @@ void SAL_CALL void SAL_CALL AccessibleDrawDocumentView::propertyChange (const beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -361,10 +361,10 @@ void SAL_CALL rtl::Reference< sd::SlideShow > xSlideshow( sd::SlideShow::GetSlideShow( mpSdViewSh->GetViewShellBase() ) ); if( xSlideshow.is() && xSlideshow->isRunning() && xSlideshow->isFullScreen() ) { - ::com::sun::star::uno::Reference< drawing::XDrawPage > xSlide; + css::uno::Reference< drawing::XDrawPage > xSlide; // MT IA2: Not used... // sal_Int32 currentPageIndex = xSlideshow->getCurrentPageIndex(); - ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > mpSlideController = xSlideshow->getController(); + css::uno::Reference< css::presentation::XSlideShowController > mpSlideController = xSlideshow->getController(); if( mpSlideController.is() ) { xSlide = mpSlideController->getCurrentSlide(); @@ -395,14 +395,14 @@ void SAL_CALL OUString SAL_CALL AccessibleDrawDocumentView::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleDrawDocumentView"); } -::com::sun::star::uno::Sequence< OUString> SAL_CALL +css::uno::Sequence< OUString> SAL_CALL AccessibleDrawDocumentView::getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); // Get list of supported service names from base class... @@ -554,7 +554,7 @@ OUString AccessibleDrawDocumentView::getObjectLink( const uno::Any& rAny ) /// Create a name for this view. OUString AccessibleDrawDocumentView::CreateAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { OUString sName; @@ -607,7 +607,7 @@ OUString AccessibleDrawDocumentView::CreateAccessibleName() */ OUString AccessibleDrawDocumentView::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { OUString sDescription; @@ -841,9 +841,9 @@ void SAL_CALL AccessibleDrawDocumentView::disposing() AccessibleDocumentViewBase::disposing (); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - SAL_CALL AccessibleDrawDocumentView::getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +css::uno::Sequence< css::uno::Any > + SAL_CALL AccessibleDrawDocumentView::getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) + throw ( css::uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -851,7 +851,7 @@ void SAL_CALL AccessibleDrawDocumentView::disposing() const sal_Int32 FINDREPLACEFLOWTO = 2; if ( nType == SPELLCHECKFLOWTO ) { - uno::Reference< ::com::sun::star::drawing::XShape > xShape; + uno::Reference< css::drawing::XShape > xShape; rAny >>= xShape; if ( mpChildrenManager && xShape.is() ) { @@ -933,7 +933,7 @@ void SAL_CALL AccessibleDrawDocumentView::disposing() } Rt: - ::com::sun::star::uno::Sequence< uno::Any> aRet; + css::uno::Sequence< uno::Any> aRet; return aRet; } uno::Reference<XAccessible> AccessibleDrawDocumentView::GetSelAccContextInTable() diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 29e02ab72857..2fe6584341e1 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -125,7 +125,7 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible> SAL_CALL AccessibleOutlineView::getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Forward request to children manager. @@ -136,7 +136,7 @@ uno::Reference<XAccessible> SAL_CALL OUString SAL_CALL AccessibleOutlineView::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -184,7 +184,7 @@ void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::R OUString SAL_CALL AccessibleOutlineView::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleOutlineView"); } @@ -193,7 +193,7 @@ OUString SAL_CALL void SAL_CALL AccessibleOutlineView::disposing (const lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { AccessibleDocumentViewBase::disposing (rEventObject); } @@ -228,7 +228,7 @@ void SAL_CALL AccessibleOutlineView::disposing() void SAL_CALL AccessibleOutlineView::propertyChange (const beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -262,7 +262,7 @@ void SAL_CALL /// Create a name for this view. OUString AccessibleOutlineView::CreateAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -274,7 +274,7 @@ OUString */ OUString AccessibleOutlineView::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 4a9cf0c49208..fbb3d958a522 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -83,7 +83,7 @@ uno::Reference<XAccessible> SAL_CALL //===== XAccessibleComponent ================================================ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -147,7 +147,7 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds() } sal_Int32 SAL_CALL AccessiblePageShape::getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x0ffffffL); @@ -162,7 +162,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground() aColor >>= nColor; } } - catch (const ::com::sun::star::beans::UnknownPropertyException&) + catch (const css::beans::UnknownPropertyException&) { // Ignore exception and return default color. } @@ -173,7 +173,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground() draw page or its master page. */ sal_Int32 SAL_CALL AccessiblePageShape::getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x01020ffL); @@ -211,7 +211,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground() OSL_TRACE ("no Background property in page"); } } - catch (const ::com::sun::star::beans::UnknownPropertyException&) + catch (const css::beans::UnknownPropertyException&) { OSL_TRACE ("caught exception due to unknown property"); // Ignore exception and return default color. @@ -223,15 +223,15 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground() OUString SAL_CALL AccessiblePageShape::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return OUString("AccessiblePageShape"); } -::com::sun::star::uno::Sequence< OUString> SAL_CALL +css::uno::Sequence< OUString> SAL_CALL AccessiblePageShape::getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return AccessibleShape::getSupportedServiceNames(); @@ -240,8 +240,8 @@ OUString SAL_CALL //===== lang::XEventListener ================================================ void SAL_CALL - AccessiblePageShape::disposing (const ::com::sun::star::lang::EventObject& aEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) + AccessiblePageShape::disposing (const css::lang::EventObject& aEvent) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); AccessibleShape::disposing (aEvent); @@ -250,7 +250,7 @@ void SAL_CALL //===== XComponent ========================================================== void AccessiblePageShape::dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { OSL_TRACE ("AccessiblePageShape::dispose"); @@ -270,14 +270,14 @@ void AccessiblePageShape::dispose() OUString AccessiblePageShape::CreateAccessibleBaseName() - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { return OUString ("PageShape"); } OUString AccessiblePageShape::CreateAccessibleName() - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { Reference<beans::XPropertySet> xPageProperties (mxPage, UNO_QUERY); @@ -299,7 +299,7 @@ OUString OUString AccessiblePageShape::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { return OUString ("Page Shape"); } diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index b41b1a07aa99..fcda6c8ad698 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -46,7 +46,7 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape() OUString SAL_CALL AccessiblePresentationGraphicShape::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationGraphicShape"); } @@ -54,7 +54,7 @@ OUString SAL_CALL /// Set this object's name if is different to the current name. OUString AccessiblePresentationGraphicShape::CreateAccessibleBaseName() - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { OUString sName; @@ -76,7 +76,7 @@ OUString OUString AccessiblePresentationGraphicShape::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { // return createAccessibleName (); DescriptionGenerator aDG (mxShape); @@ -100,7 +100,7 @@ OUString } sal_Int16 SAL_CALL AccessiblePresentationGraphicShape::getAccessibleRole () - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return AccessibleRole::GRAPHIC ; } diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index 958e312b7cc6..8abed0243758 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -46,7 +46,7 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape() OUString SAL_CALL AccessiblePresentationOLEShape::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationOLEShape"); } @@ -54,7 +54,7 @@ OUString SAL_CALL /// Set this object's name if it is different to the current name. OUString AccessiblePresentationOLEShape::CreateAccessibleBaseName() - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { OUString sName; @@ -82,7 +82,7 @@ OUString OUString AccessiblePresentationOLEShape::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { // return createAccessibleName(); DescriptionGenerator aDG (mxShape); @@ -119,7 +119,7 @@ OUString // Return this object's role. sal_Int16 SAL_CALL AccessiblePresentationOLEShape::getAccessibleRole () - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return AccessibleRole::EMBEDDED_OBJECT ; } diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index 2d91b018f623..e2906a6d6bd6 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -48,14 +48,14 @@ AccessiblePresentationShape::~AccessiblePresentationShape() OUString SAL_CALL AccessiblePresentationShape::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationShape"); } /// Set this object's name if is different to the current name. OUString AccessiblePresentationShape::CreateAccessibleBaseName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { OUString sName; @@ -104,7 +104,7 @@ OUString AccessiblePresentationShape::CreateAccessibleBaseName() OUString AccessiblePresentationShape::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { // return createAccessibleName (); DescriptionGenerator aDG (mxShape); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 132b501f9a12..dfe24a420012 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -386,7 +386,7 @@ void SAL_CALL AccessibleSlideSorterObject::grabFocus() } sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); svtools::ColorConfig aColorConfig; @@ -395,7 +395,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground() } sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); @@ -405,20 +405,20 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground() // XServiceInfo OUString SAL_CALL AccessibleSlideSorterObject::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleSlideSorterObject"); } sal_Bool SAL_CALL AccessibleSlideSorterObject::supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } uno::Sequence< OUString> SAL_CALL AccessibleSlideSorterObject::getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 3171fc32ed15..4db26b60b6b7 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -621,20 +621,20 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi // XServiceInfo OUString SAL_CALL AccessibleSlideSorterView::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleSlideSorterView"); } sal_Bool SAL_CALL AccessibleSlideSorterView::supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } uno::Sequence< OUString> SAL_CALL AccessibleSlideSorterView::getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index ee0435ecf8eb..6d9e6a4349ff 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -484,7 +484,7 @@ bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) return false; } -CustomAnimationCreateDialog::CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) +CustomAnimationCreateDialog::CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< css::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) : TabDialog( pParent, "CustomAnimationCreate", "modules/simpress/ui/customanimationcreatedialog.ui" ) , mpPane( pPane ) , mrTargets( rTargets ) diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index d7fc0e20631d..6a97e323f8f3 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -39,7 +39,7 @@ class CustomAnimationCreateDialog : public TabDialog { friend class CustomAnimationCreateTabPage; public: - CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ); + CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< css::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ); virtual ~CustomAnimationCreateDialog(); virtual void dispose() override; @@ -58,7 +58,7 @@ private: private: VclPtr<CustomAnimationPane> mpPane; - const std::vector< ::com::sun::star::uno::Any >& mrTargets; + const std::vector< css::uno::Any >& mrTargets; double mfDuration; bool mbIsPreview; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 70004faa5350..9103e73bce61 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1045,7 +1045,7 @@ private: VclPtr<MetricField> mpMFTextDelay; VclPtr<FixedText> mpFTTextDelay; - ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; + css::uno::Reference< css::media::XPlayer > mxPlayer; }; CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent, const STLPropertySet* pSet ) diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index 757153b5ebe0..672120df4206 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -100,15 +100,15 @@ public: explicit PropertySubControl( sal_Int32 nType ) : mnType( nType ) {} virtual ~PropertySubControl(); - virtual ::com::sun::star::uno::Any getValue() = 0; - virtual void setValue( const ::com::sun::star::uno::Any& rValue, const OUString& rPresetId ) = 0; + virtual css::uno::Any getValue() = 0; + virtual void setValue( const css::uno::Any& rValue, const OUString& rPresetId ) = 0; virtual Control* getControl() = 0; static PropertySubControl* create( sal_Int32 nType, vcl::Window* pParent, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const OUString& rPresetId, const Link<LinkParamNone*,void>& rModifyHdl ); diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 55287fb2f054..fb4d0f36265d 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -111,7 +111,7 @@ private: Image maImages[ IMG_CUSTOMANIMATION_MEDIA_STOP - IMG_CUSTOMANIMATION_ON_CLICK + 1]; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxLastTargetShape; + css::uno::Reference< css::drawing::XShape > mxLastTargetShape; sal_Int32 mnLastGroupId; SvTreeListEntry* mpLastParentEntry; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 8797c2e08913..54495818874c 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -696,7 +696,7 @@ static bool updateMotionPathImpl( CustomAnimationPane& rPane, ::sd::View& rView, while( aIter != aEnd ) { CustomAnimationEffectPtr pEffect( (*aIter++) ); - if( pEffect.get() && pEffect->getPresetClass() == ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH ) + if( pEffect.get() && pEffect->getPresetClass() == css::presentation::EffectPresetClass::MOTIONPATH ) { rtl::Reference< MotionPathTag > xMotionPathTag; // first try to find if there is already a tag for this @@ -1034,10 +1034,10 @@ static bool hasVisibleShape( const Reference< XShape >& xShape ) FillStyle eFillStyle; xSet->getPropertyValue( sFillStyle ) >>= eFillStyle; - ::com::sun::star::drawing::LineStyle eLineStyle; + css::drawing::LineStyle eLineStyle; xSet->getPropertyValue( sLineStyle ) >>= eLineStyle; - return eFillStyle != FillStyle_NONE || eLineStyle != ::com::sun::star::drawing::LineStyle_NONE; + return eFillStyle != FillStyle_NONE || eLineStyle != css::drawing::LineStyle_NONE; } } catch( Exception& ) @@ -2202,7 +2202,7 @@ void CustomAnimationPane::onPreview( bool bForcePreview ) void CustomAnimationPane::preview( const Reference< XAnimationNode >& xAnimationNode ) { Reference< XParallelTimeContainer > xRoot = ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ); - Sequence< ::com::sun::star::beans::NamedValue > aUserData + Sequence< css::beans::NamedValue > aUserData { { "node-type", css::uno::makeAny(css::presentation::EffectNodeType::TIMING_ROOT) } }; xRoot->setUserData( aUserData ); xRoot->appendChild( xAnimationNode ); diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 0144c549cf74..f1a51d802677 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -77,7 +77,7 @@ public: void onChangeSpeed(); // methods - void preview( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode ); + void preview( const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode ); void remove( CustomAnimationEffectPtr& pEffect ); // Control @@ -107,13 +107,13 @@ private: void moveSelection( bool bUp ); void onPreview( bool bForcePreview ); - void createPath( PathKind eKind, std::vector< ::com::sun::star::uno::Any >& rTargets, double fDuration ); + void createPath( PathKind eKind, std::vector< css::uno::Any >& rTargets, double fDuration ); STLPropertySet* createSelectionSet(); void changeSelection( STLPropertySet* pResultSet, STLPropertySet* pOldSet ); - static ::com::sun::star::uno::Any getProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect ); - bool setProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect, const ::com::sun::star::uno::Any& rValue ); + static css::uno::Any getProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect ); + bool setProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect, const css::uno::Any& rValue ); void UpdateLook(); DECL_LINK_TYPED( implControlListBoxHdl, ListBox&, void ); @@ -153,14 +153,14 @@ private: Size maMinSize; - EffectSequence maListSelection; - ::com::sun::star::uno::Any maViewSelection; + EffectSequence maListSelection; + css::uno::Any maViewSelection; MainSequencePtr mpMainSequence; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mxCurrentPage; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; + css::uno::Reference< css::drawing::XDrawPage > mxCurrentPage; + css::uno::Reference< css::drawing::XDrawView > mxView; + css::uno::Reference< css::frame::XModel > mxModel; /** The mpCustomAnimationPresets is initialized either on demand or after a short time after the construction of a new object of this diff --git a/sd/source/ui/animations/STLPropertySet.hxx b/sd/source/ui/animations/STLPropertySet.hxx index 4cc95e0ffca9..10606534f720 100644 --- a/sd/source/ui/animations/STLPropertySet.hxx +++ b/sd/source/ui/animations/STLPropertySet.hxx @@ -34,12 +34,12 @@ const sal_Int32 STLPropertyState_AMBIGUOUS = 3; struct STLPropertyMapEntry { - ::com::sun::star::uno::Any maValue; + css::uno::Any maValue; sal_Int32 mnState; STLPropertyMapEntry() : mnState( STLPropertyState_AMBIGUOUS ) {} - STLPropertyMapEntry( ::com::sun::star::uno::Any aValue, sal_Int32 nState = STLPropertyState_DEFAULT ) + STLPropertyMapEntry( css::uno::Any aValue, sal_Int32 nState = STLPropertyState_DEFAULT ) : maValue( aValue ), mnState( nState ) {} }; @@ -54,9 +54,9 @@ public: STLPropertySet(); ~STLPropertySet(); - void setPropertyDefaultValue( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ); - void setPropertyValue( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue, sal_Int32 nState = STLPropertyState_DIRECT ); - ::com::sun::star::uno::Any getPropertyValue( sal_Int32 nHandle ) const; + void setPropertyDefaultValue( sal_Int32 nHandle, const css::uno::Any& rValue ); + void setPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue, sal_Int32 nState = STLPropertyState_DIRECT ); + css::uno::Any getPropertyValue( sal_Int32 nHandle ) const; sal_Int32 getPropertyState( sal_Int32 nHandle ) const; void setPropertyState( sal_Int32 nHandle, sal_Int32 nState ); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 21df5d071fe4..b3c845c0d027 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -890,7 +890,7 @@ void SlideTransitionPane::playCurrentEffect() if( mxView.is() ) { - Reference< ::com::sun::star::animations::XAnimationNode > xNode; + Reference< css::animations::XAnimationNode > xNode; SlideShow::StartPreview( mrBase, mxView->getCurrentPage(), xNode ); } } diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index 41ac9bd4c603..69e714d7be6d 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -114,8 +114,8 @@ private: VclPtr<PushButton> mpPB_PLAY; VclPtr<CheckBox> mpCB_AUTO_PREVIEW; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; + css::uno::Reference< css::drawing::XDrawView > mxView; + css::uno::Reference< css::frame::XModel > mxModel; bool mbHasSelection; bool mbUpdatingControls; diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index cf4dca489ae8..3e03f32a67a5 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -881,7 +881,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) { if( mpPathObj ) { - ::com::sun::star::awt::Point aPos; + css::awt::Point aPos; if (mxOrigin.is()) aPos = mxOrigin->getPosition(); if( (aPos.X != maOriginPos.X) || (aPos.Y != maOriginPos.Y) ) @@ -1199,7 +1199,7 @@ void SAL_CALL MotionPathTag::disposing( const EventObject& /*Source*/ ) throw (R Dispose(); } -Any SAL_CALL MotionPathTag::queryInterface( const ::com::sun::star::uno::Type& aType ) throw (RuntimeException, std::exception) +Any SAL_CALL MotionPathTag::queryInterface( const css::uno::Type& aType ) throw (RuntimeException, std::exception) { if( aType == cppu::UnoType<XChangesListener>::get() ) return Any( Reference< XChangesListener >( this ) ); diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index a44c9c95b719..2c9deecbdb39 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -35,7 +35,7 @@ class View; class CustomAnimationPane; /// Base class for all functions. -class MotionPathTag : public SmartTag, public IPolyPolygonEditorController, public SfxListener, public ::com::sun::star::util::XChangesListener +class MotionPathTag : public SmartTag, public IPolyPolygonEditorController, public SfxListener, public css::util::XChangesListener { public: MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, const CustomAnimationEffectPtr& pEffect ); @@ -85,9 +85,9 @@ public: bool OnMove( const KeyEvent& rKEvt ); // XChangesListener - virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( ) throw () override; virtual void SAL_CALL release( ) throw () override; @@ -104,9 +104,9 @@ private: CustomAnimationPane& mrPane; CustomAnimationEffectPtr mpEffect; ::basegfx::B2DPolyPolygon mxPolyPoly; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxOrigin; + css::uno::Reference< css::drawing::XShape > mxOrigin; SdrPathObj* mpPathObj; - ::com::sun::star::awt::Point maOriginPos; + css::awt::Point maOriginPos; SdrMark* mpMark; OUString msLastPath; bool mbInUpdatePath; diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index da3d5d54af28..a860daec3032 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -132,10 +132,10 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) return 0; } -com::sun::star::util::DateTime getCurrentDateTime() +css::util::DateTime getCurrentDateTime() { DateTime aCurrentDate( DateTime::SYSTEM ); - return com::sun::star::util::DateTime( 0, aCurrentDate.GetSec(), + return css::util::DateTime( 0, aCurrentDate.GetSec(), aCurrentDate.GetMin(), aCurrentDate.GetHour(), aCurrentDate.GetDay(), aCurrentDate.GetMonth(), aCurrentDate.GetYear(), false ); @@ -149,7 +149,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio const SvtSysLocale aSysLocale; const LocaleDataWrapper& rLocalData = aSysLocale.GetLocaleData(); - com::sun::star::util::DateTime aDateTime( xAnnotation->getDateTime() ); + css::util::DateTime aDateTime( xAnnotation->getDateTime() ); Date aSysDate( Date::SYSTEM ); Date aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year ); @@ -230,7 +230,7 @@ void SAL_CALL AnnotationManagerImpl::disposing () } // XEventListener -void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL AnnotationManagerImpl::notifyEvent( const css::document::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) { if( aEvent.EventName == "OnAnnotationInserted" || aEvent.EventName == "OnAnnotationRemoved" || aEvent.EventName == "OnAnnotationChanged" ) { @@ -238,7 +238,7 @@ void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::docume } } -void SAL_CALL AnnotationManagerImpl::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL AnnotationManagerImpl::disposing( const css::lang::EventObject& /*Source*/ ) throw (css::uno::RuntimeException, std::exception) { } @@ -717,7 +717,7 @@ void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag ) } } -void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit /* = sal_False */ ) +void AnnotationManagerImpl::SelectAnnotation( css::uno::Reference< css::office::XAnnotation > xAnnotation, bool bEdit /* = sal_False */ ) { mxSelectedAnnotation = xAnnotation; @@ -735,7 +735,7 @@ void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< } } -void AnnotationManagerImpl::GetSelectedAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ) +void AnnotationManagerImpl::GetSelectedAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotation ) { xAnnotation = mxSelectedAnnotation; } @@ -976,7 +976,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation sal_uInt16 nId = 0; // set slot images - Reference< ::com::sun::star::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface() ); + Reference< css::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface() ); if( xFrame.is() ) { for( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index bc2f73fb5fff..643d3a02c0ce 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -44,7 +44,7 @@ class EventMultiplexerEvent; } typedef ::cppu::WeakComponentImplHelper < - com::sun::star::document::XEventListener + css::document::XEventListener > AnnotationManagerImplBase; class AnnotationManagerImpl : private ::cppu::BaseMutex, public AnnotationManagerImplBase @@ -58,8 +58,8 @@ public: virtual void SAL_CALL disposing () override; // XEventListener - virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; void ExecuteAnnotation (SfxRequest& rRequest); void GetAnnotationState (SfxItemSet& rItemSet); @@ -70,15 +70,15 @@ public: void SelectNextAnnotation(bool bForeward); - void SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit = false ); - void GetSelectedAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); + void SelectAnnotation( css::uno::Reference< css::office::XAnnotation > xAnnotation, bool bEdit = false ); + void GetSelectedAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotation ); void InsertAnnotation(); - void DeleteAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation ); + void DeleteAnnotation( css::uno::Reference< css::office::XAnnotation > xAnnotation ); void DeleteAnnotationsByAuthor( const OUString& sAuthor ); void DeleteAllAnnotations(); - void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, vcl::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); + void ExecuteAnnotationContextMenu( css::uno::Reference< css::office::XAnnotation > xAnnotation, vcl::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); static Color GetColorDark(sal_uInt16 aAuthorIndex); static Color GetColorLight(sal_uInt16 aAuthorIndex); @@ -118,9 +118,9 @@ private: AnnotationTagVector maTagVector; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; - ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationAccess > mxCurrentPage; - ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > mxSelectedAnnotation; + css::uno::Reference< css::drawing::XDrawView > mxView; + css::uno::Reference< css::office::XAnnotationAccess > mxCurrentPage; + css::uno::Reference< css::office::XAnnotation > mxSelectedAnnotation; bool mbShowAnnotations; ImplSVEvent * mnUpdateTagsEvent; @@ -131,7 +131,7 @@ OUString getAnnotationDateTimeString( const css::uno::Reference< css::office::XA SfxItemPool* GetAnnotationPool(); -com::sun::star::util::DateTime getCurrentDateTime(); +css::util::DateTime getCurrentDateTime(); } diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 9e25f440573b..55470bdb3711 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -83,13 +83,13 @@ class AnnotationWindow : public FloatingWindow OutlinerView* mpOutlinerView; Outliner* mpOutliner; - VclPtr<ScrollBar> mpVScrollbar; - ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > mxAnnotation; + VclPtr<ScrollBar> mpVScrollbar; + css::uno::Reference< css::office::XAnnotation > mxAnnotation; bool mbReadonly; bool mbProtected; bool mbMouseOverButton; VclPtr<AnnotationTextWindow> mpTextWindow; - VclPtr<MultiLineEdit> mpMeta; + VclPtr<MultiLineEdit> mpMeta; Rectangle maRectMetaButton; basegfx::B2DPolygon maPopupTriangle; @@ -107,7 +107,7 @@ class AnnotationWindow : public FloatingWindow SvxLanguageItem GetLanguage(); - void setAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, bool bGrabFocus = false ); + void setAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, bool bGrabFocus = false ); void ExecuteSlot( sal_uInt16 nSID ); diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 14a3fc018bb4..f86572d31944 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -60,7 +60,7 @@ void SdOptionsItem::ImplCommit() mrParent.Commit( *this ); }; -void SdOptionsItem::Notify( const com::sun::star::uno::Sequence<OUString>& ) +void SdOptionsItem::Notify( const css::uno::Sequence<OUString>& ) {} Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames ) diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index a6f666919d36..2bf67cb9ad8f 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -304,7 +304,7 @@ void SdDLL::Init() // register 3D-Objekt-Factory E3dObjFactory(); - // register ::com::sun::star::form::component::Form-Object-Factory + // register css::form::component::Form-Object-Factory FmFormObjFactory(); // register Object-Factory diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 32a73f868dee..56cbcaa2dd5a 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -572,11 +572,11 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) DBG_ASSERT( !aFileToOpen.isEmpty(), "The autopilot should have asked for a file itself already!" ); if (!aFileToOpen.isEmpty()) { - com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > aPasswrd( pPilotDlg->GetPassword() ); + css::uno::Sequence< css::beans::NamedValue > aPasswrd( pPilotDlg->GetPassword() ); SfxStringItem aFile( SID_FILE_NAME, aFileToOpen ); SfxStringItem aReferer( SID_REFERER, OUString()); - SfxUnoAnyItem aPassword( SID_ENCRYPTIONDATA, com::sun::star::uno::makeAny(aPasswrd) ); + SfxUnoAnyItem aPassword( SID_ENCRYPTIONDATA, css::uno::makeAny(aPasswrd) ); if ( xTargetFrame.is() ) { @@ -612,7 +612,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if ( pFrameItem ) pFrame = &pFrameItem->GetFrame()->GetFrame(); } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { DBG_ASSERT (false, "caught IllegalArgumentException while loading document from Impress autopilot"); } diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 994ac56a29ee..7ff21c9f0f70 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -187,17 +187,17 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) { - Reference< ::com::sun::star::awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel() ); + Reference< css::awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel() ); if( !xControlModel.is() ) return; - Reference< ::com::sun::star::beans::XPropertySet > xPropSet( xControlModel, UNO_QUERY ); + Reference< css::beans::XPropertySet > xPropSet( xControlModel, UNO_QUERY ); if( !xPropSet.is() ) return; - ::com::sun::star::form::FormButtonType eButtonType; + css::form::FormButtonType eButtonType; Any aTmp( xPropSet->getPropertyValue( "ButtonType" ) ); if( aTmp >>= eButtonType ) @@ -605,7 +605,7 @@ bool SdTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pDoc->setUnoModel( Reference< XInterface >::query( xComponent ) ); { - com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *rxOStm ) ); + css::uno::Reference<css::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *rxOStm ) ); if( SvxDrawingLayerExport( pDoc, xDocOut, xComponent, (pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ? "com.sun.star.comp.Impress.XMLClipboardExporter" : "com.sun.star.comp.DrawingLayer.XMLExporter" ) ) rxOStm->Commit(); } @@ -734,7 +734,7 @@ void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmar } } -sal_Int64 SAL_CALL SdTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL SdTransferable::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) { sal_Int64 nRet; @@ -774,7 +774,7 @@ namespace class theSdTransferableUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdTransferableUnoTunnelId > {}; } -const ::com::sun::star::uno::Sequence< sal_Int8 >& SdTransferable::getUnoTunnelId() +const css::uno::Sequence< sal_Int8 >& SdTransferable::getUnoTunnelId() { return theSdTransferableUnoTunnelId::get().getSeq(); } @@ -783,10 +783,10 @@ SdTransferable* SdTransferable::getImplementation( const Reference< XInterface > { try { - Reference< ::com::sun::star::lang::XUnoTunnel > xUnoTunnel( rxData, UNO_QUERY_THROW ); + Reference< css::lang::XUnoTunnel > xUnoTunnel( rxData, UNO_QUERY_THROW ); return reinterpret_cast<SdTransferable*>(sal::static_int_cast<sal_uIntPtr>(xUnoTunnel->getSomething( SdTransferable::getUnoTunnelId()) ) ); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } return NULL; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index bf498071a0ae..27b81ed0849e 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -385,16 +385,16 @@ Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames( } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_sd_SlideLayoutController_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_sd_SlideLayoutController_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::SlideLayoutController(context, ".uno:AssignLayout", false)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_sd_InsertSlideController_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_sd_InsertSlideController_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::SlideLayoutController(context, ".uno:InsertPage", true)); } diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index 0ede3f9150ed..f9a6d21e5a47 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -28,7 +28,7 @@ namespace sd class SlideLayoutController : public svt::PopupWindowController { public: - SlideLayoutController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, + SlideLayoutController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& sCommandURL, bool bInsertPage ); @@ -39,8 +39,8 @@ public: throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; using svt::PopupWindowController::createPopupWindow; private: diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 0416c639c476..9cd2261f9cdb 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -64,7 +64,7 @@ public: const OUString& rsTitle, const OUString& rsTargetDir, const OUString& rsContentIdentifier, - const Reference<com::sun::star::ucb::XCommandEnvironment>& rxFolderEnvironment) + const Reference<css::ucb::XCommandEnvironment>& rxFolderEnvironment) : mnPriority(nPriority), msTitle(rsTitle), msTargetDir(rsTargetDir), @@ -76,7 +76,7 @@ public: OUString msTargetDir; OUString msContentIdentifier; // Reference<sdbc::XResultSet> mxFolderResultSet; - Reference<com::sun::star::ucb::XCommandEnvironment> mxFolderEnvironment; + Reference<css::ucb::XCommandEnvironment> mxFolderEnvironment; class Comparator { @@ -211,7 +211,7 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning() if (maFolderContent.isFolder()) { - mxEntryEnvironment = Reference<com::sun::star::ucb::XCommandEnvironment>(); + mxEntryEnvironment = Reference<css::ucb::XCommandEnvironment>(); // We are interested only in three properties: the entry's name, // its URL, and its content type. @@ -222,7 +222,7 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning() // Create a cursor to iterate over the templates in this folders. ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_DOCUMENTS_ONLY; - mxEntryResultSet = Reference<com::sun::star::sdbc::XResultSet>( + mxEntryResultSet = Reference<css::sdbc::XResultSet>( maFolderContent.createCursor(aProps, eInclude)); } else @@ -235,8 +235,8 @@ TemplateScanner::State TemplateScanner::ScanEntry() { State eNextState (ERROR); - Reference<com::sun::star::ucb::XContentAccess> xContentAccess (mxEntryResultSet, UNO_QUERY); - Reference<com::sun::star::sdbc::XRow> xRow (mxEntryResultSet, UNO_QUERY); + Reference<css::ucb::XContentAccess> xContentAccess (mxEntryResultSet, UNO_QUERY); + Reference<css::sdbc::XRow> xRow (mxEntryResultSet, UNO_QUERY); if (xContentAccess.is() && xRow.is() && mxEntryResultSet.is()) { @@ -299,7 +299,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning() try { // Create content for template folders. - mxFolderEnvironment = Reference<com::sun::star::ucb::XCommandEnvironment>(); + mxFolderEnvironment = Reference<css::ucb::XCommandEnvironment>(); ::ucbhelper::Content aTemplateDir (mxTemplateRoot, mxFolderEnvironment, comphelper::getProcessComponentContext()); // Define the list of properties we are interested in. @@ -314,7 +314,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning() if (mxFolderResultSet.is()) eNextState = GATHER_FOLDER_LIST; } - catch (::com::sun::star::uno::Exception&) + catch (css::uno::Exception&) { eNextState = ERROR; } @@ -326,7 +326,7 @@ TemplateScanner::State TemplateScanner::GatherFolderList() { State eNextState (ERROR); - Reference<com::sun::star::ucb::XContentAccess> xContentAccess (mxFolderResultSet, UNO_QUERY); + Reference<css::ucb::XContentAccess> xContentAccess (mxFolderResultSet, UNO_QUERY); if (xContentAccess.is() && mxFolderResultSet.is()) { while (mxFolderResultSet->next()) diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 726ff7a8d7de..2e35e9bf41c2 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1653,7 +1653,7 @@ OUString AssistentDlgImpl::GetUiTextForCommand (const OUString& sCommandURL) } while(false); } - catch (com::sun::star::uno::Exception& ) + catch (css::uno::Exception& ) { } @@ -1680,13 +1680,13 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) Reference<ui::XModuleUIConfigurationManagerSupplier> xSupplier ( ui::theModuleUIConfigurationManagerSupplier::get(xContext)); - Reference<com::sun::star::ui::XUIConfigurationManager> xManager ( + Reference<css::ui::XUIConfigurationManager> xManager ( xSupplier->getUIConfigurationManager( "com.sun.star.presentation.PresentationDocument")); if ( ! xManager.is()) break; - Reference<com::sun::star::ui::XImageManager> xImageManager ( + Reference<css::ui::XImageManager> xImageManager ( xManager->getImageManager(), UNO_QUERY_THROW); @@ -1701,7 +1701,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) } while(false); } - catch (com::sun::star::uno::Exception& ) + catch (css::uno::Exception& ) { } diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 455349db3757..91de86569f36 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -222,7 +222,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, { maUpdateIdle.SetIdleHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl)); - css::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker2 > xFileDlg = GetFilePicker(); + css::uno::Reference < css::ui::dialogs::XFilePicker2 > xFileDlg = GetFilePicker(); // get the control access mxControlAccess = css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > ( xFileDlg, css::uno::UNO_QUERY ); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 7837a8ab3997..7dec856bdc92 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -224,7 +224,7 @@ bool AbstractAssistentDlg_Impl::IsDocEmpty() const return pDlg->IsDocEmpty(); } -com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > AbstractAssistentDlg_Impl::GetPassword() +css::uno::Sequence< css::beans::NamedValue > AbstractAssistentDlg_Impl::GetPassword() { return pDlg->GetPassword(); } @@ -344,7 +344,7 @@ const GDIMetaFile& AbstractSdVectorizeDlg_Impl::GetGDIMetaFile() const return pDlg->GetGDIMetaFile(); } -void AbstractSdPublishingDlg_Impl::GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ) +void AbstractSdPublishingDlg_Impl::GetParameterSequence( css::uno::Sequence< css::beans::PropertyValue >& rParams ) { pDlg->GetParameterSequence( rParams ); } diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 5b6fbab2739d..0cfbc05d68bd 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -122,7 +122,7 @@ class AbstractAssistentDlg_Impl : public AbstractAssistentDlg virtual OUString GetDocPath() const override; virtual bool GetStartWithFlag() const override; virtual bool IsDocEmpty() const override; - virtual com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword() override; + virtual css::uno::Sequence< css::beans::NamedValue > GetPassword() override; }; class SdModifyFieldDlg; @@ -212,7 +212,7 @@ class SdPublishingDlg; class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg { DECL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl,SdPublishingDlg) - virtual void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ) override; + virtual void GetParameterSequence( css::uno::Sequence< css::beans::PropertyValue >& rParams ) override; }; class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index a37abe0907d0..fca49efd00f7 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -144,7 +144,7 @@ void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction ) SdTransferable::DragFinished(nDropAction); } -sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) { sal_Int64 nRet; @@ -164,23 +164,23 @@ namespace class theSdPageObjsTLBUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdPageObjsTLBUnoTunnelId > {}; } -const ::com::sun::star::uno::Sequence< sal_Int8 >& SdPageObjsTLB::SdPageObjsTransferable::getUnoTunnelId() +const css::uno::Sequence< sal_Int8 >& SdPageObjsTLB::SdPageObjsTransferable::getUnoTunnelId() { return theSdPageObjsTLBUnoTunnelId::get().getSeq(); } -SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) +SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw() { try { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUnoTunnel( rxData, ::com::sun::star::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::lang::XUnoTunnel > xUnoTunnel( rxData, css::uno::UNO_QUERY_THROW ); return reinterpret_cast<SdPageObjsTLB::SdPageObjsTransferable*>( sal::static_int_cast<sal_uIntPtr>( xUnoTunnel->getSomething( SdPageObjsTLB::SdPageObjsTransferable::getUnoTunnelId()) ) ); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } return 0; @@ -1354,7 +1354,7 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) } } } - catch (com::sun::star::uno::Exception&) + catch (css::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index bdd3915c13fb..109a5d2ba04a 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -711,7 +711,7 @@ presentation::ClickAction SdTPAction::GetActualClickAction() void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) { - std::vector<com::sun::star::presentation::ClickAction>::const_iterator pIter = + std::vector<css::presentation::ClickAction>::const_iterator pIter = std::find(maCurrentActions.begin(),maCurrentActions.end(),eCA); if ( pIter != maCurrentActions.end() ) diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index c1ec179f4ff6..8c72b571e39a 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -412,8 +412,8 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) aOptsItem.GetOptionsMisc().SetSummationOfParagraphs( m_pCbxCompatibility->IsChecked() ); aOptsItem.GetOptionsMisc().SetPrinterIndependentLayout ( m_pCbxUsePrinterMetrics->IsChecked() - ? ::com::sun::star::document::PrinterIndependentLayout::DISABLED - : ::com::sun::star::document::PrinterIndependentLayout::ENABLED); + ? css::document::PrinterIndependentLayout::DISABLED + : css::document::PrinterIndependentLayout::ENABLED); rAttrs->Put( aOptsItem ); bModified = true; diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index a85d1b782408..b91cd3407b0f 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -149,7 +149,7 @@ void DrawDocShell::SetPrinter(SfxPrinter *pNewPrinter) mpPrinter = pNewPrinter; mbOwnPrinter = true; - if ( mpDoc->GetPrinterIndependentLayout() == ::com::sun::star::document::PrinterIndependentLayout::DISABLED ) + if ( mpDoc->GetPrinterIndependentLayout() == css::document::PrinterIndependentLayout::DISABLED ) UpdateFontList(); UpdateRefDevice(); } @@ -158,7 +158,7 @@ void DrawDocShell::UpdateFontList() { delete mpFontList; OutputDevice* pRefDevice = NULL; - if ( mpDoc->GetPrinterIndependentLayout() == ::com::sun::star::document::PrinterIndependentLayout::DISABLED ) + if ( mpDoc->GetPrinterIndependentLayout() == css::document::PrinterIndependentLayout::DISABLED ) pRefDevice = GetPrinter(true); else pRefDevice = SD_MOD()->GetVirtualRefDevice(); @@ -205,11 +205,11 @@ void DrawDocShell::UpdateRefDevice() VclPtr< OutputDevice > pRefDevice; switch (mpDoc->GetPrinterIndependentLayout()) { - case ::com::sun::star::document::PrinterIndependentLayout::DISABLED: + case css::document::PrinterIndependentLayout::DISABLED: pRefDevice = mpPrinter.get(); break; - case ::com::sun::star::document::PrinterIndependentLayout::ENABLED: + case css::document::PrinterIndependentLayout::ENABLED: pRefDevice = SD_MOD()->GetVirtualRefDevice(); break; @@ -239,7 +239,7 @@ void DrawDocShell::UpdateRefDevice() /** * Creates new document, opens streams */ -bool DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) +bool DrawDocShell::InitNew( const css::uno::Reference< css::embed::XStorage >& xStorage ) { bool bRet = SfxObjectShell::InitNew( xStorage ); @@ -625,7 +625,7 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium ) * Reopen own streams to ensure that nobody else can prevent use from opening * them. */ -bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) +bool DrawDocShell::SaveCompleted( const css::uno::Reference< css::embed::XStorage >& xStorage ) { bool bRet = false; @@ -909,9 +909,7 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark) SdUnoDrawView* pUnoDrawView = new SdUnoDrawView ( *pDrViewSh, *pDrViewSh->GetView()); - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage> xDrawPage ( - pPage->getUnoPage(), ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::drawing::XDrawPage> xDrawPage( pPage->getUnoPage(), css::uno::UNO_QUERY); pUnoDrawView->setCurrentPage (xDrawPage); delete pUnoDrawView; @@ -991,9 +989,7 @@ bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark) SdUnoDrawView* pUnoDrawView = new SdUnoDrawView ( *pDrViewSh, *pDrViewSh->GetView()); - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage> xDrawPage ( - pPage->getUnoPage(), ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::drawing::XDrawPage> xDrawPage( pPage->getUnoPage(), css::uno::UNO_QUERY); pUnoDrawView->setCurrentPage (xDrawPage); delete pUnoDrawView; diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx index 2792539b389e..a3ba43ed5f22 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx @@ -31,8 +31,7 @@ namespace sd { namespace framework { ChangeRequestQueueProcessor to process these requests. */ class ChangeRequestQueue - : public ::std::list<com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfigurationChangeRequest> > + : public ::std::list<css::uno::Reference< css::drawing::framework::XConfigurationChangeRequest> > { public: /** Create an empty queue. diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx index fa0263af47d2..a232dc7b3033 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx @@ -64,15 +64,13 @@ public: controller who owns the configuration. */ void SetConfiguration ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration); + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration); /** The given request is appended to the end of the queue and will eventually be processed when all other entries in front of it have been processed. */ - void AddRequest (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfigurationChangeRequest>& rxRequest); + void AddRequest (const css::uno::Reference<css::drawing::framework::XConfigurationChangeRequest>& rxRequest); /** Returns </sal_True> when the queue is empty. */ @@ -107,8 +105,7 @@ private: */ ImplSVEvent * mnUserEventId; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration> mxConfiguration; + css::uno::Reference<css::drawing::framework::XConfiguration> mxConfiguration; ::rtl::Reference<ConfigurationController> mpConfigurationController; diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 82878ed9509a..614a69984292 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -95,7 +95,7 @@ void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResour ThrowIfDisposed(); if ( ! rxResourceId.is() || rxResourceId->getResourceURL().isEmpty()) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); if (mpResourceContainer->find(rxResourceId) == mpResourceContainer->end()) { @@ -113,7 +113,7 @@ void SAL_CALL Configuration::removeResource (const Reference<XResourceId>& rxRes ThrowIfDisposed(); if ( ! rxResourceId.is() || rxResourceId->getResourceURL().isEmpty()) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); ResourceContainer::iterator iResource (mpResourceContainer->find(rxResourceId)); if (iResource != mpResourceContainer->end()) @@ -130,7 +130,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( const Reference<XResourceId>& rxAnchorId, const OUString& rsResourceURLPrefix, AnchorBindingMode eMode) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -281,7 +281,7 @@ void Configuration::PostEvent ( } void Configuration::ThrowIfDisposed() const - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -337,10 +337,10 @@ bool AreConfigurationsEquivalent ( } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation( - ::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) + css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::framework::Configuration(NULL, false)); } diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index 6989223cd136..7319ef15a3ea 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -52,8 +52,8 @@ bool ConfigurationClassifier::Partition() } void ConfigurationClassifier::PartitionResources ( - const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS1, - const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS2) + const css::uno::Sequence<Reference<XResourceId> >& rS1, + const css::uno::Sequence<Reference<XResourceId> >& rS2) { ResourceIdVector aC1minusC2; ResourceIdVector aC2minusC1; @@ -85,8 +85,8 @@ void ConfigurationClassifier::PartitionResources ( } void ConfigurationClassifier::ClassifyResources ( - const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS1, - const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS2, + const css::uno::Sequence<Reference<XResourceId> >& rS1, + const css::uno::Sequence<Reference<XResourceId> >& rS2, ResourceIdVector& rS1minusS2, ResourceIdVector& rS2minusS1, ResourceIdVector& rS1andS2) diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx index 2470f01ffc04..a40247d05a89 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx @@ -39,10 +39,8 @@ public: two given configurations. */ ConfigurationClassifier ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration1, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration2); + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration1, + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration2); /** Calculate three lists of resource ids. These contain the resources that belong to one configuration but not the other, or that belong @@ -53,8 +51,7 @@ public: */ bool Partition(); - typedef ::std::vector<com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId> > ResourceIdVector; + typedef ::std::vector<css::uno::Reference<css::drawing::framework::XResourceId> > ResourceIdVector; /** Return the resources that belong to the configuration given as rxConfiguration1 to the constructor but that do not belong to @@ -77,10 +74,8 @@ public: const ResourceIdVector& GetC2minusC1() const { return maC2minusC1;} private: - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration> mxConfiguration1; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration> mxConfiguration2; + css::uno::Reference<css::drawing::framework::XConfiguration> mxConfiguration1; + css::uno::Reference<css::drawing::framework::XConfiguration> mxConfiguration2; /** After the call to Classify() this vector holds all elements from mxConfiguration1 that are not in mxConfiguration2. @@ -108,12 +103,8 @@ private: Another sequence of XResourceId objects. */ void PartitionResources ( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId> >& rS1, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId> >& rS2); + const css::uno::Sequence<css::uno::Reference<css::drawing::framework::XResourceId> >& rS1, + const css::uno::Sequence<css::uno::Reference<css::drawing::framework::XResourceId> >& rS2); /** Compare the given sequences of resource ids and put their elements in one of three vectors depending on whether an element belongs to @@ -126,12 +117,8 @@ private: Another sequence of XResourceId objects. */ static void ClassifyResources ( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId> >& rS1, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId> >& rS2, + const css::uno::Sequence<css::uno::Reference<css::drawing::framework::XResourceId> >& rS1, + const css::uno::Sequence<css::uno::Reference<css::drawing::framework::XResourceId> >& rS2, ResourceIdVector& rS1minusS2, ResourceIdVector& rS2minusS1, ResourceIdVector& rS1andS2); @@ -151,8 +138,7 @@ private: */ static void CopyResources ( const ResourceIdVector& rSource, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration, ResourceIdVector& rTarget); }; diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index abfaa87fc855..cd3424d9e4e9 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -66,8 +66,7 @@ public: requestResourceDeactivation(). The mpConfigurationUpdater makes the current configuration reflect the content of this one. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration> mxRequestedConfiguration; + css::uno::Reference<css::drawing::framework::XConfiguration> mxRequestedConfiguration; ViewShellBase* mpBase; @@ -571,10 +570,10 @@ ConfigurationController::Implementation::~Implementation() } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Draw_framework_configuration_ConfigurationController_get_implementation( - ::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) + css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::framework::ConfigurationController()); } diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index c1cc172999b3..ac4807a59abb 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -107,11 +107,11 @@ public: void DisposeAndClear(); private: - css::uno::Reference< - com::sun::star::drawing::framework::XConfigurationController> mxConfigurationController; - class ListenerDescriptor {public: - css::uno::Reference< - css::drawing::framework::XConfigurationChangeListener> mxListener; + css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; + class ListenerDescriptor + { + public: + css::uno::Reference<css::drawing::framework::XConfigurationChangeListener> mxListener; css::uno::Any maUserData; }; typedef std::vector<ListenerDescriptor> ListenerList; diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx index 4d59fd797c8e..991141843728 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx @@ -31,15 +31,12 @@ class ConfigurationTracer { public: static void TraceConfiguration ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration, const char* pMessage); #ifdef DEBUG static void TraceBoundResources ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId>& rxResourceId, + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration, + const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const int nIndentation); #endif }; diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index c4f569109684..090eed3cf4fe 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -29,13 +29,13 @@ namespace sd { namespace framework { GenericConfigurationChangeRequest::GenericConfigurationChangeRequest ( const Reference<XResourceId>& rxResourceId, - const Mode eMode) throw(::com::sun::star::lang::IllegalArgumentException) + const Mode eMode) throw(css::lang::IllegalArgumentException) : GenericConfigurationChangeRequestInterfaceBase(MutexOwner::maMutex), mxResourceId(rxResourceId), meMode(eMode) { if ( ! rxResourceId.is() || rxResourceId->getResourceURL().isEmpty()) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest() throw() diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index 612c9ac6118f..f7cf7e6235a0 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -32,8 +32,8 @@ namespace { typedef ::cppu::WeakComponentImplHelper < - ::com::sun::star::drawing::framework::XConfigurationChangeRequest, - ::com::sun::star::container::XNamed + css::drawing::framework::XConfigurationChangeRequest, + css::container::XNamed > GenericConfigurationChangeRequestInterfaceBase; } // end of anonymous namespace. @@ -65,10 +65,10 @@ public: resource. */ GenericConfigurationChangeRequest ( - const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& + const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const Mode eMode) - throw (::com::sun::star::lang::IllegalArgumentException); + throw (css::lang::IllegalArgumentException); virtual ~GenericConfigurationChangeRequest() throw(); @@ -82,9 +82,8 @@ public: The configuration to which the requested change is made. */ virtual void SAL_CALL execute ( - const ::com::sun::star::uno::Reference< - com::sun::star::drawing::framework::XConfiguration>& rxConfiguration) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration) + throw (css::uno::RuntimeException, std::exception) override; // XNamed @@ -92,13 +91,13 @@ public: debugging purposes. */ virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ virtual void SAL_CALL setName (const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: const css::uno::Reference<css::drawing::framework::XResourceId> mxResourceId; diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index e3a780a60daa..38536b848fdc 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -109,7 +109,7 @@ ResourceId::~ResourceId() OUString SAL_CALL ResourceId::getResourceURL() - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { if (!maResourceURLs.empty()) return maResourceURLs[0]; @@ -119,7 +119,7 @@ OUString SAL_CALL util::URL SAL_CALL ResourceId::getFullResourceURL() - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { if (mpURL.get() != NULL) return *mpURL; @@ -521,9 +521,9 @@ void ResourceId::ParseResourceURL() } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_framework_ResourceID_get_implementation(::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_framework_ResourceID_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::framework::ResourceId()); } diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index b21de13177fa..248267a313b9 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -29,8 +29,8 @@ namespace { typedef ::cppu::WeakComponentImplHelper < - ::com::sun::star::drawing::framework::XConfigurationChangeRequest, - ::com::sun::star::container::XNamed + css::drawing::framework::XConfigurationChangeRequest, + css::container::XNamed > UpdateRequestInterfaceBase; } // end of anonymous namespace. @@ -56,9 +56,8 @@ public: // XConfigurationChangeOperation virtual void SAL_CALL execute ( - const ::com::sun::star::uno::Reference< - com::sun::star::drawing::framework::XConfiguration>& rxConfiguration) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration) + throw (css::uno::RuntimeException, std::exception) override; // XNamed @@ -66,13 +65,13 @@ public: debugging purposes. */ virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ virtual void SAL_CALL setName (const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 9d9c7959e0b2..a74bc4cfc37f 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -440,9 +440,9 @@ void BasicPaneFactory::ThrowIfDisposed() const } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_framework_BasicPaneFactory_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_framework_BasicPaneFactory_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::framework::BasicPaneFactory(context)); } diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index cba8afb1d346..1ca070918096 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -173,9 +173,9 @@ void BasicToolBarFactory::ThrowIfDisposed() const } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_framework_BasicToolBarFactory_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_framework_BasicToolBarFactory_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::framework::BasicToolBarFactory(context)); } diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index 4a79431373ec..8093c2ba9df6 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -57,14 +57,14 @@ class BasicToolBarFactory { public: explicit BasicToolBarFactory ( - const css::uno::Reference<com::sun::star::uno::XComponentContext>& rxContext); + const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~BasicToolBarFactory(); virtual void SAL_CALL disposing() override; // ToolBarFactory - virtual css::uno::Reference<com::sun::star::drawing::framework::XResource> SAL_CALL + virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxToolBarId) @@ -72,14 +72,14 @@ public: virtual void SAL_CALL releaseResource ( - const css::uno::Reference<com::sun::star::drawing::framework::XResource>& + const css::uno::Reference<css::drawing::framework::XResource>& rxToolBar) throw (css::uno::RuntimeException, std::exception) override; // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence<com::sun::star::uno::Any>& aArguments) + const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // lang::XEventListener diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index dee1ae7c07a4..3f6b1defdec5 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -533,9 +533,9 @@ void BasicViewFactory::ActivateCenterView ( } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_framework_BasicViewFactory_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_framework_BasicViewFactory_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::framework::BasicViewFactory(context)); } diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index 8bd9a98122c2..e90d184d3d9d 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -34,7 +34,7 @@ namespace { typedef ::cppu::ImplInheritanceHelper < ::sd::framework::Pane, - ::com::sun::star::lang::XEventListener + css::lang::XEventListener > ChildWindowPaneInterfaceBase; } // end of anonymous namespace. @@ -52,8 +52,7 @@ class ChildWindowPane { public: ChildWindowPane ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId>& rxPaneId, + const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, sal_uInt16 nChildWindowId, ViewShellBase& rViewShellBase, ::std::unique_ptr<SfxShell> && pShell); @@ -77,9 +76,9 @@ public: /** The local getWindow() first calls GetWindow() to provide a valid window pointer before forwarding the call to the base class. */ - virtual ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow> + virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() @@ -87,11 +86,11 @@ public: // XEventListener virtual void SAL_CALL disposing( - const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> mxPaneId; + css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId; sal_uInt16 mnChildWindowId; ViewShellBase& mrViewShellBase; ::std::unique_ptr<SfxShell> mpShell; diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index 9df800d5869c..10961ccd1547 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -34,8 +34,7 @@ class FrameWindowPane { public: FrameWindowPane ( - const ::com::sun::star::uno::Reference< - com::sun::star::drawing::framework::XResourceId>& rxPaneId, + const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, vcl::Window* pWindow); virtual ~FrameWindowPane() throw(); @@ -44,7 +43,7 @@ public: Therefore this method always returns <FALSE/>. */ virtual sal_Bool SAL_CALL isAnchorOnly() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 1ebbb73d4f25..fdb0c37b77c3 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -201,7 +201,7 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas() // common: first any is VCL pointer to window (for VCL canvas) aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow)); aArg[1] = Any(); - aArg[2] = makeAny(::com::sun::star::awt::Rectangle()); + aArg[2] = makeAny(css::awt::Rectangle()); aArg[3] = makeAny(sal_False); aArg[4] = makeAny(mxWindow); diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index 4a73329b0d5e..fa0ade96ec17 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -74,9 +74,9 @@ public: DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); protected: - virtual ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> + virtual css::uno::Reference<css::rendering::XCanvas> CreateCanvas() - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index c2efde53fd9f..16e168dde94e 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -54,8 +54,8 @@ public: // XInitialization virtual void SAL_CALL initialize( - const ::com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArguments) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::uno::Any>& aArguments) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; }; typedef ::cppu::WeakComponentImplHelper <XView> PresentationViewInterfaceBase; @@ -231,9 +231,9 @@ void SAL_CALL PresentationFactoryProvider::initialize( } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_framework_PresentationFactoryProvider_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_framework_PresentationFactoryProvider_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::framework::PresentationFactoryProvider(context)); } diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 2b3e80501a92..888de15bcc67 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -121,7 +121,7 @@ sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly() //----- XSelectionSupplier -------------------------------------------------- -sal_Bool SAL_CALL ViewShellWrapper::select( const ::com::sun::star::uno::Any& aSelection ) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ViewShellWrapper::select( const css::uno::Any& aSelection ) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if (!mpSlideSorterViewShell) return false; diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx index 8cf9dd07519e..15058be2de68 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx @@ -31,7 +31,7 @@ namespace { typedef ::cppu::WeakComponentImplHelper < - ::com::sun::star::drawing::framework::XConfigurationChangeListener + css::drawing::framework::XConfigurationChangeListener > CenterViewFocusModuleInterfaceBase; } // end of anonymous namespace. @@ -55,7 +55,7 @@ class CenterViewFocusModule { public: explicit CenterViewFocusModule ( - ::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController); + css::uno::Reference<css::frame::XController>& rxController); virtual ~CenterViewFocusModule(); virtual void SAL_CALL disposing() override; @@ -63,20 +63,20 @@ public: // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; // XEventListener virtual void SAL_CALL disposing ( - const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; private: class ViewShellContainer; bool mbValid; - ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfigurationController> + css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; ViewShellBase* mpBase; /** This flag indicates whether in the last configuration change cycle a @@ -90,8 +90,7 @@ private: shell to the top of the shell stack. */ void HandleNewView( - const ::com::sun::star::uno::Reference< - com::sun::star::drawing::framework::XConfiguration>& rxConfiguration); + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 8b86fca69008..8d355a6f7ad1 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -263,10 +263,10 @@ void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments) } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation( - ::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) + css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { css::uno::Reference< css::uno::XInterface > xModCont ( sd::framework::ModuleController::CreateInstance(context) ); xModCont->acquire(); diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 41ffc624c86a..455ddd384ddc 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -30,7 +30,7 @@ namespace { typedef ::cppu::WeakComponentImplHelper < - ::com::sun::star::drawing::framework::XConfigurationChangeListener + css::drawing::framework::XConfigurationChangeListener > ResourceManagerInterfaceBase; } // end of anonymous namespace. @@ -49,10 +49,8 @@ class ResourceManager { public: ResourceManager ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController>& rxController, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId>& rxResourceId); + const css::uno::Reference<css::frame::XController>& rxController, + const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId); virtual ~ResourceManager(); /** Remember the given URL as one of a center pane view for which to @@ -67,17 +65,17 @@ public: // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; // XEventListener virtual void SAL_CALL disposing ( - const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; protected: - ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfigurationController> + css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; private: @@ -94,13 +92,11 @@ private: void HandleMainViewSwitch ( const OUString& rsViewURL, - const ::com::sun::star::uno::Reference< - com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration, const bool bIsActivated); void HandleResourceRequest( bool bActivation, - const ::com::sun::star::uno::Reference< - com::sun::star::drawing::framework::XConfiguration>& rxConfiguration); + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration); void UpdateForMainViewShell(); }; diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 1e19d650659b..0cb11c0899b7 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -55,7 +55,7 @@ namespace { //----- CallbackCaller -------------------------------------------------------- typedef ::cppu::WeakComponentImplHelper < - ::com::sun::star::drawing::framework::XConfigurationChangeListener + css::drawing::framework::XConfigurationChangeListener > CallbackCallerInterfaceBase; /** A CallbackCaller registers as listener at an XConfigurationController @@ -112,7 +112,7 @@ private: //----- LifetimeController ---------------------------------------------------- typedef ::cppu::WeakComponentImplHelper < - ::com::sun::star::lang::XEventListener + css::lang::XEventListener > LifetimeControllerInterfaceBase; /** This class helps controlling the lifetime of the @@ -287,7 +287,7 @@ public: namespace { typedef ::cppu::WeakComponentImplHelper < - ::com::sun::star::lang::XEventListener + css::lang::XEventListener > FrameworkHelperDisposeListenerInterfaceBase; } diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 0bffcd8cb5e1..2f27d91b2495 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -51,8 +51,8 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& const SvxNumberFormat& rSrcLevel = aNumRule.GetLevel(nLevel); SvxNumberFormat aNewLevel( rSrcLevel ); - if(rSrcLevel.GetNumberingType() != com::sun::star::style::NumberingType::CHAR_SPECIAL && - rSrcLevel.GetNumberingType() != com::sun::star::style::NumberingType::NUMBER_NONE ) + if(rSrcLevel.GetNumberingType() != css::style::NumberingType::CHAR_SPECIAL && + rSrcLevel.GetNumberingType() != css::style::NumberingType::NUMBER_NONE ) { // if enumeration instead bullet is chosen, adjust bullet font to template font @@ -100,7 +100,7 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& aNewLevel.SetBulletFont(&aMyFont); aNumRule.SetLevel(nLevel, aNewLevel ); } - else if( rSrcLevel.GetNumberingType() == com::sun::star::style::NumberingType::CHAR_SPECIAL ) + else if( rSrcLevel.GetNumberingType() == css::style::NumberingType::CHAR_SPECIAL ) { aNewLevel.SetPrefix(""); aNewLevel.SetSuffix(""); diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 3fda2e13d3b5..fb7a29e0fe8a 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -199,7 +199,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) if( bFirst ) bFirst = false; else - pCreated->setNodeType( ::com::sun::star::presentation::EffectNodeType::WITH_PREVIOUS ); + pCreated->setNodeType( css::presentation::EffectNodeType::WITH_PREVIOUS ); } } } diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 53a31f8cbad7..b7d6c754890c 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -230,16 +230,6 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj ) pObj->NbcRotate( pObj->GetSnapRect().Center(), nAngle, sin( a ), cos( a ) ); } bAttributesAppliedFromGallery = true; - - /* - com::sun::star::uno::Any aAny; - if ( ((SdrCustomShapeGeometryItem&)pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )).QueryValue( aAny ) ) - { - aGeometryItem.PutValue( aAny ); - pObj->SetMergedItem( aGeometryItem ); - bAttributesAppliedFromGallery = sal_True; - } - */ } } } diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 9536ad9b432e..4918f20ac6a2 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -251,7 +251,7 @@ bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) // calling SetVerticalWriting() again since this item may not yet // be set at the object and thus may differ from vertical state of // the object. - aSet.Put(SvxWritingModeItem(com::sun::star::text::WritingMode_TB_RL, SDRATTR_TEXTDIRECTION)); + aSet.Put(SvxWritingModeItem(css::text::WritingMode_TB_RL, SDRATTR_TEXTDIRECTION)); pObj->SetMergedItemSet(aSet); } diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 6e2c856cbb97..4c7a3819072f 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -205,7 +205,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& ) std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( mpViewShell->GetActiveWindow() )); if ( pDlg ) { - ::com::sun::star::datatransfer::DataFlavor aFlavor; + css::datatransfer::DataFlavor aFlavor; pDlg->Insert( SotClipboardFormatId::EMBED_SOURCE, OUString() ); pDlg->Insert( SotClipboardFormatId::LINK_SOURCE, OUString() ); diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 6108d772bb63..f4bed84fd778 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -225,7 +225,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) aNewAttr.Put( aBoxItem ); aNewAttr.Put( SvxFrameDirectionItem( - mpDoc->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, + mpDoc->GetDefaultWritingMode() == css::text::WritingMode_RL_TB ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) ); // Retrieve page-data for dialog @@ -473,7 +473,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) if( SfxItemState::SET == pTempSet->GetItemState( EE_PARA_WRITINGDIR, false, &pItem ) ) { sal_uInt32 nVal = static_cast<const SvxFrameDirectionItem*>(pItem)->GetValue(); - mpDoc->SetDefaultWritingMode( nVal == FRMDIR_HORI_RIGHT_TOP ? ::com::sun::star::text::WritingMode_RL_TB : ::com::sun::star::text::WritingMode_LR_TB ); + mpDoc->SetDefaultWritingMode( nVal == FRMDIR_HORI_RIGHT_TOP ? css::text::WritingMode_RL_TB : css::text::WritingMode_LR_TB ); } mpDoc->SetChanged(); diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 1969d3378cc2..9f5bf097aff3 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -87,11 +87,11 @@ class AccessibleDocumentViewBase public AccessibleComponentBase, public AccessibleSelectionBase, public IAccessibleViewForwarderListener, - public ::com::sun::star::beans::XPropertyChangeListener, - public ::com::sun::star::awt::XWindowListener, - public ::com::sun::star::awt::XFocusListener - ,public ::com::sun::star::accessibility::XAccessibleExtendedAttributes - ,public com::sun::star::accessibility::XAccessibleGetAccFlowTo + public css::beans::XPropertyChangeListener, + public css::awt::XWindowListener, + public css::awt::XFocusListener, + public css::accessibility::XAccessibleExtendedAttributes, + public css::accessibility::XAccessibleGetAccFlowTo { public: //===== internal ======================================================== @@ -111,10 +111,8 @@ public: AccessibleDocumentViewBase ( ::sd::Window* pSdWindow, ::sd::ViewShell* pViewShell, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController>& rxController, - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent); + const css::uno::Reference<css::frame::XController>& rxController, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent); virtual ~AccessibleDocumentViewBase(); @@ -141,51 +139,48 @@ public: //===== XAccessibleContext ============================================== - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** This implementation returns either 1 or 0 depending on whether there is an active accessible OLE object or not. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** This implementation either returns the active accessible OLE object if it exists and the given index is 0 or throws an exception. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; //===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint (const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint (const css::awt::Point& aPoint) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; //===== XInterface ====================================================== - virtual com::sun::star::uno::Any SAL_CALL - queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL + queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() @@ -201,58 +196,58 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XTypeProvider =================================================== - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; //===== XPropertyChangeListener ========================================= virtual void SAL_CALL - propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + propertyChange (const css::beans::PropertyChangeEvent& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; //===== XWindowListener ================================================= virtual void SAL_CALL - windowResized (const ::com::sun::star::awt::WindowEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + windowResized (const css::awt::WindowEvent& e) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - windowMoved (const ::com::sun::star::awt::WindowEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + windowMoved (const css::awt::WindowEvent& e) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - windowShown (const ::com::sun::star::lang::EventObject& e) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + windowShown (const css::lang::EventObject& e) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - windowHidden (const ::com::sun::star::lang::EventObject& e) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + windowHidden (const css::lang::EventObject& e) + throw (css::uno::RuntimeException, std::exception) override; //===== XFocusListener ================================================= - virtual void SAL_CALL focusGained (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL focusLost (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained (const css::awt::FocusEvent& e) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusLost (const css::awt::FocusEvent& e) + throw (css::uno::RuntimeException, std::exception) override; //----------------------------xAttribute---------------------------- - virtual com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + virtual css::uno::Any SAL_CALL getExtendedAttributes() + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; ::sd::ViewShell* mpViewShell; private: @@ -262,34 +257,34 @@ private: implGetMutex() override; // return ourself as context in default case - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > implGetAccessibleContext() - throw ( ::com::sun::star::uno::RuntimeException ) override; + throw ( css::uno::RuntimeException ) override; // return sal_False in default case virtual bool implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; // return nothing in default case virtual void implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; protected: /// The core window that is made accessible. VclPtr< ::sd::Window> mpWindow; /// The API window that is made accessible. - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> + css::uno::Reference< css::awt::XWindow> mxWindow; /// The controller of the window in which this view is displayed. - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController> + css::uno::Reference< css::frame::XController> mxController; /// Model of the document. - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XModel> + css::uno::Reference < css::frame::XModel> mxModel; // Bundle of information that is passed down the shape tree. @@ -301,8 +296,7 @@ protected: /** Accessible OLE object. Set or removed by the <member>SetAccessibleOLEObject</member> method. */ - ::com::sun::star::uno::Reference < - ::com::sun::star::accessibility::XAccessible> + css::uno::Reference< css::accessibility::XAccessible> mxAccessibleOLEObject; Link<VclWindowEvent&,void> maWindowLink; @@ -319,7 +313,7 @@ protected: */ virtual OUString CreateAccessibleName () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Create a description string. The current description is not modified and, therefore, no events are send. This method is usually @@ -330,7 +324,7 @@ protected: */ virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** This method is called when (after) the frame containing this document has been activated. Can be used to send FOCUSED state @@ -361,20 +355,19 @@ protected: accessible OLE object (if there is one) is removed. */ void SetAccessibleOLEObject ( - const ::com::sun::star::uno::Reference < - ::com::sun::star::accessibility::XAccessible>& xOLEObject); + const css::uno::Reference<css::accessibility::XAccessible>& xOLEObject); //===== XAccessibleGetAccFromXShape ============================================ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - SAL_CALL getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + css::uno::Sequence< css::uno::Any > + SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) + throw ( css::uno::RuntimeException, std::exception ) override; public: void SwitchViewActivated() { Activated(); } virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void impl_dispose(); }; diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 26a202ae64f2..d8ff9e469392 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -36,17 +36,15 @@ namespace accessibility { */ class AccessibleDrawDocumentView : public AccessibleDocumentViewBase - ,public ::com::sun::star::accessibility::XAccessibleGroupPosition + ,public css::accessibility::XAccessibleGroupPosition { public: //===== internal ======================================================== AccessibleDrawDocumentView (::sd::Window* pSdWindow, ::sd::ViewShell* pViewShell, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController>& rxController, - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent); + const css::uno::Reference<css::frame::XController>& rxController, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent); virtual ~AccessibleDrawDocumentView(); @@ -63,33 +61,33 @@ public: virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; //===== XPropertyChangeListener ========================================= virtual void SAL_CALL - propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + propertyChange (const css::beans::PropertyChangeEvent& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; //===== XInterface ====================================================== - virtual com::sun::star::uno::Any SAL_CALL - queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL + queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() @@ -100,12 +98,12 @@ public: throw () override; //===== XAccessibleGroupPosition ========================================= - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL - getGroupPosition( const ::com::sun::star::uno::Any& rAny ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; - virtual OUString SAL_CALL getObjectLink( const ::com::sun::star::uno::Any& accoject ) - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< sal_Int32 > SAL_CALL + getGroupPosition( const css::uno::Any& rAny ) + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; + virtual OUString SAL_CALL getObjectLink( const css::uno::Any& accoject ) + throw (css::uno::RuntimeException, std::exception) override; protected: @@ -114,15 +112,15 @@ protected: virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual bool implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; /** Select or deselect the specified child or all children if the given index has the special value ACCESSIBLE_SELECTION_CHILD_ALL. @@ -139,7 +137,7 @@ protected: */ virtual void implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; private: ::sd::ViewShell* mpSdViewSh; @@ -161,14 +159,14 @@ protected: /// Create an accessible name that contains the current view mode. virtual OUString CreateAccessibleName () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Create an accessible description that contains the current view mode. */ virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Make sure that the currently focused shape sends a FOCUSED state change event indicating that it has (regained) the focus. @@ -183,10 +181,10 @@ protected: virtual void impl_dispose() override; //===== XAccessibleGetAccFromXShape ============================================ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - SAL_CALL getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Sequence< css::uno::Any > + SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) + throw ( css::uno::RuntimeException, std::exception ) override; + css::uno::Reference< css::accessibility::XAccessible > GetSelAccContextInTable(); private: diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 8aa312c21f57..b6f73a360b55 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -41,10 +41,8 @@ public: AccessibleOutlineView ( ::sd::Window* pSdWindow, ::sd::OutlineViewShell* pViewShell, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController>& rxController, - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent); + const css::uno::Reference<css::frame::XController>& rxController, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent); virtual ~AccessibleOutlineView(); @@ -61,27 +59,25 @@ public: virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleEventBroadcaster ======================================== virtual void SAL_CALL addAccessibleEventListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessibleEventListener >& xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeAccessibleEventListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessibleEventListener >& xListener) + throw (css::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== @@ -89,19 +85,19 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; //===== XPropertyChangeListener ========================================= virtual void SAL_CALL - propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + propertyChange (const css::beans::PropertyChangeEvent& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; protected: @@ -121,13 +117,13 @@ protected: /// Create an accessible name that contains the current view mode. virtual OUString CreateAccessibleName () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Create an accessible description that contains the current /// view mode. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 36f1e7372394..3027d752aa13 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -60,10 +60,8 @@ public: would not keep a strong reference to the new object. */ AccessiblePageShape ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage>& rxPage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::drawing::XDrawPage>& rxPage, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, const AccessibleShapeTreeInfo& rShapeTreeInfo, long nIndex = -1); @@ -90,43 +88,42 @@ public: @raises IndexOutOfBoundsException Throws always an exception because there are no children. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; //===== XAccessibleComponent ============================================ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XComponent ====================================================== virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& Source) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& Source) + throw (css::uno::RuntimeException, std::exception) override; using AccessibleShape::disposing; @@ -135,20 +132,19 @@ protected: */ virtual OUString CreateAccessibleBaseName() - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; virtual OUString CreateAccessibleName() - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; private: - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage> mxPage; + css::uno::Reference<css::drawing::XDrawPage> mxPage; AccessiblePageShape (const AccessiblePageShape&) = delete; AccessibleShape& operator= (const AccessiblePageShape&) = delete; diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index 06a8b0f9cc87..649e969d136f 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -43,21 +43,21 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole () throw (css::uno::RuntimeException, std::exception) override; }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 90eacf4dd386..85027aa953c4 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -43,21 +43,21 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole () throw (css::uno::RuntimeException, std::exception) override; }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index 6df14a57a7b1..47873007a327 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -42,19 +42,19 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; OUString GetStyle() override; private: diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 6889b5341224..e269e643309c 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -40,11 +40,11 @@ class SlideSorter; namespace accessibility { typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::lang::XServiceInfo > AccessibleSlideSorterObjectBase; + css::accessibility::XAccessible, + css::accessibility::XAccessibleEventBroadcaster, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleComponent, + css::lang::XServiceInfo > AccessibleSlideSorterObjectBase; /** This class makes page objects of the slide sorter accessible. */ @@ -63,8 +63,7 @@ public: The number of the page in the range [0,nPageCount). */ AccessibleSlideSorterObject( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference<css::accessibility::XAccessible >& rxParent, ::sd::slidesorter::SlideSorter& rSlideSorter, sal_uInt16 nPageNumber); virtual ~AccessibleSlideSorterObject(); @@ -79,104 +78,101 @@ public: void FireAccessibleEvent ( short nEventId, - const ::com::sun::star::uno::Any& rOldValue, - const ::com::sun::star::uno::Any& rNewValue); + const css::uno::Any& rOldValue, + const css::uno::Any& rNewValue); virtual void SAL_CALL disposing() override; //===== XAccessible ======================================================= - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL addAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessibleEventListener >& rxListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessibleEventListener >& rxListener ) + throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::lang::Locale SAL_CALL + virtual css::lang::Locale SAL_CALL getLocale() - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) override; + throw (css::uno::RuntimeException, + css::accessibility::IllegalAccessibleComponentStateException, std::exception) override; //===== XAccessibleComponent ================================================ virtual sal_Bool SAL_CALL containsPoint ( - const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( - const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== @@ -184,23 +180,22 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> mxParent; + css::uno::Reference<css::accessibility::XAccessible> mxParent; sal_uInt16 mnPageNumber; ::sd::slidesorter::SlideSorter& mrSlideSorter; sal_uInt32 mnClientId; @@ -211,7 +206,7 @@ private: foul deed. */ void ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the state of being disposed). diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index e9fbf8785fd9..1cedfc86f12b 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -46,12 +46,12 @@ namespace accessibility { class AccessibleSlideSorterObject; typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleSelection, - ::com::sun::star::lang::XServiceInfo + css::accessibility::XAccessible, + css::accessibility::XAccessibleEventBroadcaster, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleSelection, + css::lang::XServiceInfo > AccessibleSlideSorterViewBase; /** This class makes the SlideSorterViewShell accessible. It uses objects @@ -65,7 +65,7 @@ class AccessibleSlideSorterView public: AccessibleSlideSorterView( ::sd::slidesorter::SlideSorter& rSlideSorter, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> & rxParent, + const css::uno::Reference< css::accessibility::XAccessible> & rxParent, vcl::Window* pParentWindow); void Init(); @@ -79,8 +79,8 @@ public: void FireAccessibleEvent ( short nEventId, - const ::com::sun::star::uno::Any& rOldValue, - const ::com::sun::star::uno::Any& rNewValue); + const css::uno::Any& rOldValue, + const css::uno::Any& rNewValue); virtual void SAL_CALL disposing() override; @@ -92,79 +92,76 @@ public: //===== XAccessible ======================================================= - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL addAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener ) + throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or throw exception. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; /// Return a reference to the parent. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current name. virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return NULL to indicate that an empty relation set. - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the set of current states. - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ - virtual ::com::sun::star::lang::Locale SAL_CALL + virtual css::lang::Locale SAL_CALL getLocale() - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) override; + throw (css::uno::RuntimeException, + css::accessibility::IllegalAccessibleComponentStateException, std::exception) override; //===== XAccessibleComponent ================================================ @@ -173,89 +170,88 @@ public: inside this object. */ virtual sal_Bool SAL_CALL containsPoint ( - const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint) + throw (css::uno::RuntimeException, std::exception) override; /** The default implementation returns an empty reference. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( - const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint) + throw (css::uno::RuntimeException, std::exception) override; /** The default implementation returns an empty rectangle. */ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() + throw (css::uno::RuntimeException, std::exception) override; /** The default implementation uses the result of <member>getBounds</member> to determine the location. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() + throw (css::uno::RuntimeException, std::exception) override; /** The default implementation returns an empty position, i.e. the - * result of the default constructor of <type>com::sun::star::awt::Point</type>. + * result of the default constructor of <type>css::awt::Point</type>. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() + throw (css::uno::RuntimeException, std::exception) override; /** The default implementation uses the result of <member>getBounds</member> to determine the size. */ - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; /** The default implementation does nothing. */ virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns black as the default foreground color. */ virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns white as the default background color. */ virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleSelection ============================================== virtual void SAL_CALL selectAccessibleChild (sal_Int32 nChildIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearAccessibleSelection( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== @@ -263,19 +259,19 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; void SwitchViewActivated(); private: @@ -284,8 +280,7 @@ private: ::sd::slidesorter::SlideSorter& mrSlideSorter; - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> mxParent; + css::uno::Reference<css::accessibility::XAccessible> mxParent; sal_uInt32 mnClientId; @@ -297,7 +292,7 @@ private: foul deed. */ void ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the state of being disposed). diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index 6e1e6f35717e..892636a5123b 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -31,7 +31,7 @@ namespace sd { namespace { typedef ::cppu::WeakComponentImplHelper < - ::com::sun::star::view::XRenderable + css::view::XRenderable > DocumentRendererInterfaceBase; } diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 96e5a73f6556..04d13a58e9b9 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -45,13 +45,13 @@ namespace sd { typedef ::cppu::ImplInheritanceHelper < SfxBaseController, - ::com::sun::star::view::XSelectionSupplier, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::drawing::XDrawView, - ::com::sun::star::view::XSelectionChangeListener, - ::com::sun::star::view::XFormLayerAccess, - ::com::sun::star::drawing::framework::XControllerManager, - ::com::sun::star::lang::XUnoTunnel + css::view::XSelectionSupplier, + css::lang::XServiceInfo, + css::drawing::XDrawView, + css::view::XSelectionChangeListener, + css::view::XFormLayerAccess, + css::drawing::framework::XControllerManager, + css::lang::XUnoTunnel > DrawControllerInterfaceBase; class BroadcastHelperOwner @@ -139,11 +139,11 @@ public: */ void BroadcastContextChange() const; void NotifyAccUpdate(); - void fireChangeLayer( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* pCurrentLayer ) throw(); + void fireChangeLayer( css::uno::Reference< css::drawing::XLayer>* pCurrentLayer ) throw(); // change the parameter to int //void fireSwitchCurrentPage( String pageName) throw(); void fireSwitchCurrentPage( sal_Int32 pageIndex) throw(); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* mpCurrentLayer; + css::uno::Reference< css::drawing::XLayer>* mpCurrentLayer; bool IsDisposing() const { return mbDisposing; } /** Return a pointer to the ViewShellBase object that the DrawController @@ -161,77 +161,77 @@ public: */ void ReleaseViewShellBase(); - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XController - virtual sal_Bool SAL_CALL suspend( sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL suspend( sal_Bool Suspend ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XFormLayerAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getFormController( const css::uno::Reference< css::form::XForm >& Form ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isFormDesignMode( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (css::uno::RuntimeException, std::exception) override; // XControlAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl( const css::uno::Reference< css::awt::XControlModel >& xModel ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; // XDrawView virtual void SAL_CALL setCurrentPage ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xPage) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::drawing::XDrawPage >& xPage) + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage > SAL_CALL + virtual css::uno::Reference< + css::drawing::XDrawPage > SAL_CALL getCurrentPage() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // lang::XEventListener virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; // view::XSelectionChangeListener virtual void SAL_CALL - selectionChanged (const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + selectionChanged (const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; // XControllerManager virtual css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL getConfigurationController() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::drawing::framework::XModuleController> SAL_CALL getModuleController() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) + throw (css::uno::RuntimeException, std::exception) override; protected: /** This method must return the name to index table. This table @@ -240,14 +240,14 @@ protected: virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; static void FillPropertyTable ( - ::std::vector< ::com::sun::star::beans::Property>& rProperties); + ::std::vector< css::beans::Property>& rProperties); /** * The same as getFastProperyValue, but return the value through * rValue and nHandle is always valid. */ virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const override; /** Convert the value rValue and return the result in rConvertedValue and the @@ -265,31 +265,31 @@ protected: @throws IllegalArgumentException */ virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any & rConvertedValue, - ::com::sun::star::uno::Any & rOldValue, + css::uno::Any & rConvertedValue, + css::uno::Any & rOldValue, sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) + throw (css::lang::IllegalArgumentException) override; /** The same as setFastProperyValue, but no exception is thrown and nHandle is always valid. You must not broadcast the changes in this method. */ virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) override; /** When the called object has been disposed already this method throws a Disposed exception and does not return. */ void ThrowIfDisposed() const - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); using cppu::OPropertySetHelper::disposing; using cppu::OPropertySetHelper::getFastPropertyValue; private: - const ::com::sun::star::uno::Type m_aSelectionTypeIdentifier; + const css::uno::Type m_aSelectionTypeIdentifier; /** This pointer to the ViewShellBase can be NULL (after a call to ReleaseViewShellBase()). @@ -324,8 +324,8 @@ private: */ void FirePropertyChange ( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rNewValue, - const ::com::sun::star::uno::Any& rOldValue); + const css::uno::Any& rNewValue, + const css::uno::Any& rOldValue); void ProvideFrameworkControllers(); void DisposeFrameworkControllers(); diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 8bc84918d9dc..93817ef99384 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -78,7 +78,7 @@ public: void UpdateRefDevice(); virtual void Activate( bool bMDI ) override; virtual void Deactivate( bool bMDI ) override; - virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override; + virtual bool InitNew( const css::uno::Reference< css::embed::XStorage >& xStorage ) override; virtual bool ImportFrom(SfxMedium &rMedium, css::uno::Reference<css::text::XTextRange> const& xInsertPosition) override; @@ -86,7 +86,7 @@ public: virtual bool Save() override; virtual bool SaveAsOwnFormat( SfxMedium& rMedium ) override; virtual bool ConvertTo( SfxMedium &rMedium ) override; - virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override; + virtual bool SaveCompleted( const css::uno::Reference< css::embed::XStorage >& xStorage ) override; virtual bool Load( SfxMedium &rMedium ) override; virtual bool LoadFrom( SfxMedium& rMedium ) override; diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 4b6d4530f8ec..612e0bf8a7fd 100644 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -27,19 +27,19 @@ namespace sd { class DrawSubControllerInterfaceBase : public ::cppu::WeakComponentImplHelper< - ::com::sun::star::drawing::XDrawSubController, - ::com::sun::star::lang::XServiceInfo > + css::drawing::XDrawSubController, + css::lang::XServiceInfo > { public: DrawSubControllerInterfaceBase( ::osl::Mutex& aMutex ) : ::cppu::WeakComponentImplHelper< - ::com::sun::star::drawing::XDrawSubController, - ::com::sun::star::lang::XServiceInfo >( aMutex ) {} + css::drawing::XDrawSubController, + css::lang::XServiceInfo >( aMutex ) {} // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override = 0; }; } diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 971c5dcd2274..54527dddd9d7 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -298,7 +298,7 @@ public: */ virtual void ShowUIControls (bool bVisible = true) override; - void ScannerEvent( const ::com::sun::star::lang::EventObject& rEventObject ); + void ScannerEvent( const css::lang::EventObject& rEventObject ); bool IsLayerModeActive() const { return mbIsLayerModeActive;} @@ -307,8 +307,8 @@ public: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ) override; - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; virtual void VisAreaChanged(const Rectangle& rRect) override; @@ -319,8 +319,7 @@ public: @return Returns an <type>AccessibleDrawDocumentView</type> object. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessibleDocumentView (::sd::Window* pWindow) override; /** Return the number of layers managed by the layer tab control. This @@ -465,10 +464,10 @@ private: SdPage* pPage, const sal_Int32 nInsertPosition = -1) override; - ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager2 > mxScannerManager; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxScannerListener; - TransferableClipboardListener* mpClipEvtLstnr; - bool mbPastePossible; + css::uno::Reference< css::scanner::XScannerManager2 > mxScannerManager; + css::uno::Reference< css::lang::XEventListener > mxScannerListener; + TransferableClipboardListener* mpClipEvtLstnr; + bool mbPastePossible; virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint) override; diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index dea23ec839f4..c13aee245fa2 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -165,8 +165,8 @@ public: void SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAllShapes); bool IsNavigatorShowingAllShapes() const { return mbIsNavigatorShowingAllShapes;} - void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); - void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); + void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ); + void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ); private: sal_uInt16 mnRefCount; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 7b512d98e43d..dcf2a5a72646 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -114,8 +114,8 @@ public: sal_uLong Read(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat); - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; /** this method is called when the visible area of the view from this viewshell is changed */ virtual void VisAreaChanged(const Rectangle& rRect) override; @@ -127,8 +127,7 @@ public: @return Returns an <type>AccessibleDrawDocumentView</type> object. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessibleDocumentView (::sd::Window* pWindow) override; OUString m_StrOldPageName; diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index ed9181ed1bb3..890abd34e4fc 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -94,9 +94,9 @@ public: css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; protected: bool getMasterPageMode() const throw(); @@ -109,23 +109,23 @@ public: The returned value may be empty when the internal state of this view is not valid (like during destruction.) */ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> getActiveLayer() throw (); + css::uno::Reference< css::drawing::XLayer> getActiveLayer() throw (); protected: /** Make the specified object the active layer. @param rxLayer The new layer object. */ - void setActiveLayer (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>& rxLayer) throw (css::uno::RuntimeException, std::exception); + void setActiveLayer (const css::uno::Reference< css::drawing::XLayer>& rxLayer) throw (css::uno::RuntimeException, std::exception); void SetZoom( sal_Int16 nZoom ); sal_Int16 GetZoom() const; - void SetViewOffset(const com::sun::star::awt::Point& rWinPos ); - com::sun::star::awt::Point GetViewOffset() const; + void SetViewOffset(const css::awt::Point& rWinPos ); + css::awt::Point GetViewOffset() const; void SetZoomType( sal_Int16 nType ); - ::com::sun::star::uno::Any getDrawViewMode() const; + css::uno::Any getDrawViewMode() const; private: DrawViewShell& mrDrawViewShell; diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 5c050409ea3d..c5566ee2c5de 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -86,9 +86,9 @@ public: css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; private: OutlineViewShell& mrOutlineViewShell; diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index a592e65bf1cc..2188291bf9e4 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -44,12 +44,12 @@ public: // XSelectionSupplier - virtual sal_Bool SAL_CALL select (const ::com::sun::star::uno::Any& aSelection) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL select (const css::uno::Any& aSelection) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection() + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) @@ -62,12 +62,12 @@ public: // XDrawView virtual void SAL_CALL setCurrentPage ( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::drawing::XDrawPage >& xPage) + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getCurrentPage() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XFastPropertySet @@ -87,9 +87,9 @@ public: css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; private: slidesorter::SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index d49b06e3e9d6..880612c94b23 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -148,7 +148,7 @@ public: /** Return the XController object of the main view. */ - ::com::sun::star::uno::Reference<com::sun::star::frame::XController> + css::uno::Reference<css::frame::XController> GetXController() const; /** Return the ViewShellBase object. @@ -217,7 +217,7 @@ private: std::unique_ptr<controller::SlideSorterController> mpSlideSorterController; std::unique_ptr<model::SlideSorterModel> mpSlideSorterModel; std::unique_ptr<view::SlideSorterView> mpSlideSorterView; - ::com::sun::star::uno::WeakReference<com::sun::star::frame::XController> mxControllerWeak; + css::uno::WeakReference<css::frame::XController> mxControllerWeak; ViewShell* mpViewShell; ViewShellBase* mpViewShellBase; VclPtr<sd::Window> mpContentWindow; diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index cb9683151fbb..71f95de44bc8 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -181,11 +181,10 @@ public: @return Returns an <type>AccessibleSlideSorterView</type> object. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessibleDocumentView (::sd::Window* pWindow) override; // handle SlideSorterView specially because AccessibleSlideSorterView doesn't inherit from AccessibleDocumentViewBase - virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ) override; + virtual void SwitchViewFireFocus( css::uno::Reference< css::accessibility::XAccessible > xAcc ) override; SlideSorter& GetSlideSorter() const; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index ed1cc64d400a..17f40d7ddb3e 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -188,11 +188,11 @@ private: InitializeFolderScanning(), GatherFolderList(), ScanFolder(), InitializeEntryScanning(), and ScanEntry(). */ - com::sun::star::uno::Reference<com::sun::star::ucb::XContent> mxTemplateRoot; - com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> mxFolderEnvironment; - com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> mxEntryEnvironment; - com::sun::star::uno::Reference<com::sun::star::sdbc::XResultSet> mxFolderResultSet; - com::sun::star::uno::Reference<com::sun::star::sdbc::XResultSet> mxEntryResultSet; + css::uno::Reference<css::ucb::XContent> mxTemplateRoot; + css::uno::Reference<css::ucb::XCommandEnvironment> mxFolderEnvironment; + css::uno::Reference<css::ucb::XCommandEnvironment> mxEntryEnvironment; + css::uno::Reference<css::sdbc::XResultSet> mxFolderResultSet; + css::uno::Reference<css::sdbc::XResultSet> mxEntryResultSet; /** Obtain the root folder of the template folder hierarchy. The result is stored in mxTemplateRoot for later use. diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index c7c74024ab4a..184f4095a45c 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -120,15 +120,12 @@ public: sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRPAGE_NOTFOUND); - ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable> + css::uno::Reference<css::datatransfer::XTransferable> CreateClipboardDataObject (::sd::View*, vcl::Window& rWindow); - ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable> + css::uno::Reference<css::datatransfer::XTransferable> CreateDragDataObject (::sd::View*, vcl::Window& rWindow, const Point& rDragPos); - ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable> + css::uno::Reference<css::datatransfer::XTransferable> CreateSelectionDataObject (::sd::View*, vcl::Window& rWindow); void UpdateSelectionClipboard( bool bForceDeselect ); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 75bd01ba80a0..e01f558408b0 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -277,8 +277,8 @@ public: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); + virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ); + virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ); /** this method is called when the visible area of the view from this viewshell is changed */ virtual void VisAreaChanged(const Rectangle& rRect); @@ -291,11 +291,10 @@ public: @return This default implementation returns an empty reference. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessibleDocumentView (::sd::Window* pWindow); - virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ); + virtual void SwitchViewFireFocus( css::uno::Reference< css::accessibility::XAccessible > xAcc ); void SwitchActiveViewFireFocus( ); // Move these two methods from DrawViewShell to enable slide show view void NotifyAccUpdate(); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index f4971ed6f94b..1bb2395b221e 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -130,7 +130,7 @@ public: /** Return a new renderer that can be used for example for printing the document. */ - virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable() override; + virtual css::uno::Reference<css::view::XRenderable> GetRenderable() override; /// Forwarded to the print manager. virtual SfxPrinter* GetPrinter (bool bCreate = false) override; @@ -142,8 +142,7 @@ public: /// Forward methods to main sub shell. virtual void WriteUserDataSequence ( - ::com::sun::star::uno::Sequence < - ::com::sun::star::beans::PropertyValue >&, + css::uno::Sequence< css::beans::PropertyValue >&, bool bBrowse = false) override; /** Pass the given properties to the main view shell. After that we @@ -151,8 +150,7 @@ public: pane. */ virtual void ReadUserDataSequence ( - const ::com::sun::star::uno::Sequence < - ::com::sun::star::beans::PropertyValue >&, + const css::uno::Sequence< css::beans::PropertyValue >&, bool bBrowse = false) override; virtual void UIActivating( SfxInPlaceClient* ) override; diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index e77b13200406..d6dba60a3235 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -41,10 +41,10 @@ namespace sd { namespace { typedef ::cppu::WeakComponentImplHelper < - ::com::sun::star::drawing::framework::XToolBar, - ::com::sun::star::drawing::framework::XTabBar, - ::com::sun::star::drawing::framework::XConfigurationChangeListener, - ::com::sun::star::lang::XUnoTunnel + css::drawing::framework::XToolBar, + css::drawing::framework::XTabBar, + css::drawing::framework::XConfigurationChangeListener, + css::lang::XUnoTunnel > ViewTabBarInterfaceBase; } @@ -58,10 +58,8 @@ class ViewTabBar { public: ViewTabBar ( - const ::com::sun::star::uno::Reference< - com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController>& rxController); + const css::uno::Reference< css::drawing::framework::XResourceId>& rxViewTabBarId, + const css::uno::Reference< css::frame::XController>& rxController); virtual ~ViewTabBar(); virtual void SAL_CALL disposing() override; @@ -74,55 +72,55 @@ public: virtual void SAL_CALL notifyConfigurationChange ( - const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing( - const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; //----- XTabBar ----------------------------------------------------------- virtual void SAL_CALL addTabBarButtonAfter ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton, - const ::com::sun::star::drawing::framework::TabBarButton& rAnchor) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::drawing::framework::TabBarButton& rButton, + const css::drawing::framework::TabBarButton& rAnchor) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL appendTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::drawing::framework::TabBarButton& rButton) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::drawing::framework::TabBarButton& rButton) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::drawing::framework::TabBarButton& rButton) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> + virtual css::uno::Sequence<css::drawing::framework::TabBarButton> SAL_CALL getTabBarButtons() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //----- XResource --------------------------------------------------------- - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::drawing::framework::XResourceId> SAL_CALL getResourceId() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAnchorOnly() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //----- XUnoTunnel -------------------------------------------------------- - virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) + throw (css::uno::RuntimeException, std::exception) override; /** The returned value is calculated as the difference between the total height of the control and the heigh of its first tab page. @@ -136,33 +134,30 @@ public: int GetHeight(); void AddTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton, - const ::com::sun::star::drawing::framework::TabBarButton& rAnchor); + const css::drawing::framework::TabBarButton& rButton, + const css::drawing::framework::TabBarButton& rAnchor); void AddTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton); + const css::drawing::framework::TabBarButton& rButton); void RemoveTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton); + const css::drawing::framework::TabBarButton& rButton); bool HasTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton); - ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> + const css::drawing::framework::TabBarButton& rButton); + css::uno::Sequence<css::drawing::framework::TabBarButton> GetTabBarButtons(); private: VclPtr< ::TabControl> mpTabControl; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController> mxController; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfigurationController> mxConfigurationController; - typedef ::std::vector<com::sun::star::drawing::framework::TabBarButton> TabBarButtonList; + css::uno::Reference<css::frame::XController> mxController; + css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; + typedef ::std::vector<css::drawing::framework::TabBarButton> TabBarButtonList; TabBarButtonList maTabBarButtons; VclPtr<TabPage> mpTabPage; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId> mxViewTabBarId; + css::uno::Reference<css::drawing::framework::XResourceId> mxViewTabBarId; ViewShellBase* mpViewShellBase; void UpdateActiveButton(); void AddTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton, + const css::drawing::framework::TabBarButton& rButton, sal_Int32 nPosition); void UpdateTabBarButtons(); @@ -172,11 +167,9 @@ private: members. */ static vcl::Window* GetAnchorWindow( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController>& rxController); - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewTabBarId, + const css::uno::Reference<css::frame::XController>& rxController); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index b01dd28f50cf..2aa190be8d4a 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -186,8 +186,7 @@ protected: The returned reference is empty if an accessible object could not be created. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; OUString GetSurroundingText() const override; diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 0793a1ad52d7..b7eb8aa2dc34 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -35,13 +35,13 @@ class SdPagesField : public SvxMetricField { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + css::uno::Reference< css::frame::XFrame > m_xFrame; protected: virtual void Modify() override; public: SdPagesField( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); virtual ~SdPagesField(); diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 824a0eca1e36..8fd3988cd6f1 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -57,7 +57,7 @@ public: bool GetStartWithFlag() const; bool IsDocEmpty() const; - com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword(); + css::uno::Sequence< css::beans::NamedValue > GetPassword(); }; #endif diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index f723bd0bb272..d916d61cb83d 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -33,8 +33,8 @@ namespace { typedef ::cppu::WeakComponentImplHelper < - ::com::sun::star::drawing::framework::XConfiguration, - ::com::sun::star::container::XNamed, + css::drawing::framework::XConfiguration, + css::container::XNamed, css::lang::XServiceInfo > ConfigurationInterfaceBase; @@ -78,8 +78,7 @@ public: then events with type "ResourceActivationEvent" and "ResourceDeactivationEvent" are broadcasted. */ - Configuration (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, + Configuration (const css::uno::Reference<css::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents); virtual ~Configuration(); @@ -88,33 +87,32 @@ public: // XConfiguration virtual void SAL_CALL addResource ( - const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& + const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeResource( - const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& + const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< com::sun::star::uno::Reference< - com::sun::star::drawing::framework::XResourceId> > SAL_CALL getResources ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId>& rxAnchorId, + virtual css::uno::Sequence< css::uno::Reference< + css::drawing::framework::XResourceId> > SAL_CALL getResources ( + const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId, const OUString& rsResourceURLPrefix, - ::com::sun::star::drawing::framework::AnchorBindingMode eMode) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + css::drawing::framework::AnchorBindingMode eMode) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasResource ( - const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& + const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XCloneable - virtual ::com::sun::star::uno::Reference<com::sun::star::util::XCloneable> + virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XNamed @@ -122,13 +120,13 @@ public: debugging purposes. */ virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ virtual void SAL_CALL setName (const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -149,8 +147,7 @@ private: /** The broadcaster used for notifying listeners of requests for configuration changes. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster> + css::uno::Reference<css::drawing::framework::XConfigurationControllerBroadcaster> mxBroadcaster; bool mbBroadcastRequestEvents; @@ -161,8 +158,7 @@ private: The new Configuration is created with a copy of the elements in this container. */ - Configuration (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, + Configuration (const css::uno::Reference<css::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents, const ResourceContainer& rResourceContainer); @@ -177,15 +173,14 @@ private: into account when the actual event type field is determined. */ void PostEvent ( - const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& - rxResourceId, + const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const bool bActivation); /** When the called object has already been disposed this method throws an exception and does not return. */ void ThrowIfDisposed() const - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); }; /** Return whether the two given configurations contain the same resource @@ -193,10 +188,8 @@ private: treated like empty configurations. */ bool AreConfigurationsEquivalent ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration1, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration2); + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration1, + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration2); } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/DrawModule.hxx b/sd/source/ui/inc/framework/DrawModule.hxx index 114da1f35d89..bad14263be72 100644 --- a/sd/source/ui/inc/framework/DrawModule.hxx +++ b/sd/source/ui/inc/framework/DrawModule.hxx @@ -31,7 +31,7 @@ class DrawModule { public: static void Initialize ( - ::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController); + css::uno::Reference<css::frame::XController>& rxController); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/ImpressModule.hxx b/sd/source/ui/inc/framework/ImpressModule.hxx index ea3b9a372781..548f3fca7690 100644 --- a/sd/source/ui/inc/framework/ImpressModule.hxx +++ b/sd/source/ui/inc/framework/ImpressModule.hxx @@ -31,7 +31,7 @@ class ImpressModule { public: static void Initialize ( - ::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController); + css::uno::Reference<css::frame::XController>& rxController); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index c8b4bfcf0487..30d7133e1ac3 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -36,9 +36,9 @@ namespace vcl { class Window; } namespace { typedef ::cppu::WeakComponentImplHelper < - ::com::sun::star::drawing::framework::XPane, - ::com::sun::star::drawing::framework::XPane2, - ::com::sun::star::lang::XUnoTunnel + css::drawing::framework::XPane, + css::drawing::framework::XPane2, + css::lang::XUnoTunnel > PaneInterfaceBase; } // end of anonymous namespace. @@ -72,15 +72,14 @@ public: NULL. */ Pane ( - const ::com::sun::star::uno::Reference< - com::sun::star::drawing::framework::XResourceId>& rxPaneId, + const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, vcl::Window* pWindow) throw (); virtual ~Pane(); virtual void SAL_CALL disposing() override; - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); /** This method is typically used together with the XUnoTunnel to obtain a Window pointer from an XPane object. @@ -118,40 +117,40 @@ public: //----- XResource --------------------------------------------------------- - virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** For the typical pane it makes no sense to be displayed without a view. Therefore this default implementation returns always <TRUE/>. */ virtual sal_Bool SAL_CALL isAnchorOnly() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //----- XUnoTunnel -------------------------------------------------------- - virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) + throw (css::uno::RuntimeException, std::exception) override; protected: - ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> mxPaneId; + css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId; VclPtr<vcl::Window> mpWindow; - ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow> mxWindow; - ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> mxCanvas; + css::uno::Reference<css::awt::XWindow> mxWindow; + css::uno::Reference<css::rendering::XCanvas> mxCanvas; /** Override this method, not getCanvas(), when you want to provide a different canvas. */ - virtual ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> + virtual css::uno::Reference<css::rendering::XCanvas> CreateCanvas() - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); /** Throw DisposedException when the object has already been disposed or is currently being disposed. Otherwise this method returns normally. */ void ThrowIfDisposed() const - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/PresentationModule.hxx b/sd/source/ui/inc/framework/PresentationModule.hxx index 9fc40abdc6b1..45c2858f07b5 100644 --- a/sd/source/ui/inc/framework/PresentationModule.hxx +++ b/sd/source/ui/inc/framework/PresentationModule.hxx @@ -31,7 +31,7 @@ class PresentationModule { public: static void Initialize ( - ::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController); + css::uno::Reference<css::frame::XController>& rxController); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 6a6b875e981f..a79d49850d8c 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -34,11 +34,11 @@ namespace { -typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::awt::XWindowListener - , ::com::sun::star::view::XSelectionSupplier - , ::com::sun::star::drawing::framework::XRelocatableResource - , ::com::sun::star::drawing::framework::XView +typedef ::cppu::WeakComponentImplHelper < css::lang::XUnoTunnel + , css::awt::XWindowListener + , css::view::XSelectionSupplier + , css::drawing::framework::XRelocatableResource + , css::drawing::framework::XView > ViewShellWrapperInterfaceBase; } // end of anonymous namespace. @@ -69,15 +69,14 @@ public: */ ViewShellWrapper ( ::std::shared_ptr<ViewShell> pViewShell, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId>& rxViewId, - const ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow>& rxWindow); + const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, + const css::uno::Reference<css::awt::XWindow>& rxWindow); virtual ~ViewShellWrapper(); virtual void SAL_CALL disposing() override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); /** This method is typically used together with the XUnoTunnel interface to obtain a pointer to the wrapped ViewShell object for a given @@ -87,63 +86,63 @@ public: // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) + throw (css::uno::RuntimeException, std::exception) override; // XResource - virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAnchorOnly() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection() - throw (::com::sun::star::uno::RuntimeException, + virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection() + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; // XRelocatableResource virtual sal_Bool SAL_CALL relocateToAnchor ( - const ::com::sun::star::uno::Reference< - com::sun::star::drawing::framework::XResource>& xResource) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::drawing::framework::XResource>& xResource) + throw (css::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized( - const ::com::sun::star::awt::WindowEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::WindowEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved( - const ::com::sun::star::awt::WindowEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::WindowEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown( - const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden( - const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; // XEventListener virtual void SAL_CALL disposing( - const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; private: - ::std::shared_ptr< ViewShell > mpViewShell; - ::std::shared_ptr< ::sd::slidesorter::SlideSorterViewShell > mpSlideSorterViewShell; - const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId > mxViewId; - ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow > mxWindow; + ::std::shared_ptr< ViewShell > mpViewShell; + ::std::shared_ptr< ::sd::slidesorter::SlideSorterViewShell > mpSlideSorterViewShell; + const css::uno::Reference< css::drawing::framework::XResourceId > mxViewId; + css::uno::Reference<css::awt::XWindow > mxWindow; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index c246db628af8..b2ba189aefc5 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -62,7 +62,7 @@ protected: sal_uInt16 nEditMode; - ::com::sun::star::uno::Any maTargets; // used for creating a path for custom animations + css::uno::Any maTargets; // used for creating a path for custom animations }; } // end of namespace sd diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index 766ba66b122b..2ce910acc08e 100644 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -79,8 +79,8 @@ protected: SdrHdl* pHdl; bool bSuppressChangesOfSelection; bool bMirrorSide0; - sal_uInt16 nEditMode; - ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; + sal_uInt16 nEditMode; + css::uno::Reference< css::media::XPlayer > mxPlayer; private: /** This pointer stores a canidate for assigning a style in the water diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index 7ff199dc6a1a..864cd1c02ba7 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -31,10 +31,10 @@ enum class SdrEscapeDirection; class GlueEscDirLB : public ListBox { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + css::uno::Reference< css::frame::XFrame > m_xFrame; public: GlueEscDirLB( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + const css::uno::Reference< css::frame::XFrame >& rFrame ); virtual ~GlueEscDirLB(); virtual void Select() override; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index d50bad692452..6a9383a7f912 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -50,12 +50,11 @@ public: SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree ); virtual ~SdOptionsItem(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override; + virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( - const ::com::sun::star::uno::Sequence< OUString >& rNames ); - bool PutProperties( const com::sun::star::uno::Sequence< OUString >& rNames, - const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues ); + css::uno::Sequence< css::uno::Any > GetProperties( const css::uno::Sequence< OUString >& rNames ); + bool PutProperties( const css::uno::Sequence< OUString >& rNames, + const css::uno::Sequence< css::uno::Any>& rValues ); void SetModified(); }; @@ -65,14 +64,14 @@ friend class SdOptionsItem; private: - OUString maSubTree; + OUString maSubTree; SdOptionsItem* mpCfgItem; - sal_uInt16 mnConfigId; + sal_uInt16 mnConfigId; bool mbInit : 1; bool mbEnableModify : 1; SAL_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; - SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< OUString > GetPropertyNames() const; + SAL_DLLPRIVATE css::uno::Sequence< OUString > GetPropertyNames() const; protected: @@ -82,8 +81,8 @@ protected: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const = 0; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; + virtual bool ReadData( const css::uno::Any* pValues ) = 0; + virtual bool WriteData( css::uno::Any* pValues ) const = 0; public: @@ -114,8 +113,8 @@ private: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; + virtual bool ReadData( const css::uno::Any* pValues ) override; + virtual bool WriteData( css::uno::Any* pValues ) const override; public: SdOptionsLayout( sal_uInt16 nConfigId, bool bUseConfig ); @@ -163,8 +162,8 @@ private: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; + virtual bool ReadData( const css::uno::Any* pValues ) override; + virtual bool WriteData( css::uno::Any* pValues ) const override; public: @@ -233,8 +232,8 @@ private: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; + virtual bool ReadData( const css::uno::Any* pValues ) override; + virtual bool WriteData( css::uno::Any* pValues ) const override; public: @@ -352,8 +351,8 @@ private: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; + virtual bool ReadData( const css::uno::Any* pValues ) override; + virtual bool WriteData( css::uno::Any* pValues ) const override; public: @@ -412,8 +411,8 @@ private: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; + virtual bool ReadData( const css::uno::Any* pValues ) override; + virtual bool WriteData( css::uno::Any* pValues ) const override; public: @@ -431,8 +430,8 @@ class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; + virtual bool ReadData( const css::uno::Any* pValues ) override; + virtual bool WriteData( css::uno::Any* pValues ) const override; public: @@ -503,8 +502,8 @@ private: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; + virtual bool ReadData( const css::uno::Any* pValues ) override; + virtual bool WriteData( css::uno::Any* pValues ) const override; public: diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 132b5ed843f3..4136f4973aed 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -199,7 +199,7 @@ public: virtual ~SdPublishingDlg(); virtual void dispose() override; - void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ); + void GetParameterSequence( css::uno::Sequence< css::beans::PropertyValue >& rParams ); }; #endif // INCLUDED_SD_SOURCE_UI_INC_PUBDLG_HXX diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 98d721df962e..b134c54d5278 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -76,8 +76,8 @@ public: ::sd::DrawDocShell& GetDocShell() const { return mrDocShell;} NavigatorDragType GetDragType() const { return meDragType;} - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - static SdPageObjsTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + static SdPageObjsTransferable* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw(); /** Return a temporary transferable data flavor that is used internally in the navigator for reordering entries. Its lifetime ends with the office application. @@ -100,7 +100,7 @@ public: SAL_DLLPRIVATE virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; SAL_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ) override; - SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; }; friend class SdPageObjsTLB::SdPageObjsTransferable; @@ -125,13 +125,13 @@ protected: SfxMedium* mpOwnMedium; Image maImgOle; Image maImgGraphic; - bool mbLinkableSelected; + bool mbLinkableSelected; OUString maDocName; ::sd::DrawDocShellRef mxBookmarkDocShRef; ///< for the loading of bookmarks VclPtr<SdNavigatorWin> mpDropNavWin; SfxViewFrame* mpFrame; std::vector<OUString> maTreeItem; - bool mbSaveTreeItemState; + bool mbSaveTreeItemState; OUString maSelectionEntryText; // DragSourceHelper @@ -184,12 +184,12 @@ public: SdPageObjsTLB( vcl::Window* pParent, const SdResId& rSdResId ); SdPageObjsTLB( vcl::Window* pParent, WinBits nStyle ); virtual ~SdPageObjsTLB(); - virtual void dispose() override; + virtual void dispose() override; // helper function for GetEntryAltText and GetEntryLongDescription - OUString getAltLongDescText( SvTreeListEntry* pEntry , bool isAltText) const; - OUString GetEntryAltText( SvTreeListEntry* pEntry ) const override; - OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const override; + OUString getAltLongDescText( SvTreeListEntry* pEntry , bool isAltText) const; + OUString GetEntryAltText( SvTreeListEntry* pEntry ) const override; + OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const override; virtual void SelectHdl() override; virtual void KeyInput( const KeyEvent& rKEvt ) override; diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 8117608669c2..76a636999fd0 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -66,16 +66,16 @@ public: void SetPageBookmarks( const std::vector<OUString>& rPageBookmarks, bool bPersistent ); bool IsPageTransferable() const { return mbPageTransferable; } bool HasPageBookmarks() const { return( mpPageDocShell && ( !maPageBookmarks.empty() ) ); } - const std::vector<OUString>& GetPageBookmarks() const { return maPageBookmarks; } - ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } + const std::vector<OUString>& GetPageBookmarks() const { return maPageBookmarks; } + ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } - bool SetTableRTF( SdDrawDocument*, const ::com::sun::star::datatransfer::DataFlavor& ); + bool SetTableRTF( SdDrawDocument*, const css::datatransfer::DataFlavor& ); - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - static SdTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + static SdTransferable* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; virtual void DragFinished( sal_Int8 nDropAction ) override; SdDrawDocument* GetSourceDoc() const { return mpSourceDoc;} @@ -105,11 +105,11 @@ public: protected: virtual void AddSupportedFormats() override; - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; - virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override; virtual void ObjectReleased() override; - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; private: diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 2ee4dc9b0102..5dd55c11e7e9 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -78,7 +78,7 @@ enum AnimationMode ANIMATIONMODE_PREVIEW }; -typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::presentation::XPresentation2, ::com::sun::star::lang::XServiceInfo > SlideshowBase; +typedef ::cppu::WeakComponentImplHelper< css::presentation::XPresentation2, css::lang::XServiceInfo > SlideshowBase; class SlideShow : private ::cppu::BaseMutex, public SlideshowBase { @@ -91,11 +91,11 @@ public: static rtl::Reference< SlideShow > GetSlideShow( SdDrawDocument& rDocument ); static rtl::Reference< SlideShow > GetSlideShow( ViewShellBase& rBase ); - static ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > GetSlideShowController(ViewShellBase& rBase ); + static css::uno::Reference< css::presentation::XSlideShowController > GetSlideShowController(ViewShellBase& rBase ); static bool StartPreview( ViewShellBase& rBase, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, - const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, + const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, + const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode, vcl::Window* pParent = 0 ); static void Stop( ViewShellBase& rBase ); @@ -110,8 +110,8 @@ public: // helper api bool startPreview( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, - const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, + const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, + const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode, vcl::Window* pParent = 0 ); // uno api @@ -119,32 +119,32 @@ public: virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XPresentation - virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL start( ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL end() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rehearseTimings( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rehearseTimings( ) throw (css::uno::RuntimeException, std::exception) override; // XPresentation2 - virtual void SAL_CALL startWithArguments(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL startWithArguments(const css::uno::Sequence< css::beans::PropertyValue >& Arguments) + throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isRunning( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SAL_CALL getController( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::presentation::XSlideShowController > SAL_CALL getController( ) throw (css::uno::RuntimeException, std::exception) override; // legacy api diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 8f5c1c640ee7..686cda2d217f 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -82,10 +82,8 @@ public: OUString GetTitle() const { return msTitle; } - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessibleObject ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent); + css::uno::Reference<css::accessibility::XAccessible > CreateAccessibleObject ( + const css::uno::Reference<css::accessibility::XAccessible>& rxParent); private: TitleBarType meType; diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index ddd3b39ae998..923046dcfba1 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -72,8 +72,7 @@ public: virtual void ArrangeGUIElements() override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessibleDocumentView (::sd::Window* pWindow) override; virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() override; diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index 740d9b9f90ba..3e36728855d8 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -101,13 +101,13 @@ public: protected: /** Return the requested property value. - @throw com::sun::star::beans::UnknownPropertyException when the + @throw css::beans::UnknownPropertyException when the property is not supported. */ virtual css::uno::Any GetPropertyValue (const OUString& rsPropertyName) = 0; /** Set the given property value. @return the old value. - @throw com::sun::star::beans::UnknownPropertyException when the + @throw css::beans::UnknownPropertyException when the property is not supported. */ virtual css::uno::Any SetPropertyValue ( diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 4a373dd074b8..019b675c1a52 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -33,7 +33,7 @@ namespace sd { namespace tools { typedef cppu::WeakComponentImplHelper< - ::com::sun::star::frame::XStatusListener + css::frame::XStatusListener > SlotStateListenerInterfaceBase; /** Listen for state changes of slots. This class has been created in order @@ -52,8 +52,7 @@ public: */ SlotStateListener ( Link<const OUString&,void>& rCallback, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatchProvider>& rxDispatchProvider, + const css::uno::Reference<css::frame::XDispatchProvider>& rxDispatchProvider, const OUString& rSlotName); /** The constructor de-registers all remaining listeners. Usually a prior @@ -74,8 +73,7 @@ public: @throws DisposedException */ void ConnectToDispatchProvider ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatchProvider>& rxDispatchProvider); + const css::uno::Reference<css::frame::XDispatchProvider>& rxDispatchProvider); /** Observe the slot specified by the given name. Note that ConnectToFrame() has to have been called earlier. @@ -94,14 +92,14 @@ public: */ virtual void SAL_CALL statusChanged ( - const ::com::sun::star::frame::FeatureStateEvent& rState) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::frame::FeatureStateEvent& rState) + throw (css::uno::RuntimeException, std::exception) override; //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + disposing(const css::lang::EventObject& rEvent) + throw(css::uno::RuntimeException, std::exception) override; protected: /** This method is called by the WeakComponentImplHelper base class in @@ -116,11 +114,10 @@ private: /** Remember the URLs that describe slots whose state changes we are listening to. */ - typedef ::std::vector<com::sun::star::util::URL> RegisteredURLList; + typedef ::std::vector<css::util::URL> RegisteredURLList; RegisteredURLList maRegisteredURLList; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::frame::XDispatchProvider> mxDispatchProviderWeak; + css::uno::WeakReference<css::frame::XDispatchProvider> mxDispatchProviderWeak; /** Deregister all currently active state change listeners. */ @@ -130,17 +127,17 @@ private: disposed. */ void ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); /** Transform the given string into a URL object. */ - static ::com::sun::star::util::URL MakeURL (const OUString& rSlotName); + static css::util::URL MakeURL (const OUString& rSlotName); /** Return an XDispatch object for the given URL. */ - ::com::sun::star::uno::Reference<com::sun::star::frame::XDispatch> + css::uno::Reference<css::frame::XDispatch> GetDispatch ( - const ::com::sun::star::util::URL& rURL) const; + const css::util::URL& rURL) const; }; } } // end of namespace ::sd::tools diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index fe951ddb4715..ecc407fdf5fe 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -74,7 +74,7 @@ private: XColorListRef pColList; bool bTreeUpdated; - std::vector<com::sun::star::presentation::ClickAction> maCurrentActions; + std::vector<css::presentation::ClickAction> maCurrentActions; OUString aLastFile; ::std::vector< long > aVerbVector; @@ -85,11 +85,11 @@ private: void UpdateTree(); void OpenFileDialog(); - ::com::sun::star::presentation::ClickAction GetActualClickAction(); - void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); + css::presentation::ClickAction GetActualClickAction(); + void SetActualClickAction( css::presentation::ClickAction eCA ); void SetEditText( OUString const & rStr ); OUString GetEditText( bool bURL = false ); - static sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); + static sal_uInt16 GetClickActionSdResId( css::presentation::ClickAction eCA ); public: SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index db677346b332..330e9a0f4b63 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -47,24 +47,24 @@ class SdAnimationPrmsUndoAction : public SdUndoAction bool bNewPlayFull; bool bOldSecondPlayFull; bool bNewSecondPlayFull; - ::com::sun::star::presentation::AnimationEffect eOldEffect; - ::com::sun::star::presentation::AnimationEffect eNewEffect; - ::com::sun::star::presentation::AnimationEffect eOldTextEffect; - ::com::sun::star::presentation::AnimationEffect eNewTextEffect; - ::com::sun::star::presentation::AnimationSpeed eOldSpeed; - ::com::sun::star::presentation::AnimationSpeed eNewSpeed; - ::com::sun::star::presentation::AnimationEffect eOldSecondEffect; - ::com::sun::star::presentation::AnimationEffect eNewSecondEffect; - ::com::sun::star::presentation::AnimationSpeed eOldSecondSpeed; - ::com::sun::star::presentation::AnimationSpeed eNewSecondSpeed; + css::presentation::AnimationEffect eOldEffect; + css::presentation::AnimationEffect eNewEffect; + css::presentation::AnimationEffect eOldTextEffect; + css::presentation::AnimationEffect eNewTextEffect; + css::presentation::AnimationSpeed eOldSpeed; + css::presentation::AnimationSpeed eNewSpeed; + css::presentation::AnimationEffect eOldSecondEffect; + css::presentation::AnimationEffect eNewSecondEffect; + css::presentation::AnimationSpeed eOldSecondSpeed; + css::presentation::AnimationSpeed eNewSecondSpeed; Color aOldDimColor; Color aNewDimColor; OUString aOldSoundFile; OUString aNewSoundFile; SdrPathObj* pOldPathObj; SdrPathObj* pNewPathObj; - ::com::sun::star::presentation::ClickAction eOldClickAction; - ::com::sun::star::presentation::ClickAction eNewClickAction; + css::presentation::ClickAction eOldClickAction; + css::presentation::ClickAction eNewClickAction; OUString aOldBookmark; OUString aNewBookmark; sal_uInt16 nOldVerb; @@ -118,11 +118,11 @@ public: void SetActive(bool bTheOldActive, bool bTheNewActive) { bOldActive = bTheOldActive; bNewActive = bTheNewActive; } - void SetEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) + void SetEffect(css::presentation::AnimationEffect eTheOldEffect, css::presentation::AnimationEffect eTheNewEffect) { eOldEffect = eTheOldEffect; eNewEffect = eTheNewEffect; } - void SetTextEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) + void SetTextEffect(css::presentation::AnimationEffect eTheOldEffect, css::presentation::AnimationEffect eTheNewEffect) { eOldTextEffect = eTheOldEffect; eNewTextEffect = eTheNewEffect; } - void SetSpeed(::com::sun::star::presentation::AnimationSpeed eTheOldSpeed, ::com::sun::star::presentation::AnimationSpeed eTheNewSpeed) + void SetSpeed(css::presentation::AnimationSpeed eTheOldSpeed, css::presentation::AnimationSpeed eTheNewSpeed) { eOldSpeed = eTheOldSpeed; eNewSpeed = eTheNewSpeed; } void SetDim(bool bTheOldDim, bool bTheNewDim) { bOldDimPrevious = bTheOldDim; bNewDimPrevious = bTheNewDim; } @@ -138,15 +138,15 @@ public: { bOldPlayFull = bTheOldPlayFull; bNewPlayFull = bTheNewPlayFull; } void SetPathObj(SdrPathObj* pTheOldPath, SdrPathObj* pTheNewPath) { pOldPathObj = pTheOldPath; pNewPathObj = pTheNewPath; } - void SetClickAction(::com::sun::star::presentation::ClickAction eTheOldAction, ::com::sun::star::presentation::ClickAction eTheNewAction) + void SetClickAction(css::presentation::ClickAction eTheOldAction, css::presentation::ClickAction eTheNewAction) { eOldClickAction = eTheOldAction; eNewClickAction = eTheNewAction; } void SetBookmark(const OUString& aTheOldBookmark, const OUString& aTheNewBookmark) { aOldBookmark = aTheOldBookmark; aNewBookmark = aTheNewBookmark; } void SetVerb(sal_uInt16 nTheOldVerb, sal_uInt16 nTheNewVerb) { nOldVerb = nTheOldVerb; nNewVerb = nTheNewVerb; } - void SetSecondEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) + void SetSecondEffect(css::presentation::AnimationEffect eTheOldEffect, css::presentation::AnimationEffect eTheNewEffect) { eOldSecondEffect = eTheOldEffect; eNewSecondEffect = eTheNewEffect; } - void SetSecondSpeed(::com::sun::star::presentation::AnimationSpeed eTheOldSpeed, ::com::sun::star::presentation::AnimationSpeed eTheNewSpeed) + void SetSecondSpeed(css::presentation::AnimationSpeed eTheOldSpeed, css::presentation::AnimationSpeed eTheNewSpeed) { eOldSecondSpeed = eTheOldSpeed; eNewSecondSpeed = eTheNewSpeed; } void SetSecondSoundOn(bool bTheOldSoundOn, bool bTheNewSoundOn) { bOldSecondSoundOn = bTheOldSoundOn; bNewSecondSoundOn = bTheNewSoundOn; } diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 1e1d65f2d63c..68c7e7c2bea4 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -70,19 +70,19 @@ extern OUString getPageApiNameFromUiName( const OUString& rUIName ); ***********************************************************************/ class SD_DLLPUBLIC SdXImpressDocument : public SfxBaseModel, // implements SfxListener, OWEAKOBJECT & other public SvxUnoDrawMSFactory, - public ::com::sun::star::drawing::XDrawPageDuplicator, - public ::com::sun::star::drawing::XLayerSupplier, - public ::com::sun::star::drawing::XMasterPagesSupplier, - public ::com::sun::star::drawing::XDrawPagesSupplier, - public ::com::sun::star::presentation::XPresentationSupplier, - public ::com::sun::star::presentation::XCustomPresentationSupplier, - public ::com::sun::star::document::XLinkTargetSupplier, - public ::com::sun::star::beans::XPropertySet, - public ::com::sun::star::style::XStyleFamiliesSupplier, - public ::com::sun::star::lang::XServiceInfo, - public ::com::sun::star::ucb::XAnyCompareFactory, - public ::com::sun::star::presentation::XHandoutMasterSupplier, - public ::com::sun::star::view::XRenderable, + public css::drawing::XDrawPageDuplicator, + public css::drawing::XLayerSupplier, + public css::drawing::XMasterPagesSupplier, + public css::drawing::XDrawPagesSupplier, + public css::presentation::XPresentationSupplier, + public css::presentation::XCustomPresentationSupplier, + public css::document::XLinkTargetSupplier, + public css::beans::XPropertySet, + public css::style::XStyleFamiliesSupplier, + public css::lang::XServiceInfo, + public css::ucb::XAnyCompareFactory, + public css::presentation::XHandoutMasterSupplier, + public css::view::XRenderable, public vcl::ITiledRenderable { friend class SdDrawPagesAccess; @@ -103,26 +103,26 @@ private: const bool mbImpressDoc; bool mbClipBoard; - ::com::sun::star::uno::WeakReference< ::com::sun::star::drawing::XDrawPages > mxDrawPagesAccess; - ::com::sun::star::uno::WeakReference< ::com::sun::star::drawing::XDrawPages > mxMasterPagesAccess; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > mxLayerManager; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameContainer > mxCustomPresentationAccess; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > mxStyleFamilies; - ::com::sun::star::uno::WeakReference< ::com::sun::star::presentation::XPresentation > mxPresentation; - ::com::sun::star::uno::WeakReference< ::com::sun::star::i18n::XForbiddenCharacters > mxForbidenCharacters; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLinks; - - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDashTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxGradientTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxHatchTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxBitmapTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxTransGradientTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxMarkerTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDrawingPool; + css::uno::WeakReference< css::drawing::XDrawPages > mxDrawPagesAccess; + css::uno::WeakReference< css::drawing::XDrawPages > mxMasterPagesAccess; + css::uno::WeakReference< css::container::XNameAccess > mxLayerManager; + css::uno::WeakReference< css::container::XNameContainer > mxCustomPresentationAccess; + css::uno::WeakReference< css::container::XNameAccess > mxStyleFamilies; + css::uno::WeakReference< css::presentation::XPresentation > mxPresentation; + css::uno::WeakReference< css::i18n::XForbiddenCharacters > mxForbidenCharacters; + css::uno::Reference< css::container::XNameAccess > mxLinks; + + css::uno::Reference< css::uno::XInterface > mxDashTable; + css::uno::Reference< css::uno::XInterface > mxGradientTable; + css::uno::Reference< css::uno::XInterface > mxHatchTable; + css::uno::Reference< css::uno::XInterface > mxBitmapTable; + css::uno::Reference< css::uno::XInterface > mxTransGradientTable; + css::uno::Reference< css::uno::XInterface > mxMarkerTable; + css::uno::Reference< css::uno::XInterface > mxDrawingPool; const SvxItemPropertySet* mpPropSet; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; + css::uno::Sequence< css::uno::Type > maTypeSequence; OUString maBuildId; @@ -147,7 +147,7 @@ public: void SetModified( bool bModified = true ) throw(); - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XForbiddenCharacters > getForbiddenCharsTable(); + css::uno::Reference< css::i18n::XForbiddenCharacters > getForbiddenCharsTable(); // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -155,78 +155,78 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdXImpressDocument) // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XModel - virtual void SAL_CALL lockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setViewData( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lockControllers( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unlockControllers( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XDrawPageDuplicator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL duplicate( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL duplicate( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override; // XDrawPagesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(css::uno::RuntimeException, std::exception) override; // XMasterPagesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getMasterPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getMasterPages( ) throw(css::uno::RuntimeException, std::exception) override; // XLayerManagerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLayerManager( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLayerManager( ) throw(css::uno::RuntimeException, std::exception) override; // XCustomPresentationSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getCustomPresentations( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getCustomPresentations( ) throw(css::uno::RuntimeException, std::exception) override; // XHandoutMasterSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getHandoutMasterPage( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getHandoutMasterPage( ) throw (css::uno::RuntimeException, std::exception) override; // XPresentationSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation > SAL_CALL getPresentation( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::presentation::XPresentation > SAL_CALL getPresentation( ) throw(css::uno::RuntimeException, std::exception) override; // XMultiServiceFactory ( SvxUnoDrawMSFactory ) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::uno::XInterface> SAL_CALL createInstanceWithArguments( OUString const & ServiceSpecifier, css::uno::Sequence<css::uno::Any> const & Arguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks( ) throw(css::uno::RuntimeException, std::exception) override; // XStyleFamiliesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(css::uno::RuntimeException, std::exception) override; // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; // XRenderable - virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // ITiledRenderable virtual void paintTile( VirtualDevice& rDevice, @@ -273,14 +273,14 @@ public: and still has to forward the second call to the base class. See also comments of issue 27847. */ - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** * * ***********************************************************************/ -class SdDrawPagesAccess : public ::cppu::WeakImplHelper< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::container::XNameAccess, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XComponent > +class SdDrawPagesAccess : public ::cppu::WeakImplHelper< css::drawing::XDrawPages, css::container::XNameAccess, css::lang::XServiceInfo, css::lang::XComponent > { private: SdXImpressDocument* mpModel; @@ -290,38 +290,38 @@ public: virtual ~SdDrawPagesAccess() throw(); // XDrawPages - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** * * ***********************************************************************/ -class SdMasterPagesAccess : public ::cppu::WeakImplHelper< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XComponent > +class SdMasterPagesAccess : public ::cppu::WeakImplHelper< css::drawing::XDrawPages, css::lang::XServiceInfo, css::lang::XComponent > { private: SdXImpressDocument* mpModel; @@ -331,36 +331,36 @@ public: virtual ~SdMasterPagesAccess() throw(); // XDrawPages - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** * * ***********************************************************************/ -class SdDocLinkTargets : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess, - ::com::sun::star::lang::XServiceInfo , ::com::sun::star::lang::XComponent > +class SdDocLinkTargets : public ::cppu::WeakImplHelper< css::container::XNameAccess, + css::lang::XServiceInfo , css::lang::XComponent > { private: SdXImpressDocument* mpModel; @@ -370,23 +370,23 @@ public: virtual ~SdDocLinkTargets() throw(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // intern SdPage* FindPage( const OUString& rName ) const throw(std::exception); diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx index d0ea0f9ffe92..2246b597c619 100644 --- a/sd/source/ui/inc/unopage.hxx +++ b/sd/source/ui/inc/unopage.hxx @@ -48,14 +48,14 @@ struct SfxItemPropertySimpleEntry; ***********************************************************************/ class SdGenericDrawPage : public SvxFmDrawPage, public SdUnoSearchReplaceShape, - public ::com::sun::star::drawing::XShapeCombiner, - public ::com::sun::star::drawing::XShapeBinder, - public ::com::sun::star::container::XNamed, - public ::com::sun::star::beans::XPropertySet, - public ::com::sun::star::beans::XMultiPropertySet, - public ::com::sun::star::animations::XAnimationNodeSupplier, - public ::com::sun::star::office::XAnnotationAccess, - public ::com::sun::star::document::XLinkTargetSupplier + public css::drawing::XShapeCombiner, + public css::drawing::XShapeBinder, + public css::container::XNamed, + public css::beans::XPropertySet, + public css::beans::XMultiPropertySet, + public css::animations::XAnimationNodeSupplier, + public css::office::XAnnotationAccess, + public css::document::XLinkTargetSupplier { private: SdXImpressDocument* mpModel; @@ -67,8 +67,8 @@ protected: const SvxItemPropertySet* mpPropSet; - virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException, std::exception); - virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw(std::exception); + virtual void setBackground( const css::uno::Any& rValue ) throw(css::lang::IllegalArgumentException, std::exception); + virtual void getBackground( css::uno::Any& rValue ) throw(std::exception); OUString getBookmarkURL() const; void setBookmarkURL( OUString& rURL ); @@ -85,10 +85,10 @@ protected: virtual void disposing() throw() override; - ::com::sun::star::uno::Any getNavigationOrder(); - void setNavigationOrder( const ::com::sun::star::uno::Any& rValue ); + css::uno::Any getNavigationOrder(); + void setNavigationOrder( const css::uno::Any& rValue ); - void throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException ); + void throwIfDisposed() const throw (css::uno::RuntimeException ); public: SdGenericDrawPage( SdXImpressDocument* pModel, SdPage* pInPage, const SvxItemPropertySet* pSet ) throw(); @@ -100,11 +100,11 @@ public: SdPage* GetPage() const { return static_cast<SdPage*>(SvxDrawPage::mpPage); } SdXImpressDocument* GetModel() const; - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; // this is called whenever a SdrObject must be created for a empty api shape wrapper - virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) + virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override; // SvxFmDrawPage @@ -112,68 +112,68 @@ public: throw (css::uno::RuntimeException, std::exception) override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL release() throw() override; // XShapeCombiner - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL combine( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL split( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xGroup ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL combine( const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL split( const css::uno::Reference< css::drawing::XShape >& xGroup ) throw(css::uno::RuntimeException, std::exception) override; // XShapeBinder - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL bind( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unbind( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL bind( const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unbind( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XAnimationNodeSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > SAL_CALL getAnimationNode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::animations::XAnimationNode > SAL_CALL getAnimationNode( ) throw (css::uno::RuntimeException, std::exception) override; // XAnnotationAccess: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > SAL_CALL createAndInsertAnnotation() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAnnotation(const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > & annotation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationEnumeration > SAL_CALL createAnnotationEnumeration() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL createAndInsertAnnotation() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAnnotation(const css::uno::Reference< css::office::XAnnotation > & annotation) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual css::uno::Reference< css::office::XAnnotationEnumeration > SAL_CALL createAnnotationEnumeration() throw (css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** * * ***********************************************************************/ -class SdDrawPage : public ::com::sun::star::drawing::XMasterPageTarget, - public ::com::sun::star::presentation::XPresentationPage, +class SdDrawPage : public css::drawing::XMasterPageTarget, + public css::presentation::XPresentationPage, public SdGenericDrawPage { private: - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; + css::uno::Sequence< css::uno::Type > maTypeSequence; protected: - virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException) override; - virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw() override; + virtual void setBackground( const css::uno::Any& rValue ) throw(css::lang::IllegalArgumentException) override; + virtual void getBackground( css::uno::Any& rValue ) throw() override; public: SdDrawPage( SdXImpressDocument* pModel, SdPage* pInPage ) throw(); virtual ~SdDrawPage() throw(); @@ -185,42 +185,42 @@ public: static OUString getUiNameFromPageApiName( const OUString& rApiName ); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XMasterPageTarget - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getMasterPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMasterPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getMasterPage( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMasterPage( const css::uno::Reference< css::drawing::XDrawPage >& xMasterPage ) throw(css::uno::RuntimeException, std::exception) override; // XPresentationPage - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) + throw (css::uno::RuntimeException, std::exception) override; }; @@ -228,14 +228,14 @@ public: * * ***********************************************************************/ -class SdMasterPage : public ::com::sun::star::presentation::XPresentationPage, +class SdMasterPage : public css::presentation::XPresentationPage, public SdGenericDrawPage { private: - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; + css::uno::Sequence< css::uno::Type > maTypeSequence; protected: - virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw( ::com::sun::star::lang::IllegalArgumentException, std::exception ) override; - virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw (std::exception) override; + virtual void setBackground( const css::uno::Any& rValue ) throw( css::lang::IllegalArgumentException, std::exception ) override; + virtual void getBackground( css::uno::Any& rValue ) throw (std::exception) override; public: SdMasterPage( SdXImpressDocument* pModel, SdPage* pInPage ) throw(); @@ -244,38 +244,38 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdMasterPage) // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XPresentationPage - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) + throw (css::uno::RuntimeException, std::exception) override; }; @@ -284,11 +284,11 @@ public: ***********************************************************************/ #include <cppuhelper/implbase.hxx> -class SdPageLinkTargets : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess, - ::com::sun::star::lang::XServiceInfo > +class SdPageLinkTargets : public ::cppu::WeakImplHelper< css::container::XNameAccess, + css::lang::XServiceInfo > { private: - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mxPage; + css::uno::Reference< css::drawing::XDrawPage > mxPage; SdGenericDrawPage* mpUnoPage; public: @@ -299,18 +299,18 @@ public: SdrObject* FindObject( const OUString& rName ) const throw(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; }; OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ); diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index f18cd778bb40..016d3b62eeb4 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -39,34 +39,34 @@ class SvxItemPropertySet; class SdUnoSearchReplaceDescriptor; /** this class implements a search or replace operation on a given page or a given sdrobj */ -class SdUnoSearchReplaceShape : public ::com::sun::star::util::XReplaceable +class SdUnoSearchReplaceShape : public css::util::XReplaceable { protected: - ::com::sun::star::drawing::XShape* mpShape; - ::com::sun::star::drawing::XDrawPage* mpPage; + css::drawing::XShape* mpShape; + css::drawing::XDrawPage* mpPage; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > Search( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xText, SdUnoSearchReplaceDescriptor* pDescr ) throw(); + css::uno::Reference< css::text::XTextRange > Search( css::uno::Reference< css::text::XTextRange > xText, SdUnoSearchReplaceDescriptor* pDescr ) throw(); bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw(); - static ESelection GetSelection( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); - static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetShape( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetNextShape( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > xShapes, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xCurrentShape ) throw(); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetCurrentShape() const throw(); + static ESelection GetSelection( css::uno::Reference< css::text::XTextRange > xTextRange ) throw(); + static css::uno::Reference< css::drawing::XShape > GetShape( css::uno::Reference< css::text::XTextRange > xTextRange ) throw(); + css::uno::Reference< css::drawing::XShape > GetNextShape( css::uno::Reference< css::container::XIndexAccess > xShapes, css::uno::Reference< css::drawing::XShape > xCurrentShape ) throw(); + css::uno::Reference< css::drawing::XShape > GetCurrentShape() const throw(); public: // danger, this c'tor is only usable if the given shape or page is derived // from this class!!! - SdUnoSearchReplaceShape( ::com::sun::star::drawing::XDrawPage* xPage ) throw(); + SdUnoSearchReplaceShape( css::drawing::XDrawPage* xPage ) throw(); virtual ~SdUnoSearchReplaceShape() throw(); // XReplaceable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL replaceAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL replaceAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override; // XSearchable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL createSearchDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL findAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findFirst( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findNext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL findAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findFirst( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findNext( const css::uno::Reference< css::uno::XInterface >& xStartAt, const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override; }; /* ================================================================= */ @@ -74,7 +74,7 @@ public: /** this class holds the parameters and status of a search or replace operation performed by class SdUnoSearchReplaceShape */ -class SdUnoSearchReplaceDescriptor : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XUnoTunnel, ::com::sun::star::util::XReplaceDescriptor > // public ::com::sun::star::util::XSearchDescriptor, ::com::sun::star::beans::XPropertySet +class SdUnoSearchReplaceDescriptor : public ::cppu::WeakImplHelper< css::lang::XUnoTunnel, css::util::XReplaceDescriptor > // public css::util::XSearchDescriptor, css::beans::XPropertySet { protected: SvxItemPropertySet* mpPropSet; @@ -98,43 +98,43 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdUnoSearchReplaceDescriptor ) // XSearchDescriptor - virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSearchString( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSearchString( const OUString& aString ) throw(css::uno::RuntimeException, std::exception) override; // XReplaceDescriptor - virtual OUString SAL_CALL getReplaceString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getReplaceString( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; /* ================================================================= */ /** this class holds a sequence that is a result from a find all and lets people access it through the XIndexAccess Interface. */ -class SdUnoFindAllAccess : public ::cppu::WeakImplHelper< ::com::sun::star::container::XIndexAccess > // public ::com::sun::star::container::XElementAccess +class SdUnoFindAllAccess : public ::cppu::WeakImplHelper< css::container::XIndexAccess > // public css::container::XElementAccess { protected: - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > maSequence; + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > maSequence; public: - SdUnoFindAllAccess( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& rSequence ) throw(); + SdUnoFindAllAccess( css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& rSequence ) throw(); virtual ~SdUnoFindAllAccess() throw(); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNOSRCH_HXX diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 45b90299bc3b..35afe646a52f 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -985,9 +985,9 @@ void PresenterCustomSprite::ThrowIfDisposed() } } // end of namespace ::sd::presenter -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_PresenterCanvasFactory_get_implementation(::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_PresenterCanvasFactory_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::presenter::PresenterCanvas()); } diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 6316ad0ddf34..b2ff18223acb 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -157,7 +157,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( // common: first any is VCL pointer to window (for VCL canvas) aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow)); aArg[1] = Any(); - aArg[2] = makeAny(::com::sun::star::awt::Rectangle()); + aArg[2] = makeAny(css::awt::Rectangle()); aArg[3] = makeAny(sal_False); aArg[4] = makeAny(rxWindow); @@ -465,9 +465,9 @@ awt::Rectangle PresenterHelper::getWindowExtentsRelative ( } } // end of namespace ::sd::presenter -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_PresenterHelper_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_PresenterHelper_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::presenter::PresenterHelper(context)); } diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 7295472de3c1..9be1ee005d37 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -57,7 +57,7 @@ public: virtual const SdrPage* GetPage (CacheKey aKey) override; virtual std::shared_ptr<std::vector<CacheKey> > GetEntryList (bool bVisible) override; virtual sal_Int32 GetPriority (CacheKey aKey) override; - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() override; + virtual css::uno::Reference<css::uno::XInterface> GetModel() override; private: Reference<container::XIndexAccess> mxSlides; @@ -188,7 +188,7 @@ void SAL_CALL PresenterPreviewCache::resume() } void PresenterPreviewCache::ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -376,9 +376,9 @@ void PresenterPreviewCache::PresenterCacheContext::CallListeners ( } } // end of namespace ::sd::presenter -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::presenter::PresenterPreviewCache(context)); } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index e90e3f56256c..85d157264cb3 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -218,7 +218,7 @@ Any PresenterTextView::SetPropertyValue ( } void PresenterTextView::ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (PresenterTextViewInterfaceBase::rBHelper.bDisposed || PresenterTextViewInterfaceBase::rBHelper.bInDispose @@ -299,9 +299,9 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine() { LANGUAGE_ARABIC_SAUDI_ARABIA, LANGUAGE_NONE, DefaultFontType::CTL_TEXT, EE_CHAR_FONTINFO_CTL } }; - aTable[0].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN); - aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN); - aTable[2].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX); + aTable[0].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN); + aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN); + aTable[2].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX); for (int i = 0; i < 3; ++i) { @@ -518,9 +518,9 @@ void PresenterTextView::Implementation::CheckTop() } } // end of namespace ::sd::presenter -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_PresenterTextView_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_PresenterTextView_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::presenter::PresenterTextView(context)); } diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index b60da234939a..f794fe3ff506 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -198,7 +198,7 @@ BitmapEx SlideRenderer::CreatePreview ( } void SlideRenderer::ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (SlideRendererInterfaceBase::rBHelper.bDisposed || SlideRendererInterfaceBase::rBHelper.bInDispose) { @@ -210,9 +210,9 @@ void SlideRenderer::ThrowIfDisposed() } } // end of namespace ::sd::presenter -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_SlideRenderer_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_SlideRenderer_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::presenter::SlideRenderer(context)); } diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index 5ba6cfda15ab..afa7cded78d7 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -86,7 +86,7 @@ void SAL_CALL Listener::repeat( const css::uno::Reference< //----- XSlideShowListener ---------------------------------------------------- void SAL_CALL Listener::paused() - throw (com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { } @@ -145,7 +145,7 @@ void SAL_CALL Listener::disposing() void SAL_CALL Listener::disposing ( const css::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { (void) rEvent; dispose(); diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx index 284cb71f13c8..2f2ff2b861fb 100644 --- a/sd/source/ui/remotecontrol/Listener.hxx +++ b/sd/source/ui/remotecontrol/Listener.hxx @@ -56,9 +56,8 @@ public: // XEventListener virtual void SAL_CALL disposing() override; - virtual void SAL_CALL disposing ( - const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; private: rtl::Reference<Communicator> mCommunicator; diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index dc7b8cc8f4cc..892d72b98653 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -137,7 +137,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) float y = aCommand[2].toFloat(); SolarMutexGuard aSolarGuard; - const ::com::sun::star::geometry::RealPoint2D pos(x,y); + const css::geometry::RealPoint2D pos(x,y); // std::cerr << "Pointer at ("<<pos.X<<","<<pos.Y<<")" << std::endl; if (xSlideShow.is()) try @@ -196,7 +196,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) float y = aCommand[2].toFloat(); SAL_INFO( "sdremote", "Pointer at ("<<x<<","<<y<<")" ); - const ::com::sun::star::geometry::RealPoint2D pos(x,y); + const css::geometry::RealPoint2D pos(x,y); SolarMutexGuard aSolarGuard; if (xSlideShow.is()) try diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index aa66dd6c8ec2..897d95ae882a 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -132,7 +132,7 @@ private: enum InitializationState { NOT_INITIALIZED, INITIALIZING, INITIALIZED } meInitializationState; std::unique_ptr<MasterPageContainerQueue> mpRequestQueue; - ::com::sun::star::uno::Reference<com::sun::star::frame::XModel> mxModel; + css::uno::Reference<css::frame::XModel> mxModel; SdDrawDocument* mpDocument; PreviewRenderer maPreviewRenderer; /** Remember whether the first page object has already been used to @@ -519,7 +519,7 @@ MasterPageContainer::Implementation::~Implementation() { xCloseable->close(true); } - catch (const ::com::sun::star::util::CloseVetoException&) + catch (const css::util::CloseVetoException&) { } } diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index 3adab6c29a0c..a1bc5f39738e 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -157,9 +157,9 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( } } // end of namespace sd::sidebar -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -org_openoffice_comp_Draw_framework_PanelFactory_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +org_openoffice_comp_Draw_framework_PanelFactory_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::sidebar::PanelFactory(context)); } diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx index 6718f819d6bc..f96f0f839c73 100644 --- a/sd/source/ui/slideshow/PaneHider.hxx +++ b/sd/source/ui/slideshow/PaneHider.hxx @@ -50,9 +50,9 @@ private: has been modified and have to be restored. */ - ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfigurationController> + css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; - ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfiguration> + css::uno::Reference<css::drawing::framework::XConfiguration> mxConfiguration; }; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 33a487229c09..63719b59a24c 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -621,11 +621,10 @@ void ShowWindow::AddWindowToPaintView() } // Override the sd::Window's CreateAccessible to create a different accessible object -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> +css::uno::Reference<css::accessibility::XAccessible> ShowWindow::CreateAccessible() { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(false); + css::uno::Reference< css::accessibility::XAccessible > xAcc = GetAccessible(false); if (xAcc.get()) { return xAcc; diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 1803649b93d9..fec236a62d17 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -79,8 +79,7 @@ public: virtual void MouseButtonDown(const MouseEvent& rMEvt) override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; /// Override the sd::Window's CreateAccessible to create a different accessible object - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; void TerminateShow(); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index ac7132a034b7..9d91aacf43a3 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -171,7 +171,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) return GetSlideShow( rBase.GetDocument() ); } -::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SlideShow::GetSlideShowController(ViewShellBase& rBase ) +css::uno::Reference< css::presentation::XSlideShowController > SlideShow::GetSlideShowController(ViewShellBase& rBase ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); @@ -183,8 +183,8 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) } bool SlideShow::StartPreview( ViewShellBase& rBase, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, - const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, + const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, + const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode, vcl::Window* pParent /* = 0 */ ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index ba18d45b034a..60b7206cb9d3 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1516,7 +1516,7 @@ void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeExcep // XShapeEventListener -void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& /* aOriginalEvent */ ) +void SlideshowImpl::click( const Reference< XShape >& xShape, const css::awt::MouseEvent& /* aOriginalEvent */ ) { SolarMutexGuard aSolarGuard; @@ -2115,7 +2115,7 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void) SfxViewFrame* pViewFrame = getViewFrame(); if( pViewFrame ) { - Reference< ::com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() ); + Reference< css::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() ); if( xFrame.is() ) { pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, "slot:10617" , false ) ); @@ -2808,7 +2808,7 @@ sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException return mpSlideController.get() ? mpSlideController->getCurrentSlideIndex() : -1; } -// ::com::sun::star::presentation::XSlideShowController: +// css::presentation::XSlideShowController: ::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() throw (RuntimeException, std::exception) { @@ -3248,22 +3248,22 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException, std::excepti // XIndexAccess -::sal_Int32 SAL_CALL SlideshowImpl::getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SlideshowImpl::getCount( ) throw (css::uno::RuntimeException, std::exception) { return getSlideCount(); } -::com::sun::star::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { return Any( getSlideByIndex( Index ) ); } -::com::sun::star::uno::Type SAL_CALL SlideshowImpl::getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Type SAL_CALL SlideshowImpl::getElementType( ) throw (css::uno::RuntimeException, std::exception) { return cppu::UnoType<XDrawPage>::get(); } -sal_Bool SAL_CALL SlideshowImpl::hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SlideshowImpl::hasElements( ) throw (css::uno::RuntimeException, std::exception) { return getSlideCount() != 0; } @@ -3479,9 +3479,9 @@ void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::repeat, _1, boost::cref(xNode), boost::cref(nRepeat) )); } -// ::com::sun::star::presentation::XSlideShowListener: +// css::presentation::XSlideShowListener: -void SAL_CALL SlideShowListenerProxy::paused( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::paused( ) throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3489,7 +3489,7 @@ void SAL_CALL SlideShowListenerProxy::paused( ) throw (::com::sun::star::uno::R maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::paused ) ); } -void SAL_CALL SlideShowListenerProxy::resumed( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::resumed( ) throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3505,7 +3505,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeEx maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideTransitionStarted ) ); } -void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3513,7 +3513,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun: maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideTransitionEnded ) ); } -void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3556,7 +3556,7 @@ void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) thro // XEventListener -void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::EventObject& aDisposeEvent ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::disposing( const css::lang::EventObject& aDisposeEvent ) throw (RuntimeException, std::exception) { maListeners.disposeAndClear( aDisposeEvent ); mxController.clear(); @@ -3565,7 +3565,7 @@ void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::E // XShapeEventListener -void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& aOriginalEvent ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const css::awt::MouseEvent& aOriginalEvent ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; if( mxController.is() ) diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 032953001cfa..90d846d7058e 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -209,10 +209,10 @@ public: virtual css::uno::Reference< css::presentation::XSlideShow > SAL_CALL getSlideShow( ) throw (css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; // will be called from the SlideShowListenerProxy when this event is fired from the XSlideShow void slideEnded(const bool bReverse); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 7ae836be6975..9b28f8ea16fa 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -73,7 +73,7 @@ void SlideShowViewListeners::removeListener( const Reference< util::XModifyListe maListeners.erase( aIter ); } -bool SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( com::sun::star::uno::Exception ) +bool SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( css::uno::Exception ) { ::osl::MutexGuard aGuard( mrMutex ); @@ -290,7 +290,7 @@ Reference< rendering::XSpriteCanvas > SAL_CALL SlideShowView::getCanvas( ) thro return mpCanvas.get() ? mpCanvas->getUNOSpriteCanvas() : Reference< rendering::XSpriteCanvas >(); } -void SAL_CALL SlideShowView::clear() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SlideShowView::clear() throw (css::uno::RuntimeException, std::exception) { // paint background in black ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 020f0672b76a..458ee823476d 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -70,7 +70,7 @@ namespace sd { -struct WrappedMouseEvent : public ::com::sun::star::lang::EventObject +struct WrappedMouseEvent : public css::lang::EventObject { enum EventType { @@ -80,11 +80,11 @@ struct WrappedMouseEvent : public ::com::sun::star::lang::EventObject EXITED }; - EventType meType; - ::com::sun::star::awt::MouseEvent maEvent; + EventType meType; + css::awt::MouseEvent maEvent; }; -struct WrappedMouseMotionEvent : public ::com::sun::star::lang::EventObject +struct WrappedMouseMotionEvent : public css::lang::EventObject { enum EventType { @@ -92,21 +92,21 @@ struct WrappedMouseMotionEvent : public ::com::sun::star::lang::EventObject MOVED }; - EventType meType; - ::com::sun::star::awt::MouseEvent maEvent; + EventType meType; + css::awt::MouseEvent maEvent; }; // SlideShowViewListeners -typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > > ViewListenerVector; +typedef std::vector< css::uno::WeakReference< css::util::XModifyListener > > ViewListenerVector; class SlideShowViewListeners { public: SlideShowViewListeners( ::osl::Mutex& rMutex ); - void addListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& _rxListener ); - void removeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& _rxListener ); - bool notify( const ::com::sun::star::lang::EventObject& _rEvent ) throw( com::sun::star::uno::Exception ); - void disposing( const ::com::sun::star::lang::EventObject& _rEventSource ); + void addListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener ); + void removeListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener ); + bool notify( const css::lang::EventObject& _rEvent ) throw( css::uno::Exception ); + void disposing( const css::lang::EventObject& _rEventSource ); protected: ViewListenerVector maListeners; @@ -114,8 +114,8 @@ protected: }; // SlideShowViewPaintListeners -typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XPaintListener, - ::com::sun::star::awt::PaintEvent > SlideShowViewPaintListeners_Base; +typedef ::comphelper::OListenerContainerBase< css::awt::XPaintListener, + css::awt::PaintEvent > SlideShowViewPaintListeners_Base; class SlideShowViewPaintListeners : public SlideShowViewPaintListeners_Base { @@ -123,11 +123,11 @@ public: SlideShowViewPaintListeners( ::osl::Mutex& rMutex ); protected: - virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rListener, const ::com::sun::star::awt::PaintEvent& rEvent ) throw( ::com::sun::star::uno::Exception ) override; + virtual bool implTypedNotify( const css::uno::Reference< css::awt::XPaintListener >& rListener, const css::awt::PaintEvent& rEvent ) throw( css::uno::Exception ) override; }; // SlideShowViewMouseListeners -typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseListener, WrappedMouseEvent > SlideShowViewMouseListeners_Base; +typedef ::comphelper::OListenerContainerBase< css::awt::XMouseListener, WrappedMouseEvent > SlideShowViewMouseListeners_Base; class SlideShowViewMouseListeners : public SlideShowViewMouseListeners_Base { @@ -135,13 +135,13 @@ public: SlideShowViewMouseListeners( ::osl::Mutex& rMutex ); protected: - virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rListener, - const WrappedMouseEvent& rEvent ) throw( ::com::sun::star::uno::Exception ) override; + virtual bool implTypedNotify( const css::uno::Reference< css::awt::XMouseListener >& rListener, + const WrappedMouseEvent& rEvent ) throw( css::uno::Exception ) override; }; // SlideShowViewMouseMotionListeners -typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseMotionListener, +typedef ::comphelper::OListenerContainerBase< css::awt::XMouseMotionListener, WrappedMouseMotionEvent > SlideShowViewMouseMotionListeners_Base; class SlideShowViewMouseMotionListeners : public SlideShowViewMouseMotionListeners_Base @@ -150,18 +150,18 @@ public: SlideShowViewMouseMotionListeners( ::osl::Mutex& rMutex ); protected: - virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rListener, - const WrappedMouseMotionEvent& rEvent ) throw( ::com::sun::star::uno::Exception ) override; + virtual bool implTypedNotify( const css::uno::Reference< css::awt::XMouseMotionListener >& rListener, + const WrappedMouseMotionEvent& rEvent ) throw( css::uno::Exception ) override; }; // SlideShowView class ShowWindow; class SlideshowImpl; -typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::presentation::XSlideShowView, - ::com::sun::star::awt::XWindowListener, - ::com::sun::star::awt::XMouseListener, - ::com::sun::star::awt::XMouseMotionListener > SlideShowView_Base; +typedef ::cppu::WeakComponentImplHelper< css::presentation::XSlideShowView, + css::awt::XWindowListener, + css::awt::XMouseListener, + css::awt::XMouseMotionListener > SlideShowView_Base; class SlideShowView : public ::comphelper::OBaseMutex, public SlideShowView_Base @@ -176,44 +176,44 @@ public: void ignoreNextMouseReleased() { mbMousePressedEaten = true; } /// Dispose all internal references - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; /// Disposing our broadcaster - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL paint( const ::com::sun::star::awt::PaintEvent& e ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL paint( const css::awt::PaintEvent& e ) throw (css::uno::RuntimeException); // XSlideShowView methods - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::geometry::AffineMatrix2D SAL_CALL getTransformation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addTransformationChangedListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTransformationChangedListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMouseCursor( sal_Int16 nPointerShape ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clear( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMouseCursor( sal_Int16 nPointerShape ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getCanvasArea( ) throw (css::uno::RuntimeException, std::exception) override; // XWindowListener methods - virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; // XMouseListener implementation - virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; // XMouseMotionListener implementation - virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; using cppu::WeakComponentImplHelperBase::disposing; @@ -225,10 +225,10 @@ private: void updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImpl* pSlideShow ); - ::cppcanvas::SpriteCanvasSharedPtr mpCanvas; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > mxWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > mxWindowPeer; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer > mxPointer; + ::cppcanvas::SpriteCanvasSharedPtr mpCanvas; + css::uno::Reference< css::awt::XWindow > mxWindow; + css::uno::Reference< css::awt::XWindowPeer > mxWindowPeer; + css::uno::Reference< css::awt::XPointer > mxPointer; SlideshowImpl* mpSlideShow; ShowWindow& mrOutputWindow; ::std::unique_ptr< SlideShowViewListeners > @@ -246,7 +246,7 @@ private: bool mbFirstPaint; bool mbFullScreen; bool mbMousePressedEaten; - ::com::sun::star::geometry::IntegerSize2D mTranslationOffset; + css::geometry::IntegerSize2D mTranslationOffset; }; } // namespace ::sd diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 967ba30e69f2..4890d5014b2d 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -140,10 +140,10 @@ IMPL_LINK_NOARG_TYPED(CacheCompactor, CompactionCallback, Timer *, void) { Run(); } - catch (const ::com::sun::star::uno::RuntimeException&) + catch (const css::uno::RuntimeException&) { } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { } diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index 606233b38a2e..27ff28ef01d3 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -43,7 +43,7 @@ public: MultiPaneGUI/SlideSorter/PreviewCache. When the specified value does not exist then an empty Any is returned. */ - ::com::sun::star::uno::Any GetValue (const OUString& rName); + css::uno::Any GetValue (const OUString& rName); private: /** When a caller holds a reference after we have released ours we use @@ -51,8 +51,7 @@ private: */ static std::weak_ptr<CacheConfiguration> mpWeakInstance; static Timer maReleaseTimer; - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameAccess> mxCacheNode; + css::uno::Reference<css::container::XNameAccess> mxCacheNode; CacheConfiguration(); diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index b3ef313c100a..c2cc64f453f5 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -45,7 +45,7 @@ QueueProcessor::QueueProcessor ( mbIsPaused(false) { // Look into the configuration if there for overriding values. - ::com::sun::star::uno::Any aTimeBetweenReqeusts; + css::uno::Any aTimeBetweenReqeusts; aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue("TimeBetweenHighPriorityRequests"); if (aTimeBetweenReqeusts.has<sal_Int32>()) aTimeBetweenReqeusts >>= mnTimeBetweenHighPriorityRequests; @@ -171,11 +171,11 @@ void QueueProcessor::ProcessOneRequest ( } } } - catch (::com::sun::star::uno::RuntimeException &) + catch (css::uno::RuntimeException &) { OSL_FAIL("RuntimeException caught in QueueProcessor"); } - catch (::com::sun::star::uno::Exception &) + catch (css::uno::Exception &) { OSL_FAIL("Exception caught in QueueProcessor"); } diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index d6fb03b1b274..d75151ea1ebd 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -196,7 +196,7 @@ CacheKey RequestQueue::GetFront() ::osl::MutexGuard aGuard (maMutex); if (mpRequestQueue->empty()) - throw ::com::sun::star::uno::RuntimeException("RequestQueue::GetFront(): queue is empty", + throw css::uno::RuntimeException("RequestQueue::GetFront(): queue is empty", NULL); return mpRequestQueue->begin()->maKey; @@ -207,7 +207,7 @@ RequestPriorityClass RequestQueue::GetFrontPriorityClass() ::osl::MutexGuard aGuard (maMutex); if (mpRequestQueue->empty()) - throw ::com::sun::star::uno::RuntimeException("RequestQueue::GetFrontPriorityClass(): queue is empty", + throw css::uno::RuntimeException("RequestQueue::GetFrontPriorityClass(): queue is empty", NULL); return mpRequestQueue->begin()->meClass; diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 04cf53820e43..dfa797f8333d 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -868,7 +868,7 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const OUString& if ( ! pWindow) return; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > xAccessible (pWindow->GetAccessible(false)); if ( ! xAccessible.is()) return; @@ -896,7 +896,7 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const OUString& OUString sOldName (rsOldName); OUString sNewName (pChild->GetPage()->GetName()); pChild->FireAccessibleEvent( - ::com::sun::star::accessibility::AccessibleEventId::NAME_CHANGED, + css::accessibility::AccessibleEventId::NAME_CHANGED, makeAny(sOldName), makeAny(sNewName)); } diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 99278b1c6613..9f72e7ab078e 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -634,7 +634,7 @@ sal_Int8 Clipboard::AcceptDrop ( if (pDragTransferable != NULL && pDragTransferable->IsPageTransferable() && ((rEvent.maDragEvent.DropAction - & ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_DEFAULT) != 0) + & css::datatransfer::dnd::DNDConstants::ACTION_DEFAULT) != 0) && (mrSlideSorter.GetModel().GetDocument()->GetDocSh() != pDragTransferable->GetPageDocShell())) { diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 486834e17fe0..6628f31bc15a 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -496,7 +496,7 @@ void SAL_CALL Listener::propertyChange ( //===== frame::XFrameActionListener ========================================== void SAL_CALL Listener::frameAction (const frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { switch (rEvent.Action) { @@ -630,7 +630,7 @@ void Listener::HandleShapeModification (const SdrPage* pPage) } void Listener::ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index f281cdaadec9..eff122700593 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -49,10 +49,10 @@ class SlideSorter; namespace sd { namespace slidesorter { namespace controller { typedef cppu::WeakComponentImplHelper< - ::com::sun::star::document::XEventListener, - ::com::sun::star::beans::XPropertyChangeListener, - ::com::sun::star::accessibility::XAccessibleEventListener, - ::com::sun::star::frame::XFrameActionListener + css::document::XEventListener, + css::beans::XPropertyChangeListener, + css::accessibility::XAccessibleEventListener, + css::frame::XFrameActionListener > ListenerInterfaceBase; class SlideSorterController; @@ -96,27 +96,27 @@ public: //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; //===== document::XEventListener ======================================== virtual void SAL_CALL notifyEvent ( - const ::com::sun::star::document::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::document::EventObject& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; //===== beans::XPropertySetListener ===================================== virtual void SAL_CALL propertyChange ( - const com::sun::star::beans::PropertyChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::beans::PropertyChangeEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; //===== accessibility::XAccessibleEventListener ========================== virtual void SAL_CALL notifyEvent ( - const ::com::sun::star::accessibility::AccessibleEventObject& + const css::accessibility::AccessibleEventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== frame::XFrameActionListener ====================================== /** For certain actions the listener connects to a new controller of the @@ -124,8 +124,8 @@ public: in the center pane is replaced by another view shell. */ virtual void SAL_CALL - frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + frameAction (const css::frame::FrameActionEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disposing() override; @@ -144,8 +144,8 @@ private: bool mbListeningToFrame; bool mbIsMainViewChangePending; - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XController> mxControllerWeak; - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame> mxFrameWeak; + css::uno::WeakReference< css::frame::XController> mxControllerWeak; + css::uno::WeakReference< css::frame::XFrame> mxFrameWeak; /** This object is used to lock the model between some events. It is references counted in order to cope with events that @@ -174,7 +174,7 @@ private: disposed. */ void ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); DECL_LINK_TYPED(EventMultiplexerCallback, tools::EventMultiplexerEvent&, void); }; diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx index 10126e663c4b..fe0ff6ae1f86 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx @@ -89,7 +89,7 @@ public: same model but have different preview sizes may access previews of each other in order to create fast previews of the previews. */ - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() = 0; + virtual css::uno::Reference<css::uno::XInterface> GetModel() = 0; }; typedef std::shared_ptr<CacheContext> SharedCacheContext; diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index fbbc804c00ce..8f22b6ba4d3d 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -114,7 +114,7 @@ public: there is no such page descriptor. */ sal_Int32 GetIndex ( - const ::com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage>& rxSlide) const; + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) const; /** Return a page descriptor for the given SdrPage. Page descriptors are created on demand. The page descriptor is found (or not found) @@ -207,7 +207,7 @@ public: private: mutable ::osl::Mutex maMutex; SlideSorter& mrSlideSorter; - ::com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> mxSlides; + css::uno::Reference<css::container::XIndexAccess> mxSlides; PageKind mePageKind; EditMode meEditMode; typedef ::std::vector<SharedPageDescriptor> DescriptorContainer; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index d1e138e60a84..18137ae6ecf0 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -461,7 +461,7 @@ void SlideSorterService::Resize() } void SlideSorterService::ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || SlideSorterServiceInterfaceBase::rBHelper.bInDispose) { @@ -473,9 +473,9 @@ void SlideSorterService::ThrowIfDisposed() } } // end of namespace ::sd::slidesorter -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_SlideSorter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_SlideSorter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::slidesorter::SlideSorterService(context)); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 1461c7045071..140680136356 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -146,15 +146,14 @@ SlideSorterViewShell::~SlideSorterViewShell() ::sd::Window* pWindow = GetActiveWindow(); if (pWindow!=NULL) { - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent> xComponent ( + css::uno::Reference<css::lang::XComponent> xComponent ( pWindow->GetAccessible(false), - ::com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); if (xComponent.is()) xComponent->dispose(); } } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL("sd::SlideSorterViewShell::~SlideSorterViewShell(), exception caught!" ); } @@ -250,8 +249,7 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController to the base class to return a default object (probably an empty reference). */ -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> +css::uno::Reference<css::accessibility::XAccessible> SlideSorterViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow) { // When the view is not set then the initialization is not yet complete @@ -267,14 +265,14 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController pWindow->GetAccessibleParentWindow()->GetAccessible(), pWindow); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> xRet(pAccessibleView); + css::uno::Reference< css::accessibility::XAccessible> xRet(pAccessibleView); pAccessibleView->Init(); return xRet; } -void SlideSorterViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ) +void SlideSorterViewShell::SwitchViewFireFocus(css::uno::Reference< css::accessibility::XAccessible > xAcc ) { if (xAcc.get()) { diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index cc44e487f18a..3ac3e7da06dd 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -56,7 +56,7 @@ FontProvider& FontProvider::Instance() // We throw an exception when for some strange reason no instance of // this class exists. if (mpInstance == NULL) - throw ::com::sun::star::uno::RuntimeException("com.sun.star.document.IndexedPropertyValues", + throw css::uno::RuntimeException("com.sun.star.document.IndexedPropertyValues", NULL); return *mpInstance; diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx index 3ad7c0ba7151..55e1111b8743 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx @@ -112,7 +112,7 @@ model::SharedPageDescriptor ViewCacheContext::GetDescriptor (cache::CacheKey aKe return mrModel.GetPageDescriptor(nPageIndex); } -::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ViewCacheContext::GetModel() +css::uno::Reference<css::uno::XInterface> ViewCacheContext::GetModel() { if (mrModel.GetDocument() == NULL) return NULL; diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx index fe994e5710e9..e9e577b6583e 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx @@ -47,7 +47,7 @@ public: virtual const SdrPage* GetPage (cache::CacheKey aKey) override; virtual std::shared_ptr<std::vector<cache::CacheKey> > GetEntryList (bool bVisible) override; virtual sal_Int32 GetPriority (cache::CacheKey aKey) override; - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() override; + virtual css::uno::Reference<css::uno::XInterface> GetModel() override; private: model::SlideSorterModel& mrModel; diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 7a189d0f92be..e37b416b20f6 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -95,10 +95,10 @@ private: VclPtr<TableValueSet> m_pValueSet; VclPtr<CheckBox> m_aCheckBoxes[CB_COUNT]; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxSelectedTable; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > mxTableFamily; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > mxToolbar; + css::uno::Reference< css::beans::XPropertySet > mxSelectedTable; + css::uno::Reference< css::drawing::XDrawView > mxView; + css::uno::Reference< css::container::XIndexAccess > mxTableFamily; + css::uno::Reference< css::ui::XUIElement > mxToolbar; bool mbModal; bool mbStyleSelected; @@ -112,7 +112,7 @@ private: public: TableDesignPane( vcl::Window* pParent, ViewShellBase& rBase ) : PanelLayout(pParent, "TableDesignPanel", - "modules/simpress/ui/tabledesignpanel.ui", com::sun::star::uno::Reference<css::frame::XFrame>()) + "modules/simpress/ui/tabledesignpanel.ui", css::uno::Reference<css::frame::XFrame>()) , aImpl(this, rBase, false) { } diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 13e8360c1ce0..f218a21d81df 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -52,10 +52,10 @@ static const sal_Int32 ConfigurationUpdateEvent = 2; namespace sd { namespace tools { typedef cppu::WeakComponentImplHelper< - ::com::sun::star::beans::XPropertyChangeListener, - ::com::sun::star::frame::XFrameActionListener, - ::com::sun::star::view::XSelectionChangeListener, - ::com::sun::star::drawing::framework::XConfigurationChangeListener + css::beans::XPropertyChangeListener, + css::frame::XFrameActionListener, + css::view::XSelectionChangeListener, + css::drawing::framework::XConfigurationChangeListener > EventMultiplexerImplementationInterfaceBase; class EventMultiplexer::Implementation @@ -81,20 +81,20 @@ public: //===== lang::XEventListener ============================================== virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; //===== beans::XPropertySetListener ======================================= virtual void SAL_CALL propertyChange ( - const com::sun::star::beans::PropertyChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::beans::PropertyChangeEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; //===== view::XSelectionChangeListener ==================================== virtual void SAL_CALL selectionChanged ( - const com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; //===== frame::XFrameActionListener ====================================== /** For certain actions the listener connects to a new controller of the @@ -102,14 +102,14 @@ public: in the center pane is replaced by another view shell. */ virtual void SAL_CALL - frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + frameAction (const css::frame::FrameActionEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; //===== drawing::framework::XConfigurationChangeListener ================== virtual void SAL_CALL notifyConfigurationChange ( - const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disposing() override; @@ -129,16 +129,12 @@ private: /// Remember whether we are listening to the frame. bool mbListeningToFrame; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::frame::XController> mxControllerWeak; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::frame::XFrame> mxFrameWeak; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::view::XSelectionSupplier> mxSlideSorterSelectionWeak; + css::uno::WeakReference<css::frame::XController> mxControllerWeak; + css::uno::WeakReference<css::frame::XFrame> mxFrameWeak; + css::uno::WeakReference<css::view::XSelectionSupplier> mxSlideSorterSelectionWeak; SdDrawDocument* mpDocument; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::drawing::framework::XConfigurationController> - mxConfigurationControllerWeak; + css::uno::WeakReference<css::drawing::framework::XConfigurationController> + mxConfigurationControllerWeak; void ReleaseListeners(); @@ -153,7 +149,7 @@ private: disposed. */ void ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); DECL_LINK_TYPED(SlideSorterSelectionChangeListener, LinkParamNone*, void); }; @@ -514,7 +510,7 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange ( void SAL_CALL EventMultiplexer::Implementation::frameAction ( const frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { Reference<frame::XFrame> xFrame (mxFrameWeak); if (rEvent.Frame == xFrame) @@ -546,7 +542,7 @@ void SAL_CALL EventMultiplexer::Implementation::frameAction ( void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( const lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { CallListeners (EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION); } @@ -630,7 +626,7 @@ void SAL_CALL EventMultiplexer::Implementation::disposing() } void EventMultiplexer::Implementation::ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index a6ad71a60f5e..67e3f5ac6eb5 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -142,7 +142,7 @@ Image PreviewRenderer::RenderPage ( Cleanup(); } } - catch (const com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -201,7 +201,7 @@ Image PreviewRenderer::RenderSubstitution ( mpPreviewDevice->PixelToLogic(Point(0,0)), mpPreviewDevice->PixelToLogic(aSize))); } - catch (const com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -316,7 +316,7 @@ void PreviewRenderer::PaintPage ( { mpView->CompleteRedraw(mpPreviewDevice.get(), aRegion, pRedirector.get()); } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 0640b03561af..184a3f159237 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -173,7 +173,7 @@ void PropertySet::CallListeners ( } void PropertySet::ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index cc9f88a63305..c2f6cedf0526 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -107,7 +107,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( // XTypeProvider Sequence<Type> SAL_CALL DrawController::getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); // OPropertySetHelper does not provide getTypes, so we have to @@ -185,7 +185,7 @@ void SAL_CALL DrawController::removeEventListener ( } // XController -sal_Bool SAL_CALL DrawController::suspend( sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DrawController::suspend( sal_Bool Suspend ) throw (css::uno::RuntimeException, std::exception) { if( Suspend ) { @@ -456,7 +456,7 @@ void DrawController::NotifyAccUpdate() fire (&nHandle, &aNewValue, &aOldValue, 1, sal_False); } -void DrawController::fireChangeLayer( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* pCurrentLayer ) throw() +void DrawController::fireChangeLayer( css::uno::Reference< css::drawing::XLayer>* pCurrentLayer ) throw() { if( pCurrentLayer != mpCurrentLayer ) { @@ -609,7 +609,7 @@ void DrawController::FillPropertyTable ( rProperties.push_back( beans::Property("VisibleArea", PROPERTY_WORKAREA, - ::cppu::UnoType< ::com::sun::star::awt::Rectangle>::get(), + ::cppu::UnoType< css::awt::Rectangle>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY)); rProperties.push_back( beans::Property( @@ -651,12 +651,12 @@ void DrawController::FillPropertyTable ( rProperties.push_back( beans::Property("ViewOffset", PROPERTY_VIEWOFFSET, - ::cppu::UnoType< ::com::sun::star::awt::Point>::get(), + ::cppu::UnoType< css::awt::Point>::get(), beans::PropertyAttribute::BOUND )); rProperties.push_back( beans::Property("DrawViewMode", PROPERTY_DRAWVIEWMODE, - ::cppu::UnoType< ::com::sun::star::awt::Point>::get(), + ::cppu::UnoType< css::awt::Point>::get(), beans::PropertyAttribute::BOUND|beans::PropertyAttribute::READONLY|beans::PropertyAttribute::MAYBEVOID )); // add new property to update current page's acc information rProperties.push_back( @@ -689,7 +689,7 @@ IPropertyArrayHelper & DrawController::getInfoHelper() } Reference < beans::XPropertySetInfo > DrawController::getPropertySetInfo() - throw ( ::com::sun::star::uno::RuntimeException, std::exception) + throw ( css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -754,7 +754,7 @@ sal_Bool DrawController::convertFastPropertyValue ( Any & rOldValue, sal_Int32 nHandle, const Any& rValue) - throw ( com::sun::star::lang::IllegalArgumentException) + throw ( css::lang::IllegalArgumentException) { bool bResult = false; @@ -775,7 +775,7 @@ sal_Bool DrawController::convertFastPropertyValue ( catch (const beans::UnknownPropertyException&) { // The property is unknown and thus an illegal argument to this method. - throw com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } @@ -785,7 +785,7 @@ sal_Bool DrawController::convertFastPropertyValue ( void DrawController::setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const Any& rValue) - throw ( com::sun::star::uno::Exception, std::exception) + throw ( css::uno::Exception, std::exception) { SolarMutexGuard aGuard; if (nHandle == PROPERTY_SUB_CONTROLLER) @@ -855,7 +855,7 @@ void DrawController::DisposeFrameworkControllers() } void DrawController::ThrowIfDisposed() const - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose || mbDisposing) { diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index c318bfb93849..0228b5e6e803 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -404,7 +404,7 @@ Any SAL_CALL SdUnoDrawView::getFastPropertyValue ( aValue <<= GetZoom(); break; case DrawController::PROPERTY_ZOOMTYPE: - aValue <<= (sal_Int16)com::sun::star::view::DocumentZoomType::BY_VALUE; + aValue <<= (sal_Int16)css::view::DocumentZoomType::BY_VALUE; break; case DrawController::PROPERTY_VIEWOFFSET: aValue <<= GetViewOffset(); @@ -511,16 +511,16 @@ void SdUnoDrawView::SetZoomType ( sal_Int16 nType ) SvxZoomType eZoomType; switch( nType ) { - case com::sun::star::view::DocumentZoomType::OPTIMAL: + case css::view::DocumentZoomType::OPTIMAL: eZoomType = SvxZoomType::OPTIMAL; break; - case com::sun::star::view::DocumentZoomType::PAGE_WIDTH: - case com::sun::star::view::DocumentZoomType::PAGE_WIDTH_EXACT: + case css::view::DocumentZoomType::PAGE_WIDTH: + case css::view::DocumentZoomType::PAGE_WIDTH_EXACT: eZoomType = SvxZoomType::PAGEWIDTH; break; - case com::sun::star::view::DocumentZoomType::ENTIRE_PAGE: + case css::view::DocumentZoomType::ENTIRE_PAGE: eZoomType = SvxZoomType::WHOLEPAGE; break; diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index cc7680e825e4..bb8aee82ecea 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -80,20 +80,20 @@ namespace sd virtual void SAL_CALL release( ) throw () override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; @@ -110,8 +110,8 @@ namespace sd const uno::Sequence<beans::PropertyValue>& aConfigProps ) override; protected: - virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) override; - virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) override; + virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception ) override; + virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, RuntimeException, std::exception ) override; private: bool LoadList( XPropertyListType t, const OUString &rPath, diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.hxx b/sd/source/ui/unoidl/UnoDocumentSettings.hxx index f8b54908e4e5..8daa26955419 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.hxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.hxx @@ -26,7 +26,7 @@ class SdXImpressDocument; namespace sd { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL DocumentSettings_createInstance( SdXImpressDocument* pDoc ) throw(); + css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentSettings_createInstance( SdXImpressDocument* pDoc ) throw(); } #endif diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index a9205183229e..063e88505498 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -226,7 +226,7 @@ void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); - return ::com::sun::star::animations::AnimationNodeType::PAR; + return css::animations::AnimationNodeType::PAR; } // XAnimationNode @@ -569,9 +569,9 @@ Sequence< OUString > RandomAnimationNode::getSupportedServiceNames() throw(std:: } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -RandomAnimationNode_get_implementation(::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +RandomAnimationNode_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::RandomAnimationNode()); } diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index c1525a9514c3..61b36c212e46 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -153,9 +153,9 @@ Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_draw_FormatDetector_get_implementation(::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_draw_FormatDetector_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SdFilterDetect()); } diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 67ebea36dc53..fead6682b7f0 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -33,11 +33,11 @@ class SdXImpressDocument; class SdCustomShow; -class SdXCustomPresentation : public ::cppu::WeakImplHelper< ::com::sun::star::container::XIndexContainer, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::lang::XComponent, - ::com::sun::star::lang::XServiceInfo > +class SdXCustomPresentation : public ::cppu::WeakImplHelper< css::container::XIndexContainer, + css::container::XNamed, + css::lang::XUnoTunnel, + css::lang::XComponent, + css::lang::XServiceInfo > { private: SdCustomShow* mpSdCustomShow; @@ -62,33 +62,33 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdXCustomPresentation) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; }; #include <com/sun/star/container/XNameContainer.hpp> @@ -99,9 +99,9 @@ public: class List; -class SdXCustomPresentationAccess : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer, - ::com::sun::star::lang::XSingleServiceFactory, - ::com::sun::star::lang::XServiceInfo > +class SdXCustomPresentationAccess : public ::cppu::WeakImplHelper< css::container::XNameContainer, + css::lang::XSingleServiceFactory, + css::lang::XServiceInfo > { private: SdXImpressDocument& mrModel; @@ -115,29 +115,29 @@ public: virtual ~SdXCustomPresentationAccess() throw(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XSingleServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; }; inline SdCustomShowList* SdXCustomPresentationAccess::GetCustomShowList() const throw() diff --git a/sd/source/ui/unoidl/unohelp.hxx b/sd/source/ui/unoidl/unohelp.hxx index f7ae6ae32a67..25b76f8648b9 100644 --- a/sd/source/ui/unoidl/unohelp.hxx +++ b/sd/source/ui/unoidl/unohelp.hxx @@ -22,7 +22,7 @@ namespace sd { -inline void bool2any( bool bBool, ::com::sun::star::uno::Any& rAny ) +inline void bool2any( bool bBool, css::uno::Any& rAny ) { rAny.setValue( &bBool, cppu::UnoType<bool>::get() ); } diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index af8f5e15f1f1..e887c8f4a6cd 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -387,9 +387,9 @@ void SdLayer::set( LayerAttribute what, bool flag ) throw() //TODO: uno::Exception? } -// ::com::sun::star::container::XChild +// css::container::XChild uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -400,8 +400,8 @@ uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent() } void SAL_CALL SdLayer::setParent (const uno::Reference<uno::XInterface >& ) - throw (::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::NoSupportException, + css::uno::RuntimeException, std::exception) { throw lang::NoSupportException (); } diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index f977badf8127..d8452aa2169f 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -41,11 +41,11 @@ enum LayerAttribute { VISIBLE, PRINTABLE, LOCKED }; /*********************************************************************** * * ***********************************************************************/ -class SdLayer : public ::cppu::WeakImplHelper< ::com::sun::star::drawing::XLayer, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::container::XChild, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::lang::XComponent > +class SdLayer : public ::cppu::WeakImplHelper< css::drawing::XLayer, + css::lang::XServiceInfo, + css::container::XChild, + css::lang::XUnoTunnel, + css::lang::XComponent > { public: SdLayer( SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_ ) throw(); @@ -61,38 +61,38 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdLayer ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XChild + // css::container::XChild /** Returns the layer manager that manages this layer. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; /** Not implemented. Always throws an exception. @raises NoSupportException. */ - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; private: SdLayerManager* pLayerManager; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayerManager > mxLayerManager; + css::uno::Reference< css::drawing::XLayerManager > mxLayerManager; SdrLayer* pLayer; const SvxItemPropertySet* pPropSet; @@ -106,11 +106,11 @@ private: * * ***********************************************************************/ -class SdLayerManager : public ::cppu::WeakImplHelper< ::com::sun::star::drawing::XLayerManager, - ::com::sun::star::container::XNameAccess, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::lang::XComponent > +class SdLayerManager : public ::cppu::WeakImplHelper< css::drawing::XLayerManager, + css::container::XNameAccess, + css::lang::XServiceInfo, + css::lang::XUnoTunnel, + css::lang::XComponent > { friend class SdLayer; @@ -122,28 +122,28 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdLayerManager ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XLayerManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer >& xLayer ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL attachShapeToLayer( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer >& xLayer ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL getLayerForShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XLayer >& xLayer ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL attachShapeToLayer( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XLayer >& xLayer ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XLayer > SAL_CALL getLayerForShape( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; /** Return the <type>XLayer</type> object that is associated with the given <type>SdrLayer</type> object. If the requested object does @@ -157,12 +157,12 @@ public: associated with the specified argument. If no layer can be created for the argument than an empty reference is returned. */ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> GetLayer (SdrLayer* pLayer); + css::uno::Reference< css::drawing::XLayer> GetLayer (SdrLayer* pLayer); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; private: SdXImpressDocument* mpModel; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index c840f784e6a2..94a655f40f40 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -325,21 +325,21 @@ namespace } // XUnoTunnel -const ::com::sun::star::uno::Sequence< sal_Int8 > & SdXImpressDocument::getUnoTunnelId() throw() +const css::uno::Sequence< sal_Int8 > & SdXImpressDocument::getUnoTunnelId() throw() { return theSdXImpressDocumentUnoTunnelId::get().getSeq(); } SdXImpressDocument* SdXImpressDocument::getImplementation( const uno::Reference< uno::XInterface >& xInt ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( xInt, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XUnoTunnel > xUT( xInt, css::uno::UNO_QUERY ); if( xUT.is() ) return reinterpret_cast<SdXImpressDocument*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( SdXImpressDocument::getUnoTunnelId() ))); else return NULL; } -sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) { if( rIdentifier.getLength() == 16 ) { @@ -378,7 +378,7 @@ uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes( ) throw(uno:: *pTypes++ = cppu::UnoType<drawing::XDrawPagesSupplier>::get(); *pTypes++ = cppu::UnoType<document::XLinkTargetSupplier>::get(); *pTypes++ = cppu::UnoType<style::XStyleFamiliesSupplier>::get(); - *pTypes++ = cppu::UnoType<com::sun::star::ucb::XAnyCompareFactory>::get(); + *pTypes++ = cppu::UnoType<css::ucb::XAnyCompareFactory>::get(); *pTypes++ = cppu::UnoType<view::XRenderable>::get(); if( mbImpressDoc ) { @@ -644,7 +644,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewD return xRet; } -void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container::XIndexAccess >& xData ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container::XIndexAccess >& xData ) throw(css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1463,7 +1463,7 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getStyleFa } // XAnyCompareFactory -uno::Reference< com::sun::star::ucb::XAnyCompare > SAL_CALL SdXImpressDocument::createAnyCompareByName( const OUString& ) +uno::Reference< css::ucb::XAnyCompare > SAL_CALL SdXImpressDocument::createAnyCompareByName( const OUString& ) throw (uno::RuntimeException, std::exception) { return SvxCreateNumRuleCompare(); @@ -2587,7 +2587,7 @@ void SdXImpressDocument::initializeDocument() } } -void SAL_CALL SdXImpressDocument::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SdXImpressDocument::dispose() throw (css::uno::RuntimeException, std::exception) { if( !mbDisposed ) { @@ -2622,7 +2622,7 @@ void SAL_CALL SdXImpressDocument::dispose() throw (::com::sun::star::uno::Runtim uno::Reference< presentation::XPresentation > xPresentation( mxPresentation ); if( xPresentation.is() ) { - uno::Reference< ::com::sun::star::presentation::XPresentation2 > xPres( mpDoc->getPresentation().get() ); + uno::Reference< css::presentation::XPresentation2 > xPres( mpDoc->getPresentation().get() ); uno::Reference< lang::XComponent > xPresComp( xPres, uno::UNO_QUERY ); if( xPresComp.is() ) xPresComp->dispose(); @@ -3405,7 +3405,7 @@ void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName if( xModel.is() ) { uno::Reference< uno::XInterface > xSource( static_cast<uno::XWeak*>( xModel.get() ) ); - ::com::sun::star::document::EventObject aEvent( xSource, rEventName ); + css::document::EventObject aEvent( xSource, rEventName ); xModel->notifyEvent(aEvent ); } } @@ -3416,7 +3416,7 @@ void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName, if( xModel.is() ) { - ::com::sun::star::document::EventObject aEvent( xSource, rEventName ); + css::document::EventObject aEvent( xSource, rEventName ); xModel->notifyEvent(aEvent ); } } diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index 57c87e9407f8..f91854e1989c 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -129,9 +129,9 @@ uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames( ) thr } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Draw_DrawingModule_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Draw_DrawingModule_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index b0cf3c6b9314..2bbacf26786e 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -115,29 +115,29 @@ using ::com::sun::star::drawing::XShape; #define WID_LEGACYFRAGMENT 25 #define IMPRESS_MAP_ENTRIES \ - { OUString(UNO_NAME_OBJ_LEGACYFRAGMENT),WID_LEGACYFRAGMENT, cppu::UnoType<drawing::XShape>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_ANIMATIONPATH), WID_ANIMPATH, cppu::UnoType<drawing::XShape>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_DIMCOLOR), WID_DIMCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_DIMHIDE), WID_DIMHIDE, cppu::UnoType<bool>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_DIMPREV), WID_DIMPREV, cppu::UnoType<bool>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_EFFECT), WID_EFFECT, ::cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_ISEMPTYPRESOBJ),WID_ISEMPTYPRESOBJ, cppu::UnoType<bool>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_ISPRESOBJ), WID_ISPRESOBJ, cppu::UnoType<bool>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ - { OUString(UNO_NAME_OBJ_MASTERDEPENDENT),WID_MASTERDEPEND, cppu::UnoType<bool>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, ::cppu::UnoType<presentation::ClickAction>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_PLAYFULL), WID_PLAYFULL, cppu::UnoType<bool>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_PRESORDER), WID_PRESORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, cppu::UnoType<style::XStyle>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\ - { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_SOUNDFILE, ::cppu::UnoType<OUString>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_SOUNDON), WID_SOUNDON, cppu::UnoType<bool>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_SPEED), WID_SPEED, ::cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_TEXTEFFECT), WID_TEXTEFFECT, ::cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_BLUESCREEN), WID_BLUESCREEN, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_VERB), WID_VERB, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { OUString("IsAnimation"), WID_ISANIMATION, cppu::UnoType<bool>::get(), 0, 0},\ - { OUString("NavigationOrder"), WID_NAVORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { OUString("PlaceholderText"), WID_PLACEHOLDERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_LEGACYFRAGMENT),WID_LEGACYFRAGMENT, cppu::UnoType<drawing::XShape>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_ANIMATIONPATH), WID_ANIMPATH, cppu::UnoType<drawing::XShape>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, cppu::UnoType<OUString>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_DIMCOLOR), WID_DIMCOLOR, cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_DIMHIDE), WID_DIMHIDE, cppu::UnoType<bool>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_DIMPREV), WID_DIMPREV, cppu::UnoType<bool>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_EFFECT), WID_EFFECT, cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_ISEMPTYPRESOBJ),WID_ISEMPTYPRESOBJ, cppu::UnoType<bool>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_ISPRESOBJ), WID_ISPRESOBJ, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0},\ + { OUString(UNO_NAME_OBJ_MASTERDEPENDENT),WID_MASTERDEPEND, cppu::UnoType<bool>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, cppu::UnoType<presentation::ClickAction>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_PLAYFULL), WID_PLAYFULL, cppu::UnoType<bool>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_PRESORDER), WID_PRESORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, cppu::UnoType<style::XStyle>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0},\ + { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_SOUNDFILE, cppu::UnoType<OUString>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_SOUNDON), WID_SOUNDON, cppu::UnoType<bool>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_SPEED), WID_SPEED, cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_TEXTEFFECT), WID_TEXTEFFECT, cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_BLUESCREEN), WID_BLUESCREEN, cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_VERB), WID_VERB, cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { OUString("IsAnimation"), WID_ISANIMATION, cppu::UnoType<bool>::get(), 0, 0},\ + { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { OUString("PlaceholderText"), WID_PLACEHOLDERTEXT, cppu::UnoType<OUString>::get(), 0, 0},\ { OUString(), 0, css::uno::Type(), 0, 0 } static const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertyGraphicMap_Impl() @@ -162,10 +162,10 @@ using ::com::sun::star::drawing::XShape; } #define DRAW_MAP_ENTRIES\ - { OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, ::cppu::UnoType<presentation::ClickAction>::get(),0, 0},\ - { OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, cppu::UnoType<style::XStyle>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\ - { OUString("NavigationOrder"), WID_NAVORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, cppu::UnoType<OUString>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, cppu::UnoType<presentation::ClickAction>::get(),0, 0},\ + { OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, cppu::UnoType<style::XStyle>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0},\ + { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\ { OUString(), 0, css::uno::Type(), 0, 0 } static const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertySimpleMap_Impl() @@ -313,7 +313,7 @@ void SAL_CALL SdXShape::release() throw() mpShape->release(); } -bool SdXShape::queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& aAny ) +bool SdXShape::queryAggregation( const css::uno::Type & rType, css::uno::Any& aAny ) { if( mpModel && mpModel ->IsImpressDocument() ) { @@ -417,8 +417,8 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) } //XPropertySet -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL SdXShape::getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdXShape::getPropertySetInfo() + throw(css::uno::RuntimeException) { sal_uIntPtr nObjId = reinterpret_cast<sal_uIntPtr>(mpShape->getPropertyMapEntries()); css::uno::Reference<css::beans::XPropertySetInfo> pInfo; @@ -443,12 +443,12 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) return pInfo; } -void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, +void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -697,10 +697,10 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : mpModel->SetModified(); } -::com::sun::star::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, +css::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -870,7 +870,7 @@ SdAnimationInfo* SdXShape::GetAnimationInfo( bool bCreate ) const return pInfo; } -uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(css::uno::RuntimeException) { uno::Sequence< OUString > aSeq( mpShape->_getSupportedServiceNames() ); @@ -1104,7 +1104,7 @@ uno::Any SdXShape::GetStyleSheet() const throw( beans::UnknownPropertyException return Any( uno::Reference< style::XStyle >( dynamic_cast< SfxUnoStyleSheet* >( pStyleSheet ) ) ); } -class SdUnoEventsAccess : public cppu::WeakImplHelper< com::sun::star::container::XNameReplace, com::sun::star::lang::XServiceInfo > +class SdUnoEventsAccess : public cppu::WeakImplHelper< css::container::XNameReplace, css::lang::XServiceInfo > { private: const OUString maStrOnClick; @@ -1130,25 +1130,25 @@ public: SdUnoEventsAccess( SdXShape* pShape ) throw(); // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; }; // XEventsSupplier -uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents( ) throw(css::uno::RuntimeException, std::exception) { return new SdUnoEventsAccess( this ); } diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index a534f4c1bfb0..947d11d852ca 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -35,7 +35,7 @@ class SdXImpressDocument; class SdAnimationInfo; class SdXShape : public SvxShapeMaster, - public ::com::sun::star::document::XEventsSupplier + public css::document::XEventsSupplier { friend class SdUnoEventsAccess; @@ -45,9 +45,9 @@ private: const SfxItemPropertyMapEntry* mpMap; SdXImpressDocument* mpModel; - void SetStyleSheet( const ::com::sun::star::uno::Any& rAny ) - throw( ::com::sun::star::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException ); - ::com::sun::star::uno::Any GetStyleSheet() const throw( ::com::sun::star::beans::UnknownPropertyException ); + void SetStyleSheet( const css::uno::Any& rAny ) + throw( css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException ); + css::uno::Any GetStyleSheet() const throw( css::beans::UnknownPropertyException ); // Intern SdAnimationInfo* GetAnimationInfo( bool bCreate = false ) const @@ -68,43 +68,43 @@ public: SdXShape(SvxShape* pShape, SdXImpressDocument* pModel) throw(); virtual ~SdXShape() throw(); - virtual bool queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& aAny ) override; + virtual bool queryAggregation( const css::uno::Type & rType, css::uno::Any& aAny ) override; virtual void dispose() override; virtual void modelChanged( SdrModel* pNewModel ) override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException) override; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException) override; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override; }; struct SvEventDescription; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 32c8c79a08e7..ac6b7a1935c5 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -123,13 +123,13 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, { OUString(UNO_NAME_PAGE_SPEED), WID_PAGE_SPEED, ::cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_VISIBLE), WID_PAGE_VISIBLE, cppu::UnoType<bool>::get(), 0, 0}, { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_PAGE_SOUNDFILE, cppu::UnoType<Any>::get(), 0, 0}, { OUString(sUNO_Prop_IsBackgroundVisible), WID_PAGE_BACKVIS, cppu::UnoType<bool>::get(), 0, 0}, { OUString(sUNO_Prop_IsBackgroundObjectsVisible), WID_PAGE_BACKOBJVIS, cppu::UnoType<bool>::get(), 0, 0}, - { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, { OUString("HighResDuration"), WID_PAGE_HIGHRESDURATION, ::cppu::UnoType<double>::get(), 0, 0}, { OUString("IsBackgroundDark") , WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, @@ -162,7 +162,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, \ { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},\ + { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},\ { OUString("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \ { OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \ { OUString("IsBackgroundDark"), WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, \ @@ -198,9 +198,9 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, \ { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ - { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, \ + { OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, \ + { OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},\ + { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, \ { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, \ { OUString("IsBackgroundDark"), WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, \ { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ @@ -273,7 +273,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("BackgroundFullSize"), WID_PAGE_BACKFULL, cppu::UnoType<bool>::get(), 0, 0}, - { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("IsBackgroundDark"), WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -289,7 +289,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("IsBackgroundDark"), WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, { OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, @@ -322,12 +322,12 @@ namespace class theSdGenericDrawPageUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdGenericDrawPageUnoTunnelId> {}; } -const ::com::sun::star::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTunnelId() throw() +const css::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTunnelId() throw() { return theSdGenericDrawPageUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -359,7 +359,7 @@ SdGenericDrawPage::~SdGenericDrawPage() throw() { } -void SdGenericDrawPage::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException ) +void SdGenericDrawPage::throwIfDisposed() const throw (css::uno::RuntimeException ) { if( (SvxFmDrawPage::mpModel == 0) || (mpModel == 0) || (SvxFmDrawPage::mpPage == 0) ) throw lang::DisposedException(); @@ -1316,7 +1316,7 @@ void SAL_CALL SdGenericDrawPage::addVetoableChangeListener( const OUString& , co void SAL_CALL SdGenericDrawPage::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} // XMultiPropertySet -void SAL_CALL SdGenericDrawPage::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL SdGenericDrawPage::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { if( aPropertyNames.getLength() != aValues.getLength() ) throw lang::IllegalArgumentException(); diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 899388a4c9c6..7e1e6bb337e0 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -123,7 +123,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) case XATTR_FILLFLOATTRANSPARENCE : case XATTR_FILLGRADIENT : { - if ( ( pAny->getValueType() == ::cppu::UnoType< ::com::sun::star::awt::Gradient>::get() ) + if ( ( pAny->getValueType() == ::cppu::UnoType< css::awt::Gradient>::get() ) && ( aIt->nMemberId == MID_FILLGRADIENT ) ) { setPropertyValue( aPropertyName, *pAny ); @@ -137,7 +137,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) break; case XATTR_FILLHATCH : { - if ( ( pAny->getValueType() == ::cppu::UnoType< ::com::sun::star::drawing::Hatch>::get() ) + if ( ( pAny->getValueType() == ::cppu::UnoType< css::drawing::Hatch>::get() ) && ( aIt->nMemberId == MID_FILLHATCH ) ) { setPropertyValue( aPropertyName, *pAny ); @@ -151,8 +151,8 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) break; case XATTR_FILLBITMAP : { - if ( ( ( pAny->getValueType() == cppu::UnoType<com::sun::star::awt::XBitmap>::get()) || - ( pAny->getValueType() == cppu::UnoType<com::sun::star::graphic::XGraphic>::get()) ) && + if ( ( ( pAny->getValueType() == cppu::UnoType<css::awt::XBitmap>::get()) || + ( pAny->getValueType() == cppu::UnoType<css::graphic::XGraphic>::get()) ) && ( aIt->nMemberId == MID_BITMAP ) ) { setPropertyValue( aPropertyName, *pAny ); diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index d979a59901f7..d5b809bd6e3f 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -36,10 +36,10 @@ class SdDrawDocument; class SfxItemSet; class SdUnoPageBackground : public ::cppu::WeakImplHelper< - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::beans::XPropertyState, - ::com::sun::star::lang::XUnoTunnel>, + css::beans::XPropertySet, + css::lang::XServiceInfo, + css::beans::XPropertyState, + css::lang::XUnoTunnel>, public SfxListener { protected: @@ -60,24 +60,24 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdUnoPageBackground ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 0e70f81abf5e..882eff87291f 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -194,14 +194,14 @@ sal_Int32 SAL_CALL SdUnoSearchReplaceShape::replaceAll( const uno::Reference< ut } // XSearchable -uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL SdUnoSearchReplaceShape::createSearchDescriptor( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< css::util::XSearchDescriptor > SAL_CALL SdUnoSearchReplaceShape::createSearchDescriptor( ) + throw(css::uno::RuntimeException, std::exception) { return new SdUnoSearchReplaceDescriptor(false); } -uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL SdUnoSearchReplaceShape::findAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< css::container::XIndexAccess > SAL_CALL SdUnoSearchReplaceShape::findAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) + throw(css::uno::RuntimeException, std::exception) { SdUnoSearchReplaceDescriptor* pDescr = SdUnoSearchReplaceDescriptor::getImplementation( xDesc ); if( pDescr == NULL ) @@ -307,8 +307,8 @@ uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL SdUnoSearch return xRet; } -uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findFirst( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< css::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findFirst( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) + throw(css::uno::RuntimeException, std::exception) { uno::Reference< text::XTextRange > xRange( GetCurrentShape(), uno::UNO_QUERY ); if( xRange.is() ) @@ -342,8 +342,8 @@ uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetCurrentShape() co } -uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findNext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< css::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findNext( const css::uno::Reference< css::uno::XInterface >& xStartAt, const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) + throw(css::uno::RuntimeException, std::exception) { SdUnoSearchReplaceDescriptor* pDescr = SdUnoSearchReplaceDescriptor::getImplementation( xDesc ); @@ -722,40 +722,40 @@ SdUnoSearchReplaceDescriptor::~SdUnoSearchReplaceDescriptor() throw() // XSearchDescriptor OUString SAL_CALL SdUnoSearchReplaceDescriptor::getSearchString() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return maSearchStr; } void SAL_CALL SdUnoSearchReplaceDescriptor::setSearchString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { maSearchStr = aString; } // XReplaceDescriptor OUString SAL_CALL SdUnoSearchReplaceDescriptor::getReplaceString() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return maReplaceStr; } void SAL_CALL SdUnoSearchReplaceDescriptor::setReplaceString( const OUString& aReplaceString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { maReplaceStr = aReplaceString; } // XPropertySet -uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL SdUnoSearchReplaceDescriptor::getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdUnoSearchReplaceDescriptor::getPropertySetInfo() + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpPropSet->getPropertySetInfo(); } -void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -783,7 +783,7 @@ void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aP } uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -809,10 +809,10 @@ uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString return aAny; } -void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const OUString& , const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const OUString& , const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const OUString& , const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const OUString& , const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} /* ================================================================= */ @@ -827,26 +827,26 @@ SdUnoFindAllAccess::~SdUnoFindAllAccess() throw() // XElementAccess uno::Type SAL_CALL SdUnoFindAllAccess::getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return cppu::UnoType<text::XTextRange>::get(); } sal_Bool SAL_CALL SdUnoFindAllAccess::hasElements() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return maSequence.getLength() > 0; } // XIndexAccess sal_Int32 SAL_CALL SdUnoFindAllAccess::getCount() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return maSequence.getLength(); } uno::Any SAL_CALL SdUnoFindAllAccess::getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { uno::Any aAny; diff --git a/sd/source/ui/unoidl/unowcntr.hxx b/sd/source/ui/unoidl/unowcntr.hxx index f78ca1743f39..fdf35c88fc51 100644 --- a/sd/source/ui/unoidl/unowcntr.hxx +++ b/sd/source/ui/unoidl/unowcntr.hxx @@ -23,9 +23,9 @@ #include <cppuhelper/weakref.hxx> #include <list> -typedef bool (*weakref_searchfunc)( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef, void* pSearchData ); +typedef bool (*weakref_searchfunc)( css::uno::WeakReference< css::uno::XInterface > xRef, void* pSearchData ); -typedef ::std::list< ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface >* > WeakRefList; +typedef ::std::list< css::uno::WeakReference< css::uno::XInterface >* > WeakRefList; class SvUnoWeakContainer { @@ -37,12 +37,12 @@ public: ~SvUnoWeakContainer() throw(); /** inserts the given ref into this container */ - void insert( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef ) throw(); + void insert( css::uno::WeakReference< css::uno::XInterface > xRef ) throw(); /** searches the container for a ref that returns true on the given search function */ - bool findRef( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface >& rRef, void* pSearchData, weakref_searchfunc pSearchFunc ); + bool findRef( css::uno::WeakReference< css::uno::XInterface >& rRef, void* pSearchData, weakref_searchfunc pSearchFunc ); void dispose(); }; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index a92c3dfd4b91..fdd578d15971 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -938,7 +938,7 @@ namespace { { SdPage& rHandoutPage (*rDocument.GetSdPage(0, PK_HANDOUT)); - Reference< com::sun::star::beans::XPropertySet > xHandoutPage( rHandoutPage.getUnoPage(), UNO_QUERY ); + Reference< css::beans::XPropertySet > xHandoutPage( rHandoutPage.getUnoPage(), UNO_QUERY ); const OUString sPageNumber( "Number" ); // Collect the page objects of the handout master. diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index 02dee459801b..6a4b8b50c8f2 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -95,7 +95,7 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest) void GraphicViewShellBase::InitializeFramework() { - com::sun::star::uno::Reference<com::sun::star::frame::XController> + css::uno::Reference<css::frame::XController> xController (GetController()); sd::framework::DrawModule::Initialize(xController); } diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index 531a0c8b8e9c..5b10a9206277 100644 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -88,7 +88,7 @@ void ImpressViewShellBase::Execute (SfxRequest& rRequest) void ImpressViewShellBase::InitializeFramework() { - ::com::sun::star::uno::Reference<com::sun::star::frame::XController> + css::uno::Reference<css::frame::XController> xController (GetController()); sd::framework::ImpressModule::Initialize(xController); } diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 71656bb98d91..c7f315a54bbb 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1032,7 +1032,7 @@ void Outliner::ProvideNextTextObject() { mpView->SdrEndTextEdit(); } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index a5173da3a559..ab051722cad3 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -86,7 +86,7 @@ PresentationViewShellBase::~PresentationViewShellBase() void PresentationViewShellBase::InitializeFramework() { - com::sun::star::uno::Reference<com::sun::star::frame::XController> + css::uno::Reference<css::frame::XController> xController (GetController()); sd::framework::PresentationModule::Initialize(xController); } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 7fc8354905f1..58d75681656e 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -664,8 +664,7 @@ void ViewShellBase::GetState (SfxItemSet& rSet) } void ViewShellBase::WriteUserDataSequence ( - ::com::sun::star::uno::Sequence < - ::com::sun::star::beans::PropertyValue >& rSequence, + css::uno::Sequence< css::beans::PropertyValue >& rSequence, bool bBrowse) { // Forward call to main sub shell. @@ -675,8 +674,7 @@ void ViewShellBase::WriteUserDataSequence ( } void ViewShellBase::ReadUserDataSequence ( - const ::com::sun::star::uno::Sequence < - ::com::sun::star::beans::PropertyValue >& rSequence, + const css::uno::Sequence< css::beans::PropertyValue >& rSequence, bool bBrowse) { // Forward call to main sub shell. @@ -866,7 +864,7 @@ OUString ViewShellBase::GetInitialViewShellType() break; sal_Int32 nView = 0; - ::com::sun::star::uno::Any aAny = xViewData->getByIndex(nView); + css::uno::Any aAny = xViewData->getByIndex(nView); Sequence<beans::PropertyValue> aProperties; if ( ! (aAny >>= aProperties)) break; @@ -977,7 +975,7 @@ OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const { Reference< XNameAccess > const xNameAccess( frame::theUICommandDescription::get(xContext) ); - Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW ); + Reference< css::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW ); Sequence< PropertyValue > aPropSeq; if( m_xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq ) { diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index bb9ea50d6381..8e3b344de97a 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -265,35 +265,35 @@ void SAL_CALL ViewTabBar::disposing( void SAL_CALL ViewTabBar::addTabBarButtonAfter ( const TabBarButton& rButton, const TabBarButton& rAnchor) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; AddTabBarButton(rButton, rAnchor); } void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; AddTabBarButton(rButton); } void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; RemoveTabBarButton(rButton); } sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; return HasTabBarButton(rButton); } Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; return GetTabBarButtons(); @@ -414,8 +414,8 @@ int ViewTabBar::GetHeight() } void ViewTabBar::AddTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton, - const ::com::sun::star::drawing::framework::TabBarButton& rAnchor) + const css::drawing::framework::TabBarButton& rButton, + const css::drawing::framework::TabBarButton& rAnchor) { sal_uInt32 nIndex; @@ -441,13 +441,13 @@ void ViewTabBar::AddTabBarButton ( } void ViewTabBar::AddTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton) + const css::drawing::framework::TabBarButton& rButton) { AddTabBarButton(rButton, maTabBarButtons.size()); } void ViewTabBar::AddTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton, + const css::drawing::framework::TabBarButton& rButton, sal_Int32 nPosition) { if (nPosition>=0 @@ -463,7 +463,7 @@ void ViewTabBar::AddTabBarButton ( } void ViewTabBar::RemoveTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton) + const css::drawing::framework::TabBarButton& rButton) { sal_uInt16 nIndex; for (nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex) @@ -479,7 +479,7 @@ void ViewTabBar::RemoveTabBarButton ( } bool ViewTabBar::HasTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton) + const css::drawing::framework::TabBarButton& rButton) { bool bResult (false); @@ -495,11 +495,11 @@ bool ViewTabBar::HasTabBarButton ( return bResult; } -::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> +css::uno::Sequence<css::drawing::framework::TabBarButton> ViewTabBar::GetTabBarButtons() { sal_uInt32 nCount (maTabBarButtons.size()); - ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> + css::uno::Sequence<css::drawing::framework::TabBarButton> aList (nCount); for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex) diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 1fa225f8aa51..c786f6251054 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -375,7 +375,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) bLeftToRight = false; } else - bLeftToRight = static_cast<const SvxWritingModeItem&>( aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == com::sun::star::text::WritingMode_LR_TB; + bLeftToRight = static_cast<const SvxWritingModeItem&>( aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == css::text::WritingMode_LR_TB; rSet.Put( SfxBoolItem( SID_TEXTDIRECTION_LEFT_TO_RIGHT, bLeftToRight ) ); rSet.Put( SfxBoolItem( SID_TEXTDIRECTION_TOP_TO_BOTTOM, !bLeftToRight ) ); @@ -537,11 +537,11 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) case FRMDIR_ENVIRONMENT: { SdDrawDocument& rDoc = mpView->GetDoc(); - ::com::sun::star::text::WritingMode eMode = rDoc.GetDefaultWritingMode(); + css::text::WritingMode eMode = rDoc.GetDefaultWritingMode(); bool bIsLeftToRight(false); - if(::com::sun::star::text::WritingMode_LR_TB == eMode - || ::com::sun::star::text::WritingMode_TB_RL == eMode) + if(css::text::WritingMode_LR_TB == eMode + || css::text::WritingMode_TB_RL == eMode) { bIsLeftToRight = true; } diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index a34745db6d32..a163d36fefd2 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -310,7 +310,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) SfxItemSet aAttr( mpView->GetDoc().GetPool(), SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, 0 ); aAttr.Put( SvxWritingModeItem( nSlot == SID_TEXTDIRECTION_LEFT_TO_RIGHT ? - com::sun::star::text::WritingMode_LR_TB : com::sun::star::text::WritingMode_TB_RL, + css::text::WritingMode_LR_TB : css::text::WritingMode_TB_RL, SDRATTR_TEXTDIRECTION ) ); rReq.Done( aAttr ); mpView->SetAttributes( aAttr ); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 77f3df741c54..e7b2bed58960 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -241,7 +241,7 @@ void DrawViewShell::SelectionHasChanged() } } } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( OString(OString("sd::DrawViewShell::SelectionHasChanged(), " diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index ed339232a135..0542f0c928aa 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1290,12 +1290,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { try { - const ::com::sun::star::uno::Sequence< ::com::sun::star::scanner::ScannerContext > + const css::uno::Sequence< css::scanner::ScannerContext > aContexts( mxScannerManager->getAvailableScanners() ); if( aContexts.getLength() ) { - ::com::sun::star::scanner::ScannerContext aContext( aContexts.getConstArray()[ 0 ] ); + css::scanner::ScannerContext aContext( aContexts.getConstArray()[ 0 ] ); mxScannerManager->configureScannerAndScan( aContext, mxScannerListener ); } } @@ -1317,7 +1317,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { try { - const ::com::sun::star::uno::Sequence< ::com::sun::star::scanner::ScannerContext > aContexts( mxScannerManager->getAvailableScanners() ); + const css::uno::Sequence< css::scanner::ScannerContext > aContexts( mxScannerManager->getAvailableScanners() ); if( aContexts.getLength() ) { @@ -2038,7 +2038,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) css::uno::Reference < css::ui::dialogs::XExecutableDialog > xDialog = css::ui::dialogs::XSLTFilterDialog::create( ::comphelper::getProcessComponentContext() ); xDialog->execute(); } - catch( ::com::sun::star::uno::RuntimeException& ) + catch( css::uno::RuntimeException& ) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 9203b5f19f05..3446b8a57b2d 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -896,7 +896,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) maMarkRect = mpDrawView->GetAllMarkedRect(); - const bool bRTL = GetDoc() && GetDoc()->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB; + const bool bRTL = GetDoc() && GetDoc()->GetDefaultWritingMode() == css::text::WritingMode_RL_TB; rSet.Put(SfxBoolItem(SID_RULER_TEXT_RIGHT_TO_LEFT, bRTL)); if( mpDrawView->AreObjectsMarked() ) @@ -970,7 +970,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) if( aEditAttr.GetItemState( EE_PARA_WRITINGDIR ) >= SfxItemState::DEFAULT ) { const SvxFrameDirectionItem& rItem = static_cast<const SvxFrameDirectionItem&>( aEditAttr.Get( EE_PARA_WRITINGDIR ) ); - rSet.Put(SfxBoolItem(SID_RULER_TEXT_RIGHT_TO_LEFT, rItem.GetValue() == ::com::sun::star::text::WritingMode_RL_TB)); + rSet.Put(SfxBoolItem(SID_RULER_TEXT_RIGHT_TO_LEFT, rItem.GetValue() == css::text::WritingMode_RL_TB)); } } } diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index a4174b406224..a789e8e751ef 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -440,7 +440,7 @@ void DrawViewShell::HidePage() pFormShell->PrepareClose(false); } -void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) +void DrawViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); @@ -452,14 +452,14 @@ void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < :: rSequence[nIndex].Value <<= mbZoomOnPage; } -void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) +void DrawViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); ViewShell::ReadUserDataSequence( rSequence, bBrowse ); const sal_Int32 nLength = rSequence.getLength(); - const com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray(); + const css::beans::PropertyValue *pValue = rSequence.getConstArray(); for (sal_Int32 i = 0 ; i < nLength; i++, pValue++ ) { if ( pValue->Name == sUNO_View_ZoomOnPage ) @@ -535,8 +535,7 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect) <type>AccessibleDrawDocumentView</type>. Otherwise return an empty reference. */ -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> +css::uno::Reference<css::accessibility::XAccessible> DrawViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow) { if (GetViewShellBase().GetController() != NULL) @@ -548,14 +547,13 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect) GetViewShellBase().GetController(), pWindow->GetAccessibleParentWindow()->GetAccessible()); pDocumentView->Init(); - return ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - (static_cast< ::com::sun::star::uno::XWeak*>(pDocumentView), - ::com::sun::star::uno::UNO_QUERY); + return css::uno::Reference<css::accessibility::XAccessible> + (static_cast< css::uno::XWeak*>(pDocumentView), + css::uno::UNO_QUERY); } OSL_TRACE ("DrawViewShell::CreateAccessibleDocumentView: no controller"); - return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>(); + return css::uno::Reference< css::accessibility::XAccessible>(); } int DrawViewShell::GetActiveTabLayerIndex() const @@ -582,7 +580,7 @@ void DrawViewShell::SetActiveTabLayerIndex (int nIndex) css::uno::Reference<SdUnoDrawView> pUnoDrawView(new SdUnoDrawView ( *this, *GetView())); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> rLayer = pUnoDrawView->getActiveLayer(); + css::uno::Reference< css::drawing::XLayer> rLayer = pUnoDrawView->getActiveLayer(); GetViewShellBase().GetDrawController().fireChangeLayer( &rLayer ); } } diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index c1d409e6727b..75c1a1c40baf 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -45,16 +45,16 @@ namespace sd { -void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) +void DrawViewShell::ScannerEvent( const css::lang::EventObject& ) { if( mxScannerManager.is() ) { - const ::com::sun::star::scanner::ScannerContext aContext( mxScannerManager->getAvailableScanners().getConstArray()[ 0 ] ); - const ::com::sun::star::scanner::ScanError eError = mxScannerManager->getError( aContext ); + const css::scanner::ScannerContext aContext( mxScannerManager->getAvailableScanners().getConstArray()[ 0 ] ); + const css::scanner::ScanError eError = mxScannerManager->getError( aContext ); - if( ::com::sun::star::scanner::ScanError_ScanErrorNone == eError ) + if( css::scanner::ScanError_ScanErrorNone == eError ) { - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBitmap( mxScannerManager->getBitmap( aContext ) ); + const css::uno::Reference< css::awt::XBitmap > xBitmap( mxScannerManager->getBitmap( aContext ) ); if( xBitmap.is() ) { diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 8ea4492db6e2..77af9534bf18 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -82,7 +82,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) sal_Int8 nType( pGalleryItem->GetType() ); // insert graphic - if (nType == com::sun::star::gallery::GalleryItemType::GRAPHIC) + if (nType == css::gallery::GalleryItemType::GRAPHIC) { Graphic aGraphic( pGalleryItem->GetGraphic() ); @@ -174,7 +174,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) } } // insert sound - else if( nType == com::sun::star::gallery::GalleryItemType::MEDIA ) + else if( nType == css::gallery::GalleryItemType::MEDIA ) { const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGalleryItem->GetURL() ); GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, &aMediaURLItem, 0L ); diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index c1f65c78b39f..46f460d101bc 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -396,7 +396,7 @@ static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines ) } #define addValue( n, v ) push_back( std::pair< OUString, Any >( OUString( n ), v ) ) -void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rValues, bool ) +void FrameView::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rValues, bool ) { std::vector< std::pair< OUString, Any > > aUserData; @@ -546,7 +546,7 @@ static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList& } } -void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool ) +void FrameView::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool ) { const sal_Int32 nLength = rSequence.getLength(); if (nLength) @@ -565,7 +565,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : sal_Int32 aSnapGridWidthYNum = GetSnapGridWidthY().GetNumerator(); sal_Int32 aSnapGridWidthYDom = GetSnapGridWidthY().GetDenominator(); - const com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray(); + const css::beans::PropertyValue *pValue = rSequence.getConstArray(); for (sal_Int32 i = 0 ; i < nLength; i++, pValue++ ) { if ( pValue->Name == sUNO_View_ViewId ) diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index feedfac3d24a..88d743db6671 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1821,14 +1821,14 @@ sal_uLong OutlineViewShell::Read(SvStream& rInput, const OUString& rBaseURL, sal return bRet; } -void OutlineViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) +void OutlineViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); ViewShell::WriteUserDataSequence( rSequence, bBrowse ); } -void OutlineViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) +void OutlineViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); @@ -1848,8 +1848,7 @@ void OutlineViewShell::VisAreaChanged(const Rectangle& rRect) <type>AccessibleDrawDocumentView</type>. Otherwise return an empty reference. */ -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> +css::uno::Reference<css::accessibility::XAccessible> OutlineViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow) { OSL_ASSERT (GetViewShell()!=NULL); @@ -1862,14 +1861,13 @@ void OutlineViewShell::VisAreaChanged(const Rectangle& rRect) GetViewShell()->GetController(), pWindow->GetAccessibleParentWindow()->GetAccessible()); pDocumentView->Init(); - return ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - (static_cast< ::com::sun::star::uno::XWeak*>(pDocumentView), - ::com::sun::star::uno::UNO_QUERY); + return css::uno::Reference<css::accessibility::XAccessible> + (static_cast< css::uno::XWeak*>(pDocumentView), + css::uno::UNO_QUERY); } OSL_TRACE ("OutlineViewShell::CreateAccessibleDocumentView: no controller"); - return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >(); + return css::uno::Reference< css::accessibility::XAccessible >(); } void OutlineViewShell::GetState (SfxItemSet& rSet) diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index d5db95d33189..789e405c780f 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -425,7 +425,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP const ::std::vector< double > aDXArray{}; // create locale; this may need some more information in the future - const ::com::sun::star::lang::Locale aLocale; + const css::lang::Locale aLocale; // create primitive and add const drawinglayer::primitive2d::Primitive2DReference xRef( diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index d6c72e006d38..917e2ae2d336 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -94,12 +94,12 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent {} }; -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, vcl::Window& ) +css::uno::Reference< css::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, vcl::Window& ) { // since SdTransferable::CopyToClipboard is called, this // dynamically created object ist destroyed automatically SdTransferable* pTransferable = new SdTransferable( &mrDoc, NULL, false ); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); + css::uno::Reference< css::datatransfer::XTransferable > xRet( pTransferable ); SD_MOD()->pTransferClip = pTransferable; @@ -157,10 +157,10 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, vcl::Window& rWindow, const Point& rDragPos ) +css::uno::Reference< css::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, vcl::Window& rWindow, const Point& rDragPos ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, false ); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); + css::uno::Reference< css::datatransfer::XTransferable > xRet( pTransferable ); SD_MOD()->pTransferDrag = pTransferable; @@ -206,10 +206,10 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, vcl::Window& rWindow ) +css::uno::Reference< css::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, vcl::Window& rWindow ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, true ); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); + css::uno::Reference< css::datatransfer::XTransferable > xRet( pTransferable ); TransferableObjectDescriptor aObjDesc; const Rectangle aMarkRect( GetAllMarkedRect() ); OUString aDisplayName; diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index ad0d304cb660..4e32d934ca00 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -674,7 +674,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, Reference< XComponent > xComponent( xShell->GetModel(), UNO_QUERY ); xStm->Seek( 0 ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xInputStream( new utl::OInputStreamWrapper( *xStm ) ); + css::uno::Reference< css::io::XInputStream > xInputStream( new utl::OInputStreamWrapper( *xStm ) ); bReturn = SvxDrawingLayerImport( pModel, xInputStream, xComponent, "com.sun.star.comp.Impress.XMLOasisImporter" ); if( pModel->GetPageCount() == 0 ) diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 2f5330726a4d..fe98667f2d39 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -948,8 +948,7 @@ void Window::DropScroll(const Point& rMousePos) } } -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> +css::uno::Reference<css::accessibility::XAccessible> Window::CreateAccessible() { // If current viewshell is PresentationViewShell, just return empty because the correct ShowWin will be created later. @@ -957,7 +956,7 @@ void Window::DropScroll(const Point& rMousePos) { return vcl::Window::CreateAccessible (); } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(false); + css::uno::Reference< css::accessibility::XAccessible > xAcc = GetAccessible(false); if (xAcc.get()) { return xAcc; diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 4f92351f2638..f293c001881b 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1360,14 +1360,12 @@ void ViewShell::ExecReq( SfxRequest& rReq ) /** This default implementation returns only an empty reference. See derived classes for more interesting examples. */ -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> +css::uno::Reference<css::accessibility::XAccessible> ViewShell::CreateAccessibleDocumentView (::sd::Window* ) { OSL_FAIL("ViewShell::CreateAccessibleDocumentView should not be called!, perhaps Meyers, 3rd edition, Item 9:\n"); - return ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> (); + return css::uno::Reference<css::accessibility::XAccessible> (); } ::sd::WindowUpdater* ViewShell::GetWindowUpdater() const @@ -1542,7 +1540,7 @@ bool ViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) return true; } -void ViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ) +void ViewShell::SwitchViewFireFocus(css::uno::Reference< css::accessibility::XAccessible > xAcc ) { if (xAcc.get()) { |