summaryrefslogtreecommitdiff
path: root/forms/source/misc
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 /forms/source/misc
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 'forms/source/misc')
-rw-r--r--forms/source/misc/InterfaceContainer.cxx44
-rw-r--r--forms/source/misc/limitedformats.cxx12
-rw-r--r--forms/source/misc/property.cxx4
-rw-r--r--forms/source/misc/services.cxx22
4 files changed, 41 insertions, 41 deletions
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 7a3bf4178de8..43253b8d1e38 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -123,7 +123,7 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn
break;
Reference< XMultiServiceFactory > xDocFac( xDoc, UNO_QUERY_THROW );
- Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString("ooo.vba.VBACodeNameProvider") ), UNO_QUERY );
+ Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( OUString("ooo.vba.VBACodeNameProvider") ), UNO_QUERY );
if ( !xNameQuery.is() )
break;
@@ -140,15 +140,15 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn
// Try getting the code name from the container first (faster),
// then from the element if that fails (slower).
Reference<XInterface> xThis = static_cast<XContainer*>(this);
- rtl::OUString sCodeName = xNameQuery->getCodeNameForContainer(xThis);
+ OUString sCodeName = xNameQuery->getCodeNameForContainer(xThis);
if (sCodeName.isEmpty())
sCodeName = xNameQuery->getCodeNameForObject(xElement);
Reference< XPropertySet > xProps( xElement, UNO_QUERY_THROW );
- ::rtl::OUString sServiceName;
- xProps->getPropertyValue( rtl::OUString("DefaultControl") ) >>= sServiceName;
+ OUString sServiceName;
+ xProps->getPropertyValue( OUString("DefaultControl") ) >>= sServiceName;
- Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString("ooo.vba.VBAToOOEventDesc") ), UNO_QUERY_THROW );
+ Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( OUString("ooo.vba.VBAToOOEventDesc") ), UNO_QUERY_THROW );
Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( m_xServiceFactory->createInstance( sServiceName ), sCodeName );
// register the vba script events
m_xEventAttacher->registerScriptEvents( i_nIndex, vbaEvents );
@@ -223,7 +223,7 @@ void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource )
catch( const Exception& )
{
throw WrappedTargetException(
- ::rtl::OUString( "Could not clone the given interface hierarchy." ),
+ OUString( "Could not clone the given interface hierarchy." ),
static_cast< XIndexContainer* >( const_cast< OInterfaceContainer* >( &_cloneSource ) ),
::cppu::getCaughtException()
);
@@ -370,7 +370,7 @@ struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescr
if ( 0 <= nPrefixLength )
{ // the macro name does not already contain a :
#ifdef DBG_UTIL
- const ::rtl::OUString sPrefix = _rDescriptor.ScriptCode.copy( 0, nPrefixLength );
+ const OUString sPrefix = _rDescriptor.ScriptCode.copy( 0, nPrefixLength );
DBG_ASSERT( 0 == sPrefix.compareToAscii( "document" )
|| 0 == sPrefix.compareToAscii( "application" ),
"TransformEventTo52Format: invalid (unknown) prefix!" );
@@ -392,7 +392,7 @@ struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescr
if ( _rDescriptor.ScriptCode.indexOf( ':' ) < 0 )
{ // the macro name does not already contain a :
// -> default the type to "document"
- ::rtl::OUString sNewScriptCode( "document:" );
+ OUString sNewScriptCode( "document:" );
sNewScriptCode += _rDescriptor.ScriptCode;
_rDescriptor.ScriptCode = sNewScriptCode;
}
@@ -688,12 +688,12 @@ throw (::com::sun::star::uno::RuntimeException) {
{
::osl::MutexGuard aGuard( m_rMutex );
OInterfaceMap::iterator i = ::std::find(m_aMap.begin(), m_aMap.end(),
- ::std::pair<const ::rtl::OUString, InterfaceRef >(::comphelper::getString(evt.OldValue),evt.Source));
+ ::std::pair<const OUString, InterfaceRef >(::comphelper::getString(evt.OldValue),evt.Source));
if (i != m_aMap.end())
{
InterfaceRef xCorrectType((*i).second);
m_aMap.erase(i);
- m_aMap.insert(::std::pair<const ::rtl::OUString, InterfaceRef >(::comphelper::getString(evt.NewValue),xCorrectType));
+ m_aMap.insert(::std::pair<const OUString, InterfaceRef >(::comphelper::getString(evt.NewValue),xCorrectType));
}
}
}
@@ -721,7 +721,7 @@ Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() throw(
// XNameAccess
//------------------------------------------------------------------------------
-Any SAL_CALL OInterfaceContainer::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
+Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
{
::std::pair <OInterfaceMap::iterator,
OInterfaceMap::iterator> aPair = m_aMap.equal_range(_rName);
@@ -736,7 +736,7 @@ Any SAL_CALL OInterfaceContainer::getByName( const ::rtl::OUString& _rName ) thr
StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException)
{
StringSequence aNameList(m_aItems.size());
- ::rtl::OUString* pStringArray = aNameList.getArray();
+ OUString* pStringArray = aNameList.getArray();
for (OInterfaceMap::const_iterator i = m_aMap.begin(); i != m_aMap.end(); ++i, ++pStringArray)
{
@@ -746,7 +746,7 @@ StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeExce
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OInterfaceContainer::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException)
+sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw(RuntimeException)
{
::std::pair <OInterfaceMap::iterator,
OInterfaceMap::iterator> aPair = m_aMap.equal_range(_rName);
@@ -835,7 +835,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
// exist
// set the name, and add as change listener for the name
- ::rtl::OUString sName;
+ OUString sName;
_rxElement->getPropertyValue(PROPERTY_NAME) >>= sName;
_rxElement->addPropertyChangeListener(PROPERTY_NAME, this);
@@ -848,7 +848,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
else
m_aItems.insert( m_aItems.begin() + _nIndex, pElementMetaData->xInterface );
- m_aMap.insert( ::std::pair< const ::rtl::OUString, InterfaceRef >( sName, pElementMetaData->xInterface ) );
+ m_aMap.insert( ::std::pair< const OUString, InterfaceRef >( sName, pElementMetaData->xInterface ) );
// announce ourself as parent to the new element
pElementMetaData->xChild->setParent(static_cast<XContainer*>(this));
@@ -870,7 +870,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
bool bHandleVbaEvents = false;
try
{
- _rxElement->getPropertyValue(rtl::OUString("GenerateVbaEvents") ) >>= bHandleVbaEvents;
+ _rxElement->getPropertyValue(OUString("GenerateVbaEvents") ) >>= bHandleVbaEvents;
}
catch( const Exception& )
{
@@ -1006,14 +1006,14 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
m_aMap.erase(j);
// examine the new element
- ::rtl::OUString sName;
+ OUString sName;
DBG_ASSERT( aElementMetaData.get()->xPropertySet.is(), "OInterfaceContainer::implReplaceByIndex: what did approveNewElement do?" );
aElementMetaData.get()->xPropertySet->getPropertyValue(PROPERTY_NAME) >>= sName;
aElementMetaData.get()->xPropertySet->addPropertyChangeListener(PROPERTY_NAME, this);
// insert the new one
- m_aMap.insert( ::std::pair<const ::rtl::OUString, InterfaceRef >( sName, aElementMetaData.get()->xInterface ) );
+ m_aMap.insert( ::std::pair<const OUString, InterfaceRef >( sName, aElementMetaData.get()->xInterface ) );
m_aItems[ _nIndex ] = aElementMetaData.get()->xInterface;
aElementMetaData.get()->xChild->setParent(static_cast<XContainer*>(this));
@@ -1110,7 +1110,7 @@ ElementDescription* OInterfaceContainer::createElementMetaData( )
}
//------------------------------------------------------------------------
-void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException )
+void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException )
{
Reference< XPropertySet > xElementProps;
@@ -1143,7 +1143,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c
}
//------------------------------------------------------------------------
-void SAL_CALL OInterfaceContainer::replaceByName(const ::rtl::OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException )
+void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException )
{
::osl::ClearableMutexGuard aGuard( m_rMutex );
::std::pair <OInterfaceMap::iterator,
@@ -1171,7 +1171,7 @@ void SAL_CALL OInterfaceContainer::replaceByName(const ::rtl::OUString& Name, co
}
//------------------------------------------------------------------------
-void SAL_CALL OInterfaceContainer::removeByName(const ::rtl::OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException )
+void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException )
{
::osl::MutexGuard aGuard( m_rMutex );
::std::pair <OInterfaceMap::iterator,
@@ -1210,7 +1210,7 @@ void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const
}
//------------------------------------------------------------------------
-void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const ::rtl::OUString& aListenerType, const ::rtl::OUString& aEventMethod, const ::rtl::OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException)
+void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException)
{
if ( m_xEventAttacher.is() )
m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam );
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index b31c97eb91ec..7054db2403bb 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -54,9 +54,9 @@ namespace frm
//---------------------------------------------------------------------
static const Locale& getLocale(LocaleType _eType)
{
- static const Locale s_aEnglishUS( ::rtl::OUString("en"), ::rtl::OUString("us"), ::rtl::OUString() );
- static const Locale s_aGerman( ::rtl::OUString("de"), ::rtl::OUString("DE"), ::rtl::OUString() );
- static const ::rtl::OUString s_sEmptyString;
+ static const Locale s_aEnglishUS( OUString("en"), OUString("us"), OUString() );
+ static const Locale s_aGerman( OUString("de"), OUString("DE"), OUString() );
+ static const OUString s_sEmptyString;
static const Locale s_aSystem( s_sEmptyString, s_sEmptyString, s_sEmptyString );
switch (_eType)
@@ -171,7 +171,7 @@ namespace frm
{
// get the key for the description
pLoopFormats->nKey = xStandardFormats->queryKey(
- ::rtl::OUString::createFromAscii(pLoopFormats->pDescription),
+ OUString::createFromAscii(pLoopFormats->pDescription),
getLocale(pLoopFormats->eLocale),
sal_False
);
@@ -179,7 +179,7 @@ namespace frm
if (-1 == pLoopFormats->nKey)
{
pLoopFormats->nKey = xStandardFormats->addNew(
- ::rtl::OUString::createFromAscii(pLoopFormats->pDescription),
+ OUString::createFromAscii(pLoopFormats->pDescription),
getLocale(pLoopFormats->eLocale)
);
#ifdef DBG_UTIL
@@ -332,7 +332,7 @@ namespace frm
if (!bFoundIt)
{ // somebody gave us an format which we can't translate
- ::rtl::OUString sMessage ("This control supports only a very limited number of formats.");
+ OUString sMessage ("This control supports only a very limited number of formats.");
throw IllegalArgumentException(sMessage, NULL, 2);
}
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index 105593b90faa..066b58d6f709 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -36,7 +36,7 @@ namespace frm
//==================================================================
PropertyInfoService::PropertyMap PropertyInfoService::s_AllKnownProperties;
//------------------------------------------------------------------
-sal_Int32 PropertyInfoService::getPropertyId(const ::rtl::OUString& _rName)
+sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName)
{
initialize();
@@ -58,7 +58,7 @@ sal_Int32 PropertyInfoService::getPropertyId(const ::rtl::OUString& _rName)
}
//------------------------------------------------------------------
-sal_Int32 ConcreteInfoService::getPreferedPropertyId(const ::rtl::OUString& _rName)
+sal_Int32 ConcreteInfoService::getPreferedPropertyId(const OUString& _rName)
{
return PropertyInfoService::getPropertyId(_rName);
}
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 2c2ce38172d7..db4342bc11fe 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -92,16 +92,16 @@ DECLARE_SERVICE_INFO(ImageProducer)
//---------------------------------------------------------------------------------------
-static Sequence< ::rtl::OUString > s_aClassImplementationNames;
-static Sequence<Sequence< ::rtl::OUString > > s_aClassServiceNames;
+static Sequence< OUString > s_aClassImplementationNames;
+static Sequence<Sequence< OUString > > s_aClassServiceNames;
static Sequence<sal_Int64> s_aFactories;
// need to use sal_Int64 instead of ComponentInstantiation, as ComponentInstantiation has no cppuType, so
// it can't be used with sequences
//---------------------------------------------------------------------------------------
void registerClassInfo(
- ::rtl::OUString _rClassImplName, // the ImplName of the class
- const Sequence< ::rtl::OUString >& _rServiceNames, // the services supported by this class
+ OUString _rClassImplName, // the ImplName of the class
+ const Sequence< OUString >& _rServiceNames, // the services supported by this class
::cppu::ComponentInstantiation _pCreateFunction // the method for instantiating such a class
)
{
@@ -123,7 +123,7 @@ void registerClassInfo(
//.......................................................................................
#define REGISTER_CLASS_CORE(classImplName) \
registerClassInfo( \
- ::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(#classImplName), \
+ OUString("com.sun.star.form.") + OUString(#classImplName), \
aServices, \
frm::classImplName##_CreateInstance)
@@ -163,7 +163,7 @@ void ensureClassInfos()
if (s_aClassImplementationNames.getLength())
// nothing to do
return;
- Sequence< ::rtl::OUString > aServices;
+ Sequence< OUString > aServices;
// ========================================================================
// = ControlModels
@@ -218,7 +218,7 @@ void ensureClassInfos()
aServices.getArray()[2] = frm::FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
aServices.getArray()[3] = frm::BINDABLE_DATABASE_FORMATTED_FIELD;
- registerClassInfo(::rtl::OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"),
+ registerClassInfo(OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"),
aServices,
frm::OFormattedFieldWrapper_CreateInstance_ForceFormatted);
@@ -265,7 +265,7 @@ void ensureClassInfos()
// = XForms core
#define REGISTER_XFORMS_CLASS(name) \
aServices.realloc(1); \
- aServices.getArray()[0] = rtl::OUString( "com.sun.star.xforms." #name ); \
+ aServices.getArray()[0] = OUString( "com.sun.star.xforms." #name ); \
REGISTER_CLASS_CORE(name)
REGISTER_XFORMS_CLASS(Model);
@@ -329,8 +329,8 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pI
"forms::component_getFactory : invalid class infos !");
// loop through the sequences and register the service providers
- const ::rtl::OUString* pClasses = s_aClassImplementationNames.getConstArray();
- const Sequence< ::rtl::OUString >* pServices = s_aClassServiceNames.getConstArray();
+ const OUString* pClasses = s_aClassImplementationNames.getConstArray();
+ const Sequence< OUString >* pServices = s_aClassServiceNames.getConstArray();
const sal_Int64* pFunctionsAsInts = s_aFactories.getConstArray();
for (sal_Int32 i=0; i<nClasses; ++i, ++pClasses, ++pServices, ++pFunctionsAsInts)
@@ -366,7 +366,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pI
// let the module look for the component
Reference< XInterface > xRet;
xRet = ::frm::OFormsModule::getComponentFactory(
- ::rtl::OUString::createFromAscii( _pImplName ),
+ OUString::createFromAscii( _pImplName ),
static_cast< XMultiServiceFactory* >( _pServiceManager ) );
if ( xRet.is() )