diff options
Diffstat (limited to 'sc/source/ui/Accessibility')
13 files changed, 79 insertions, 86 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() ;) { |