diff options
Diffstat (limited to 'sc/source/ui')
131 files changed, 1335 insertions, 1426 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 337d91b531f1..e50345fc7b29 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -509,8 +509,8 @@ static OUString ReplaceFourChar(const OUString& oldOUString) } uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -543,7 +543,7 @@ uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes() } // cell has its own ParaIndent property, so when calling character attributes on cell, the ParaIndent should replace the ParaLeftMargin if its value is not zero. -uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) +uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 8cb2ab1b5bbc..b8d6f63d8084 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -316,7 +316,7 @@ bool ScAccessibleCellBase::IsEditable( } OUString SAL_CALL ScAccessibleCellBase::GetNote() - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { SolarMutexGuard aGuard; IsObjectValid(); @@ -365,7 +365,7 @@ OUString SAL_CALL ScAccessibleCellBase::GetNote() #include <com/sun/star/table/ShadowFormat.hpp> OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -448,7 +448,7 @@ OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs() #include <com/sun/star/table/BorderLine.hpp> OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -598,7 +598,7 @@ OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs() //end of cell attributes OUString SAL_CALL ScAccessibleCellBase::GetAllDisplayNote() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { OUString strNote; OUString strTrackText; diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index d28c3ddeb933..5fb03c99b8fd 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -434,7 +434,7 @@ sal_Unicode SAL_CALL ScAccessibleCsvRuler::getCharacter( sal_Int32 nIndex ) } Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes( sal_Int32 nIndex, - const ::com::sun::star::uno::Sequence< OUString >& /* aRequestedAttributes */ ) + const css::uno::Sequence< OUString >& /* aRequestedAttributes */ ) throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -702,7 +702,7 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::copyText( sal_Int32 /* nStartIndex */, s // XInterface ----------------------------------------------------------------- -Any SAL_CALL ScAccessibleCsvRuler::queryInterface( const ::com::sun::star::uno::Type& rType ) +Any SAL_CALL ScAccessibleCsvRuler::queryInterface( const css::uno::Type& rType ) throw( RuntimeException, std::exception ) { Any aAny( ScAccessibleCsvRulerImpl::queryInterface( rType ) ); @@ -728,9 +728,9 @@ OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeEx // XTypeProvider -------------------------------------------------------------- -Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception ) +Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception ) { - Sequence< ::com::sun::star::uno::Type > aSeq( 1 ); + Sequence< css::uno::Type > aSeq( 1 ); aSeq[ 0 ] = cppu::UnoType<XAccessibleText>::get(); return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq ); } @@ -1191,7 +1191,7 @@ void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedC // XInterface ----------------------------------------------------------------- -Any SAL_CALL ScAccessibleCsvGrid::queryInterface( const ::com::sun::star::uno::Type& rType ) +Any SAL_CALL ScAccessibleCsvGrid::queryInterface( const css::uno::Type& rType ) throw( RuntimeException, std::exception ) { Any aAny( ScAccessibleCsvGridImpl::queryInterface( rType ) ); @@ -1217,9 +1217,9 @@ OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeExc // XTypeProvider -------------------------------------------------------------- -Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception ) +Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception ) { - Sequence< ::com::sun::star::uno::Type > aSeq( 2 ); + Sequence< css::uno::Type > aSeq( 2 ); aSeq[ 0 ] = cppu::UnoType<XAccessibleTable>::get(); aSeq[ 1 ] = cppu::UnoType<XAccessibleSelection>::get(); return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq ); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 6efa9389e3ff..4b01f4311f9e 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -110,7 +110,7 @@ struct ScAccessibleShapeData ~ScAccessibleShapeData(); mutable rtl::Reference< ::accessibility::AccessibleShape > pAccShape; mutable ScAddress* pRelationCell; // if it is NULL this shape is anchored on the table - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape; + css::uno::Reference< css::drawing::XShape > xShape; mutable bool bSelected; bool bSelectable; }; @@ -263,19 +263,17 @@ public: virtual bool ReplaceChild ( ::accessibility::AccessibleShape* pCurrentChild, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, + const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException) override; + ) throw (css::uno::RuntimeException) override; virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel - (::com::sun::star::beans::XPropertySet* pSet) - throw (::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - GetAccessibleCaption (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException) override; + (css::beans::XPropertySet* pSet) + throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::accessibility::XAccessible> + GetAccessibleCaption (const css::uno::Reference<css::drawing::XShape>& xShape) + throw (css::uno::RuntimeException) override; ///===== Internal ======================================================== void SetDrawBroadcaster(); @@ -287,7 +285,7 @@ public: // gets the index of the shape starting on 0 (without the index of the table) // returns the selected shape bool IsSelected(sal_Int32 nIndex, - com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape) const; + css::uno::Reference<css::drawing::XShape>& rShape) const; bool SelectionChanged(); @@ -309,7 +307,7 @@ private: mutable SortedShapes maZOrderedShapes; // a null pointer represents the sheet in the correct order mutable ::accessibility::AccessibleShapeTreeInfo maShapeTreeInfo; - mutable com::sun::star::uno::Reference<com::sun::star::view::XSelectionSupplier> xSelectionSupplier; + mutable css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier; mutable size_t mnSdrObjCount; mutable sal_uInt32 mnShapesSelected; ScTabViewShell* mpViewShell; @@ -317,7 +315,7 @@ private: ScSplitPos meSplitPos; void FillShapes(std::vector < uno::Reference < drawing::XShape > >& rShapes) const; - bool FindSelectedShapesChanges(const com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>& xShapes, bool bCommitChange) const; + bool FindSelectedShapesChanges(const css::uno::Reference<css::drawing::XShapes>& xShapes, bool bCommitChange) const; void FillSelectionSupplier() const; ScAddress* GetAnchor(const uno::Reference<drawing::XShape>& xShape) const; @@ -449,7 +447,7 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const SfxHint& rHint) } bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentChild, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, + const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo) throw (uno::RuntimeException) { @@ -494,7 +492,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC return bResult; } -::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException) +::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException) { sal_Int32 count = GetCount(); for (sal_Int32 index=0;index<count;index++) @@ -514,9 +512,9 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC return NULL; } -::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > -ScChildrenShapes::GetAccessibleCaption (const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException) +css::uno::Reference < css::accessibility::XAccessible > +ScChildrenShapes::GetAccessibleCaption (const css::uno::Reference < css::drawing::XShape>& xShape) + throw (css::uno::RuntimeException) { sal_Int32 count = GetCount(); for (sal_Int32 index=0;index<count;index++) @@ -524,7 +522,7 @@ ScChildrenShapes::GetAccessibleCaption (const ::com::sun::star::uno::Reference < ScAccessibleShapeData* pShape = maZOrderedShapes[index]; if (pShape && pShape->xShape == xShape ) { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xNewChild( pShape->pAccShape.get() ); + css::uno::Reference< css::accessibility::XAccessible > xNewChild( pShape->pAccShape.get() ); if(xNewChild.get()) return xNewChild; } @@ -1695,11 +1693,11 @@ uno::Any SAL_CALL ScAccessibleDocument::queryInterface( uno::Type const & rType { uno::Any aAnyTmp; if(rType == cppu::UnoType<XAccessibleGetAccFlowTo>::get()) - { - com::sun::star::uno::Reference<XAccessibleGetAccFlowTo> AccFromXShape = this; - aAnyTmp <<= AccFromXShape; + { + css::uno::Reference<XAccessibleGetAccFlowTo> AccFromXShape = this; + aAnyTmp <<= AccFromXShape; return aAnyTmp; - } + } uno::Any aAny (ScAccessibleDocumentImpl::queryInterface(rType)); return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType); } @@ -1852,7 +1850,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL OUString SAL_CALL ScAccessibleDocument::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -2320,7 +2318,7 @@ ScAddress ScAccessibleDocument::GetCurCellAddress() const } uno::Any SAL_CALL ScAccessibleDocument::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -2347,7 +2345,7 @@ uno::Any SAL_CALL ScAccessibleDocument::getExtendedAttributes() return anyAtrribute; } -com::sun::star::uno::Sequence< com::sun::star::uno::Any > ScAccessibleDocument::GetScAccFlowToSequence() +css::uno::Sequence< css::uno::Any > ScAccessibleDocument::GetScAccFlowToSequence() { if ( getAccessibleChildCount() ) { @@ -2395,9 +2393,9 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Any > ScAccessibleDocument:: return aEmpty; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - SAL_CALL ScAccessibleDocument::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 ScAccessibleDocument::getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) + throw ( css::uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -2405,7 +2403,7 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Any > ScAccessibleDocument:: 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 ( xShape.is() ) { @@ -2451,9 +2449,9 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Any > ScAccessibleDocument:: uno::Reference < XAccessible > xChildSel = xAccChildSelection->getSelectedAccessibleChild( 0 ); if ( xChildSel.is() ) { - uno::Reference < ::com::sun::star::accessibility::XAccessibleContext > xChildSelContext( xChildSel->getAccessibleContext() ); + uno::Reference < css::accessibility::XAccessibleContext > xChildSelContext( xChildSel->getAccessibleContext() ); if ( xChildSelContext.is() && - xChildSelContext->getAccessibleRole() == ::com::sun::star::accessibility::AccessibleRole::PARAGRAPH ) + xChildSelContext->getAccessibleRole() == css::accessibility::AccessibleRole::PARAGRAPH ) { uno::Sequence<uno::Any> aRet( 1 ); aRet[0] = uno::makeAny( xChildSel ); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index a2c06dc0049e..1e88efead19b 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -572,7 +572,7 @@ struct ScShapeChild ScShapeChild(const ScShapeChild& rOld); ~ScShapeChild(); mutable rtl::Reference< ::accessibility::AccessibleShape > mpAccShape; - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; sal_Int32 mnRangeId; }; @@ -631,10 +631,10 @@ public: virtual bool ReplaceChild ( ::accessibility::AccessibleShape* pCurrentChild, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, + const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException) override; + ) throw (css::uno::RuntimeException) override; ///===== Internal ======================================================== @@ -836,7 +836,7 @@ void ScShapeChildren::VisAreaChanged() const ///===== IAccessibleParent ============================================== bool ScShapeChildren::ReplaceChild (::accessibility::AccessibleShape* /* pCurrentChild */, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& /* _rxShape */, + const css::uno::Reference< css::drawing::XShape >& /* _rxShape */, const long /* _nIndex */, const ::accessibility::AccessibleShapeTreeInfo& /* _rShapeTreeInfo */) throw (uno::RuntimeException) { @@ -1627,7 +1627,7 @@ ScShapeChildren* ScAccessibleDocumentPagePreview::GetShapeChildren() } OUString ScAccessibleDocumentPagePreview::getAccessibleName() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index f0dc5ef604a3..5d9cdfda931d 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -127,14 +127,14 @@ void ScAccessibleEditObject::GotFocus() //===== XInterface ========================================================== -com::sun::star::uno::Any SAL_CALL - ScAccessibleEditObject::queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL + ScAccessibleEditObject::queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aReturn = ScAccessibleContextBase::queryInterface (rType); + css::uno::Any aReturn = ScAccessibleContextBase::queryInterface (rType); if ( ! aReturn.hasValue()) aReturn = ::cppu::queryInterface (rType, - static_cast< ::com::sun::star::accessibility::XAccessibleSelection* >(this) + static_cast< css::accessibility::XAccessibleSelection* >(this) ); return aReturn; } @@ -397,13 +397,13 @@ void ScAccessibleEditObject::CreateTextHelper() } sal_Int32 SAL_CALL ScAccessibleEditObject::getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return GetFgBgColor(OUString(SC_UNONAME_CCOLOR)); } sal_Int32 SAL_CALL ScAccessibleEditObject::getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return GetFgBgColor(OUString(SC_UNONAME_CELLBACK)); } @@ -464,7 +464,7 @@ throw ( IndexOutOfBoundsException, { if( xContext->getAccessibleRole() == AccessibleRole::PARAGRAPH ) { - uno::Reference< ::com::sun::star::accessibility::XAccessibleText > + uno::Reference< css::accessibility::XAccessibleText > xText(xAcc, uno::UNO_QUERY); if( xText.is() ) { diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index cefd8621a1f0..2cb914dfed5a 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -94,7 +94,7 @@ ScAccessibleFilterMenu::~ScAccessibleFilterMenu() // XAccessibleComponent -Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleAtPoint( const ::com::sun::star::awt::Point& /*rPoint*/ ) +Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleAtPoint( const css::awt::Point& /*rPoint*/ ) throw (RuntimeException, std::exception) { return this; @@ -160,18 +160,16 @@ OUString ScAccessibleFilterMenu::getImplementationName() // XAccessibleEventBroadcaster void ScAccessibleFilterMenu::addAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) + throw (css::uno::RuntimeException, std::exception) { ScAccessibleContextBase::addAccessibleEventListener(xListener); for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, true)); } void ScAccessibleFilterMenu::removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) + throw (css::uno::RuntimeException, std::exception) { ScAccessibleContextBase::removeAccessibleEventListener(xListener); for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, false)); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 2a72f783073e..72ce834e4f78 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -82,8 +82,7 @@ struct Dispose } }; -ScAccessiblePageHeader::ScAccessiblePageHeader( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, +ScAccessiblePageHeader::ScAccessiblePageHeader( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, bool bHeader, sal_Int32 nIndex ) : ScAccessibleContextBase( rxParent, bHeader ? AccessibleRole::HEADER : AccessibleRole::FOOTER ), mpViewShell( pViewShell ), diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index d1d83b9a98c2..d22ddfdd6acb 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -261,7 +261,7 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName() } Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen() const - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { Rectangle aRect; if (mxParent.is()) @@ -278,7 +278,7 @@ Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen() const } Rectangle ScAccessiblePageHeaderArea::GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { Rectangle aRect; if (mxParent.is()) diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 810befd1f879..54c2a246855c 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -46,9 +46,9 @@ using namespace ::com::sun::star::accessibility; //===== internal ============================================================ -ScAccessiblePreviewCell::ScAccessiblePreviewCell( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, - ScPreviewShell* pViewShell, /* const */ ScAddress& rCellAddress, +ScAccessiblePreviewCell::ScAccessiblePreviewCell( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, + ScPreviewShell* pViewShell, + /* const */ ScAddress& rCellAddress, sal_Int32 nIndex ) : ScAccessibleCellBase( rxParent, ( pViewShell ? &pViewShell->GetDocument() : NULL ), rCellAddress, nIndex ), mpViewShell( pViewShell ), diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 4fd177c0431d..5701e538bb88 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -77,8 +77,7 @@ using namespace ::com::sun::star::accessibility; //===== internal ============================================================ -ScAccessiblePreviewHeaderCell::ScAccessiblePreviewHeaderCell( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, +ScAccessiblePreviewHeaderCell::ScAccessiblePreviewHeaderCell( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, const ScAddress& rCellPos, bool bIsColHdr, bool bIsRowHdr, sal_Int32 nIndex ) : diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index c63bf05e2eed..947b988d81fd 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -46,8 +46,7 @@ using namespace ::com::sun::star::accessibility; //===== internal ============================================================ -ScAccessiblePreviewTable::ScAccessiblePreviewTable( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, +ScAccessiblePreviewTable::ScAccessiblePreviewTable( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, sal_Int32 nIndex ) : ScAccessibleContextBase( rxParent, AccessibleRole::TABLE ), mpViewShell( pViewShell ), diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 7744dda8cde6..8c85c4518c6d 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -472,14 +472,14 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint sal_uInt16 nTab = rViewData.GetTabNo(); ScRange aMarkRange; refScMarkData.GetMarkArea(aMarkRange); - aEvent.OldValue <<= ::com::sun::star::uno::Any(); + aEvent.OldValue <<= css::uno::Any(); //Mark All if ( !bNewPosCellFocus && (bNewMarked || bIsMark || bIsMultMark ) && aMarkRange == ScRange( 0,0,nTab, MAXCOL,MAXROW,nTab ) ) { aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN; - aEvent.NewValue <<= ::com::sun::star::uno::Any(); + aEvent.NewValue <<= css::uno::Any(); CommitChange(aEvent); return ; } @@ -511,7 +511,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint if( !bSelSmaller ) { aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN; - aEvent.NewValue <<= ::com::sun::star::uno::Any(); + aEvent.NewValue <<= css::uno::Any(); CommitChange(aEvent); } m_aLastWithInMarkRange = aMarkRange; @@ -569,7 +569,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint if(CalcScRangeListDifferenceMax(mpMarkedRanges,&m_LastMarkedRanges,10,vecNew)) { aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN; - aEvent.NewValue <<= ::com::sun::star::uno::Any(); + aEvent.NewValue <<= css::uno::Any(); CommitChange(aEvent); } else @@ -725,7 +725,7 @@ void ScAccessibleSpreadsheet::RemoveSelection(ScMarkData &refScMarkData) { AccessibleEventObject aEvent; aEvent.Source = uno::Reference< XAccessible >(this); - aEvent.OldValue <<= ::com::sun::star::uno::Any(); + aEvent.OldValue <<= css::uno::Any(); MAP_ADDR_XACC::iterator miRemove = m_mapSelectionSend.begin(); for(; miRemove != m_mapSelectionSend.end() ;) { @@ -1002,7 +1002,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleAtP try { xAccessible = getAccessibleCellAt(nY, nX); } - catch(const ::com::sun::star::lang::IndexOutOfBoundsException &) + catch(const css::lang::IndexOutOfBoundsException &) { return NULL; } @@ -1039,7 +1039,7 @@ sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground( ) //===== XAccessibleContext ============================================== uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { utl::AccessibleRelationSetHelper* pRelationSet = NULL; if(mpAccDoc) @@ -1619,7 +1619,7 @@ void ScAccessibleSpreadsheet::NotifyRefMode() if ( nNewSize > 10 ) { aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN; - aEvent.NewValue <<= ::com::sun::star::uno::Any(); + aEvent.NewValue <<= css::uno::Any(); CommitChange(aEvent); } else @@ -1655,7 +1655,7 @@ void ScAccessibleSpreadsheet::RemoveFormulaSelection(bool bRemoveAll ) { AccessibleEventObject aEvent; aEvent.Source = uno::Reference< XAccessible >(this); - aEvent.OldValue <<= ::com::sun::star::uno::Any(); + aEvent.OldValue <<= css::uno::Any(); MAP_ADDR_XACC::iterator miRemove = m_mapFormulaSelectionSend.begin(); for(; miRemove != m_mapFormulaSelectionSend.end() ;) { diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 53bcf60cf887..8d28ef2ba354 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -448,7 +448,7 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c } bool ScDrawTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, - const ::com::sun::star::datatransfer::DataFlavor& /* rFlavor */ ) + const css::datatransfer::DataFlavor& /* rFlavor */ ) { // called from SetObject, put data into stream @@ -486,7 +486,7 @@ bool ScDrawTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, voi } { - 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( pDrawModel, xDocOut ) ) rxOStm->Commit(); } @@ -776,12 +776,12 @@ namespace class theScDrawTransferObjUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScDrawTransferObjUnoTunnelId > {}; } -const com::sun::star::uno::Sequence< sal_Int8 >& ScDrawTransferObj::getUnoTunnelId() +const css::uno::Sequence< sal_Int8 >& ScDrawTransferObj::getUnoTunnelId() { return theScDrawTransferObjUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) { sal_Int64 nRet; if( ( rId.getLength() == 16 ) && diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 9d5567df845b..56ccb3623d6a 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -703,13 +703,13 @@ void ScInputHandler::UpdateSpellSettings( bool bFromStartTab ) // Language is set separately, so the speller is needed only if online spelling is active if ( bOnlineSpell ) { - com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> xXSpellChecker1( LinguMgr::GetSpellChecker() ); + css::uno::Reference<css::linguistic2::XSpellChecker1> xXSpellChecker1( LinguMgr::GetSpellChecker() ); pEngine->SetSpeller( xXSpellChecker1 ); } bool bHyphen = pLastPattern && static_cast<const SfxBoolItem&>(pLastPattern->GetItem(ATTR_HYPHENATE)).GetValue(); if ( bHyphen ) { - com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); + css::uno::Reference<css::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); pEngine->SetHyphenator( xXHyphenator ); } } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index ae0554381779..f50615cbd6df 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1109,12 +1109,12 @@ void ScInputBarGroup::TriggerToolboxLayout() if ( pViewFrm ) { - Reference< com::sun::star::beans::XPropertySet > xPropSet( pViewFrm->GetFrame().GetFrameInterface(), UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::beans::XPropertySet > xPropSet( pViewFrm->GetFrame().GetFrameInterface(), UNO_QUERY ); + Reference< css::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); + css::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; } @@ -2023,7 +2023,7 @@ void ScTextWnd::ImplInitSettings() Invalidate(); } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ScTextWnd::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > ScTextWnd::CreateAccessible() { return new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), NULL, this, OUString(ScResId(STR_ACC_EDITLINE_NAME)), diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index c1ba649ad4e2..37ac39c0f8fd 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -277,7 +277,7 @@ void ScDLL::Init() // Add 3DObject Factory E3dObjFactory(); - // Add ::com::sun::star::form::component::FormObject Factory + // Add css::form::component::FormObject Factory FmFormObjFactory(); pMod->PutItem( SfxUInt16Item( SID_ATTR_METRIC, sal::static_int_cast<sal_uInt16>(pMod->GetAppOptions().GetAppMetric()) ) ); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 833eaeef18ca..72982730cc0b 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -551,7 +551,7 @@ void ScModule::Execute( 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(); } @@ -2256,9 +2256,9 @@ void ScModule::GetSpellSettings( sal_uInt16& rDefLang, sal_uInt16& rCjkLang, sal SvtLinguOptions aOptions; aConfig.GetOptions( aOptions ); - rDefLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN); - rCjkLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN); - rCtlLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX); + rDefLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, css::i18n::ScriptType::LATIN); + rCjkLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN); + rCtlLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX); rAutoSpell = aOptions.bIsSpellAuto; } diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index f137e6562e8c..15ac5ad51f87 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -837,12 +837,12 @@ namespace class theScTransferUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScTransferUnoTunnelId> {}; } -const com::sun::star::uno::Sequence< sal_Int8 >& ScTransferObj::getUnoTunnelId() +const css::uno::Sequence< sal_Int8 >& ScTransferObj::getUnoTunnelId() { return theScTransferUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL ScTransferObj::getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL ScTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) { sal_Int64 nRet; if( ( rId.getLength() == 16 ) && diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 9a7998849075..0ffeb65b9061 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -177,10 +177,10 @@ SfxPoolItem* ScSortItem::Clone( SfxItemPool * ) const return new ScSortItem( *this ); } -bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const +bool ScSortItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const { // Return empty value as there is no useful conversion - rVal = com::sun::star::uno::Any(); + rVal = css::uno::Any(); return true; } @@ -312,10 +312,10 @@ SfxPoolItem* ScSubTotalItem::Clone( SfxItemPool * ) const return new ScSubTotalItem( *this ); } -bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const +bool ScSubTotalItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const { // Return empty value as there is no useful conversion - rVal = com::sun::star::uno::Any(); + rVal = css::uno::Any(); return true; } diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 9fd856a41e90..b4881436ded6 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -495,7 +495,7 @@ sal_uInt16 AbstractScDPFunctionDlg_Impl::GetFuncMask() const return pDlg->GetFuncMask(); } -::com::sun::star::sheet::DataPilotFieldReference AbstractScDPFunctionDlg_Impl::GetFieldRef() const +css::sheet::DataPilotFieldReference AbstractScDPFunctionDlg_Impl::GetFieldRef() const { return pDlg->GetFieldRef(); } @@ -663,7 +663,7 @@ AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilo } AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( vcl::Window* pParent, - const com::sun::star::uno::Sequence<OUString>& rServices, + const css::uno::Sequence<OUString>& rServices, int nId ) { VclPtr<ScDataPilotServiceDlg> pDlg; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 491514e8d229..75f73d39fcc4 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -293,7 +293,7 @@ class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg { DECL_ABSTDLG_BASE( AbstractScDPFunctionDlg_Impl, ScDPFunctionDlg) virtual sal_uInt16 GetFuncMask() const override; - virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const override; + virtual css::sheet::DataPilotFieldReference GetFieldRef() const override; }; class AbstractScDPSubtotalDlg_Impl : public AbstractScDPSubtotalDlg @@ -417,7 +417,7 @@ public: bool bEnableExternal) override; virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( vcl::Window* pParent, - const com::sun::star::uno::Sequence<OUString>& rServices, + const css::uno::Sequence<OUString>& rServices, int nId ) override; virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false ) override; diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 79d4b92b2b1e..db81464a9850 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -84,8 +84,8 @@ VclPtr<vcl::Window> ScZoomSliderControl::CreateItemWindow( vcl::Window *pParent // #i98000# Don't try to get a value via SfxViewFrame::Current here. // The view's value is always notified via StateChanged later. VclPtrInstance<ScZoomSliderWnd> pSlider( pParent, - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >( m_xFrame->getController(), - ::com::sun::star::uno::UNO_QUERY ), m_xFrame, 100 ); + css::uno::Reference< css::frame::XDispatchProvider >( m_xFrame->getController(), + css::uno::UNO_QUERY ), m_xFrame, 100 ); return pSlider.get(); } @@ -216,8 +216,10 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const return nRect; } -ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , sal_uInt16 nCurrentZoom ): +ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, + const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, + const css::uno::Reference< css::frame::XFrame >& _xFrame, + sal_uInt16 nCurrentZoom ): Window( pParent ), mpImpl( new ScZoomSliderWnd_Impl( nCurrentZoom ) ), aLogicalSize( 115, 40 ), @@ -286,10 +288,10 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom ); - ::com::sun::star::uno::Any a; + css::uno::Any a; aZoomSliderItem.QueryValue( a ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = "ScalingFactor"; aArgs[0].Value = a; @@ -324,10 +326,10 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) // commit state change SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom ); - ::com::sun::star::uno::Any a; + css::uno::Any a; aZoomSliderItem.QueryValue( a ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = "ScalingFactor"; aArgs[0].Value = a; @@ -351,7 +353,7 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) mpImpl->mnMaxZoom >= mpImpl->mnCurrentZoom && mpImpl->mnMaxZoom > mpImpl->mnSliderCenter, "Looks like the zoom slider item is corrupted" ); - const com::sun::star::uno::Sequence < sal_Int32 > rSnappingPoints = pZoomSliderItem->GetSnappingPoints(); + const css::uno::Sequence < sal_Int32 > rSnappingPoints = pZoomSliderItem->GetSnappingPoints(); mpImpl->maSnappingPointOffsets.clear(); mpImpl->maSnappingPointZooms.clear(); diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index e28d4284a880..8db25e49938f 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -33,13 +33,13 @@ namespace { /** Date part flags in order of the list box entries. */ static const sal_Int32 spnDateParts[] = { - com::sun::star::sheet::DataPilotFieldGroupBy::SECONDS, - com::sun::star::sheet::DataPilotFieldGroupBy::MINUTES, - com::sun::star::sheet::DataPilotFieldGroupBy::HOURS, - com::sun::star::sheet::DataPilotFieldGroupBy::DAYS, - com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS, - com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS, - com::sun::star::sheet::DataPilotFieldGroupBy::YEARS + css::sheet::DataPilotFieldGroupBy::SECONDS, + css::sheet::DataPilotFieldGroupBy::MINUTES, + css::sheet::DataPilotFieldGroupBy::HOURS, + css::sheet::DataPilotFieldGroupBy::DAYS, + css::sheet::DataPilotFieldGroupBy::MONTHS, + css::sheet::DataPilotFieldGroupBy::QUARTERS, + css::sheet::DataPilotFieldGroupBy::YEARS }; static const sal_uInt16 nDatePartResIds[] = @@ -238,7 +238,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( vcl::Window* pParent, maEndHelper.SetValue( rInfo.mbAutoEnd, rInfo.mfEnd ); if( nDatePart == 0 ) - nDatePart = com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS; + nDatePart = css::sheet::DataPilotFieldGroupBy::MONTHS; for( size_t nIdx = 0; nIdx < nCount; ++nIdx ) mpLbUnits->CheckEntryPos( static_cast< sal_uInt16 >( nIdx ), (nDatePart & spnDateParts[ nIdx ]) != 0 ); @@ -321,7 +321,7 @@ sal_Int32 ScDPDateGroupDlg::GetDatePart() const { // return DAYS for special "number of days" mode if( mpRbNumDays->IsChecked() ) - return com::sun::star::sheet::DataPilotFieldGroupBy::DAYS; + return css::sheet::DataPilotFieldGroupBy::DAYS; // return listbox contents for "units" mode sal_Int32 nDatePart = 0; diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 5adb2108a3bd..df1829fcbf8d 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -101,7 +101,7 @@ void ScAreaLink::Edit(vcl::Window* pParent, const Link<SvBaseLink&,void>& /* rEn } ::sfx2::SvBaseLink::UpdateResult ScAreaLink::DataChanged( - const OUString&, const ::com::sun::star::uno::Any& ) + const OUString&, const css::uno::Any& ) { // bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im // LinkManager zu setzen, ohne die Daten im Dokument zu aendern diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 81c3555e1369..0fb15fdce41c 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -431,7 +431,7 @@ void processDataStream( ScDocShell& rShell, const sc::ImportPostProcessData& rDa } -bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor ) +bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const css::uno::Reference< css::embed::XStorage >& xStor ) { LoadMediumGuard aLoadGuard(&aDocument); @@ -513,7 +513,7 @@ bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::R return bRet; } -bool ScDocShell::SaveXML( SfxMedium* pSaveMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor ) +bool ScDocShell::SaveXML( SfxMedium* pSaveMedium, const css::uno::Reference< css::embed::XStorage >& xStor ) { aDocument.EnableIdle(false); @@ -569,7 +569,7 @@ bool ScDocShell::Load( SfxMedium& rMedium ) if (GetMedium()) { const SfxUInt16Item* pUpdateDocItem = SfxItemSet::GetItem<SfxUInt16Item>(rMedium.GetItemSet(), SID_UPDATEDOCMODE, false); - nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE; + nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : css::document::UpdateDocMode::NO_UPDATE; } { @@ -984,7 +984,7 @@ bool ScDocShell::LoadFrom( SfxMedium& rMedium ) if (GetMedium()) { const SfxUInt16Item* pUpdateDocItem = SfxItemSet::GetItem<SfxUInt16Item>(rMedium.GetItemSet(), SID_UPDATEDOCMODE, false); - nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE; + nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : css::document::UpdateDocMode::NO_UPDATE; } // until loading/saving only the styles in XML is implemented, @@ -1053,7 +1053,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) rMedium.GetPhysicalName(); //! Call CreateFileStream directly, if available const SfxUInt16Item* pUpdateDocItem = SfxItemSet::GetItem<SfxUInt16Item>(rMedium.GetItemSet(), SID_UPDATEDOCMODE, false); - nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE; + nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : css::document::UpdateDocMode::NO_UPDATE; const SfxFilter* pFilter = rMedium.GetFilter(); if (pFilter) @@ -2646,7 +2646,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : bDocumentModifiedPending( false ), bUpdateEnabled ( true ), nDocumentLock ( 0 ), - nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), + nCanUpdate (css::document::UpdateDocMode::ACCORDING_TO_CONFIG), pOldAutoDBRange ( NULL ), pDocHelper ( NULL ), pAutoStyleList ( NULL ), @@ -2691,7 +2691,7 @@ ScDocShell::ScDocShell( const SfxModelFlags i_nSfxCreationFlags ) : bDocumentModifiedPending( false ), bUpdateEnabled ( true ), nDocumentLock ( 0 ), - nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), + nCanUpdate (css::document::UpdateDocMode::ACCORDING_TO_CONFIG), pOldAutoDBRange ( NULL ), pDocHelper ( NULL ), pAutoStyleList ( NULL ), @@ -3157,13 +3157,13 @@ bool ScDocShell::SetProtectionPassword( const OUString &rNewPassword ) // when password protection is applied change tracking must always be active SetChangeRecording( true ); - ::com::sun::star::uno::Sequence< sal_Int8 > aProtectionHash; + css::uno::Sequence< sal_Int8 > aProtectionHash; SvPasswordHelper::GetHashPassword( aProtectionHash, rNewPassword ); pChangeTrack->SetProtection( aProtectionHash ); } else { - pChangeTrack->SetProtection( ::com::sun::star::uno::Sequence< sal_Int8 >() ); + pChangeTrack->SetProtection( css::uno::Sequence< sal_Int8 >() ); } bRes = true; @@ -3177,7 +3177,7 @@ bool ScDocShell::SetProtectionPassword( const OUString &rNewPassword ) return bRes; } -bool ScDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) +bool ScDocShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPasswordHash ) { bool bRes = false; ScChangeTrack* pChangeTrack = aDocument.GetChangeTrack(); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index d93d7d6b1cab..91e064a24636 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -418,9 +418,9 @@ void ScDocShell::Execute( SfxRequest& rReq ) nSet=aAppOptions.GetLinkMode(); } - if (nCanUpdate == com::sun::star::document::UpdateDocMode::NO_UPDATE) + if (nCanUpdate == css::document::UpdateDocMode::NO_UPDATE) nSet = LM_NEVER; - else if (nCanUpdate == com::sun::star::document::UpdateDocMode::FULL_UPDATE) + else if (nCanUpdate == css::document::UpdateDocMode::FULL_UPDATE) nSet = LM_ALWAYS; if (nSet == LM_ALWAYS @@ -480,8 +480,8 @@ void ScDocShell::Execute( SfxRequest& rReq ) bool bDone = false; ScDBCollection* pDBColl = aDocument.GetDBCollection(); - if ((nCanUpdate != com::sun::star::document::UpdateDocMode::NO_UPDATE) && - (nCanUpdate != com::sun::star::document::UpdateDocMode::QUIET_UPDATE)) + if ((nCanUpdate != css::document::UpdateDocMode::NO_UPDATE) && + (nCanUpdate != css::document::UpdateDocMode::QUIET_UPDATE)) { ScRange aRange; ScTabViewShell* pViewSh = GetBestViewShell(); @@ -1173,7 +1173,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJus bDone = true; else pChangeTrack->SetProtection( - com::sun::star::uno::Sequence< sal_Int8 > (0) ); + css::uno::Sequence< sal_Int8 > (0) ); } else { @@ -1184,7 +1184,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJus } else { - com::sun::star::uno::Sequence< sal_Int8 > aPass; + css::uno::Sequence< sal_Int8 > aPass; SvPasswordHelper::GetHashPassword( aPass, aPassword ); pChangeTrack->SetProtection( aPass ); } @@ -2090,7 +2090,7 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, #if defined WNT bool ScDocShell::DdeGetData( const OUString& rItem, const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ) + css::uno::Any & rValue ) { if( SotClipboardFormatId::STRING == SotExchange::GetFormatIdFromMimeType( rMimeType ) ) { @@ -2098,7 +2098,7 @@ bool ScDocShell::DdeGetData( const OUString& rItem, { OString aFmtByte(OUStringToOString(aDdeTextFmt, osl_getThreadTextEncoding())); - rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >( + rValue <<= css::uno::Sequence< sal_Int8 >( reinterpret_cast<const sal_Int8*>(aFmtByte.getStr()), aFmtByte.getLength() + 1 ); return true; @@ -2116,7 +2116,7 @@ bool ScDocShell::DdeGetData( const OUString& rItem, if( aObj.ExportByteString( aData, osl_getThreadTextEncoding(), SotClipboardFormatId::SYLK ) ) { - rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >( + rValue <<= css::uno::Sequence< sal_Int8 >( reinterpret_cast<const sal_Int8*>(aData.getStr()), aData.getLength() + 1 ); return true; @@ -2138,7 +2138,7 @@ bool ScDocShell::DdeGetData( const OUString& rItem, bool ScDocShell::DdeSetData( const OUString& rItem, const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ) + const css::uno::Any & rValue ) { if( SotClipboardFormatId::STRING == SotExchange::GetFormatIdFromMimeType( rMimeType )) { diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index e96f182b0c6f..6150dabfeac1 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -943,7 +943,7 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec Reference< XNameContainer > xLib; if( xLibContainer.is() ) { - com::sun::star::uno::Any aLibAny = xLibContainer->getByName( aLibName ); + css::uno::Any aLibAny = xLibContainer->getByName( aLibName ); aLibAny >>= xLib; } if( xLib.is() ) @@ -951,7 +951,7 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec xLib->getByName( sSrcCodeName ) >>= sSource; } } - catch ( const com::sun::star::uno::Exception& ) + catch ( const css::uno::Exception& ) { } VBA_InsertModule( aDocument, nTabToUse, sCodeName, sSource ); diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 1e6f46ce5e05..04654b36ba69 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -473,7 +473,7 @@ void ScDocShell::SetFormulaOptions( const ScFormulaOptions& rOpt, bool bForLoadi { // switch native symbols to English. ScCompiler aComp(NULL, ScAddress()); - ScCompiler::OpCodeMapPtr xMap = aComp.GetOpCodeMap(::com::sun::star::sheet::FormulaLanguage::ENGLISH); + ScCompiler::OpCodeMapPtr xMap = aComp.GetOpCodeMap(css::sheet::FormulaLanguage::ENGLISH); ScCompiler::SetNativeSymbols(xMap); } else diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 5813bd2b9ec9..3d877f6edb12 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -170,15 +170,15 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& try { ::ucbhelper::Content aDestPath( aDestPathObj.GetMainURL(INetURLObject::NO_DECODE), - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - uno::Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); + uno::Reference< css::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); OUString aTransferName = "transfer"; if ( xInfo->hasCommandByName( aTransferName ) ) { aDestPath.executeCommand( aTransferName, uno::makeAny( - ::com::sun::star::ucb::TransferInfo( bMoveData, rSourceObj.GetMainURL(INetURLObject::NO_DECODE), aName, - ::com::sun::star::ucb::NameClash::ERROR ) ) ); + css::ucb::TransferInfo( bMoveData, rSourceObj.GetMainURL(INetURLObject::NO_DECODE), aName, + css::ucb::NameClash::ERROR ) ) ); } else { @@ -203,7 +203,7 @@ bool ScDocShell::KillFile( const INetURLObject& rURL ) try { ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE), - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); aCnt.executeCommand( OUString( "delete" ), comphelper::makeBoolAny( true ) ); @@ -223,7 +223,7 @@ bool ScDocShell::IsDocument( const INetURLObject& rURL ) try { ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE), - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); bRet = aCnt.isDocument(); } diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 01c8d6d9723f..7089b0786381 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -255,14 +255,14 @@ void ScImportExport::EndPaste(bool bAutoRowHeight) } bool ScImportExport::ImportData( const OUString& /* rMimeType */, - const ::com::sun::star::uno::Any & /* rValue */ ) + const css::uno::Any & /* rValue */ ) { OSL_ENSURE( false, "Implementation is missing" ); return false; } bool ScImportExport::ExportData( const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ) + css::uno::Any & rValue ) { SvMemoryStream aStrm; // mba: no BaseURL for data exchange @@ -270,7 +270,7 @@ bool ScImportExport::ExportData( const OUString& rMimeType, SotExchange::GetFormatIdFromMimeType( rMimeType ) )) { aStrm.WriteUChar( 0 ); - rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >( + rValue <<= css::uno::Sequence< sal_Int8 >( static_cast<sal_Int8 const *>(aStrm.GetData()), aStrm.Seek( STREAM_SEEK_TO_END ) ); return true; diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 0470b7cd79b2..fee703f749c7 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -99,7 +99,7 @@ ScMacroManager::~ScMacroManager() { } -typedef ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener > ContainerListenerHelper; +typedef ::cppu::WeakImplHelper< css::container::XContainerListener > ContainerListenerHelper; class VBAProjectListener : public ContainerListenerHelper { diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 4e2d7a32baeb..be22512cb0fb 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -132,7 +132,7 @@ void ScServerObject::EndListeningAll() } bool ScServerObject::GetData( - ::com::sun::star::uno::Any & rData /*out param*/, + css::uno::Any & rData /*out param*/, const OUString & rMimeType, bool /* bSynchron */ ) { if (!pDocSh) @@ -173,7 +173,7 @@ bool ScServerObject::GetData( OString aByteData; if( aObj.ExportByteString( aByteData, osl_getThreadTextEncoding(), SotClipboardFormatId::SYLK ) ) { - rData <<= ::com::sun::star::uno::Sequence< sal_Int8 >( + rData <<= css::uno::Sequence< sal_Int8 >( reinterpret_cast<const sal_Int8*>(aByteData.getStr()), aByteData.getLength() + 1 ); return true; diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index fc2846680478..cfe790a21ee0 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -120,7 +120,7 @@ void ScTableLink::Edit( vcl::Window* pParent, const Link<SvBaseLink&,void>& rEnd } ::sfx2::SvBaseLink::UpdateResult ScTableLink::DataChanged( - const OUString&, const ::com::sun::star::uno::Any& ) + const OUString&, const css::uno::Any& ) { sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument().GetLinkManager(); if (pLinkManager!=NULL) diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index dd8303e809e8..2a302f4c4864 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -92,7 +92,7 @@ static void lcl_setModified( SfxObjectShell* pShell ) { if ( pShell ) { - com::sun::star::uno::Reference< com::sun::star::util::XModifiable > xModif( pShell->GetModel(), com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::util::XModifiable > xModif( pShell->GetModel(), css::uno::UNO_QUERY ); if ( xModif.is() ) xModif->setModified( sal_True ); } @@ -341,7 +341,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, vcl::Window* pWin ) aNamesItem.AddEvent( ScResId(RID_SCSTR_ONCLICK), OUString(), SFX_EVENT_MOUSECLICK_OBJECT ); pItemSet->Put( aNamesItem, SID_EVENTCONFIG ); - com::sun::star::uno::Reference < com::sun::star::frame::XFrame > xFrame; + css::uno::Reference < css::frame::XFrame > xFrame; if (GetViewShell()) xFrame = GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 4c2c62e7ddb7..1b07ca88bd57 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -1140,7 +1140,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) 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; if ( bDisableVerticalText ) { diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index 223b2b7227f5..7942caf032d6 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -94,7 +94,7 @@ void ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) SfxItemSet aAttr( pView->GetModel()->GetItemPool(), 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 ) ); pView->SetAttributes( aAttr ); pViewData->GetScDrawView()->InvalidateDrawTextAttrs(); // Bidi slots may be disabled diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 6a5338681f64..7aad2937845d 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -123,7 +123,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie { // connect to Calc data (if no range string, leave chart alone, with its own data) - uno::Reference< ::com::sun::star::chart2::data::XDataReceiver > xReceiver; + uno::Reference< css::chart2::data::XDataReceiver > xReceiver; uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is()) xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY ); @@ -494,7 +494,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV uno::Reference < embed::XEmbeddedObject > xObj = pViewShell->GetObjectShell()->GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID_60 ).GetByteSequence(), aName ); - uno::Reference< ::com::sun::star::chart2::data::XDataReceiver > xReceiver; + uno::Reference< css::chart2::data::XDataReceiver > xReceiver; uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is()) xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY ); diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index a464473e53f8..8f00c253d26c 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -96,7 +96,7 @@ static void lcl_UpdateHyphenator( Outliner& rOutliner, SdrObject* pObj ) { // use hyphenator only if hyphenation attribute is set if ( pObj && static_cast<const SfxBoolItem&>(pObj->GetMergedItem(EE_PARA_HYPHENATE)).GetValue() ) { - com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xHyphenator( LinguMgr::GetHyphenator() ); + css::uno::Reference<css::linguistic2::XHyphenator> xHyphenator( LinguMgr::GetHyphenator() ); rOutliner.SetHyphenator( xHyphenator ); } } diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx index 165a96806c7e..1b6df14fbd61 100644 --- a/sc/source/ui/inc/AccessibilityHints.hxx +++ b/sc/source/ui/inc/AccessibilityHints.hxx @@ -36,21 +36,21 @@ class ScAccWinFocusLostHint : public SfxHint { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > xOldAccessible; public: ScAccWinFocusLostHint( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld ); + const css::uno::Reference< css::uno::XInterface >& xOld ); virtual ~ScAccWinFocusLostHint(); }; class ScAccWinFocusGotHint : public SfxHint { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > xNewAccessible; public: ScAccWinFocusGotHint( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew ); + const css::uno::Reference< css::uno::XInterface >& xNew ); virtual ~ScAccWinFocusGotHint(); }; @@ -59,7 +59,7 @@ class ScAccGridWinFocusLostHint : public ScAccWinFocusLostHint ScSplitPos eOldGridWin; public: ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld ); + const css::uno::Reference< css::uno::XInterface >& xOld ); virtual ~ScAccGridWinFocusLostHint(); ScSplitPos GetOldGridWin() const { return eOldGridWin; } @@ -70,7 +70,7 @@ class ScAccGridWinFocusGotHint : public ScAccWinFocusGotHint ScSplitPos eNewGridWin; public: ScAccGridWinFocusGotHint( ScSplitPos eNewGridWin, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew ); + const css::uno::Reference< css::uno::XInterface >& xNew ); virtual ~ScAccGridWinFocusGotHint(); ScSplitPos GetNewGridWin() const { return eNewGridWin; } diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 0006aa8d2af3..ed58ccc6e0ee 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -33,7 +33,7 @@ class ScTabViewShell; class ScAccessibleDocument; -typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleExtendedAttributes> +typedef cppu::ImplHelper1< css::accessibility::XAccessibleExtendedAttributes> ScAccessibleCellAttributeImpl; /** @descr @@ -47,8 +47,7 @@ class ScAccessibleCell { public: static rtl::Reference<ScAccessibleCell> create( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, ScAddress& rCellAddress, sal_Int32 nIndex, @@ -57,8 +56,7 @@ public: private: ScAccessibleCell( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, ScAddress& rCellAddress, sal_Int32 nIndex, @@ -86,22 +84,21 @@ public: ///===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > + SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) + 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; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleContext ============================================== @@ -110,25 +107,25 @@ public: /// override to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand - 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; /// 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; - 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; ///===== XServiceInfo ==================================================== @@ -136,22 +133,22 @@ public: */ virtual OUString SAL_CALL getImplementationName() - 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; - 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; // Override this method to handle cell's ParaIndent attribute specially. - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; private: ScTabViewShell* mpViewShell; ScAccessibleDocument* mpAccDoc; @@ -159,14 +156,11 @@ private: ScSplitPos meSplitPos; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); virtual bool IsEditable( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates) override; + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates) override; bool IsOpaque( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); bool IsSelected(); static ScDocument* GetDocument(ScTabViewShell* mpViewShell); diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index c0074270bed7..558aea6fab0b 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <cppuhelper/implbase1.hxx> -typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleValue> +typedef cppu::ImplHelper1< css::accessibility::XAccessibleValue> ScAccessibleCellBaseImpl; class ScAccessibleCellBase @@ -36,8 +36,7 @@ class ScAccessibleCellBase public: //===== internal ======================================================== ScAccessibleCellBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScDocument* pDoc, const ScAddress& rCellAddress, sal_Int32 nIndex); @@ -46,13 +45,13 @@ protected: public: virtual bool SAL_CALL isVisible() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; @@ -61,48 +60,48 @@ public: ///===== XAccessibleComponent ============================================ 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; ///===== XAccessibleContext ============================================== /// 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; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - 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 createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleValue ================================================ - virtual ::com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getCurrentValue() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + setCurrentValue( const css::uno::Any& aNumber ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getMaximumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getMinimumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -110,20 +109,20 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /// returns the possible types - 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; /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: ScAddress maCellAddress; @@ -134,18 +133,17 @@ protected: private: virtual bool IsEditable( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); protected: OUString SAL_CALL GetNote() - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); OUString SAL_CALL GetAllDisplayNote() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); OUString SAL_CALL getShadowAttrs() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); OUString SAL_CALL getBorderAttrs() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); public: const ScAddress& GetCellAddress() const { return maCellAddress; } }; diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 333803693e2d..c1503eee740c 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -49,15 +49,15 @@ class Rectangle; */ typedef cppu::WeakAggComponentImplHelper5< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::lang::XServiceInfo + css::accessibility::XAccessible, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleEventBroadcaster, + css::lang::XServiceInfo > ScAccessibleContextBaseWeakImpl; typedef cppu::ImplHelper1< - ::com::sun::star::accessibility::XAccessibleEventListener + css::accessibility::XAccessibleEventListener > ScAccessibleContextBaseImplEvent; class ScAccessibleContextBase @@ -69,8 +69,7 @@ class ScAccessibleContextBase public: //===== internal ======================================================== ScAccessibleContextBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, const sal_Int16 aRole); virtual void Init(); @@ -80,10 +79,10 @@ protected: public: bool SAL_CALL isShowing( ) - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual bool SAL_CALL isVisible() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); ///===== SfxListener ===================================================== @@ -91,9 +90,9 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; @@ -102,98 +101,96 @@ public: ///===== XAccessible ===================================================== /// Return the XAccessibleContext. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL + getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override; ///===== XAccessibleComponent ============================================ virtual sal_Bool SAL_CALL containsPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) + 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; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. - 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, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, 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; ///===== XAccessibleEventBroadcaster ===================================== @@ -202,27 +199,25 @@ public: */ 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; // Remove an existing event listener. 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; ///===== XAccessibleEventListener ======================================== 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; virtual void SAL_CALL notifyEvent( - const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::accessibility::AccessibleEventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -230,58 +225,58 @@ 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. In this case that is just the AccessibleContext and Accessible service. */ - 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 =================================================== /// returns the possible types - 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; /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception); /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); public: /// Calls all Listener to tell they the change. void - CommitChange(const com::sun::star::accessibility::AccessibleEventObject& rEvent) const; + CommitChange(const css::accessibility::AccessibleEventObject& rEvent) const; protected: /// Calls all FocusListener to tell they that the focus is gained. @@ -293,7 +288,7 @@ protected: bool IsDefunc() const { return rBHelper.bDisposed; } void IsObjectValid() const - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); /// Use this method to set initial Name without notification void SetName(const OUString& rName) { msName = rName; } @@ -301,8 +296,7 @@ protected: void SetDescription(const OUString& rDesc) { msDescription = rDesc; } /// Reference to the parent object. - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> mxParent; + css::uno::Reference<css::accessibility::XAccessible> mxParent; private: /** Description of this object. This is not a constant because it can diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 49c31cbdf1d2..9b8838fc37c9 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -52,16 +52,16 @@ public: virtual void SAL_CALL disposing() override; /** Returns true, if the control is visible. */ - virtual bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual bool SAL_CALL isVisible() throw( css::uno::RuntimeException, std::exception ) override; // XAccessibleComponent --------------------------------------------------- /** Returns the child at the specified point (cell returns NULL). */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Sets the focus to this control. */ - virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() throw( css::uno::RuntimeException, std::exception ) override; // events ----------------------------------------------------------------- public: @@ -83,22 +83,22 @@ public: // helpers ---------------------------------------------------------------- protected: /** Returns this object's current bounding box relative to the desktop. */ - virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw( css::uno::RuntimeException, std::exception ) override; /** Returns this object's current bounding box relative to the parent object. */ - virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBox() const throw( css::uno::RuntimeException, std::exception ) override; /** Returns whether the object is alive. Must be called with locked mutex. */ inline bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; } /** Throws an exception, if the object is disposed/disposing or any pointer is missing. Should be used with locked mutex! */ - void ensureAlive() const throw( ::com::sun::star::lang::DisposedException ); + void ensureAlive() const throw( css::lang::DisposedException ); /** Returns the VCL control. Assumes a living object. */ ScCsvControl& implGetControl() const; /** Returns the first child of rxParentObj, which has the role nRole. */ static css::uno::Reference< css::accessibility::XAccessible > implGetChildByRole( const css::uno::Reference< css::accessibility::XAccessible >& rxParentObj, sal_uInt16 nRole ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); /** Creates a StateSetHelper and fills it with DEFUNC, OPAQUE, ENABLED, SHOWING and VISIBLE. */ ::utl::AccessibleStateSetHelper* implCreateStateSet(); @@ -111,9 +111,7 @@ protected: class ScCsvRuler; -typedef ::cppu::ImplHelper1< - ::com::sun::star::accessibility::XAccessibleText > - ScAccessibleCsvRulerImpl; +typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleText > ScAccessibleCsvRulerImpl; /** Accessible class representing the CSV ruler control. */ class ScAccessibleCsvRuler : public ScAccessibleCsvControl, public ScAccessibleCsvRulerImpl @@ -128,90 +126,90 @@ public: // XAccessibleComponent ----------------------------------------------------- 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; // XAccessibleContext ----------------------------------------------------- /** Returns the child count (the ruler does not have children). */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Throws an exception (the ruler does not have children). */ 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; /** Returns the relation to the grid control. */ 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; /** Returns the current set of states. */ 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; // XAccessibleText -------------------------------------------------------- /** Return the position of the caret. */ - virtual sal_Int32 SAL_CALL getCaretPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCaretPosition() throw( css::uno::RuntimeException, std::exception ) override; /** Sets the position of the caret. */ virtual sal_Bool SAL_CALL setCaretPosition( 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; /** Returns the specified character. */ virtual sal_Unicode SAL_CALL getCharacter( 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; /** Returns the attributes of the specified character. */ - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the screen coordinates of the specified character. */ virtual css::awt::Rectangle SAL_CALL getCharacterBounds( 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; /** Returns the count of characters. */ - virtual sal_Int32 SAL_CALL getCharacterCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCharacterCount() throw( css::uno::RuntimeException, std::exception ) override; /** Returns the character index at the specified coordinate (object's coordinate system). */ virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& rPoint ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the selected text (ruler returns empty string). */ - virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getSelectedText() throw( css::uno::RuntimeException, std::exception ) override; /** Returns the start index of the selection (ruler returns -1). */ - virtual sal_Int32 SAL_CALL getSelectionStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectionStart() throw( css::uno::RuntimeException, std::exception ) override; /** Returns the end index of the selection (ruler returns -1). */ - virtual sal_Int32 SAL_CALL getSelectionEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectionEnd() throw( css::uno::RuntimeException, std::exception ) override; /** Selects a part of the text (ruler does nothing). */ virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the entire text. */ - virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override; /** Returns the specified range [Start,End) of the text. */ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the specified text portion. */ - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; /** Copies the specified text range into the clipboard (ruler does nothing). */ virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, 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() throw() override; @@ -221,17 +219,17 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XTypeProvider ---------------------------------------------------------- /** Returns a sequence with all supported interface types. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - 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; /** Returns an implementation ID. */ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; // events ----------------------------------------------------------------- public: @@ -242,27 +240,27 @@ public: private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Throws an exception, if the specified character position is invalid (outside 0..len-1). */ void ensureValidIndex( sal_Int32 nIndex ) const - throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw( css::lang::IndexOutOfBoundsException ); /** Throws an exception, if the specified character position is invalid (outside 0..len). */ void ensureValidIndexWithEnd( sal_Int32 nIndex ) const - throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw( css::lang::IndexOutOfBoundsException ); /** Throws an exception, if the specified character range [Start,End) is invalid. @descr If Start>End, swaps Start and End before checking. */ void ensureValidRange( sal_Int32& rnStartIndex, sal_Int32& rnEndIndex ) const - throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw( css::lang::IndexOutOfBoundsException ); /** Returns the VCL ruler control. Assumes a living object. */ ScCsvRuler& implGetRuler() const; /** Builds the entire string buffer. */ - void constructStringBuffer() throw( ::com::sun::star::uno::RuntimeException ); + void constructStringBuffer() throw( css::uno::RuntimeException ); /** Returns the character count of the text. */ sal_Int32 implGetTextLength() const; @@ -278,16 +276,15 @@ private: class ScCsvGrid; typedef ::cppu::ImplHelper2< - ::com::sun::star::accessibility::XAccessibleTable, - ::com::sun::star::accessibility::XAccessibleSelection > + css::accessibility::XAccessibleTable, + css::accessibility::XAccessibleSelection > ScAccessibleCsvGridImpl; /** Accessible class representing the CSV grid control. */ class ScAccessibleCsvGrid : public ScAccessibleCsvControl, public ScAccessibleCsvGridImpl { protected: - typedef ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleTable > XAccessibleTableRef; + typedef css::uno::Reference< css::accessibility::XAccessibleTable > XAccessibleTableRef; public: explicit ScAccessibleCsvGrid( ScCsvGrid& rGrid ); @@ -297,146 +294,146 @@ public: /** Returns the cell at the specified point. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) - 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; // XAccessibleContext ----------------------------------------------------- /** Returns the child count (count of cells in the table). */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the specified child cell. */ 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; /** Returns the relation to the ruler control. */ 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; /** Returns the current set of states. */ 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; // XAccessibleTable ------------------------------------------------------- /** Returns the number of rows in the table. */ virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the number of columns in the table. */ virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the description of the specified row in the table. */ virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the description text of the specified column in the table. */ virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the number of rows occupied at a specified row and column. @descr Returns always 1 (Merged cells not supported). */ virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the number of rows occupied at a specified row and column. @descr Returns always 1 (Merged cells not supported). */ virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the row headers as an AccessibleTable. */ virtual XAccessibleTableRef SAL_CALL getAccessibleRowHeaders() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the column headers as an AccessibleTable. */ virtual XAccessibleTableRef SAL_CALL getAccessibleColumnHeaders() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the selected rows as a sequence. */ - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the selected columns as a sequence. */ - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() + throw( css::uno::RuntimeException, std::exception ) override; /** Returns true, if the specified row is selected. */ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns true, if the specified column is selected. */ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the accessible cell object at the specified position. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the caption object of the table. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the summary description object of the table. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns true, if the cell at a specified position is selected. */ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the child index of the cell at the specified position. */ virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the row index of the specified child. */ virtual sal_Int32 SAL_CALL getAccessibleRow( 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; /** Returns the column index of the specified child. */ virtual sal_Int32 SAL_CALL getAccessibleColumn( 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; // XAccessibleSelection --------------------------------------------------- /** Selects the specified child (selects the entire column or the entire table). */ 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; /** Returns true, if the specified child is selected. */ 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; /** Deselects all cells. */ virtual void SAL_CALL clearAccessibleSelection() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Selects all cells. */ virtual void SAL_CALL selectAllAccessibleChildren() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the count of selected children. */ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the child with the specified index in all selected children. */ 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; /** Deselects the child with the specified index in all selected children. */ 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; // 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; @@ -446,17 +443,17 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XTypeProvider ---------------------------------------------------------- /** Returns a sequence with all supported interface types. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - 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; /** Returns an implementation ID. */ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; // events ----------------------------------------------------------------- public: @@ -473,17 +470,17 @@ public: private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Throws an exception, if nIndex is not a valid child index. */ void ensureValidIndex( sal_Int32 nIndex ) const - throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw( css::lang::IndexOutOfBoundsException ); /** Throws an exception, if the specified position is invalid. */ void ensureValidPosition( sal_Int32 nRow, sal_Int32 nColumn ) const - throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw( css::lang::IndexOutOfBoundsException ); /** Returns the VCL grid control. Assumes a living object. */ ScCsvGrid& implGetGrid() const; @@ -542,35 +539,35 @@ public: // XAccessibleComponent --------------------------------------------------- /** Sets the focus to the column of this cell. */ - virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() 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; // XAccessibleContext ----------------------------------------------------- /** Returns the child count. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the specified child. */ 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; /** Returns the index of this cell in the table. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the relation to the ruler control. */ 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; /** Returns the current set of states. */ 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; // XInterface ------------------------------------------------------------- @@ -584,22 +581,22 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // helpers ---------------------------------------------------------------- protected: /** Returns this object's current bounding box relative to the desktop. */ - virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw( css::uno::RuntimeException, std::exception ) override; /** Returns this object's current bounding box relative to the parent object. */ - virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBox() const throw( css::uno::RuntimeException, std::exception ) override; private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; /** Returns the VCL grid control. Assumes a living object. */ ScCsvGrid& implGetGrid() const; diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index b2c208f489b1..70b2c37b6c84 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -44,22 +44,21 @@ namespace utl <code>AccessibleContext</code> service. */ -typedef cppu::ImplHelper3< ::com::sun::star::accessibility::XAccessibleSelection, - ::com::sun::star::accessibility::XAccessibleExtendedAttributes, - ::com::sun::star::view::XSelectionChangeListener > +typedef cppu::ImplHelper3< css::accessibility::XAccessibleSelection, + css::accessibility::XAccessibleExtendedAttributes, + css::view::XSelectionChangeListener > ScAccessibleDocumentImpl; class ScAccessibleDocument : public ScAccessibleDocumentBase, public ScAccessibleDocumentImpl, - public com::sun::star::accessibility::XAccessibleGetAccFlowTo, + public css::accessibility::XAccessibleGetAccFlowTo, public accessibility::IAccessibleViewForwarder { public: //===== internal ======================================================== ScAccessibleDocument( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, ScSplitPos eSplitPos); @@ -83,9 +82,9 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; @@ -93,81 +92,81 @@ public: ///===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) + 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; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. - 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; /// 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; 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::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getExtendedAttributes() + throw (css::lang::IndexOutOfBoundsException, 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 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; ///===== XSelectionListener ============================================= - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) + throw (css::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 disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo =================================================== @@ -175,26 +174,26 @@ public: */ virtual OUString SAL_CALL getImplementationName() - 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; ///===== XTypeProvider =================================================== /// returns the possible types - 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; /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== IAccessibleViewForwarder ======================================== @@ -234,28 +233,27 @@ public: utl::AccessibleRelationSetHelper* GetRelationSet(const ScAddress* pAddress) const; - ::com::sun::star::uno::Reference - < ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > GetAccessibleSpreadsheet(); protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - 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 createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: ScTabViewShell* mpViewShell; @@ -263,7 +261,7 @@ private: rtl::Reference<ScAccessibleSpreadsheet> mpAccessibleSpreadsheet; ScChildrenShapes* mpChildrenShapes; ScAccessibleEditObject* mpTempAccEdit; - com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> mxTempAcc; + css::uno::Reference<css::accessibility::XAccessible> mxTempAcc; Rectangle maVisArea; bool mbCompleteSheetSelected; @@ -276,30 +274,29 @@ private: bool IsTableSelected() const; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); - void AddChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, bool bFireEvent); - void RemoveChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, bool bFireEvent); + void AddChild(const css::uno::Reference<css::accessibility::XAccessible>& xAcc, bool bFireEvent); + void RemoveChild(const css::uno::Reference<css::accessibility::XAccessible>& xAcc, bool bFireEvent); OUString GetCurrentCellName() const; static OUString GetCurrentCellDescription(); Rectangle GetVisibleArea_Impl() const; - com::sun::star::uno::Sequence< com::sun::star::uno::Any > GetScAccFlowToSequence(); + css::uno::Sequence< css::uno::Any > GetScAccFlowToSequence(); public: ScDocument *GetDocument() const ; ScAddress GetCurCellAddress() const; //===== 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; 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; }; #endif diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx index 78af5575d62b..607917d126d9 100644 --- a/sc/source/ui/inc/AccessibleDocumentBase.hxx +++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx @@ -28,8 +28,7 @@ class ScAccessibleDocumentBase public: //===== internal ======================================================== ScAccessibleDocumentBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent); + const css::uno::Reference<css::accessibility::XAccessible>& rxParent); protected: virtual ~ScAccessibleDocumentBase(); }; diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index c982b2252b1a..d72a417d102c 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -38,8 +38,7 @@ class ScAccessibleDocumentPagePreview public: //===== internal ======================================================== ScAccessibleDocumentPagePreview( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell ); protected: virtual ~ScAccessibleDocumentPagePreview(); @@ -57,56 +56,56 @@ public: ///===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) + 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; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. - 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, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, 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; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - 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; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== internal ======================================================== @@ -114,22 +113,22 @@ protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - 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 createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: // needed in ScShapeChildren /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; @@ -140,8 +139,7 @@ private: ScAccessiblePageHeader* mpFooter; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); ScNotesChildren* GetNotesChildren(); ScShapeChildren* GetShapeChildren(); diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 4cae0a782321..359f1e8bea7e 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -39,7 +39,7 @@ namespace vcl { class Window; } */ class ScAccessibleEditObject : public ScAccessibleContextBase, - public ::com::sun::star::accessibility::XAccessibleSelection + public css::accessibility::XAccessibleSelection { public: enum EditObjectType @@ -50,8 +50,7 @@ public: }; ScAccessibleEditObject( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, EditView* pEditView, vcl::Window* pWin, const OUString& rName, const OUString& rDescription, EditObjectType eObjectType); @@ -70,28 +69,28 @@ public: void GotFocus(); ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; ///===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) + throw (css::uno::RuntimeException, std::exception) override; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleContext ============================================== @@ -100,56 +99,56 @@ public: /// override to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand - 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; /// 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; //===== 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; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( + throw ( css::uno::RuntimeException, std::exception ) override; + 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; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleEventBroadcaster ===================================== @@ -159,16 +158,14 @@ public: */ 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; // Remove an existing event listener. 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 ==================================================== @@ -176,15 +173,15 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: accessibility::AccessibleTextHelper* mpTextHelper; @@ -194,8 +191,7 @@ private: bool mbHasFocus; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); void CreateTextHelper(); ScDocument *m_pScDoc; @@ -203,10 +199,10 @@ private: ///===== XAccessibleComponent ============================================ 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; sal_Int32 GetFgBgColor( const rtl::OUString &strPropColor) ; }; diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index 01eebff0b94c..86877e1d55cf 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -31,8 +31,7 @@ class ScPreviewShell; class ScAccessiblePageHeader : public ScAccessibleContextBase { public: - ScAccessiblePageHeader( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + ScAccessiblePageHeader( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, bool bHeader, sal_Int32 nIndex ); protected: @@ -50,35 +49,35 @@ public: //===== 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 void SAL_CALL grabFocus() 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 void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw (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; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; @@ -89,8 +88,7 @@ private: sal_Int32 mnChildCount; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); void AddChild(const EditTextObject* pArea, sal_uInt32 nIndex, SvxAdjust eAdjust); }; diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 4cc234a828bf..e32b2c29972d 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -36,8 +36,7 @@ class ScAccessiblePageHeaderArea public: //===== internal ======================================================== ScAccessiblePageHeaderArea( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, const EditTextObject* pEditObj, bool bHeader, @@ -56,10 +55,10 @@ public: ///===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) + throw (css::uno::RuntimeException, std::exception) override; ///===== XAccessibleContext ============================================== @@ -67,20 +66,20 @@ public: /// override to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand - 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; /// 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; ///===== XServiceInfo ==================================================== @@ -88,29 +87,29 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ - 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 =================================================== /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; private: EditTextObject* mpEditObj; diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index 7bf645fc626d..72dc4eca95ee 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -34,8 +34,7 @@ class ScAccessiblePreviewCell : public ScAccessibleCellBase public: //===== internal ======================================================== ScAccessiblePreviewCell( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, /* const */ ScAddress& rCellAddress, sal_Int32 nIndex ); protected: @@ -53,41 +52,41 @@ public: //===== 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 void SAL_CALL grabFocus() 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 void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== // override to calculate this on demand - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) - 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::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw (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; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; @@ -95,14 +94,11 @@ private: accessibility::AccessibleTextHelper* mpTextHelper; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); virtual bool IsEditable( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates) override; + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates) override; bool IsOpaque( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); void CreateTextHelper(); diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 1aa83bc78e96..1c1cfb8a89be 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -33,7 +33,7 @@ namespace accessibility { class AccessibleTextHelper; } -typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleValue> +typedef cppu::ImplHelper1< css::accessibility::XAccessibleValue> ScAccessiblePreviewHeaderCellImpl; class ScAccessiblePreviewHeaderCell : @@ -41,8 +41,7 @@ class ScAccessiblePreviewHeaderCell : public ScAccessiblePreviewHeaderCellImpl { public: - ScAccessiblePreviewHeaderCell( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + ScAccessiblePreviewHeaderCell( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, const ScAddress& rCellPos, bool bIsColHdr, bool bIsRowHdr, sal_Int32 nIndex ); @@ -62,9 +61,9 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; @@ -72,55 +71,55 @@ public: //===== XAccessibleValue ================================================ - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getMaximumValue() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getMinimumValue() throw (css::uno::RuntimeException, 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 void SAL_CALL grabFocus() 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 void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw (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; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + 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; /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; @@ -132,8 +131,7 @@ private: mutable ScPreviewTableInfo* mpTableInfo; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); void CreateTextHelper(); void FillTableInfo() const; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 1aaef208436e..ae52d1afe220 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -27,7 +27,7 @@ class ScPreviewShell; class ScPreviewTableInfo; -typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleTable> +typedef cppu::ImplHelper1< css::accessibility::XAccessibleTable> ScAccessiblePreviewTableImpl; class ScAccessiblePreviewTable : @@ -35,8 +35,7 @@ class ScAccessiblePreviewTable : public ScAccessiblePreviewTableImpl { public: - ScAccessiblePreviewTable( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + ScAccessiblePreviewTable( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, sal_Int32 nIndex ); protected: @@ -54,9 +53,9 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; @@ -65,115 +64,115 @@ public: //===== XAccessibleTable ================================================ virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, - std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL - getAccessibleRowHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL - getAccessibleColumnHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, + std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL + getAccessibleRowHeaders() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL + getAccessibleColumnHeaders() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + 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 getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleCaption() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleSummary() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleCaption() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleSummary() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, 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, + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& aPoint ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, + 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 i ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw (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; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + 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; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; protected: virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; @@ -181,8 +180,7 @@ private: mutable ScPreviewTableInfo* mpTableInfo; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); void FillTableInfo() const; }; diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 16fdaf30dfb0..9ff0c09588d9 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -102,111 +102,108 @@ private: ///===== XAccessibleTable ================================================ /// Returns the row headers as an AccessibleTable. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the column headers as an AccessibleTable. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the selected rows in a table. - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the selected columns in a table. - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns a boolean value indicating whether the specified row is selected. virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns a boolean value indicating whether the specified column is selected. virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the Accessible at a specified row and column in the table. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; rtl::Reference<ScAccessibleCell> GetAccessibleCellAt(sal_Int32 nRow, sal_Int32 nColumn); /// Returns a boolean value indicating whether the accessible at a specified row and column is selected. virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - 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 > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) + 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; ///===== XAccessibleContext ============================================== /// 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; ///===== XAccessibleSelection =========================================== virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + 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 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -215,21 +212,21 @@ private: */ virtual OUString SAL_CALL getImplementationName() - 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; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XAccessibleEventBroadcaster ===================================== @@ -238,31 +235,30 @@ private: */ 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; //===== XAccessibleTableSelection ============================================ virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: ScTabViewShell* mpViewShell; ScRangeList* mpMarkedRanges; @@ -279,11 +275,9 @@ private: bool mbIsFocusSend; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); bool IsEditable( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); bool IsFocused(); bool IsCompleteSheetSelected(); @@ -294,7 +288,7 @@ private: Rectangle GetVisCells(const Rectangle& rVisArea); typedef std::vector<ScMyAddress> VEC_MYADDR; - typedef std::map<ScMyAddress,com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > + typedef std::map<ScMyAddress,css::uno::Reference< css::accessibility::XAccessible > > MAP_ADDR_XACC; MAP_ADDR_XACC m_mapSelectionSend; void RemoveSelection(ScMarkData &refScMarkData); @@ -333,7 +327,7 @@ public: VEC_COL m_vecTempCol; OUString m_strOldTabName; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > GetActiveCell(); + css::uno::Reference < css::accessibility::XAccessible > GetActiveCell(); bool IsScAddrFormulaSel (const ScAddress &addr) const; bool IsFormulaMode(); ScMyAddress CalcScAddressFromRangeList(ScRangeList *pMarkedRanges,sal_Int32 nSelectedChildIndex); diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 9cab4afe0b0e..33ffbf50dac0 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -33,20 +33,19 @@ <code>AccessibleTable</code> service. */ -typedef cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessibleTable, - ::com::sun::star::accessibility::XAccessibleSelection> +typedef cppu::ImplHelper2< css::accessibility::XAccessibleTable, + css::accessibility::XAccessibleSelection> ScAccessibleTableBaseImpl; class ScAccessibleTableBase : public ScAccessibleContextBase, - public ::com::sun::star::accessibility::XAccessibleTableSelection, + public css::accessibility::XAccessibleTableSelection, public ScAccessibleTableBaseImpl { public: //===== internal ======================================================== ScAccessibleTableBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScDocument* pDoc, const ScRange& rRange); protected: @@ -58,9 +57,9 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; @@ -71,27 +70,27 @@ public: /// Returns the number of rows in the table. virtual sal_Int32 SAL_CALL getAccessibleRowCount( ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; /// Returns the number of columns in the table. virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; /// Returns the description of the specified row in the table. virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the description text of the specified column in the table. virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /** Returns the number of rows occupied by the Accessible at a specified row and column in the table. @@ -99,8 +98,8 @@ public: */ virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /** Returns the number of columns occupied by the Accessible at a specified row and column in the table. @@ -108,66 +107,66 @@ public: */ virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the row headers as an AccessibleTable. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the column headers as an AccessibleTable. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the selected rows in a table. - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the selected columns in a table. - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns a boolean value indicating whether the specified row is selected. virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns a boolean value indicating whether the specified column is selected. virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the Accessible at a specified row and column in the table. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the caption for the table. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the summary description of the table. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns a boolean value indicating whether the accessible at a specified row and column is selected. virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; ///===== XAccessibleExtendedTable ======================================== @@ -175,22 +174,22 @@ public: /// Returns the index of the cell on the given position. virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the row number of an index in the table. virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the column number of an index in the table. virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; //===== XAccessibleContext ============================================== @@ -199,91 +198,88 @@ public: /// override to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand - 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, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - 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 createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; public: /// 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. // perhaps sometimes to be implemented - 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; ///===== XAccessibleSelection =========================================== virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + 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, + 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, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo =================================================== @@ -292,20 +288,20 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /// returns the possible types - 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; /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: /// contains the range of the table, because it could be a subrange of the complete table diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index 65617cc58e32..e4f5c7d5a822 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx @@ -27,8 +27,8 @@ class ScTabViewShell; typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::view::XSelectionChangeListener, - ::com::sun::star::lang::XServiceInfo > + css::view::XSelectionChangeListener, + css::lang::XServiceInfo > ScChartRangeSelectionListener_Base; class ScChartRangeSelectionListener : @@ -42,13 +42,13 @@ public: protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XEventListener (base of XSelectionChangeListener) ____ virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; // ____ WeakComponentImplHelperBase ____ // is called when dispose() is called at this component @@ -56,12 +56,12 @@ protected: // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::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; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) override; private: ScTabViewShell * m_pViewShell; diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index 69eef5f7b06e..bde6810533d4 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx @@ -28,7 +28,7 @@ class SdrModel; class ScDrawModelBroadcaster : public SfxListener, - public ::cppu::WeakImplHelper< com::sun::star::document::XEventBroadcaster > + public ::cppu::WeakImplHelper< css::document::XEventBroadcaster > { mutable ::osl::Mutex maListenerMutex; ::cppu::OInterfaceContainerHelper maEventListeners; @@ -39,10 +39,10 @@ public: ScDrawModelBroadcaster( SdrModel *pDrawModel ); virtual ~ScDrawModelBroadcaster(); - virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::document::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::document::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index fdfc94a8aeec..c6717110e988 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -248,7 +248,7 @@ public: virtual bool Notify(NotifyEvent& rNEvt) override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; virtual vcl::Window* GetPreferredKeyInputWindow() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; void setMemberSize(size_t n); void addDateMember(const OUString& rName, double nVal, bool bVisible); diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx index e2c295059c76..bb11c1a75f70 100644 --- a/sc/source/ui/inc/condformatuno.hxx +++ b/sc/source/ui/inc/condformatuno.hxx @@ -48,7 +48,7 @@ class XSheetCellRanges; } } } -class ScCondFormatsObj : public cppu::WeakImplHelper<com::sun::star::sheet::XConditionalFormats>, +class ScCondFormatsObj : public cppu::WeakImplHelper<css::sheet::XConditionalFormats>, public SfxListener { public: @@ -60,18 +60,18 @@ public: // XConditionalFormats virtual sal_Int32 SAL_CALL createByRange(const uno::Reference<sheet::XSheetCellRanges>& xRanges) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByID( const sal_Int32 nID ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual uno::Sequence< uno::Reference< sheet::XConditionalFormat > > SAL_CALL getConditionalFormats() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getLength() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; ScConditionalFormatList* getCoreObject(); @@ -81,8 +81,8 @@ private: ScDocShell* mpDocShell; }; -class ScCondFormatObj : public cppu::WeakImplHelper<com::sun::star::sheet::XConditionalFormat, - com::sun::star::beans::XPropertySet> +class ScCondFormatObj : public cppu::WeakImplHelper<css::sheet::XConditionalFormat, + css::beans::XPropertySet> { public: ScCondFormatObj(ScDocShell* pDocShell, rtl::Reference<ScCondFormatsObj> xCondFormats, sal_Int32 nKey); @@ -93,70 +93,66 @@ public: // XConditionalFormat virtual void SAL_CALL createEntry(const sal_Int32 nType, const sal_Int32 nPos) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex(const sal_Int32 nIndex) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess virtual uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getCount() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::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 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(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::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; + 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 ::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; + 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 ::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; + 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 ::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; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; ScConditionalFormat* getCoreObject(); @@ -167,8 +163,8 @@ private: sal_Int32 mnKey; }; -class ScConditionEntryObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, - com::sun::star::sheet::XConditionEntry> +class ScConditionEntryObj : public cppu::WeakImplHelper<css::beans::XPropertySet, + css::sheet::XConditionEntry> { public: @@ -180,48 +176,44 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::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 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(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::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; + 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 ::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; + 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 ::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; + 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 ::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; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; private: ScDocShell* mpDocShell; @@ -230,8 +222,8 @@ private: const ScCondFormatEntry* mpFormat; }; -class ScColorScaleFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, - com::sun::star::sheet::XConditionEntry> +class ScColorScaleFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, + css::sheet::XConditionEntry> { public: @@ -240,51 +232,47 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; ScColorScaleFormat* getCoreObject(); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::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 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(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::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; + 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 ::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; + 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 ::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; + 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 ::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; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -292,30 +280,30 @@ private: const ScColorScaleFormat* mpFormat; }; -class ScColorScaleEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XColorScaleEntry> +class ScColorScaleEntryObj : public cppu::WeakImplHelper<css::sheet::XColorScaleEntry> { public: ScColorScaleEntryObj(rtl::Reference<ScColorScaleFormatObj> xParent, size_t nPos); virtual ~ScColorScaleEntryObj(); - virtual com::sun::star::util::Color SAL_CALL getColor() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL getColor() + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColor(com::sun::star::util::Color aColor) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setColor(css::util::Color aColor) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setType(sal_Int32 nType) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFormula() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula(const OUString& rString) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; private: ScColorScaleEntry* getCoreObject(); @@ -324,8 +312,8 @@ private: size_t mnPos; }; -class ScDataBarFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, - com::sun::star::sheet::XConditionEntry> +class ScDataBarFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, + css::sheet::XConditionEntry> { public: ScDataBarFormatObj(rtl::Reference<ScCondFormatObj> xParent, @@ -336,48 +324,44 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::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 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(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::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; + 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 ::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; + 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 ::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; + 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 ::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; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -385,7 +369,7 @@ private: const ScDataBarFormat* mpFormat; }; -class ScDataBarEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XDataBarEntry> +class ScDataBarEntryObj : public cppu::WeakImplHelper<css::sheet::XDataBarEntry> { public: ScDataBarEntryObj(rtl::Reference<ScDataBarFormatObj> xParent, size_t nPos); @@ -393,16 +377,16 @@ public: virtual ~ScDataBarEntryObj(); virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setType(sal_Int32 nType) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFormula() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula(const OUString& rString) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; private: ScColorScaleEntry* getCoreObject(); @@ -411,8 +395,8 @@ private: size_t mnPos; }; -class ScIconSetFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, - com::sun::star::sheet::XConditionEntry> +class ScIconSetFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, + css::sheet::XConditionEntry> { public: ScIconSetFormatObj(rtl::Reference<ScCondFormatObj> xParent, @@ -423,48 +407,44 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::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 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(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::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; + 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 ::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; + 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 ::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; + 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 ::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; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -472,7 +452,7 @@ private: const ScIconSetFormat* mpFormat; }; -class ScIconSetEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XIconSetEntry> +class ScIconSetEntryObj : public cppu::WeakImplHelper<css::sheet::XIconSetEntry> { public: ScIconSetEntryObj(rtl::Reference<ScIconSetFormatObj> xParent, size_t nPos); @@ -480,16 +460,16 @@ public: virtual ~ScIconSetEntryObj(); virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setType(sal_Int32 nType) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFormula() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula(const OUString& rString) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; private: ScColorScaleEntry* getCoreObject(); @@ -498,8 +478,8 @@ private: size_t mnPos; }; -class ScCondDateFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, - com::sun::star::sheet::XConditionEntry> +class ScCondDateFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, + css::sheet::XConditionEntry> { public: ScCondDateFormatObj(rtl::Reference<ScCondFormatObj> xParent, @@ -511,48 +491,44 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::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 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(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::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; + 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 ::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; + 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 ::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; + 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 ::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; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; private: rtl::Reference<ScCondFormatObj> mxParent; diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index d0a424767747..2855769e898e 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -61,7 +61,7 @@ private: public: ScDataPilotServiceDlg( vcl::Window* pParent, - const com::sun::star::uno::Sequence<OUString>& rServices ); + const css::uno::Sequence<OUString>& rServices ); virtual ~ScDataPilotServiceDlg(); virtual void dispose() override; diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index 714a2dbcceda..4b47afed54df 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -66,8 +66,7 @@ public: bool bAddrInsert = false ); bool DoImportUno( const ScAddress& rPos, - const com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue>& aArgs ); + const css::uno::Sequence<css::beans::PropertyValue>& aArgs ); static void ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame ); diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 207fdbfdbce9..f5a1238a0a08 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -93,7 +93,7 @@ public: void SetDataPilotDetails(bool bShow, const OUString* pNewDimensionName = NULL); void ShowDataPilotSourceData( ScDPObject& rDPObj, - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters ); + const css::uno::Sequence< css::sheet::DataPilotFieldFilter >& rFilters ); void MakeOutline( bool bColumns, bool bRecord = true ); void RemoveOutline( bool bColumns, bool bRecord = true ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 824178fab8d6..a190472a3b73 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -130,8 +130,8 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener ScDocShell & mrDocShell; }; - SAL_DLLPRIVATE bool LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); - SAL_DLLPRIVATE bool SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); + SAL_DLLPRIVATE bool LoadXML( SfxMedium* pMedium, const css::uno::Reference< css::embed::XStorage >& ); + SAL_DLLPRIVATE bool SaveXML( SfxMedium* pMedium, const css::uno::Reference< css::embed::XStorage >& ); SAL_DLLPRIVATE SCTAB GetSaveTab(); SAL_DLLPRIVATE bool SaveCurrentChart( SfxMedium& rMedium ); @@ -151,7 +151,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener SAL_DLLPRIVATE void UnlockDocument_Impl(sal_uInt16 nNew); SAL_DLLPRIVATE void EnableSharedSettings( bool bEnable ); - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument(); + SAL_DLLPRIVATE css::uno::Reference< css::frame::XModel > LoadSharedDocument(); SAL_DLLPRIVATE void UseSheetSaveEntries(); @@ -192,7 +192,7 @@ public: virtual std::set<Color> GetDocColors() override; - virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) override; + virtual bool InitNew( const css::uno::Reference< css::embed::XStorage >& ) override; virtual bool Load( SfxMedium& rMedium ) override; virtual bool LoadFrom( SfxMedium& rMedium ) override; virtual bool ConvertFrom( SfxMedium &rMedium ) override; @@ -205,7 +205,7 @@ public: virtual bool IsInformationLost() override; virtual void LoadStyles( SfxObjectShell &rSource ) override; - virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) override; // SfxInPlaceObject + virtual bool SaveCompleted( const css::uno::Reference< css::embed::XStorage >& ) override; // SfxInPlaceObject virtual bool DoSaveCompleted( SfxMedium * pNewStor) override; // SfxObjectShell virtual bool QuerySlotExecutable( sal_uInt16 nSlotId ) override; @@ -365,9 +365,9 @@ public: #if defined WNT virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ) override; + css::uno::Any & rValue ) override; virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ) override; + const css::uno::Any & rValue ) override; #endif virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) override; @@ -422,7 +422,7 @@ public: virtual bool HasChangeRecordProtection() const override; virtual void SetChangeRecording( bool bActivate ) override; virtual bool SetProtectionPassword( const OUString &rPassword ) override; - virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) override; + virtual bool GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPasswordHash ) override; void SnapVisArea( Rectangle& rRect ) const; @@ -479,8 +479,8 @@ namespace HelperNotifyChanges inline void Notify(ScModelObj &rModelObj, const ScRangeList &rChangeRanges, const OUString &rType = OUString("cell-change"), - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProperties = - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >()) + const css::uno::Sequence< css::beans::PropertyValue >& rProperties = + css::uno::Sequence< css::beans::PropertyValue >()) { rModelObj.NotifyChanges(rType, rChangeRanges, rProperties); } diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 3828c1b064ef..bf8312eb5abb 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -137,7 +137,7 @@ public: inline void UnlockInternalLayer() { LockInternalLayer( false ); } SdrEndTextEditKind ScEndTextEdit(); // calls SetDrawTextUndo(0) - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable(); + css::uno::Reference< css::datatransfer::XTransferable > CopyToTransferable(); SdrObject* GetObjectByName(const OUString& rName); bool GetObjectIsMarked( SdrObject * pObject ); diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index 70e6b4634831..da714a053910 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -77,7 +77,7 @@ public: 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; + const css::datatransfer::DataFlavor& rFlavor ) override; virtual void ObjectReleased() override; virtual void DragFinished( sal_Int8 nDropAction ) override; @@ -95,8 +95,8 @@ public: sal_uInt16 GetDragSourceFlags() const { return nDragSourceFlags; } static ScDrawTransferObj* GetOwnClipboard( vcl::Window* pUIWin ); - virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; - static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); const ScRangeListVector& GetProtectedChartRangesVector() const { return m_aProtectedChartRangesVector; } }; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 1b2b5fd736a7..92be94f60270 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -44,8 +44,8 @@ class ScFormulaDlg : public formula::FormulaDlg, public IAnyRefDialog { ScFormulaReferenceHelper m_aHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> m_xParser; - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; + css::uno::Reference< css::sheet::XFormulaParser> m_xParser; + css::uno::Reference< css::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; static ScDocument* pDoc; static ScAddress aCursorPos; @@ -75,10 +75,10 @@ public: virtual OUString getCurrentFormula() const override; virtual formula::IFunctionManager* getFunctionManager() override; - virtual ::std::unique_ptr<formula::FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> getFormulaParser() const override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const override; - virtual ::com::sun::star::table::CellAddress getReferencePosition() const override; + virtual ::std::unique_ptr<formula::FormulaTokenArray> convertToTokenArray(const css::uno::Sequence< css::sheet::FormulaToken >& _aTokenList) override; + virtual css::uno::Reference< css::sheet::XFormulaParser> getFormulaParser() const override; + virtual css::uno::Reference< css::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const override; + virtual css::table::CellAddress getReferencePosition() const override; virtual bool Close() override; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index c99f2ddafa5b..c5db4f197f39 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -339,7 +339,7 @@ public: /// Get the cell selection, coordinates are in logic units. void GetCellSelection(std::vector<Rectangle>& rLogicRects); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; void FakeButtonUp(); @@ -367,7 +367,7 @@ public: void LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ); void LaunchDPFieldMenu( SCCOL nCol, SCROW nRow ); - ::com::sun::star::sheet::DataPilotFieldOrientation GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const; + css::sheet::DataPilotFieldOrientation GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const; void DrawButtons(SCCOL nX1, SCCOL nX2, const ScTableInfo& rTabInfo, OutputDevice* pContentDev); diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index b0466152367b..feaff387777b 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -129,9 +129,9 @@ public: bool ExportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING ); static bool ImportData( const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ); + const css::uno::Any & rValue ); bool ExportData( const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ); + css::uno::Any & rValue ); // after import bool IsOverflowRow() const { return bOverflowRow; } diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 27192c58194b..d9763a1ca35f 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -82,7 +82,7 @@ public: virtual void SetFormulaMode( bool bSet ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) override; virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) override; diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index c96511cf7660..893ffcdf7bd4 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -69,14 +69,14 @@ class ScOptSolverSave OUString maVariable; std::vector<ScOptConditionRow> maConditions; OUString maEngine; - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; + css::uno::Sequence<css::beans::PropertyValue> maProperties; public: ScOptSolverSave( const OUString& rObjective, bool bMax, bool bMin, bool bValue, const OUString& rTarget, const OUString& rVariable, const std::vector<ScOptConditionRow>& rConditions, const OUString& rEngine, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties ); + const css::uno::Sequence<css::beans::PropertyValue>& rProperties ); const OUString& GetObjective() const { return maObjective; } bool GetMax() const { return mbMax; } @@ -86,7 +86,7 @@ public: const OUString& GetVariable() const { return maVariable; } const std::vector<ScOptConditionRow>& GetConditions() const { return maConditions; } const OUString& GetEngine() const { return maEngine; } - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& GetProperties() const + const css::uno::Sequence<css::beans::PropertyValue>& GetProperties() const { return maProperties; } }; @@ -175,10 +175,10 @@ private: std::vector<ScOptConditionRow> maConditions; long nScrollPos; - com::sun::star::uno::Sequence<OUString> maImplNames; - com::sun::star::uno::Sequence<OUString> maDescriptions; + css::uno::Sequence<OUString> maImplNames; + css::uno::Sequence<OUString> maDescriptions; OUString maEngine; - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; + css::uno::Sequence<css::beans::PropertyValue> maProperties; void Init(const ScAddress& rCursorPos); bool CallSolver(); diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 729629958a5a..0291e72aa1fc 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -113,7 +113,7 @@ protected: virtual void GetFocus() override; virtual void LoseFocus() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; public: ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ); diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 22567c77260e..e242d9396630 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -46,7 +46,7 @@ class SC_DLLPUBLIC ScPreviewShell: public SfxViewShell VclPtr<ScrollBar> pVerScroll; VclPtr<vcl::Window> pCorner; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSourceData; // ViewData + css::uno::Sequence< css::beans::PropertyValue > aSourceData; // ViewData TriState nSourceDesignMode; // form design mode from TabView SvxZoomType eZoom; long nMaxVertPos; @@ -71,8 +71,8 @@ protected: virtual void WriteUserData(OUString &, bool bBrowse = false) override; virtual void ReadUserData(const OUString &, bool bBrowse = false) 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; public: TYPEINFO_OVERRIDE(); diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 81871e7b0a74..9a364c99c91e 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -63,7 +63,7 @@ public: virtual ~ScDPFunctionDlg(); virtual void dispose() override; sal_uInt16 GetFuncMask() const; - ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const; + css::sheet::DataPilotFieldReference GetFieldRef() const; private: void Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx index 35f4e516cce4..76ca857eb9c1 100644 --- a/sc/source/ui/inc/servobj.hxx +++ b/sc/source/ui/inc/servobj.hxx @@ -54,7 +54,7 @@ public: ScServerObject( ScDocShell* pShell, const OUString& rItem ); virtual ~ScServerObject(); - virtual bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, + virtual bool GetData( css::uno::Any & rData /*out param*/, const OUString & rMimeType, bool bSynchron = false ) override; diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 64b46d191f2e..0ebb12d248b0 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -40,10 +40,10 @@ class ScSolverOptionsDialog : public ModalDialog VclPtr<PushButton> m_pBtnEdit; SvLBoxButtonData* mpCheckButtonData; - com::sun::star::uno::Sequence<OUString> maImplNames; - com::sun::star::uno::Sequence<OUString> maDescriptions; + css::uno::Sequence<OUString> maImplNames; + css::uno::Sequence<OUString> maDescriptions; OUString maEngine; - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; + css::uno::Sequence<css::beans::PropertyValue> maProperties; DECL_LINK_TYPED( EngineSelectHdl, ListBox&, void ); DECL_LINK_TYPED( SettingsSelHdl, SvTreeListBox*, void ); @@ -56,16 +56,16 @@ class ScSolverOptionsDialog : public ModalDialog public: ScSolverOptionsDialog( vcl::Window* pParent, - const com::sun::star::uno::Sequence<OUString>& rImplNames, - const com::sun::star::uno::Sequence<OUString>& rDescriptions, + const css::uno::Sequence<OUString>& rImplNames, + const css::uno::Sequence<OUString>& rDescriptions, const OUString& rEngine, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties ); + const css::uno::Sequence<css::beans::PropertyValue>& rProperties ); virtual ~ScSolverOptionsDialog(); virtual void dispose() override; // already updated in selection handler const OUString& GetEngine() const { return maEngine; } - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& GetProperties(); + const css::uno::Sequence<css::beans::PropertyValue>& GetProperties(); }; class ScSolverIntegerDialog : public ModalDialog diff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx index 37107d04e1e7..7d9667e520f0 100644 --- a/sc/source/ui/inc/solverutil.hxx +++ b/sc/source/ui/inc/solverutil.hxx @@ -31,10 +31,10 @@ namespace com { namespace sun { namespace star { class ScSolverUtil { public: - static void GetImplementations( com::sun::star::uno::Sequence<OUString>& rImplNames, - com::sun::star::uno::Sequence<OUString>& rDescriptions ); - static com::sun::star::uno::Reference<com::sun::star::sheet::XSolver> GetSolver( const OUString& rImplName ); - static com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> GetDefaults( const OUString& rImplName ); + static void GetImplementations( css::uno::Sequence<OUString>& rImplNames, + css::uno::Sequence<OUString>& rDescriptions ); + static css::uno::Reference<css::sheet::XSolver> GetSolver( const OUString& rImplName ); + static css::uno::Sequence<css::beans::PropertyValue> GetDefaults( const OUString& rImplName ); }; #endif diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index c5fffce05396..24be8c0c43b4 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -436,8 +436,7 @@ public: void AddHighlightRange( const ScRange& rRange, const Color& rColor ); void ClearHighlightRanges(); - void DoChartSelection( const ::com::sun::star::uno::Sequence< - ::com::sun::star::chart2::data::HighlightedRange > & rHilightRanges ); + void DoChartSelection( const css::uno::Sequence< css::chart2::data::HighlightedRange > & rHilightRanges ); long GetGridWidth( ScHSplitPos eWhich ); long GetGridHeight( ScVSplitPos eWhich ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 31208b35f628..6f94a6088d15 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -119,8 +119,7 @@ private: ::editeng::SvxBorderLine* pCurFrameLine; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatchProviderInterceptor > + css::uno::Reference< css::frame::XDispatchProviderInterceptor > xDisProvInterceptor; Point aWinPos; @@ -180,8 +179,7 @@ private: SfxShell* GetMySubShell() const; void DoReadUserData( const OUString& rData ); - void DoReadUserDataSequence( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rSettings ); + void DoReadUserDataSequence( const css::uno::Sequence< css::beans::PropertyValue >& rSettings ); DECL_LINK_TYPED( SimpleRefClose, const OUString*, void ); DECL_LINK_TYPED( SimpleRefDone, const OUString&, void ); @@ -211,8 +209,8 @@ protected: virtual void WriteUserData(OUString &, bool bBrowse = false) override; virtual void ReadUserData(const OUString &, bool bBrowse = false) 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 UIDeactivated( SfxInPlaceClient* pClient ) override; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index fefff1f6dc79..b362a02d255a 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -68,7 +68,7 @@ public: void SetNumType(SvxNumType eNumType); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; ScHeaderEditEngine* GetEditEngine() const { return pEdEngine; } void SetObjectSelectHdl( const Link<ScEditWindow&,void>& aLink) { aObjectSelectLink = aLink; } @@ -91,7 +91,7 @@ private: ScEditWindowLocation eLocation; bool mbRTL; - com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > xAcc; + css::uno::WeakReference< css::accessibility::XAccessible > xAcc; ScAccessibleEditObject* pAcc; Link<ScEditWindow&,void> aObjectSelectLink; diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 855cc50c10b8..f69b21c810c2 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -46,7 +46,7 @@ private: TransferableObjectDescriptor aObjDesc; SfxObjectShellRef aDocShellRef; SfxObjectShellRef aDrawPersistRef; - com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges> xDragSourceRanges; + css::uno::Reference<css::sheet::XSheetCellRanges> xDragSourceRanges; SCCOL nDragHandleX; SCROW nDragHandleY; SCTAB nVisibleTab; @@ -74,7 +74,7 @@ public: 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; + const css::datatransfer::DataFlavor& rFlavor ) override; virtual void ObjectReleased() override; virtual void DragFinished( sal_Int8 nDropAction ) override; diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 493d24a5124a..3e73bf22163f 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -145,7 +145,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; ScViewData* GetViewData () const { return pViewData; } const ScSortParam& GetSortData () const { return theSortData; } @@ -197,7 +197,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; ScViewData* GetViewData () const { return pViewData; } const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 630693cd79fe..ea119050865a 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -142,11 +142,11 @@ private: ScViewDataTable(); void WriteUserDataSequence( - com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings, + css::uno::Sequence <css::beans::PropertyValue>& rSettings, const ScViewData& rViewData, SCTAB nTab ) const; void ReadUserDataSequence( - const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings, + const css::uno::Sequence <css::beans::PropertyValue>& rSettings, ScViewData& rViewData, SCTAB nTab, bool& rHasZoom); public: ~ScViewDataTable(); @@ -251,8 +251,8 @@ public: void ReadUserData(const OUString& rData); void WriteExtOptions( ScExtDocOptions& rOpt ) const; void ReadExtOptions( const ScExtDocOptions& rOpt ); - void WriteUserDataSequence(com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings) const; - void ReadUserDataSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings); + void WriteUserDataSequence(css::uno::Sequence <css::beans::PropertyValue>& rSettings) const; + void ReadUserDataSequence(const css::uno::Sequence <css::beans::PropertyValue>& rSettings); ScDocument* GetDocument() const; diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 836d5ac5058f..84bf390b170c 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -115,35 +115,32 @@ public: SC_DLLPUBLIC void PasteFromSystem(); SC_DLLPUBLIC bool PasteFromSystem( SotClipboardFormatId nFormatId, bool bApi = false ); - void PasteFromTransferable( const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); + void PasteFromTransferable( const css::uno::Reference< + css::datatransfer::XTransferable >& rxTransferable ); void PasteDraw(); void PasteDraw( const Point& rLogicPos, SdrModel* pModel, bool bGroup, const OUString& rSrcShellID, const OUString& rDestShellID ); bool PasteOnDrawObjectLinked( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, SdrObject& rHitObj); bool PasteDataFormat( SotClipboardFormatId nFormatId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable, + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, SCCOL nPosX, SCROW nPosY, Point* pLogicPos = NULL, bool bLink = false, bool bAllowDialogs = false ); bool PasteFile( const Point&, const OUString&, bool bLink=false ); - bool PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const OUString& = OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT ); + bool PasteObject( const Point&, const css::uno::Reference < css::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const OUString& = OUString(), sal_Int64 nAspect = css::embed::Aspects::MSOLE_CONTENT ); bool PasteBitmapEx( const Point&, const BitmapEx& ); bool PasteMetaFile( const Point&, const GDIMetaFile& ); bool PasteGraphic( const Point& rPos, const Graphic& rGraphic, const OUString& rFile, const OUString& rFilter ); bool PasteBookmark( SotClipboardFormatId nFormatId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable, + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, SCCOL nPosX, SCROW nPosY ); - bool PasteLink( const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); + bool PasteLink( const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable ); void InsertBookmark( const OUString& rDescription, const OUString& rURL, SCCOL nPosX, SCROW nPosY, const OUString* pTarget = NULL, @@ -338,8 +335,7 @@ protected: private: void PasteRTF( SCCOL nCol, SCROW nStartRow, - const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable ); bool PasteMultiRangesFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, ScPasteFunc nFunction, bool bSkipEmpty, bool bTranspose, bool bAsLink, bool bAllowDialogs, diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 1b87ed40a282..24932223c6f1 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -127,7 +127,7 @@ void ScEditWindow::dispose() // delete Accessible object before deleting EditEngine and EditView if (pAcc) { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xTemp = xAcc; + css::uno::Reference< css::accessibility::XAccessible > xTemp = xAcc; if (xTemp.is()) pAcc->dispose(); } @@ -285,7 +285,7 @@ void ScEditWindow::GetFocus() pEdView->ShowCursor(); pActiveEdWnd = this; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xTemp = xAcc; + css::uno::Reference< css::accessibility::XAccessible > xTemp = xAcc; if (xTemp.is() && pAcc) { pAcc->GotFocus(); @@ -298,7 +298,7 @@ void ScEditWindow::GetFocus() void ScEditWindow::LoseFocus() { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xTemp = xAcc; + css::uno::Reference< css::accessibility::XAccessible > xTemp = xAcc; if (xTemp.is() && pAcc) { pAcc->LostFocus(); @@ -308,7 +308,7 @@ void ScEditWindow::LoseFocus() Control::LoseFocus(); } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ScEditWindow::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > ScEditWindow::CreateAccessible() { OUString sName; OUString sDescription(GetHelpText()); @@ -332,7 +332,7 @@ void ScEditWindow::LoseFocus() } pAcc = new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), pEdView, this, OUString(sName), OUString(sDescription), ScAccessibleEditObject::EditControl); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible = pAcc; + css::uno::Reference< css::accessibility::XAccessible > xAccessible = pAcc; xAcc = xAccessible; return pAcc; } diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 9041722dec95..42e541b2b3e1 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -1103,7 +1103,7 @@ void ScUndoPaste::Repeat(SfxRepeatTarget& rTarget) if (pOwnClip) { // keep a reference in case the clipboard is changed during PasteFromClip - com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> aOwnClipRef( pOwnClip ); + css::uno::Reference<css::datatransfer::XTransferable> aOwnClipRef( pOwnClip ); pViewSh->PasteFromClip( nFlags, pOwnClip->GetDocument(), aPasteOptions.nFunction, aPasteOptions.bSkipEmpty, aPasteOptions.bTranspose, aPasteOptions.bAsLink, aPasteOptions.eMoveMode, InsertDeleteFlags::NONE, diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index a7dd0827e338..f7694235ab8d 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -41,10 +41,10 @@ namespace calc class OCellListSource; // the base for our interfaces - typedef ::cppu::WeakAggComponentImplHelper4 < ::com::sun::star::form::binding::XListEntrySource - , ::com::sun::star::util::XModifyListener - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XInitialization + typedef ::cppu::WeakAggComponentImplHelper4 < css::form::binding::XListEntrySource + , css::util::XModifyListener + , css::lang::XServiceInfo + , css::lang::XInitialization > OCellListSource_Base; // the base for the property handling typedef ::comphelper::OPropertyContainer OCellListSource_PBase; @@ -58,9 +58,9 @@ namespace calc ,public OCellListSource_PABase { private: - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > + css::uno::Reference< css::sheet::XSpreadsheetDocument > m_xDocument; /// the document where our cell lives - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > + css::uno::Reference< css::table::XCellRange > m_xRange; /// the range of cells we're bound to ::cppu::OInterfaceContainerHelper m_aListEntryListeners; /// our listeners @@ -68,7 +68,7 @@ namespace calc public: OCellListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& _rxDocument + const css::uno::Reference< css::sheet::XSpreadsheetDocument >& _rxDocument ); using OCellListSource_PBase::getFastPropertyValue; @@ -84,36 +84,36 @@ namespace calc DECLARE_XTYPEPROVIDER() // XListEntrySource - virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; // OComponentHelper/XComponent 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 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const override; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& _rValue, sal_Int32 _nHandle ) const override; // ::comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) 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 modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // 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; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; private: void checkDisposed( ) const; @@ -123,7 +123,7 @@ namespace calc @precond our m_xRange is not <NULL/> */ - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress getRangeAddress( ) const; /** retrievs the text of a cell within our range diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index eb3cd065dada..e816b07d2c37 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2999,7 +2999,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas // XIndent -void SAL_CALL ScCellRangesBase::decrementIndent() throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangesBase::decrementIndent() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) // leer = nichts zu tun @@ -3011,7 +3011,7 @@ void SAL_CALL ScCellRangesBase::decrementIndent() throw(::com::sun::star::uno::R } } -void SAL_CALL ScCellRangesBase::incrementIndent() throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangesBase::incrementIndent() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) // leer = nichts zu tun @@ -3390,7 +3390,7 @@ void SAL_CALL ScCellRangesBase::removeChartDataChangeEventListener( const uno::R } } -double SAL_CALL ScCellRangesBase::getNotANumber() throw(::com::sun::star::uno::RuntimeException, std::exception) +double SAL_CALL ScCellRangesBase::getNotANumber() throw(css::uno::RuntimeException, std::exception) { // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will return DBL_MIN; @@ -4303,7 +4303,7 @@ OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() void SAL_CALL ScCellRangesObj::addRangeAddress( const table::CellRangeAddress& rRange, sal_Bool bMergeRanges ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aRange(static_cast<SCCOL>(rRange.StartColumn), @@ -4324,8 +4324,8 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const ScR } void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress& rRange ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -4373,7 +4373,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress void SAL_CALL ScCellRangesObj::addRangeAddresses( const uno::Sequence<table::CellRangeAddress >& rRanges, sal_Bool bMergeRanges ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_Int32 nCount(rRanges.getLength()); @@ -4394,8 +4394,8 @@ void SAL_CALL ScCellRangesObj::addRangeAddresses( const uno::Sequence<table::Cel } void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table::CellRangeAddress >& rRangeSeq ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) { // use sometimes a better/faster implementation sal_uInt32 nCount(rRangeSeq.getLength()); @@ -8407,7 +8407,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn sal_Int16 nValue = 0; if (aValue >>= nValue) { - if (nValue == com::sun::star::text::WritingMode2::RL_TB) + if (nValue == css::text::WritingMode2::RL_TB) rFunc.SetLayoutRTL(nTab, true, true); else rFunc.SetLayoutRTL(nTab, false, true); @@ -8584,9 +8584,9 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn else if ( pEntry->nWID == SC_WID_UNO_TABLAYOUT ) { if (rDoc.IsLayoutRTL(nTab)) - rAny <<= sal_Int16(com::sun::star::text::WritingMode2::RL_TB); + rAny <<= sal_Int16(css::text::WritingMode2::RL_TB); else - rAny <<= sal_Int16(com::sun::star::text::WritingMode2::LR_TB); + rAny <<= sal_Int16(css::text::WritingMode2::LR_TB); } else if ( pEntry->nWID == SC_WID_UNO_AUTOPRINT ) { diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 6f47116c58da..4979a5e979d6 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -42,11 +42,11 @@ namespace calc class OCellValueBinding; // the base for our interfaces - typedef ::cppu::WeakAggComponentImplHelper5 < ::com::sun::star::form::binding::XValueBinding - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::util::XModifyBroadcaster - , ::com::sun::star::util::XModifyListener - , ::com::sun::star::lang::XInitialization + typedef ::cppu::WeakAggComponentImplHelper5 < css::form::binding::XValueBinding + , css::lang::XServiceInfo + , css::util::XModifyBroadcaster + , css::util::XModifyListener + , css::lang::XInitialization > OCellValueBinding_Base; // the base for the property handling typedef ::comphelper::OPropertyContainer OCellValueBinding_PBase; @@ -60,11 +60,11 @@ namespace calc ,public OCellValueBinding_PABase { private: - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > + css::uno::Reference< css::sheet::XSpreadsheetDocument > m_xDocument; /// the document where our cell lives - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > + css::uno::Reference< css::table::XCell > m_xCell; /// the cell we're bound to, for double value access - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > + css::uno::Reference< css::text::XTextRange > m_xCellText; /// the cell we're bound to, for text access ::cppu::OInterfaceContainerHelper m_aModifyListeners; /// our modify listeners @@ -73,7 +73,7 @@ namespace calc public: OCellValueBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& _rxDocument, + const css::uno::Reference< css::sheet::XSpreadsheetDocument >& _rxDocument, bool _bListPos ); @@ -90,43 +90,43 @@ namespace calc DECLARE_XTYPEPROVIDER() // XValueBinding - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getSupportedValueTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsType( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getValue( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getSupportedValueTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) throw (css::form::binding::IncompatibleTypesException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( const css::uno::Any& aValue ) throw (css::form::binding::IncompatibleTypesException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // OComponentHelper/XComponent 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 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const override; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& _rValue, sal_Int32 _nHandle ) const override; // ::comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) 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 modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // 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; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; private: void checkDisposed( ) const; - void checkValueType( const ::com::sun::star::uno::Type& _rType ) const; + void checkValueType( const css::uno::Type& _rType ) const; void checkInitialized(); /** notifies our modify listeners diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 5542341923c4..373d1717ffd0 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -97,7 +97,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap() static const SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] = { {OUString(SC_UNONAME_HIDDENVALUES), 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), 0, 0 }, - {OUString(SC_UNONAME_ROLE), 0, cppu::UnoType<com::sun::star::chart2::data::DataSequenceRole>::get(), 0, 0 }, + {OUString(SC_UNONAME_ROLE), 0, cppu::UnoType<css::chart2::data::DataSequenceRole>::get(), 0, 0 }, {OUString(SC_UNONAME_INCLUDEHIDDENCELLS), 0, cppu::UnoType<bool>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -105,10 +105,9 @@ const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap() } template< typename T > -::com::sun::star::uno::Sequence< T > lcl_VectorToSequence( - const ::std::vector< T > & rCont ) +css::uno::Sequence< T > lcl_VectorToSequence( const ::std::vector< T > & rCont ) { - ::com::sun::star::uno::Sequence< T > aResult( rCont.size()); + css::uno::Sequence< T > aResult( rCont.size()); ::std::copy( rCont.begin(), rCont.end(), aResult.getArray()); return aResult; } diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 10dc39106a11..aef5ea31a7f8 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -166,7 +166,7 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, const awt::Rectangle& aRect, const uno::Sequence<table::CellRangeAddress>& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index c166330882b6..4fc02fabc82d 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -169,7 +169,7 @@ void SAL_CALL ScDispatchProviderInterceptor::setMasterDispatchProvider( // XEventListener void SAL_CALL ScDispatchProviderInterceptor::disposing( const lang::EventObject& /* Source */ ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -333,8 +333,8 @@ void SAL_CALL ScDispatch::removeStatusListener( // XSelectionChangeListener -void SAL_CALL ScDispatch::selectionChanged( const ::com::sun::star::lang::EventObject& /* aEvent */ ) - throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScDispatch::selectionChanged( const css::lang::EventObject& /* aEvent */ ) + throw (css::uno::RuntimeException, std::exception) { // currently only called for URL cURLDocDataSource @@ -368,8 +368,8 @@ void SAL_CALL ScDispatch::selectionChanged( const ::com::sun::star::lang::EventO // XEventListener -void SAL_CALL ScDispatch::disposing( const ::com::sun::star::lang::EventObject& rSource ) - throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScDispatch::disposing( const css::lang::EventObject& rSource ) + throw (css::uno::RuntimeException, std::exception) { uno::Reference<view::XSelectionSupplier> xSupplier(rSource.Source, uno::UNO_QUERY); xSupplier->removeSelectionChangeListener(this); diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index db76dd0610d7..8391905ba969 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -906,12 +906,12 @@ uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType ) uno::Any aRet(SfxBaseModel::queryInterface( rType )); if ( !aRet.hasValue() - && rType != cppu::UnoType<com::sun::star::document::XDocumentEventBroadcaster>::get() - && rType != cppu::UnoType<com::sun::star::frame::XController>::get() - && rType != cppu::UnoType<com::sun::star::frame::XFrame>::get() - && rType != cppu::UnoType<com::sun::star::script::XInvocation>::get() - && rType != cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get() - && rType != cppu::UnoType<com::sun::star::awt::XWindow>::get()) + && rType != cppu::UnoType<css::document::XDocumentEventBroadcaster>::get() + && rType != cppu::UnoType<css::frame::XController>::get() + && rType != cppu::UnoType<css::frame::XFrame>::get() + && rType != cppu::UnoType<css::script::XInvocation>::get() + && rType != cppu::UnoType<css::beans::XFastPropertySet>::get() + && rType != cppu::UnoType<css::awt::XWindow>::get()) { GetFormatter(); if ( xNumberAgg.is() ) @@ -1775,7 +1775,7 @@ sal_Int16 SAL_CALL ScModelObj::resetActionLocks() throw(uno::RuntimeException, s return nRet; } -void SAL_CALL ScModelObj::lockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::lockControllers() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SfxBaseModel::lockControllers(); @@ -1783,7 +1783,7 @@ void SAL_CALL ScModelObj::lockControllers() throw (::com::sun::star::uno::Runtim pDocShell->LockPaint(); } -void SAL_CALL ScModelObj::unlockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::unlockControllers() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (hasControllersLocked()) diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index c22f8d312fa8..5e663bf908c6 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -194,9 +194,9 @@ OUString ScExcelBiffDetect::detect( uno::Sequence<beans::PropertyValue>& lDescri return aType; } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_calc_ExcelBiffFormatDetector_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_calc_ExcelBiffFormatDetector_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScExcelBiffDetect(context)); } diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx index 12901ce85614..22e91ad6d9fb 100644 --- a/sc/source/ui/unoobj/exceldetect.hxx +++ b/sc/source/ui/unoobj/exceldetect.hxx @@ -19,20 +19,20 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; }}}} -class ScExcelBiffDetect : public cppu::WeakImplHelper<com::sun::star::document::XExtendedFilterDetection, com::sun::star::lang::XServiceInfo> +class ScExcelBiffDetect : public cppu::WeakImplHelper<css::document::XExtendedFilterDetection, css::lang::XServiceInfo> { public: - ScExcelBiffDetect( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext ); + ScExcelBiffDetect( const css::uno::Reference<css::uno::XComponentContext>& xContext ); virtual ~ScExcelBiffDetect(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) 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& aName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XExtendedFilterDetection - virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor ) + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 293bfc017096..0521434d79af 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -692,7 +692,7 @@ SvxFieldData* ScEditFieldObj::getData() return mpData.get(); } -void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const com::sun::star::uno::Any& rVal) +void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const css::uno::Any& rVal) { OUString aStrVal; if (mpEditSource) diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 0258478524fc..5d2694e75757 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -1399,7 +1399,7 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName ) uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( const OUString& aApplication, const OUString& aTopic, - const OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) + const OUString& aItem, css::sheet::DDELinkMode nMode ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index 9f187786be2a..a1149acb3bca 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -218,29 +218,29 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme } OUString SAL_CALL ScIndexEnumeration::getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return OUString("ScIndexEnumeration"); } sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -::com::sun::star::uno::Sequence< OUString > +css::uno::Sequence< OUString > SAL_CALL ScIndexEnumeration::getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Sequence< OUString > aRet(1); + css::uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); pArray[0] = sServiceName; return aRet; } -ScNameToIndexAccess::ScNameToIndexAccess( const com::sun::star::uno::Reference< - com::sun::star::container::XNameAccess>& rNameObj ) : +ScNameToIndexAccess::ScNameToIndexAccess( const css::uno::Reference< + css::container::XNameAccess>& rNameObj ) : xNameAccess( rNameObj ) { //! test for XIndexAccess interface at rNameObj, use that instead! @@ -255,15 +255,15 @@ ScNameToIndexAccess::~ScNameToIndexAccess() // XIndexAccess -sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) throw(css::uno::RuntimeException, std::exception) { return aNames.getLength(); } -::com::sun::star::uno::Any SAL_CALL ScNameToIndexAccess::getByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL ScNameToIndexAccess::getByIndex( sal_Int32 nIndex ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { if ( xNameAccess.is() && nIndex >= 0 && nIndex < aNames.getLength() ) return xNameAccess->getByName( aNames.getConstArray()[nIndex] ); @@ -273,8 +273,8 @@ sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) throw(::com::sun::star::uno // XElementAccess -::com::sun::star::uno::Type SAL_CALL ScNameToIndexAccess::getElementType( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Type SAL_CALL ScNameToIndexAccess::getElementType( ) + throw(css::uno::RuntimeException, std::exception) { if ( xNameAccess.is() ) return xNameAccess->getElementType(); @@ -282,7 +282,7 @@ sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) throw(::com::sun::star::uno return uno::Type(); } -sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(css::uno::RuntimeException, std::exception) { return getCount() > 0; } diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index 80b67b4d4056..73b15fd6824b 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -224,7 +224,7 @@ void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::Ru // XSheetAnnotationShapeSupplier uno::Reference < drawing::XShape > SAL_CALL ScAnnotationObj::getAnnotationShape() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 8d29d6e0e10d..12a11be841e0 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -322,7 +322,7 @@ sal_Bool ScFilterDetect::supportsService( const OUString& sServiceName ) return cppu::supportsService(this, sServiceName); } -com::sun::star::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames() +css::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence<OUString> seqServiceNames(1); @@ -330,9 +330,9 @@ com::sun::star::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames return seqServiceNames; } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_calc_FormatDetector_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_calc_FormatDetector_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScFilterDetect(context)); } diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index 1dca02c3b02e..7c1af7015c14 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -36,21 +36,21 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } }}} -class ScFilterDetect : public ::cppu::WeakImplHelper< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo > +class ScFilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo > { public: - ScFilterDetect( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext ); + ScFilterDetect( const css::uno::Reference<css::uno::XComponentContext>& xContext ); virtual ~ScFilterDetect(); /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) 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& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XExtendedFilterDetect - virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor ) + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 9ba379bf67cd..3562d3c50531 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -92,7 +92,7 @@ public: maWorkbook <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs ); } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override { SolarMutexGuard aGuard; maCachedObject = uno::Any(); // clear cached object @@ -135,16 +135,16 @@ public: return maCachedObject.hasValue(); } - ::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 + css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { SolarMutexGuard aGuard; OSL_TRACE("ScVbaObjectForCodeNameProvider::getByName( %s )", OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() ); if ( !hasByName( aName ) ) - throw ::com::sun::star::container::NoSuchElementException(); + throw css::container::NoSuchElementException(); return maCachedObject; } - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override { SolarMutexGuard aGuard; ScDocument& rDoc = mpDocShell->GetDocument(); @@ -161,8 +161,8 @@ public: return aNames; } // XElemenAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return uno::Type(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override { return sal_True; } + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override { return uno::Type(); } + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception ) override { return sal_True; } }; diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index bd93e98715d4..1eed0551b3d5 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1181,7 +1181,7 @@ bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) throw (::uno::RuntimeException) { bool bReturn(false); - if ( e.Buttons == ::com::sun::star::awt::MouseButton::LEFT ) + if ( e.Buttons == css::awt::MouseButton::LEFT ) mbLeftMousePressed = true; uno::Reference< uno::XInterface > xTarget = GetClickedObject(Point(e.X, e.Y)); @@ -1274,7 +1274,7 @@ bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) bool ScTabViewObj::MouseReleased( const awt::MouseEvent& e ) throw (uno::RuntimeException) { - if ( e.Buttons == ::com::sun::star::awt::MouseButton::LEFT ) + if ( e.Buttons == css::awt::MouseButton::LEFT ) { try { @@ -2212,8 +2212,8 @@ ScTabViewObj* ScTabViewObj::getImplementation(const uno::Reference<uno::XInterfa return pRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL ScTabViewObj::getTransferable() - throw (::com::sun::star::uno::RuntimeException, +css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL ScTabViewObj::getTransferable() + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2240,9 +2240,9 @@ ScTabViewObj* ScTabViewObj::getImplementation(const uno::Reference<uno::XInterfa return xTransferable; } -void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) - throw (::com::sun::star::datatransfer::UnsupportedFlavorException, - ::com::sun::star::uno::RuntimeException, +void SAL_CALL ScTabViewObj::insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) + throw (css::datatransfer::UnsupportedFlavorException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 7cd16bb60420..4f7d181b05ae 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -334,7 +334,7 @@ ScVbaApplication::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeExcept } uno::Any SAL_CALL -ScVbaApplication::WorksheetFunction( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaApplication::WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) { return uno::makeAny( uno::Reference< script::XInvocation >( new ScVbaWSFunction( this, mxContext ) ) ); } diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index 9612438681a6..7760d9e06514 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -45,8 +45,8 @@ public: void removeByName(const OUString& _sChartName); // XChartObjects - virtual ::com::sun::star::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (::com::sun::star::script::BasicErrorException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (::com::sun::star::script::BasicErrorException, std::exception) override; + virtual css::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (css::script::BasicErrorException, std::exception) override; + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, std::exception) override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // XElementAccess diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index f6477be468c9..7b98034c9815 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -151,7 +151,7 @@ ScVbaGlobals::getThisWorkbook() throw (uno::RuntimeException, std::exception) return getApplication()->getThisWorkbook(); } void SAL_CALL -ScVbaGlobals::Calculate() throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException, std::exception) +ScVbaGlobals::Calculate() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) { return getApplication()->Calculate(); } diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index b7d72fad2bea..b2195d40e81f 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -34,37 +34,34 @@ typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE; - class ScVbaGlobals : public ScVbaGlobals_BASE - { - css::uno::Reference< ov::excel::XApplication > mxApplication; - css::uno::Reference< - ov::excel::XApplication > SAL_CALL getApplication() +class ScVbaGlobals : public ScVbaGlobals_BASE +{ + css::uno::Reference< ov::excel::XApplication > mxApplication; + css::uno::Reference< ov::excel::XApplication > SAL_CALL getApplication() throw (css::uno::RuntimeException); - public: +public: - ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, - css::uno::Reference< css::uno::XComponentContext >const& rxContext ); - //ScVbaGlobals( - // css::uno::Reference< css::uno::XComponentContext >const& rxContext, ); - virtual ~ScVbaGlobals(); + ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, + css::uno::Reference< css::uno::XComponentContext >const& rxContext ); + virtual ~ScVbaGlobals(); - // XGlobals - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override; + // XGlobals + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Calculate( ) throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; @@ -82,7 +79,7 @@ typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::excel::XGlobals > ScV // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; - }; -#endif +}; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index 700a0a1c53d7..8abd91c14f25 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.hxx @@ -53,8 +53,8 @@ public: virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) override; virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECT_HXX diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 86554ff299b5..0fce307c647e 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -1679,7 +1679,7 @@ ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException, } uno::Any -ScVbaRange::getFormulaR1C1() throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaRange::getFormulaR1C1() throw (css::uno::RuntimeException, std::exception) { return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); } @@ -1691,7 +1691,7 @@ ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeExcepti } uno::Any -ScVbaRange::getFormula() throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaRange::getFormula() throw (css::uno::RuntimeException, std::exception) { return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); } @@ -2846,7 +2846,7 @@ getPasteFormulaBits( sal_Int32 Operation) return nFormulaBits; } void SAL_CALL -ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception) { if ( m_Areas->getCount() > 1 ) throw uno::RuntimeException("That command cannot be used on multiple selections" ); diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 59c326b102b6..bdbebac2f32a 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -56,8 +56,8 @@ SCTAB, OUStringHash, typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets; typedef ::cppu::WeakImplHelper< container::XEnumerationAccess - , com::sun::star::container::XIndexAccess - , com::sun::star::container::XNameAccess + , css::container::XIndexAccess + , css::container::XNameAccess > SelectedSheets_BASE; class SelectedSheetsEnum : public ::cppu::WeakImplHelper< container::XEnumeration > diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 09d52ff62c6c..e9a7d0dc33d1 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -104,8 +104,8 @@ public: }; typedef ::cppu::WeakImplHelper< container::XEnumerationAccess - , com::sun::star::container::XIndexAccess - , com::sun::star::container::XNameAccess + , css::container::XIndexAccess + , css::container::XNameAccess > WindowsAccessImpl_BASE; class WindowsAccessImpl : public WindowsAccessImpl_BASE diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 9876b9c75822..8735dd0c8f72 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -39,7 +39,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // XWindows - virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (css::uno::RuntimeException, std::exception) override; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index a7fc1ac49b70..0160826d043c 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -305,7 +305,7 @@ ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeExcep } void SAL_CALL -ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*ReadOnlyRecommended*/, const uno::Any& /*CreateBackup*/, const uno::Any& /*AccessMode*/, const uno::Any& /*ConflictResolution*/, const uno::Any& /*AddToMru*/, const uno::Any& /*TextCodepage*/, const uno::Any& /*TextVisualLayout*/, const uno::Any& /*Local*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*ReadOnlyRecommended*/, const uno::Any& /*CreateBackup*/, const uno::Any& /*AccessMode*/, const uno::Any& /*ConflictResolution*/, const uno::Any& /*AddToMru*/, const uno::Any& /*TextCodepage*/, const uno::Any& /*TextVisualLayout*/, const uno::Any& /*Local*/ ) throw (css::uno::RuntimeException, std::exception) { OUString sFileName; FileName >>= sFileName; diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 699f8d359043..49d434ced9f8 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -52,7 +52,7 @@ public: virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 1e7aa38fd686..e5e57307c682 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -163,7 +163,7 @@ openNewDoc(const OUString& aSheetName ) uno::Reference<lang::XComponent > xComponent( xComponentLoader->loadComponentFromURL( OUString( "private:factory/scalc" ), OUString( "_blank" ), 0, - uno::Sequence < ::com::sun::star::beans::PropertyValue >() ) ); + uno::Sequence < css::beans::PropertyValue >() ) ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW ); if ( xSpreadDoc.is() ) { diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 58d17a17dc29..d61c5d8e0e73 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -75,7 +75,7 @@ public: { return mxModel; } css::uno::Reference< css::sheet::XSpreadsheet > getSheet() { return mxSheet; } - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); css::uno::Reference< ov::excel::XWorksheet > createSheetCopyInNewDoc( const OUString& ); css::uno::Reference< ov::excel::XWorksheet > createSheetCopy(css::uno::Reference< ov::excel::XWorksheet> xSheet, bool bAfter); diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index a0bb2d29ef03..676febee36e7 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -165,11 +165,11 @@ public: }; -ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xSheets, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, xSheets ), mxModel( xModel ), m_xSheets( uno::Reference< sheet::XSpreadsheets >( xSheets, uno::UNO_QUERY ) ) +ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xSheets, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, xSheets ), mxModel( xModel ), m_xSheets( uno::Reference< sheet::XSpreadsheets >( xSheets, uno::UNO_QUERY ) ) { } -ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XEnumerationAccess >& xEnumAccess, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xEnumAccess, uno::UNO_QUERY ) ), mxModel(xModel) +ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XEnumerationAccess >& xEnumAccess, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xEnumAccess, uno::UNO_QUERY ) ), mxModel(xModel) { } diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index e1ddb60e97cf..cf4b59012ae7 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -783,7 +783,7 @@ bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& // of days with a "Number of days" value. rOldInfo = pNumGroupDim->GetInfo(); - rParts = com::sun::star::sheet::DataPilotFieldGroupBy::DAYS; // not found in CollectDateParts + rParts = css::sheet::DataPilotFieldGroupBy::DAYS; // not found in CollectDateParts bFoundParts = true; bFound = true; } diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 2f192fbc33ac..4d2f2504d281 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -403,20 +403,20 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) const SfxStringItem* pFamilyItem = rReq.GetArg<SfxStringItem>(SID_STYLE_FAMILYNAME); if ( pFamilyItem && pNameItem ) { - com::sun::star::uno::Reference< com::sun::star::style::XStyleFamiliesSupplier > xModel(pDocSh->GetModel(), com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::style::XStyleFamiliesSupplier > xModel(pDocSh->GetModel(), css::uno::UNO_QUERY); try { - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xStyles; - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xCont = xModel->getStyleFamilies(); + css::uno::Reference< css::container::XNameAccess > xStyles; + css::uno::Reference< css::container::XNameAccess > xCont = xModel->getStyleFamilies(); xCont->getByName(pFamilyItem->GetValue()) >>= xStyles; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xInfo; + css::uno::Reference< css::beans::XPropertySet > xInfo; xStyles->getByName( pNameItem->GetValue() ) >>= xInfo; OUString aUIName; xInfo->getPropertyValue("DisplayName") >>= aUIName; if ( !aUIName.isEmpty() ) rReq.AppendItem( SfxStringItem( SID_STYLE_APPLY, aUIName ) ); } - catch( com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 6c523cc8e477..8037a8a11497 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2811,13 +2811,13 @@ bool ScGridWindow::PreNotify( NotifyEvent& rNEvt ) SfxViewFrame* pViewFrame = pViewData->GetViewShell()->GetViewFrame(); if (pViewFrame) { - com::sun::star::uno::Reference<com::sun::star::frame::XController> xController = pViewFrame->GetFrame().GetController(); + css::uno::Reference<css::frame::XController> xController = pViewFrame->GetFrame().GetController(); if (xController.is()) { ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController ); if (pImp && pImp->IsMouseListening()) { - ::com::sun::star::awt::MouseEvent aEvent; + css::awt::MouseEvent aEvent; lcl_InitMouseEvent( aEvent, *rNEvt.GetMouseEvent() ); if ( rNEvt.GetWindow() ) aEvent.Source = rNEvt.GetWindow()->GetComponentInterface(); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 947d20b07ad7..2e044cb7e048 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -450,10 +450,10 @@ void ScGridWindow::HideNoteMarker() mpNoteMarker.reset(); } -com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > +css::uno::Reference< css::accessibility::XAccessible > ScGridWindow::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.is()) { return xAcc; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index d36dbb54eb76..72d88495c93a 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2448,7 +2448,7 @@ void ScOutputData::DrawEditParam::setPatternToEngine(bool bUseStyleColor) if ( !mbHyphenatorSet && static_cast<const SfxBoolItem&>(pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { // set hyphenator the first time it is needed - com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); + css::uno::Reference<css::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); mpEngine->SetHyphenator( xXHyphenator ); mbHyphenatorSet = true; } @@ -4802,7 +4802,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) if ( !bHyphenatorSet && static_cast<const SfxBoolItem&>(pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { // set hyphenator the first time it is needed - com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); + css::uno::Reference<css::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); pEngine->SetHyphenator( xXHyphenator ); bHyphenatorSet = true; } diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 37851a06f621..d1f4a3f2baf8 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -1514,9 +1514,9 @@ void ScPreview::LoseFocus() Window::LoseFocus(); } -com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> ScPreview::CreateAccessible() +css::uno::Reference<css::accessibility::XAccessible> ScPreview::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.is()) { return xAcc; diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index f6a4a9de8f7e..ca8c67e62e4e 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -471,7 +471,7 @@ void ScTabControl::DoDrag( const vcl::Region& /* rRegion */ ) // maSize is set in ScTransferObj ctor ScTransferObj* pTransferObj = new ScTransferObj( pClipDoc, aObjDesc ); - com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> xTransferable( pTransferObj ); + css::uno::Reference<css::datatransfer::XTransferable> xTransferable( pTransferObj ); pTransferObj->SetDragSourceFlags( SC_DROP_TABLE ); diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 88787fdf1f80..6e390531885c 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -2144,7 +2144,7 @@ void ScTabView::SetNewVisArea() if (pViewFrame) { SfxFrame& rFrame = pViewFrame->GetFrame(); - com::sun::star::uno::Reference<com::sun::star::frame::XController> xController = rFrame.GetController(); + css::uno::Reference<css::frame::XController> xController = rFrame.GetController(); if (xController.is()) { ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController ); diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index adaad13dbf72..d8bbc2f34b45 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -69,7 +69,7 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) return; sal_Int8 nType( pGalleryItem->GetType() ); - if ( nType == com::sun::star::gallery::GalleryItemType::GRAPHIC ) + if ( nType == css::gallery::GalleryItemType::GRAPHIC ) { MakeDrawLayer(); @@ -79,7 +79,7 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) OUString aPath, aFilter; PasteGraphic( aPos, aGraphic, aPath, aFilter ); } - else if ( nType == com::sun::star::gallery::GalleryItemType::MEDIA ) + else if ( nType == css::gallery::GalleryItemType::MEDIA ) { // for sounds (linked or not), insert a hyperlink button, // like in Impress and Writer diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index aa1daef67f97..a899178b50d5 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -3043,7 +3043,7 @@ void ScViewData::UpdateOutlinerFlags( Outliner& rOutl ) const if ( bOnlineSpell ) { - com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> xXSpellChecker1( LinguMgr::GetSpellChecker() ); + css::uno::Reference<css::linguistic2::XSpellChecker1> xXSpellChecker1( LinguMgr::GetSpellChecker() ); rOutl.SetSpeller( xXSpellChecker1 ); } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 42a7c37d3781..d84f3e078a31 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -481,7 +481,7 @@ void ScViewFunc::PasteFromSystem() SotClipboardFormatId nFormat; // output param for GetExchangeAction sal_uInt16 nEventAction; // output param for GetExchangeAction - uno::Reference<com::sun::star::datatransfer::XTransferable> xTransferable( aDataHelper.GetXTransferable() ); + uno::Reference<css::datatransfer::XTransferable> xTransferable( aDataHelper.GetXTransferable() ); sal_uInt16 nAction = SotExchange::GetExchangeAction( aDataHelper.GetDataFlavorExVector(), nDestination, diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 241106dd0e5a..9db01ae474fd 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -77,8 +77,7 @@ using namespace com::sun::star; bool bPasteIsDrop = false; void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, - const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable ) + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable ) { TransferableDataHelper aDataHelper( rxTransferable ); if ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE ) ) @@ -669,8 +668,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink } bool ScViewFunc::PasteBookmark( SotClipboardFormatId nFormatId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable, + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, SCCOL nPosX, SCROW nPosY ) { INetBookmark aBookmark; @@ -764,7 +762,7 @@ bool ScViewFunc::HasBookmarkAtCursor( SvxHyperlinkItem* pContent ) // doesn't have a field item data. return false; - if (pField->GetClassId() != com::sun::star::text::textfield::Type::URL) + if (pField->GetClassId() != css::text::textfield::Type::URL) // not a URL field. return false; diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index c8b8ea0af7eb..ee60d8c6370b 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -497,7 +497,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, pModel->GetItemPool().FreezeIdRanges(); 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 ) ); SvxDrawingLayerImport( pModel.get(), xInputStream ); // set everything to right layer: diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 1308f905bbfe..2da15480a718 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -1225,7 +1225,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, ScModelObj* pModelObj = HelperNotifyChanges::getMustPropagateChangesModel(*pDocSh); if (pModelObj) { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aProperties; + css::uno::Sequence< css::beans::PropertyValue > aProperties; sal_Int32 nCount = 0; const SfxItemPropertyMap& rMap = ScCellObj::GetCellPropertyMap(); PropertyEntryVector_t aPropVector = rMap.getPropertyEntries(); @@ -1239,7 +1239,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, { if ( aIt->nWID == nWhich ) { - ::com::sun::star::uno::Any aVal; + css::uno::Any aVal; pItem->QueryValue( aVal, aIt->nMemberId ); aProperties.realloc( nCount + 1 ); aProperties[ nCount ].Name = aIt->sName; diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index e878df4f3fe2..aba3a38b5e55 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -104,31 +104,31 @@ sal_Int32 ScViewUtil::GetTransliterationType( sal_uInt16 nSlotID ) switch ( nSlotID ) { case SID_TRANSLITERATE_SENTENCE_CASE: - nType = com::sun::star::i18n::TransliterationModulesExtra::SENTENCE_CASE; + nType = css::i18n::TransliterationModulesExtra::SENTENCE_CASE; break; case SID_TRANSLITERATE_TITLE_CASE: - nType = com::sun::star::i18n::TransliterationModulesExtra::TITLE_CASE; + nType = css::i18n::TransliterationModulesExtra::TITLE_CASE; break; case SID_TRANSLITERATE_TOGGLE_CASE: - nType = com::sun::star::i18n::TransliterationModulesExtra::TOGGLE_CASE; + nType = css::i18n::TransliterationModulesExtra::TOGGLE_CASE; break; case SID_TRANSLITERATE_UPPER: - nType = com::sun::star::i18n::TransliterationModules_LOWERCASE_UPPERCASE; + nType = css::i18n::TransliterationModules_LOWERCASE_UPPERCASE; break; case SID_TRANSLITERATE_LOWER: - nType = com::sun::star::i18n::TransliterationModules_UPPERCASE_LOWERCASE; + nType = css::i18n::TransliterationModules_UPPERCASE_LOWERCASE; break; case SID_TRANSLITERATE_HALFWIDTH: - nType = com::sun::star::i18n::TransliterationModules_FULLWIDTH_HALFWIDTH; + nType = css::i18n::TransliterationModules_FULLWIDTH_HALFWIDTH; break; case SID_TRANSLITERATE_FULLWIDTH: - nType = com::sun::star::i18n::TransliterationModules_HALFWIDTH_FULLWIDTH; + nType = css::i18n::TransliterationModules_HALFWIDTH_FULLWIDTH; break; case SID_TRANSLITERATE_HIRAGANA: - nType = com::sun::star::i18n::TransliterationModules_KATAKANA_HIRAGANA; + nType = css::i18n::TransliterationModules_KATAKANA_HIRAGANA; break; case SID_TRANSLITERATE_KATAGANA: - nType = com::sun::star::i18n::TransliterationModules_HIRAGANA_KATAKANA; + nType = css::i18n::TransliterationModules_HIRAGANA_KATAKANA; break; } return nType; |