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/unoobj | |
| 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/unoobj')
42 files changed, 1208 insertions, 1217 deletions
diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx index 94724946dd18..d3a4939a03a6 100644 --- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx +++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; SC_SIMPLE_SERVICE_INFO( ScChartRangeSelectionListener, "ScChartRangeSelectionListener", SC_SERVICENAME_CHRANGEHILIGHT ) diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index c8b241118531..3b1890d9e0b1 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -102,11 +102,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp static SfxItemPropertyMapEntry aPropertyMap[] = { {MAP_CHAR_LEN(SC_UNONAME_ADDRESS), 0, &getCppuType((table::CellRangeAddress*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static uno::Reference<beans::XPropertySetInfo> aRef(new SfxItemPropertySetInfo( aPropertyMap )); @@ -117,11 +117,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp static SfxItemPropertyMapEntry aPropertyMap[] = { {MAP_CHAR_LEN(SC_UNONAME_ADDRESS), 0, &getCppuType((table::CellAddress*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static uno::Reference<beans::XPropertySetInfo> aRef(new SfxItemPropertySetInfo( aPropertyMap )); @@ -129,7 +129,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp } } -void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPropertyName, const uno::Any& aValue ) +void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -174,7 +174,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr else if ( aNameStr.EqualsAscii( SC_UNONAME_UIREPR ) ) { // parse the UI representation string - rtl::OUString sRepresentation; + OUString sRepresentation; if (aValue >>= sRepresentation) { String aUIString = sRepresentation; @@ -187,7 +187,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr ::formula::FormulaGrammar::CONV_XL_A1 : ::formula::FormulaGrammar::CONV_OOO; // parse the file format string - rtl::OUString sRepresentation; + OUString sRepresentation; if (aValue >>= sRepresentation) { String aUIString(sRepresentation); @@ -199,7 +199,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr if ( bIsRange ) { // range: also strip a "." after the last colon - sal_Int32 nColon = rtl::OUString(aUIString).lastIndexOf( (sal_Unicode) ':' ); + sal_Int32 nColon = OUString(aUIString).lastIndexOf( (sal_Unicode) ':' ); if ( nColon >= 0 && nColon < aUIString.Len() - 1 && aUIString.GetChar((xub_StrLen)nColon+1) == (sal_Unicode) '.' ) aUIString.Erase( (xub_StrLen)nColon+1, 1 ); @@ -216,7 +216,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr throw lang::IllegalArgumentException(); } -uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -257,7 +257,7 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString& aRange.Format( aFormatStr, nFlags, pDoc ); else aRange.aStart.Format( aFormatStr, nFlags, pDoc ); - aRet <<= rtl::OUString( aFormatStr ); + aRet <<= OUString( aFormatStr ); } else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XLA1REPR ) ) { @@ -278,7 +278,7 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString& aRange.aEnd.Format( aSecond, nFlags, pDoc, eConv ); aFormatStr.Append( aSecond ); } - aRet <<= rtl::OUString( aFormatStr ); + aRet <<= OUString( aFormatStr ); } else throw beans::UnknownPropertyException(); @@ -290,12 +290,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAddressConversionObj ) // lang::XServiceInfo -rtl::OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAddressConversionObj" ); + return OUString("ScAddressConversionObj" ); } -sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -303,13 +303,13 @@ sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const rtl::OUString& : SC_SERVICENAME_CELLADDRESS ); } -uno::Sequence<rtl::OUString> SAL_CALL ScAddressConversionObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScAddressConversionObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = bIsRange ? rtl::OUString(SC_SERVICENAME_RANGEADDRESS) - : rtl::OUString(SC_SERVICENAME_CELLADDRESS); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = bIsRange ? OUString(SC_SERVICENAME_RANGEADDRESS) + : OUString(SC_SERVICENAME_CELLADDRESS); return aRet; } diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 33a788dfcbb2..4240c223fbec 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -102,15 +102,15 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -153,13 +153,13 @@ SC_SIMPLE_SERVICE_INFO( ScAutoFormatsObj, "ScAutoFormatsObj", SCAUTOFORMATSOBJ_S //------------------------------------------------------------------------ -static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const rtl::OUString& rName, sal_uInt16& rOutIndex ) +static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUString& rName, sal_uInt16& rOutIndex ) { ScAutoFormat::const_iterator itBeg = rFormats.begin(), itEnd = rFormats.end(); for (ScAutoFormat::const_iterator it = itBeg; it != itEnd; ++it) { const ScAutoFormatData* pEntry = it->second; - const rtl::OUString& aEntryName = pEntry->GetName(); + const OUString& aEntryName = pEntry->GetName(); if ( aEntryName.equals(rName) ) { size_t nPos = std::distance(itBeg, it); @@ -193,16 +193,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance( return xInst; } -rtl::OUString ScAutoFormatsObj::getImplementationName_Static() +OUString ScAutoFormatsObj::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScAutoFormatsObj" ); + return OUString( "stardiv.StarCalc.ScAutoFormatsObj" ); } -uno::Sequence<rtl::OUString> ScAutoFormatsObj::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScAutoFormatsObj::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCAUTOFORMATSOBJ_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCAUTOFORMATSOBJ_SERVICE )); return aRet; } @@ -216,7 +216,7 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) return NULL; // falscher Index } -ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const OUString& aName) { String aString(aName); sal_uInt16 nIndex; @@ -228,7 +228,7 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const rtl::OUString& aNa // container::XNameContainer -void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -282,7 +282,7 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const } } -void SAL_CALL ScAutoFormatsObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScAutoFormatsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -292,7 +292,7 @@ void SAL_CALL ScAutoFormatsObj::replaceByName( const rtl::OUString& aName, const insertByName( aName, aElement ); } -void SAL_CALL ScAutoFormatsObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScAutoFormatsObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -319,7 +319,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); } // container::XIndexAccess @@ -355,7 +355,7 @@ sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException) // container::XNameAccess -uno::Any SAL_CALL ScAutoFormatsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScAutoFormatsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -366,13 +366,13 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByName( const rtl::OUString& aName ) return uno::makeAny(xFormat); } -uno::Sequence<rtl::OUString> SAL_CALL ScAutoFormatsObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScAutoFormatsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); - uno::Sequence<rtl::OUString> aSeq(pFormats->size()); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(pFormats->size()); + OUString* pAry = aSeq.getArray(); ScAutoFormat::const_iterator it = pFormats->begin(), itEnd = pFormats->end(); for (size_t i = 0; it != itEnd; ++it, ++i) { @@ -381,7 +381,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAutoFormatsObj::getElementNames() return aSeq; } -sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -477,7 +477,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); } // container::XIndexAccess @@ -519,17 +519,17 @@ sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException) // container::XNamed -rtl::OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); if (IsInserted() && nFormatIndex < pFormats->size()) return pFormats->findByIndex(nFormatIndex)->GetName(); - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScAutoFormatObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -582,7 +582,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatObj::getPropertySet } void SAL_CALL ScAutoFormatObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -616,7 +616,7 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue( } } -uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -687,7 +687,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatFieldObj::getProper } void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -791,7 +791,7 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( } } -uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 906a227a548d..41fc7ae9663b 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -44,74 +44,74 @@ using namespace com::sun::star; //------------------------------------------------------------------------ // Calc document -extern uno::Sequence< rtl::OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScDocument_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScDocument_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr, const sal_uInt64 _nCreationFlags ) throw( uno::Exception ); // Calc XML import -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); // Calc XML export -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); // Calc XML Oasis export -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); @@ -152,7 +152,7 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() {MAP_CHAR_LEN(SC_UNONAME_RANGEFIN), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_SCALE), 0, &getCppuType((sal_Int16*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_STBFUNC), 0, &getCppuType((sal_Int16*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_ULISTS), 0, &getCppuType((uno::Sequence<rtl::OUString>*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_ULISTS), 0, &getCppuType((uno::Sequence<OUString>*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_PRMETRICS),0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_USETABCOL),0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_REPLWARN), 0, &getBooleanCppuType(), 0, 0}, @@ -182,7 +182,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory( return NULL; uno::Reference<lang::XSingleServiceFactory> xFactory; - rtl::OUString aImpl(rtl::OUString::createFromAscii(pImplName)); + OUString aImpl(OUString::createFromAscii(pImplName)); if ( aImpl == ScSpreadsheetSettings::getImplementationName_Static() ) xFactory.set(cppu::createOneInstanceFactory( @@ -365,16 +365,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( return xInst; } -rtl::OUString ScSpreadsheetSettings::getImplementationName_Static() +OUString ScSpreadsheetSettings::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScSpreadsheetSettings" ); + return OUString( "stardiv.StarCalc.ScSpreadsheetSettings" ); } -uno::Sequence<rtl::OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEETSETTINGS_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEETSETTINGS_SERVICE )); return aRet; } @@ -390,7 +390,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettings::getPrope } void SAL_CALL ScSpreadsheetSettings::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -499,7 +499,7 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( else if (aString.EqualsAscii( SC_UNONAME_ULISTS )) { ScUserList* pUserList = ScGlobal::GetUserList(); - uno::Sequence<rtl::OUString> aSeq; + uno::Sequence<OUString> aSeq; if ( pUserList && ( aValue >>= aSeq ) ) { // es wird direkt die "lebende" Liste veraendert, @@ -507,7 +507,7 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( pUserList->clear(); // alle Eintraege raus sal_uInt16 nCount = (sal_uInt16)aSeq.getLength(); - const rtl::OUString* pAry = aSeq.getConstArray(); + const OUString* pAry = aSeq.getConstArray(); for (sal_uInt16 i=0; i<nCount; i++) { String aEntry = pAry[i]; @@ -537,7 +537,7 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( pScMod->SetInputOptions( aInpOpt ); } -uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -586,8 +586,8 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString& if (pUserList) { size_t nCount = pUserList->size(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (size_t i=0; i<nCount; ++i) { String aEntry((*pUserList)[i]->GetString()); @@ -627,16 +627,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance( return xInst; } -rtl::OUString ScRecentFunctionsObj::getImplementationName_Static() +OUString ScRecentFunctionsObj::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScRecentFunctionsObj" ); + return OUString( "stardiv.StarCalc.ScRecentFunctionsObj" ); } -uno::Sequence<rtl::OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCRECENTFUNCTIONSOBJ_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCRECENTFUNCTIONSOBJ_SERVICE )); return aRet; } @@ -708,16 +708,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance( return xInst; } -rtl::OUString ScFunctionListObj::getImplementationName_Static() +OUString ScFunctionListObj::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScFunctionListObj" ); + return OUString( "stardiv.StarCalc.ScFunctionListObj" ); } -uno::Sequence<rtl::OUString> ScFunctionListObj::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScFunctionListObj::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONLISTOBJ_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONLISTOBJ_SERVICE )); return aRet; } @@ -730,21 +730,21 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co beans::PropertyValue* pArray = rSequence.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ID )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ID )); pArray[0].Value <<= (sal_Int32) rDesc.nFIndex; - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CATEGORY )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CATEGORY )); pArray[1].Value <<= (sal_Int32) rDesc.nCategory; - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NAME )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NAME )); if (rDesc.pFuncName) - pArray[2].Value <<= rtl::OUString( *rDesc.pFuncName ); + pArray[2].Value <<= OUString( *rDesc.pFuncName ); - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DESCRIPTION )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DESCRIPTION )); if (rDesc.pFuncDesc) - pArray[3].Value <<= rtl::OUString( *rDesc.pFuncDesc ); + pArray[3].Value <<= OUString( *rDesc.pFuncDesc ); - pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ARGUMENTS )); + pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ARGUMENTS )); if (rDesc.ppDefArgNames && rDesc.ppDefArgDescs && rDesc.pDefArgFlags ) { sal_uInt16 nCount = rDesc.nArgCount; @@ -811,12 +811,12 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int // XNameAccess -uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScFunctionListObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aNameStr(aName); + OUString aNameStr(aName); const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { @@ -882,7 +882,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); } // XElementAccess @@ -899,15 +899,15 @@ sal_Bool SAL_CALL ScFunctionListObj::hasElements() throw(uno::RuntimeException) return ( getCount() > 0 ); } -uno::Sequence<rtl::OUString> SAL_CALL ScFunctionListObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence<OUString> SAL_CALL ScFunctionListObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { sal_uInt32 nCount = pFuncList->GetCount(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex) { const ScFuncDesc* pDesc = pFuncList->GetFunction(nIndex); @@ -916,10 +916,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScFunctionListObj::getElementNames() throw } return aSeq; } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } -sal_Bool SAL_CALL ScFunctionListObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 0109379986c8..6578da838f05 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -79,7 +79,7 @@ namespace calc // register our property at the base class CellRangeAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString( "CellRange" ), + OUString( "CellRange" ), PROP_HANDLE_RANGE_ADDRESS, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), @@ -174,17 +174,17 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OCellListSource::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL OCellListSource::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.sheet.OCellListSource" ); + return OUString( "com.sun.star.comp.sheet.OCellListSource" ); } //-------------------------------------------------------------------- - sal_Bool SAL_CALL OCellListSource::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL OCellListSource::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupportedServices( getSupportedServiceNames() ); - const ::rtl::OUString* pLookup = aSupportedServices.getConstArray(); - const ::rtl::OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); + Sequence< OUString > aSupportedServices( getSupportedServiceNames() ); + const OUString* pLookup = aSupportedServices.getConstArray(); + const OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); while ( pLookup != pLookupEnd ) if ( *pLookup++ == _rServiceName ) return sal_True; @@ -193,11 +193,11 @@ namespace calc } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellRangeListSource" ); - aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ListEntrySource" ); + Sequence< OUString > aServices( 2 ); + aServices[ 0 ] = OUString( "com.sun.star.table.CellRangeListSource" ); + aServices[ 1 ] = OUString( "com.sun.star.form.binding.ListEntrySource" ); return aServices; } @@ -214,14 +214,14 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow ) + OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow ) { OSL_PRECOND( m_xRange.is(), "OCellListSource::getRangeAddress: invalid range!" ); Reference< XTextRange > xCellText; if ( m_xRange.is() ) xCellText.set(xCellText.query( m_xRange->getCellByPosition( _nRangeRelativeColumn, _nRangeRelativeRow ) )); - ::rtl::OUString sText; + OUString sText; if ( xCellText.is() ) sText = xCellText->getString(); return sText; @@ -240,7 +240,7 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException) + OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); DBG_CHKTHIS( OCellListSource, checkConsistency_static ); @@ -254,15 +254,15 @@ namespace calc } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); DBG_CHKTHIS( OCellListSource, checkConsistency_static ); checkDisposed(); checkInitialized(); - Sequence< ::rtl::OUString > aAllEntries( getListEntryCount() ); - ::rtl::OUString* pAllEntries = aAllEntries.getArray(); + Sequence< OUString > aAllEntries( getListEntryCount() ); + OUString* pAllEntries = aAllEntries.getArray(); for ( sal_Int32 i = 0; i < aAllEntries.getLength(); ++i ) { *pAllEntries++ = getCellTextContent_noCheck( 0, i ); diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 07a46e2b37d2..469eb10f25e2 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -89,8 +89,8 @@ namespace calc // XListEntrySource virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException); 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); 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); @@ -98,9 +98,9 @@ namespace calc virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -140,7 +140,7 @@ namespace calc @precond our m_xRange is not <NULL/> */ - ::rtl::OUString + OUString getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 1cb7552f6116..2d4a3bfa4ca1 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -155,13 +155,13 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() { static SfxItemPropertyMapEntry aCellsPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -173,15 +173,15 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -250,7 +250,7 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellsPropertySet( aCellsPropertyMap_Impl ); @@ -264,13 +264,13 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() { static SfxItemPropertyMapEntry aRangePropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -282,15 +282,15 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -374,13 +374,13 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() { static SfxItemPropertyMapEntry aCellPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -392,15 +392,15 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -432,7 +432,7 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_FORMLOC), SC_WID_UNO_FORMLOC, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FORMLOC), SC_WID_UNO_FORMLOC, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_FORMRT), SC_WID_UNO_FORMRT, &getCppuType((table::CellContentType*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, @@ -474,7 +474,7 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_ESCAPEMENT), EE_CHAR_ESCAPEMENT, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellPropertySet( aCellPropertyMap_Impl ); @@ -488,13 +488,13 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() { static SfxItemPropertyMapEntry aColumnPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -506,15 +506,15 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -600,13 +600,13 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() { static SfxItemPropertyMapEntry aRowPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -618,15 +618,15 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -713,7 +713,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() { static SfxItemPropertyMapEntry aSheetPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_AUTOPRINT),SC_WID_UNO_AUTOPRINT,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BORDCOL), SC_WID_UNO_BORDCOL, &getCppuType((sal_Int32*)0), 0, 0 }, @@ -721,7 +721,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -733,15 +733,15 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -785,11 +785,11 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), SC_WID_UNO_LINKDISPBIT,&getCppuType((uno::Reference<awt::XBitmap>*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PAGESTL), SC_WID_UNO_PAGESTL, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PAGESTL), SC_WID_UNO_PAGESTL, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS @@ -825,7 +825,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_TABCOLOR), SC_WID_UNO_TABCOLOR, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, &getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, &getCppuType(static_cast< const OUString * >(0)), 0, 0}, {MAP_CHAR_LEN(SC_UNO_NAMEDRANGES), SC_WID_UNO_NAMES, &getCppuType((uno::Reference<sheet::XNamedRanges>*)0), 0, 0 }, {0,0,0,0,0,0} }; @@ -905,7 +905,7 @@ static void lcl_CopyProperties( beans::XPropertySet& rDest, beans::XPropertySet& sal_uLong nCount = aSeq.getLength(); for (sal_uLong i=0; i<nCount; i++) { - rtl::OUString aName(pAry[i].Name); + OUString aName(pAry[i].Name); rDest.setPropertyValue( aName, rSource.getPropertyValue( aName ) ); } } @@ -1230,7 +1230,7 @@ static sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, case uno::TypeClass_STRING: { - rtl::OUString aUStr; + OUString aUStr; rElement >>= aUStr; if ( !aUStr.isEmpty() ) { @@ -1289,7 +1289,7 @@ static sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, } static sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, - const uno::Sequence< uno::Sequence<rtl::OUString> >& aData, + const uno::Sequence< uno::Sequence<OUString> >& aData, const formula::FormulaGrammar::Grammar eGrammar ) { ScDocument* pDoc = rDocShell.GetDocument(); @@ -1308,7 +1308,7 @@ static sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRang long nCols = 0; long nRows = aData.getLength(); - const uno::Sequence<rtl::OUString>* pArray = aData.getConstArray(); + const uno::Sequence<OUString>* pArray = aData.getConstArray(); if ( nRows ) nCols = pArray[0].getLength(); @@ -1332,11 +1332,11 @@ static sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRang SCROW nDocRow = nStartRow; for (long nRow=0; nRow<nRows; nRow++) { - const uno::Sequence<rtl::OUString>& rColSeq = pArray[nRow]; + const uno::Sequence<OUString>& rColSeq = pArray[nRow]; if ( rColSeq.getLength() == nCols ) { SCCOL nDocCol = nStartCol; - const rtl::OUString* pColArr = rColSeq.getConstArray(); + const OUString* pColArr = rColSeq.getConstArray(); for (long nCol=0; nCol<nCols; nCol++) { String aText(pColArr[nCol]); @@ -1988,7 +1988,7 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( sal_uInt16 nItemWhic return eRet; } -beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const rtl::OUString& aPropertyName ) +beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2003,7 +2003,7 @@ beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const rtl::OUS } uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates( - const uno::Sequence<rtl::OUString>& aPropertyNames ) + const uno::Sequence<OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2022,7 +2022,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates return aRet; } -void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScCellRangesBase::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2067,7 +2067,7 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aProp } } -uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2113,7 +2113,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr ScUnoHelpFunctions::SetBoolInAny( aAny, false ); break; case SC_WID_UNO_CELLSTYL: - aAny <<= rtl::OUString( ScStyleNameConversion::DisplayToProgrammaticName( + aAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PARA ) ); break; case SC_WID_UNO_TBLBORD: @@ -2295,7 +2295,7 @@ static void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const } void SAL_CALL ScCellRangesBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -2397,7 +2397,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE break; case SC_WID_UNO_CELLSTYL: { - rtl::OUString aStrVal; + OUString aStrVal; aValue >>= aStrVal; String aString(ScStyleNameConversion::ProgrammaticToDisplayName( aStrVal, SFX_STYLE_FAMILY_PARA )); @@ -2492,7 +2492,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE } } -uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2568,7 +2568,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE const ScStyleSheet* pStyle = pDocShell->GetDocument()->GetSelectionStyle(*GetMarkData()); if (pStyle) aStyleName = pStyle->GetName(); - rAny <<= rtl::OUString( ScStyleNameConversion::DisplayToProgrammaticName( + rAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( aStyleName, SFX_STYLE_FAMILY_PARA ) ); } break; @@ -2648,13 +2648,13 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE { String sRet; aRanges.Format(sRet, SCR_ABS_3D, pDocShell->GetDocument()); - rAny <<= rtl::OUString(sRet); + rAny <<= OUString(sRet); } } } } -void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const rtl::OUString& /* aPropertyName */, +void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2666,7 +2666,7 @@ void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const rtl::OUString& OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const rtl::OUString& /* aPropertyName */, +void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2678,7 +2678,7 @@ void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const rtl::OUStrin OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const rtl::OUString&, +void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2686,7 +2686,7 @@ void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const rtl::OUString&, OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const rtl::OUString&, +void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2696,7 +2696,7 @@ void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const rtl::OUStrin // XMultiPropertySet -void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames, +void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, @@ -2713,7 +2713,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS if ( pDocShell && nCount ) { const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap(); // from derived class - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); const SfxItemPropertySimpleEntry** pEntryArray = new const SfxItemPropertySimpleEntry*[nCount]; @@ -2791,7 +2791,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS } uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues( - const uno::Sequence< rtl::OUString >& aPropertyNames ) + const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2808,7 +2808,7 @@ uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues( return aRet; } -void SAL_CALL ScCellRangesBase::addPropertiesChangeListener( const uno::Sequence< rtl::OUString >& /* aPropertyNames */, +void SAL_CALL ScCellRangesBase::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) throw (uno::RuntimeException) { @@ -2821,7 +2821,7 @@ void SAL_CALL ScCellRangesBase::removePropertiesChangeListener( const uno::Refer OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< rtl::OUString >& /* aPropertyNames */, +void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) throw (uno::RuntimeException) { @@ -2843,7 +2843,7 @@ IMPL_LINK( ScCellRangesBase, ValueListenerHdl, SfxHint*, pHint ) } // XTolerantMultiPropertySet -uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::setPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames, +uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::setPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -2860,7 +2860,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set beans::SetPropertyTolerantFailed* pReturns = aReturns.getArray(); const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap(); // from derived class - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); const SfxItemPropertySimpleEntry** pMapArray = new const SfxItemPropertySimpleEntry*[nCount]; @@ -2967,7 +2967,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set return uno::Sequence < beans::SetPropertyTolerantFailed >(); } -uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::getPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) +uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::getPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2997,7 +2997,7 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::get return aReturns; } -uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBase::getDirectPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) +uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBase::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3227,7 +3227,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub throw uno::RuntimeException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesBase::getRowDescriptions() +uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getRowDescriptions() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3235,19 +3235,19 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesBase::getRowDescriptions() if ( pMemChart ) { sal_Int32 nRowCount = static_cast<sal_Int32>(pMemChart->GetRowCount()); - uno::Sequence<rtl::OUString> aSeq( nRowCount ); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq( nRowCount ); + OUString* pAry = aSeq.getArray(); for (sal_Int32 nRow = 0; nRow < nRowCount; nRow++) pAry[nRow] = pMemChart->GetRowText(static_cast<short>(nRow)); delete pMemChart; return aSeq; } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } void SAL_CALL ScCellRangesBase::setRowDescriptions( - const uno::Sequence<rtl::OUString>& aRowDescriptions ) + const uno::Sequence<OUString>& aRowDescriptions ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3266,7 +3266,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( { if ( pPosMap->GetRowCount() == static_cast<SCROW>(nRowCount) ) { - const rtl::OUString* pArray = aRowDescriptions.getConstArray(); + const OUString* pArray = aRowDescriptions.getConstArray(); for (long nRow=0; nRow<nRowCount; nRow++) { const ScAddress* pPos = pPosMap->GetRowHeaderPosition( @@ -3299,7 +3299,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( throw uno::RuntimeException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions() +uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3307,19 +3307,19 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions() if ( pMemChart ) { sal_Int32 nColCount = pMemChart->GetColCount(); - uno::Sequence<rtl::OUString> aSeq( nColCount ); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq( nColCount ); + OUString* pAry = aSeq.getArray(); for (sal_Int32 nCol = 0; nCol < nColCount; nCol++) pAry[nCol] = pMemChart->GetColText(static_cast<short>(nCol)); delete pMemChart; return aSeq; } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } void SAL_CALL ScCellRangesBase::setColumnDescriptions( - const uno::Sequence<rtl::OUString>& aColumnDescriptions ) + const uno::Sequence<OUString>& aColumnDescriptions ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3338,7 +3338,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions( { if ( pPosMap->GetColCount() == static_cast<SCCOL>(nColCount) ) { - const rtl::OUString* pArray = aColumnDescriptions.getConstArray(); + const OUString* pArray = aColumnDescriptions.getConstArray(); for (long nCol=0; nCol<nColCount; nCol++) { const ScAddress* pPos = pPosMap->GetColHeaderPosition( @@ -3406,7 +3406,7 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe ScDocument* pDoc = pDocShell->GetDocument(); ScRangeListRef aRangesRef( new ScRangeList(aRanges) ); ScChartListenerCollection* pColl = pDoc->GetChartListenerCollection(); - rtl::OUString aName = pColl->getUniqueName(rtl::OUString("__Uno")); + OUString aName = pColl->getUniqueName(OUString("__Uno")); if (aName.isEmpty()) // failed to create unique name. return; @@ -3979,7 +3979,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll( ScMarkData aMark(*GetMarkData()); - rtl::OUString aDummyUndo; + OUString aDummyUndo; ScRangeList aMatchedRanges; SCCOL nCol = 0; SCROW nRow = 0; @@ -4028,7 +4028,7 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl( ScDocument::GetSearchAndReplaceStart( *pSearchItem, nCol, nRow ); } - rtl::OUString aDummyUndo; + OUString aDummyUndo; ScRangeList aMatchedRanges; bool bFound = pDoc->SearchAndReplace( *pSearchItem, nCol, nRow, nTab, aMark, aMatchedRanges, aDummyUndo, NULL); @@ -4119,7 +4119,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea SCCOL nCol = 0; SCROW nRow = 0; - rtl::OUString aUndoStr; + OUString aUndoStr; ScDocument* pUndoDoc = NULL; if (bUndo) { @@ -4338,7 +4338,7 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells return NULL; } -rtl::OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() +OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4470,7 +4470,7 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const Str rNamedEntries.erase( rNamedEntries.begin() + n ); } -void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScCellRangesObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4599,7 +4599,7 @@ static sal_Bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, return false; // not found } -void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4664,7 +4664,7 @@ void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName ) // XNameReplace -void SAL_CALL ScCellRangesObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScCellRangesObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4676,7 +4676,7 @@ void SAL_CALL ScCellRangesObj::replaceByName( const rtl::OUString& aName, const // XNameAccess -uno::Any SAL_CALL ScCellRangesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScCellRangesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4715,7 +4715,7 @@ static sal_Bool lcl_FindEntryName( const ScNamedEntryArr_Impl& rNamedEntries, return false; } -uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4728,8 +4728,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames() ScDocument* pDoc = pDocSh->GetDocument(); size_t nCount = rRanges.size(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (size_t i=0; i < nCount; i++) { // use given name if for exactly this range, otherwise just format @@ -4743,10 +4743,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames() } return aSeq; } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } -sal_Bool SAL_CALL ScCellRangesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScCellRangesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4764,7 +4764,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); } // XIndexAccess @@ -4803,12 +4803,12 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException) // XServiceInfo -rtl::OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellRangesObj" ); + return OUString( "ScCellRangesObj" ); } -sal_Bool SAL_CALL ScCellRangesObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellRangesObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -4818,15 +4818,15 @@ sal_Bool SAL_CALL ScCellRangesObj::supportsService( const rtl::OUString& rServic aServiceStr.EqualsAscii( SCPARAPROPERTIES_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(4); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + uno::Sequence<OUString> aRet(4); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); return aRet; } @@ -5017,13 +5017,13 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByPositio } uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByName( - const rtl::OUString& aName ) throw(uno::RuntimeException) + const OUString& aName ) throw(uno::RuntimeException) { return getCellRangeByName( aName, ScAddress::detailsOOOa1 ); } uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( - const rtl::OUString& aName, const ScAddress::Details& rDetails ) throw(uno::RuntimeException) + const OUString& aName, const ScAddress::Details& rDetails ) throw(uno::RuntimeException) { // name refers to the whole document (with the range's table as default), // valid only if the range is within this range @@ -5126,7 +5126,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellRangeObj::getSpreadsheet() // XArrayFormulaRange -rtl::OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException) +OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5160,8 +5160,8 @@ rtl::OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeExcep return aFormula; } -void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula, - const rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) +void ScCellRangeObj::SetArrayFormula_Impl( const OUString& rFormula, + const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) { ScDocShell* pDocSh = GetDocShell(); if (pDocSh) @@ -5187,16 +5187,16 @@ void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula, } } -void SAL_CALL ScCellRangeObj::setArrayFormula( const rtl::OUString& aFormula ) +void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; // GRAM_PODF_A1 for API compatibility. - SetArrayFormula_Impl( aFormula, ::rtl::OUString(), formula::FormulaGrammar::GRAM_PODF_A1); + SetArrayFormula_Impl( aFormula, OUString(), formula::FormulaGrammar::GRAM_PODF_A1); } -void ScCellRangeObj::SetArrayFormulaWithGrammar( const rtl::OUString& rFormula, - const rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) +void ScCellRangeObj::SetArrayFormulaWithGrammar( const OUString& rFormula, + const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; SetArrayFormula_Impl( rFormula, rFormulaNmsp, eGrammar); @@ -5322,7 +5322,7 @@ void SAL_CALL ScCellRangeObj::setDataArray( // XCellRangeFormula -uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormulaArray() +uno::Sequence< uno::Sequence<OUString> > SAL_CALL ScCellRangeObj::getFormulaArray() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5344,12 +5344,12 @@ uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormul SCROW nRowCount = nEndRow + 1 - nStartRow; SCTAB nTab = aRange.aStart.Tab(); - uno::Sequence< uno::Sequence<rtl::OUString> > aRowSeq( nRowCount ); - uno::Sequence<rtl::OUString>* pRowAry = aRowSeq.getArray(); + uno::Sequence< uno::Sequence<OUString> > aRowSeq( nRowCount ); + uno::Sequence<OUString>* pRowAry = aRowSeq.getArray(); for (SCROW nRowIndex = 0; nRowIndex < nRowCount; nRowIndex++) { - uno::Sequence<rtl::OUString> aColSeq( nColCount ); - rtl::OUString* pColAry = aColSeq.getArray(); + uno::Sequence<OUString> aColSeq( nColCount ); + OUString* pColAry = aColSeq.getArray(); for (SCCOL nColIndex = 0; nColIndex < nColCount; nColIndex++) pColAry[nColIndex] = lcl_GetInputString( pDocSh->GetDocument(), ScAddress( nStartCol+nColIndex, nStartRow+nRowIndex, nTab ), sal_True ); @@ -5364,7 +5364,7 @@ uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormul } void SAL_CALL ScCellRangeObj::setFormulaArray( - const uno::Sequence< uno::Sequence<rtl::OUString> >& aArray ) + const uno::Sequence< uno::Sequence<OUString> >& aArray ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5581,7 +5581,7 @@ void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection, // XAutoFormattable -void SAL_CALL ScCellRangeObj::autoFormat( const rtl::OUString& aName ) +void SAL_CALL ScCellRangeObj::autoFormat( const OUString& aName ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -6094,12 +6094,12 @@ const SfxItemPropertyMap& ScCellRangeObj::GetItemPropertyMap() // XServiceInfo -rtl::OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellRangeObj" ); + return OUString( "ScCellRangeObj" ); } -sal_Bool SAL_CALL ScCellRangeObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellRangeObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -6110,16 +6110,16 @@ sal_Bool SAL_CALL ScCellRangeObj::supportsService( const rtl::OUString& rService aServiceStr.EqualsAscii( SCPARAPROPERTIES_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(5); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + uno::Sequence<OUString> aRet(5); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); return aRet; } @@ -6327,7 +6327,7 @@ void ScCellObj::SetValue_Impl(double fValue) // only for XML import -void ScCellObj::InputEnglishString( const ::rtl::OUString& rText ) +void ScCellObj::InputEnglishString( const OUString& rText ) { // This is like a mixture of setFormula and property FormulaLocal: // The cell's number format is checked for "text", a new cell format may be set, @@ -6418,13 +6418,13 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange( return xCursor; } -rtl::OUString SAL_CALL ScCellObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScCellObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return GetOutputString_Impl(); } -void SAL_CALL ScCellObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScCellObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aString(aText); @@ -6436,7 +6436,7 @@ void SAL_CALL ScCellObj::setString( const rtl::OUString& aText ) throw(uno::Runt } void SAL_CALL ScCellObj::insertString( const uno::Reference<text::XTextRange>& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { // special handling for ScCellTextCursor is no longer needed, @@ -6564,13 +6564,13 @@ sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException) // XCell -rtl::OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException) +OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return GetInputString_Impl( true /* English */ ); } -void SAL_CALL ScCellObj::setFormula( const rtl::OUString& aFormula ) throw(uno::RuntimeException) +void SAL_CALL ScCellObj::setFormula( const OUString& aFormula ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aString(aFormula); @@ -6589,7 +6589,7 @@ void SAL_CALL ScCellObj::setValue( double nValue ) throw(uno::RuntimeException) SetValue_Impl(nValue); } -void SAL_CALL ScCellObj::setFormulaString( const rtl::OUString& aFormula) throw(uno::RuntimeException) +void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula) throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScDocShell *pDocSh = GetDocShell(); @@ -6784,7 +6784,7 @@ void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, c { if ( pEntry->nWID == SC_WID_UNO_FORMLOC ) { - rtl::OUString aStrVal; + OUString aStrVal; aValue >>= aStrVal; String aString(aStrVal); SetString_Impl(aString, sal_True, false); // lokal interpretieren @@ -6808,7 +6808,7 @@ void ScCellObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, if ( pEntry->nWID == SC_WID_UNO_FORMLOC ) { // sal_False = lokal - rAny <<= rtl::OUString( GetInputString_Impl(false) ); + rAny <<= OUString( GetInputString_Impl(false) ); } else if ( pEntry->nWID == SC_WID_UNO_FORMRT ) { @@ -6827,12 +6827,12 @@ const SfxItemPropertyMap& ScCellObj::GetItemPropertyMap() // XServiceInfo -rtl::OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellObj" ); + return OUString( "ScCellObj" ); } -sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { // CellRange/SheetCellRange are not in SheetCell service description, @@ -6849,18 +6849,18 @@ sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName aServiceStr.EqualsAscii( SCCELLRANGE_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(7); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); - pArray[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); + uno::Sequence<OUString> aRet(7); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); + pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); return aRet; } @@ -7120,7 +7120,7 @@ uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotation } uno::Reference<table::XCellRange> SAL_CALL ScTableSheetObj::getCellRangeByName( - const rtl::OUString& rRange ) throw(uno::RuntimeException) + const OUString& rRange ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName( rRange ); @@ -7288,17 +7288,17 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc // XNamed -rtl::OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aName; + OUString aName; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) pDocSh->GetDocument()->GetName( GetTab_Impl(), aName ); return aName; } -void SAL_CALL ScTableSheetObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScTableSheetObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7709,14 +7709,14 @@ void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode ) //! Filter und Options aus altem Link suchen - rtl::OUString aUrl(getLinkUrl()); - rtl::OUString aSheet(getLinkSheetName()); + OUString aUrl(getLinkUrl()); + OUString aSheet(getLinkSheetName()); - rtl::OUString aEmpty; + OUString aEmpty; link( aUrl, aSheet, aEmpty, aEmpty, nLinkMode ); } -rtl::OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aFile; @@ -7726,7 +7726,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException return aFile; } -void SAL_CALL ScTableSheetObj::setLinkUrl( const rtl::OUString& aLinkUrl ) +void SAL_CALL ScTableSheetObj::setLinkUrl( const OUString& aLinkUrl ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7734,13 +7734,13 @@ void SAL_CALL ScTableSheetObj::setLinkUrl( const rtl::OUString& aLinkUrl ) //! Filter und Options aus altem Link suchen sheet::SheetLinkMode eMode = getLinkMode(); - rtl::OUString aSheet(getLinkSheetName()); + OUString aSheet(getLinkSheetName()); - rtl::OUString aEmpty; + OUString aEmpty; link( aLinkUrl, aSheet, aEmpty, aEmpty, eMode ); } -rtl::OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aSheet; @@ -7750,7 +7750,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeExc return aSheet; } -void SAL_CALL ScTableSheetObj::setLinkSheetName( const rtl::OUString& aLinkSheetName ) +void SAL_CALL ScTableSheetObj::setLinkSheetName( const OUString& aLinkSheetName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7758,14 +7758,14 @@ void SAL_CALL ScTableSheetObj::setLinkSheetName( const rtl::OUString& aLinkSheet //! Filter und Options aus altem Link suchen sheet::SheetLinkMode eMode = getLinkMode(); - rtl::OUString aUrl(getLinkUrl()); + OUString aUrl(getLinkUrl()); - rtl::OUString aEmpty; + OUString aEmpty; link( aUrl, aLinkSheetName, aEmpty, aEmpty, eMode ); } -void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUString& aSheetName, - const rtl::OUString& aFilterName, const rtl::OUString& aFilterOptions, +void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString& aSheetName, + const OUString& aFilterName, const OUString& aFilterOptions, sheet::SheetLinkMode nMode ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7775,10 +7775,10 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = GetTab_Impl(); - rtl::OUString aFileString = aUrl; - rtl::OUString aFilterString = aFilterName; - rtl::OUString aOptString = aFilterOptions; - rtl::OUString aSheetString = aSheetName; + OUString aFileString = aUrl; + OUString aFilterString = aFilterName; + OUString aOptString = aFilterOptions; + OUString aSheetString = aSheetName; aFileString = ScGlobal::GetAbsDocName( aFileString, pDocSh ); if (aFilterString.isEmpty()) @@ -8027,7 +8027,7 @@ void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientat // XProtectable -void SAL_CALL ScTableSheetObj::protect( const rtl::OUString& aPassword ) +void SAL_CALL ScTableSheetObj::protect( const OUString& aPassword ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8040,7 +8040,7 @@ void SAL_CALL ScTableSheetObj::protect( const rtl::OUString& aPassword ) } } -void SAL_CALL ScTableSheetObj::unprotect( const rtl::OUString& aPassword ) +void SAL_CALL ScTableSheetObj::unprotect( const OUString& aPassword ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8077,22 +8077,22 @@ sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException) return false; } -rtl::OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDocSh->GetDocument()->GetScenarioData( GetTab_Impl(), aComment, aColor, nFlags ); return aComment; } - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScTableSheetObj::setScenarioComment( const rtl::OUString& aScenarioComment ) +void SAL_CALL ScTableSheetObj::setScenarioComment( const OUString& aScenarioComment ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8102,8 +8102,8 @@ void SAL_CALL ScTableSheetObj::setScenarioComment( const rtl::OUString& aScenari ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = GetTab_Impl(); - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8161,7 +8161,7 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException) { ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = GetTab_Impl(); - rtl::OUString aName; + OUString aName; pDoc->GetName( nTab, aName ); // Name dieses Szenarios SCTAB nDestTab = nTab; @@ -8210,7 +8210,7 @@ uno::Sequence< table::CellRangeAddress > SAL_CALL ScTableSheetObj::getRanges( ) // XExternalSheetName -void ScTableSheetObj::setExternalName( const ::rtl::OUString& aUrl, const ::rtl::OUString& aSheetName ) +void ScTableSheetObj::setExternalName( const OUString& aUrl, const OUString& aSheetName ) throw (container::ElementExistException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8225,7 +8225,7 @@ void ScTableSheetObj::setExternalName( const ::rtl::OUString& aUrl, const ::rtl: const String aDocTabName( ScGlobal::GetDocTabName( aAbsDocName, aSheetName ) ); if ( !pDoc->RenameTab( nTab, aDocTabName, false /*bUpdateRef*/, sal_True /*bExternalDocument*/ ) ) { - throw container::ElementExistException( ::rtl::OUString(), *this ); + throw container::ElementExistException( OUString(), *this ); } } } @@ -8277,9 +8277,9 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn if ( pEntry->nWID == SC_WID_UNO_PAGESTL ) { - rtl::OUString aStrVal; + OUString aStrVal; aValue >>= aStrVal; - rtl::OUString aNewStr(ScStyleNameConversion::ProgrammaticToDisplayName( + OUString aNewStr(ScStyleNameConversion::ProgrammaticToDisplayName( aStrVal, SFX_STYLE_FAMILY_PAGE )); //! Undo? (auch bei SID_STYLE_APPLY an der View) @@ -8321,8 +8321,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn sal_Int32 nNewColor = 0; if (aValue >>= nNewColor) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8338,8 +8338,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8371,8 +8371,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8404,8 +8404,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8437,8 +8437,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8470,8 +8470,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8503,8 +8503,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8566,7 +8566,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn } else if ( pEntry->nWID == SC_WID_UNO_CODENAME ) { - rtl::OUString aCodeName; + OUString aCodeName; if ( pDocSh && ( aValue >>= aCodeName ) ) { pDocSh->GetDocument()->SetCodeName( GetTab_Impl(), aCodeName ); @@ -8595,7 +8595,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn } else if ( pEntry->nWID == SC_WID_UNO_PAGESTL ) { - rAny <<= rtl::OUString( ScStyleNameConversion::DisplayToProgrammaticName( + rAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( pDoc->GetPageStyle( nTab ), SFX_STYLE_FAMILY_PAGE ) ); } else if ( pEntry->nWID == SC_WID_UNO_CELLVIS ) @@ -8622,7 +8622,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8634,7 +8634,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8646,7 +8646,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8658,7 +8658,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8670,7 +8670,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8682,7 +8682,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8694,7 +8694,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8720,10 +8720,10 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn } else if ( pEntry->nWID == SC_WID_UNO_CODENAME ) { - rtl::OUString aCodeName; + OUString aCodeName; if ( pDocSh ) pDocSh->GetDocument()->GetCodeName( GetTab_Impl(), aCodeName ); - rAny <<= rtl::OUString( aCodeName ); + rAny <<= OUString( aCodeName ); } else ScCellRangeObj::GetOnePropertyValue(pEntry, rAny); @@ -8737,12 +8737,12 @@ const SfxItemPropertyMap& ScTableSheetObj::GetItemPropertyMap() // XServiceInfo -rtl::OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScTableSheetObj" ); + return OUString( "ScTableSheetObj" ); } -sal_Bool SAL_CALL ScTableSheetObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScTableSheetObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -8755,18 +8755,18 @@ sal_Bool SAL_CALL ScTableSheetObj::supportsService( const rtl::OUString& rServic aServiceStr.EqualsAscii( SCLINKTARGET_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(7); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); - pArray[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); + uno::Sequence<OUString> aRet(7); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); return aRet; } @@ -8864,7 +8864,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScTableColumnObj::getImplementationId() throw(u // XNamed -rtl::OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8875,7 +8875,7 @@ rtl::OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) return ScColToAlpha( nCol ); // from global.hxx } -void SAL_CALL ScTableColumnObj::setName( const rtl::OUString& /* aNewName */ ) +void SAL_CALL ScTableColumnObj::setName( const OUString& /* aNewName */ ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 09ef26331a80..bfa5bd806598 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -85,7 +85,7 @@ namespace calc // register our property at the base class CellAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString( "BoundCell" ), + OUString( "BoundCell" ), PROP_HANDLE_BOUND_CELL, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), @@ -185,7 +185,7 @@ namespace calc if ( m_xCellText.is() ) { // an XTextRange can be used to set/get "string" values - aTypes[1] = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + aTypes[1] = ::getCppuType( static_cast< OUString* >( NULL ) ); // and additionally, we use it to handle booleans aTypes[2] = ::getCppuType( static_cast< sal_Bool* >( NULL ) ); } @@ -232,7 +232,7 @@ namespace calc if ( m_xCellText.is() ) aReturn <<= m_xCellText->getString(); else - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); break; case TypeClass_BOOLEAN: @@ -254,7 +254,7 @@ namespace calc if ( xProp.is() ) { CellContentType eResultType; - if ( (xProp->getPropertyValue(::rtl::OUString( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE ) + if ( (xProp->getPropertyValue(OUString( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE ) bHasValue = sal_True; } } @@ -318,7 +318,7 @@ namespace calc { OSL_ENSURE( m_xCellText.is(), "OCellValueBinding::setValue: don't have a text!" ); - ::rtl::OUString sText; + OUString sText; aValue >>= sText; if ( m_xCellText.is() ) m_xCellText->setString( sText ); @@ -392,7 +392,7 @@ namespace calc { // set boolean number format if not already set - ::rtl::OUString sPropName( "NumberFormat" ); + OUString sPropName( "NumberFormat" ); Reference<XPropertySet> xCellProp( m_xCell, UNO_QUERY ); Reference<XNumberFormatsSupplier> xSupplier( m_xDocument, UNO_QUERY ); if ( xSupplier.is() && xCellProp.is() ) @@ -417,10 +417,10 @@ namespace calc if ( xOldFormat.is() ) { // use the locale of the existing format - xOldFormat->getPropertyValue( ::rtl::OUString( "Locale" ) ) >>= aLocale; + xOldFormat->getPropertyValue( OUString( "Locale" ) ) >>= aLocale; sal_Int16 nOldType = ::comphelper::getINT16( - xOldFormat->getPropertyValue( ::rtl::OUString( "Type" ) ) ); + xOldFormat->getPropertyValue( OUString( "Type" ) ) ); if ( nOldType & NumberFormat::LOGICAL ) bWasBoolean = sal_True; } @@ -456,9 +456,9 @@ namespace calc OCellValueBinding* pNonConstThis = const_cast< OCellValueBinding* >( this ); if ( !pNonConstThis->supportsType( _rType ) ) { - ::rtl::OUString sMessage( "The given type (" ); + OUString sMessage( "The given type (" ); sMessage += _rType.getTypeName(); - sMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ") is not supported by this binding." ) ); + sMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( ") is not supported by this binding." ) ); // TODO: localize this error message throw IncompatibleTypesException( sMessage, *pNonConstThis ); @@ -467,21 +467,21 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OCellValueBinding::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL OCellValueBinding::getImplementationName( ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - return ::rtl::OUString( "com.sun.star.comp.sheet.OCellValueBinding" ); + return OUString( "com.sun.star.comp.sheet.OCellValueBinding" ); } //-------------------------------------------------------------------- - sal_Bool SAL_CALL OCellValueBinding::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL OCellValueBinding::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - Sequence< ::rtl::OUString > aSupportedServices( getSupportedServiceNames() ); - const ::rtl::OUString* pLookup = aSupportedServices.getConstArray(); - const ::rtl::OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); + Sequence< OUString > aSupportedServices( getSupportedServiceNames() ); + const OUString* pLookup = aSupportedServices.getConstArray(); + const OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); while ( pLookup != pLookupEnd ) if ( *pLookup++ == _rServiceName ) return sal_True; @@ -490,15 +490,15 @@ namespace calc } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - Sequence< ::rtl::OUString > aServices( m_bListPos ? 3 : 2 ); - aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellValueBinding" ); - aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ValueBinding" ); + Sequence< OUString > aServices( m_bListPos ? 3 : 2 ); + aServices[ 0 ] = OUString( "com.sun.star.table.CellValueBinding" ); + aServices[ 1 ] = OUString( "com.sun.star.form.binding.ValueBinding" ); if ( m_bListPos ) - aServices[ 2 ] = ::rtl::OUString( "com.sun.star.table.ListPositionCellBinding" ); + aServices[ 2 ] = OUString( "com.sun.star.table.ListPositionCellBinding" ); return aServices; } diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 3ad5744918e5..10d12ca96f15 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -103,9 +103,9 @@ namespace calc virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index a3e6797452c2..38036b7982b1 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -63,8 +63,6 @@ SC_SIMPLE_SERVICE_INFO( ScChart2DataSequence, "ScChart2DataSequence", using namespace ::com::sun::star; using namespace ::formula; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::std::auto_ptr; @@ -110,7 +108,7 @@ template< typename T > struct lcl_appendTableNumber : public ::std::unary_function< SCTAB, void > { - lcl_appendTableNumber( ::rtl::OUStringBuffer & rBuffer ) : + lcl_appendTableNumber( OUStringBuffer & rBuffer ) : m_rBuffer( rBuffer ) {} void operator() ( SCTAB nTab ) @@ -120,12 +118,12 @@ struct lcl_appendTableNumber : public ::std::unary_function< SCTAB, void > m_rBuffer.append( sal_Unicode( ' ' )); } private: - ::rtl::OUStringBuffer & m_rBuffer; + OUStringBuffer & m_rBuffer; }; -::rtl::OUString lcl_createTableNumberList( const ::std::list< SCTAB > & rTableList ) +OUString lcl_createTableNumberList( const ::std::list< SCTAB > & rTableList ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::std::for_each( rTableList.begin(), rTableList.end(), lcl_appendTableNumber( aBuffer )); // remove last trailing ' ' if( aBuffer.getLength() > 0 ) @@ -1043,7 +1041,7 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint if( ! m_pDocument ) return false; - rtl::OUString aRangeRepresentation; + OUString aRangeRepresentation; for(sal_Int32 i = 0; i < aArguments.getLength(); ++i) { if ( aArguments[i].Name == "CellRangeRepresentation" ) @@ -1448,7 +1446,7 @@ ScChart2DataProvider::createDataSource( bool bLabel = true; bool bCategories = false; bool bOrientCol = true; - ::rtl::OUString aRangeRepresentation; + OUString aRangeRepresentation; uno::Sequence< sal_Int32 > aSequenceMapping; for(sal_Int32 i = 0; i < aArguments.getLength(); ++i) { @@ -1770,7 +1768,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum bool bRowSourceDetected = false; bool bFirstCellAsLabel = false; bool bHasCategories = false; - ::rtl::OUString sRangeRep; + OUString sRangeRep; bool bHasCategoriesLabels = false; vector<ScTokenRef> aAllCategoriesValuesTokens; @@ -1803,8 +1801,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if(!bHasCategories) { Reference< beans::XPropertySet > xSeqProp( xLS->getValues(), uno::UNO_QUERY ); - ::rtl::OUString aRole; - if( xSeqProp.is() && (xSeqProp->getPropertyValue(::rtl::OUString("Role")) >>= aRole) && + OUString aRole; + if( xSeqProp.is() && (xSeqProp->getPropertyValue(OUString("Role")) >>= aRole) && aRole.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("categories")) ) bThisIsCategories = bHasCategories = true; } @@ -1906,7 +1904,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func); func.getList(aTableNumList); aResult.push_back( - beans::PropertyValue( ::rtl::OUString("TableNumberList"), -1, + beans::PropertyValue( OUString("TableNumberList"), -1, uno::makeAny( lcl_createTableNumberList( aTableNumList ) ), beans::PropertyState_DIRECT_VALUE )); } @@ -1915,7 +1913,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("DataRowSource"), -1, + beans::PropertyValue( OUString("DataRowSource"), -1, uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE )); } @@ -1923,7 +1921,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("HasCategories"), -1, + beans::PropertyValue( OUString("HasCategories"), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE )); } @@ -1931,7 +1929,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("FirstCellAsLabel"), -1, + beans::PropertyValue( OUString("FirstCellAsLabel"), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE )); } @@ -1957,7 +1955,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum // add cell range property aResult.push_back( - beans::PropertyValue( ::rtl::OUString("CellRangeRepresentation"), -1, + beans::PropertyValue( OUString("CellRangeRepresentation"), -1, uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE )); //Sequence Mapping @@ -1986,11 +1984,11 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aNewSequences( xDataSource->getDataSequences()); - rtl::OUString aOldLabel; - rtl::OUString aNewLabel; - rtl::OUString aOldValues; - rtl::OUString aNewValues; - rtl::OUString aEmpty; + OUString aOldLabel; + OUString aNewLabel; + OUString aOldValues; + OUString aNewValues; + OUString aEmpty; for( sal_Int32 nNewIndex = 0; nNewIndex < aNewSequences.getLength(); nNewIndex++ ) { @@ -2027,7 +2025,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bDifferentIndexes && !aSequenceMappingVector.empty() ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("SequenceMapping"), -1, + beans::PropertyValue( OUString("SequenceMapping"), -1, uno::makeAny( lcl_VectorToSequence(aSequenceMappingVector) ) , beans::PropertyState_DIRECT_VALUE )); } @@ -2036,7 +2034,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum return lcl_VectorToSequence( aResult ); } -::sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationPossible( const ::rtl::OUString& aRangeRepresentation ) +::sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2052,7 +2050,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum uno::Reference< chart2::data::XDataSequence > SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentation( - const ::rtl::OUString& aRangeRepresentation ) + const OUString& aRangeRepresentation ) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -2223,7 +2221,7 @@ ScChart2DataProvider::createDataSequenceByFormulaTokens( // XRangeXMLConversion --------------------------------------------------- -rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const rtl::OUString& sRangeRepresentation ) +OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const OUString& sRangeRepresentation ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { OUString aRet; @@ -2248,7 +2246,7 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const rtl::OUStr return aRet; } -rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUString& sXMLRange ) +OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const OUString& sXMLRange ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { const sal_Unicode cSep = ' '; @@ -2259,11 +2257,11 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUS // #i74062# When loading flat XML, this is called before the referenced sheets are in the document, // so the conversion has to take place directly with the strings, without looking up the sheets. - rtl::OUStringBuffer sRet; + OUStringBuffer sRet; sal_Int32 nOffset = 0; while( nOffset >= 0 ) { - rtl::OUString sToken; + OUString sToken; ScRangeStringConverter::GetTokenByOffset( sToken, sXMLRange, nOffset, cSep, cQuote ); if( nOffset >= 0 ) { @@ -2306,7 +2304,7 @@ ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException) void SAL_CALL ScChart2DataProvider::setPropertyValue( - const ::rtl::OUString& rPropertyName, const uno::Any& rValue) + const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, @@ -2323,7 +2321,7 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue( uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2342,7 +2340,7 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2352,7 +2350,7 @@ void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2362,7 +2360,7 @@ void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2372,7 +2370,7 @@ void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( void SAL_CALL ScChart2DataProvider::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/ ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2486,11 +2484,11 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, // BM: don't use names of named ranges but the UI range strings // String aStr; // rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); -// m_aIdentifier = ::rtl::OUString( aStr ); +// m_aIdentifier = OUString( aStr ); -// m_aIdentifier = ::rtl::OUString( "ID_"); +// m_aIdentifier = OUString( "ID_"); // static sal_Int32 nID = 0; -// m_aIdentifier += ::rtl::OUString::valueOf( ++nID); +// m_aIdentifier += OUString::valueOf( ++nID); } ScChart2DataSequence::~ScChart2DataSequence() @@ -3059,10 +3057,10 @@ uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData() // XTextualDataSequence -------------------------------------------------- -uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; - uno::Sequence<rtl::OUString> aSeq; + uno::Sequence<OUString> aSeq; if ( !m_pDocument ) throw uno::RuntimeException(); @@ -3071,8 +3069,8 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) sal_Int32 nCount = m_aDataArray.size(); if ( nCount > 0 ) { - aSeq = uno::Sequence<rtl::OUString>(nCount); - rtl::OUString* pArr = aSeq.getArray(); + aSeq = uno::Sequence<OUString>(nCount); + OUString* pArr = aSeq.getArray(); ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end(); for(; itr != itrEnd; ++itr, ++pArr) *pArr = itr->maString; @@ -3081,7 +3079,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) { if( m_pTokens->front()->GetType() == svString ) { - aSeq = uno::Sequence<rtl::OUString>(1); + aSeq = uno::Sequence<OUString>(1); aSeq[0] = m_pTokens->front()->GetString(); } } @@ -3089,7 +3087,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) return aSeq; } -::rtl::OUString SAL_CALL ScChart2DataSequence::getSourceRangeRepresentation() +OUString SAL_CALL ScChart2DataSequence::getSourceRangeRepresentation() throw ( uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3207,7 +3205,7 @@ private: } -uno::Sequence< ::rtl::OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::data::LabelOrigin eOrigin) +uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::data::LabelOrigin eOrigin) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3478,7 +3476,7 @@ ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException) void SAL_CALL ScChart2DataSequence::setPropertyValue( - const ::rtl::OUString& rPropertyName, const uno::Any& rValue) + const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, @@ -3504,7 +3502,7 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue( uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3528,7 +3526,7 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue( void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -3539,7 +3537,7 @@ void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -3550,7 +3548,7 @@ void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -3561,7 +3559,7 @@ void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index d0f688f424c7..6529ffd50b13 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -155,7 +155,7 @@ ScChartObj* ScChartsObj::GetObjectByIndex_Impl(long nIndex) const return NULL; } -ScChartObj* ScChartsObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScChartObj* ScChartsObj::GetObjectByName_Impl(const OUString& aName) const { String aNameString(aName); if ( lcl_FindChartObj( pDocShell, nTab, aNameString ) ) @@ -165,7 +165,7 @@ ScChartObj* ScChartsObj::GetObjectByName_Impl(const rtl::OUString& aName) const // XTableCharts -void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, +void SAL_CALL ScChartsObj::addNewByName( const OUString& aName, const awt::Rectangle& aRect, const uno::Sequence<table::CellRangeAddress>& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) @@ -208,7 +208,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, ScRangeListRef xNewRanges( pList ); uno::Reference < embed::XEmbeddedObject > xObj; - ::rtl::OUString aTmp( aNameString ); + OUString aTmp( aNameString ); if ( SvtModuleOptions().IsChart() ) xObj = pDocShell->GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aTmp ); if ( xObj.is() ) @@ -251,7 +251,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, if( sRangeStr.Len() ) xReceiver->attachDataProvider( xDataProvider ); else - sRangeStr = rtl::OUString("all"); + sRangeStr = OUString("all"); uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( pDocShell->GetModel(), uno::UNO_QUERY ); xReceiver->attachNumberFormatsSupplier( xNumberFormatsSupplier ); @@ -259,16 +259,16 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, // set arguments uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString("CellRangeRepresentation"), -1, - uno::makeAny( ::rtl::OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE ); + OUString("CellRangeRepresentation"), -1, + uno::makeAny( OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString("HasCategories"), -1, + OUString("HasCategories"), -1, uno::makeAny( bRowHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString("FirstCellAsLabel"), -1, + OUString("FirstCellAsLabel"), -1, uno::makeAny( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString("DataRowSource"), -1, + OUString("DataRowSource"), -1, uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); } @@ -289,7 +289,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, } } -void SAL_CALL ScChartsObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScChartsObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -314,7 +314,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration( throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableChartsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableChartsEnumeration")); } // XIndexAccess @@ -371,7 +371,7 @@ sal_Bool SAL_CALL ScChartsObj::hasElements() throw(uno::RuntimeException) return getCount() != 0; } -uno::Any SAL_CALL ScChartsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScChartsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -383,7 +383,7 @@ uno::Any SAL_CALL ScChartsObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (pDocShell) @@ -391,8 +391,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno:: ScDocument* pDoc = pDocShell->GetDocument(); long nCount = getCount(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); long nPos = 0; ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer(); @@ -424,10 +424,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno:: return aSeq; } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } -sal_Bool SAL_CALL ScChartsObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScChartsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -447,7 +447,7 @@ ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const String& rN) pDocShell->GetDocument()->AddUnoObject(*this); uno::Sequence< table::CellRangeAddress > aInitialPropValue; - registerPropertyNoMember( ::rtl::OUString( "RelatedCellRanges" ), + registerPropertyNoMember( OUString( "RelatedCellRanges" ), PROP_HANDLE_RELATED_CELLRANGES, beans::PropertyAttribute::MAYBEVOID, ::getCppuType( &aInitialPropValue ), &aInitialPropValue ); } @@ -485,7 +485,7 @@ void ScChartObj::GetData_Impl( ScRangeListRef& rRanges, bool& rColHeaders, bool& { uno::Sequence< beans::PropertyValue > aArgs( xProvider->detectArguments( xReceiver->getUsedData() ) ); - rtl::OUString aRanges; + OUString aRanges; chart::ChartDataRowSource eDataRowSource = chart::ChartDataRowSource_COLUMNS; bool bHasCategories=false; bool bFirstCellAsLabel=false; @@ -766,13 +766,13 @@ uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() throw( // XNamed -rtl::OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aChartName; } -void SAL_CALL ScChartObj::setName( const rtl::OUString& /* aName */ ) throw(uno::RuntimeException) +void SAL_CALL ScChartObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; throw uno::RuntimeException(); // name cannot be changed diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 4c42538adf7c..d72a9c313165 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -63,7 +63,7 @@ static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() {MAP_CHAR_LEN(SC_UNO_RASTERSUBY), 0, &getCppuType((sal_Int32*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_RASTERSYNC), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_AUTOCALC), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_PRINTERNAME), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_PRINTERNAME), 0, &getCppuType((OUString*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_PRINTERSETUP), 0, &getCppuType((uno::Sequence<sal_Int8>*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_APPLYDOCINF), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_FORBIDDEN), 0, &getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0), beans::PropertyAttribute::READONLY, 0}, @@ -120,7 +120,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocumentConfiguration::getPro } void SAL_CALL ScDocumentConfiguration::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -171,7 +171,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( pDoc->SetAutoCalc( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName.compareToAscii( SC_UNO_PRINTERNAME ) == 0 ) { - rtl::OUString sPrinterName; + OUString sPrinterName; if ( aValue >>= sPrinterName ) { // #i75610# if the name is empty, do nothing (don't create any printer) @@ -272,13 +272,13 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( uno::Sequence< beans::PropertyValue > aInfo; if ( !( aValue >>= aInfo ) ) throw lang::IllegalArgumentException( - ::rtl::OUString( "Value of type Sequence<PropertyValue> expected!" ), + OUString( "Value of type Sequence<PropertyValue> expected!" ), uno::Reference< uno::XInterface >(), 2 ); if ( !pDocShell->SetModifyPasswordInfo( aInfo ) ) throw beans::PropertyVetoException( - ::rtl::OUString( "The hash is not allowed to be changed now!" ), + OUString( "The hash is not allowed to be changed now!" ), uno::Reference< uno::XInterface >() ); } else if ( aPropertyName.compareToAscii( SC_UNO_EMBED_FONTS ) == 0 ) @@ -330,7 +330,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( throw uno::RuntimeException(); } -uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -379,9 +379,9 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const rtl::OUString // (as in SwXDocumentSettings) SfxPrinter* pPrinter = pDoc->GetPrinter( false ); if (pPrinter) - aRet <<= rtl::OUString ( pPrinter->GetName()); + aRet <<= OUString ( pPrinter->GetName()); else - aRet <<= rtl::OUString(); + aRet <<= OUString(); } else if ( aPropertyName.compareToAscii( SC_UNO_PRINTERSETUP ) == 0 ) { @@ -465,12 +465,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration ) // XServiceInfo -rtl::OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScDocumentConfiguration" ); + return OUString( "ScDocumentConfiguration" ); } -sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -478,13 +478,13 @@ sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const rtl::OUString& aServiceStr.EqualsAscii( SCDOCUMENTSETTINGS_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScDocumentConfiguration::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScDocumentConfiguration::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCOMPSCPREADSHEETSETTINGS_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCUMENTSETTINGS_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCOMPSCPREADSHEETSETTINGS_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCUMENTSETTINGS_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index a71a324bf5c8..d2c2f35e38ca 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -448,7 +448,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByPositi } uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( - const rtl::OUString& rRange ) throw(uno::RuntimeException) + const OUString& rRange ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName(rRange); @@ -456,12 +456,12 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( // XServiceInfo -rtl::OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellCursorObj" ); + return OUString( "ScCellCursorObj" ); } -sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellCursorObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -470,19 +470,19 @@ sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServic ScCellRangeObj::supportsService(rServiceName); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() throw(uno::RuntimeException) { // get all service names from cell range - uno::Sequence<rtl::OUString> aParentSeq(ScCellRangeObj::getSupportedServiceNames()); + uno::Sequence<OUString> aParentSeq(ScCellRangeObj::getSupportedServiceNames()); sal_Int32 nParentLen = aParentSeq.getLength(); - const rtl::OUString* pParentArr = aParentSeq.getConstArray(); + const OUString* pParentArr = aParentSeq.getConstArray(); // SheetCellCursor should be first (?) - uno::Sequence<rtl::OUString> aTotalSeq( nParentLen + 2 ); - rtl::OUString* pTotalArr = aTotalSeq.getArray(); - pTotalArr[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLCURSOR_SERVICE )); - pTotalArr[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLCURSOR_SERVICE )); + uno::Sequence<OUString> aTotalSeq( nParentLen + 2 ); + OUString* pTotalArr = aTotalSeq.getArray(); + pTotalArr[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLCURSOR_SERVICE )); + pTotalArr[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLCURSOR_SERVICE )); // append cell range services for (long i=0; i<nParentLen; i++) diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index bb7830dbd726..bb6969e0b063 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -57,7 +57,6 @@ using namespace com::sun::star; using namespace com::sun::star::sheet; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; @@ -98,14 +97,14 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap() { {MAP_CHAR_LEN(SC_UNO_DP_COLGRAND), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_DRILLDOWN), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_DP_GRANDTOTAL_NAME),0,&getCppuType((rtl::OUString*)0), beans::PropertyAttribute::MAYBEVOID, 0 }, + {MAP_CHAR_LEN(SC_UNO_DP_GRANDTOTAL_NAME),0,&getCppuType((OUString*)0), beans::PropertyAttribute::MAYBEVOID, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_IGNORE_EMPTYROWS), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_IMPORTDESC), 0, &getCppuType((uno::Sequence<beans::PropertyValue>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_REPEATEMPTY), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_ROWGRAND), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_SERVICEARG), 0, &getCppuType((uno::Sequence<beans::PropertyValue>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_SHOWFILTER), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_DP_SOURCESERVICE), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_DP_SOURCESERVICE), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; return aDataPilotDescriptorBaseMap_Impl; @@ -809,7 +808,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp } else if ( aNameString.EqualsAscii( SC_UNO_DP_GRANDTOTAL_NAME ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aNewData.SetGrandTotalName(aStrVal); } @@ -847,7 +846,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp } else if ( aNameString.EqualsAscii( SC_UNO_DP_SOURCESERVICE ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) { String aEmpty; @@ -874,7 +873,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp if (pOldDesc) aServiceDesc = *pOldDesc; - rtl::OUString aStrVal; + OUString aStrVal; sal_Int32 nArgs = aArgSeq.getLength(); for (sal_Int32 nArgPos=0; nArgPos<nArgs; ++nArgPos) { @@ -958,7 +957,7 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope } else if ( aNameString.EqualsAscii( SC_UNO_DP_GRANDTOTAL_NAME ) ) { - const rtl::OUString* pGrandTotalName = aNewData.GetGrandTotalName(); + const OUString* pGrandTotalName = aNewData.GetGrandTotalName(); if (pGrandTotalName) aRet <<= *pGrandTotalName; // same behavior as in ScDPSource } @@ -989,7 +988,7 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope } else if ( aNameString.EqualsAscii( SC_UNO_DP_SOURCESERVICE ) ) { - rtl::OUString aServiceName; + OUString aServiceName; const ScDPServiceDesc* pServiceDesc = pDPObject->GetDPServiceDesc(); if (pServiceDesc) aServiceName = pServiceDesc->aServiceName; @@ -1002,13 +1001,13 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope { uno::Sequence<beans::PropertyValue> aSeq( 4 ); beans::PropertyValue* pArray = aSeq.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SOURCENAME )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SOURCENAME )); pArray[0].Value <<= pServiceDesc->aParSource; - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_OBJECTNAME )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_OBJECTNAME )); pArray[1].Value <<= pServiceDesc->aParName; - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_USERNAME )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_USERNAME )); pArray[2].Value <<= pServiceDesc->aParUser; - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_PASSWORD )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_PASSWORD )); pArray[3].Value <<= pServiceDesc->aParPass; aRet <<= aSeq; } @@ -1857,7 +1856,7 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException) aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) ); else { - const rtl::OUString* pLayoutName = pDim->GetLayoutName(); + const OUString* pLayoutName = pDim->GetLayoutName(); if (pLayoutName) aName = *pLayoutName; else @@ -2263,7 +2262,7 @@ void ScDataPilotFieldObj::setUseCurrentPage( sal_Bool bUse ) { /* It is somehow useless to set the property "HasSelectedPage" to true, because it is still needed to set an explicit page name. */ - const ::rtl::OUString aPage; + const OUString aPage; pDim->SetCurrentPage( &aPage ); } else @@ -2408,7 +2407,7 @@ DataPilotFieldGroupInfo ScDataPilotFieldObj::getGroupInfo() ScFieldGroup aGroup; aGroup.maName = pGroup->GetGroupName(); for( sal_Int32 nMemIdx = 0, nMemCount = pGroup->GetElementCount(); nMemIdx < nMemCount; ++nMemIdx ) - if (const rtl::OUString* pMem = pGroup->GetElementByIndex(nMemIdx)) + if (const OUString* pMem = pGroup->GetElementByIndex(nMemIdx)) aGroup.maMembers.push_back( *pMem ); aGroups.push_back( aGroup ); } @@ -2555,13 +2554,13 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { - rtl::OUString aDimName = pDim->GetName(); + OUString aDimName = pDim->GetName(); ScDPSaveData aSaveData = *pDPObj->GetSaveData(); ScDPDimensionSaveData* pDimData = aSaveData.GetDimensionData(); // created if not there // find original base - rtl::OUString aBaseDimName( aDimName ); + OUString aBaseDimName( aDimName ); const ScDPSaveGroupDimension* pBaseGroupDim = pDimData->GetNamedGroupDim( aDimName ); if ( pBaseGroupDim ) { @@ -2581,7 +2580,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons { for (nEntry=0; nEntry<nEntryCount; nEntry++) { - const rtl::OUString& aEntryName = rItems[nEntry]; + const OUString& aEntryName = rItems[nEntry]; if ( pBaseGroupDim ) { // for each selected (intermediate) group, remove all its items @@ -2630,10 +2629,10 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons } } } - rtl::OUString aGroupDimName = pGroupDimension->GetGroupDimName(); + OUString aGroupDimName = pGroupDimension->GetGroupDimName(); //! localized prefix string - rtl::OUString aGroupName = pGroupDimension->CreateGroupName( String( RTL_CONSTASCII_USTRINGPARAM( "Group" ) ) ); + OUString aGroupName = pGroupDimension->CreateGroupName( String( RTL_CONSTASCII_USTRINGPARAM( "Group" ) ) ); ScDPSaveGroupItem aGroup( aGroupName ); Reference< XNameAccess > xMembers = GetMembers(); if (!xMembers.is()) @@ -2746,9 +2745,9 @@ Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( con ScDPDimensionSaveData& rDimData = *aSaveData.GetDimensionData(); // find source dimension name - const rtl::OUString& rDimName = pDim->GetName(); + const OUString& rDimName = pDim->GetName(); const ScDPSaveGroupDimension* pGroupDim = rDimData.GetNamedGroupDim( rDimName ); - rtl::OUString aSrcDimName = pGroupDim ? pGroupDim->GetSourceDimName() : rDimName; + OUString aSrcDimName = pGroupDim ? pGroupDim->GetSourceDimName() : rDimName; // find a group dimension for the base field, or get numeric grouping pGroupDim = rDimData.GetFirstNamedGroupDim( aSrcDimName ); diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index b45539503323..d41ffc85e052 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -112,7 +112,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() {MAP_CHAR_LEN(SC_UNONAME_ISUSER), 0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_KEEPFORM), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_MOVCELLS), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD), 0, &getCppuType((sal_Int32*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_STRIPDAT), 0, &getBooleanCppuType(), 0, 0}, @@ -217,28 +217,28 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS aDescriptor.setDataSource(rParam.aDBName); if (aDescriptor.has( svx::daDataSource )) { - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DBNAME )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DBNAME )); pArray[0].Value <<= rParam.aDBName; } else if (aDescriptor.has( svx::daConnectionResource )) { - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONRES )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONRES )); pArray[0].Value <<= rParam.aDBName; } - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCTYPE )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCTYPE )); pArray[1].Value <<= eMode; - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCOBJ )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCOBJ )); pArray[2].Value <<= rParam.aStatement; - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISNATIVE )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISNATIVE )); ScUnoHelpFunctions::SetBoolInAny( pArray[3].Value, rParam.bNative ); } void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequence<beans::PropertyValue>& rSeq ) { - rtl::OUString aStrVal; + OUString aStrVal; const beans::PropertyValue* pPropArray = rSeq.getConstArray(); long nPropCount = rSeq.getLength(); for (long i = 0; i < nPropCount; i++) @@ -340,31 +340,31 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq // Sequence fuellen - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISSORTCOLUMNS )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISSORTCOLUMNS )); pArray[0].Value = ::cppu::bool2any(!rParam.bByRow); - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONTHDR )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONTHDR )); ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader ); - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_MAXFLD )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_MAXFLD )); pArray[2].Value <<= static_cast<sal_Int32>( rParam.GetSortKeyCount() ); - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SORTFLD )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SORTFLD )); pArray[3].Value <<= aFields; - pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_BINDFMT )); + pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_BINDFMT )); ScUnoHelpFunctions::SetBoolInAny( pArray[4].Value, rParam.bIncludePattern ); - pArray[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_COPYOUT )); + pArray[5].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_COPYOUT )); ScUnoHelpFunctions::SetBoolInAny( pArray[5].Value, !rParam.bInplace ); - pArray[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OUTPOS )); + pArray[6].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OUTPOS )); pArray[6].Value <<= aOutPos; - pArray[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISULIST )); + pArray[7].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISULIST )); ScUnoHelpFunctions::SetBoolInAny( pArray[7].Value, rParam.bUserDef ); - pArray[8].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_UINDEX )); + pArray[8].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_UINDEX )); pArray[8].Value <<= static_cast<sal_Int32>( rParam.nUserIndex ); } @@ -485,7 +485,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b } else if (aPropName.EqualsAscii( SC_UNONAME_COLLALG )) { - rtl::OUString sStr; + OUString sStr; if ( rProp.Value >>= sStr ) rParam.aCollatorAlgorithm = sStr; } @@ -675,7 +675,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::creat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); } // XIndexAccess @@ -728,7 +728,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSubTotalDescriptorBase::getPr } void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -771,7 +771,7 @@ void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( PutData(aParam); } -uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1476,7 +1476,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFilterDescriptorBase::getProp } void SAL_CALL ScFilterDescriptorBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1523,7 +1523,7 @@ void SAL_CALL ScFilterDescriptorBase::setPropertyValue( PutData(aParam); } -uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1736,13 +1736,13 @@ ScDBData* ScDatabaseRangeObj::GetDBData_Impl() const // XNamed -rtl::OUString SAL_CALL ScDatabaseRangeObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScDatabaseRangeObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aName; } -void SAL_CALL ScDatabaseRangeObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScDatabaseRangeObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2048,7 +2048,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDatabaseRangeObj::getProperty } void SAL_CALL ScDatabaseRangeObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -2140,7 +2140,7 @@ void SAL_CALL ScDatabaseRangeObj::setPropertyValue( } } -uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2168,7 +2168,7 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const rtl::OUString& aPr // ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_DBAREA ); } else if ( aString.EqualsAscii( SC_UNO_LINKDISPNAME ) ) - aRet <<= rtl::OUString( aName ); + aRet <<= OUString( aName ); else if (aString.EqualsAscii( SC_UNONAME_AUTOFLT )) { sal_Bool bAutoFilter(GetDBData_Impl()->HasAutoFilter()); @@ -2216,12 +2216,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj ) // XServiceInfo -rtl::OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScDatabaseRangeObj" ); + return OUString( "ScDatabaseRangeObj" ); } -sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -2229,13 +2229,13 @@ sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const rtl::OUString& rSer aServiceStr.EqualsAscii( SCLINKTARGET_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); return aRet; } @@ -2284,7 +2284,7 @@ ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByIndex_Impl(size_t nIndex) return new ScDatabaseRangeObj(pDocShell, itr->GetName()); } -ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell && hasByName(aName) ) { @@ -2295,7 +2295,7 @@ ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const rtl::OUStrin } -void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName, +void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName, const table::CellRangeAddress& aRange ) throw(uno::RuntimeException) { @@ -2314,7 +2314,7 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName, throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScDatabaseRangesObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScDatabaseRangesObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2335,7 +2335,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnum throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); } // XIndexAccess @@ -2384,7 +2384,7 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() throw(uno::RuntimeException // XNameAccess -uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2397,7 +2397,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2410,7 +2410,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() if (pNames) { const ScDBCollection::NamedDBs& rDBs = pNames->getNamedDBs(); - uno::Sequence<rtl::OUString> aSeq(rDBs.size()); + uno::Sequence<OUString> aSeq(rDBs.size()); ScDBCollection::NamedDBs::const_iterator itr = rDBs.begin(), itrEnd = rDBs.end(); for (size_t i = 0; itr != itrEnd; ++itr, ++i) aSeq[i] = itr->GetName(); @@ -2418,10 +2418,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() return aSeq; } } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } -sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 8e100da64d57..5afa88f7e900 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -50,15 +50,15 @@ static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, @@ -123,7 +123,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocDefaultsObj::getPropertySe } void SAL_CALL ScDocDefaultsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -216,7 +216,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue( } } -uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -276,7 +276,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocDefaultsObj ) // XPropertyState -beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const rtl::OUString& aPropertyName ) +beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -311,13 +311,13 @@ beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const rtl::OUS } uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates( - const uno::Sequence<rtl::OUString>& aPropertyNames ) + const uno::Sequence<OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { // the simple way: call getPropertyState SolarMutexGuard aGuard; - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++) @@ -325,7 +325,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates return aRet; } -void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -346,7 +346,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const rtl::OUString& aProp } } -uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index ee5013fe9fbd..4f125516222c 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -98,7 +98,7 @@ void ScDispatchProviderInterceptor::Notify( SfxBroadcaster&, const SfxHint& rHin // XDispatchProvider uno::Reference<frame::XDispatch> SAL_CALL ScDispatchProviderInterceptor::queryDispatch( - const util::URL& aURL, const rtl::OUString& aTargetFrameName, + const util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(uno::RuntimeException) { @@ -266,7 +266,7 @@ static void lcl_FillDataSource( frame::FeatureStateEvent& rEvent, const ScImport { // descriptor has to be complete anyway - rtl::OUString aEmpty; + OUString aEmpty; aDescriptor[svx::daDataSource] <<= aEmpty; aDescriptor[svx::daCommand] <<= aEmpty; aDescriptor[svx::daCommandType] <<= (sal_Int32)sdb::CommandType::TABLE; @@ -367,7 +367,7 @@ void SAL_CALL ScDispatch::selectionChanged( const ::com::sun::star::lang::EventO { frame::FeatureStateEvent aEvent; aEvent.Source.set(static_cast<cppu::OWeakObject*>(this)); - aEvent.FeatureURL.Complete = rtl::OUString::createFromAscii( cURLDocDataSource ); + aEvent.FeatureURL.Complete = OUString::createFromAscii( cURLDocDataSource ); lcl_FillDataSource( aEvent, aNewImport ); // modifies State, IsEnabled diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 34a0de491604..4f66ccab159e 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -112,7 +112,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_DIALOGLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(SC_UNO_VBAGLOBNAME), 0, &getCppuType(static_cast< const rtl::OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(SC_UNO_VBAGLOBNAME), 0, &getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0}, @@ -137,7 +137,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {MAP_CHAR_LEN(SC_UNO_SPELLONLINE), PROP_UNO_SPELLONLINE, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_STANDARDDEC), PROP_UNO_STANDARDDEC, &getCppuType((sal_Int16*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_REGEXENABLED), PROP_UNO_REGEXENABLED, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_RUNTIMEUID), 0, &getCppuType(static_cast< const rtl::OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(SC_UNO_RUNTIMEUID), 0, &getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_HASVALIDSIGNATURES),0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_ISLOADED), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_ISUNDOENABLED), 0, &getBooleanCppuType(), 0, 0}, @@ -145,8 +145,8 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {MAP_CHAR_LEN(SC_UNO_ISEXECUTELINKENABLED), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_ISCHANGEREADONLYENABLED), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_REFERENCEDEVICE), 0, &getCppuType((uno::Reference<awt::XDevice>*)0), beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN("BuildId"), 0, &::getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_CODENAME), 0, &getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, + {MAP_CHAR_LEN("BuildId"), 0, &::getCppuType(static_cast< const OUString * >(0)), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_CODENAME), 0, &getCppuType(static_cast< const OUString * >(0)), 0, 0}, {0,0,0,0,0,0} }; @@ -229,64 +229,64 @@ ScPrintUIOptions::ScPrintUIOptions() m_aUIProperties.realloc(nNumProps); // load the writer PrinterOptions into the custom tab - m_aUIProperties[nIdx].Name = rtl::OUString("OptionsUIFile"); - m_aUIProperties[nIdx++].Value <<= rtl::OUString("modules/scalc/ui/printeroptions.ui"); + m_aUIProperties[nIdx].Name = OUString("OptionsUIFile"); + m_aUIProperties[nIdx++].Value <<= OUString("modules/scalc/ui/printeroptions.ui"); // create Section for spreadsheet (results in an extra tab page in dialog) SvtModuleOptions aOpt; String aAppGroupname( aStrings.GetString( 9 ) ); aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), aOpt.GetModuleName( SvtModuleOptions::E_SCALC ) ); - m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, rtl::OUString()); + m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, OUString()); // show subgroup for pages - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pages", rtl::OUString(aStrings.GetString(0)), rtl::OUString()); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pages", OUString(aStrings.GetString(0)), OUString()); // create a bool option for empty pages - m_aUIProperties[nIdx++].Value = setBoolControlOpt("includeemptypages", rtl::OUString( aStrings.GetString( 1 ) ), + m_aUIProperties[nIdx++].Value = setBoolControlOpt("includeemptypages", OUString( aStrings.GetString( 1 ) ), ".HelpID:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox", "IsIncludeEmptyPages", ! bSuppress); // show Subgroup for print content vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.maGroupHint = rtl::OUString( "PrintRange" ); - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", rtl::OUString(aStrings.GetString(2)), - rtl::OUString(), + aPrintRangeOpt.maGroupHint = OUString( "PrintRange" ); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", OUString(aStrings.GetString(2)), + OUString(), aPrintRangeOpt); // create a choice for the content to create - uno::Sequence< rtl::OUString > aChoices( 3 ), aHelpIds( 3 ), aWidgetIds( 3 ); + uno::Sequence< OUString > aChoices( 3 ), aHelpIds( 3 ), aWidgetIds( 3 ); aChoices[0] = aStrings.GetString( 3 ); - aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); + aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); aWidgetIds[0] = "printallsheets"; aChoices[1] = aStrings.GetString( 4 ); - aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); + aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); aWidgetIds[1] = "printselectedsheets"; aChoices[2] = aStrings.GetString( 5 ); - aHelpIds[2] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); + aHelpIds[2] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); aWidgetIds[2] = "printselectedcells"; - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), + m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, "PrintContent", aChoices, nContent ); // show Subgroup for print range aPrintRangeOpt.mbInternalOnly = sal_True; - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("fromwhich", rtl::OUString(aStrings.GetString(6)), - rtl::OUString(), + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("fromwhich", OUString(aStrings.GetString(6)), + OUString(), aPrintRangeOpt); // create a choice for the range to print - rtl::OUString aPrintRangeName( "PrintRange" ); + OUString aPrintRangeName( "PrintRange" ); aChoices.realloc( 2 ); aHelpIds.realloc( 2 ); aWidgetIds.realloc( 2 ); aChoices[0] = aStrings.GetString( 7 ); - aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ); + aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ); aWidgetIds[0] = "printallpages"; aChoices[1] = aStrings.GetString( 8 ); - aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ); + aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ); aWidgetIds[1] = "printpages"; - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), + m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, aPrintRangeName, aChoices, @@ -294,9 +294,9 @@ ScPrintUIOptions::ScPrintUIOptions() // create a an Edit dependent on "Pages" selected vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True ); - m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", rtl::OUString(), + m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", OUString(), ".HelpID:vcl:PrintDialog:PageRange:Edit", - "PageRange", rtl::OUString(), aPageRangeOpt); + "PageRange", OUString(), aPageRangeOpt); assert(nIdx == nNumProps); } @@ -316,7 +316,7 @@ void ScPrintUIOptions::SetDefaults() { for (sal_Int32 nPropPos=0; nPropPos<aUIProp.getLength(); ++nPropPos) { - rtl::OUString aName = aUIProp[nPropPos].Name; + OUString aName = aUIProp[nPropPos].Name; if ( aName == "Property" ) { beans::PropertyValue aPropertyValue; @@ -776,7 +776,7 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, bool bHasPrintContent = false; sal_Int32 nPrintContent = 0; // all sheets / selected sheets / selected cells sal_Int32 nPrintRange = 0; // all pages / pages - rtl::OUString aPageRange; // "pages" edit value + OUString aPageRange; // "pages" edit value for( sal_Int32 i = 0, nLen = rOptions.getLength(); i < nLen; i++ ) { @@ -936,7 +936,7 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount( const uno::Any& aSelection, SolarMutexGuard aGuard; if (!pDocShell) { - throw lang::DisposedException( ::rtl::OUString(), + throw lang::DisposedException( OUString(), static_cast< sheet::XSpreadsheetDocument* >(this) ); } @@ -987,7 +987,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 SolarMutexGuard aGuard; if (!pDocShell) { - throw lang::DisposedException( ::rtl::OUString(), + throw lang::DisposedException( OUString(), static_cast< sheet::XSpreadsheetDocument* >(this) ); } @@ -1019,7 +1019,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 uno::Sequence<beans::PropertyValue> aSequence(1); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); pArray[0].Value <<= aPageSize; if( ! pPrinterOptions ) @@ -1066,17 +1066,17 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 long nPropCount = bWasCellRange ? 3 : 2; uno::Sequence<beans::PropertyValue> aSequence(nPropCount); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); pArray[0].Value <<= aPageSize; // #i111158# all positions are relative to the whole page, including non-printable area - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INC_NP_AREA )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INC_NP_AREA )); pArray[1].Value = uno::makeAny( sal_True ); if ( bWasCellRange ) { table::CellRangeAddress aRangeAddress( nTab, aCellRange.aStart.Col(), aCellRange.aStart.Row(), aCellRange.aEnd.Col(), aCellRange.aEnd.Row() ); - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCERANGE )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCERANGE )); pArray[2].Value <<= aRangeAddress; } @@ -1095,7 +1095,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec SolarMutexGuard aGuard; if (!pDocShell) { - throw lang::DisposedException( ::rtl::OUString(), + throw lang::DisposedException( OUString(), static_cast< sheet::XSpreadsheetDocument* >(this) ); } @@ -1169,7 +1169,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec // the sheet starts at the top of the page Rectangle aArea( pDev->PixelToLogic( Rectangle( 0,0,0,0 ) ) ); sal_Int32 nDestID = pPDFData->CreateDest( aArea ); - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( nTab, aTabName ); sal_Int32 nParent = -1; // top-level pPDFData->CreateOutlineItem( nParent, aTabName, nDestID ); @@ -1178,7 +1178,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec if( pPDFData && pPDFData->GetIsExportNamedDestinations() ) { Rectangle aArea( pDev->PixelToLogic( Rectangle( 0,0,0,0 ) ) ); - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( nTab, aTabName ); //need the PDF page number here pPDFData->CreateNamedDest( aTabName, aArea ); @@ -1198,7 +1198,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec std::vector< vcl::PDFExtOutDevBookmarkEntry >::iterator aIEnd = rBookmarks.end(); while ( aIter != aIEnd ) { - rtl::OUString aBookmark = aIter->aBookmark; + OUString aBookmark = aIter->aBookmark; if ( aBookmark.toChar() == (sal_Unicode) '#' ) { // try to resolve internal link @@ -1414,7 +1414,7 @@ void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabledIn ) // XProtectable -void SAL_CALL ScModelObj::protect( const rtl::OUString& aPassword ) throw(uno::RuntimeException) +void SAL_CALL ScModelObj::protect( const OUString& aPassword ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; // #i108245# if already protected, don't change anything @@ -1425,7 +1425,7 @@ void SAL_CALL ScModelObj::protect( const rtl::OUString& aPassword ) throw(uno::R } } -void SAL_CALL ScModelObj::unprotect( const rtl::OUString& aPassword ) +void SAL_CALL ScModelObj::unprotect( const OUString& aPassword ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1465,7 +1465,7 @@ uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages() throw(un sheet::GoalResult SAL_CALL ScModelObj::seekGoal( const table::CellAddress& aFormulaPosition, const table::CellAddress& aVariablePosition, - const ::rtl::OUString& aGoalValue ) + const OUString& aGoalValue ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1556,10 +1556,10 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) uno::Sequence< beans::PropertyValue > aSeq; aSeq.realloc(1); - rtl::OUString sName; + OUString sName; pDocShell->GetDocument()->GetName( pDocShell->GetDocument()->GetVisibleTab(), sName ); - rtl::OUString sOUName(sName); - aSeq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); + OUString sOUName(sName); + aSeq[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); aSeq[0].Value <<= sOUName; xCont->insertByIndex( 0, uno::makeAny( aSeq ) ); } @@ -1581,7 +1581,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScModelObj::getPropertySetInfo( } void SAL_CALL ScModelObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1620,7 +1620,7 @@ void SAL_CALL ScModelObj::setPropertyValue( } else if ( aString.EqualsAscii( SC_UNO_CODENAME ) ) { - rtl::OUString sCodeName; + OUString sCodeName; if ( aValue >>= sCodeName ) pDoc->SetCodeName( sCodeName ); } @@ -1699,7 +1699,7 @@ void SAL_CALL ScModelObj::setPropertyValue( } else if ( aString.EqualsAscii( "SavedObject" ) ) // set from chart after saving { - rtl::OUString aObjName; + OUString aObjName; aValue >>= aObjName; if ( !aObjName.isEmpty() ) pDoc->RestoreChartListener( aObjName ); @@ -1716,7 +1716,7 @@ void SAL_CALL ScModelObj::setPropertyValue( } } -uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScModelObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1744,7 +1744,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa } else if ( aString.EqualsAscii( SC_UNO_CODENAME ) ) { - rtl::OUString sCodeName = pDoc->GetCodeName(); + OUString sCodeName = pDoc->GetCodeName(); aRet <<= sCodeName; } @@ -1839,7 +1839,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa That constant will be equivelant to 'ThisComponent' but for each application, so e.g. a 'ThisExcelDoc' and a 'ThisWordDoc' constant can co-exist, as required by VBA. */ - aRet <<= rtl::OUString( "ThisExcelDoc" ); + aRet <<= OUString( "ThisExcelDoc" ); } else if ( aString.EqualsAscii( SC_UNO_RUNTIMEUID ) ) { @@ -1893,7 +1893,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScModelObj ) // XMultiServiceFactory uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( - const rtl::OUString& aServiceSpecifier ) + const OUString& aServiceSpecifier ) throw(uno::Exception, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1972,7 +1972,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( } uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments( - const rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const uno::Sequence<uno::Any>& aArgs ) throw(uno::Exception, uno::RuntimeException) { @@ -1993,7 +1993,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments return xInt; } -uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames() +uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2002,20 +2002,20 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames() //! return concatServiceNames( ScServiceProvider::GetAllServiceNames(), //! SvxFmMSFactory::getAvailableServiceNames() ); - uno::Sequence<rtl::OUString> aMyServices(ScServiceProvider::GetAllServiceNames()); - uno::Sequence<rtl::OUString> aDrawServices(SvxFmMSFactory::getAvailableServiceNames()); + uno::Sequence<OUString> aMyServices(ScServiceProvider::GetAllServiceNames()); + uno::Sequence<OUString> aDrawServices(SvxFmMSFactory::getAvailableServiceNames()); return concatServiceNames( aMyServices, aDrawServices ); } // XServiceInfo -rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScModelObj" ); + return OUString( "ScModelObj" ); } -sal_Bool SAL_CALL ScModelObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScModelObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -2024,13 +2024,13 @@ sal_Bool SAL_CALL ScModelObj::supportsService( const rtl::OUString& rServiceName aServiceStr.EqualsAscii( SCDOC_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); return aRet; } @@ -2119,7 +2119,7 @@ bool ScModelObj::HasChangesListeners() const return pDocShell && pDocShell->GetDocument()->HasAnySheetEventScript(SC_SHEETEVENT_CHANGE); } -void ScModelObj::NotifyChanges( const ::rtl::OUString& rOperation, const ScRangeList& rRanges, +void ScModelObj::NotifyChanges( const OUString& rOperation, const ScRangeList& rRanges, const uno::Sequence< beans::PropertyValue >& rProperties ) { if ( pDocShell && HasChangesListeners() ) @@ -2178,7 +2178,7 @@ void ScModelObj::NotifyChanges( const ::rtl::OUString& rOperation, const ScRange const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CHANGE); + const OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CHANGE); if (pScript) { ScRangeList aTabRanges; // collect ranges on this sheet @@ -2235,7 +2235,7 @@ void ScModelObj::HandleCalculateEvents() { if (const ScSheetEvents* pEvents = pDoc->GetSheetEvents( nTab )) { - if (const rtl::OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CALCULATE)) + if (const OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CALCULATE)) { uno::Any aRet; uno::Sequence<uno::Any> aParams; @@ -2315,7 +2315,7 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sa uno::Reference<drawing::XDrawPage> xRet; if (pDocShell) { - rtl::OUString aNewName; + OUString aNewName; pDocShell->GetDocument()->CreateValidTabName(aNewName); if ( pDocShell->GetDocFunc().InsertTable( static_cast<SCTAB>(nPos), aNewName, true, true ) ) @@ -2409,7 +2409,7 @@ ScTableSheetObj* ScTableSheetsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const return NULL; } -ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const OUString& aName) const { if (pDocShell) { @@ -2420,7 +2420,7 @@ ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const rtl::OUString& aNa return NULL; } -void SAL_CALL ScTableSheetsObj::insertNewByName( const rtl::OUString& aName, sal_Int16 nPosition ) +void SAL_CALL ScTableSheetsObj::insertNewByName( const OUString& aName, sal_Int16 nPosition ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2434,7 +2434,7 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const rtl::OUString& aName, sal throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int16 nDestination ) +void SAL_CALL ScTableSheetsObj::moveByName( const OUString& aName, sal_Int16 nDestination ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2449,8 +2449,8 @@ void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int1 throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName, - const rtl::OUString& aCopy, sal_Int16 nDestination ) +void SAL_CALL ScTableSheetsObj::copyByName( const OUString& aName, + const OUString& aCopy, sal_Int16 nDestination ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2479,7 +2479,7 @@ void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName, throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScTableSheetsObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2531,7 +2531,7 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const } } -void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScTableSheetsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2583,7 +2583,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const } } -void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScTableSheetsObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2604,7 +2604,7 @@ void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName ) sal_Int32 ScTableSheetsObj::importSheet( const uno::Reference < sheet::XSpreadsheetDocument > & xDocSrc, - const rtl::OUString& srcName, const sal_Int32 nDestPosition ) + const OUString& srcName, const sal_Int32 nDestPosition ) throw( lang::IllegalArgumentException, lang::IndexOutOfBoundsException, uno::RuntimeException ) { //pDocShell is the destination @@ -2660,7 +2660,7 @@ uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPos return xSheet->getCellRangeByPosition(nLeft, nTop, nRight, nBottom); } -uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj::getCellRangesByName( const rtl::OUString& aRange ) +uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj::getCellRangesByName( const OUString& aRange ) throw (lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2695,7 +2695,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); } // XIndexAccess @@ -2735,7 +2735,7 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasElements() throw(uno::RuntimeException) // XNameAccess -uno::Any SAL_CALL ScTableSheetsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScTableSheetsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2747,7 +2747,7 @@ uno::Any SAL_CALL ScTableSheetsObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetsObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScTableSheetsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2755,9 +2755,9 @@ uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetsObj::getElementNames() { ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nCount = pDoc->GetTableCount(); - rtl::OUString aName; - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + OUString aName; + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (SCTAB i=0; i<nCount; i++) { pDoc->GetName( i, aName ); @@ -2765,10 +2765,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetsObj::getElementNames() } return aSeq; } - return uno::Sequence<rtl::OUString>(); + return uno::Sequence<OUString>(); } -sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2822,7 +2822,7 @@ ScTableColumnObj* ScTableColumnsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) con return NULL; // falscher Index } -ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const OUString& aName) const { SCCOL nCol = 0; String aString(aName); @@ -2871,7 +2871,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableColumnsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableColumnsEnumeration")); } // XIndexAccess @@ -2906,7 +2906,7 @@ sal_Bool SAL_CALL ScTableColumnsObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScTableColumnsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScTableColumnsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2918,20 +2918,20 @@ uno::Any SAL_CALL ScTableColumnsObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScTableColumnsObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScTableColumnsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SCCOL nCount = nEndCol - nStartCol + 1; - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (SCCOL i=0; i<nCount; i++) pAry[i] = ::ScColToAlpha( nStartCol + i ); return aSeq; } -sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2956,7 +2956,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnsObj::getPropertyS } void SAL_CALL ScTableColumnsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -3005,7 +3005,7 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue( } } -uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3130,7 +3130,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableRowsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableRowsEnumeration")); } // XIndexAccess @@ -3177,7 +3177,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowsObj::getPropertySetI } void SAL_CALL ScTableRowsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -3278,7 +3278,7 @@ void SAL_CALL ScTableRowsObj::setPropertyValue( } } -uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3368,7 +3368,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettingsObj::getPr } void SAL_CALL ScSpreadsheetSettingsObj::setPropertyValue( - const rtl::OUString& /* aPropertyName */, const uno::Any& /* aValue */ ) + const OUString& /* aPropertyName */, const uno::Any& /* aValue */ ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -3376,7 +3376,7 @@ void SAL_CALL ScSpreadsheetSettingsObj::setPropertyValue( //! muss noch } -uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const rtl::OUString& /* aPropertyName */ ) +uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const OUString& /* aPropertyName */ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3446,7 +3446,7 @@ ScAnnotationObj* ScAnnotationsObj::GetObjectByIndex_Impl( sal_Int32 nIndex ) con // XSheetAnnotations void SAL_CALL ScAnnotationsObj::insertNew( - const table::CellAddress& aPosition, const ::rtl::OUString& rText ) + const table::CellAddress& aPosition, const OUString& rText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3483,7 +3483,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera //! iterate directly (more efficiently)? SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAnnotationsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAnnotationsEnumeration")); } // XIndexAccess @@ -3554,13 +3554,13 @@ void ScScenariosObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XScenarios -sal_Bool ScScenariosObj::GetScenarioIndex_Impl( const rtl::OUString& rName, SCTAB& rIndex ) +sal_Bool ScScenariosObj::GetScenarioIndex_Impl( const OUString& rName, SCTAB& rIndex ) { //! Case-insensitiv ???? if ( pDocShell ) { - rtl::OUString aTabName; + OUString aTabName; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nCount = (SCTAB)getCount(); for (SCTAB i=0; i<nCount; i++) @@ -3584,7 +3584,7 @@ ScTableSheetObj* ScScenariosObj::GetObjectByIndex_Impl(sal_Int32 nIndex) return NULL; // kein Dokument oder falscher Index } -ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const OUString& aName) { SCTAB nIndex; if ( pDocShell && GetScenarioIndex_Impl( aName, nIndex ) ) @@ -3593,9 +3593,9 @@ ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const rtl::OUString& aName return NULL; // nicht gefunden } -void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName, +void SAL_CALL ScScenariosObj::addNewByName( const OUString& aName, const uno::Sequence<table::CellRangeAddress>& aRanges, - const rtl::OUString& aComment ) + const OUString& aComment ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3628,7 +3628,7 @@ void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName, } } -void SAL_CALL ScScenariosObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScScenariosObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3643,7 +3643,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.ScenariosEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.ScenariosEnumeration")); } // XIndexAccess @@ -3693,7 +3693,7 @@ sal_Bool SAL_CALL ScScenariosObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScScenariosObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScScenariosObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3705,18 +3705,18 @@ uno::Any SAL_CALL ScScenariosObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScScenariosObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScScenariosObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SCTAB nCount = (SCTAB)getCount(); - uno::Sequence<rtl::OUString> aSeq(nCount); + uno::Sequence<OUString> aSeq(nCount); if ( pDocShell ) // sonst ist auch Count = 0 { - rtl::OUString aTabName; + OUString aTabName; ScDocument* pDoc = pDocShell->GetDocument(); - rtl::OUString* pAry = aSeq.getArray(); + OUString* pAry = aSeq.getArray(); for (SCTAB i=0; i<nCount; i++) if (pDoc->GetName( nTab+i+1, aTabName )) pAry[i] = aTabName; @@ -3725,7 +3725,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScScenariosObj::getElementNames() return aSeq; } -sal_Bool SAL_CALL ScScenariosObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScScenariosObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 8c2822ea6f77..5539a3f47fe9 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -56,7 +56,7 @@ void ScSheetEventsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -static sal_Int32 lcl_GetEventFromName( const rtl::OUString& aName ) +static sal_Int32 lcl_GetEventFromName( const OUString& aName ) { for (sal_Int32 nEvent=0; nEvent<SC_SHEETEVENT_COUNT; ++nEvent) if ( aName == ScSheetEvents::GetEventName(nEvent) ) @@ -67,7 +67,7 @@ static sal_Int32 lcl_GetEventFromName( const rtl::OUString& aName ) // XNameReplace -void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScSheetEventsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -84,7 +84,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const if (pOldEvents) aNewEvents = *pOldEvents; - rtl::OUString aScript; + OUString aScript; if ( aElement.hasValue() ) // empty Any -> reset event { uno::Sequence<beans::PropertyValue> aPropSeq; @@ -96,7 +96,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const const beans::PropertyValue& rProp = aPropSeq[nPos]; if ( rProp.Name.compareToAscii( SC_UNO_EVENTTYPE ) == 0 ) { - rtl::OUString aEventType; + OUString aEventType; if ( rProp.Value >>= aEventType ) { // only "Script" is supported @@ -120,7 +120,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const // XNameAccess -uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScSheetEventsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -128,7 +128,7 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) if (nEvent < 0) throw container::NoSuchElementException(); - const rtl::OUString* pScript = NULL; + const OUString* pScript = NULL; if (mpDocShell) { const ScSheetEvents* pEvents = mpDocShell->GetDocument()->GetSheetEvents(mnTab); @@ -141,10 +141,10 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) { uno::Sequence<beans::PropertyValue> aPropSeq( 2 ); aPropSeq[0] = beans::PropertyValue( - rtl::OUString("EventType"), -1, - uno::makeAny( rtl::OUString("Script") ), beans::PropertyState_DIRECT_VALUE ); + OUString("EventType"), -1, + uno::makeAny( OUString("Script") ), beans::PropertyState_DIRECT_VALUE ); aPropSeq[1] = beans::PropertyValue( - rtl::OUString("Script"), -1, + OUString("Script"), -1, uno::makeAny( *pScript ), beans::PropertyState_DIRECT_VALUE ); aRet <<= aPropSeq; } @@ -152,16 +152,16 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) return aRet; } -uno::Sequence<rtl::OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence<OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - uno::Sequence<rtl::OUString> aNames(SC_SHEETEVENT_COUNT); + uno::Sequence<OUString> aNames(SC_SHEETEVENT_COUNT); for (sal_Int32 nEvent=0; nEvent<SC_SHEETEVENT_COUNT; ++nEvent) aNames[nEvent] = ScSheetEvents::GetEventName(nEvent); return aNames; } -sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const ::rtl::OUString& aName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; sal_Int32 nEvent = lcl_GetEventFromName(aName); diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx index d47d01691aba..13ace176952f 100644 --- a/sc/source/ui/unoobj/exceldetect.hxx +++ b/sc/source/ui/unoobj/exceldetect.hxx @@ -28,10 +28,10 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); // XExtendedFilterDetection - virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) throw (com::sun::star::uno::RuntimeException); static com::sun::star::uno::Sequence<OUString> impl_getStaticSupportedServiceNames(); diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index b478f1bd146c..c42c119990ca 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -81,10 +81,10 @@ const SfxItemPropertySet* lcl_GetURLPropertySet() { {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence<text::TextContentAnchorType>*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_TARGET), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_REPR), 0, &getCppuType((OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_TARGET), 0, &getCppuType((OUString*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0, &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((OUString*)0), 0, 0}, {0,0,0,0,0,0} }; static SfxItemPropertySet aURLPropertySet_Impl( aURLPropertyMap_Impl ); @@ -392,7 +392,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); } void SAL_CALL ScCellFieldsObj::addContainerListener( @@ -572,7 +572,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); } void SAL_CALL ScHeaderFieldsObj::addContainerListener( @@ -662,7 +662,7 @@ SvxFieldData* ScEditFieldObj::getData() break; case text::textfield::Type::EXTENDED_FILE: mpData.reset( - new SvxExtFileField(rtl::OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT)); + new SvxExtFileField(OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT)); break; case text::textfield::Type::PAGE: mpData.reset(new SvxPageField); @@ -689,7 +689,7 @@ SvxFieldData* ScEditFieldObj::getData() break; case text::textfield::Type::URL: mpData.reset( - new SvxURLField(rtl::OUString(), rtl::OUString(), SVXURLFORMAT_APPDEFAULT)); + new SvxURLField(OUString(), OUString(), SVXURLFORMAT_APPDEFAULT)); break; default: mpData.reset(new SvxFieldData); @@ -698,9 +698,9 @@ SvxFieldData* ScEditFieldObj::getData() return mpData.get(); } -void ScEditFieldObj::setPropertyValueURL(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal) +void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const com::sun::star::uno::Any& rVal) { - rtl::OUString aStrVal; + OUString aStrVal; if (mpEditSource) { // Edit engine instance already exists for this field item. Use it. @@ -768,7 +768,7 @@ void ScEditFieldObj::setPropertyValueURL(const rtl::OUString& rName, const com:: throw beans::UnknownPropertyException(); } -uno::Any ScEditFieldObj::getPropertyValueURL(const rtl::OUString& rName) +uno::Any ScEditFieldObj::getPropertyValueURL(const OUString& rName) { uno::Any aRet; @@ -820,7 +820,7 @@ uno::Any ScEditFieldObj::getPropertyValueURL(const rtl::OUString& rName) return aRet; } -void ScEditFieldObj::setPropertyValueFile(const rtl::OUString& rName, const uno::Any& rVal) +void ScEditFieldObj::setPropertyValueFile(const OUString& rName, const uno::Any& rVal) { if (rName == SC_UNONAME_FILEFORM) { @@ -855,7 +855,7 @@ void ScEditFieldObj::setPropertyValueFile(const rtl::OUString& rName, const uno: throw beans::UnknownPropertyException(); } -uno::Any ScEditFieldObj::getPropertyValueFile(const rtl::OUString& rName) +uno::Any ScEditFieldObj::getPropertyValueFile(const OUString& rName) { uno::Any aRet; if (rName == SC_UNONAME_FILEFORM) @@ -887,7 +887,7 @@ uno::Any ScEditFieldObj::getPropertyValueFile(const rtl::OUString& rName) return aRet; } -void ScEditFieldObj::setPropertyValueDateTime(const rtl::OUString& rName, const uno::Any& rVal) +void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno::Any& rVal) { if (mpEditSource) { @@ -981,7 +981,7 @@ void ScEditFieldObj::setPropertyValueDateTime(const rtl::OUString& rName, const } } -uno::Any ScEditFieldObj::getPropertyValueDateTime(const rtl::OUString& rName) +uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName) { if (mpEditSource) { @@ -1086,7 +1086,7 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const rtl::OUString& rName) throw beans::UnknownPropertyException(); } -void ScEditFieldObj::setPropertyValueSheet(const rtl::OUString& rName, const uno::Any& rVal) +void ScEditFieldObj::setPropertyValueSheet(const OUString& rName, const uno::Any& rVal) { if (mpEditSource) { @@ -1221,13 +1221,13 @@ bool ScEditFieldObj::IsInserted() const // XTextField -rtl::OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) +OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (!mpEditSource) - return rtl::OUString(); + return OUString(); //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = mpEditSource->GetEditEngine(); @@ -1238,7 +1238,7 @@ rtl::OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) aSelection.nStartPara, aSelection.nStartPos, text::textfield::Type::UNSPECIFIED); OSL_ENSURE(pField,"getPresentation: Feld nicht gefunden"); if (!pField) - return rtl::OUString(); + return OUString(); switch (meType) { @@ -1255,7 +1255,7 @@ rtl::OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) default: ; } - return rtl::OUString(); + return OUString(); } // XTextContent @@ -1312,7 +1312,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScEditFieldObj::getPropertySetI } void SAL_CALL ScEditFieldObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1346,7 +1346,7 @@ void SAL_CALL ScEditFieldObj::setPropertyValue( } } -uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1431,22 +1431,22 @@ ScEditFieldObj* ScEditFieldObj::getImplementation(const uno::Reference<text::XTe // XServiceInfo -rtl::OUString SAL_CALL ScEditFieldObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScEditFieldObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScEditFieldObj"); + return OUString("ScEditFieldObj"); } -sal_Bool SAL_CALL ScEditFieldObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScEditFieldObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { return rServiceName == SCTEXTFIELD_SERVICE || rServiceName == SCTEXTCONTENT_SERVICE; } -uno::Sequence<rtl::OUString> SAL_CALL ScEditFieldObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScEditFieldObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); pArray[0] = SCTEXTFIELD_SERVICE; pArray[1] = SCTEXTCONTENT_SERVICE; return aRet; diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index 0357c88e213b..3e4e0883642d 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star; -using ::rtl::OUStringBuffer; using namespace rtl; using namespace com::sun::star::uno; @@ -133,16 +132,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance( return (::cppu::OWeakObject*) new ScFilterOptionsObj; } -rtl::OUString ScFilterOptionsObj::getImplementationName_Static() +OUString ScFilterOptionsObj::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_IMPLNAME )); + return OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_IMPLNAME )); } -uno::Sequence<rtl::OUString> ScFilterOptionsObj::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScFilterOptionsObj::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_SERVICE )); return aRet; } @@ -153,7 +152,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValu uno::Sequence<beans::PropertyValue> aRet(1); beans::PropertyValue* pArray = aRet.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTEROPTIONS )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTEROPTIONS )); pArray[0].Value <<= aFilterOptions; return aRet; @@ -183,7 +182,7 @@ void SAL_CALL ScFilterOptionsObj::setPropertyValues( const uno::Sequence<beans:: // XExecutableDialog -void SAL_CALL ScFilterOptionsObj::setTitle( const ::rtl::OUString& /* aTitle */ ) throw(uno::RuntimeException) +void SAL_CALL ScFilterOptionsObj::setTitle( const OUString& /* aTitle */ ) throw(uno::RuntimeException) { // not used } diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index e5dcc7f7f882..197321325c2c 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -48,11 +48,11 @@ static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() static SfxItemPropertyMapEntry aValidatePropertyMap_Impl[] = { {MAP_CHAR_LEN(SC_UNONAME_ERRALSTY), 0, &getCppuType((sheet::ValidationAlertStyle*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_ERRMESS), 0, &getCppuType((rtl::OUString*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_ERRTITLE), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_ERRMESS), 0, &getCppuType((OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_ERRTITLE), 0, &getCppuType((OUString*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_IGNOREBL), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_INPMESS), 0, &getCppuType((rtl::OUString*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_INPTITLE), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_INPMESS), 0, &getCppuType((OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_INPTITLE), 0, &getCppuType((OUString*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_SHOWERR), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_SHOWINP), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_SHOWLIST), 0, &getCppuType((sal_Int16*)0), 0, 0}, @@ -279,7 +279,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( } else if ( rProp.Name == SC_UNONAME_FORMULA1 ) { - rtl::OUString aStrVal; + OUString aStrVal; uno::Sequence<sheet::FormulaToken> aTokens; if ( rProp.Value >>= aStrVal ) aEntry.maExpr1 = aStrVal; @@ -291,7 +291,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( } else if ( rProp.Name == SC_UNONAME_FORMULA2 ) { - rtl::OUString aStrVal; + OUString aStrVal; uno::Sequence<sheet::FormulaToken> aTokens; if ( rProp.Value >>= aStrVal ) aEntry.maExpr2 = aStrVal; @@ -309,26 +309,26 @@ void SAL_CALL ScTableConditionalFormat::addNew( } else if ( rProp.Name == SC_UNONAME_SOURCESTR ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maPosStr = String( aStrVal ); } else if ( rProp.Name == SC_UNONAME_STYLENAME ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName( aStrVal, SFX_STYLE_FAMILY_PARA ); } else if ( rProp.Name == SC_UNONAME_FORMULANMSP1 ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maExprNmsp1 = aStrVal; } else if ( rProp.Name == SC_UNONAME_FORMULANMSP2 ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maExprNmsp2 = aStrVal; } @@ -383,7 +383,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::creat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); } // XIndexAccess @@ -421,14 +421,14 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeExce // conditional format entries have no real names // -> generate name from index -static rtl::OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) +static OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) { - rtl::OUString aRet( "Entry" ); - aRet += rtl::OUString::valueOf( nIndex ); + OUString aRet( "Entry" ); + aRet += OUString::valueOf( nIndex ); return aRet; } -uno::Any SAL_CALL ScTableConditionalFormat::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScTableConditionalFormat::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -449,21 +449,21 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByName( const rtl::OUString& aNam throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScTableConditionalFormat::getElementNames() +uno::Sequence<OUString> SAL_CALL ScTableConditionalFormat::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; long nCount = aEntries.size(); - uno::Sequence<rtl::OUString> aNames(nCount); - rtl::OUString* pArray = aNames.getArray(); + uno::Sequence<OUString> aNames(nCount); + OUString* pArray = aNames.getArray(); for (long i=0; i<nCount; i++) pArray[i] = lcl_GetEntryNameFromIndex(i); return aNames; } -sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -557,26 +557,26 @@ void SAL_CALL ScTableConditionalEntry::setConditionOperator( sal_Int32 nOperator aData.meMode = ScConditionEntry::GetModeFromApi( nOperator ); } -rtl::OUString SAL_CALL ScTableConditionalEntry::getFormula1() throw(uno::RuntimeException) +OUString SAL_CALL ScTableConditionalEntry::getFormula1() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aData.maExpr1; } -void SAL_CALL ScTableConditionalEntry::setFormula1( const rtl::OUString& aFormula1 ) +void SAL_CALL ScTableConditionalEntry::setFormula1( const OUString& aFormula1 ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; aData.maExpr1 = String( aFormula1 ); } -rtl::OUString SAL_CALL ScTableConditionalEntry::getFormula2() throw(uno::RuntimeException) +OUString SAL_CALL ScTableConditionalEntry::getFormula2() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aData.maExpr2; } -void SAL_CALL ScTableConditionalEntry::setFormula2( const rtl::OUString& aFormula2 ) +void SAL_CALL ScTableConditionalEntry::setFormula2( const OUString& aFormula2 ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -602,13 +602,13 @@ void SAL_CALL ScTableConditionalEntry::setSourcePosition( const table::CellAddre // XSheetConditionalEntry -rtl::OUString SAL_CALL ScTableConditionalEntry::getStyleName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableConditionalEntry::getStyleName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return ScStyleNameConversion::DisplayToProgrammaticName( aData.maStyle, SFX_STYLE_FAMILY_PARA ); } -void SAL_CALL ScTableConditionalEntry::setStyleName( const rtl::OUString& aStyleName ) +void SAL_CALL ScTableConditionalEntry::setStyleName( const OUString& aStyleName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -755,26 +755,26 @@ void SAL_CALL ScTableValidationObj::setConditionOperator( sal_Int32 nOperator ) nMode = sal::static_int_cast<sal_uInt16>( ScConditionEntry::GetModeFromApi( nOperator ) ); } -rtl::OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException) +OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aExpr1; } -void SAL_CALL ScTableValidationObj::setFormula1( const rtl::OUString& aFormula1 ) +void SAL_CALL ScTableValidationObj::setFormula1( const OUString& aFormula1 ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; aExpr1 = String( aFormula1 ); } -rtl::OUString SAL_CALL ScTableValidationObj::getFormula2() throw(uno::RuntimeException) +OUString SAL_CALL ScTableValidationObj::getFormula2() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aExpr2; } -void SAL_CALL ScTableValidationObj::setFormula2( const rtl::OUString& aFormula2 ) +void SAL_CALL ScTableValidationObj::setFormula2( const OUString& aFormula2 ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -842,7 +842,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableValidationObj::getProper } void SAL_CALL ScTableValidationObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -856,25 +856,25 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aValue >>= nShowList; else if ( aString.EqualsAscii( SC_UNONAME_INPTITLE ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aInputTitle = String( aStrVal ); } else if ( aString.EqualsAscii( SC_UNONAME_INPMESS ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aInputMessage = String( aStrVal ); } else if ( aString.EqualsAscii( SC_UNONAME_ERRTITLE ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aErrorTitle = String( aStrVal ); } else if ( aString.EqualsAscii( SC_UNONAME_ERRMESS ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aErrorMessage = String( aStrVal ); } @@ -918,7 +918,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( { // internal - only for XML filter, not in PropertySetInfo, only set - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aPosString = String( aStrVal ); } @@ -926,7 +926,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( { // internal - only for XML filter, not in PropertySetInfo, only set - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) maExprNmsp1 = aStrVal; } @@ -934,7 +934,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( { // internal - only for XML filter, not in PropertySetInfo, only set - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) maExprNmsp2 = aStrVal; } @@ -956,7 +956,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( } } -uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -968,10 +968,10 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& a else if ( aString.EqualsAscii( SC_UNONAME_SHOWERR ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bShowError ); else if ( aString.EqualsAscii( SC_UNONAME_IGNOREBL ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bIgnoreBlank ); else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aRet <<= nShowList; - else if ( aString.EqualsAscii( SC_UNONAME_INPTITLE ) ) aRet <<= rtl::OUString( aInputTitle ); - else if ( aString.EqualsAscii( SC_UNONAME_INPMESS ) ) aRet <<= rtl::OUString( aInputMessage ); - else if ( aString.EqualsAscii( SC_UNONAME_ERRTITLE ) ) aRet <<= rtl::OUString( aErrorTitle ); - else if ( aString.EqualsAscii( SC_UNONAME_ERRMESS ) ) aRet <<= rtl::OUString( aErrorMessage ); + else if ( aString.EqualsAscii( SC_UNONAME_INPTITLE ) ) aRet <<= OUString( aInputTitle ); + else if ( aString.EqualsAscii( SC_UNONAME_INPMESS ) ) aRet <<= OUString( aInputMessage ); + else if ( aString.EqualsAscii( SC_UNONAME_ERRTITLE ) ) aRet <<= OUString( aErrorTitle ); + else if ( aString.EqualsAscii( SC_UNONAME_ERRMESS ) ) aRet <<= OUString( aErrorMessage ); else if ( aString.EqualsAscii( SC_UNONAME_TYPE ) ) { sheet::ValidationType eType = sheet::ValidationType_ANY; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 558d17012067..61f2074e529c 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -244,27 +244,27 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance( return xInst; } -rtl::OUString ScFunctionAccess::getImplementationName_Static() +OUString ScFunctionAccess::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScFunctionAccess" ); + return OUString( "stardiv.StarCalc.ScFunctionAccess" ); } -uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static() +uno::Sequence<OUString> ScFunctionAccess::getSupportedServiceNames_Static() { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); return aRet; } // XServiceInfo -rtl::OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScFunctionAccess"); + return OUString( "ScFunctionAccess"); } -sal_Bool SAL_CALL ScFunctionAccess::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScFunctionAccess::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -272,13 +272,13 @@ sal_Bool SAL_CALL ScFunctionAccess::supportsService( const rtl::OUString& rServi aServiceStr.EqualsAscii( SCDOCSETTINGS_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); return aRet; } @@ -294,7 +294,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySe } void SAL_CALL ScFunctionAccess::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -319,7 +319,7 @@ void SAL_CALL ScFunctionAccess::setPropertyValue( } } -uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -340,10 +340,10 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFunctionAccess ) // XFunctionAccess -static sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName,const ScCompiler& rCompiler ) +static sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const OUString& rName,const ScCompiler& rCompiler ) { // function names are always case-insensitive - rtl::OUString aUpper = ScGlobal::pCharClass->uppercase(rName); + OUString aUpper = ScGlobal::pCharClass->uppercase(rName); // same options as in ScCompiler::IsOpCode: // 1. built-in function name @@ -365,7 +365,7 @@ static sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& // 3. new (uno) add in functions - rtl::OUString aIntName = + OUString aIntName = ScGlobal::GetAddInCollection()->FindFunction(aUpper, false); if (!aIntName.isEmpty()) { @@ -398,7 +398,7 @@ public: SimpleVisitor( ScDocument* pDoc ) : mbArgError( false ), mpDoc( pDoc ) {} // could possibly just get away with JUST the following overload // 1) virtual void visitElem( long& nCol, long& nRow, const double& elem ) - // 2) virtual void visitElem( long& nCol, long& nRow, const rtl::OUString& elem ) + // 2) virtual void visitElem( long& nCol, long& nRow, const OUString& elem ) // 3) virtual void visitElem( long& nCol, long& nRow, const uno::Any& elem ) // the other types methods are here just to reflect the orig code and for // completeness. @@ -415,7 +415,7 @@ public: { mpDoc->SetValue( (SCCOL) nCol, (SCROW) nRow, 0, elem ); } - void visitElem( long nCol, long nRow, const rtl::OUString& elem ) + void visitElem( long nCol, long nRow, const OUString& elem ) { if (!elem.isEmpty()) { @@ -447,7 +447,7 @@ public: } else if ( eElemClass == uno::TypeClass_STRING ) { - rtl::OUString aUStr; + OUString aUStr; rElement >>= aUStr; visitElem( nCol, nRow, aUStr ); } @@ -517,7 +517,7 @@ static void processSequences( ScDocument* pDoc, const uno::Any& rArg, ScTokenArr } }; -uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, +uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, const uno::Sequence<uno::Any>& aArguments ) throw(container::NoSuchElementException, lang::IllegalArgumentException, uno::RuntimeException) @@ -597,7 +597,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, } else if ( eClass == uno::TypeClass_STRING ) { - rtl::OUString aUStr; + OUString aUStr; rArg >>= aUStr; String aStr( aUStr ); aTokenArr.AddString( aStr.GetBuffer() ); @@ -614,9 +614,9 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, { ArrayOfArrayProc<double>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } - else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<rtl::OUString> > *)0 ) ) ) + else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<OUString> > *)0 ) ) ) { - ArrayOfArrayProc<rtl::OUString>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); + ArrayOfArrayProc<OUString>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<uno::Any> > *)0 ) ) ) { @@ -699,7 +699,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, else { // string result - rtl::OUString aStrVal = pFormula->GetString(); + OUString aStrVal = pFormula->GetString(); aRet <<= aStrVal; } } diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 38f1ce4bd610..3cff46ba8287 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -45,7 +45,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; using ::std::vector; //------------------------------------------------------------------------ @@ -55,9 +54,9 @@ static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() { static SfxItemPropertyMapEntry aSheetLinkMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_FILTER), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_LINKURL), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FILTER), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_LINKURL), 0, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFDELAY), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {0,0,0,0,0,0} @@ -130,13 +129,13 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const // XNamed -rtl::OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return getFileName(); // Name ist der Dateiname (URL) } -void SAL_CALL ScSheetLinkObj::setName( const rtl::OUString& aName ) throw(uno::RuntimeException) +void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; setFileName(aName); // Name ist der Dateiname (URL) @@ -212,14 +211,14 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSheetLinkObj::getPropertySetI } void SAL_CALL ScSheetLinkObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; String aNameString(aPropertyName); - rtl::OUString aValStr; + OUString aValStr; if ( aNameString.EqualsAscii( SC_UNONAME_LINKURL ) ) { if ( aValue >>= aValStr ) @@ -249,7 +248,7 @@ void SAL_CALL ScSheetLinkObj::setPropertyValue( } } -uno::Any SAL_CALL ScSheetLinkObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScSheetLinkObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -273,13 +272,13 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSheetLinkObj ) // internal: -rtl::OUString ScSheetLinkObj::getFileName(void) const +OUString ScSheetLinkObj::getFileName(void) const { SolarMutexGuard aGuard; return aFileName; } -void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) +void ScSheetLinkObj::setFileName(const OUString& rNewName) { SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); @@ -295,7 +294,7 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; nTab++) - if ( pDoc->IsLinked(nTab) && pDoc->GetLinkDoc(nTab) == rtl::OUString(aFileName) ) // alte Datei + if ( pDoc->IsLinked(nTab) && pDoc->GetLinkDoc(nTab) == OUString(aFileName) ) // alte Datei pDoc->SetLink( nTab, pDoc->GetLinkMode(nTab), aNewStr, pDoc->GetLinkFlt(nTab), pDoc->GetLinkOpt(nTab), pDoc->GetLinkTab(nTab), @@ -316,17 +315,17 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) } } -rtl::OUString ScSheetLinkObj::getFilter(void) const +OUString ScSheetLinkObj::getFilter(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScTableLink* pLink = GetLink_Impl(); if (pLink) aRet = pLink->GetFilterName(); return aRet; } -void ScSheetLinkObj::setFilter(const rtl::OUString& Filter) +void ScSheetLinkObj::setFilter(const OUString& Filter) { SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); @@ -337,17 +336,17 @@ void ScSheetLinkObj::setFilter(const rtl::OUString& Filter) } } -rtl::OUString ScSheetLinkObj::getFilterOptions(void) const +OUString ScSheetLinkObj::getFilterOptions(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScTableLink* pLink = GetLink_Impl(); if (pLink) aRet = pLink->GetOptions(); return aRet; } -void ScSheetLinkObj::setFilterOptions(const rtl::OUString& FilterOptions) +void ScSheetLinkObj::setFilterOptions(const OUString& FilterOptions) { SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); @@ -406,7 +405,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) if (!pDocShell) return NULL; - typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> StrSetType; + typedef boost::unordered_set<OUString, OUStringHash> StrSetType; StrSetType aNames; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); @@ -416,7 +415,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) if (!pDoc->IsLinked(nTab)) continue; - rtl::OUString aLinkDoc = pDoc->GetLinkDoc(nTab); + OUString aLinkDoc = pDoc->GetLinkDoc(nTab); if (aNames.insert(aLinkDoc).second) { // unique document name. @@ -429,7 +428,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) return NULL; // kein Dokument oder Index zu gross } -ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const OUString& aName) { // Name ist der Dateiname @@ -458,14 +457,14 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetLinksEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetLinksEnumeration")); } // XIndexAccess sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException) { - typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> StrSetType; + typedef boost::unordered_set<OUString, OUStringHash> StrSetType; SolarMutexGuard aGuard; if (!pDocShell) @@ -481,7 +480,7 @@ sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException) if (!pDoc->IsLinked(nTab)) continue; - rtl::OUString aLinkDoc = pDoc->GetLinkDoc(nTab); + OUString aLinkDoc = pDoc->GetLinkDoc(nTab); if (aNames.insert(aLinkDoc).second) ++nCount; } @@ -512,7 +511,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScSheetLinksObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScSheetLinksObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -525,7 +524,7 @@ uno::Any SAL_CALL ScSheetLinksObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -549,30 +548,30 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName ) return false; } -uno::Sequence<rtl::OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException) { - typedef boost::unordered_set<rtl::OUString, rtl::OUStringHash> StrSetType; + typedef boost::unordered_set<OUString, OUStringHash> StrSetType; SolarMutexGuard aGuard; // Name ist der Dateiname if (!pDocShell) - return uno::Sequence<rtl::OUString>(); + return uno::Sequence<OUString>(); StrSetType aNames; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); sal_Int32 nLinkCount = getCount(); - uno::Sequence<rtl::OUString> aSeq(nLinkCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nLinkCount); + OUString* pAry = aSeq.getArray(); sal_uInt16 nPos = 0; for (SCTAB nTab = 0; nTab < nTabCount; ++nTab) { if (!pDoc->IsLinked(nTab)) continue; - rtl::OUString aLinkDoc = pDoc->GetLinkDoc(nTab); + OUString aLinkDoc = pDoc->GetLinkDoc(nTab); if (aNames.insert(aLinkDoc).second) pAry[nPos++] = aLinkDoc; } @@ -642,8 +641,8 @@ void ScAreaLinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XFileLink -void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUString* pNewFilter, - const rtl::OUString* pNewOptions, const rtl::OUString* pNewSource, +void ScAreaLinkObj::Modify_Impl( const OUString* pNewFile, const OUString* pNewFilter, + const OUString* pNewOptions, const OUString* pNewSource, const table::CellRangeAddress* pNewDest ) { ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); @@ -755,14 +754,14 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAreaLinkObj::getPropertySetIn } void SAL_CALL ScAreaLinkObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; String aNameString(aPropertyName); - rtl::OUString aValStr; + OUString aValStr; if ( aNameString.EqualsAscii( SC_UNONAME_LINKURL ) ) { if ( aValue >>= aValStr ) @@ -792,7 +791,7 @@ void SAL_CALL ScAreaLinkObj::setPropertyValue( } } -uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -816,49 +815,49 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAreaLinkObj ) // internal: -rtl::OUString ScAreaLinkObj::getFileName(void) const +OUString ScAreaLinkObj::getFileName(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetFile(); return aRet; } -void ScAreaLinkObj::setFileName(const rtl::OUString& rNewName) +void ScAreaLinkObj::setFileName(const OUString& rNewName) { SolarMutexGuard aGuard; Modify_Impl( &rNewName, NULL, NULL, NULL, NULL ); } -rtl::OUString ScAreaLinkObj::getFilter(void) const +OUString ScAreaLinkObj::getFilter(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetFilter(); return aRet; } -void ScAreaLinkObj::setFilter(const rtl::OUString& Filter) +void ScAreaLinkObj::setFilter(const OUString& Filter) { SolarMutexGuard aGuard; Modify_Impl( NULL, &Filter, NULL, NULL, NULL ); } -rtl::OUString ScAreaLinkObj::getFilterOptions(void) const +OUString ScAreaLinkObj::getFilterOptions(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetOptions(); return aRet; } -void ScAreaLinkObj::setFilterOptions(const rtl::OUString& FilterOptions) +void ScAreaLinkObj::setFilterOptions(const OUString& FilterOptions) { SolarMutexGuard aGuard; Modify_Impl( NULL, NULL, &FilterOptions, NULL, NULL ); @@ -882,17 +881,17 @@ void ScAreaLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay) // XAreaLink -rtl::OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException) +OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetSource(); return aRet; } -void SAL_CALL ScAreaLinkObj::setSourceArea( const rtl::OUString& aSourceArea ) +void SAL_CALL ScAreaLinkObj::setSourceArea( const OUString& aSourceArea ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -952,10 +951,10 @@ ScAreaLinkObj* ScAreaLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) } void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestPos, - const rtl::OUString& aFileName, - const rtl::OUString& aSourceArea, - const rtl::OUString& aFilter, - const rtl::OUString& aFilterOptions ) + const OUString& aFileName, + const OUString& aSourceArea, + const OUString& aFilter, + const OUString& aFilterOptions ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -993,7 +992,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); } // XIndexAccess @@ -1092,13 +1091,13 @@ static String lcl_BuildDDEName( const String& rAppl, const String& rTopic, const return aRet; } -rtl::OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return lcl_BuildDDEName( aAppl, aTopic, aItem ); } -void SAL_CALL ScDDELinkObj::setName( const rtl::OUString& /* aName */ ) throw(uno::RuntimeException) +void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException) { // name can't be changed (formulas wouldn't find the link) throw uno::RuntimeException(); @@ -1106,7 +1105,7 @@ void SAL_CALL ScDDELinkObj::setName( const rtl::OUString& /* aName */ ) throw(un // XDDELink -rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException) { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1114,7 +1113,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeExceptio return aAppl; } -rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1122,7 +1121,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) return aTopic; } -rtl::OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException) { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1209,7 +1208,7 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( ) if ( !bSuccess ) { - throw uno::RuntimeException( ::rtl::OUString( + throw uno::RuntimeException( OUString( "ScDDELinkObj::getResults: failed to get results!" ), uno::Reference< uno::XInterface >() ); } @@ -1241,7 +1240,7 @@ void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >& if ( !bSuccess ) { - throw uno::RuntimeException( ::rtl::OUString( + throw uno::RuntimeException( OUString( "ScDDELinkObj::setResults: failed to set results!" ), uno::Reference< uno::XInterface >() ); } @@ -1286,7 +1285,7 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) { if (pDocShell) { - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; if ( nIndex <= USHRT_MAX && pDocShell->GetDocument()->GetDdeLinkData( (sal_uInt16)nIndex, aAppl, aTopic, aItem ) ) return new ScDDELinkObj( pDocShell, aAppl, aTopic, aItem ); @@ -1294,12 +1293,12 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) return NULL; } -ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const OUString& aName) { if (pDocShell) { String aNamStr(aName); - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; ScDocument* pDoc = pDocShell->GetDocument(); sal_uInt16 nCount = pDoc->GetDdeLinkCount(); @@ -1319,7 +1318,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DDELinksEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DDELinksEnumeration")); } // XIndexAccess @@ -1357,7 +1356,7 @@ sal_Bool SAL_CALL ScDDELinksObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScDDELinksObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScDDELinksObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1369,17 +1368,17 @@ uno::Any SAL_CALL ScDDELinksObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (pDocShell) { - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; ScDocument* pDoc = pDocShell->GetDocument(); sal_uInt16 nCount = pDoc->GetDdeLinkCount(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (sal_uInt16 i=0; i<nCount; i++) { @@ -1388,17 +1387,17 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno } return aSeq; } - return uno::Sequence<rtl::OUString>(); + return uno::Sequence<OUString>(); } -sal_Bool SAL_CALL ScDDELinksObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (pDocShell) { String aNamStr(aName); - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; ScDocument* pDoc = pDocShell->GetDocument(); sal_uInt16 nCount = pDoc->GetDdeLinkCount(); @@ -1415,8 +1414,8 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const rtl::OUString& aName ) // XDDELinks uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( - const ::rtl::OUString& aApplication, const ::rtl::OUString& aTopic, - const ::rtl::OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) + const OUString& aApplication, const OUString& aTopic, + const OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1453,7 +1452,7 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( if ( pDoc->CreateDdeLink( aApplication, aTopic, aItem, nMod, ScMatrixRef() ) ) { - const ::rtl::OUString aName( lcl_BuildDDEName( aApplication, aTopic, aItem ) ); + const OUString aName( lcl_BuildDDEName( aApplication, aTopic, aItem ) ); xLink.set( GetObjectByName_Impl( aName ) ); } } @@ -1461,7 +1460,7 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( if ( !xLink.is() ) { - throw uno::RuntimeException( ::rtl::OUString( + throw uno::RuntimeException( OUString( "ScDDELinksObj::addDDELink: cannot add DDE link!" ), uno::Reference< uno::XInterface >() ); } @@ -1597,7 +1596,7 @@ Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetC return aSheetCache; } -Any SAL_CALL ScExternalDocLinkObj::getByName(const::rtl::OUString &aName) +Any SAL_CALL ScExternalDocLinkObj::getByName(const OUString &aName) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { SolarMutexGuard aGuard; @@ -1729,7 +1728,7 @@ Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink( return aDocLink; } -Any SAL_CALL ScExternalDocLinksObj::getByName(const::rtl::OUString &aName) +Any SAL_CALL ScExternalDocLinksObj::getByName(const OUString &aName) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index f7b05a8f4bf0..f5f6719b1123 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -24,7 +24,6 @@ using namespace com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //------------------------------------------------------------------------ @@ -42,7 +41,7 @@ uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::A } sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp, - const rtl::OUString& rName, sal_Bool bDefault ) + const OUString& rName, sal_Bool bDefault ) { sal_Bool bRet = bDefault; if ( xProp.is() ) @@ -67,7 +66,7 @@ sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPrope } sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XPropertySet>& xProp, - const rtl::OUString& rName, long nDefault ) + const OUString& rName, long nDefault ) { sal_Int32 nRet = nDefault; if ( xProp.is() ) @@ -86,7 +85,7 @@ sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XProp } sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XPropertySet>& xProp, - const rtl::OUString& rName, long nDefault ) + const OUString& rName, long nDefault ) { sal_Int32 nRet = nDefault; if ( xProp.is() ) @@ -187,7 +186,7 @@ void ScUnoHelpFunctions::SetOptionalPropertyValue( //------------------------------------------------------------------------ ScIndexEnumeration::ScIndexEnumeration(const uno::Reference<container::XIndexAccess>& rInd, - const rtl::OUString& rServiceName) : + const OUString& rServiceName) : xIndex( rInd ), sServiceName(rServiceName), nPos( 0 ) @@ -222,24 +221,24 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme return aReturn; } -::rtl::OUString SAL_CALL ScIndexEnumeration::getImplementationName() +OUString SAL_CALL ScIndexEnumeration::getImplementationName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("ScIndexEnumeration"); + return OUString("ScIndexEnumeration"); } -sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { return sServiceName == ServiceName; } -::com::sun::star::uno::Sequence< ::rtl::OUString > +::com::sun::star::uno::Sequence< OUString > SAL_CALL ScIndexEnumeration::getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); - ::rtl::OUString* pArray = aRet.getArray(); + ::com::sun::star::uno::Sequence< OUString > aRet(1); + OUString* pArray = aRet.getArray(); pArray[0] = sServiceName; return aRet; } diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 3539c7e30314..511c4677b515 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -52,7 +52,7 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() static SfxItemPropertyMapEntry aNamedRangeMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_TOKENINDEX), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ISSHAREDFMLA), 0, &getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} @@ -139,7 +139,7 @@ SCTAB ScNamedRangeObj::GetTab_Impl() return -2; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab; - rtl::OUString sName = mxSheet->getName(); + OUString sName = mxSheet->getName(); pDoc->GetTable(sName, nTab); return nTab; } @@ -212,13 +212,13 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* p } -rtl::OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aName; } -void SAL_CALL ScNamedRangeObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -232,7 +232,7 @@ void SAL_CALL ScNamedRangeObj::setName( const rtl::OUString& aNewName ) throw uno::RuntimeException(); // no other exceptions specified } -rtl::OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException) +OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aContent; @@ -243,7 +243,7 @@ rtl::OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException return aContent; } -void SAL_CALL ScNamedRangeObj::setContent( const rtl::OUString& aContent ) +void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -378,7 +378,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangeObj::getPropertySet } void SAL_CALL ScNamedRangeObj::setPropertyValue( - const rtl::OUString& rPropertyName, const uno::Any& aValue ) + const OUString& rPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -395,7 +395,7 @@ void SAL_CALL ScNamedRangeObj::setPropertyValue( } } -uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const rtl::OUString& rPropertyName ) +uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -407,7 +407,7 @@ uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const rtl::OUString& rPrope // ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_RANGENAME ); } else if ( rPropertyName == SC_UNO_LINKDISPNAME ) - aRet <<= rtl::OUString( aName ); + aRet <<= OUString( aName ); else if ( rPropertyName == SC_UNONAME_TOKENINDEX ) { // get index for use in formula tokens (read-only) @@ -427,24 +427,24 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangeObj ) // lang::XServiceInfo -rtl::OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScNamedRangeObj" ); + return OUString( "ScNamedRangeObj" ); } -sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ) || rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SCLINKTARGET_SERVICE ) ); } -uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - aRet[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ); - aRet[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ) ); + uno::Sequence<OUString> aRet(2); + aRet[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ); + aRet[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ) ); return aRet; } @@ -506,8 +506,8 @@ bool ScNamedRangesObj::IsModifyAndBroadcast() const // sheet::XNamedRanges -void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName, - const rtl::OUString& aContent, const table::CellAddress& aPosition, +void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName, + const OUString& aContent, const table::CellAddress& aPosition, sal_Int32 nUnoType ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -571,7 +571,7 @@ void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& pDocShell->GetDocFunc().CreateNames( aRange, nFlags, sal_True, GetTab_Impl() ); } -void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScNamedRangesObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -611,7 +611,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.NamedRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.NamedRangesEnumeration")); } // container::XIndexAccess @@ -667,7 +667,7 @@ Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangesObj::getPropertySetInfo } void SAL_CALL ScNamedRangesObj::setPropertyValue( - const rtl::OUString& rPropertyName, const uno::Any& aValue ) + const OUString& rPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -678,7 +678,7 @@ void SAL_CALL ScNamedRangesObj::setPropertyValue( } } -Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyName ) +Any SAL_CALL ScNamedRangesObj::getPropertyValue( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -693,7 +693,7 @@ Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyN SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangesObj ) -uno::Any SAL_CALL ScNamedRangesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScNamedRangesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -705,7 +705,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScNamedRangesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -715,8 +715,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames() if (pNames) { long nVisCount = getCount(); // Namen mit lcl_UserVisibleName - uno::Sequence<rtl::OUString> aSeq(nVisCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nVisCount); + OUString* pAry = aSeq.getArray(); sal_uInt16 nVisPos = 0; ScRangeName::const_iterator itr = pNames->begin(), itrEnd = pNames->end(); for (; itr != itrEnd; ++itr) @@ -727,10 +727,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames() return aSeq; } } - return uno::Sequence<rtl::OUString>(0); + return uno::Sequence<OUString>(0); } -sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -864,7 +864,7 @@ ScNamedRangeObj* ScGlobalNamedRangesObj::GetObjectByIndex_Impl(sal_uInt16 nIndex return NULL; } -ScNamedRangeObj* ScGlobalNamedRangesObj::GetObjectByName_Impl(const ::rtl::OUString& aName) +ScNamedRangeObj* ScGlobalNamedRangesObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell && hasByName(aName) ) return new ScNamedRangeObj(this, pDocShell, String(aName)); @@ -895,7 +895,7 @@ ScLocalNamedRangesObj::~ScLocalNamedRangesObj() } -ScNamedRangeObj* ScLocalNamedRangesObj::GetObjectByName_Impl(const ::rtl::OUString& aName) +ScNamedRangeObj* ScLocalNamedRangesObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell && hasByName( aName ) ) return new ScNamedRangeObj( this, pDocShell, String(aName), mxSheet); @@ -908,7 +908,7 @@ ScNamedRangeObj* ScLocalNamedRangesObj::GetObjectByIndex_Impl( sal_uInt16 nIndex if (!pDocShell) return NULL; - rtl::OUString aName = mxSheet->getName(); + OUString aName = mxSheet->getName(); ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab; pDoc->GetTable( aName, nTab ); @@ -1186,7 +1186,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.LabelRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.LabelRangesEnumeration")); } // container::XIndexAccess diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index b9415092ee9e..ad1787b055b5 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -138,20 +138,20 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursorByRa return GetUnoText().createTextCursorByRange(aTextPosition); } -rtl::OUString SAL_CALL ScAnnotationObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScAnnotationObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return GetUnoText().getString(); } -void SAL_CALL ScAnnotationObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; GetUnoText().setString(aText); } void SAL_CALL ScAnnotationObj::insertString( const uno::Reference<text::XTextRange>& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -196,18 +196,18 @@ table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeExc return aAdr; } -rtl::OUString SAL_CALL ScAnnotationObj::getAuthor() throw(uno::RuntimeException) +OUString SAL_CALL ScAnnotationObj::getAuthor() throw(uno::RuntimeException) { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); - return pNote ? pNote->GetAuthor() : rtl::OUString(); + return pNote ? pNote->GetAuthor() : OUString(); } -rtl::OUString SAL_CALL ScAnnotationObj::getDate() throw(uno::RuntimeException) +OUString SAL_CALL ScAnnotationObj::getDate() throw(uno::RuntimeException) { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); - return pNote ? pNote->GetDate() : rtl::OUString(); + return pNote ? pNote->GetDate() : OUString(); } sal_Bool SAL_CALL ScAnnotationObj::getIsVisible() throw(uno::RuntimeException) diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index 2a5fefe1b956..8efb9e3c395a 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -52,7 +52,7 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) { //! use map (with new identifiers) @@ -125,7 +125,7 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, uno::Any ScDocOptionsHelper::getPropertyValue( const ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, - const rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) { uno::Any aRet; const SfxItemPropertySimpleEntry* pEntry = rPropMap.getByName( aPropertyName ); @@ -192,7 +192,7 @@ ScDocOptionsObj::~ScDocOptionsObj() } void SAL_CALL ScDocOptionsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -205,7 +205,7 @@ void SAL_CALL ScDocOptionsObj::setPropertyValue( ScModelObj::setPropertyValue( aPropertyName, aValue ); } -uno::Any SAL_CALL ScDocOptionsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocOptionsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index dc4364a08bc2..390d4fb749dd 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -42,25 +42,25 @@ uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) cons return xShape; } -::rtl::OUString SAL_CALL ScPageObj::getImplementationName() +OUString SAL_CALL ScPageObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScPageObj"); + return OUString("ScPageObj"); } -sal_Bool SAL_CALL ScPageObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScPageObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); return aServiceStr.EqualsAscii( "com.sun.star.sheet.SpreadsheetDrawPage" ); } -uno::Sequence<rtl::OUString> SAL_CALL ScPageObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScPageObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString("com.sun.star.sheet.SpreadsheetDrawPage"); + uno::Sequence<OUString> aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString("com.sun.star.sheet.SpreadsheetDrawPage"); return aRet; } diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 20cd22ce8b4a..e40be82dda5e 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -71,7 +71,6 @@ using namespace ::com::sun::star::task; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; ScFilterDetect::ScFilterDetect( const uno::Reference<uno::XComponentContext>& /*xContext*/ ) { @@ -155,11 +154,11 @@ static const SfxFilter* lcl_DetectExcelXML( SvStream& rStream, SfxFilterMatcher& { // Be consistent with XMLFilterDetect service: Check for presence of "Workbook" in XML file. - rtl::OString aTryStr( "Workbook" ); - rtl::OString aFileString(reinterpret_cast<const sal_Char*>(aBuffer), nBytesRead); + OString aTryStr( "Workbook" ); + OString aFileString(reinterpret_cast<const sal_Char*>(aBuffer), nBytesRead); if (aFileString.indexOf(aTryStr) >= 0) - pFound = rMatcher.GetFilter4FilterName( rtl::OUString(pFilterExcelXML) ); + pFound = rMatcher.GetFilter4FilterName( OUString(pFilterExcelXML) ); } return pFound; @@ -216,18 +215,18 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) return ( 0x0d == nEndFlag ); } -::rtl::OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& lDescriptor ) +OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& lDescriptor ) throw( uno::RuntimeException ) { uno::Reference< XInputStream > xStream; uno::Reference< XContent > xContent; uno::Reference< XInteractionHandler > xInteraction; String aURL; - ::rtl::OUString sTemp; + OUString sTemp; String aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection) String aPreselectedFilterName; // a name describing the filter to use (from MediaDescriptor, usually from UI action) - ::rtl::OUString aDocumentTitle; // interesting only if set in this method + OUString aDocumentTitle; // interesting only if set in this method // opening as template is done when a parameter tells to do so and a template filter can be detected // (otherwise no valid filter would be found) or if the detected filter is a template filter and @@ -309,11 +308,11 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) bWasReadOnly = pItem && pItem->GetValue(); const SfxFilter* pFilter = 0; - String aPrefix = rtl::OUString( "private:factory/" ); + String aPrefix = OUString( "private:factory/" ); if( aURL.Match( aPrefix ) == aPrefix.Len() ) { String aPattern( aPrefix ); - aPattern += rtl::OUString("scalc"); + aPattern += OUString("scalc"); if ( aURL.Match( aPattern ) >= aPattern.Len() ) pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL ); } @@ -653,14 +652,14 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // get file header rStr.Seek( 0 ); const sal_Size nTrySize = 80; - rtl::OString aHeader = read_uInt8s_ToOString(rStr, nTrySize); + OString aHeader = read_uInt8s_ToOString(rStr, nTrySize); bool bMaybeHtml = HTMLParser::IsHTMLFormat( aHeader.getStr()); if ( aHeader.copy(0, 5).equalsL("{\\rtf", 5) ) { // test for RTF - pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterRtf) ); + pFilter = aMatcher.GetFilter4FilterName( OUString(pFilterRtf) ); } else if ( bIsXLS && (bMaybeText && !bMaybeHtml) ) { @@ -669,7 +668,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // The configured detection for Excel 2003 XML is still in XMLFilterDetect. pFilter = lcl_DetectExcelXML( rStr, aMatcher ); if (!pFilter) - pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterAscii) ); + pFilter = aMatcher.GetFilter4FilterName( OUString(pFilterAscii) ); bFakeXLS = true; } else if ( pPreselectedFilter->GetName().EqualsAscii(pFilterDBase) && lcl_MayBeDBase( rStr ) ) @@ -693,7 +692,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) } else { - pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterHtmlWeb) ); + pFilter = aMatcher.GetFilter4FilterName( OUString(pFilterHtmlWeb) ); if ( bIsXLS ) bFakeXLS = true; } @@ -788,11 +787,11 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) { lDescriptor.realloc( nPropertyCount + 1 ); lDescriptor[nPropertyCount].Name = "FilterName"; - lDescriptor[nPropertyCount].Value <<= rtl::OUString(pFilter->GetName()); + lDescriptor[nPropertyCount].Value <<= OUString(pFilter->GetName()); nPropertyCount++; } else - lDescriptor[nIndexOfFilterName].Value <<= rtl::OUString(pFilter->GetName()); + lDescriptor[nIndexOfFilterName].Value <<= OUString(pFilter->GetName()); } if ( pFilter ) diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index 63702f88eb8f..d36cdf6493ae 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -45,8 +45,8 @@ public: /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); /* Helper for XServiceInfo */ static com::sun::star::uno::Sequence<OUString> impl_getStaticSupportedServiceNames(); @@ -60,7 +60,7 @@ public: //---------------------------------------------------------------------------------- // XExtendedFilterDetect //---------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) throw (com::sun::star::uno::RuntimeException); }; diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index a6662f8bac22..e36f967fd447 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -86,7 +86,7 @@ public: { ScDocument* pDoc = mpDocShell->GetDocument(); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString(""), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString(""), uno::Reference< uno::XInterface >() ); uno::Sequence< uno::Any > aArgs(2); // access the application object ( parent for workbook ) @@ -95,7 +95,7 @@ public: maWorkbook <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs ); } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) { SolarMutexGuard aGuard; maCachedObject = uno::Any(); // clear cached object @@ -110,7 +110,7 @@ public: maCachedObject = maWorkbook; else { - rtl::OUString sCodeName; + OUString sCodeName; SCTAB nCount = pDoc->GetTableCount(); for( SCTAB i = 0; i < nCount; i++ ) { @@ -119,7 +119,7 @@ public: // from the code name if( String(sCodeName).EqualsIgnoreCaseAscii( sName ) ) { - rtl::OUString sSheetName; + OUString sSheetName; if( pDoc->GetName( i, sSheetName ) ) { uno::Reference< frame::XModel > xModel( mpDocShell->GetModel() ); @@ -130,7 +130,7 @@ public: uno::Sequence< uno::Any > aArgs(3); aArgs[0] = maWorkbook; aArgs[1] = uno::Any( xModel ); - aArgs[2] = uno::Any( rtl::OUString( sSheetName ) ); + aArgs[2] = uno::Any( OUString( sSheetName ) ); // use the convience function maCachedObject <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Worksheet", aArgs ); break; @@ -141,25 +141,25 @@ public: return maCachedObject.hasValue(); } - ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::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) { SolarMutexGuard aGuard; OSL_TRACE("ScVbaObjectForCodeNameProvider::getByName( %s )", - rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() ); if ( !hasByName( aName ) ) throw ::com::sun::star::container::NoSuchElementException(); return maCachedObject; } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; ScDocument* pDoc = mpDocShell->GetDocument(); if ( !pDoc ) throw uno::RuntimeException(); SCTAB nCount = pDoc->GetTableCount(); - uno::Sequence< rtl::OUString > aNames( nCount + 1 ); + uno::Sequence< OUString > aNames( nCount + 1 ); SCTAB index = 0; - rtl::OUString sCodeName; + OUString sCodeName; for( ; index < nCount; ++index ) { pDoc->GetCodeName( index, sCodeName ); @@ -180,10 +180,10 @@ class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNam public: ScVbaCodeNameProvider( ScDocShell& rDocShell ) : mrDocShell(rDocShell) {} // XCodeNameQuery - rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) + OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; - rtl::OUString sCodeName; + OUString sCodeName; // need to find the page ( and index ) for this control uno::Reference< drawing::XDrawPagesSupplier > xSupplier( mrDocShell.GetModel(), uno::UNO_QUERY_THROW ); @@ -206,7 +206,7 @@ public: bMatched = ( xControl == xIf ); if ( bMatched ) { - rtl::OUString sName; + OUString sName; mrDocShell.GetDocument()->GetCodeName( static_cast<SCTAB>( index ), sName ); sCodeName = sName; } @@ -220,7 +220,7 @@ public: return sCodeName; } - rtl::OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer ) + OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer ) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -237,14 +237,14 @@ public: uno::Reference<container::XIndexAccess> xFormControls(xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW); if (xFormControls == xContainer) { - rtl::OUString aName; + OUString aName; if (mrDocShell.GetDocument()->GetCodeName(static_cast<SCTAB>(i), aName)) return aName; } } catch( uno::Exception& ) {} } - return rtl::OUString(); + return OUString(); } }; @@ -632,7 +632,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( { uno::Sequence< uno::Any > aArgs(1); aArgs[ 0 ] <<= pDocShell->GetModel(); - xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( "ooo.vba.excel.Globals" ), aArgs ); + xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( OUString( "ooo.vba.excel.Globals" ), aArgs ); pDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", uno::Any( xRet ) ); BasicManager* pAppMgr = SFX_APP()->GetBasicManager(); if ( pAppMgr ) @@ -651,14 +651,14 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( return xRet; } -uno::Sequence<rtl::OUString> ScServiceProvider::GetAllServiceNames() +uno::Sequence<OUString> ScServiceProvider::GetAllServiceNames() { const sal_uInt16 nEntries = sizeof(aProvNamesId) / sizeof(aProvNamesId[0]); - uno::Sequence<rtl::OUString> aRet(nEntries); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence<OUString> aRet(nEntries); + OUString* pArray = aRet.getArray(); for (sal_uInt16 i = 0; i < nEntries; i++) { - pArray[i] = rtl::OUString::createFromAscii( aProvNamesId[i].pName ); + pArray[i] = OUString::createFromAscii( aProvNamesId[i].pName ); } return aRet; } diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 55fcc99bdb8e..c5ec413e1b57 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -61,8 +61,8 @@ static const SfxItemPropertyMapEntry* lcl_GetShapeMap() {MAP_CHAR_LEN(SC_UNONAME_VERTPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_MOVEPROTECT), 0, &getCppuType((sal_Bool*)0), 0, 0 }, // #i66550 HLINK_FOR_SHAPES - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; @@ -271,14 +271,14 @@ static sal_Bool lcl_GetPageNum( SdrPage* pPage, SdrModel& rModel, SCTAB& rNum ) static sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, awt::Point& rCaptionPoint ) { sal_Bool bReturn = false; - rtl::OUString sType(xShape->getShapeType()); + OUString sType(xShape->getShapeType()); sal_Bool bCaptionShape( sType == "com.sun.star.drawing.CaptionShape" ); if (bCaptionShape) { uno::Reference < beans::XPropertySet > xShapeProp (xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - xShapeProp->getPropertyValue( rtl::OUString( "CaptionPoint" ) ) >>= rCaptionPoint; + xShapeProp->getPropertyValue( OUString( "CaptionPoint" ) ) >>= rCaptionPoint; bReturn = sal_True; } } @@ -332,7 +332,7 @@ static awt::Point lcl_GetRelativePos( uno::Reference< drawing::XShape >& xShape, } void SAL_CALL ScShapeObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -446,7 +446,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( } } else - throw lang::IllegalArgumentException(rtl::OUString("only XCell or XSpreadsheet objects allowed"), static_cast<cppu::OWeakObject*>(this), 0); + throw lang::IllegalArgumentException(OUString("only XCell or XSpreadsheet objects allowed"), static_cast<cppu::OWeakObject*>(this), 0); } else if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) ) { @@ -642,7 +642,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) || aNameString.EqualsAscii( SC_UNONAME_URL) ) { - rtl::OUString sHlink; + OUString sHlink; ScMacroInfo* pInfo = ScShapeObj_getShapeHyperMacroInfo(this, true); if ( ( aValue >>= sHlink ) && pInfo ) pInfo->SetHlink( sHlink ); @@ -664,7 +664,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( } } -uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -827,7 +827,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) || aNameString.EqualsAscii( SC_UNONAME_URL ) ) { - rtl::OUString sHlink; + OUString sHlink; if ( ScMacroInfo* pInfo = ScShapeObj_getShapeHyperMacroInfo(this) ) sHlink = pInfo->GetHlink(); aAny <<= sHlink; @@ -849,7 +849,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa return aAny; } -void SAL_CALL ScShapeObj::addPropertyChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XPropertyChangeListener>& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -873,7 +873,7 @@ void SAL_CALL ScShapeObj::addPropertyChangeListener( const rtl::OUString& aPrope } } -void SAL_CALL ScShapeObj::removePropertyChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XPropertyChangeListener>& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -885,7 +885,7 @@ void SAL_CALL ScShapeObj::removePropertyChangeListener( const rtl::OUString& aPr pShapePropertySet->removePropertyChangeListener( aPropertyName, aListener ); } -void SAL_CALL ScShapeObj::addVetoableChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::addVetoableChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XVetoableChangeListener>& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -897,7 +897,7 @@ void SAL_CALL ScShapeObj::addVetoableChangeListener( const rtl::OUString& aPrope pShapePropertySet->addVetoableChangeListener( aPropertyName, aListener ); } -void SAL_CALL ScShapeObj::removeVetoableChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::removeVetoableChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XVetoableChangeListener>& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -911,7 +911,7 @@ void SAL_CALL ScShapeObj::removeVetoableChangeListener( const rtl::OUString& aPr // XPropertyState -beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const rtl::OUString& aPropertyName ) +beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -945,14 +945,14 @@ beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const rtl::OUString& } uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates( - const uno::Sequence<rtl::OUString>& aPropertyNames ) + const uno::Sequence<OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; // simple loop to get own and aggregated states - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++) @@ -960,7 +960,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates( return aRet; } -void SAL_CALL ScShapeObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -991,7 +991,7 @@ void SAL_CALL ScShapeObj::setPropertyToDefault( const rtl::OUString& aPropertyNa } } -uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1102,7 +1102,7 @@ void SAL_CALL ScShapeObj::removeEventListener( static void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet& rSource, const sal_Char* pName ) { - rtl::OUString aNameStr(rtl::OUString::createFromAscii(pName)); + OUString aNameStr(OUString::createFromAscii(pName)); try { rDest.setPropertyValue( aNameStr, rSource.getPropertyValue( aNameStr ) ); @@ -1200,7 +1200,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange( } void SAL_CALL ScShapeObj::insertString( const uno::Reference<text::XTextRange>& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1260,7 +1260,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::Runtim // return uno::Reference<text::XTextRange>(); } -rtl::OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1270,10 +1270,10 @@ rtl::OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException) else throw uno::RuntimeException(); -// return rtl::OUString(); +// return OUString(); } -void SAL_CALL ScShapeObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScShapeObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1360,7 +1360,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScShapeObj::getImplementationId() if( xAggShape.is() ) { - const rtl::OUString aShapeType( xAggShape->getShapeType() ); + const OUString aShapeType( xAggShape->getShapeType() ); // did we already compute an implementation id for the agregated shape type? ScShapeImplementationIdMap::iterator aIter( aImplementationIdMap.find(aShapeType ) ); if( aIter == aImplementationIdMap.end() ) @@ -1403,9 +1403,9 @@ SdrObject* ScShapeObj::GetSdrObject() const throw() return NULL; } -#define SC_EVENTACC_ONCLICK ::rtl::OUString( "OnClick" ) -#define SC_EVENTACC_SCRIPT ::rtl::OUString( "Script" ) -#define SC_EVENTACC_EVENTTYPE ::rtl::OUString( "EventType" ) +#define SC_EVENTACC_ONCLICK OUString( "OnClick" ) +#define SC_EVENTACC_SCRIPT OUString( "Script" ) +#define SC_EVENTACC_EVENTTYPE OUString( "EventType" ) typedef ::cppu::WeakImplHelper1< container::XNameReplace > ShapeUnoEventAcess_BASE; class ShapeUnoEventAccessImpl : public ShapeUnoEventAcess_BASE @@ -1424,7 +1424,7 @@ public: } // XNameReplace - virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -1443,7 +1443,7 @@ public: } if ( isEventType && (pProperties->Name == SC_EVENTACC_SCRIPT) ) { - rtl::OUString sValue; + OUString sValue; if ( pProperties->Value >>= sValue ) { ScMacroInfo* pInfo = getInfo( sal_True ); @@ -1460,7 +1460,7 @@ public: } // XNameAccess - virtual uno::Any SAL_CALL getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { uno::Sequence< beans::PropertyValue > aProperties; ScMacroInfo* pInfo = getInfo(); @@ -1484,14 +1484,14 @@ public: return uno::Any( aProperties ); } - virtual uno::Sequence< rtl::OUString > SAL_CALL getElementNames() throw(uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw(uno::RuntimeException) { - uno::Sequence< rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); aSeq[ 0 ] = SC_EVENTACC_ONCLICK; return aSeq; } - virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException) { return aName == SC_EVENTACC_ONCLICK; } @@ -1515,15 +1515,15 @@ ScShapeObj::getEvents( ) throw(uno::RuntimeException) return new ShapeUnoEventAccessImpl( this ); } -::rtl::OUString SAL_CALL ScShapeObj::getImplementationName( ) throw (uno::RuntimeException) +OUString SAL_CALL ScShapeObj::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.sc.ScShapeObj" ); + return OUString( "com.sun.star.comp.sc.ScShapeObj" ); } -::sal_Bool SAL_CALL ScShapeObj::supportsService( const ::rtl::OUString& _ServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL ScShapeObj::supportsService( const OUString& _ServiceName ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pSupported = aSupported.getConstArray(); + uno::Sequence< OUString > aSupported( getSupportedServiceNames() ); + for ( const OUString* pSupported = aSupported.getConstArray(); pSupported != aSupported.getConstArray() + aSupported.getLength(); ++pSupported ) @@ -1532,23 +1532,23 @@ ScShapeObj::getEvents( ) throw(uno::RuntimeException) return false; } -uno::Sequence< ::rtl::OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) throw (uno::RuntimeException) { uno::Reference<lang::XServiceInfo> xSI; if ( mxShapeAgg.is() ) mxShapeAgg->queryAggregation( lang::XServiceInfo::static_type() ) >>= xSI; - uno::Sequence< ::rtl::OUString > aSupported; + uno::Sequence< OUString > aSupported; if ( xSI.is() ) aSupported = xSI->getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.Shape" ); + aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.sheet.Shape" ); if( bIsNoteCaption ) { aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.CellAnnotationShape" ); + aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.sheet.CellAnnotationShape" ); } return aSupported; diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 1ead24df1f09..0d0228b5e96d 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -99,13 +99,13 @@ ScCellSearchObj::~ScCellSearchObj() // XSearchDescriptor -rtl::OUString SAL_CALL ScCellSearchObj::getSearchString() throw(uno::RuntimeException) +OUString SAL_CALL ScCellSearchObj::getSearchString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return pSearchItem->GetSearchString(); } -void SAL_CALL ScCellSearchObj::setSearchString( const rtl::OUString& aString ) +void SAL_CALL ScCellSearchObj::setSearchString( const OUString& aString ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -114,13 +114,13 @@ void SAL_CALL ScCellSearchObj::setSearchString( const rtl::OUString& aString ) // XReplaceDescriptor -rtl::OUString SAL_CALL ScCellSearchObj::getReplaceString() throw(uno::RuntimeException) +OUString SAL_CALL ScCellSearchObj::getReplaceString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return pSearchItem->GetReplaceString(); } -void SAL_CALL ScCellSearchObj::setReplaceString( const rtl::OUString& aReplaceString ) +void SAL_CALL ScCellSearchObj::setReplaceString( const OUString& aReplaceString ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -139,7 +139,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellSearchObj::getPropertySet } void SAL_CALL ScCellSearchObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -162,7 +162,7 @@ void SAL_CALL ScCellSearchObj::setPropertyValue( else if (aString.EqualsAscii( SC_UNO_SRCHFILTERED )) pSearchItem->SetSearchFiltered( ScUnoHelpFunctions::GetBoolFromAny(aValue) ); } -uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -191,12 +191,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScCellSearchObj ) // XServiceInfo -rtl::OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellSearchObj" ); + return OUString( "ScCellSearchObj" ); } -sal_Bool SAL_CALL ScCellSearchObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellSearchObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -204,13 +204,13 @@ sal_Bool SAL_CALL ScCellSearchObj::supportsService( const rtl::OUString& rServic aServiceStr.EqualsAscii( SCREPLACEDESCRIPTOR_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSEARCHDESCRIPTOR_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCREPLACEDESCRIPTOR_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSEARCHDESCRIPTOR_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCREPLACEDESCRIPTOR_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index a5d5cb5c7c7e..9c7cc587d386 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -88,15 +88,15 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -123,7 +123,7 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &::getCppuType((const table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, @@ -159,7 +159,7 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_HIDDEN), ATTR_HIDDEN, &getCppuType((sal_Bool*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellStyleSet_Impl( aCellStyleMap_Impl ); @@ -173,9 +173,9 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() static SfxItemPropertyMapEntry aPageStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICURL), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_URL }, {MAP_CHAR_LEN(SC_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS }, @@ -184,13 +184,13 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTMARGIN), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERHOR), ATTR_PAGE_HORCENTER,&::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERVER), ATTR_PAGE_VERCENTER,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ATTR_PAGE_FIRSTPAGENO,&::getCppuType((const sal_Int16*)0), 0, 0 }, // {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), SC_WID_UNO_FOOTERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), SC_WID_UNO_FOOTERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, @@ -215,9 +215,9 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, // {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), SC_WID_UNO_HEADERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), SC_WID_UNO_HEADERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, @@ -261,7 +261,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTHEADER), ATTR_PAGE_HEADERS, &::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTOBJS), ATTR_PAGE_OBJECTS, &::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTZERO), ATTR_PAGE_NULLVALS, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ATTR_PAGE_PAPERBIN, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ATTR_PAGE_PAPERBIN, &::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTMARGIN), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS }, @@ -294,9 +294,9 @@ static const SfxItemPropertyMap* lcl_GetHeaderStyleMap() static SfxItemPropertyMapEntry aHeaderStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_URL }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS }, @@ -333,9 +333,9 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() static SfxItemPropertyMapEntry aFooterStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_URL }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN | CONVERT_TWIPS }, @@ -424,19 +424,19 @@ static const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) if ( !bCellMapFilled ) { aCellMap[0].aDispName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); - aCellMap[0].aProgName = rtl::OUString( SC_STYLE_PROG_STANDARD ); + aCellMap[0].aProgName = OUString( SC_STYLE_PROG_STANDARD ); aCellMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_RESULT ); - aCellMap[1].aProgName = rtl::OUString( SC_STYLE_PROG_RESULT ); + aCellMap[1].aProgName = OUString( SC_STYLE_PROG_RESULT ); aCellMap[2].aDispName = ScGlobal::GetRscString( STR_STYLENAME_RESULT1 ); - aCellMap[2].aProgName = rtl::OUString( SC_STYLE_PROG_RESULT1 ); + aCellMap[2].aProgName = OUString( SC_STYLE_PROG_RESULT1 ); aCellMap[3].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE ); - aCellMap[3].aProgName = rtl::OUString( SC_STYLE_PROG_HEADLINE ); + aCellMap[3].aProgName = OUString( SC_STYLE_PROG_HEADLINE ); aCellMap[4].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE1 ); - aCellMap[4].aProgName = rtl::OUString( SC_STYLE_PROG_HEADLINE1 ); + aCellMap[4].aProgName = OUString( SC_STYLE_PROG_HEADLINE1 ); // last entry remains empty @@ -451,10 +451,10 @@ static const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) if ( !bPageMapFilled ) { aPageMap[0].aDispName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); - aPageMap[0].aProgName = rtl::OUString( SC_STYLE_PROG_STANDARD ); + aPageMap[0].aProgName = OUString( SC_STYLE_PROG_STANDARD ); aPageMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_REPORT ); - aPageMap[1].aProgName = rtl::OUString( SC_STYLE_PROG_REPORT ); + aPageMap[1].aProgName = OUString( SC_STYLE_PROG_REPORT ); // last entry remains empty @@ -596,7 +596,7 @@ ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByIndex_Impl(sal_uInt32 nIndex) c return NULL; // ungueltiger Index } -ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByName_Impl(const OUString& aName) const { if ( pDocShell ) { @@ -644,7 +644,7 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException) // container::XNameAccess -uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -657,18 +657,18 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamiliesObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScStyleFamiliesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - uno::Sequence<rtl::OUString> aNames(SC_STYLE_FAMILY_COUNT); - rtl::OUString* pNames = aNames.getArray(); - pNames[0] = rtl::OUString(SC_FAMILYNAME_CELL ); - pNames[1] = rtl::OUString(SC_FAMILYNAME_PAGE ); + uno::Sequence<OUString> aNames(SC_STYLE_FAMILY_COUNT); + OUString* pNames = aNames.getArray(); + pNames[0] = OUString(SC_FAMILYNAME_CELL ); + pNames[1] = OUString(SC_FAMILYNAME_PAGE ); return aNames; } -sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -678,15 +678,15 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const rtl::OUString& aName ) // style::XStyleLoader -void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const rtl::OUString& aURL, +void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const OUString& aURL, const uno::Sequence<beans::PropertyValue>& aOptions ) throw(io::IOException, uno::RuntimeException) { //! use aOptions (like Writer) //! set flag to disable filter option dialogs when importing - rtl::OUString aFilter; // empty - detect - rtl::OUString aFiltOpt; + OUString aFilter; // empty - detect + OUString aFiltOpt; ScDocumentLoader aLoader( aURL, aFilter, aFiltOpt ); ScDocShell* pSource = aLoader.GetDocShell(); @@ -726,13 +726,13 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO uno::Sequence<beans::PropertyValue> aSequence(3); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString(SC_UNONAME_OVERWSTL ); + pArray[0].Name = OUString(SC_UNONAME_OVERWSTL ); ScUnoHelpFunctions::SetBoolInAny( pArray[0].Value, true ); - pArray[1].Name = rtl::OUString(SC_UNONAME_LOADCELL ); + pArray[1].Name = OUString(SC_UNONAME_LOADCELL ); ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, true ); - pArray[2].Name = rtl::OUString(SC_UNONAME_LOADPAGE ); + pArray[2].Name = OUString(SC_UNONAME_LOADPAGE ); ScUnoHelpFunctions::SetBoolInAny( pArray[2].Value, true ); return aSequence; @@ -786,7 +786,7 @@ ScStyleObj* ScStyleFamilyObj::GetObjectByIndex_Impl(sal_uInt32 nIndex) return NULL; } -ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell ) { @@ -800,7 +800,7 @@ ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const rtl::OUString& aName) return NULL; } -void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -846,7 +846,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const } } -void SAL_CALL ScStyleFamilyObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScStyleFamilyObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -856,7 +856,7 @@ void SAL_CALL ScStyleFamilyObj::replaceByName( const rtl::OUString& aName, const insertByName( aName, aElement ); } -void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -954,7 +954,7 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException) // container::XNameAccess -uno::Any SAL_CALL ScStyleFamilyObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScStyleFamilyObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -968,7 +968,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamilyObj::getElementNames() +uno::Sequence<OUString> SAL_CALL ScStyleFamilyObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -980,8 +980,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamilyObj::getElementNames() SfxStyleSheetIterator aIter( pStylePool, eFamily ); sal_uInt16 nCount = aIter.Count(); - uno::Sequence<rtl::OUString> aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence<OUString> aSeq(nCount); + OUString* pAry = aSeq.getArray(); SfxStyleSheetBase* pStyle = aIter.First(); sal_uInt16 nPos = 0; while (pStyle) @@ -994,10 +994,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamilyObj::getElementNames() } return aSeq; } - return uno::Sequence<rtl::OUString>(); + return uno::Sequence<OUString>(); } -sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1021,12 +1021,12 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScStyleFamilyObj::getProperty return uno::Reference< beans::XPropertySetInfo >(); } -void SAL_CALL ScStyleFamilyObj::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; @@ -1045,34 +1045,34 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPr } if ( nResId > 0 ) { - ::rtl::OUString sDisplayName( ScGlobal::GetRscString( static_cast< sal_uInt16 >( nResId ) ) ); + OUString sDisplayName( ScGlobal::GetRscString( static_cast< sal_uInt16 >( nResId ) ) ); aRet = uno::makeAny( sDisplayName ); } } else { - throw beans::UnknownPropertyException( ::rtl::OUString( "unknown property: " ) + sPropertyName, static_cast<OWeakObject *>(this) ); + throw beans::UnknownPropertyException( OUString( "unknown property: " ) + sPropertyName, static_cast<OWeakObject *>(this) ); } return aRet; } -void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } @@ -1185,16 +1185,16 @@ sal_Bool SAL_CALL ScStyleObj::isInUse() throw(uno::RuntimeException) return false; } -rtl::OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException) +OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetParent(), sal::static_int_cast<sal_uInt16>(eFamily) ); - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle ) +void SAL_CALL ScStyleObj::setParentStyle( const OUString& rParentStyle ) throw(container::NoSuchElementException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1241,16 +1241,16 @@ void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle ) // container::XNamed -rtl::OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetName(), sal::static_int_cast<sal_uInt16>(eFamily) ); - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScStyleObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1295,7 +1295,7 @@ uno::Reference<container::XIndexReplace> ScStyleObj::CreateEmptyNumberingRules() // beans::XPropertyState -const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const ::rtl::OUString& rPropName, +const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const OUString& rPropName, const SfxItemPropertySimpleEntry*& rpResultEntry ) { //! OUString as argument? @@ -1331,7 +1331,7 @@ const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const ::rtl::OUString& rProp return NULL; } -beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const rtl::OUString& aPropertyName ) +beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1372,14 +1372,14 @@ beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const rtl::OUString& } uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( - const uno::Sequence<rtl::OUString>& aPropertyNames ) + const uno::Sequence<OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { // duemmliche Default-Implementierung: alles einzeln per getPropertyState holen //! sollte optimiert werden! SolarMutexGuard aGuard; - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++) @@ -1387,7 +1387,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( return aRet; } -void SAL_CALL ScStyleObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1400,7 +1400,7 @@ void SAL_CALL ScStyleObj::setPropertyToDefault( const rtl::OUString& aPropertyNa SetOnePropertyValue( aPropertyName, pEntry, NULL ); } -uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1492,7 +1492,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aProperty // XMultiPropertySet -void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames, +void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1505,7 +1505,7 @@ void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< rtl::OUString if ( nCount ) { - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); const SfxItemPropertyMap& rPropertyMap = pPropSet->getPropertyMap(); @@ -1518,7 +1518,7 @@ void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< rtl::OUString } uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( - const uno::Sequence< rtl::OUString >& aPropertyNames ) + const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1536,7 +1536,7 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( return aSequence; } -void SAL_CALL ScStyleObj::addPropertiesChangeListener( const uno::Sequence<rtl::OUString>& /* aPropertyNames */, +void SAL_CALL ScStyleObj::addPropertiesChangeListener( const uno::Sequence<OUString>& /* aPropertyNames */, const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ ) throw (uno::RuntimeException) { @@ -1550,7 +1550,7 @@ void SAL_CALL ScStyleObj::removePropertiesChangeListener( // no bound properties } -void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence<rtl::OUString>& /* aPropertyNames */, +void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence<OUString>& /* aPropertyNames */, const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ ) throw (uno::RuntimeException) { @@ -1606,7 +1606,7 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault() throw (uno::RuntimeExcepti } } -void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<rtl::OUString>& aPropertyNames ) +void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<OUString>& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1614,7 +1614,7 @@ void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<rtl::OUStr sal_Int32 nCount = aPropertyNames.getLength(); if ( nCount ) { - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); const SfxItemPropertyMap& rPropertyMap = pPropSet->getPropertyMap(); for (sal_Int32 i = 0; i < nCount; i++) @@ -1626,7 +1626,7 @@ void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<rtl::OUStr } uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults( - const uno::Sequence<rtl::OUString>& aPropertyNames ) + const uno::Sequence<OUString>& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1655,7 +1655,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScStyleObj::getPropertySetInfo( } void SAL_CALL ScStyleObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1669,7 +1669,7 @@ void SAL_CALL ScStyleObj::setPropertyValue( SetOnePropertyValue( aPropertyName, pEntry, &aValue ); } -void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const uno::Any* pValue ) +void ScStyleObj::SetOnePropertyValue( const OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const uno::Any* pValue ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1830,7 +1830,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS; sal_Bool bFound = false; - rtl::OUString aName; + OUString aName; if ( *pValue >>= aName ) { if ( aName == SC_PAPERBIN_DEFAULTNAME ) @@ -1976,7 +1976,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons } } -uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScStyleObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1988,7 +1988,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa // core always has the display name SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) - aAny <<= rtl::OUString( pStyle->GetName() ); + aAny <<= OUString( pStyle->GetName() ); } else { @@ -2043,9 +2043,9 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa // property PrinterPaperTray is the name of the tray sal_uInt8 nValue = ((const SvxPaperBinItem&)pItemSet->Get(nWhich)).GetValue(); - rtl::OUString aName; + OUString aName; if ( nValue == PAPERBIN_PRINTER_SETTINGS ) - aName = rtl::OUString(SC_PAPERBIN_DEFAULTNAME ); + aName = OUString(SC_PAPERBIN_DEFAULTNAME ); else { Printer* pPrinter = pDocShell->GetPrinter(); @@ -2119,12 +2119,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScStyleObj ) // lang::XServiceInfo -rtl::OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScStyleObj" ); + return OUString("ScStyleObj" ); } -sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScStyleObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { sal_Bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE ); @@ -2133,15 +2133,15 @@ sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName RTL_CONSTASCII_STRINGPARAM ( bPage ? SCPAGESTYLE_SERVICE : SCCELLSTYLE_SERVICE )); } -uno::Sequence<rtl::OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() throw(uno::RuntimeException) { sal_Bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE ); - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(SCSTYLE_SERVICE ); - pArray[1] = bPage ? rtl::OUString(SCPAGESTYLE_SERVICE) - : rtl::OUString(SCCELLSTYLE_SERVICE); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(SCSTYLE_SERVICE ); + pArray[1] = bPage ? OUString(SCPAGESTYLE_SERVICE) + : OUString(SCCELLSTYLE_SERVICE); return aRet; } diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 8a64525cc0a0..e7196b037359 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -53,7 +53,7 @@ static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() static SfxItemPropertyMapEntry aLinkTargetMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((const uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {0,0,0,0,0,0} }; return aLinkTargetMap_Impl; @@ -93,7 +93,7 @@ void ScLinkTargetTypesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // container::XNameAccess -uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const rtl::OUString& aName) +uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { if (pDocShell) @@ -107,16 +107,16 @@ uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const rtl::OUString& aName) throw container::NoSuchElementException(); } -uno::Sequence<rtl::OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames(void) throw( uno::RuntimeException ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames(void) throw( uno::RuntimeException ) { - uno::Sequence<rtl::OUString> aRet(SC_LINKTARGETTYPE_COUNT); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence<OUString> aRet(SC_LINKTARGETTYPE_COUNT); + OUString* pArray = aRet.getArray(); for (sal_uInt16 i=0; i<SC_LINKTARGETTYPE_COUNT; i++) pArray[i] = aNames[i]; return aRet; } -sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const rtl::OUString& aName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw( uno::RuntimeException ) { String aNameStr = aName; for (sal_uInt16 i=0; i<SC_LINKTARGETTYPE_COUNT; i++) @@ -199,7 +199,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getProp return aRef; } -void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const rtl::OUString& /* aPropertyName */, +void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const OUString& /* aPropertyName */, const uno::Any& /* aValue */) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -234,7 +234,7 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType } } -uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const rtl::OUString& PropertyName) +uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const OUString& PropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { uno::Any aRet; @@ -242,7 +242,7 @@ uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const rtl::OUString& Pro if ( aNameStr.EqualsAscii( SC_UNO_LINKDISPBIT ) ) SetLinkTargetBitmap( aRet, nType ); else if ( aNameStr.EqualsAscii( SC_UNO_LINKDISPNAME ) ) - aRet <<= rtl::OUString( aName ); + aRet <<= OUString( aName ); return aRet; } @@ -263,7 +263,7 @@ ScLinkTargetsObj::~ScLinkTargetsObj() // container::XNameAccess -uno::Any SAL_CALL ScLinkTargetsObj::getByName(const rtl::OUString& aName) +uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xProp( ScUnoHelpFunctions::AnyToInterface( xCollection->getByName(aName) ), uno::UNO_QUERY ); @@ -274,12 +274,12 @@ uno::Any SAL_CALL ScLinkTargetsObj::getByName(const rtl::OUString& aName) // return uno::Any(); } -uno::Sequence<rtl::OUString> SAL_CALL ScLinkTargetsObj::getElementNames(void) throw( uno::RuntimeException ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames(void) throw( uno::RuntimeException ) { return xCollection->getElementNames(); } -sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const rtl::OUString& aName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName) throw( uno::RuntimeException ) { return xCollection->hasByName(aName); } diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 29e61fdd8f8b..77ba10fa924b 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -321,7 +321,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) { - rtl::OUString aDummy("???"); + OUString aDummy("???"); rData.aTitle = aDummy; rData.aLongDocName = aDummy; rData.aShortDocName = aDummy; @@ -330,10 +330,10 @@ void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) rData.nTotalPages = 99; } -rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; const EditTextObject* pData; sal_uInt16 nPart = aTextData.GetPart(); @@ -360,7 +360,7 @@ rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeExce return aRet; } -void SAL_CALL ScHeaderFooterTextObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aString(aText); @@ -372,7 +372,7 @@ void SAL_CALL ScHeaderFooterTextObj::setString( const rtl::OUString& aText ) thr } void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference<text::XTextRange>& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 6be263f1e816..bb49faf9d49d 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -125,7 +125,7 @@ void ScFormulaParserObj::SetCompilerFlags( ScCompiler& rCompiler ) const } uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula( - const rtl::OUString& aFormula, const table::CellAddress& rReferencePos ) + const OUString& aFormula, const table::CellAddress& rReferencePos ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -150,12 +150,12 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula( return aRet; } -rtl::OUString SAL_CALL ScFormulaParserObj::printFormula( +OUString SAL_CALL ScFormulaParserObj::printFormula( const uno::Sequence<sheet::FormulaToken>& aTokens, const table::CellAddress& rReferencePos ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; if (mpDocShell) { @@ -168,7 +168,7 @@ rtl::OUString SAL_CALL ScFormulaParserObj::printFormula( aCompiler.SetGrammar(pDoc->GetGrammar()); SetCompilerFlags( aCompiler ); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aCompiler.CreateStringFromTokenArray( aBuffer ); aRet = aBuffer.makeStringAndClear(); } @@ -187,7 +187,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFormulaParserObj::getProperty } void SAL_CALL ScFormulaParserObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -246,7 +246,7 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue( throw beans::UnknownPropertyException(); } -uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -362,12 +362,12 @@ bool ScTokenConversion::ConvertToTokenSequence( ScDocument& rDoc, rAPI.Data <<= rToken.GetDouble(); break; case formula::svString: - rAPI.Data <<= rtl::OUString( rToken.GetString() ); + rAPI.Data <<= OUString( rToken.GetString() ); break; case svExternal: // Function name is stored as string. // Byte (parameter count) is ignored. - rAPI.Data <<= rtl::OUString( rToken.GetExternal() ); + rAPI.Data <<= OUString( rToken.GetExternal() ); break; case svSingleRef: { @@ -431,7 +431,7 @@ bool ScTokenConversion::ConvertToTokenSequence( ScDocument& rDoc, { sheet::ExternalReference aExtRef; aExtRef.Index = rToken.GetIndex(); - aExtRef.Reference <<= ::rtl::OUString( rToken.GetString() ); + aExtRef.Reference <<= OUString( rToken.GetString() ); rAPI.Data <<= aExtRef; eOpCode = ocPush; } diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index dacd7ec34313..378177ae2e8d 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -30,15 +30,15 @@ using namespace ::com::sun::star; -::rtl::OUString SAL_CALL ScDocument_getImplementationName() throw() +OUString SAL_CALL ScDocument_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); + return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() { - uno::Sequence< rtl::OUString > aSeq( 1 ); - aSeq[0] = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ); + uno::Sequence< OUString > aSeq( 1 ); + aSeq[0] = OUString( "com.sun.star.sheet.SpreadsheetDocument" ); return aSeq; } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 7e9e1be6a09a..2c791eb2e455 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -531,7 +531,7 @@ static void lcl_CallActivate( ScDocShell* pDocSh, SCTAB nTab, sal_Int32 nEvent ) const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(nEvent); + const OUString* pScript = pEvents->GetScript(nEvent); if (pScript) { uno::Any aRet; @@ -986,7 +986,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); } // XIndexAccess @@ -1240,7 +1240,7 @@ sal_Bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(nEvent); + const OUString* pScript = pEvents->GetScript(nEvent); if (pScript) { // the macro parameter is the clicked object, as in the mousePressed call above @@ -1760,7 +1760,7 @@ void ScTabViewObj::SelectionChanged() const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_SELECT); + const OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_SELECT); if (pScript) { // the macro parameter is the selection as returned by getSelection @@ -1806,7 +1806,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInf } void SAL_CALL ScTabViewObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1930,7 +1930,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue( } } -uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1990,7 +1990,7 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aProperty return aRet; } -void SAL_CALL ScTabViewObj::addPropertyChangeListener( const ::rtl::OUString& /* aPropertyName */, +void SAL_CALL ScTabViewObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2002,7 +2002,7 @@ void SAL_CALL ScTabViewObj::addPropertyChangeListener( const ::rtl::OUString& /* aPropertyChgListeners.push_back( pObj ); } -void SAL_CALL ScTabViewObj::removePropertyChangeListener( const ::rtl::OUString& /* aPropertyName */, +void SAL_CALL ScTabViewObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2020,7 +2020,7 @@ void SAL_CALL ScTabViewObj::removePropertyChangeListener( const ::rtl::OUString& } } -void SAL_CALL ScTabViewObj::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, +void SAL_CALL ScTabViewObj::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference<beans::XVetoableChangeListener >& /* aListener */ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2028,7 +2028,7 @@ void SAL_CALL ScTabViewObj::addVetoableChangeListener( const ::rtl::OUString& /* { } -void SAL_CALL ScTabViewObj::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, +void SAL_CALL ScTabViewObj::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference<beans::XVetoableChangeListener >& /* aListener */ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2059,7 +2059,7 @@ void SAL_CALL ScTabViewObj::startRangeSelection( sal_Bool bSingleCell = false; sal_Bool bMultiSelection = false; - rtl::OUString aStrVal; + OUString aStrVal; const beans::PropertyValue* pPropArray = aArguments.getConstArray(); long nPropCount = aArguments.getLength(); for (long i = 0; i < nPropCount; i++) @@ -2153,7 +2153,7 @@ void ScTabViewObj::RangeSelDone( const String& rText ) { sheet::RangeSelectionEvent aEvent; aEvent.Source.set(static_cast<cppu::OWeakObject*>(this)); - aEvent.RangeDescriptor = rtl::OUString( rText ); + aEvent.RangeDescriptor = OUString( rText ); // copy on the stack because listener could remove itself XRangeSelectionListenerVector const listeners(aRangeSelListeners); @@ -2166,7 +2166,7 @@ void ScTabViewObj::RangeSelAborted( const String& rText ) { sheet::RangeSelectionEvent aEvent; aEvent.Source.set(static_cast<cppu::OWeakObject*>(this)); - aEvent.RangeDescriptor = rtl::OUString( rText ); + aEvent.RangeDescriptor = OUString( rText ); // copy on the stack because listener could remove itself XRangeSelectionListenerVector const listeners(aRangeSelListeners); @@ -2179,7 +2179,7 @@ void ScTabViewObj::RangeSelChanged( const String& rText ) { sheet::RangeSelectionEvent aEvent; aEvent.Source.set(static_cast<cppu::OWeakObject*>(this)); - aEvent.RangeDescriptor = rtl::OUString( rText ); + aEvent.RangeDescriptor = OUString( rText ); // copy on the stack because listener could remove itself XRangeSelectionChangeListenerVector const listener(aRangeChgListeners); @@ -2190,12 +2190,12 @@ void ScTabViewObj::RangeSelChanged( const String& rText ) // XServiceInfo -rtl::OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScTabViewObj" ); + return OUString( "ScTabViewObj" ); } -sal_Bool SAL_CALL ScTabViewObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScTabViewObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -2203,13 +2203,13 @@ sal_Bool SAL_CALL ScTabViewObj::supportsService( const rtl::OUString& rServiceNa aServiceStr.EqualsAscii( SCVIEWSETTINGS_SERVICE ); } -uno::Sequence<rtl::OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTABVIEWOBJ_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCVIEWSETTINGS_SERVICE )); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCTABVIEWOBJ_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCVIEWSETTINGS_SERVICE )); return aRet; } @@ -2277,7 +2277,7 @@ void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Ref SolarMutexGuard aGuard; ScEditShell* pShell = PTR_CAST( ScEditShell, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); if (pShell) - pShell->GetEditView()->InsertText( xTrans, ::rtl::OUString(), false ); + pShell->GetEditView()->InsertText( xTrans, OUString(), false ); else { ScDrawTextObjectBar* pTextShell = PTR_CAST( ScDrawTextObjectBar, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); @@ -2288,7 +2288,7 @@ void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Ref OutlinerView* pOutView = pView->GetTextEditOutlinerView(); if ( pOutView ) { - pOutView->GetEditView().InsertText( xTrans, ::rtl::OUString(), false ); + pOutView->GetEditView().InsertText( xTrans, OUString(), false ); return; } } diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx index 086948ae05d6..df022b2b4330 100644 --- a/sc/source/ui/unoobj/warnpassword.cxx +++ b/sc/source/ui/unoobj/warnpassword.cxx @@ -30,7 +30,6 @@ #include <svx/svxerr.hxx> -using ::rtl::OUString; using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; |