summaryrefslogtreecommitdiff
path: root/sc/workben
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /sc/workben
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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/workben')
-rw-r--r--sc/workben/addin.cxx34
-rw-r--r--sc/workben/addin.hxx32
-rw-r--r--sc/workben/result.cxx2
3 files changed, 34 insertions, 34 deletions
diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx
index d15b95f51a74..dbc538b6165f 100644
--- a/sc/workben/addin.cxx
+++ b/sc/workben/addin.cxx
@@ -68,8 +68,8 @@ sal_Bool SAL_CALL component_writeInfo(
uno::Reference<registry::XRegistryKey> xNewKey(
reinterpret_cast<registry::XRegistryKey*>(pRegistryKey)->createKey(aImpl) );
- uno::Sequence <rtl::OUString> aSequ = ScTestAddIn::getSupportedServiceNames_Static();
- const rtl::OUString * pArray = aSequ.getConstArray();
+ uno::Sequence <OUString> aSequ = ScTestAddIn::getSupportedServiceNames_Static();
+ const OUString * pArray = aSequ.getConstArray();
for( INT32 i = 0; i < aSequ.getLength(); i++ )
xNewKey->createKey( pArray[i] );
@@ -123,10 +123,10 @@ UString ScTestAddIn::getImplementationName_Static()
return L"stardiv.StarCalc.ScTestAddIn";
}
-::com::sun::star::uno::Sequence< ::rtl::OUString > ScTestAddIn::getSupportedServiceNames_Static()
+::com::sun::star::uno::Sequence< OUString > ScTestAddIn::getSupportedServiceNames_Static()
{
- uno::Sequence< rtl::OUString > aRet(2);
- rtl::OUString* pArray = aRet.getArray();
+ uno::Sequence< OUString > aRet(2);
+ OUString* pArray = aRet.getArray();
pArray[0] = SCADDIN_SERVICE;
pArray[1] = SCTESTADDIN_SERVICE;
return aRet;
@@ -344,7 +344,7 @@ double SAL_CALL ScTestAddIn::addOne( double fValue ) throw(::com::sun::star::uno
return fValue + 1.0;
}
-::rtl::OUString SAL_CALL ScTestAddIn::repeatStr( const ::rtl::OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL ScTestAddIn::repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException)
{
String aRet;
String aStrStr = OUStringToString( aStr, CHARSET_SYSTEM );
@@ -354,7 +354,7 @@ double SAL_CALL ScTestAddIn::addOne( double fValue ) throw(::com::sun::star::uno
return StringToOUString( aRet, CHARSET_SYSTEM );
}
-::rtl::OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException)
{
uno::Any aDateAny = xCaller->getPropertyValue( L"NullDate" );
{
@@ -459,14 +459,14 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix,
return aRet;
}
-::rtl::OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException)
{
String aSeparator;
if ( !aFirst.hasValue() ) // not specified
aSeparator = ';';
else
{
- rtl::OUString aUStr;
+ OUString aUStr;
aFirst >>= aUStr;
aSeparator = OUStringToString( aUStr, CHARSET_SYSTEM );
}
@@ -478,7 +478,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix,
{
if ( nPos > 0 )
aContent += ' ';
- rtl::OUString aUStr;
+ OUString aUStr;
pArr[nPos] >>= aUStr;
aContent += OUStringToString( aUStr, CHARSET_SYSTEM );
}
@@ -502,11 +502,11 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix,
//! Test
if ( nFlag == 42 )
{
- uno::Sequence<rtl::OUString> aInner(3);
+ uno::Sequence<OUString> aInner(3);
aInner.getArray()[0] = L"Bla";
aInner.getArray()[1] = L"Fasel";
aInner.getArray()[2] = L"Suelz";
- uno::Sequence< uno::Sequence<rtl::OUString> > aOuter( &aInner, 1 );
+ uno::Sequence< uno::Sequence<OUString> > aOuter( &aInner, 1 );
aRet <<= aOuter;
return aRet;
@@ -521,7 +521,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix,
return aRet;
}
-::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL ScTestAddIn::callAsync( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException)
+::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL ScTestAddIn::callAsync( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException)
{
String aStr = OUStringToString( aString, CHARSET_SYSTEM );
char c = (char) aStr;
@@ -542,25 +542,25 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix,
// XServiceName
-::rtl::OUString SAL_CALL ScTestAddIn::getServiceName( ) throw(::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL ScTestAddIn::getServiceName( ) throw(::com::sun::star::uno::RuntimeException)
{
return SCTESTADDIN_SERVICE; // name of specific AddIn service
}
// XServiceInfo
-::rtl::OUString SAL_CALL ScTestAddIn::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL ScTestAddIn::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException)
{
return getImplementationName_Static();
}
-sal_Bool SAL_CALL ScTestAddIn::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
+sal_Bool SAL_CALL ScTestAddIn::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
{
return ServiceName == SCADDIN_SERVICE ||
ServiceName == SCTESTADDIN_SERVICE;
}
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScTestAddIn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException)
+::com::sun::star::uno::Sequence< OUString > SAL_CALL ScTestAddIn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
diff --git a/sc/workben/addin.hxx b/sc/workben/addin.hxx
index c0e946cc5d70..4d54de38921b 100644
--- a/sc/workben/addin.hxx
+++ b/sc/workben/addin.hxx
@@ -53,16 +53,16 @@ public:
// virtual XIdlClassRef getIdlClass(void);
static UString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static();
+ static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XAddIn
- virtual ::rtl::OUString SAL_CALL getProgrammaticFuntionName( const ::rtl::OUString& aDisplayName ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getDisplayFunctionName( const ::rtl::OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getFunctionDescription( const ::rtl::OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getDisplayArgumentName( const ::rtl::OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getArgumentDescription( const ::rtl::OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getProgrammaticCategoryName( const ::rtl::OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getDisplayCategoryName( const ::rtl::OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException);
// XLocalizable
virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& eLocale ) throw(::com::sun::star::uno::RuntimeException);
@@ -71,22 +71,22 @@ public:
// XTestAddIn
virtual sal_Int32 SAL_CALL countParams( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs ) throw(::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL addOne( double fValue ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL repeatStr( const ::rtl::OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getColorValue( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& xRange ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL transpose( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > > SAL_CALL transposeInt( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL callAsync( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL callAsync( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getStrOrVal( sal_Int32 nFlag ) throw(::com::sun::star::uno::RuntimeException);
// XServiceName
- virtual ::rtl::OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException);
// 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);
};
diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx
index 727b9e7b0b48..c11d74b6d106 100644
--- a/sc/workben/result.cxx
+++ b/sc/workben/result.cxx
@@ -49,7 +49,7 @@ void ScAddInResult::NewValue()
uno::Any aAny;
String aRet = aArg;
aRet += nTickCount;
- rtl::OUString aUStr = StringToOUString( aRet, CHARSET_SYSTEM );
+ OUString aUStr = StringToOUString( aRet, CHARSET_SYSTEM );
aAny <<= aUStr;
sheet::ResultEvent aEvent( (cppu::OWeakObject*)this, aAny );