diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /sc/source/ui/Accessibility | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'sc/source/ui/Accessibility')
19 files changed, 148 insertions, 153 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 7eb84d5bb8e8..e167eb2b4faf 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -266,22 +266,22 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleCell::getImplementationName(void) +OUString SAL_CALL ScAccessibleCell::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleCell"); + return OUString("ScAccessibleCell"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleCell::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessibleCell"); + pNames[nOldSize] = OUString("com.sun.star.sheet.AccessibleCell"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 7481e654030e..831386a88e04 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -113,7 +113,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CCOLOR))); + uno::Any aAny = xCellProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CCOLOR))); aAny >>= nColor; } } @@ -154,7 +154,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLBACK))); + uno::Any aAny = xCellProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLBACK))); aAny >>= nColor; } } @@ -199,16 +199,16 @@ sal_Int32 return mnIndex; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleCellBase::createAccessibleDescription(void) throw (uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_CELL_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_CELL_DESCR)); return sDescription; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleCellBase::createAccessibleName(void) throw (uno::RuntimeException) { @@ -222,7 +222,7 @@ sal_Int32 contained in cell A1, ZT reads "cell A twelve" instead of "cell A1 - 2". Simple solution: Append a space character to the cell address. */ sName.Append( ' ' ); - return rtl::OUString(sName); + return OUString(sName); } //===== XAccessibleValue ================================================ @@ -287,10 +287,10 @@ uno::Any SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleCellBase"); + return OUString("ScAccessibleCellBase"); } //===== XTypeProvider =================================================== diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index f19eb7c4692a..3b58ba1fb40b 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -313,7 +313,7 @@ sal_Int16 SAL_CALL return maRole; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::getAccessibleDescription(void) throw (uno::RuntimeException) { @@ -463,7 +463,7 @@ void SAL_CALL ScAccessibleContextBase::notifyEvent( //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::getImplementationName(void) throw (uno::RuntimeException) { @@ -476,7 +476,7 @@ sal_Bool SAL_CALL { // Iterate over all supported service names and return true if on of them // matches the given name. - uno::Sequence< ::rtl::OUString> aSupportedServices ( + uno::Sequence< OUString> aSupportedServices ( getSupportedServiceNames ()); sal_Int32 nLength(aSupportedServices.getLength()); const OUString* pServiceNames = aSupportedServices.getConstArray(); @@ -486,7 +486,7 @@ sal_Bool SAL_CALL return false; } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleContextBase::getSupportedServiceNames(void) throw (uno::RuntimeException) { @@ -523,20 +523,20 @@ uno::Sequence<sal_Int8> SAL_CALL //===== internal ============================================================ -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::createAccessibleDescription(void) throw (uno::RuntimeException) { OSL_FAIL("should be implemented in the abrevated class"); - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::createAccessibleName(void) throw (uno::RuntimeException) { OSL_FAIL("should be implemented in the abrevated class"); - return rtl::OUString(); + return OUString(); } void ScAccessibleContextBase::CommitChange(const AccessibleEventObject& rEvent) const @@ -552,7 +552,7 @@ void ScAccessibleContextBase::ChangeName() aEvent.Source = uno::Reference< XAccessibleContext >(const_cast<ScAccessibleContextBase*>(this)); aEvent.OldValue <<= msName; - msName = rtl::OUString(); // reset the name so it will be hold again + msName = OUString(); // reset the name so it will be hold again getAccessibleName(); // create the new name aEvent.NewValue <<= msName; diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index deb600879345..65f8778d50a2 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -48,8 +48,6 @@ // ause #include "editutil.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::utl::AccessibleRelationSetHelper; using ::utl::AccessibleStateSetHelper; using ::accessibility::AccessibleStaticTextBase; @@ -455,7 +453,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< ::rtl::OUString >& /* aRequestedAttributes */ ) + const ::com::sun::star::uno::Sequence< OUString >& /* aRequestedAttributes */ ) throw( IndexOutOfBoundsException, RuntimeException ) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index 0b3141f7f3a8..6c7134459770 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx @@ -102,7 +102,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); @@ -116,12 +116,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -447,10 +447,10 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotControl::getAc ///===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void) +OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleDataPilotControl"); + return OUString("ScAccessibleDataPilotControl"); } ///===== XTypeProvider =================================================== @@ -468,7 +468,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementation //===== internal ======================================================== -::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleDescription(void) +OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleDescription(void) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -476,10 +476,10 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementation if (mpFieldWindow) return mpFieldWindow->GetDescription(); - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleName(void) +OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleName(void) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -487,7 +487,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementation if (mpFieldWindow) return mpFieldWindow->GetName(); - return rtl::OUString(); + return OUString(); } Rectangle ScAccessibleDataPilotControl::GetBoundingBoxOnScreen(void) const @@ -658,10 +658,10 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotButton::getAcc ///===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void) +OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void) throw (::com::sun::star::uno::RuntimeException) { - return rtl::OUString("ScAccessibleDataPilotButton"); + return OUString("ScAccessibleDataPilotButton"); } ///===== XTypeProvider =================================================== @@ -677,13 +677,13 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotButton::getImplementationI return theScAccessibleDataPilotButtonImplementationId::get().getSeq(); } -::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleDescription(void) +OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException) { - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleName(void) +OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -691,7 +691,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotButton::getImplementationI if (mpFieldWindow) return mpFieldWindow->GetFieldText(getAccessibleIndexInParent()); - return rtl::OUString(); + return OUString(); } Rectangle ScAccessibleDataPilotButton::GetBoundingBoxOnScreen(void) const diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 76f84f0441ed..d22416ee542d 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -88,8 +88,8 @@ ScAccessibleShapeData::~ScAccessibleShapeData() struct ScShapeDataLess { - rtl::OUString msLayerId; - rtl::OUString msZOrder; + OUString msLayerId; + OUString msZOrder; ScShapeDataLess() : msLayerId(RTL_CONSTASCII_USTRINGPARAM( "LayerID" )), msZOrder(RTL_CONSTASCII_USTRINGPARAM( "ZOrder" )) @@ -1040,7 +1040,7 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, s uno::Reference< beans::XPropertySet > xShapeProp(xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - uno::Any aPropAny = xShapeProp->getPropertyValue(rtl::OUString( "LayerID" )); + uno::Any aPropAny = xShapeProp->getPropertyValue(OUString( "LayerID" )); sal_Int16 nLayerID = 0; if( aPropAny >>= nLayerID ) { @@ -1361,7 +1361,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { mpTempAccEdit = new ScAccessibleEditObject(this, mpViewShell->GetViewData()->GetEditView(meSplitPos), mpViewShell->GetWindowByPos(meSplitPos), GetCurrentCellName(), - rtl::OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::CellInEditMode); + OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::CellInEditMode); uno::Reference<XAccessible> xAcc = mpTempAccEdit; AddChild(xAcc, sal_True); @@ -1783,23 +1783,23 @@ void SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleDocument::getImplementationName(void) throw (uno::RuntimeException) { - return ::rtl::OUString("ScAccessibleDocument"); + return OUString("ScAccessibleDocument"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleDocument::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetDocumentView"); + pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheetDocumentView"); return aSequence; } @@ -1916,23 +1916,23 @@ utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScA return pRelationSet; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleDocument::createAccessibleDescription(void) throw (uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_DOC_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_DOC_DESCR)); return sDescription; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleDocument::createAccessibleName(void) throw (uno::RuntimeException) { SolarMutexGuard aGuard; IsObjectValid(); - rtl::OUString sName = String(ScResId(STR_ACC_DOC_NAME)); + OUString sName = String(ScResId(STR_ACC_DOC_NAME)); sal_Int32 nNumber(sal_Int32(meSplitPos) + 1); - sName += rtl::OUString::valueOf(nNumber); + sName += OUString::valueOf(nNumber); return sName; } @@ -2057,7 +2057,7 @@ void ScAccessibleDocument::RemoveChild(const uno::Reference<XAccessible>& xAcc, } } -rtl::OUString ScAccessibleDocument::GetCurrentCellName() const +OUString ScAccessibleDocument::GetCurrentCellName() const { String sName( ScResId(STR_ACC_CELL_NAME) ); if (mpViewShell) @@ -2067,12 +2067,12 @@ rtl::OUString ScAccessibleDocument::GetCurrentCellName() const mpViewShell->GetViewData()->GetCurPos().Format( sAddress, SCA_VALID, NULL ); sName.SearchAndReplaceAscii("%1", sAddress); } - return rtl::OUString(sName); + return OUString(sName); } -rtl::OUString ScAccessibleDocument::GetCurrentCellDescription() const +OUString ScAccessibleDocument::GetCurrentCellDescription() const { - return rtl::OUString(); + return OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 99927af07599..afcd4ff01bc3 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1591,21 +1591,21 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::ge //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void) throw (uno::RuntimeException) { - return ::rtl::OUString("ScAccessibleDocumentPagePreview"); + return OUString("ScAccessibleDocumentPagePreview"); } -uno::Sequence< ::rtl::OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void) +uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetPageView"); + pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheetPageView"); return aSequence; } @@ -1626,17 +1626,17 @@ uno::Sequence<sal_Int8> SAL_CALL //===== internal ======================================================== -::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription(void) throw (uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_PREVIEWDOC_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_PREVIEWDOC_DESCR)); return sDescription; } -::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName(void) throw (uno::RuntimeException) { - rtl::OUString sName = String(ScResId(STR_ACC_PREVIEWDOC_NAME)); + OUString sName = String(ScResId(STR_ACC_PREVIEWDOC_NAME)); return sName; } diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 8c8583ecf9cb..93d175d446c4 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -42,8 +42,8 @@ using namespace ::com::sun::star::accessibility; ScAccessibleEditObject::ScAccessibleEditObject( const uno::Reference<XAccessible>& rxParent, - EditView* pEditView, Window* pWin, const rtl::OUString& rName, - const rtl::OUString& rDescription, EditObjectType eObjectType) + EditView* pEditView, Window* pWin, const OUString& rName, + const OUString& rDescription, EditObjectType eObjectType) : ScAccessibleContextBase(rxParent, AccessibleRole::TEXT_FRAME), mpTextHelper(NULL), @@ -228,20 +228,20 @@ uno::Reference<XAccessibleStateSet> SAL_CALL return pStateSet; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleEditObject::createAccessibleDescription(void) throw (uno::RuntimeException) { // OSL_FAIL("Should never be called, because is set in the constructor.") - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleEditObject::createAccessibleName(void) throw (uno::RuntimeException) { OSL_FAIL("Should never be called, because is set in the constructor."); - return rtl::OUString(); + return OUString(); } ///===== XAccessibleEventBroadcaster ===================================== @@ -272,10 +272,10 @@ void SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) +OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleEditObject"); + return OUString("ScAccessibleEditObject"); } //===== XTypeProvider ======================================================= diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index d2618789456a..637b5d589ee7 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -48,7 +48,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; using ::std::for_each; using ::std::vector; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx index dfaae342ba46..2104515fccb3 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx @@ -40,7 +40,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; ScAccessibleFilterMenuItem::ScAccessibleFilterMenuItem( const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) : diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index c5511140c64b..fda7ef5b5208 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::accessibility; using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; ScAccessibleFilterTopWindow::ScAccessibleFilterTopWindow( const Reference<XAccessible>& rxParent, ScCheckListMenuWindow* pWin, const OUString& rName) : diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 7291e3ffc7ef..0cf9957f1675 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -316,40 +316,40 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccess //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePageHeader"); + return OUString("ScAccessiblePageHeader"); } -uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.text.AccessibleHeaderFooterView"); + pNames[nOldSize] = OUString("com.sun.star.text.AccessibleHeaderFooterView"); return aSequence; } //==== internal ========================================================= -::rtl::OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription(void) throw (uno::RuntimeException) { String sDesc(ScResId(mbHeader ? STR_ACC_HEADER_DESCR : STR_ACC_FOOTER_DESCR)); sDesc.SearchAndReplaceAscii("%1", String(ScResId(SCSTR_UNKNOWN))); - return rtl::OUString( sDesc ); + return OUString( sDesc ); } -::rtl::OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName(void) throw (uno::RuntimeException) { String sName(ScResId(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME)); sName.SearchAndReplaceAscii("%1", String(ScResId(SCSTR_UNKNOWN))); - return rtl::OUString( sName ); + return OUString( sName ); } Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::RuntimeException) diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 61efa0e810e1..79b9e37c8e68 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -181,23 +181,23 @@ uno::Reference<XAccessibleStateSet> SAL_CALL //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessiblePageHeaderArea::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessiblePageHeaderArea"); + return OUString("ScAccessiblePageHeaderArea"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessiblePageHeaderArea::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"); + pNames[nOldSize] = OUString("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"); return aSequence; } @@ -217,10 +217,10 @@ uno::Sequence<sal_Int8> SAL_CALL } //===== internal ============================================================== -rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) throw(uno::RuntimeException) { - rtl::OUString sDesc; + OUString sDesc; switch (meAdjust) { case SVX_ADJUST_LEFT : @@ -239,10 +239,10 @@ rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(v return sDesc; } -rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) throw (uno::RuntimeException) { - rtl::OUString sName; + OUString sName; switch (meAdjust) { case SVX_ADJUST_LEFT : diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index ce6a79a52da1..2b8df1b29faa 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -180,20 +180,20 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessi //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePreviewCell"); + return OUString("ScAccessiblePreviewCell"); } -uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView"); + pNames[nOldSize] = OUString("com.sun.star.table.AccessibleCellView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 3f747ee53947..12315f148b96 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -266,20 +266,20 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getA //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePreviewHeaderCell"); + return OUString("ScAccessiblePreviewHeaderCell"); } -uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView"); + pNames[nOldSize] = OUString("com.sun.star.table.AccessibleCellView"); return aSequence; } @@ -360,15 +360,15 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const throw (uno::Runt return Rectangle(); } -rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() throw(uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_HEADERCELL_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_HEADERCELL_DESCR)); return sDescription; } -rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(uno::RuntimeException) { - rtl::OUString sName = String(ScResId(STR_ACC_HEADERCELL_NAME)); + OUString sName = String(ScResId(STR_ACC_HEADERCELL_NAME)); if ( mbColumnHeader ) { @@ -376,7 +376,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() thr { //! name for corner cell? -// sName = rtl::OUString("Column/Row Header"); +// sName = OUString("Column/Row Header"); } else { @@ -387,7 +387,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() thr else { // name of row header - sName += rtl::OUString::valueOf( (sal_Int32) ( maCellPos.Row() + 1 ) ); + sName += OUString::valueOf( (sal_Int32) ( maCellPos.Row() + 1 ) ); } return sName; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 557db8336f5f..2ed5c55fcb5f 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -159,7 +159,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnCount() throw (u return nRet; } -rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sal_Int32 nRow ) +OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sal_Int32 nRow ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -167,10 +167,10 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sa if ( nRow < 0 || (mpTableInfo && nRow >= mpTableInfo->GetRows()) ) throw lang::IndexOutOfBoundsException(); - return rtl::OUString(); + return OUString(); } -rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( sal_Int32 nColumn ) +OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -178,7 +178,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( if ( nColumn < 0 || (mpTableInfo && nColumn >= mpTableInfo->GetCols()) ) throw lang::IndexOutOfBoundsException(); - return rtl::OUString(); + return OUString(); } sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) @@ -566,20 +566,20 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAcce //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePreviewTable"); + return OUString("ScAccessiblePreviewTable"); } -uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleTableView"); + pNames[nOldSize] = OUString("com.sun.star.table.AccessibleTableView"); return aSequence; } @@ -605,14 +605,14 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId() //==== internal ========================================================= -::rtl::OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription(void) throw (uno::RuntimeException) { String sDesc(ScResId(STR_ACC_TABLE_DESCR)); - return rtl::OUString(sDesc); + return OUString(sDesc); } -::rtl::OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName(void) throw (uno::RuntimeException) { String sName(ScResId(STR_ACC_TABLE_NAME)); @@ -623,13 +623,13 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId() if ( mpTableInfo ) { - rtl::OUString sCoreName; + OUString sCoreName; if (mpViewShell->GetDocument()->GetName( mpTableInfo->GetTab(), sCoreName )) sName.SearchAndReplaceAscii("%1", sCoreName); } } - return rtl::OUString(sName); + return OUString(sName); } Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::RuntimeException) diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 88037b59b4c5..2dddb0627fdd 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -795,22 +795,22 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange) //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void) +OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleSpreadsheet"); + return OUString("ScAccessibleSpreadsheet"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleSpreadsheet::getSupportedServiceNames (void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheet"); + pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheet"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index b5de4ab84886..95d8e1b293bf 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -98,7 +98,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) return maRange.aEnd.Col() - maRange.aStart.Col() + 1; } -::rtl::OUString SAL_CALL ScAccessibleTableBase::getAccessibleRowDescription( sal_Int32 nRow ) +OUString SAL_CALL ScAccessibleTableBase::getAccessibleRowDescription( sal_Int32 nRow ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { OSL_FAIL("Here should be a implementation to fill the description"); @@ -107,10 +107,10 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) throw lang::IndexOutOfBoundsException(); //setAccessibleRowDescription(nRow, xAccessible); // to remember the created Description - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ScAccessibleTableBase::getAccessibleColumnDescription( sal_Int32 nColumn ) +OUString SAL_CALL ScAccessibleTableBase::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { OSL_FAIL("Here should be a implementation to fill the description"); @@ -119,7 +119,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) throw lang::IndexOutOfBoundsException(); //setAccessibleColumnDescription(nColumn, xAccessible); // to remember the created Description - return rtl::OUString(); + return OUString(); } sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) @@ -346,23 +346,23 @@ uno::Reference< XAccessible > SAL_CALL return getAccessibleCellAt(nRow, nColumn); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleTableBase::createAccessibleDescription(void) throw (uno::RuntimeException) { String sDesc(ScResId(STR_ACC_TABLE_DESCR)); - return rtl::OUString(sDesc); + return OUString(sDesc); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleTableBase::createAccessibleName(void) throw (uno::RuntimeException) { String sName(ScResId(STR_ACC_TABLE_NAME)); - rtl::OUString sCoreName; + OUString sCoreName; if (mpDoc && mpDoc->GetName( maRange.aStart.Tab(), sCoreName )) sName.SearchAndReplaceAscii("%1", sCoreName); - return rtl::OUString(sName); + return OUString(sName); } uno::Reference<XAccessibleRelationSet> SAL_CALL @@ -436,10 +436,10 @@ void SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleTableBase"); + return OUString("ScAccessibleTableBase"); } //===== XTypeProvider =================================================== diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx index a87fce64a219..58c219857c18 100644 --- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx +++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx @@ -74,9 +74,9 @@ void ScDrawModelBroadcaster::Notify( SfxBroadcaster&, { (void) r; #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "Runtime exception caught while notifying shape.:\n")); - aError.append(rtl::OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL( aError.getStr() ); #endif } |