[Libreoffice-commits] core.git: include/registry include/rtl include/store
Stephan Bergmann
sbergman at redhat.com
Wed Dec 18 06:37:36 PST 2013
include/registry/reader.hxx | 64 +++++++++---------
include/registry/reflread.hxx | 96 +++++++++++++--------------
include/registry/reflwrit.hxx | 64 +++++++++---------
include/registry/registry.hxx | 148 +++++++++++++++++++++---------------------
include/registry/writer.hxx | 30 ++++----
include/rtl/bootstrap.hxx | 4 -
include/store/store.hxx | 32 ++++-----
7 files changed, 219 insertions(+), 219 deletions(-)
New commits:
commit f0e7b79db7ab60ae6be94658ec5a38d11fa75ec7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Dec 18 15:36:41 2013 +0100
URE headers do not have "using rtl::OUString"
Change-Id: I525b93371dbd89dafa6916f7c3696423f44753f6
diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx
index cb0a652..e1a06f0 100644
--- a/include/registry/reader.hxx
+++ b/include/registry/reader.hxx
@@ -141,13 +141,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getDocumentation() const {
+ rtl::OUString getDocumentation() const {
rtl_uString * s = 0;
typereg_reader_getDocumentation(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -159,13 +159,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
@deprecated
*/
- OUString getFileName() const {
+ rtl::OUString getFileName() const {
rtl_uString * s = 0;
typereg_reader_getFileName(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -200,13 +200,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getTypeName() const {
+ rtl::OUString getTypeName() const {
rtl_uString * s = 0;
typereg_reader_getTypeName(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -229,13 +229,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getSuperTypeName(sal_uInt16 index) const {
+ rtl::OUString getSuperTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getSuperTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -257,13 +257,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getFieldDocumentation(sal_uInt16 index) const {
+ rtl::OUString getFieldDocumentation(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldDocumentation(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -276,13 +276,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
@deprecated
*/
- OUString getFieldFileName(sal_uInt16 index) const {
+ rtl::OUString getFieldFileName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldFileName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -305,13 +305,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getFieldName(sal_uInt16 index) const {
+ rtl::OUString getFieldName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -323,13 +323,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getFieldTypeName(sal_uInt16 index) const {
+ rtl::OUString getFieldTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -370,13 +370,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getMethodDocumentation(sal_uInt16 index) const {
+ rtl::OUString getMethodDocumentation(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getMethodDocumentation(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -399,13 +399,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getMethodName(sal_uInt16 index) const {
+ rtl::OUString getMethodName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getMethodName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -417,13 +417,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getMethodReturnTypeName(sal_uInt16 index) const {
+ rtl::OUString getMethodReturnTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getMethodReturnTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -468,7 +468,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getMethodParameterName(
+ rtl::OUString getMethodParameterName(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const
{
rtl_uString * s = 0;
@@ -477,7 +477,7 @@ public:
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -493,7 +493,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getMethodParameterTypeName(
+ rtl::OUString getMethodParameterTypeName(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const
{
rtl_uString * s = 0;
@@ -502,7 +502,7 @@ public:
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -529,7 +529,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getMethodExceptionTypeName(
+ rtl::OUString getMethodExceptionTypeName(
sal_uInt16 methodIndex, sal_uInt16 exceptionIndex) const
{
rtl_uString * s = 0;
@@ -538,7 +538,7 @@ public:
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -561,13 +561,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getReferenceDocumentation(sal_uInt16 index) const {
+ rtl::OUString getReferenceDocumentation(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getReferenceDocumentation(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -604,13 +604,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- OUString getReferenceTypeName(sal_uInt16 index) const {
+ rtl::OUString getReferenceTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getReferenceTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return OUString(s, SAL_NO_ACQUIRE);
+ return rtl::OUString(s, SAL_NO_ACQUIRE);
}
private:
diff --git a/include/registry/reflread.hxx b/include/registry/reflread.hxx
index 15fbe37..b044bb7 100644
--- a/include/registry/reflread.hxx
+++ b/include/registry/reflread.hxx
@@ -151,11 +151,11 @@ public:
/** returns the full qualified name of the type.
*/
- inline OUString getTypeName() const;
+ inline rtl::OUString getTypeName() const;
/** returns the full qualified name of the supertype.
*/
- inline OUString getSuperTypeName() const;
+ inline rtl::OUString getSuperTypeName() const;
/** @deprecated
returns the unique identifier for an interface type as an out parameter.
@@ -168,11 +168,11 @@ public:
/** returns the documentation string of this type.
*/
- inline OUString getDoku() const;
+ inline rtl::OUString getDoku() const;
/** returns the IDL filename where the type is defined.
*/
- inline OUString getFileName() const;
+ inline rtl::OUString getFileName() const;
/** returns the number of fields (attributes/properties, enum values or number
of constants in a module).
@@ -182,11 +182,11 @@ public:
/** returns the name of the field specified by index.
*/
- inline OUString getFieldName( sal_uInt16 index ) const;
+ inline rtl::OUString getFieldName( sal_uInt16 index ) const;
/** returns the full qualified name of the field specified by index.
*/
- inline OUString getFieldType( sal_uInt16 index ) const;
+ inline rtl::OUString getFieldType( sal_uInt16 index ) const;
/** returns the access mode of the field specified by index.
*/
@@ -202,14 +202,14 @@ public:
Each field of a type can have their own documentation.
*/
- inline OUString getFieldDoku( sal_uInt16 index ) const;
+ inline rtl::OUString getFieldDoku( sal_uInt16 index ) const;
/** returns the IDL filename of the field specified by index.
The IDL filename of a field can differ from the filename of the ype itself
because modules and also constants can be defined in different IDL files.
*/
- inline OUString getFieldFileName( sal_uInt16 index ) const;
+ inline rtl::OUString getFieldFileName( sal_uInt16 index ) const;
/** returns the number of methods of an interface type.
*/
@@ -217,7 +217,7 @@ public:
/** returns the name of the method specified by index.
*/
- inline OUString getMethodName( sal_uInt16 index ) const;
+ inline rtl::OUString getMethodName( sal_uInt16 index ) const;
/** returns number of parameters of the method specified by index.
*/
@@ -228,14 +228,14 @@ public:
@param index indicates the method
@param paramIndex indeciates the parameter which type will be returned.
*/
- inline OUString getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const;
+ inline rtl::OUString getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const;
/** returns the name of a parameter.
@param index indicates the method
@param paramIndex indiciates the parameter which name will be returned.
*/
- inline OUString getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const;
+ inline rtl::OUString getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const;
/** returns the parameter mode, if it is an in, out or inout parameter.
@@ -255,11 +255,11 @@ public:
@param index indicates the method
@param excIndex indeciates the exception which typename will be returned.
*/
- inline OUString getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const;
+ inline rtl::OUString getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const;
/** returns the full qualified return type of the method specified by index.
*/
- inline OUString getMethodReturnType( sal_uInt16 index ) const;
+ inline rtl::OUString getMethodReturnType( sal_uInt16 index ) const;
/** returns the full qualified exception type of the specified exception.
@@ -271,7 +271,7 @@ public:
@param index indicates the method.
*/
- inline OUString getMethodDoku( sal_uInt16 index ) const;
+ inline rtl::OUString getMethodDoku( sal_uInt16 index ) const;
/** returns the number of references (supported interfaces, exported services).
*/
@@ -281,7 +281,7 @@ public:
@param index indicates the reference.
*/
- inline OUString getReferenceName( sal_uInt16 index ) const;
+ inline rtl::OUString getReferenceName( sal_uInt16 index ) const;
/** returns the type of the reference specified by index.
@@ -293,7 +293,7 @@ public:
@param index indicates the reference.
*/
- inline OUString getReferenceDoku( sal_uInt16 index ) const;
+ inline rtl::OUString getReferenceDoku( sal_uInt16 index ) const;
/** returns the access mode of the reference specified by index.
@@ -356,16 +356,16 @@ inline sal_uInt16 RegistryTypeReader::getMajorVersion() const
inline RTTypeClass RegistryTypeReader::getTypeClass() const
{ return m_pApi->getTypeClass(m_hImpl); }
-inline OUString RegistryTypeReader::getTypeName() const
+inline rtl::OUString RegistryTypeReader::getTypeName() const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getTypeName(m_hImpl, &sRet.pData);
return sRet;
}
-inline OUString RegistryTypeReader::getSuperTypeName() const
+inline rtl::OUString RegistryTypeReader::getSuperTypeName() const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getSuperTypeName(m_hImpl, &sRet.pData);
return sRet;
}
@@ -373,16 +373,16 @@ inline OUString RegistryTypeReader::getSuperTypeName() const
inline void RegistryTypeReader::getUik(RTUik& uik) const
{ m_pApi->getUik(m_hImpl, &uik); }
-inline OUString RegistryTypeReader::getDoku() const
+inline rtl::OUString RegistryTypeReader::getDoku() const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getDoku(m_hImpl, &sRet.pData);
return sRet;
}
-inline OUString RegistryTypeReader::getFileName() const
+inline rtl::OUString RegistryTypeReader::getFileName() const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getFileName(m_hImpl, &sRet.pData);
return sRet;
}
@@ -390,16 +390,16 @@ inline OUString RegistryTypeReader::getFileName() const
inline sal_uInt32 RegistryTypeReader::getFieldCount() const
{ return m_pApi->getFieldCount(m_hImpl); }
-inline OUString RegistryTypeReader::getFieldName( sal_uInt16 index ) const
+inline rtl::OUString RegistryTypeReader::getFieldName( sal_uInt16 index ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getFieldName(m_hImpl, &sRet.pData, index);
return sRet;
}
-inline OUString RegistryTypeReader::getFieldType( sal_uInt16 index ) const
+inline rtl::OUString RegistryTypeReader::getFieldType( sal_uInt16 index ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getFieldType(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -414,16 +414,16 @@ inline RTConstValue RegistryTypeReader::getFieldConstValue( sal_uInt16 index ) c
return ret;
}
-inline OUString RegistryTypeReader::getFieldDoku( sal_uInt16 index ) const
+inline rtl::OUString RegistryTypeReader::getFieldDoku( sal_uInt16 index ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getFieldDoku(m_hImpl, &sRet.pData, index);
return sRet;
}
-inline OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index ) const
+inline rtl::OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getFieldFileName(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -431,9 +431,9 @@ inline OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index ) const
inline sal_uInt32 RegistryTypeReader::getMethodCount() const
{ return m_pApi->getMethodCount(m_hImpl); }
-inline OUString RegistryTypeReader::getMethodName( sal_uInt16 index ) const
+inline rtl::OUString RegistryTypeReader::getMethodName( sal_uInt16 index ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getMethodName(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -441,16 +441,16 @@ inline OUString RegistryTypeReader::getMethodName( sal_uInt16 index ) const
inline sal_uInt32 RegistryTypeReader::getMethodParamCount( sal_uInt16 index ) const
{ return m_pApi->getMethodParamCount(m_hImpl, index); }
-inline OUString RegistryTypeReader::getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const
+inline rtl::OUString RegistryTypeReader::getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getMethodParamType(m_hImpl, &sRet.pData, index, paramIndex);
return sRet;
}
-inline OUString RegistryTypeReader::getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const
+inline rtl::OUString RegistryTypeReader::getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getMethodParamName(m_hImpl, &sRet.pData, index, paramIndex);
return sRet;
}
@@ -461,16 +461,16 @@ inline RTParamMode RegistryTypeReader::getMethodParamMode( sal_uInt16 index, sal
inline sal_uInt32 RegistryTypeReader::getMethodExcCount( sal_uInt16 index ) const
{ return m_pApi->getMethodExcCount(m_hImpl, index); }
-inline OUString RegistryTypeReader::getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const
+inline rtl::OUString RegistryTypeReader::getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getMethodExcType(m_hImpl, &sRet.pData, index, excIndex);
return sRet;
}
-inline OUString RegistryTypeReader::getMethodReturnType( sal_uInt16 index ) const
+inline rtl::OUString RegistryTypeReader::getMethodReturnType( sal_uInt16 index ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getMethodReturnType(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -478,9 +478,9 @@ inline OUString RegistryTypeReader::getMethodReturnType( sal_uInt16 index ) cons
inline RTMethodMode RegistryTypeReader::getMethodMode( sal_uInt16 index ) const
{ return m_pApi->getMethodMode(m_hImpl, index); }
-inline OUString RegistryTypeReader::getMethodDoku( sal_uInt16 index ) const
+inline rtl::OUString RegistryTypeReader::getMethodDoku( sal_uInt16 index ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getMethodDoku(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -488,9 +488,9 @@ inline OUString RegistryTypeReader::getMethodDoku( sal_uInt16 index ) const
inline sal_uInt32 RegistryTypeReader::getReferenceCount() const
{ return m_pApi->getReferenceCount(m_hImpl); }
-inline OUString RegistryTypeReader::getReferenceName( sal_uInt16 index ) const
+inline rtl::OUString RegistryTypeReader::getReferenceName( sal_uInt16 index ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getReferenceName(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -498,9 +498,9 @@ inline OUString RegistryTypeReader::getReferenceName( sal_uInt16 index ) const
inline RTReferenceType RegistryTypeReader::getReferenceType( sal_uInt16 index ) const
{ return m_pApi->getReferenceType(m_hImpl, index); }
-inline OUString RegistryTypeReader::getReferenceDoku( sal_uInt16 index ) const
+inline rtl::OUString RegistryTypeReader::getReferenceDoku( sal_uInt16 index ) const
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getReferenceDoku(m_hImpl, &sRet.pData, index);
return sRet;
}
diff --git a/include/registry/reflwrit.hxx b/include/registry/reflwrit.hxx
index 8fa2e36..fa866fe 100644
--- a/include/registry/reflwrit.hxx
+++ b/include/registry/reflwrit.hxx
@@ -94,8 +94,8 @@ public:
exported services ...)
*/
inline RegistryTypeWriter(RTTypeClass RTTypeClass,
- const OUString& typeName,
- const OUString& superTypeName,
+ const rtl::OUString& typeName,
+ const rtl::OUString& superTypeName,
sal_uInt16 fieldCount,
sal_uInt16 methodCount,
sal_uInt16 referenceCount);
@@ -126,11 +126,11 @@ public:
This documentation should be the same as the documentation which is provided
for this type in IDL.
*/
- inline void setDoku(const OUString& doku);
+ inline void setDoku(const rtl::OUString& doku);
/** sets the IDL filename where this type is defined.
*/
- inline void setFileName(const OUString& fileName);
+ inline void setFileName(const rtl::OUString& fileName);
/** sets the data for a field member of a type blob.
@@ -144,10 +144,10 @@ public:
for enum values or constants.
*/
inline void setFieldData( sal_uInt16 index,
- const OUString& name,
- const OUString& typeName,
- const OUString& doku,
- const OUString& fileName,
+ const rtl::OUString& name,
+ const rtl::OUString& typeName,
+ const rtl::OUString& doku,
+ const rtl::OUString& fileName,
RTFieldAccess access,
RTConstValue constValue = RTConstValue());
@@ -162,12 +162,12 @@ public:
@param doku specifies the documentation string of the field.
*/
inline void setMethodData(sal_uInt16 index,
- const OUString& name,
- const OUString& returnTypeName,
+ const rtl::OUString& name,
+ const rtl::OUString& returnTypeName,
RTMethodMode mode,
sal_uInt16 paramCount,
sal_uInt16 excCount,
- const OUString& doku);
+ const rtl::OUString& doku);
/** sets the data for the specified parameter of a method.
@@ -179,8 +179,8 @@ public:
*/
inline void setParamData(sal_uInt16 index,
sal_uInt16 paramIndex,
- const OUString& type,
- const OUString& name,
+ const rtl::OUString& type,
+ const rtl::OUString& name,
RTParamMode mode);
/** sets the data for the specified exception of a mehtod.
@@ -191,7 +191,7 @@ public:
*/
inline void setExcData(sal_uInt16 index,
sal_uInt16 excIndex,
- const OUString& type);
+ const rtl::OUString& type);
/** returns a pointer to the new type blob.
@@ -213,9 +213,9 @@ public:
@param access specifies the access mode of the reference.
*/
inline void setReferenceData( sal_uInt16 index,
- const OUString& name,
+ const rtl::OUString& name,
RTReferenceType refType,
- const OUString& doku,
+ const rtl::OUString& doku,
RTFieldAccess access = RT_ACCESS_INVALID);
protected:
@@ -229,8 +229,8 @@ protected:
inline RegistryTypeWriter::RegistryTypeWriter(RTTypeClass RTTypeClass,
- const OUString& typeName,
- const OUString& superTypeName,
+ const rtl::OUString& typeName,
+ const rtl::OUString& superTypeName,
sal_uInt16 fieldCount,
sal_uInt16 methodCount,
sal_uInt16 referenceCount)
@@ -271,10 +271,10 @@ inline RegistryTypeWriter& RegistryTypeWriter::operator == (const RegistryTypeWr
}
inline void RegistryTypeWriter::setFieldData( sal_uInt16 index,
- const OUString& name,
- const OUString& typeName,
- const OUString& doku,
- const OUString& fileName,
+ const rtl::OUString& name,
+ const rtl::OUString& typeName,
+ const rtl::OUString& doku,
+ const rtl::OUString& fileName,
RTFieldAccess access,
RTConstValue constValue)
{
@@ -283,12 +283,12 @@ inline void RegistryTypeWriter::setFieldData( sal_uInt16 index,
inline void RegistryTypeWriter::setMethodData(sal_uInt16 index,
- const OUString& name,
- const OUString& returnTypeName,
+ const rtl::OUString& name,
+ const rtl::OUString& returnTypeName,
RTMethodMode mode,
sal_uInt16 paramCount,
sal_uInt16 excCount,
- const OUString& doku)
+ const rtl::OUString& doku)
{
m_pApi->setMethodData(m_hImpl, index, name.pData, returnTypeName.pData, mode, paramCount, excCount, doku.pData);
}
@@ -299,20 +299,20 @@ inline void RegistryTypeWriter::setUik(const RTUik& uik)
m_pApi->setUik(m_hImpl, &uik);
}
-inline void RegistryTypeWriter::setDoku(const OUString& doku)
+inline void RegistryTypeWriter::setDoku(const rtl::OUString& doku)
{
m_pApi->setDoku(m_hImpl, doku.pData);
}
-inline void RegistryTypeWriter::setFileName(const OUString& doku)
+inline void RegistryTypeWriter::setFileName(const rtl::OUString& doku)
{
m_pApi->setFileName(m_hImpl, doku.pData);
}
inline void RegistryTypeWriter::setParamData(sal_uInt16 index,
sal_uInt16 paramIndex,
- const OUString& type,
- const OUString& name,
+ const rtl::OUString& type,
+ const rtl::OUString& name,
RTParamMode mode)
{
m_pApi->setParamData(m_hImpl, index, paramIndex, type.pData, name.pData, mode);
@@ -320,7 +320,7 @@ inline void RegistryTypeWriter::setParamData(sal_uInt16 index,
inline void RegistryTypeWriter::setExcData(sal_uInt16 index,
sal_uInt16 excIndex,
- const OUString& type)
+ const rtl::OUString& type)
{
m_pApi->setExcData(m_hImpl, index, excIndex, type.pData);
}
@@ -337,9 +337,9 @@ inline sal_uInt32 RegistryTypeWriter::getBlopSize()
inline void RegistryTypeWriter::setReferenceData( sal_uInt16 index,
- const OUString& name,
+ const rtl::OUString& name,
RTReferenceType refType,
- const OUString& doku,
+ const rtl::OUString& doku,
RTFieldAccess access)
{
m_pApi->setReferenceData(m_hImpl, index, name.pData, refType, doku.pData, access);
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index 0e322f3..d277dba 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -126,14 +126,14 @@ public:
inline RegError openRootKey(RegistryKey& rRootKey);
/// returns the name of the current registry data file.
- inline OUString getName();
+ inline rtl::OUString getName();
/** creates a new registry with the specified name and creates a root key.
@param registryName specifies the name of the new registry.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError create(const OUString& registryName);
+ inline RegError create(const rtl::OUString& registryName);
/** opens a registry with the specified name.
@@ -142,7 +142,7 @@ public:
@param accessMode specifies the access mode for the registry, REG_READONLY or REG_READWRITE.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError open(const OUString& registryName,
+ inline RegError open(const rtl::OUString& registryName,
RegAccessMode accessMode);
/// closes explicitly the current registry data file.
@@ -154,7 +154,7 @@ public:
itselfs will be destroyed.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError destroy(const OUString& registryName);
+ inline RegError destroy(const rtl::OUString& registryName);
/** loads registry information from a specified file and save it under the
specified keyName.
@@ -168,8 +168,8 @@ public:
@return REG_NO_ERROR if succeeds else an error code.
*/
inline RegError loadKey(RegistryKey& rKey,
- const OUString& keyName,
- const OUString& regFileName);
+ const rtl::OUString& keyName,
+ const rtl::OUString& regFileName);
/** saves the registry information of the specified key and all subkeys and save
it in the specified file.
@@ -183,8 +183,8 @@ public:
@return REG_NO_ERROR if succeeds else an error code.
*/
inline RegError saveKey(RegistryKey& rKey,
- const OUString& keyName,
- const OUString& regFileName);
+ const rtl::OUString& keyName,
+ const rtl::OUString& regFileName);
/** merges the registry information of the specified key with the registry
information of the specified file.
@@ -202,8 +202,8 @@ public:
restore the state before merging.
*/
inline RegError mergeKey(RegistryKey& rKey,
- const OUString& keyName,
- const OUString& regFileName,
+ const rtl::OUString& keyName,
+ const rtl::OUString& regFileName,
sal_Bool bWarnings = sal_False,
sal_Bool bReport = sal_False);
@@ -287,7 +287,7 @@ public:
inline ~RegistryKeyNames();
/// returns the name of the key sepecified by index.
- inline OUString getElement(sal_uInt32 index);
+ inline rtl::OUString getElement(sal_uInt32 index);
/// returns the length of the array.
inline sal_uInt32 getLength();
@@ -417,7 +417,7 @@ public:
inline sal_Bool isReadOnly() const;
/// returns the full qualified name of the key beginning with the rootkey.
- inline OUString getName();
+ inline rtl::OUString getName();
/** creates a new key or opens a key if the specified key already exists.
@@ -426,7 +426,7 @@ public:
@param rNewKey references a RegistryKey which will be filled with the new or open key.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError createKey(const OUString& keyName,
+ inline RegError createKey(const rtl::OUString& keyName,
RegistryKey& rNewKey);
/** opens the specified key.
@@ -436,7 +436,7 @@ public:
@param rOpenKey references a RegistryKey which will be filled with the open key.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError openKey(const OUString& keyName,
+ inline RegError openKey(const rtl::OUString& keyName,
RegistryKey& rOpenKey);
/** opens all subkeys of the specified key.
@@ -446,7 +446,7 @@ public:
@param rSubKeys reference a RegistryKeyArray which will be filled with the open subkeys.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError openSubKeys(const OUString& keyName,
+ inline RegError openSubKeys(const rtl::OUString& keyName,
RegistryKeyArray& rSubKeys);
/** returns an array with the names of all subkeys of the specified key.
@@ -456,7 +456,7 @@ public:
@param rSubKeyNames reference a RegistryKeyNames array which will be filled with the subkey names.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getKeyNames(const OUString& keyName,
+ inline RegError getKeyNames(const rtl::OUString& keyName,
RegistryKeyNames& rSubKeyNames);
/** closes all keys specified in the array.
@@ -471,7 +471,7 @@ public:
@param keyName specifies the name of the key which will be deleted.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError deleteKey(const OUString& keyName);
+ inline RegError deleteKey(const rtl::OUString& keyName);
/// closes explicitly the current key
inline RegError closeKey();
@@ -489,7 +489,7 @@ public:
@param valueSize specifies the size of pData in bytes
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setValue(const OUString& keyName,
+ inline RegError setValue(const rtl::OUString& keyName,
RegValueType valueType,
RegValue pValue,
sal_uInt32 valueSize);
@@ -503,7 +503,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setLongListValue(const OUString& keyName,
+ inline RegError setLongListValue(const rtl::OUString& keyName,
sal_Int32* pValueList,
sal_uInt32 len);
@@ -516,7 +516,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setStringListValue(const OUString& keyName,
+ inline RegError setStringListValue(const rtl::OUString& keyName,
sal_Char** pValueList,
sal_uInt32 len);
@@ -529,7 +529,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setUnicodeListValue(const OUString& keyName,
+ inline RegError setUnicodeListValue(const rtl::OUString& keyName,
sal_Unicode** pValueList,
sal_uInt32 len);
@@ -542,7 +542,7 @@ public:
@param pValueSize returns the size of the value in bytes or the length of a list value.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getValueInfo(const OUString& keyName,
+ inline RegError getValueInfo(const rtl::OUString& keyName,
RegValueType* pValueType,
sal_uInt32* pValueSize);
@@ -554,7 +554,7 @@ public:
@param pValue points to an allocated memory block receiving the data of the value.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getValue(const OUString& keyName,
+ inline RegError getValue(const rtl::OUString& keyName,
RegValue pValue);
/** gets a long list value of a key.
@@ -565,7 +565,7 @@ public:
@param rValueList references a RegistryValueList which will be filled with the long values.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getLongListValue(const OUString& keyName,
+ inline RegError getLongListValue(const rtl::OUString& keyName,
RegistryValueList<sal_Int32>& rValueList);
/** gets an ascii list value of a key.
@@ -576,7 +576,7 @@ public:
@param rValueList references a RegistryValueList which will be filled with the ascii values.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getStringListValue(const OUString& keyName,
+ inline RegError getStringListValue(const rtl::OUString& keyName,
RegistryValueList<sal_Char*>& rValueList);
/** gets a unicode value of a key.
@@ -587,7 +587,7 @@ public:
@param rValueList reference a RegistryValueList which will be filled with the unicode values.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getUnicodeListValue(const OUString& keyName,
+ inline RegError getUnicodeListValue(const rtl::OUString& keyName,
RegistryValueList<sal_Unicode*>& rValueList);
/** used to create a link.
@@ -596,8 +596,8 @@ public:
@return REG_INVALID_LINK
*/
- inline RegError createLink(const OUString& linkName,
- const OUString& linkTarget);
+ inline RegError createLink(const rtl::OUString& linkName,
+ const rtl::OUString& linkTarget);
/** used to delete a link.
@@ -605,7 +605,7 @@ public:
@return REG_INVALID_LINK
*/
- inline RegError deleteLink(const OUString& linkName);
+ inline RegError deleteLink(const rtl::OUString& linkName);
/** returns the type of the specified key.
@@ -613,7 +613,7 @@ public:
@param pKeyType returns the type of the key (always RG_KEYTYPE).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getKeyType(const OUString& name,
+ inline RegError getKeyType(const rtl::OUString& name,
RegKeyType* pKeyType) const;
/** used to return the target of a link.
@@ -622,8 +622,8 @@ public:
@return REG_INVALID_LINK
*/
- inline RegError getLinkTarget(const OUString& linkName,
- OUString& rLinkTarget) const;
+ inline RegError getLinkTarget(const rtl::OUString& linkName,
+ rtl::OUString& rLinkTarget) const;
/** resolves a keyname.
@@ -633,12 +633,12 @@ public:
@param[out] rResolvedName the resolved name.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getResolvedKeyName(const OUString& keyName,
+ inline RegError getResolvedKeyName(const rtl::OUString& keyName,
sal_Bool firstLinkOnly,
- OUString& rResolvedName) const;
+ rtl::OUString& rResolvedName) const;
/// returns the name of the registry in which the key is defined.
- inline OUString getRegistryName();
+ inline rtl::OUString getRegistryName();
/// returns the registry in which the key is defined.
Registry getRegistry() const { return m_registry; }
@@ -736,13 +736,13 @@ inline RegistryKeyNames::~RegistryKeyNames()
m_registry.m_pApi->freeKeyNames(m_pKeyNames, m_length);
}
-inline OUString RegistryKeyNames::getElement(sal_uInt32 index)
+inline rtl::OUString RegistryKeyNames::getElement(sal_uInt32 index)
{
if (m_pKeyNames && index < m_length)
return m_pKeyNames[index];
else
- return OUString();
+ return rtl::OUString();
}
inline sal_uInt32 RegistryKeyNames::getLength()
@@ -834,15 +834,15 @@ inline sal_Bool RegistryKey::isReadOnly() const
return sal_False;
}
-inline OUString RegistryKey::getName()
+inline rtl::OUString RegistryKey::getName()
{
- OUString sRet;
+ rtl::OUString sRet;
if (m_registry.isValid())
m_registry.m_pApi->getKeyName(m_hImpl, &sRet.pData);
return sRet;
}
-inline RegError RegistryKey::createKey(const OUString& keyName,
+inline RegError RegistryKey::createKey(const rtl::OUString& keyName,
RegistryKey& rNewKey)
{
if (rNewKey.isValid()) rNewKey.closeKey();
@@ -855,7 +855,7 @@ inline RegError RegistryKey::createKey(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::openKey(const OUString& keyName,
+inline RegError RegistryKey::openKey(const rtl::OUString& keyName,
RegistryKey& rOpenKey)
{
if (rOpenKey.isValid()) rOpenKey.closeKey();
@@ -869,7 +869,7 @@ inline RegError RegistryKey::openKey(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::openSubKeys(const OUString& keyName,
+inline RegError RegistryKey::openSubKeys(const rtl::OUString& keyName,
RegistryKeyArray& rSubKeys)
{
if (m_registry.isValid())
@@ -891,7 +891,7 @@ inline RegError RegistryKey::openSubKeys(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getKeyNames(const OUString& keyName,
+inline RegError RegistryKey::getKeyNames(const rtl::OUString& keyName,
RegistryKeyNames& rSubKeyNames)
{
if (m_registry.isValid())
@@ -921,7 +921,7 @@ inline RegError RegistryKey::closeSubKeys(RegistryKeyArray& rSubKeys)
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::deleteKey(const OUString& keyName)
+inline RegError RegistryKey::deleteKey(const rtl::OUString& keyName)
{
if (m_registry.isValid())
return m_registry.m_pApi->deleteKey(m_hImpl, keyName.pData);
@@ -952,7 +952,7 @@ inline void RegistryKey::releaseKey()
}
}
-inline RegError RegistryKey::setValue(const OUString& keyName,
+inline RegError RegistryKey::setValue(const rtl::OUString& keyName,
RegValueType valueType,
RegValue pValue,
sal_uInt32 valueSize)
@@ -964,7 +964,7 @@ inline RegError RegistryKey::setValue(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::setLongListValue(const OUString& keyName,
+inline RegError RegistryKey::setLongListValue(const rtl::OUString& keyName,
sal_Int32* pValueList,
sal_uInt32 len)
{
@@ -975,7 +975,7 @@ inline RegError RegistryKey::setLongListValue(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::setStringListValue(const OUString& keyName,
+inline RegError RegistryKey::setStringListValue(const rtl::OUString& keyName,
sal_Char** pValueList,
sal_uInt32 len)
{
@@ -986,7 +986,7 @@ inline RegError RegistryKey::setStringListValue(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::setUnicodeListValue(const OUString& keyName,
+inline RegError RegistryKey::setUnicodeListValue(const rtl::OUString& keyName,
sal_Unicode** pValueList,
sal_uInt32 len)
{
@@ -997,7 +997,7 @@ inline RegError RegistryKey::setUnicodeListValue(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getValueInfo(const OUString& keyName,
+inline RegError RegistryKey::getValueInfo(const rtl::OUString& keyName,
RegValueType* pValueType,
sal_uInt32* pValueSize)
{
@@ -1007,7 +1007,7 @@ inline RegError RegistryKey::getValueInfo(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getValue(const OUString& keyName,
+inline RegError RegistryKey::getValue(const rtl::OUString& keyName,
RegValue pValue)
{
if (m_registry.isValid())
@@ -1016,7 +1016,7 @@ inline RegError RegistryKey::getValue(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getLongListValue(const OUString& keyName,
+inline RegError RegistryKey::getLongListValue(const rtl::OUString& keyName,
RegistryValueList<sal_Int32>& rValueList)
{
if (m_registry.isValid())
@@ -1039,7 +1039,7 @@ inline RegError RegistryKey::getLongListValue(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getStringListValue(const OUString& keyName,
+inline RegError RegistryKey::getStringListValue(const rtl::OUString& keyName,
RegistryValueList<sal_Char*>& rValueList)
{
if (m_registry.isValid())
@@ -1062,7 +1062,7 @@ inline RegError RegistryKey::getStringListValue(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getUnicodeListValue(const OUString& keyName,
+inline RegError RegistryKey::getUnicodeListValue(const rtl::OUString& keyName,
RegistryValueList<sal_Unicode*>& rValueList)
{
if (m_registry.isValid())
@@ -1085,8 +1085,8 @@ inline RegError RegistryKey::getUnicodeListValue(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::createLink(const OUString& linkName,
- const OUString& linkTarget)
+inline RegError RegistryKey::createLink(const rtl::OUString& linkName,
+ const rtl::OUString& linkTarget)
{
if (m_registry.isValid())
return m_registry.m_pApi->createLink(m_hImpl, linkName.pData, linkTarget.pData);
@@ -1094,7 +1094,7 @@ inline RegError RegistryKey::createLink(const OUString& linkName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::deleteLink(const OUString& linkName)
+inline RegError RegistryKey::deleteLink(const rtl::OUString& linkName)
{
if (m_registry.isValid())
return m_registry.m_pApi->deleteLink(m_hImpl, linkName.pData);
@@ -1102,7 +1102,7 @@ inline RegError RegistryKey::deleteLink(const OUString& linkName)
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getKeyType(const OUString& keyName,
+inline RegError RegistryKey::getKeyType(const rtl::OUString& keyName,
RegKeyType* pKeyType) const
{
if (m_registry.isValid())
@@ -1111,8 +1111,8 @@ inline RegError RegistryKey::getKeyType(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getLinkTarget(const OUString& linkName,
- OUString& rLinkTarget) const
+inline RegError RegistryKey::getLinkTarget(const rtl::OUString& linkName,
+ rtl::OUString& rLinkTarget) const
{
if (m_registry.isValid())
{
@@ -1124,9 +1124,9 @@ inline RegError RegistryKey::getLinkTarget(const OUString& linkName,
}
-inline RegError RegistryKey::getResolvedKeyName(const OUString& keyName,
+inline RegError RegistryKey::getResolvedKeyName(const rtl::OUString& keyName,
sal_Bool firstLinkOnly,
- OUString& rResolvedName) const
+ rtl::OUString& rResolvedName) const
{
if (m_registry.isValid())
return m_registry.m_pApi->getResolvedKeyName(m_hImpl,
@@ -1137,13 +1137,13 @@ inline RegError RegistryKey::getResolvedKeyName(const OUString& keyName,
return REG_INVALID_KEY;
}
-inline OUString RegistryKey::getRegistryName()
+inline rtl::OUString RegistryKey::getRegistryName()
{
if (m_registry.isValid())
{
return m_registry.getName();
} else
- return OUString();
+ return rtl::OUString();
}
//-----------------------------------------------------------------------------
@@ -1193,21 +1193,21 @@ inline RegError Registry::openRootKey(RegistryKey& rRootKey)
return m_pApi->openRootKey(m_hImpl, &rRootKey.m_hImpl);
}
-inline OUString Registry::getName()
+inline rtl::OUString Registry::getName()
{
- OUString sRet;
+ rtl::OUString sRet;
m_pApi->getName(m_hImpl, &sRet.pData);
return sRet;
}
-inline RegError Registry::create(const OUString& registryName)
+inline RegError Registry::create(const rtl::OUString& registryName)
{
if (m_hImpl)
m_pApi->release(m_hImpl);
return m_pApi->createRegistry(registryName.pData, &m_hImpl);
}
-inline RegError Registry::open(const OUString& registryName,
+inline RegError Registry::open(const rtl::OUString& registryName,
RegAccessMode accessMode)
{
if (m_hImpl)
@@ -1223,7 +1223,7 @@ inline RegError Registry::close()
return ret;
}
-inline RegError Registry::destroy(const OUString& registryName)
+inline RegError Registry::destroy(const rtl::OUString& registryName)
{
RegError ret = m_pApi->destroyRegistry(m_hImpl, registryName.pData);
if ( !ret && registryName.isEmpty() )
@@ -1232,18 +1232,18 @@ inline RegError Registry::destroy(const OUString& registryName)
}
inline RegError Registry::loadKey(RegistryKey& rKey,
- const OUString& keyName,
- const OUString& regFileName)
+ const rtl::OUString& keyName,
+ const rtl::OUString& regFileName)
{ return m_pApi->loadKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData); }
inline RegError Registry::saveKey(RegistryKey& rKey,
- const OUString& keyName,
- const OUString& regFileName)
+ const rtl::OUString& keyName,
+ const rtl::OUString& regFileName)
{ return m_pApi->saveKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData); }
inline RegError Registry::mergeKey(RegistryKey& rKey,
- const OUString& keyName,
- const OUString& regFileName,
+ const rtl::OUString& keyName,
+ const rtl::OUString& regFileName,
sal_Bool bWarnings,
sal_Bool bReport)
{ return m_pApi->mergeKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData, bWarnings, bReport); }
diff --git a/include/registry/writer.hxx b/include/registry/writer.hxx
index 4b44122..219e0a2 100644
--- a/include/registry/writer.hxx
+++ b/include/registry/writer.hxx
@@ -70,9 +70,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
Writer(
- typereg_Version version, OUString const & documentation,
- OUString const & fileName, RTTypeClass typeClass, bool published,
- OUString const & typeName, sal_uInt16 superTypeCount,
+ typereg_Version version, rtl::OUString const & documentation,
+ rtl::OUString const & fileName, RTTypeClass typeClass, bool published,
+ rtl::OUString const & typeName, sal_uInt16 superTypeCount,
sal_uInt16 fieldCount, sal_uInt16 methodCount,
sal_uInt16 referenceCount):
m_handle(
@@ -103,7 +103,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- void setSuperTypeName(sal_uInt16 index, OUString const & typeName) {
+ void setSuperTypeName(sal_uInt16 index, rtl::OUString const & typeName) {
if (!typereg_writer_setSuperTypeName(m_handle, index, typeName.pData)) {
throw std::bad_alloc();
}
@@ -129,9 +129,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setFieldData(
- sal_uInt16 index, OUString const & documentation,
- OUString const & fileName, RTFieldAccess flags, OUString const & name,
- OUString const & typeName, RTConstValue const & value)
+ sal_uInt16 index, rtl::OUString const & documentation,
+ rtl::OUString const & fileName, RTFieldAccess flags, rtl::OUString const & name,
+ rtl::OUString const & typeName, RTConstValue const & value)
{
if (!typereg_writer_setFieldData(
m_handle, index, documentation.pData, fileName.pData, flags,
@@ -161,9 +161,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setMethodData(
- sal_uInt16 index, OUString const & documentation,
- RTMethodMode flags, OUString const & name,
- OUString const & returnTypeName, sal_uInt16 parameterCount,
+ sal_uInt16 index, rtl::OUString const & documentation,
+ RTMethodMode flags, rtl::OUString const & name,
+ rtl::OUString const & returnTypeName, sal_uInt16 parameterCount,
sal_uInt16 exceptionCount)
{
if (!typereg_writer_setMethodData(
@@ -193,8 +193,8 @@ public:
*/
void setMethodParameterData(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
- RTParamMode flags, OUString const & name,
- OUString const & typeName)
+ RTParamMode flags, rtl::OUString const & name,
+ rtl::OUString const & typeName)
{
if (!typereg_writer_setMethodParameterData(
m_handle, methodIndex, parameterIndex, flags, name.pData,
@@ -219,7 +219,7 @@ public:
*/
void setMethodExceptionTypeName(
sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
- OUString const & typeName)
+ rtl::OUString const & typeName)
{
if (!typereg_writer_setMethodExceptionTypeName(
m_handle, methodIndex, exceptionIndex, typeName.pData))
@@ -245,9 +245,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setReferenceData(
- sal_uInt16 index, OUString const & documentation,
+ sal_uInt16 index, rtl::OUString const & documentation,
RTReferenceType sort, RTFieldAccess flags,
- OUString const & typeName)
+ rtl::OUString const & typeName)
{
if (!typereg_writer_setReferenceData(
m_handle, index, documentation.pData, sort, flags,
diff --git a/include/rtl/bootstrap.hxx b/include/rtl/bootstrap.hxx
index 5ec0107..b73c47c 100644
--- a/include/rtl/bootstrap.hxx
+++ b/include/rtl/bootstrap.hxx
@@ -80,7 +80,7 @@ namespace rtl
/** Opens a bootstrap argment container
@see rtl_bootstrap_args_open()
*/
- inline Bootstrap(const OUString & iniName);
+ inline Bootstrap(const rtl::OUString & iniName);
/** Closes a bootstrap argument container
@see rtl_bootstrap_args_close()
@@ -180,7 +180,7 @@ namespace rtl
_handle = 0;
}
- inline Bootstrap::Bootstrap(const OUString & iniName)
+ inline Bootstrap::Bootstrap(const rtl::OUString & iniName)
{
if(!iniName.isEmpty())
_handle = rtl_bootstrap_args_open(iniName.pData);
diff --git a/include/store/store.hxx b/include/store/store.hxx
index a7eb1e3..969aa6b 100644
--- a/include/store/store.hxx
+++ b/include/store/store.hxx
@@ -99,8 +99,8 @@ public:
*/
inline storeError create (
storeFileHandle hFile,
- OUString const & rPath,
- OUString const & rName,
+ rtl::OUString const & rPath,
+ rtl::OUString const & rName,
storeAccessMode eMode) SAL_THROW(())
{
if (m_hImpl)
@@ -264,8 +264,8 @@ public:
*/
inline storeError create (
storeFileHandle hFile,
- OUString const & rPath,
- OUString const & rName,
+ rtl::OUString const & rPath,
+ rtl::OUString const & rName,
storeAccessMode eMode) SAL_THROW(())
{
if (m_hImpl)
@@ -429,7 +429,7 @@ public:
@see store_openFile()
*/
inline storeError create (
- OUString const & rFilename,
+ rtl::OUString const & rFilename,
storeAccessMode eAccessMode,
sal_uInt16 nPageSize = STORE_DEFAULT_PAGESIZE) SAL_THROW(())
{
@@ -504,8 +504,8 @@ public:
@see store_attrib()
*/
inline storeError attrib (
- OUString const & rPath,
- OUString const & rName,
+ rtl::OUString const & rPath,
+ rtl::OUString const & rName,
sal_uInt32 nMask1,
sal_uInt32 nMask2,
sal_uInt32 & rnAttrib) SAL_THROW(())
@@ -520,8 +520,8 @@ public:
@see store_attrib()
*/
inline storeError attrib (
- OUString const & rPath,
- OUString const & rName,
+ rtl::OUString const & rPath,
+ rtl::OUString const & rName,
sal_uInt32 nMask1,
sal_uInt32 nMask2) SAL_THROW(())
{
@@ -535,8 +535,8 @@ public:
@see store_link()
*/
inline storeError link (
- OUString const & rSrcPath, OUString const & rSrcName,
- OUString const & rDstPath, OUString const & rDstName) SAL_THROW(())
+ rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName,
+ rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
@@ -549,8 +549,8 @@ public:
@see store_symlink()
*/
inline storeError symlink (
- OUString const & rSrcPath, OUString const & rSrcName,
- OUString const & rDstPath, OUString const & rDstName) SAL_THROW(())
+ rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName,
+ rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
@@ -562,8 +562,8 @@ public:
@see store_rename()
*/
inline storeError rename (
- OUString const & rSrcPath, OUString const & rSrcName,
- OUString const & rDstPath, OUString const & rDstName) SAL_THROW(())
+ rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName,
+ rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
@@ -575,7 +575,7 @@ public:
@see store_remove()
*/
inline storeError remove (
- OUString const & rPath, OUString const & rName) SAL_THROW(())
+ rtl::OUString const & rPath, rtl::OUString const & rName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
More information about the Libreoffice-commits
mailing list