summaryrefslogtreecommitdiff
path: root/comphelper/inc/comphelper
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 /comphelper/inc/comphelper
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 'comphelper/inc/comphelper')
-rw-r--r--comphelper/inc/comphelper/ChainablePropertySet.hxx28
-rw-r--r--comphelper/inc/comphelper/ChainablePropertySetInfo.hxx6
-rw-r--r--comphelper/inc/comphelper/MasterPropertySet.hxx28
-rw-r--r--comphelper/inc/comphelper/MasterPropertySetInfo.hxx4
-rw-r--r--comphelper/inc/comphelper/PropertyInfoHash.hxx12
-rw-r--r--comphelper/inc/comphelper/SettingsHelper.hxx20
-rw-r--r--comphelper/inc/comphelper/accessiblecontexthelper.hxx4
-rw-r--r--comphelper/inc/comphelper/accessibletexthelper.hxx18
-rw-r--r--comphelper/inc/comphelper/accessiblewrapper.hxx4
-rw-r--r--comphelper/inc/comphelper/anycompare.hxx4
-rw-r--r--comphelper/inc/comphelper/anytostring.hxx2
-rw-r--r--comphelper/inc/comphelper/attributelist.hxx12
-rw-r--r--comphelper/inc/comphelper/basicio.hxx6
-rw-r--r--comphelper/inc/comphelper/componentcontext.hxx24
-rw-r--r--comphelper/inc/comphelper/componentguard.hxx2
-rw-r--r--comphelper/inc/comphelper/componentmodule.hxx32
-rw-r--r--comphelper/inc/comphelper/configuration.hxx22
-rw-r--r--comphelper/inc/comphelper/configurationhelper.hxx26
-rw-r--r--comphelper/inc/comphelper/container.hxx2
-rw-r--r--comphelper/inc/comphelper/docpasswordhelper.hxx22
-rw-r--r--comphelper/inc/comphelper/docpasswordrequest.hxx8
-rw-r--r--comphelper/inc/comphelper/documentconstants.hxx54
-rw-r--r--comphelper/inc/comphelper/documentinfo.hxx2
-rw-r--r--comphelper/inc/comphelper/embeddedobjectcontainer.hxx54
-rw-r--r--comphelper/inc/comphelper/enumhelper.hxx4
-rw-r--r--comphelper/inc/comphelper/evtmethodhelper.hxx2
-rw-r--r--comphelper/inc/comphelper/ihwrapnofilter.hxx10
-rw-r--r--comphelper/inc/comphelper/interaction.hxx8
-rw-r--r--comphelper/inc/comphelper/logging.hxx82
-rw-r--r--comphelper/inc/comphelper/mediadescriptor.hxx92
-rw-r--r--comphelper/inc/comphelper/mimeconfighelper.hxx40
-rw-r--r--comphelper/inc/comphelper/namedvaluecollection.hxx40
-rw-r--r--comphelper/inc/comphelper/numberedcollection.hxx6
-rw-r--r--comphelper/inc/comphelper/numbers.hxx2
-rw-r--r--comphelper/inc/comphelper/officeresourcebundle.hxx2
-rw-r--r--comphelper/inc/comphelper/ofopxmlhelper.hxx40
-rw-r--r--comphelper/inc/comphelper/propagg.hxx34
-rw-r--r--comphelper/inc/comphelper/property.hxx12
-rw-r--r--comphelper/inc/comphelper/propertybag.hxx8
-rw-r--r--comphelper/inc/comphelper/propertycontainerhelper.hxx12
-rw-r--r--comphelper/inc/comphelper/propertysethelper.hxx28
-rw-r--r--comphelper/inc/comphelper/propertysetinfo.hxx6
-rw-r--r--comphelper/inc/comphelper/propertystatecontainer.hxx10
-rw-r--r--comphelper/inc/comphelper/propmultiplex.hxx4
-rw-r--r--comphelper/inc/comphelper/propstate.hxx8
-rw-r--r--comphelper/inc/comphelper/sequence.hxx4
-rw-r--r--comphelper/inc/comphelper/sequenceashashmap.hxx10
-rw-r--r--comphelper/inc/comphelper/servicedecl.hxx12
-rw-r--r--comphelper/inc/comphelper/serviceinfohelper.hxx10
-rw-r--r--comphelper/inc/comphelper/stl_types.hxx36
-rw-r--r--comphelper/inc/comphelper/storagehelper.hxx38
-rw-r--r--comphelper/inc/comphelper/string.hxx88
-rw-r--r--comphelper/inc/comphelper/synchronousdispatch.hxx4
-rw-r--r--comphelper/inc/comphelper/types.hxx4
-rw-r--r--comphelper/inc/comphelper/unwrapargs.hxx2
-rw-r--r--comphelper/inc/comphelper/xmltools.hxx2
56 files changed, 528 insertions, 528 deletions
diff --git a/comphelper/inc/comphelper/ChainablePropertySet.hxx b/comphelper/inc/comphelper/ChainablePropertySet.hxx
index b281151558e6..2dfe5f3ca256 100644
--- a/comphelper/inc/comphelper/ChainablePropertySet.hxx
+++ b/comphelper/inc/comphelper/ChainablePropertySet.hxx
@@ -97,39 +97,39 @@ namespace comphelper
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XMultiPropertySet
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
+ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+ virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+ virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw(::com::sun::star::uno::RuntimeException);
// XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName )
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName )
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName )
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName )
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
};
}
diff --git a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
index 51cfd9ea433e..ce28803036d5 100644
--- a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
+++ b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
@@ -52,15 +52,15 @@ namespace comphelper
void add( PropertyInfo* pMap, sal_Int32 nCount = -1 )
throw();
- void remove( const rtl::OUString& aName )
+ void remove( const OUString& aName )
throw();
// XPropertySetInfo
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties()
throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName )
+ virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name )
+ virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
throw(::com::sun::star::uno::RuntimeException);
};
}
diff --git a/comphelper/inc/comphelper/MasterPropertySet.hxx b/comphelper/inc/comphelper/MasterPropertySet.hxx
index 03fdd4a8ccea..266137fdb9b4 100644
--- a/comphelper/inc/comphelper/MasterPropertySet.hxx
+++ b/comphelper/inc/comphelper/MasterPropertySet.hxx
@@ -102,39 +102,39 @@ namespace comphelper
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XMultiPropertySet
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
+ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+ virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+ virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw(::com::sun::star::uno::RuntimeException);
// XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName )
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName )
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName )
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName )
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
};
}
diff --git a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
index 48740daa2ab0..d2c772e2c5d5 100644
--- a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
+++ b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
@@ -48,9 +48,9 @@ namespace comphelper
// XPropertySetInfo
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties()
throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName )
+ virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name )
+ virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
throw(::com::sun::star::uno::RuntimeException);
};
}
diff --git a/comphelper/inc/comphelper/PropertyInfoHash.hxx b/comphelper/inc/comphelper/PropertyInfoHash.hxx
index 41671b71532d..3241560b4a94 100644
--- a/comphelper/inc/comphelper/PropertyInfoHash.hxx
+++ b/comphelper/inc/comphelper/PropertyInfoHash.hxx
@@ -44,21 +44,21 @@ namespace comphelper
};
struct eqFunc
{
- sal_Bool operator()( const rtl::OUString &r1,
- const rtl::OUString &r2) const
+ sal_Bool operator()( const OUString &r1,
+ const OUString &r2) const
{
return r1 == r2;
}
};
}
-typedef boost::unordered_map < ::rtl::OUString,
+typedef boost::unordered_map < OUString,
::comphelper::PropertyInfo*,
- ::rtl::OUStringHash,
+ OUStringHash,
::comphelper::eqFunc > PropertyInfoHash;
-typedef boost::unordered_map < ::rtl::OUString,
+typedef boost::unordered_map < OUString,
::comphelper::PropertyData*,
- ::rtl::OUStringHash,
+ OUStringHash,
::comphelper::eqFunc > PropertyDataHash;
#endif
diff --git a/comphelper/inc/comphelper/SettingsHelper.hxx b/comphelper/inc/comphelper/SettingsHelper.hxx
index 661a4a0c8341..d623fa3e5494 100644
--- a/comphelper/inc/comphelper/SettingsHelper.hxx
+++ b/comphelper/inc/comphelper/SettingsHelper.hxx
@@ -58,39 +58,39 @@ namespace comphelper
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException)
{ return ComphelperBase::getPropertySetInfo(); }
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{ ComphelperBase::setPropertyValue ( aPropertyName, aValue ); }
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{ return ComphelperBase::getPropertyValue ( PropertyName ); }
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{ ComphelperBase::addPropertyChangeListener ( aPropertyName, xListener ); }
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{ ComphelperBase::removePropertyChangeListener ( aPropertyName, aListener ); }
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{ ComphelperBase::addVetoableChangeListener ( PropertyName, aListener ); }
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{ ComphelperBase::removeVetoableChangeListener ( PropertyName, aListener ); }
// XMultiPropertySet
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
+ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{ ComphelperBase::setPropertyValues ( aPropertyNames, aValues ); }
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
throw(::com::sun::star::uno::RuntimeException)
{ return ComphelperBase::getPropertyValues ( aPropertyNames ); }
- virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+ virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw(::com::sun::star::uno::RuntimeException)
{ ComphelperBase::addPropertiesChangeListener ( aPropertyNames, xListener ); }
virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw(::com::sun::star::uno::RuntimeException)
{ ComphelperBase::removePropertiesChangeListener ( xListener ); }
- virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+ virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw(::com::sun::star::uno::RuntimeException)
{ ComphelperBase::firePropertiesChangeEvent ( aPropertyNames, xListener ); }
};
diff --git a/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
index ae7712126504..5ca27baddabf 100644
--- a/comphelper/inc/comphelper/accessiblecontexthelper.hxx
+++ b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
@@ -160,8 +160,8 @@ namespace comphelper
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) = 0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException) = 0;
virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException) = 0;
- virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException) = 0;
- virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException) = 0;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException) = 0;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException) = 0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException) = 0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException) = 0;
diff --git a/comphelper/inc/comphelper/accessibletexthelper.hxx b/comphelper/inc/comphelper/accessibletexthelper.hxx
index 502b0b178127..ea3f505ee7fe 100644
--- a/comphelper/inc/comphelper/accessibletexthelper.hxx
+++ b/comphelper/inc/comphelper/accessibletexthelper.hxx
@@ -55,7 +55,7 @@ namespace comphelper
sal_Bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength );
virtual sal_Bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength );
virtual sal_Bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength );
- virtual ::rtl::OUString implGetText() = 0;
+ virtual OUString implGetText() = 0;
virtual ::com::sun::star::lang::Locale implGetLocale() = 0;
virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0;
virtual void implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
@@ -68,11 +68,11 @@ namespace comphelper
*/
sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
- ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+ OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
- ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
- ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+ OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -90,8 +90,8 @@ namespace comphelper
::com::sun::star::accessibility::TextSegment
*/
static bool implInitTextChangedEvent(
- const rtl::OUString& rOldString,
- const rtl::OUString& rNewString,
+ const OUString& rOldString,
+ const OUString& rNewString,
/*out*/ ::com::sun::star::uno::Any& rDeleted,
/*out*/ ::com::sun::star::uno::Any& rInserted); // throw()
};
@@ -125,11 +125,11 @@ namespace comphelper
// XAccessibleText
virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
diff --git a/comphelper/inc/comphelper/accessiblewrapper.hxx b/comphelper/inc/comphelper/accessiblewrapper.hxx
index 0867ab5594e9..fbd65d638899 100644
--- a/comphelper/inc/comphelper/accessiblewrapper.hxx
+++ b/comphelper/inc/comphelper/accessiblewrapper.hxx
@@ -280,8 +280,8 @@ namespace comphelper
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
diff --git a/comphelper/inc/comphelper/anycompare.hxx b/comphelper/inc/comphelper/anycompare.hxx
index 5ae1d938cae8..fb17b7ca67ec 100644
--- a/comphelper/inc/comphelper/anycompare.hxx
+++ b/comphelper/inc/comphelper/anycompare.hxx
@@ -93,7 +93,7 @@ namespace comphelper
public:
virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const
{
- ::rtl::OUString lhs, rhs;
+ OUString lhs, rhs;
if ( !( _lhs >>= lhs )
|| !( _rhs >>= rhs )
)
@@ -115,7 +115,7 @@ namespace comphelper
virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const
{
- ::rtl::OUString lhs, rhs;
+ OUString lhs, rhs;
if ( !( _lhs >>= lhs )
|| !( _rhs >>= rhs )
)
diff --git a/comphelper/inc/comphelper/anytostring.hxx b/comphelper/inc/comphelper/anytostring.hxx
index ff34c02f18f3..e68779854292 100644
--- a/comphelper/inc/comphelper/anytostring.hxx
+++ b/comphelper/inc/comphelper/anytostring.hxx
@@ -34,7 +34,7 @@ namespace comphelper
@return
STRING representation of given ANY value
*/
-COMPHELPER_DLLPUBLIC ::rtl::OUString anyToString( ::com::sun::star::uno::Any const & value );
+COMPHELPER_DLLPUBLIC OUString anyToString( ::com::sun::star::uno::Any const & value );
}
diff --git a/comphelper/inc/comphelper/attributelist.hxx b/comphelper/inc/comphelper/attributelist.hxx
index a309264a52e4..dd10e13c70ab 100644
--- a/comphelper/inc/comphelper/attributelist.hxx
+++ b/comphelper/inc/comphelper/attributelist.hxx
@@ -41,20 +41,20 @@ public:
virtual ~AttributeList();
// methods that are not contained in any interface
- void AddAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sType , const ::rtl::OUString &sValue );
+ void AddAttribute( const OUString &sName , const OUString &sType , const OUString &sValue );
// ::com::sun::star::xml::sax::XAttributeList
virtual sal_Int16 SAL_CALL getLength(void)
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i)
+ virtual OUString SAL_CALL getNameByIndex(sal_Int16 i)
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i)
+ virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i)
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName)
+ virtual OUString SAL_CALL getTypeByName(const OUString& aName)
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i)
+ virtual OUString SAL_CALL getValueByIndex(sal_Int16 i)
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName)
+ virtual OUString SAL_CALL getValueByName(const OUString& aName)
throw( ::com::sun::star::uno::RuntimeException );
};
diff --git a/comphelper/inc/comphelper/basicio.hxx b/comphelper/inc/comphelper/basicio.hxx
index 626466bceba4..42eea8076e47 100644
--- a/comphelper/inc/comphelper/basicio.hxx
+++ b/comphelper/inc/comphelper/basicio.hxx
@@ -37,9 +37,9 @@ namespace starawt = ::com::sun::star::awt;
COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Bool& _rVal);
COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Bool _bVal);
-// ::rtl::OUString
-COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, ::rtl::OUString& _rStr);
-COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const ::rtl::OUString& _rStr);
+// OUString
+COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& _rStr);
+COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& _rStr);
// sal_Int16
COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int16& _rValue);
diff --git a/comphelper/inc/comphelper/componentcontext.hxx b/comphelper/inc/comphelper/componentcontext.hxx
index c617f8b1811c..d6461502be54 100644
--- a/comphelper/inc/comphelper/componentcontext.hxx
+++ b/comphelper/inc/comphelper/componentcontext.hxx
@@ -80,7 +80,7 @@ namespace comphelper
<TRUE/> if and only if the component could be successfully created
*/
template < typename INTERFACE >
- bool createComponent( const ::rtl::OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
+ bool createComponent( const OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
{
_out_rxComponent.clear();
_out_rxComponent = _out_rxComponent.query(
@@ -97,7 +97,7 @@ namespace comphelper
template < typename INTERFACE >
bool createComponent( const sal_Char* _pAsciiServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
{
- return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent );
+ return createComponent( OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent );
}
/** creates a component using our component factory/context, passing creation arguments
@@ -106,7 +106,7 @@ namespace comphelper
<TRUE/> if and only if the component could be successfully created
*/
template < typename INTERFACE >
- bool createComponentWithArguments( const ::rtl::OUString& _rServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
+ bool createComponentWithArguments( const OUString& _rServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
{
_out_rxComponent.clear();
_out_rxComponent = _out_rxComponent.query(
@@ -123,7 +123,7 @@ namespace comphelper
template < typename INTERFACE >
bool createComponentWithArguments( const sal_Char* _pAsciiServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
{
- return createComponentWithArguments( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _rArguments, _out_rxComponent );
+ return createComponentWithArguments( OUString::createFromAscii( _pAsciiServiceName ), _rArguments, _out_rxComponent );
}
/** creates a component using our component factory/context
@@ -135,7 +135,7 @@ namespace comphelper
@return
the newly created component. Is never <NULL/>.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const ::rtl::OUString& _rServiceName ) const;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const OUString& _rServiceName ) const;
/** creates a component using our component factory/context
@@ -148,7 +148,7 @@ namespace comphelper
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const sal_Char* _pAsciiServiceName ) const
{
- return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ) );
+ return createComponent( OUString::createFromAscii( _pAsciiServiceName ) );
}
/** creates a component using our component factory/context, passing creation arguments
@@ -161,7 +161,7 @@ namespace comphelper
the newly created component. Is never <NULL/>.
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponentWithArguments(
- const ::rtl::OUString& _rServiceName,
+ const OUString& _rServiceName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments
) const;
@@ -179,7 +179,7 @@ namespace comphelper
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments
) const
{
- return createComponentWithArguments( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _rArguments );
+ return createComponentWithArguments( OUString::createFromAscii( _pAsciiServiceName ), _rArguments );
}
/** retrieves a singleton instance from the context
@@ -187,7 +187,7 @@ namespace comphelper
Singletons are collected below the <code>/singletons</code> key in a component context,
so accessing them means retrieving the value under <code>/singletons/&lt;instance_name&gt;</code>.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getSingleton( const ::rtl::OUString& _rInstanceName ) const;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getSingleton( const OUString& _rInstanceName ) const;
/** retrieves a singleton instance from the context
@@ -196,7 +196,7 @@ namespace comphelper
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getSingleton( const sal_Char* _pAsciiInstanceName ) const
{
- return getSingleton( ::rtl::OUString::createFromAscii( _pAsciiInstanceName ) );
+ return getSingleton( OUString::createFromAscii( _pAsciiInstanceName ) );
}
/** returns the ->XMultiServiceFactory interface of ->m_xORB, for passing to
@@ -216,7 +216,7 @@ namespace comphelper
@seealso getContextValueByAsciiName
*/
::com::sun::star::uno::Any
- getContextValueByName( const ::rtl::OUString& _rName ) const;
+ getContextValueByName( const OUString& _rName ) const;
/** retrieves a value from our component context, specified by 8-bit ASCII string
@param _rName
@@ -229,7 +229,7 @@ namespace comphelper
inline ::com::sun::star::uno::Any
getContextValueByAsciiName( const sal_Char* _pAsciiName ) const
{
- return getContextValueByName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
+ return getContextValueByName( OUString::createFromAscii( _pAsciiName ) );
}
};
diff --git a/comphelper/inc/comphelper/componentguard.hxx b/comphelper/inc/comphelper/componentguard.hxx
index 3fc17f94dfe7..eb1cfbcc24a8 100644
--- a/comphelper/inc/comphelper/componentguard.hxx
+++ b/comphelper/inc/comphelper/componentguard.hxx
@@ -40,7 +40,7 @@ namespace comphelper
:m_aGuard( i_broadcastHelper.rMutex )
{
if ( i_broadcastHelper.bDisposed )
- throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), &i_component );
+ throw ::com::sun::star::lang::DisposedException( OUString(), &i_component );
}
~ComponentGuard()
diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx
index e01a133f7027..7e577705a805 100644
--- a/comphelper/inc/comphelper/componentmodule.hxx
+++ b/comphelper/inc/comphelper/componentmodule.hxx
@@ -41,8 +41,8 @@ namespace comphelper
typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > (SAL_CALL *FactoryInstantiation)
(
::cppu::ComponentFactoryFunc _pFactoryFunc,
- ::rtl::OUString const& _rComponentName,
- ::com::sun::star::uno::Sequence< ::rtl::OUString > const & _rServiceNames,
+ OUString const& _rComponentName,
+ ::com::sun::star::uno::Sequence< OUString > const & _rServiceNames,
rtl_ModuleCount* _pModuleCounter
) SAL_THROW(());
@@ -52,13 +52,13 @@ namespace comphelper
struct COMPHELPER_DLLPUBLIC ComponentDescription
{
/// the implementation name of the component
- ::rtl::OUString sImplementationName;
+ OUString sImplementationName;
/// the services supported by the component implementation
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupportedServices;
+ ::com::sun::star::uno::Sequence< OUString > aSupportedServices;
/** the name under which the component implementation should be registered as singleton,
or empty if the component does not implement a singleton.
*/
- ::rtl::OUString sSingletonName;
+ OUString sSingletonName;
/// the function to create an instance of the component
::cppu::ComponentFactoryFunc pComponentCreationFunc;
/// the function to create a factory for the component (usually <code>::cppu::createSingleComponentFactory</code>)
@@ -74,9 +74,9 @@ namespace comphelper
}
ComponentDescription(
- const ::rtl::OUString& _rImplementationName,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSupportedServices,
- const ::rtl::OUString& _rSingletonName,
+ const OUString& _rImplementationName,
+ const ::com::sun::star::uno::Sequence< OUString >& _rSupportedServices,
+ const OUString& _rSingletonName,
::cppu::ComponentFactoryFunc _pComponentCreationFunc,
FactoryInstantiation _pFactoryCreationFunc
)
@@ -118,8 +118,8 @@ namespace comphelper
a function for creating a factory for that component
*/
void registerImplementation(
- const ::rtl::OUString& _rImplementationName,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames,
+ const OUString& _rImplementationName,
+ const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames,
::cppu::ComponentFactoryFunc _pCreateFunction,
FactoryInstantiation _pFactoryFunction = ::cppu::createSingleComponentFactory );
@@ -135,7 +135,7 @@ namespace comphelper
the XInterface access to a factory for the component
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory(
- const ::rtl::OUString& _rImplementationName );
+ const OUString& _rImplementationName );
/** version of getComponentFactory which directly takes the char argument you got in your component_getFactory call
*/
@@ -191,8 +191,8 @@ namespace comphelper
/** automatically provides all component information to an OModule instance
<p>Assumed that the template argument has the three methods
<ul>
- <li><code>static ::rtl::OUString getImplementationName_static()</code><li/>
- <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static()</code><li/>
+ <li><code>static OUString getImplementationName_static()</code><li/>
+ <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static()</code><li/>
<li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
</li>
@@ -226,9 +226,9 @@ namespace comphelper
<p>Assumed that the template argument has the three methods
<ul>
- <li><code>static ::rtl::OUString getImplementationName_static()</code><li/>
- <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static()</code><li/>
- <li><code>static ::rtl::OUString getSingletonName_static()</code></li>
+ <li><code>static OUString getImplementationName_static()</code><li/>
+ <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static()</code><li/>
+ <li><code>static OUString getSingletonName_static()</code></li>
<li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
</li>
diff --git a/comphelper/inc/comphelper/configuration.hxx b/comphelper/inc/comphelper/configuration.hxx
index d70b3901b550..92d5e1d1bd83 100644
--- a/comphelper/inc/comphelper/configuration.hxx
+++ b/comphelper/inc/comphelper/configuration.hxx
@@ -80,16 +80,16 @@ private:
const & context);
SAL_DLLPRIVATE void setPropertyValue(
- rtl::OUString const & path, com::sun::star::uno::Any const & value)
+ OUString const & path, com::sun::star::uno::Any const & value)
const;
SAL_DLLPRIVATE com::sun::star::uno::Reference<
com::sun::star::container::XHierarchicalNameReplace >
- getGroup(rtl::OUString const & path) const;
+ getGroup(OUString const & path) const;
SAL_DLLPRIVATE
com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >
- getSet(rtl::OUString const & path) const;
+ getSet(OUString const & path) const;
com::sun::star::uno::Reference<
com::sun::star::configuration::XReadWriteAccess > access_;
@@ -112,38 +112,38 @@ public:
SAL_DLLPRIVATE ~ConfigurationWrapper();
- com::sun::star::uno::Any getPropertyValue(rtl::OUString const & path) const;
+ com::sun::star::uno::Any getPropertyValue(OUString const & path) const;
void setPropertyValue(
boost::shared_ptr< ConfigurationChanges > const & batch,
- rtl::OUString const & path, com::sun::star::uno::Any const & value)
+ OUString const & path, com::sun::star::uno::Any const & value)
const;
com::sun::star::uno::Any getLocalizedPropertyValue(
- rtl::OUString const & path) const;
+ OUString const & path) const;
void setLocalizedPropertyValue(
boost::shared_ptr< ConfigurationChanges > const & batch,
- rtl::OUString const & path, com::sun::star::uno::Any const & value)
+ OUString const & path, com::sun::star::uno::Any const & value)
const;
com::sun::star::uno::Reference<
com::sun::star::container::XHierarchicalNameAccess >
- getGroupReadOnly(rtl::OUString const & path) const;
+ getGroupReadOnly(OUString const & path) const;
com::sun::star::uno::Reference<
com::sun::star::container::XHierarchicalNameReplace >
getGroupReadWrite(
boost::shared_ptr< ConfigurationChanges > const & batch,
- rtl::OUString const & path) const;
+ OUString const & path) const;
com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >
- getSetReadOnly(rtl::OUString const & path) const;
+ getSetReadOnly(OUString const & path) const;
com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >
getSetReadWrite(
boost::shared_ptr< ConfigurationChanges > const & batch,
- rtl::OUString const & path) const;
+ OUString const & path) const;
boost::shared_ptr< ConfigurationChanges > createChanges() const;
diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx
index 3ad6b44398dd..b267e4c0c564 100644
--- a/comphelper/inc/comphelper/configurationhelper.hxx
+++ b/comphelper/inc/comphelper/configurationhelper.hxx
@@ -88,7 +88,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
* E.g. css::uno::Exception if the configuration could not be opened.
*/
static css::uno::Reference< css::uno::XInterface > openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sPackage,
+ const OUString& sPackage,
sal_Int32 eMode );
//-----------------------------------------------
@@ -117,8 +117,8 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
* key does not exists.
*/
static css::uno::Any readRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG ,
- const ::rtl::OUString& sRelPath,
- const ::rtl::OUString& sKey );
+ const OUString& sRelPath,
+ const OUString& sKey );
//-----------------------------------------------
/** writes a new value for an existing(!) configuration key,
@@ -147,8 +147,8 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
* access does not allow writing for this key.
*/
static void writeRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG ,
- const ::rtl::OUString& sRelPath,
- const ::rtl::OUString& sKey ,
+ const OUString& sRelPath,
+ const OUString& sKey ,
const css::uno::Any& aValue );
//-----------------------------------------------
@@ -181,8 +181,8 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
* access does not allow writing for this set.
*/
static css::uno::Reference< css::uno::XInterface > makeSureSetNodeExists(const css::uno::Reference< css::uno::XInterface > xCFG ,
- const ::rtl::OUString& sRelPathToSet,
- const ::rtl::OUString& sSetNode );
+ const OUString& sRelPathToSet,
+ const OUString& sSetNode );
//-----------------------------------------------
/** commit all changes made on the specified configuration access.
@@ -210,9 +210,9 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
* (Excepting these keys exists inside different configuration packages ...))
*/
static css::uno::Any readDirectKey(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sPackage,
- const ::rtl::OUString& sRelPath,
- const ::rtl::OUString& sKey ,
+ const OUString& sPackage,
+ const OUString& sRelPath,
+ const OUString& sKey ,
sal_Int32 eMode );
//-----------------------------------------------
@@ -226,9 +226,9 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
* (Excepting these keys exists inside different configuration packages ...))
*/
static void writeDirectKey(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sPackage,
- const ::rtl::OUString& sRelPath,
- const ::rtl::OUString& sKey ,
+ const OUString& sPackage,
+ const OUString& sRelPath,
+ const OUString& sKey ,
const css::uno::Any& aValue ,
sal_Int32 eMode );
};
diff --git a/comphelper/inc/comphelper/container.hxx b/comphelper/inc/comphelper/container.hxx
index 62903dd7fdbe..d6c5be927873 100644
--- a/comphelper/inc/comphelper/container.hxx
+++ b/comphelper/inc/comphelper/container.hxx
@@ -47,7 +47,7 @@ protected:
// so I have to remember where each child is in relation to its parent.
// That is the path from the root node to m_xCurrentObject
- ::rtl::OUString m_ustrProperty;
+ OUString m_ustrProperty;
// The Name of the requested property
public:
diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/comphelper/inc/comphelper/docpasswordhelper.hxx
index f44838ee37a8..24fd868c0735 100644
--- a/comphelper/inc/comphelper/docpasswordhelper.hxx
+++ b/comphelper/inc/comphelper/docpasswordhelper.hxx
@@ -73,7 +73,7 @@ public:
occurred while password verification. The password request loop
will be aborted.
*/
- virtual DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0;
+ virtual DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0;
/** Will be called everytime an encryption data needs to be verified.
@@ -115,7 +115,7 @@ public:
*/
static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
- GenerateNewModifyPasswordInfo( const ::rtl::OUString& aPassword );
+ GenerateNewModifyPasswordInfo( const OUString& aPassword );
// ------------------------------------------------------------------------
@@ -134,7 +134,7 @@ public:
*/
static sal_Bool IsModifyPasswordCorrect(
- const ::rtl::OUString& aPassword,
+ const OUString& aPassword,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aInfo );
@@ -151,7 +151,7 @@ public:
*/
static sal_uInt32 GetWordHashAsUINT32(
- const ::rtl::OUString& aString );
+ const OUString& aString );
// ------------------------------------------------------------------------
@@ -171,7 +171,7 @@ public:
*/
static sal_uInt16 GetXLHashAsUINT16(
- const ::rtl::OUString& aString,
+ const OUString& aString,
rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 );
// ------------------------------------------------------------------------
@@ -192,7 +192,7 @@ public:
*/
static ::com::sun::star::uno::Sequence< sal_Int8 > GetXLHashAsSequence(
- const ::rtl::OUString& aString,
+ const OUString& aString,
rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 );
// ------------------------------------------------------------------------
@@ -211,7 +211,7 @@ public:
*/
static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateStd97Key(
- const ::rtl::OUString& aPassword,
+ const OUString& aPassword,
const ::com::sun::star::uno::Sequence< sal_Int8 >& aDocId );
// ------------------------------------------------------------------------
@@ -282,12 +282,12 @@ public:
static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestAndVerifyDocPassword(
IDocPasswordVerifier& rVerifier,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rMediaEncData,
- const ::rtl::OUString& rMediaPassword,
+ const OUString& rMediaPassword,
const ::com::sun::star::uno::Reference<
::com::sun::star::task::XInteractionHandler >& rxInteractHandler,
- const ::rtl::OUString& rDocumentName,
+ const OUString& rDocumentName,
DocPasswordRequestType eRequestType,
- const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0,
+ const ::std::vector< OUString >* pDefaultPasswords = 0,
bool* pbIsDefaultPassword = 0 );
// ------------------------------------------------------------------------
@@ -336,7 +336,7 @@ public:
IDocPasswordVerifier& rVerifier,
MediaDescriptor& rMediaDesc,
DocPasswordRequestType eRequestType,
- const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0 );
+ const ::std::vector< OUString >* pDefaultPasswords = 0 );
// ------------------------------------------------------------------------
diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx
index fd3232279867..54a32f522ae6 100644
--- a/comphelper/inc/comphelper/docpasswordrequest.hxx
+++ b/comphelper/inc/comphelper/docpasswordrequest.hxx
@@ -58,7 +58,7 @@ public:
sal_Bool isPassword() const;
- ::rtl::OUString getPassword() const;
+ OUString getPassword() const;
private:
// XInteractionRequest
@@ -85,7 +85,7 @@ public:
explicit DocPasswordRequest(
DocPasswordRequestType eType,
::com::sun::star::task::PasswordRequestMode eMode,
- const ::rtl::OUString& rDocumentName,
+ const OUString& rDocumentName,
sal_Bool bPasswordToModify = sal_False );
virtual ~DocPasswordRequest();
@@ -96,9 +96,9 @@ public:
sal_Bool isPassword() const;
- ::rtl::OUString getPassword() const;
+ OUString getPassword() const;
- ::rtl::OUString getPasswordToModify() const;
+ OUString getPasswordToModify() const;
sal_Bool getRecommendReadOnly() const;
private:
diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx
index 1f8dbd2f14ef..2bc00220995f 100644
--- a/comphelper/inc/comphelper/documentconstants.hxx
+++ b/comphelper/inc/comphelper/documentconstants.hxx
@@ -32,15 +32,15 @@
#define MIMETYPE_VND_SUN_XML_MATH_ASCII "application/vnd.sun.xml.math"
#define MIMETYPE_VND_SUN_XML_BASE_ASCII "application/vnd.sun.xml.base"
-#define MIMETYPE_VND_SUN_XML_WRITER ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII )
-#define MIMETYPE_VND_SUN_XML_WRITER_WEB ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII )
-#define MIMETYPE_VND_SUN_XML_WRITER_GLOBAL ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII )
-#define MIMETYPE_VND_SUN_XML_DRAW ::rtl::OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII )
-#define MIMETYPE_VND_SUN_XML_IMPRESS ::rtl::OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )
-#define MIMETYPE_VND_SUN_XML_CALC ::rtl::OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII )
-#define MIMETYPE_VND_SUN_XML_CHART ::rtl::OUString( MIMETYPE_VND_SUN_XML_CHART_ASCII )
-#define MIMETYPE_VND_SUN_XML_MATH ::rtl::OUString( MIMETYPE_VND_SUN_XML_MATH_ASCII )
-#define MIMETYPE_VND_SUN_XML_BASE ::rtl::OUString( MIMETYPE_VND_SUN_XML_BASE_ASCII )
+#define MIMETYPE_VND_SUN_XML_WRITER OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII )
+#define MIMETYPE_VND_SUN_XML_WRITER_WEB OUString( MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII )
+#define MIMETYPE_VND_SUN_XML_WRITER_GLOBAL OUString( MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII )
+#define MIMETYPE_VND_SUN_XML_DRAW OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII )
+#define MIMETYPE_VND_SUN_XML_IMPRESS OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )
+#define MIMETYPE_VND_SUN_XML_CALC OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII )
+#define MIMETYPE_VND_SUN_XML_CHART OUString( MIMETYPE_VND_SUN_XML_CHART_ASCII )
+#define MIMETYPE_VND_SUN_XML_MATH OUString( MIMETYPE_VND_SUN_XML_MATH_ASCII )
+#define MIMETYPE_VND_SUN_XML_BASE OUString( MIMETYPE_VND_SUN_XML_BASE_ASCII )
// template formats of SO6/7
#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII "application/vnd.sun.xml.writer.template"
@@ -48,10 +48,10 @@
#define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII "application/vnd.sun.xml.impress.template"
#define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII "application/vnd.sun.xml.calc.template"
-#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII )
-#define MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE ::rtl::OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII )
-#define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE ::rtl::OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )
-#define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE ::rtl::OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII )
+#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII )
+#define MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII )
+#define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )
+#define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII )
// formats of SO8
#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII "application/vnd.oasis.opendocument.text"
@@ -66,17 +66,17 @@
#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII "application/vnd.sun.xml.report"
#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII "application/vnd.sun.xml.report.chart"
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_CHART ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING OUString( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION OUString( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET OUString( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_CHART OUString( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA OUString( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE OUString( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII )
// template formats of SO8
#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII "application/vnd.oasis.opendocument.text-template"
@@ -98,9 +98,9 @@
#define ODFVER_011_TEXT_ASCII "1.1"
#define ODFVER_012_TEXT_ASCII "1.2"
-#define ODFVER_010_TEXT ::rtl::OUString( ODFVER_010_TEXT_ASCII )
-#define ODFVER_011_TEXT ::rtl::OUString( ODFVER_011_TEXT_ASCII )
-#define ODFVER_012_TEXT ::rtl::OUString( ODFVER_012_TEXT_ASCII )
+#define ODFVER_010_TEXT OUString( ODFVER_010_TEXT_ASCII )
+#define ODFVER_011_TEXT OUString( ODFVER_011_TEXT_ASCII )
+#define ODFVER_012_TEXT OUString( ODFVER_012_TEXT_ASCII )
#endif
// filter flags
diff --git a/comphelper/inc/comphelper/documentinfo.hxx b/comphelper/inc/comphelper/documentinfo.hxx
index e97b749443b2..48bc39a8cc00 100644
--- a/comphelper/inc/comphelper/documentinfo.hxx
+++ b/comphelper/inc/comphelper/documentinfo.hxx
@@ -36,7 +36,7 @@ namespace comphelper {
public:
/** retrieves the UI title of the given document
*/
- static ::rtl::OUString getDocumentTitle( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument );
+ static OUString getDocumentTitle( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument );
private:
DocumentInfo(); // never implemented
diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
index 2312b2d072fa..0347e12ba2c2 100644
--- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
+++ b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
@@ -53,15 +53,15 @@ class COMPHELPER_DLLPUBLIC EmbeddedObjectContainer
{
EmbedImpl* pImpl;
- ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > Get_Impl( const ::rtl::OUString&,
+ ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > Get_Impl( const OUString&,
const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xCopy);
public:
// add an embedded object to the container storage
- sal_Bool StoreEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString&, sal_Bool );
+ sal_Bool StoreEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString&, sal_Bool );
// add an embedded object that has been imported from the container storage - should only be called by filters!
- void AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, const ::rtl::OUString& );
+ void AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, const OUString& );
EmbeddedObjectContainer();
EmbeddedObjectContainer( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& );
@@ -73,86 +73,86 @@ public:
sal_Bool CommitImageSubStorage();
void ReleaseImageSubStorage();
- ::rtl::OUString CreateUniqueObjectName();
+ OUString CreateUniqueObjectName();
// get a list of object names that have been added so far
- com::sun::star::uno::Sequence < ::rtl::OUString > GetObjectNames();
+ com::sun::star::uno::Sequence < OUString > GetObjectNames();
// check for existence of objects at all
sal_Bool HasEmbeddedObjects();
// check existence of an object - either by identity or by name
- sal_Bool HasEmbeddedObject( const ::rtl::OUString& );
+ sal_Bool HasEmbeddedObject( const OUString& );
sal_Bool HasEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
- sal_Bool HasInstantiatedEmbeddedObject( const ::rtl::OUString& );
+ sal_Bool HasInstantiatedEmbeddedObject( const OUString& );
// get the object name of an object - this is the persist name if the object has persistence
- ::rtl::OUString GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
+ OUString GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
// retrieve an embedded object by name that either has been added already or is available in the container storage
- ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > GetEmbeddedObject( const ::rtl::OUString& );
+ ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > GetEmbeddedObject( const OUString& );
// create an object from a ClassId
::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >
- CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&, ::rtl::OUString& );
+ CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&, OUString& );
::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >
CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&,
- const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, ::rtl::OUString& );
+ const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, OUString& );
// insert an embedded object into the container - objects persistent representation will be added to the storage
- sal_Bool InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString& );
+ sal_Bool InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& );
// load an embedded object from a MediaDescriptor and insert it into the container
// a new object will be created from the new content and returned
::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >
- InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, ::rtl::OUString& );
+ InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, OUString& );
// create an embedded link based on a MediaDescriptor and insert it into the container
// a new object will be created from the new content and returned
::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >
- InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, ::rtl::OUString& );
+ InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, OUString& );
// create an object from a stream that contains its persistent representation and insert it as usual (usually called from clipboard)
// a new object will be created from the new content and returned
::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >
- InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >&, ::rtl::OUString& );
+ InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >&, OUString& );
// copy an embedded object into the storage, open the new copy and return it
- ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, /* TODO const ::rtl::OUString& aOrigName,*/ ::rtl::OUString& rName );
+ ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, /* TODO const OUString& aOrigName,*/ OUString& rName );
// move an embedded object from one container to another one
- sal_Bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString& );
+ sal_Bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& );
// remove an embedded object from the container and from the storage; if object can't be closed
- sal_Bool RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose=sal_True );
+ sal_Bool RemoveEmbeddedObject( const OUString& rName, sal_Bool bClose=sal_True );
sal_Bool RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose=sal_True );
// close and remove an embedded object from the container without removing it from the storage
sal_Bool CloseEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
// move an embedded object to another container (keep the persistent name)
- sal_Bool MoveEmbeddedObject( const ::rtl::OUString& rName, EmbeddedObjectContainer& );
+ sal_Bool MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& );
// get the stored graphical representation for the object
- com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString* pMediaType=0 );
+ com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString* pMediaType=0 );
// get the stored graphical representation by the object name
- com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const ::rtl::OUString& aName, ::rtl::OUString* pMediaType=0 );
+ com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const OUString& aName, OUString* pMediaType=0 );
// add a graphical representation for an object
- sal_Bool InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const ::rtl::OUString& rMediaType );
+ sal_Bool InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType );
// try to add a graphical representation for an object in optimized way ( might fail )
- sal_Bool InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType );
+ sal_Bool InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType );
// remove a graphical representation for an object
- sal_Bool RemoveGraphicStream( const ::rtl::OUString& rObjectName );
+ sal_Bool RemoveGraphicStream( const OUString& rObjectName );
// copy the graphical representation from different container
sal_Bool TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc,
- const ::rtl::OUString& aOrigName,
- const ::rtl::OUString& aTargetName );
+ const OUString& aOrigName,
+ const OUString& aTargetName );
void CloseEmbeddedObjects();
sal_Bool StoreChildren(sal_Bool _bOasisFormat,sal_Bool _bObjectsOnly);
@@ -163,7 +163,7 @@ public:
static com::sun::star::uno::Reference< com::sun::star::io::XInputStream > GetGraphicReplacementStream(
sal_Int64 nViewAspect,
const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&,
- ::rtl::OUString* pMediaType );
+ OUString* pMediaType );
/** call setPersistentEntry for each embedded object in the container
*
diff --git a/comphelper/inc/comphelper/enumhelper.hxx b/comphelper/inc/comphelper/enumhelper.hxx
index f8ff700f60a1..9870291b22f5 100644
--- a/comphelper/inc/comphelper/enumhelper.hxx
+++ b/comphelper/inc/comphelper/enumhelper.hxx
@@ -58,7 +58,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
, public ::cppu::WeakImplHelper2< starcontainer::XEnumeration ,
starlang::XEventListener >
{
- staruno::Sequence< ::rtl::OUString > m_aNames;
+ staruno::Sequence< OUString > m_aNames;
sal_Int32 m_nPos;
staruno::Reference< starcontainer::XNameAccess > m_xAccess;
sal_Bool m_bListening;
@@ -66,7 +66,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
public:
OEnumerationByName(const staruno::Reference< starcontainer::XNameAccess >& _rxAccess);
OEnumerationByName(const staruno::Reference< starcontainer::XNameAccess >& _rxAccess,
- const staruno::Sequence< ::rtl::OUString >& _aNames );
+ const staruno::Sequence< OUString >& _aNames );
virtual ~OEnumerationByName();
virtual sal_Bool SAL_CALL hasMoreElements( ) throw(staruno::RuntimeException);
diff --git a/comphelper/inc/comphelper/evtmethodhelper.hxx b/comphelper/inc/comphelper/evtmethodhelper.hxx
index f2aec5cdfef0..7ecf08a0fc57 100644
--- a/comphelper/inc/comphelper/evtmethodhelper.hxx
+++ b/comphelper/inc/comphelper/evtmethodhelper.hxx
@@ -22,7 +22,7 @@
//........................................................................
namespace comphelper
{
- COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type);
+ COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type);
//........................................................................
} // namespace comphelper
diff --git a/comphelper/inc/comphelper/ihwrapnofilter.hxx b/comphelper/inc/comphelper/ihwrapnofilter.hxx
index 2ac1ac93d761..eb0b13957874 100644
--- a/comphelper/inc/comphelper/ihwrapnofilter.hxx
+++ b/comphelper/inc/comphelper/ihwrapnofilter.hxx
@@ -52,8 +52,8 @@ namespace comphelper {
OIHWrapNoFilterDialog( com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > xInteraction );
~OIHWrapNoFilterDialog();
- static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames();
+ static OUString SAL_CALL impl_staticGetImplementationName();
+ static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
//____________________________________________________________________________________________________
@@ -83,13 +83,13 @@ namespace comphelper {
// XServiceInfo
//____________________________________________________________________________________________________
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
- virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw ( ::com::sun::star::uno::RuntimeException );
};
diff --git a/comphelper/inc/comphelper/interaction.hxx b/comphelper/inc/comphelper/interaction.hxx
index 230604ef87c9..bbd925efd3fa 100644
--- a/comphelper/inc/comphelper/interaction.hxx
+++ b/comphelper/inc/comphelper/interaction.hxx
@@ -113,17 +113,17 @@ namespace comphelper
{
}
- OInteractionPassword( const ::rtl::OUString& _rInitialPassword )
+ OInteractionPassword( const OUString& _rInitialPassword )
:m_sPassword( _rInitialPassword )
{
}
// XInteractionPassword
- virtual void SAL_CALL setPassword( const ::rtl::OUString& _Password ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPassword( const OUString& _Password ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException);
private:
- ::rtl::OUString m_sPassword;
+ OUString m_sPassword;
};
//=========================================================================
diff --git a/comphelper/inc/comphelper/logging.hxx b/comphelper/inc/comphelper/logging.hxx
index 56bebab74145..b6356384af3d 100644
--- a/comphelper/inc/comphelper/logging.hxx
+++ b/comphelper/inc/comphelper/logging.hxx
@@ -41,23 +41,23 @@ namespace comphelper
namespace log { namespace convert
{
- inline const ::rtl::OUString& convertLogArgToString( const ::rtl::OUString& _rValue )
+ inline const OUString& convertLogArgToString( const OUString& _rValue )
{
return _rValue;
}
- inline ::rtl::OUString convertLogArgToString( const sal_Char* _pAsciiValue )
+ inline OUString convertLogArgToString( const sal_Char* _pAsciiValue )
{
- return ::rtl::OUString::createFromAscii( _pAsciiValue );
+ return OUString::createFromAscii( _pAsciiValue );
}
- inline ::rtl::OUString convertLogArgToString( double _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
- inline ::rtl::OUString convertLogArgToString( float _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
- inline ::rtl::OUString convertLogArgToString( sal_Int64 _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
- inline ::rtl::OUString convertLogArgToString( sal_Int32 _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
- inline ::rtl::OUString convertLogArgToString( sal_Int16 _nValue ) { return ::rtl::OUString::valueOf( (sal_Int32)_nValue ); }
- inline ::rtl::OUString convertLogArgToString( sal_Unicode _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
- inline ::rtl::OUString convertLogArgToString( sal_Bool _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
+ inline OUString convertLogArgToString( double _nValue ) { return OUString::valueOf( _nValue ); }
+ inline OUString convertLogArgToString( float _nValue ) { return OUString::valueOf( _nValue ); }
+ inline OUString convertLogArgToString( sal_Int64 _nValue ) { return OUString::valueOf( _nValue ); }
+ inline OUString convertLogArgToString( sal_Int32 _nValue ) { return OUString::valueOf( _nValue ); }
+ inline OUString convertLogArgToString( sal_Int16 _nValue ) { return OUString::valueOf( (sal_Int32)_nValue ); }
+ inline OUString convertLogArgToString( sal_Unicode _nValue ) { return OUString::valueOf( _nValue ); }
+ inline OUString convertLogArgToString( sal_Bool _nValue ) { return OUString::valueOf( _nValue ); }
} } // namespace log::convert
@@ -65,7 +65,7 @@ namespace comphelper
//= EventLogger
//====================================================================
class EventLogger_Impl;
- typedef ::boost::optional< ::rtl::OUString > OptionalString;
+ typedef ::boost::optional< OUString > OptionalString;
/** encapsulates an <type scope="com::sun::star::logging">XLogger</type>
@@ -120,7 +120,7 @@ namespace comphelper
//- string messages
/// logs a given message, without any arguments, or source class/method names
- bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage ) const
+ bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, NULL, NULL, _rMessage );
@@ -135,7 +135,7 @@ namespace comphelper
is searched in the message string, and replaced with the argument string.
*/
template< typename ARGTYPE1 >
- bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1 ) const
+ bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -145,7 +145,7 @@ namespace comphelper
/// logs a given message, replacing 2 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2 >
- bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+ bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -156,7 +156,7 @@ namespace comphelper
/// logs a given message, replacing 3 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
- bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+ bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -168,7 +168,7 @@ namespace comphelper
/// logs a given message, replacing 4 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
- bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+ bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -181,7 +181,7 @@ namespace comphelper
/// logs a given message, replacing 5 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
- bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+ bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -195,7 +195,7 @@ namespace comphelper
/// logs a given message, replacing 6 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
- bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
+ bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -216,7 +216,7 @@ namespace comphelper
bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ) );
+ return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ) );
return false;
}
@@ -231,7 +231,7 @@ namespace comphelper
bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+ return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ) );
return false;
}
@@ -241,7 +241,7 @@ namespace comphelper
bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+ return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ) );
return false;
@@ -252,7 +252,7 @@ namespace comphelper
bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+ return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ) );
@@ -264,7 +264,7 @@ namespace comphelper
bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+ return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -277,7 +277,7 @@ namespace comphelper
bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+ return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -291,7 +291,7 @@ namespace comphelper
bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+ return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -306,7 +306,7 @@ namespace comphelper
//- string messages
/// logs a given message, without any arguments, or source class/method names
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage ) const
+ bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage );
@@ -321,7 +321,7 @@ namespace comphelper
is searched in the message string, and replaced with the argument string.
*/
template< typename ARGTYPE1 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1 ) const
+ bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -331,7 +331,7 @@ namespace comphelper
/// logs a given message, replacing 2 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+ bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -342,7 +342,7 @@ namespace comphelper
/// logs a given message, replacing 3 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+ bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -354,7 +354,7 @@ namespace comphelper
/// logs a given message, replacing 4 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+ bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -367,7 +367,7 @@ namespace comphelper
/// logs a given message, replacing 5 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+ bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -381,7 +381,7 @@ namespace comphelper
/// logs a given message, replacing 6 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
+ bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
{
if ( isLoggable( _nLogLevel ) )
return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -402,7 +402,7 @@ namespace comphelper
bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ) );
+ return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ) );
return false;
}
@@ -417,7 +417,7 @@ namespace comphelper
bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+ return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ) );
return false;
}
@@ -427,7 +427,7 @@ namespace comphelper
bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+ return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ) );
return false;
@@ -438,7 +438,7 @@ namespace comphelper
bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+ return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ) );
@@ -450,7 +450,7 @@ namespace comphelper
bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+ return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -463,7 +463,7 @@ namespace comphelper
bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+ return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -477,7 +477,7 @@ namespace comphelper
bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+ return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -492,7 +492,7 @@ namespace comphelper
const sal_Int32 _nLogLevel,
const sal_Char* _pSourceClass,
const sal_Char* _pSourceMethod,
- const ::rtl::OUString& _rMessage,
+ const OUString& _rMessage,
const OptionalString& _rArgument1 = OptionalString(),
const OptionalString& _rArgument2 = OptionalString(),
const OptionalString& _rArgument3 = OptionalString(),
@@ -714,7 +714,7 @@ namespace comphelper
}
private:
- ::rtl::OUString impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const;
+ OUString impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const;
};
//........................................................................
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index ac045dc2c4a0..7c7174644292 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -52,47 +52,47 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
does not work as expected under windows (under unix it works as well)
these way must be used :-(
*/
- static const ::rtl::OUString& PROP_ABORTED();
- static const ::rtl::OUString& PROP_ASTEMPLATE();
- static const ::rtl::OUString& PROP_COMPONENTDATA();
- static const ::rtl::OUString& PROP_DOCUMENTSERVICE();
- static const ::rtl::OUString& PROP_ENCRYPTIONDATA();
- static const ::rtl::OUString& PROP_FILENAME();
- static const ::rtl::OUString& PROP_FILTERNAME();
- static const ::rtl::OUString& PROP_FILTERPROVIDER();
- static const ::rtl::OUString& PROP_FILTEROPTIONS();
- static const ::rtl::OUString& PROP_FRAME();
- static const ::rtl::OUString& PROP_FRAMENAME();
- static const ::rtl::OUString& PROP_HIDDEN();
- static const ::rtl::OUString& PROP_INPUTSTREAM();
- static const ::rtl::OUString& PROP_INTERACTIONHANDLER();
- static const ::rtl::OUString& PROP_JUMPMARK();
- static const ::rtl::OUString& PROP_MACROEXECUTIONMODE();
- static const ::rtl::OUString& PROP_MEDIATYPE();
- static const ::rtl::OUString& PROP_MINIMIZED();
- static const ::rtl::OUString& PROP_NOAUTOSAVE();
- static const ::rtl::OUString& PROP_OPENNEWVIEW();
- static const ::rtl::OUString& PROP_OUTPUTSTREAM();
- static const ::rtl::OUString& PROP_PASSWORD();
- static const ::rtl::OUString& PROP_POSTDATA();
- static const ::rtl::OUString& PROP_PREVIEW();
- static const ::rtl::OUString& PROP_READONLY();
- static const ::rtl::OUString& PROP_REFERRER();
- static const ::rtl::OUString& PROP_SALVAGEDFILE();
- static const ::rtl::OUString& PROP_STATUSINDICATOR();
- static const ::rtl::OUString& PROP_STREAM();
- static const ::rtl::OUString& PROP_STREAMFOROUTPUT();
- static const ::rtl::OUString& PROP_TEMPLATENAME();
- static const ::rtl::OUString& PROP_TITLE();
- static const ::rtl::OUString& PROP_TYPENAME();
- static const ::rtl::OUString& PROP_UCBCONTENT();
- static const ::rtl::OUString& PROP_UPDATEDOCMODE();
- static const ::rtl::OUString& PROP_URL();
- static const ::rtl::OUString& PROP_VERSION();
- static const ::rtl::OUString& PROP_DOCUMENTTITLE();
- static const ::rtl::OUString& PROP_MODEL();
- static const ::rtl::OUString& PROP_VIEWONLY();
- static const ::rtl::OUString& PROP_DOCUMENTBASEURL();
+ static const OUString& PROP_ABORTED();
+ static const OUString& PROP_ASTEMPLATE();
+ static const OUString& PROP_COMPONENTDATA();
+ static const OUString& PROP_DOCUMENTSERVICE();
+ static const OUString& PROP_ENCRYPTIONDATA();
+ static const OUString& PROP_FILENAME();
+ static const OUString& PROP_FILTERNAME();
+ static const OUString& PROP_FILTERPROVIDER();
+ static const OUString& PROP_FILTEROPTIONS();
+ static const OUString& PROP_FRAME();
+ static const OUString& PROP_FRAMENAME();
+ static const OUString& PROP_HIDDEN();
+ static const OUString& PROP_INPUTSTREAM();
+ static const OUString& PROP_INTERACTIONHANDLER();
+ static const OUString& PROP_JUMPMARK();
+ static const OUString& PROP_MACROEXECUTIONMODE();
+ static const OUString& PROP_MEDIATYPE();
+ static const OUString& PROP_MINIMIZED();
+ static const OUString& PROP_NOAUTOSAVE();
+ static const OUString& PROP_OPENNEWVIEW();
+ static const OUString& PROP_OUTPUTSTREAM();
+ static const OUString& PROP_PASSWORD();
+ static const OUString& PROP_POSTDATA();
+ static const OUString& PROP_PREVIEW();
+ static const OUString& PROP_READONLY();
+ static const OUString& PROP_REFERRER();
+ static const OUString& PROP_SALVAGEDFILE();
+ static const OUString& PROP_STATUSINDICATOR();
+ static const OUString& PROP_STREAM();
+ static const OUString& PROP_STREAMFOROUTPUT();
+ static const OUString& PROP_TEMPLATENAME();
+ static const OUString& PROP_TITLE();
+ static const OUString& PROP_TYPENAME();
+ static const OUString& PROP_UCBCONTENT();
+ static const OUString& PROP_UPDATEDOCMODE();
+ static const OUString& PROP_URL();
+ static const OUString& PROP_VERSION();
+ static const OUString& PROP_DOCUMENTTITLE();
+ static const OUString& PROP_MODEL();
+ static const OUString& PROP_VIEWONLY();
+ static const OUString& PROP_DOCUMENTBASEURL();
static const OUString& PROP_DEEPDETECTION();
@@ -179,7 +179,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
Any.
*/
::com::sun::star::uno::Any getComponentDataEntry(
- const ::rtl::OUString& rName ) const;
+ const OUString& rName ) const;
//---------------------------------------
/** Inserts a value into the sequence contained in the property
@@ -198,7 +198,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
'ComponentData' property.
*/
void setComponentDataEntry(
- const ::rtl::OUString& rName,
+ const OUString& rName,
const ::com::sun::star::uno::Any& rValue );
//---------------------------------------
@@ -214,7 +214,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
of the 'ComponentData' property.
*/
void clearComponentDataEntry(
- const ::rtl::OUString& rName );
+ const OUString& rName );
//-------------------------------------------
// helper
@@ -267,7 +267,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
if the MediaDescriptor seems to be invalid!
*/
COMPHELPER_DLLPRIVATE sal_Bool impl_openStreamWithURL(
- const ::rtl::OUString& sURL,
+ const OUString& sURL,
sal_Bool bLockFile
) throw(::com::sun::star::uno::RuntimeException);
@@ -281,7 +281,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
@return [string]
the "normalized" URL (e.g. without jumpmark)
*/
- COMPHELPER_DLLPRIVATE ::rtl::OUString impl_normalizeURL(const ::rtl::OUString& sURL);
+ COMPHELPER_DLLPRIVATE OUString impl_normalizeURL(const OUString& sURL);
//---------------------------------------
/** @short it checks if the descriptor already has a valid
diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx
index 8cf7953394e7..6e2b128d5a23 100644
--- a/comphelper/inc/comphelper/mimeconfighelper.hxx
+++ b/comphelper/inc/comphelper/mimeconfighelper.hxx
@@ -51,13 +51,13 @@ public:
MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
- static ::rtl::OUString GetStringClassIDRepresentation( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID );
+ static OUString GetStringClassIDRepresentation( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID );
- static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassIDRepresentation( const ::rtl::OUString& aClassID );
+ static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassIDRepresentation( const OUString& aClassID );
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
- GetConfigurationByPath( const ::rtl::OUString& aPath );
+ GetConfigurationByPath( const OUString& aPath );
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetObjConfiguration();
@@ -65,61 +65,61 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetMediaTypeConfiguration();
- ::rtl::OUString GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName );
+ OUString GetDocServiceNameFromFilter( const OUString& aFilterName );
- ::rtl::OUString GetDocServiceNameFromMediaType( const ::rtl::OUString& aMediaType );
+ OUString GetDocServiceNameFromMediaType( const OUString& aMediaType );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjPropsFromConfigEntry(
const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xObjectProps );
- sal_Bool GetVerbByShortcut( const ::rtl::OUString& aVerbShortcut,
+ sal_Bool GetVerbByShortcut( const OUString& aVerbShortcut,
::com::sun::star::embed::VerbDescriptor& aDescriptor );
- ::rtl::OUString GetExplicitlyRegisteredObjClassID( const ::rtl::OUString& aMediaType );
+ OUString GetExplicitlyRegisteredObjClassID( const OUString& aMediaType );
// retrieving object description from configuration
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByStringClassID(
- const ::rtl::OUString& aStringClassID );
+ const OUString& aStringClassID );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByClassID(
const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByMediaType(
- const ::rtl::OUString& aMediaType );
+ const OUString& aMediaType );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByFilter(
- const ::rtl::OUString& aFilterName );
+ const OUString& aFilterName );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByDocumentName(
- const ::rtl::OUString& aDocumentName );
+ const OUString& aDocumentName );
// retrieving object factory from configuration
- ::rtl::OUString GetFactoryNameByStringClassID( const ::rtl::OUString& aStringClassID );
- ::rtl::OUString GetFactoryNameByClassID( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID );
- ::rtl::OUString GetFactoryNameByDocumentName( const ::rtl::OUString& aDocName );
- ::rtl::OUString GetFactoryNameByMediaType( const ::rtl::OUString& aMediaType );
+ OUString GetFactoryNameByStringClassID( const OUString& aStringClassID );
+ OUString GetFactoryNameByClassID( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID );
+ OUString GetFactoryNameByDocumentName( const OUString& aDocName );
+ OUString GetFactoryNameByMediaType( const OUString& aMediaType );
// typedetection related
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetFilterFactory();
- ::rtl::OUString UpdateMediaDescriptorWithFilterName(
+ OUString UpdateMediaDescriptorWithFilterName(
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
sal_Bool bIgnoreType );
- ::rtl::OUString UpdateMediaDescriptorWithFilterName(
+ OUString UpdateMediaDescriptorWithFilterName(
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObject );
#ifdef WNT
- sal_Int32 GetFilterFlags( const ::rtl::OUString& aFilterName );
+ sal_Int32 GetFilterFlags( const OUString& aFilterName );
sal_Bool AddFilterNameCheckOwnFile(
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr );
#endif
- ::rtl::OUString GetDefaultFilterFromServiceName( const ::rtl::OUString& aServName, sal_Int32 nVersion );
+ OUString GetDefaultFilterFromServiceName( const OUString& aServName, sal_Int32 nVersion );
- ::rtl::OUString GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName );
+ OUString GetExportFilterFromImportFilter( const OUString& aImportFilterName );
static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery,
diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx
index f42602bfccb4..93b53dd14c6c 100644
--- a/comphelper/inc/comphelper/namedvaluecollection.hxx
+++ b/comphelper/inc/comphelper/namedvaluecollection.hxx
@@ -132,7 +132,7 @@ namespace comphelper
/** returns the names of all elements in the collection
*/
- ::std::vector< ::rtl::OUString >
+ ::std::vector< OUString >
getNames() const;
/** merges the content of another collection into |this|
@@ -171,11 +171,11 @@ namespace comphelper
template < typename VALUE_TYPE >
bool get_ensureType( const sal_Char* _pAsciiValueName, VALUE_TYPE& _out_rValue ) const
{
- return get_ensureType( ::rtl::OUString::createFromAscii( _pAsciiValueName ), &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() );
+ return get_ensureType( OUString::createFromAscii( _pAsciiValueName ), &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() );
}
template < typename VALUE_TYPE >
- bool get_ensureType( const ::rtl::OUString& _rValueName, VALUE_TYPE& _out_rValue ) const
+ bool get_ensureType( const OUString& _rValueName, VALUE_TYPE& _out_rValue ) const
{
return get_ensureType( _rValueName, &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() );
}
@@ -186,11 +186,11 @@ namespace comphelper
template < typename VALUE_TYPE >
VALUE_TYPE getOrDefault( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rDefault ) const
{
- return getOrDefault( ::rtl::OUString::createFromAscii( _pAsciiValueName ), _rDefault );
+ return getOrDefault( OUString::createFromAscii( _pAsciiValueName ), _rDefault );
}
template < typename VALUE_TYPE >
- VALUE_TYPE getOrDefault( const ::rtl::OUString& _rValueName, const VALUE_TYPE& _rDefault ) const
+ VALUE_TYPE getOrDefault( const OUString& _rValueName, const VALUE_TYPE& _rDefault ) const
{
VALUE_TYPE retVal( _rDefault );
get_ensureType( _rValueName, retVal );
@@ -204,7 +204,7 @@ namespace comphelper
*/
const ::com::sun::star::uno::Any& get( const sal_Char* _pAsciiValueName ) const
{
- return get( ::rtl::OUString::createFromAscii( _pAsciiValueName ) );
+ return get( OUString::createFromAscii( _pAsciiValueName ) );
}
/** retrieves a (untyped) value with a given name
@@ -212,7 +212,7 @@ namespace comphelper
If the collection does not contain a value with the given name, an empty
Any is returned.
*/
- const ::com::sun::star::uno::Any& get( const ::rtl::OUString& _rValueName ) const
+ const ::com::sun::star::uno::Any& get( const OUString& _rValueName ) const
{
return impl_get( _rValueName );
}
@@ -220,11 +220,11 @@ namespace comphelper
/// determines whether a value with a given name is present in the collection
inline bool has( const sal_Char* _pAsciiValueName ) const
{
- return impl_has( ::rtl::OUString::createFromAscii( _pAsciiValueName ) );
+ return impl_has( OUString::createFromAscii( _pAsciiValueName ) );
}
/// determines whether a value with a given name is present in the collection
- inline bool has( const ::rtl::OUString& _rValueName ) const
+ inline bool has( const OUString& _rValueName ) const
{
return impl_has( _rValueName );
}
@@ -237,7 +237,7 @@ namespace comphelper
template < typename VALUE_TYPE >
inline bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue )
{
- return impl_put( ::rtl::OUString::createFromAscii( _pAsciiValueName ), ::com::sun::star::uno::makeAny( _rValue ) );
+ return impl_put( OUString::createFromAscii( _pAsciiValueName ), ::com::sun::star::uno::makeAny( _rValue ) );
}
/** puts a value into the collection
@@ -246,17 +246,17 @@ namespace comphelper
which case it has been overwritten.
*/
template < typename VALUE_TYPE >
- inline bool put( const ::rtl::OUString& _rValueName, const VALUE_TYPE& _rValue )
+ inline bool put( const OUString& _rValueName, const VALUE_TYPE& _rValue )
{
return impl_put( _rValueName, ::com::sun::star::uno::makeAny( _rValue ) );
}
inline bool put( const sal_Char* _pAsciiValueName, const ::com::sun::star::uno::Any& _rValue )
{
- return impl_put( ::rtl::OUString::createFromAscii( _pAsciiValueName ), _rValue );
+ return impl_put( OUString::createFromAscii( _pAsciiValueName ), _rValue );
}
- inline bool put( const ::rtl::OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue )
+ inline bool put( const OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue )
{
return impl_put( _rValueName, _rValue );
}
@@ -267,14 +267,14 @@ namespace comphelper
*/
inline bool remove( const sal_Char* _pAsciiValueName )
{
- return impl_remove( ::rtl::OUString::createFromAscii( _pAsciiValueName ) );
+ return impl_remove( OUString::createFromAscii( _pAsciiValueName ) );
}
/** removes the value with the given name from the collection
@return <TRUE/> if and only if a value with the given name existed in the collection.
*/
- inline bool remove( const ::rtl::OUString& _rValueName )
+ inline bool remove( const OUString& _rValueName )
{
return impl_remove( _rValueName );
}
@@ -336,19 +336,19 @@ namespace comphelper
void impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rArguments );
bool get_ensureType(
- const ::rtl::OUString& _rValueName,
+ const OUString& _rValueName,
void* _pValueLocation,
const ::com::sun::star::uno::Type& _rExpectedValueType
) const;
const ::com::sun::star::uno::Any&
- impl_get( const ::rtl::OUString& _rValueName ) const;
+ impl_get( const OUString& _rValueName ) const;
- bool impl_has( const ::rtl::OUString& _rValueName ) const;
+ bool impl_has( const OUString& _rValueName ) const;
- bool impl_put( const ::rtl::OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue );
+ bool impl_put( const OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue );
- bool impl_remove( const ::rtl::OUString& _rValueName );
+ bool impl_remove( const OUString& _rValueName );
template< class VALUE_TYPE >
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > impl_wrap() const
diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx
index 59183e460b9e..6a311767658d 100644
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/comphelper/inc/comphelper/numberedcollection.hxx
@@ -104,7 +104,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
@param sPrefix
the new prefix for untitled components.
*/
- void setUntitledPrefix(const ::rtl::OUString& sPrefix);
+ void setUntitledPrefix(const OUString& sPrefix);
//---------------------------------------
/** @see css.frame.XUntitledNumbers */
@@ -126,7 +126,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
//---------------------------------------
/** @see css.frame.XUntitledNumbers */
- virtual ::rtl::OUString SAL_CALL getUntitledPrefix()
+ virtual OUString SAL_CALL getUntitledPrefix()
throw (css::uno::RuntimeException);
//-------------------------------------------
@@ -160,7 +160,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
private:
/// localized string to be used for untitled components
- ::rtl::OUString m_sUntitledPrefix;
+ OUString m_sUntitledPrefix;
/// cache of all "leased numbers" and its bound components
TNumberedItemHash m_lComponents;
diff --git a/comphelper/inc/comphelper/numbers.hxx b/comphelper/inc/comphelper/numbers.hxx
index 87ae613a1084..b64fe341da4f 100644
--- a/comphelper/inc/comphelper/numbers.hxx
+++ b/comphelper/inc/comphelper/numbers.hxx
@@ -55,7 +55,7 @@ namespace comphelper
COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Any getNumberFormatProperty(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
sal_Int32 _nKey,
- const rtl::OUString& _rPropertyName
+ const OUString& _rPropertyName
);
//.........................................................................
diff --git a/comphelper/inc/comphelper/officeresourcebundle.hxx b/comphelper/inc/comphelper/officeresourcebundle.hxx
index 8bec9326524b..5e6d9e1bccc5 100644
--- a/comphelper/inc/comphelper/officeresourcebundle.hxx
+++ b/comphelper/inc/comphelper/officeresourcebundle.hxx
@@ -73,7 +73,7 @@ namespace comphelper
an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this
then.
*/
- ::rtl::OUString loadString( sal_Int32 _resourceId ) const;
+ OUString loadString( sal_Int32 _resourceId ) const;
/** determines whether the resource bundle has a string with the given id
@param _resourceId
diff --git a/comphelper/inc/comphelper/ofopxmlhelper.hxx b/comphelper/inc/comphelper/ofopxmlhelper.hxx
index c263022166cd..e054d0dbc909 100644
--- a/comphelper/inc/comphelper/ofopxmlhelper.hxx
+++ b/comphelper/inc/comphelper/ofopxmlhelper.hxx
@@ -37,28 +37,28 @@ class COMPHELPER_DLLPUBLIC OFOPXMLHelper : public cppu::WeakImplHelper1 < com::s
sal_uInt16 m_nFormat; // which format to parse
// Relations info related strings
- ::rtl::OUString m_aRelListElement;
- ::rtl::OUString m_aRelElement;
- ::rtl::OUString m_aIDAttr;
- ::rtl::OUString m_aTypeAttr;
- ::rtl::OUString m_aTargetModeAttr;
- ::rtl::OUString m_aTargetAttr;
+ OUString m_aRelListElement;
+ OUString m_aRelElement;
+ OUString m_aIDAttr;
+ OUString m_aTypeAttr;
+ OUString m_aTargetModeAttr;
+ OUString m_aTargetAttr;
// ContentType related strings
- ::rtl::OUString m_aTypesElement;
- ::rtl::OUString m_aDefaultElement;
- ::rtl::OUString m_aOverrideElement;
- ::rtl::OUString m_aExtensionAttr;
- ::rtl::OUString m_aPartNameAttr;
- ::rtl::OUString m_aContentTypeAttr;
+ OUString m_aTypesElement;
+ OUString m_aDefaultElement;
+ OUString m_aOverrideElement;
+ OUString m_aExtensionAttr;
+ OUString m_aPartNameAttr;
+ OUString m_aContentTypeAttr;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aResultSeq;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aElementsSeq; // stack of elements being parsed
+ ::com::sun::star::uno::Sequence< OUString > m_aElementsSeq; // stack of elements being parsed
OFOPXMLHelper( sal_uInt16 nFormat ); // must not be created directly
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > GetParsingResult();
- static COMPHELPER_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL ReadSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, sal_uInt16 nFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext )
+ static COMPHELPER_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL ReadSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const OUString& aStringID, sal_uInt16 nFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext )
throw( ::com::sun::star::uno::Exception );
public:
@@ -72,7 +72,7 @@ public:
SAL_CALL
ReadRelationsInfoSequence(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream,
- const ::rtl::OUString aStreamName,
+ const OUString aStreamName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext )
throw( ::com::sun::star::uno::Exception );
@@ -115,11 +115,11 @@ public:
// XDocumentHandler
virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
};
diff --git a/comphelper/inc/comphelper/propagg.hxx b/comphelper/inc/comphelper/propagg.hxx
index f499b2091a33..e49f589990e7 100644
--- a/comphelper/inc/comphelper/propagg.hxx
+++ b/comphelper/inc/comphelper/propagg.hxx
@@ -73,7 +73,7 @@ public:
@return the handle the property should be refered by, or -1 if there are no
preferences for the given property
*/
- virtual sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName) = 0;
+ virtual sal_Int32 getPreferedPropertyId(const OUString& _rName) = 0;
protected:
~IPropertyInfoService() {}
@@ -125,21 +125,21 @@ public:
/// inherited from IPropertyArrayHelper
- virtual sal_Bool SAL_CALL fillPropertyMembersByHandle( ::rtl::OUString* _pPropName, sal_Int16* _pAttributes,
+ virtual sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString* _pPropName, sal_Int16* _pAttributes,
sal_Int32 _nHandle) ;
/// inherited from IPropertyArrayHelper
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> SAL_CALL getProperties();
/// inherited from IPropertyArrayHelper
- virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const ::rtl::OUString& _rPropertyName)
+ virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& _rPropertyName)
throw(::com::sun::star::beans::UnknownPropertyException);
/// inherited from IPropertyArrayHelper
- virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& _rPropertyName) ;
+ virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& _rPropertyName) ;
/// inherited from IPropertyArrayHelper
- virtual sal_Int32 SAL_CALL getHandleByName(const ::rtl::OUString & _rPropertyName);
+ virtual sal_Int32 SAL_CALL getHandleByName(const OUString & _rPropertyName);
/// inherited from IPropertyArrayHelper
- virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropNames );
+ virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< OUString >& _rPropNames );
/** returns information about a property of the aggregate.
@param _pPropName points to a string to recieve the property name. No name is returned if this is NULL.
@@ -149,7 +149,7 @@ public:
@return sal_True, if _nHandle marks an aggregate property, otherwise sal_False
*/
- virtual bool SAL_CALL fillAggregatePropertyInfoByHandle(::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle,
+ virtual bool SAL_CALL fillAggregatePropertyInfoByHandle(OUString* _pPropName, sal_Int32* _pOriginalHandle,
sal_Int32 _nHandle) const;
/** returns information about a property given by handle
@@ -175,10 +175,10 @@ public:
When using the XPropertySetInfo of the aggregate set to determine the existence of a property, then this
would return false positives.</p>
*/
- PropertyOrigin classifyProperty( const ::rtl::OUString& _rName );
+ PropertyOrigin classifyProperty( const OUString& _rName );
protected:
- const ::com::sun::star::beans::Property* findPropertyByName(const ::rtl::OUString& _rName) const;
+ const ::com::sun::star::beans::Property* findPropertyByName(const OUString& _rName) const;
};
//==================================================================
@@ -221,8 +221,8 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XPropertySet
- virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XPropertiesChangeListener
virtual void SAL_CALL propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt) throw(::com::sun::star::uno::RuntimeException);
@@ -231,13 +231,13 @@ public:
virtual void SAL_CALL vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& aEvent) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
// XMultiPropertySet
- virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException);
// XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// OPropertySetHelper
/** still waiting to be overwritten ...
@@ -262,7 +262,7 @@ protected:
virtual void SAL_CALL disposing();
sal_Int32 getOriginalHandle( sal_Int32 _nHandle ) const;
- ::rtl::OUString getPropertyName( sal_Int32 _nHandle ) const;
+ OUString getPropertyName( sal_Int32 _nHandle ) const;
/** declares the property with the given (public) handle as one to be forwarded to the aggregate
diff --git a/comphelper/inc/comphelper/property.hxx b/comphelper/inc/comphelper/property.hxx
index 29ff7b2b9eca..e8d75c7ed3d6 100644
--- a/comphelper/inc/comphelper/property.hxx
+++ b/comphelper/inc/comphelper/property.hxx
@@ -55,15 +55,15 @@ namespace comphelper
//--------------------------------------------------------------------------
/** compare two properties by name
*/
- struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, ::rtl::OUString, bool >
+ struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, OUString, bool >
{
// ................................................................
- inline bool operator()( const ::com::sun::star::beans::Property& lhs, const ::rtl::OUString& rhs ) const
+ inline bool operator()( const ::com::sun::star::beans::Property& lhs, const OUString& rhs ) const
{
return lhs.Name == rhs ;
}
// ................................................................
- inline bool operator()( const ::rtl::OUString& lhs, const ::com::sun::star::beans::Property& rhs ) const
+ inline bool operator()( const OUString& lhs, const ::com::sun::star::beans::Property& rhs ) const
{
return lhs == rhs.Name ;
}
@@ -80,7 +80,7 @@ namespace comphelper
//------------------------------------------------------------------
/// remove the property with the given name from the given sequence
-COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>& seqProps, const ::rtl::OUString& _rPropName);
+COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>& seqProps, const OUString& _rPropName);
//------------------------------------------------------------------
/** within the given property sequence, modify attributes of a special property
@@ -89,12 +89,12 @@ COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>&
@param _nAddAttrib the attributes which should be added
@param _nRemoveAttrib the attributes which should be removed
*/
-COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence<starbeans::Property>& _rProps, const ::rtl::OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib);
+COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence<starbeans::Property>& _rProps, const OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib);
//------------------------------------------------------------------
/** check if the given set has the given property.
*/
-COMPHELPER_DLLPUBLIC sal_Bool hasProperty(const rtl::OUString& _rName, const staruno::Reference<starbeans::XPropertySet>& _rxSet);
+COMPHELPER_DLLPUBLIC sal_Bool hasProperty(const OUString& _rName, const staruno::Reference<starbeans::XPropertySet>& _rxSet);
//------------------------------------------------------------------
/** copy properties between property sets, in compliance with the property
diff --git a/comphelper/inc/comphelper/propertybag.hxx b/comphelper/inc/comphelper/propertybag.hxx
index 997b9e37015a..92c0026ba845 100644
--- a/comphelper/inc/comphelper/propertybag.hxx
+++ b/comphelper/inc/comphelper/propertybag.hxx
@@ -78,7 +78,7 @@ namespace comphelper
if the name is empty
*/
void addProperty(
- const ::rtl::OUString& _rName,
+ const OUString& _rName,
sal_Int32 _nHandle,
sal_Int32 _nAttributes,
const ::com::sun::star::uno::Any& _rInitialValue
@@ -106,7 +106,7 @@ namespace comphelper
if the name is empty
*/
void addVoidProperty(
- const ::rtl::OUString& _rName,
+ const OUString& _rName,
const ::com::sun::star::uno::Type& _rType,
sal_Int32 _nHandle,
sal_Int32 _nAttributes
@@ -123,7 +123,7 @@ namespace comphelper
call.
*/
void removeProperty(
- const ::rtl::OUString& _rName
+ const OUString& _rName
);
/** describes all properties in the bag
@@ -202,7 +202,7 @@ namespace comphelper
/** determines whether a property with a given name is part of the bag
*/
- inline bool hasPropertyByName( const ::rtl::OUString& _rName ) const
+ inline bool hasPropertyByName( const OUString& _rName ) const
{
return isRegisteredProperty( _rName );
}
diff --git a/comphelper/inc/comphelper/propertycontainerhelper.hxx b/comphelper/inc/comphelper/propertycontainerhelper.hxx
index 97e581a3d5c2..dacefd8737a6 100644
--- a/comphelper/inc/comphelper/propertycontainerhelper.hxx
+++ b/comphelper/inc/comphelper/propertycontainerhelper.hxx
@@ -54,7 +54,7 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription
LocationAccess aLocation; // access to the property value
PropertyDescription()
- :aProperty( ::rtl::OUString(), -1, ::com::sun::star::uno::Type(), 0 )
+ :aProperty( OUString(), -1, ::com::sun::star::uno::Type(), 0 )
,eLocated( ltHoldMyself )
{
aLocation.nOwnClassVectorIndex = -1;
@@ -101,7 +101,7 @@ protected:
@param _rMemberType the cppu type of the property represented by the object
to which _pPointerToMember points.
*/
- void registerProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
+ void registerProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType);
@@ -115,7 +115,7 @@ protected:
@param _rExpectedType the expected type of the property. NOT the type of the object to which
_pPointerToMember points (this is always an Any).
*/
- void registerMayBeVoidProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
+ void registerMayBeVoidProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType);
/** register a property. The repository will create an own object holding this property, so there is no
@@ -128,7 +128,7 @@ protected:
the ::com::sun::star::beans::PropertyAttribute::MAYBEVOID flag.
Else it must be a pointer to an object of the type described by _rType.
*/
- void registerPropertyNoMember(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
+ void registerPropertyNoMember(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue);
/** revokes a previously registered property
@@ -142,7 +142,7 @@ protected:
sal_Bool isRegisteredProperty( sal_Int32 _nHandle ) const;
/// checkes whether a property with the given name has been registered
- sal_Bool isRegisteredProperty( const ::rtl::OUString& _rName ) const;
+ sal_Bool isRegisteredProperty( const OUString& _rName ) const;
// helper for implementing OPropertySetHelper overridables
@@ -180,7 +180,7 @@ protected:
if no property with the given name is registered
*/
const ::com::sun::star::beans::Property&
- getProperty( const ::rtl::OUString& _rName ) const;
+ getProperty( const OUString& _rName ) const;
private:
/// insertion of _rProp into m_aProperties, keeping the sort order
diff --git a/comphelper/inc/comphelper/propertysethelper.hxx b/comphelper/inc/comphelper/propertysethelper.hxx
index c9f1b4da5f78..ecc600c37d3c 100644
--- a/comphelper/inc/comphelper/propertysethelper.hxx
+++ b/comphelper/inc/comphelper/propertysethelper.hxx
@@ -60,26 +60,26 @@ public:
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XMultiPropertySet
// virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
// XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
};
//.........................................................................
diff --git a/comphelper/inc/comphelper/propertysetinfo.hxx b/comphelper/inc/comphelper/propertysetinfo.hxx
index a9056fb270a2..e0b863e8f2ca 100644
--- a/comphelper/inc/comphelper/propertysetinfo.hxx
+++ b/comphelper/inc/comphelper/propertysetinfo.hxx
@@ -71,11 +71,11 @@ public:
void add( PropertyMapEntry* pMap ) throw();
/** removes an already added PropertyMapEntry which string in mpName equals to aName */
- void remove( const rtl::OUString& aName ) throw();
+ void remove( const OUString& aName ) throw();
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException);
};
//.........................................................................
diff --git a/comphelper/inc/comphelper/propertystatecontainer.hxx b/comphelper/inc/comphelper/propertystatecontainer.hxx
index e21b3a372827..acd368646628 100644
--- a/comphelper/inc/comphelper/propertystatecontainer.hxx
+++ b/comphelper/inc/comphelper/propertystatecontainer.hxx
@@ -59,10 +59,10 @@ namespace comphelper
// ................................................................
// XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// ................................................................
// own overridables
@@ -102,7 +102,7 @@ namespace comphelper
@throw UnknownPropertyException if the given name is not a registered property
*/
- sal_Int32 getHandleForName( const ::rtl::OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) );
+ sal_Int32 getHandleForName( const OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) );
};
//.........................................................................
diff --git a/comphelper/inc/comphelper/propmultiplex.hxx b/comphelper/inc/comphelper/propmultiplex.hxx
index 51484ce04e16..28795e57ce8a 100644
--- a/comphelper/inc/comphelper/propmultiplex.hxx
+++ b/comphelper/inc/comphelper/propmultiplex.hxx
@@ -71,7 +71,7 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer :public cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener>
{
friend class OPropertyChangeListener;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aProperties;
+ ::com::sun::star::uno::Sequence< OUString > m_aProperties;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSet;
OPropertyChangeListener* m_pListener;
sal_Int32 m_nLockCount;
@@ -96,7 +96,7 @@ namespace comphelper
/// get the lock count
sal_Int32 locked() const { return m_nLockCount; }
- void addProperty(const ::rtl::OUString& aPropertyName);
+ void addProperty(const OUString& aPropertyName);
void dispose();
};
diff --git a/comphelper/inc/comphelper/propstate.hxx b/comphelper/inc/comphelper/propstate.hxx
index b0e14c517f09..727f40d96824 100644
--- a/comphelper/inc/comphelper/propstate.hxx
+++ b/comphelper/inc/comphelper/propstate.hxx
@@ -57,13 +57,13 @@ namespace comphelper
// XPropertyState
virtual ::com::sun::star::beans::PropertyState SAL_CALL
- getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL
- getPropertyStates(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL
- setPropertyToDefault(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL
- getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// access via handle
virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle);
diff --git a/comphelper/inc/comphelper/sequence.hxx b/comphelper/inc/comphelper/sequence.hxx
index 9dc41b7cc68a..ad1e8943b952 100644
--- a/comphelper/inc/comphelper/sequence.hxx
+++ b/comphelper/inc/comphelper/sequence.hxx
@@ -38,7 +38,7 @@ namespace comphelper
/** search the given string within the given sequence, return the positions where it was found.
if _bOnlyFirst is sal_True, only the first occurrence will be returned.
*/
- COMPHELPER_DLLPUBLIC staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString >& _rList, const ::rtl::OUString& _rValue, sal_Bool _bOnlyFirst = sal_False);
+ COMPHELPER_DLLPUBLIC staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, sal_Bool _bOnlyFirst = sal_False);
/** Checks if the name exists
*
@@ -46,7 +46,7 @@ namespace comphelper
* \param _aList The list in which to search for the value.
* \return <TRUE/> if the value can be found, otherwise <FALSE/>.
*/
- COMPHELPER_DLLPUBLIC sal_Bool existsValue(const ::rtl::OUString& Value,const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _aList);
+ COMPHELPER_DLLPUBLIC sal_Bool existsValue(const OUString& Value,const ::com::sun::star::uno::Sequence< OUString >& _aList);
//-------------------------------------------------------------------------
diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx
index acf61f1a9031..0c8353776931 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/comphelper/inc/comphelper/sequenceashashmap.hxx
@@ -43,10 +43,10 @@ namespace comphelper{
*/
struct SequenceAsHashMapBase : public ::boost::unordered_map<
- ::rtl::OUString ,
+ OUString ,
::com::sun::star::uno::Any ,
- ::rtl::OUStringHash ,
- ::std::equal_to< ::rtl::OUString > >
+ OUStringHash ,
+ ::std::equal_to< OUString > >
{
};
@@ -226,7 +226,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
@attention "unpacked" means the Any content of every iterator->second!
*/
template< class TValueType >
- TValueType getUnpackedValueOrDefault(const ::rtl::OUString& sKey ,
+ TValueType getUnpackedValueOrDefault(const OUString& sKey ,
const TValueType& aDefault) const
{
const_iterator pIt = find(sKey);
@@ -262,7 +262,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
FALSE if it already exists.
*/
template< class TValueType >
- sal_Bool createItemIfMissing(const ::rtl::OUString& sKey ,
+ sal_Bool createItemIfMissing(const OUString& sKey ,
const TValueType& aValue)
{
if (find(sKey) == end())
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index d02e47fba612..be3b275cf215 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -120,14 +120,14 @@ public:
void * getFactory( sal_Char const* pImplName ) const;
/// @return supported service names
- ::com::sun::star::uno::Sequence< ::rtl::OUString>
+ ::com::sun::star::uno::Sequence< OUString>
getSupportedServiceNames() const;
/// @return whether name is in set of supported service names
- bool supportsService( ::rtl::OUString const& name ) const;
+ bool supportsService( OUString const& name ) const;
/// @return implementation name
- ::rtl::OUString getImplementationName() const;
+ OUString getImplementationName() const;
private:
class Factory;
@@ -165,15 +165,15 @@ public:
: BaseT(xContext), m_rServiceDecl(rServiceDecl) {}
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException) {
return m_rServiceDecl.getImplementationName();
}
- virtual sal_Bool SAL_CALL supportsService( ::rtl::OUString const& name )
+ virtual sal_Bool SAL_CALL supportsService( OUString const& name )
throw (css::uno::RuntimeException) {
return m_rServiceDecl.supportsService(name);
}
- virtual css::uno::Sequence< ::rtl::OUString>
+ virtual css::uno::Sequence< OUString>
SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) {
return m_rServiceDecl.getSupportedServiceNames();
}
diff --git a/comphelper/inc/comphelper/serviceinfohelper.hxx b/comphelper/inc/comphelper/serviceinfohelper.hxx
index 5c78f69e37a6..25169d1043a0 100644
--- a/comphelper/inc/comphelper/serviceinfohelper.hxx
+++ b/comphelper/inc/comphelper/serviceinfohelper.hxx
@@ -35,13 +35,13 @@ class COMPHELPER_DLLPUBLIC ServiceInfoHelper : public ::com::sun::star::lang::XS
{
public:
// 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);
// helper
- static void addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw();
- static sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw();
+ static void addToSequence( ::com::sun::star::uno::Sequence< OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw();
+ static sal_Bool SAL_CALL supportsService( const OUString& ServiceName, const ::com::sun::star::uno::Sequence< OUString >& SupportedServices ) throw();
protected:
~ServiceInfoHelper() {}
diff --git a/comphelper/inc/comphelper/stl_types.hxx b/comphelper/inc/comphelper/stl_types.hxx
index 1292f698a54a..cef5afdff3f2 100644
--- a/comphelper/inc/comphelper/stl_types.hxx
+++ b/comphelper/inc/comphelper/stl_types.hxx
@@ -46,17 +46,17 @@ namespace comphelper
// comparisation functions
//------------------------------------------------------------------------
- struct UStringLess : public ::std::binary_function< ::rtl::OUString, ::rtl::OUString, bool>
+ struct UStringLess : public ::std::binary_function< OUString, OUString, bool>
{
- bool operator() (const ::rtl::OUString& x, const ::rtl::OUString& y) const { return x < y ? true : false;} // construct prevents a MSVC6 warning
+ bool operator() (const OUString& x, const OUString& y) const { return x < y ? true : false;} // construct prevents a MSVC6 warning
};
//------------------------------------------------------------------------
-struct UStringMixLess : public ::std::binary_function< ::rtl::OUString, ::rtl::OUString, bool>
+struct UStringMixLess : public ::std::binary_function< OUString, OUString, bool>
{
bool m_bCaseSensitive;
public:
UStringMixLess(bool bCaseSensitive = true):m_bCaseSensitive(bCaseSensitive){}
- bool operator() (const ::rtl::OUString& x, const ::rtl::OUString& y) const
+ bool operator() (const OUString& x, const OUString& y) const
{
if (m_bCaseSensitive)
return rtl_ustr_compare(x.getStr(), y.getStr()) < 0 ? true : false;
@@ -69,13 +69,13 @@ public:
//------------------------------------------------------------------------
struct UStringEqual
{
- sal_Bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const { return lhs.equals( rhs );}
+ sal_Bool operator() (const OUString& lhs, const OUString& rhs) const { return lhs.equals( rhs );}
};
//------------------------------------------------------------------------
struct UStringIEqual
{
- sal_Bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const { return lhs.equalsIgnoreAsciiCase( rhs );}
+ sal_Bool operator() (const OUString& lhs, const OUString& rhs) const { return lhs.equalsIgnoreAsciiCase( rhs );}
};
//------------------------------------------------------------------------
@@ -85,14 +85,14 @@ class UStringMixEqual
public:
UStringMixEqual(sal_Bool bCaseSensitive = sal_True):m_bCaseSensitive(bCaseSensitive){}
- sal_Bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const
+ sal_Bool operator() (const OUString& lhs, const OUString& rhs) const
{
return m_bCaseSensitive ? lhs.equals( rhs ) : lhs.equalsIgnoreAsciiCase( rhs );
}
sal_Bool isCaseSensitive() const {return m_bCaseSensitive;}
};
//------------------------------------------------------------------------
-class TStringMixEqualFunctor : public ::std::binary_function< ::rtl::OUString,::rtl::OUString,bool>
+class TStringMixEqualFunctor : public ::std::binary_function< OUString,OUString,bool>
{
sal_Bool m_bCaseSensitive;
@@ -100,30 +100,30 @@ public:
TStringMixEqualFunctor(sal_Bool bCaseSensitive = sal_True)
:m_bCaseSensitive(bCaseSensitive)
{}
- bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const
+ bool operator() (const OUString& lhs, const OUString& rhs) const
{
return !!(m_bCaseSensitive ? lhs.equals( rhs ) : lhs.equalsIgnoreAsciiCase( rhs ));
}
sal_Bool isCaseSensitive() const {return m_bCaseSensitive;}
};
//------------------------------------------------------------------------
-class TPropertyValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::PropertyValue,::rtl::OUString,bool>
+class TPropertyValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::PropertyValue,OUString,bool>
{
public:
TPropertyValueEqualFunctor()
{}
- bool operator() (const ::com::sun::star::beans::PropertyValue& lhs, const ::rtl::OUString& rhs) const
+ bool operator() (const ::com::sun::star::beans::PropertyValue& lhs, const OUString& rhs) const
{
return !!(lhs.Name == rhs);
}
};
//------------------------------------------------------------------------
-class TNamedValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::NamedValue,::rtl::OUString,bool>
+class TNamedValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::NamedValue,OUString,bool>
{
public:
TNamedValueEqualFunctor()
{}
- bool operator() (const ::com::sun::star::beans::NamedValue& lhs, const ::rtl::OUString& rhs) const
+ bool operator() (const ::com::sun::star::beans::NamedValue& lhs, const OUString& rhs) const
{
return !!(lhs.Name == rhs);
}
@@ -135,7 +135,7 @@ class UStringMixHash
public:
UStringMixHash(sal_Bool bCaseSensitive = sal_True):m_bCaseSensitive(bCaseSensitive){}
- size_t operator() (const ::rtl::OUString& rStr) const
+ size_t operator() (const OUString& rStr) const
{
return m_bCaseSensitive ? rStr.hashCode() : rStr.toAsciiUpperCase().hashCode();
}
@@ -195,9 +195,9 @@ public:
typedef void pointer;
typedef size_t difference_type;
- OUStringBufferAppender(::rtl::OUStringBuffer & i_rBuffer)
+ OUStringBufferAppender(OUStringBuffer & i_rBuffer)
: m_rBuffer(i_rBuffer) { }
- Self & operator=(::rtl::OUString const & i_rStr)
+ Self & operator=(OUString const & i_rStr)
{
m_rBuffer.append( i_rStr );
return *this;
@@ -207,7 +207,7 @@ public:
Self & operator++(int) { return *this; }
private:
- ::rtl::OUStringBuffer & m_rBuffer;
+ OUStringBuffer & m_rBuffer;
};
//.........................................................................
@@ -258,7 +258,7 @@ OutputIter intersperse(
DECLARE_STL_ITERATORS(classname) \
#define DECLARE_STL_USTRINGACCESS_MAP(valuetype, classname) \
- DECLARE_STL_MAP(::rtl::OUString, valuetype, ::comphelper::UStringLess, classname) \
+ DECLARE_STL_MAP(OUString, valuetype, ::comphelper::UStringLess, classname) \
#define DECLARE_STL_STDKEY_SET(valuetype, classname) \
typedef ::std::set< valuetype > classname; \
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index b3351aa2b553..093038e6e5ed 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -27,13 +27,13 @@
#include "comphelper/comphelperdllapi.h"
-#define PACKAGE_STORAGE_FORMAT_STRING ::rtl::OUString( "PackageFormat" )
-#define ZIP_STORAGE_FORMAT_STRING ::rtl::OUString( "ZipFormat" )
-#define OFOPXML_STORAGE_FORMAT_STRING ::rtl::OUString( "OFOPXMLFormat" )
+#define PACKAGE_STORAGE_FORMAT_STRING OUString( "PackageFormat" )
+#define ZIP_STORAGE_FORMAT_STRING OUString( "ZipFormat" )
+#define OFOPXML_STORAGE_FORMAT_STRING OUString( "OFOPXMLFormat" )
-#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 ::rtl::OUString( "PackageSHA256UTF8EncryptionKey" )
-#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 ::rtl::OUString( "PackageSHA1UTF8EncryptionKey" )
-#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString( "PackageSHA1MS1252EncryptionKey" )
+#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 OUString( "PackageSHA256UTF8EncryptionKey" )
+#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 OUString( "PackageSHA1UTF8EncryptionKey" )
+#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 OUString( "PackageSHA1MS1252EncryptionKey" )
namespace com { namespace sun { namespace star {
namespace beans { struct NamedValue; }
@@ -89,7 +89,7 @@ public:
/// this one will only return Storage
static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
GetStorageFromURL(
- const ::rtl::OUString& aURL,
+ const OUString& aURL,
sal_Int32 nStorageMode,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
= ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() )
@@ -98,7 +98,7 @@ public:
/// this one will return either Storage or FileSystemStorage
static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
GetStorageFromURL2(
- const ::rtl::OUString& aURL,
+ const OUString& aURL,
sal_Int32 nStorageMode,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
= ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() )
@@ -127,7 +127,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
GetInputStreamFromURL(
- const ::rtl::OUString& aURL,
+ const OUString& aURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& context )
throw ( ::com::sun::star::uno::Exception );
@@ -143,8 +143,8 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
GetStorageOfFormatFromURL(
- const ::rtl::OUString& aFormat,
- const ::rtl::OUString& aURL,
+ const OUString& aFormat,
+ const OUString& aURL,
sal_Int32 nStorageMode,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
= ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(),
@@ -153,7 +153,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
GetStorageOfFormatFromInputStream(
- const ::rtl::OUString& aFormat,
+ const OUString& aFormat,
const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xStream,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
= ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(),
@@ -162,7 +162,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
GetStorageOfFormatFromStream(
- const ::rtl::OUString& aFormat,
+ const OUString& aFormat,
const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream >& xStream,
sal_Int32 nStorageMode = ::com::sun::star::embed::ElementModes::READWRITE,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
@@ -172,24 +172,24 @@ public:
static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >
CreatePackageEncryptionData(
- const ::rtl::OUString& aPassword );
+ const OUString& aPassword );
- static sal_Bool IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed );
+ static sal_Bool IsValidZipEntryFileName( const OUString& aName, sal_Bool bSlashAllowed );
static sal_Bool IsValidZipEntryFileName( const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed );
- static sal_Bool PathHasSegment( const ::rtl::OUString& aPath, const ::rtl::OUString& aSegment );
+ static sal_Bool PathHasSegment( const OUString& aPath, const OUString& aSegment );
// Methods to allow easy use of hierachical names inside storages
static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorageAtPath(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage,
- const ::rtl::OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness );
+ const OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness );
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStreamAtPath(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage,
- const ::rtl::OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness );
+ const OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness );
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStreamAtPackageURL(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage,
- const ::rtl::OUString& rURL, sal_uInt32 const nOpenMode,
+ const OUString& rURL, sal_uInt32 const nOpenMode,
LifecycleProxy & rNastiness );
};
diff --git a/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx
index 6e28895f7d90..85b0816b895e 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/comphelper/inc/comphelper/string.hxx
@@ -33,7 +33,7 @@
#include <com/sun/star/i18n/XCollator.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
-// rtl::OUString helper functions that are not widespread or mature enough to
+// OUString helper functions that are not widespread or mature enough to
// go into the stable URE API:
namespace comphelper { namespace string {
@@ -44,7 +44,7 @@ namespace comphelper { namespace string {
@return true if rIn has one char and its equal to c
*/
-inline bool equals(const rtl::OString& rIn, sal_Char c)
+inline bool equals(const OString& rIn, sal_Char c)
{ return rIn.getLength() == 1 && rIn[0] == c; }
/** Compare an OUString to a single char
@@ -54,12 +54,12 @@ inline bool equals(const rtl::OString& rIn, sal_Char c)
@return true if rIn has one char and its equal to c
*/
-inline bool equals(const rtl::OUString& rIn, sal_Unicode c)
+inline bool equals(const OUString& rIn, sal_Unicode c)
{ return rIn.getLength() == 1 && rIn[0] == c; }
/** Removes all occurrences of a character from within the source string
- @deprecated Use rtl::OString::replaceAll(rtl::OString(c), rtl::OString())
+ @deprecated Use OString::replaceAll(OString(c), OString())
instead.
@param rIn The input OString
@@ -67,23 +67,23 @@ inline bool equals(const rtl::OUString& rIn, sal_Unicode c)
@return The resulting OString
*/
-inline rtl::OString remove(const rtl::OString &rIn,
+inline OString remove(const OString &rIn,
sal_Char c)
-{ return rIn.replaceAll(rtl::OString(c), rtl::OString()); }
+{ return rIn.replaceAll(OString(c), OString()); }
/** Removes all occurrences of a character from within the source string
@deprecated Use
- rtl::OUString::replaceAll(rtl::OUString(c), rtl::OUString()) instead.
+ OUString::replaceAll(OUString(c), OUString()) instead.
@param rIn The input OUString
@param c The character to be removed
@return The resulting OUString
*/
-inline rtl::OUString remove(const rtl::OUString &rIn,
+inline OUString remove(const OUString &rIn,
sal_Unicode c)
-{ return rIn.replaceAll(rtl::OUString(c), rtl::OUString()); }
+{ return rIn.replaceAll(OUString(c), OUString()); }
/** Strips occurrences of a character from the start of the source string
@@ -92,7 +92,7 @@ inline rtl::OUString remove(const rtl::OUString &rIn,
@return The resulting OString
*/
-COMPHELPER_DLLPUBLIC rtl::OString stripStart(const rtl::OString &rIn,
+COMPHELPER_DLLPUBLIC OString stripStart(const OString &rIn,
sal_Char c);
/** Strips occurrences of a character from the start of the source string
@@ -102,7 +102,7 @@ COMPHELPER_DLLPUBLIC rtl::OString stripStart(const rtl::OString &rIn,
@return The resulting OUString
*/
-COMPHELPER_DLLPUBLIC rtl::OUString stripStart(const rtl::OUString &rIn,
+COMPHELPER_DLLPUBLIC OUString stripStart(const OUString &rIn,
sal_Unicode c);
/** Strips occurrences of a character from the end of the source string
@@ -112,7 +112,7 @@ COMPHELPER_DLLPUBLIC rtl::OUString stripStart(const rtl::OUString &rIn,
@return The resulting OString
*/
-COMPHELPER_DLLPUBLIC rtl::OString stripEnd(const rtl::OString &rIn,
+COMPHELPER_DLLPUBLIC OString stripEnd(const OString &rIn,
sal_Char c);
/** Strips occurrences of a character from the end of the source string
@@ -122,7 +122,7 @@ COMPHELPER_DLLPUBLIC rtl::OString stripEnd(const rtl::OString &rIn,
@return The resulting OUString
*/
-COMPHELPER_DLLPUBLIC rtl::OUString stripEnd(const rtl::OUString &rIn,
+COMPHELPER_DLLPUBLIC OUString stripEnd(const OUString &rIn,
sal_Unicode c);
/** Strips occurrences of a character from the start and end of the source string
@@ -132,7 +132,7 @@ COMPHELPER_DLLPUBLIC rtl::OUString stripEnd(const rtl::OUString &rIn,
@return The resulting OString
*/
-COMPHELPER_DLLPUBLIC rtl::OString strip(const rtl::OString &rIn,
+COMPHELPER_DLLPUBLIC OString strip(const OString &rIn,
sal_Char c);
/** Strips occurrences of a character from the start and end of the source string
@@ -142,12 +142,12 @@ COMPHELPER_DLLPUBLIC rtl::OString strip(const rtl::OString &rIn,
@return The resulting OUString
*/
-COMPHELPER_DLLPUBLIC rtl::OUString strip(const rtl::OUString &rIn,
+COMPHELPER_DLLPUBLIC OUString strip(const OUString &rIn,
sal_Unicode c);
/** Returns a token in an OString
- @deprecated Use rtl::OString::getToken(nToken, cTok) instead.
+ @deprecated Use OString::getToken(nToken, cTok) instead.
@param rIn the input OString
@param nToken the number of the token to return
@@ -155,7 +155,7 @@ COMPHELPER_DLLPUBLIC rtl::OUString strip(const rtl::OUString &rIn,
@return the token if token is negative or doesn't exist an empty token
is returned
*/
-inline rtl::OString getToken(const rtl::OString &rIn,
+inline OString getToken(const OString &rIn,
sal_Int32 nToken, sal_Char cTok) SAL_THROW(())
{
return rIn.getToken(nToken, cTok);
@@ -163,7 +163,7 @@ inline rtl::OString getToken(const rtl::OString &rIn,
/** Returns a token in an OUString
- @deprecated Use rtl::OUString::getToken(nToken, cTok) instead.
+ @deprecated Use OUString::getToken(nToken, cTok) instead.
@param rIn the input OUString
@param nToken the number of the token to return
@@ -171,7 +171,7 @@ inline rtl::OString getToken(const rtl::OString &rIn,
@return the token if token is negative or doesn't exist an empty token
is returned
*/
-inline rtl::OUString getToken(const rtl::OUString &rIn,
+inline OUString getToken(const OUString &rIn,
sal_Int32 nToken, sal_Unicode cTok) SAL_THROW(())
{
return rIn.getToken(nToken, cTok);
@@ -183,7 +183,7 @@ inline rtl::OUString getToken(const rtl::OUString &rIn,
@param cTok the character which seperate the tokens.
@return the number of tokens
*/
-COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const rtl::OString &rIn, sal_Char cTok);
+COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok);
/** Returns number of tokens in an OUString
@@ -191,21 +191,21 @@ COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const rtl::OString &rIn, sal_Char c
@param cTok the character which seperate the tokens.
@return the number of tokens
*/
-COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const rtl::OUString &rIn, sal_Unicode cTok);
+COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OUString &rIn, sal_Unicode cTok);
/** Reverse an OUString
@param rIn the input OUString
@return the reversed input
*/
-COMPHELPER_DLLPUBLIC rtl::OUString reverseString(const rtl::OUString &rStr);
+COMPHELPER_DLLPUBLIC OUString reverseString(const OUString &rStr);
/** Reverse an OString
@param rIn the input OString
@return the reversed input
*/
-COMPHELPER_DLLPUBLIC rtl::OString reverseString(const rtl::OString &rStr);
+COMPHELPER_DLLPUBLIC OString reverseString(const OString &rStr);
namespace detail
@@ -230,14 +230,14 @@ namespace detail
@return rBuf;
*/
-COMPHELPER_DLLPUBLIC inline rtl::OStringBuffer& truncateToLength(
- rtl::OStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
+COMPHELPER_DLLPUBLIC inline OStringBuffer& truncateToLength(
+ OStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
{
return detail::truncateToLength(rBuffer, nLength);
}
-COMPHELPER_DLLPUBLIC inline rtl::OUStringBuffer& truncateToLength(
- rtl::OUStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
+COMPHELPER_DLLPUBLIC inline OUStringBuffer& truncateToLength(
+ OUStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
{
return detail::truncateToLength(rBuffer, nLength);
}
@@ -271,15 +271,15 @@ namespace detail
@return rBuf;
*/
-COMPHELPER_DLLPUBLIC inline rtl::OStringBuffer& padToLength(
- rtl::OStringBuffer& rBuffer, sal_Int32 nLength,
+COMPHELPER_DLLPUBLIC inline OStringBuffer& padToLength(
+ OStringBuffer& rBuffer, sal_Int32 nLength,
sal_Char cFill = '\0') SAL_THROW(())
{
return detail::padToLength(rBuffer, nLength, cFill);
}
-COMPHELPER_DLLPUBLIC inline rtl::OUStringBuffer& padToLength(
- rtl::OUStringBuffer& rBuffer, sal_Int32 nLength,
+COMPHELPER_DLLPUBLIC inline OUStringBuffer& padToLength(
+ OUStringBuffer& rBuffer, sal_Int32 nLength,
sal_Unicode cFill = '\0') SAL_THROW(())
{
return detail::padToLength(rBuffer, nLength, cFill);
@@ -293,7 +293,7 @@ COMPHELPER_DLLPUBLIC inline rtl::OUStringBuffer& padToLength(
@return position of first occurrence of any of the elements of pChars
or -1 if none of the code units occur in the string
*/
-COMPHELPER_DLLPUBLIC sal_Int32 indexOfAny(rtl::OUString const& rIn,
+COMPHELPER_DLLPUBLIC sal_Int32 indexOfAny(OUString const& rIn,
sal_Unicode const*const pChars, sal_Int32 const nPos = 0);
/** Convert a sequence of strings to a single comma separated string.
@@ -305,8 +305,8 @@ COMPHELPER_DLLPUBLIC sal_Int32 indexOfAny(rtl::OUString const& rIn,
@return A single string containing the concatenation of the given
list, interspersed with the string ", ".
*/
-COMPHELPER_DLLPUBLIC ::rtl::OUString convertCommaSeparated(
- ::com::sun::star::uno::Sequence< ::rtl::OUString > const & i_rSeq);
+COMPHELPER_DLLPUBLIC OUString convertCommaSeparated(
+ ::com::sun::star::uno::Sequence< OUString > const & i_rSeq);
/** Convert a decimal string to a number.
@@ -319,7 +319,7 @@ COMPHELPER_DLLPUBLIC ::rtl::OUString convertCommaSeparated(
gives unspecified results
If your string is guaranteed to contain only ASCII digit
- use rtl::OUString::toInt32 instead.
+ use OUString::toInt32 instead.
@param str The string to convert containing only decimal
digit codepoints.
@@ -327,7 +327,7 @@ COMPHELPER_DLLPUBLIC ::rtl::OUString convertCommaSeparated(
@return The value of the string as an int32.
*/
COMPHELPER_DLLPUBLIC sal_uInt32 decimalStringToNumber(
- ::rtl::OUString const & str );
+ OUString const & str );
/** Convert a single comma separated string to a sequence of strings.
@@ -338,8 +338,8 @@ COMPHELPER_DLLPUBLIC sal_uInt32 decimalStringToNumber(
@return A sequence of strings resulting from splitting the given
string at ',' tokens and stripping whitespace.
*/
-COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString >
- convertCommaSeparated( ::rtl::OUString const & i_rString );
+COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString >
+ convertCommaSeparated( OUString const & i_rString );
/**
Compares two strings using natural order.
@@ -357,7 +357,7 @@ COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString >
< 0 - if this string is less than the string argument
> 0 - if this string is greater than the string argument
*/
-COMPHELPER_DLLPUBLIC sal_Int32 compareNatural( const ::rtl::OUString &rLHS, const ::rtl::OUString &rRHS,
+COMPHELPER_DLLPUBLIC sal_Int32 compareNatural( const OUString &rLHS, const OUString &rRHS,
const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > &rCollator,
const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > &rBI,
const ::com::sun::star::lang::Locale &rLocale );
@@ -372,7 +372,7 @@ public:
NaturalStringSorter(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext,
const ::com::sun::star::lang::Locale &rLocale);
- sal_Int32 compare(const rtl::OUString &rLHS, const rtl::OUString &rRHS) const
+ sal_Int32 compare(const OUString &rLHS, const OUString &rRHS) const
{
return compareNatural(rLHS, rRHS, m_xCollator, m_xBI, m_aLocale);
}
@@ -387,7 +387,7 @@ public:
the ASCII '0'-'9' range
true otherwise, including for empty string
*/
-COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const rtl::OString &rString);
+COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OString &rString);
/** Determine if an OUString contains solely ASCII numeric digits
@@ -397,7 +397,7 @@ COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const rtl::OString &rString);
the ASCII '0'-'9' range
true otherwise, including for empty string
*/
-COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const rtl::OUString &rString);
+COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OUString &rString);
COMPHELPER_DLLPUBLIC inline bool isdigitAscii(sal_Unicode c)
{
@@ -437,9 +437,9 @@ struct COMPHELPER_DLLPUBLIC ConstAsciiString
const sal_Char* ascii;
sal_Int32 length;
- operator rtl::OUString() const
+ operator OUString() const
{
- return rtl::OUString(ascii, length, RTL_TEXTENCODING_ASCII_US);
+ return OUString(ascii, length, RTL_TEXTENCODING_ASCII_US);
}
};
diff --git a/comphelper/inc/comphelper/synchronousdispatch.hxx b/comphelper/inc/comphelper/synchronousdispatch.hxx
index 3b3f4a6e4482..fc5c5fe59f4b 100644
--- a/comphelper/inc/comphelper/synchronousdispatch.hxx
+++ b/comphelper/inc/comphelper/synchronousdispatch.hxx
@@ -52,8 +52,8 @@ namespace comphelper
public:
static COMPHELPER_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::lang::XComponent > dispatch(
const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &xStartPoint,
- const rtl::OUString &sURL,
- const rtl::OUString &sTarget,
+ const OUString &sURL,
+ const OUString &sTarget,
const sal_Int32 nFlags,
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &lArguments );
};
diff --git a/comphelper/inc/comphelper/types.hxx b/comphelper/inc/comphelper/types.hxx
index 2f5ad6d353a1..66c6a9e0bcfb 100644
--- a/comphelper/inc/comphelper/types.hxx
+++ b/comphelper/inc/comphelper/types.hxx
@@ -44,7 +44,7 @@ namespace comphelper
namespace starlang = ::com::sun::star::lang;
typedef staruno::Reference< staruno::XInterface > InterfaceRef;
- typedef staruno::Sequence< ::rtl::OUString > StringSequence;
+ typedef staruno::Sequence< OUString > StringSequence;
//-------------------------------------------------------------------------
/** compare the two given Anys
@@ -152,7 +152,7 @@ namespace comphelper
COMPHELPER_DLLPUBLIC sal_Int16 getINT16(const staruno::Any& _rAny);
COMPHELPER_DLLPUBLIC double getDouble(const staruno::Any& _rAny);
COMPHELPER_DLLPUBLIC float getFloat(const staruno::Any& _rAny);
- COMPHELPER_DLLPUBLIC ::rtl::OUString getString(const staruno::Any& _rAny);
+ COMPHELPER_DLLPUBLIC OUString getString(const staruno::Any& _rAny);
COMPHELPER_DLLPUBLIC sal_Bool getBOOL(const staruno::Any& _rAny);
COMPHELPER_DLLPUBLIC sal_Int32 getEnumAsINT32(const staruno::Any& _rAny) throw(starlang::IllegalArgumentException);
diff --git a/comphelper/inc/comphelper/unwrapargs.hxx b/comphelper/inc/comphelper/unwrapargs.hxx
index ca4681b8992c..c4885f3883d9 100644
--- a/comphelper/inc/comphelper/unwrapargs.hxx
+++ b/comphelper/inc/comphelper/unwrapargs.hxx
@@ -51,7 +51,7 @@ inline void extract(
xErrorContext, static_cast<sal_Int16>(nArg) );
}
if (! (seq[nArg] >>= v)) {
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.append( "Cannot extract ANY { " );
buf.append( seq[nArg].getValueType().getTypeName() );
buf.append( " } to " );
diff --git a/comphelper/inc/comphelper/xmltools.hxx b/comphelper/inc/comphelper/xmltools.hxx
index c333ecf6acf3..988e8558542c 100644
--- a/comphelper/inc/comphelper/xmltools.hxx
+++ b/comphelper/inc/comphelper/xmltools.hxx
@@ -39,7 +39,7 @@ namespace comphelper
{
namespace xml
{
- COMPHELPER_DLLPUBLIC rtl::OString makeXMLChaff();
+ COMPHELPER_DLLPUBLIC OString makeXMLChaff();
}
}