summaryrefslogtreecommitdiff
path: root/dbaccess/source/core/recovery
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/core/recovery')
-rw-r--r--dbaccess/source/core/recovery/dbdocrecovery.cxx24
-rw-r--r--dbaccess/source/core/recovery/settingsimport.cxx42
-rw-r--r--dbaccess/source/core/recovery/settingsimport.hxx26
-rw-r--r--dbaccess/source/core/recovery/storagestream.cxx4
-rw-r--r--dbaccess/source/core/recovery/storagestream.hxx4
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.cxx8
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.hxx4
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.cxx16
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.hxx12
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.cxx60
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.hxx8
-rw-r--r--dbaccess/source/core/recovery/subcomponents.hxx6
12 files changed, 107 insertions, 107 deletions
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index 409784feccdf..d5b605f3ff5e 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -82,7 +82,7 @@ namespace dbaccess
namespace
{
// .........................................................................
- static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, ::rtl::OUStringBuffer& o_rBuffer )
+ static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, OUStringBuffer& o_rBuffer )
{
o_rBuffer.append( i_rComponentDesc.first );
o_rBuffer.append( sal_Unicode( '=' ) );
@@ -92,7 +92,7 @@ namespace dbaccess
}
// .........................................................................
- static bool lcl_extractCompDesc( const ::rtl::OUString& i_rIniLine, ::rtl::OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc )
+ static bool lcl_extractCompDesc( const OUString& i_rIniLine, OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc )
{
const sal_Int32 nEqualSignPos = i_rIniLine.indexOf( sal_Unicode( '=' ) );
if ( nEqualSignPos < 1 )
@@ -147,7 +147,7 @@ namespace dbaccess
++stor
)
{
- ::rtl::OUStringBuffer aLine;
+ OUStringBuffer aLine;
lcl_getPersistentRepresentation( *stor, aLine );
aTextOutput.writeLine( aLine.makeStringAndClear() );
@@ -157,7 +157,7 @@ namespace dbaccess
}
// .........................................................................
- static bool lcl_isSectionStart( const ::rtl::OUString& i_rIniLine, ::rtl::OUString& o_rSectionName )
+ static bool lcl_isSectionStart( const OUString& i_rIniLine, OUString& o_rSectionName )
{
const sal_Int32 nLen = i_rIniLine.getLength();
if ( ( nLen > 0 ) && ( i_rIniLine.getStr()[0] == '[' ) && ( i_rIniLine.getStr()[ nLen - 1 ] == ']' ) )
@@ -169,7 +169,7 @@ namespace dbaccess
}
// .........................................................................
- static void lcl_stripTrailingLineFeed( ::rtl::OUString& io_rLine )
+ static void lcl_stripTrailingLineFeed( OUString& io_rLine )
{
const sal_Int32 nLen = io_rLine.getLength();
if ( ( nLen > 0 ) && ( io_rLine.getStr()[ nLen - 1 ] == '\n' ) )
@@ -194,11 +194,11 @@ namespace dbaccess
xTextInput->setEncoding( lcl_getMapStreamEncodingName() );
xTextInput->setInputStream( xIniStream->getInputStream() );
- ::rtl::OUString sCurrentSection;
+ OUString sCurrentSection;
bool bCurrentSectionIsKnownToBeUnsupported = true;
while ( !xTextInput->isEOF() )
{
- ::rtl::OUString sLine = xTextInput->readLine();
+ OUString sLine = xTextInput->readLine();
lcl_stripTrailingLineFeed( sLine );
if ( sLine.isEmpty() )
@@ -220,7 +220,7 @@ namespace dbaccess
continue;
}
- ::rtl::OUString sStorageName;
+ OUString sStorageName;
SubComponentDescriptor aCompDesc;
if ( !lcl_extractCompDesc( sLine, sStorageName, aCompDesc ) )
continue;
@@ -370,15 +370,15 @@ namespace dbaccess
++stor
)
{
- const ::rtl::OUString sComponentName( stor->second.sName );
+ const OUString sComponentName( stor->second.sName );
if ( !xComponentsStor->hasByName( stor->first ) )
{
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OStringBuffer message;
+ OStringBuffer message;
message.append( "DatabaseDocumentRecovery::recoverSubDocuments: inconsistent recovery storage: storage '" );
- message.append( ::rtl::OUStringToOString( stor->first, RTL_TEXTENCODING_ASCII_US ) );
+ message.append( OUStringToOString( stor->first, RTL_TEXTENCODING_ASCII_US ) );
message.append( "' not found in '" );
- message.append( ::rtl::OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) );
+ message.append( OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) );
message.append( "', but required per map file!" );
OSL_FAIL( message.getStr() );
#endif
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index 5fd94023f954..bd9c8b2d09c8 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -82,14 +82,14 @@ namespace dbaccess
{
}
- void SettingsImport::characters( const ::rtl::OUString& i_rCharacters )
+ void SettingsImport::characters( const OUString& i_rCharacters )
{
m_aCharacters.append( i_rCharacters );
}
- void SettingsImport::split( const ::rtl::OUString& i_rElementName, ::rtl::OUString& o_rNamespace, ::rtl::OUString& o_rLocalName )
+ void SettingsImport::split( const OUString& i_rElementName, OUString& o_rNamespace, OUString& o_rLocalName )
{
- o_rNamespace = ::rtl::OUString();
+ o_rNamespace = OUString();
o_rLocalName = i_rElementName;
const sal_Int32 nSeparatorPos = i_rElementName.indexOf( ':' );
if ( nSeparatorPos > -1 )
@@ -107,7 +107,7 @@ namespace dbaccess
//= IgnoringSettingsImport
//====================================================================
//--------------------------------------------------------------------
- ::rtl::Reference< SettingsImport > IgnoringSettingsImport::nextState( const ::rtl::OUString& i_rElementName )
+ ::rtl::Reference< SettingsImport > IgnoringSettingsImport::nextState( const OUString& i_rElementName )
{
(void)i_rElementName;
return this;
@@ -128,19 +128,19 @@ namespace dbaccess
}
//--------------------------------------------------------------------
- ::rtl::Reference< SettingsImport > OfficeSettingsImport::nextState( const ::rtl::OUString& i_rElementName )
+ ::rtl::Reference< SettingsImport > OfficeSettingsImport::nextState( const OUString& i_rElementName )
{
// separate the namespace part from the element name
- ::rtl::OUString sNamespace;
- ::rtl::OUString sLocalName;
+ OUString sNamespace;
+ OUString sLocalName;
split( i_rElementName, sNamespace, sLocalName );
if ( sLocalName == "config-item-set" )
return new ConfigItemSetImport( m_rSettings );
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sMessage( "unknown (or unsupported at this place) element name '" );
- sMessage += ::rtl::OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 );
+ OString sMessage( "unknown (or unsupported at this place) element name '" );
+ sMessage += OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 );
sMessage += "', ignoring";
OSL_FAIL( sMessage.getStr() );
#endif
@@ -162,7 +162,7 @@ namespace dbaccess
}
//--------------------------------------------------------------------
- ::rtl::Reference< SettingsImport > ConfigItemImport::nextState( const ::rtl::OUString& i_rElementName )
+ ::rtl::Reference< SettingsImport > ConfigItemImport::nextState( const OUString& i_rElementName )
{
OSL_FAIL( "ConfigItemImport::nextState: unexpected: this class is responsible for child-less items only!" );
(void)i_rElementName;
@@ -174,7 +174,7 @@ namespace dbaccess
{
SettingsImport::endElement();
- const ::rtl::OUString sItemName( getItemName() );
+ const OUString sItemName( getItemName() );
ENSURE_OR_RETURN_VOID( !sItemName.isEmpty(), "no item name -> no item value" );
Any aValue;
getItemValue( aValue );
@@ -187,10 +187,10 @@ namespace dbaccess
o_rValue.clear();
// the characters building up th evalue
- ::rtl::OUStringBuffer aCharacters( getAccumulatedCharacters() );
- const ::rtl::OUString sValue = aCharacters.makeStringAndClear();
+ OUStringBuffer aCharacters( getAccumulatedCharacters() );
+ const OUString sValue = aCharacters.makeStringAndClear();
- const ::rtl::OUString& rItemType( getItemType() );
+ const OUString& rItemType( getItemType() );
ENSURE_OR_RETURN_VOID( !rItemType.isEmpty(), "no item type -> no item value" );
if ( ::xmloff::token::IsXMLToken( rItemType, ::xmloff::token::XML_INT ) )
@@ -224,8 +224,8 @@ namespace dbaccess
#if OSL_DEBUG_LEVEL > 0
else
{
- ::rtl::OString sMessage( "ConfigItemImport::getItemValue: unsupported item type '" );
- sMessage += ::rtl::OUStringToOString( rItemType, RTL_TEXTENCODING_UTF8 );
+ OString sMessage( "ConfigItemImport::getItemValue: unsupported item type '" );
+ sMessage += OUStringToOString( rItemType, RTL_TEXTENCODING_UTF8 );
sMessage += "', ignoring";
OSL_FAIL( sMessage.getStr() );
}
@@ -247,11 +247,11 @@ namespace dbaccess
}
//--------------------------------------------------------------------
- ::rtl::Reference< SettingsImport > ConfigItemSetImport::nextState( const ::rtl::OUString& i_rElementName )
+ ::rtl::Reference< SettingsImport > ConfigItemSetImport::nextState( const OUString& i_rElementName )
{
// separate the namespace part from the element name
- ::rtl::OUString sNamespace;
- ::rtl::OUString sLocalName;
+ OUString sNamespace;
+ OUString sLocalName;
split( i_rElementName, sNamespace, sLocalName );
if ( sLocalName == "config-item-set" )
@@ -260,8 +260,8 @@ namespace dbaccess
return new ConfigItemImport( m_aChildSettings );
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sMessage( "unknown element name '" );
- sMessage += ::rtl::OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 );
+ OString sMessage( "unknown element name '" );
+ sMessage += OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 );
sMessage += "', ignoring";
OSL_FAIL( sMessage.getStr() );
#endif
diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx
index e0daac2f929b..accad5c714b0 100644
--- a/dbaccess/source/core/recovery/settingsimport.hxx
+++ b/dbaccess/source/core/recovery/settingsimport.hxx
@@ -50,33 +50,33 @@ namespace dbaccess
// own overriables
virtual ::rtl::Reference< SettingsImport > nextState(
- const ::rtl::OUString& i_rElementName
+ const OUString& i_rElementName
) = 0;
virtual void startElement(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& i_rAttributes
);
virtual void endElement();
- virtual void characters( const ::rtl::OUString& i_rCharacters );
+ virtual void characters( const OUString& i_rCharacters );
protected:
virtual ~SettingsImport();
protected:
- static void split( const ::rtl::OUString& i_rElementName, ::rtl::OUString& o_rNamespace, ::rtl::OUString& o_rLocalName );
+ static void split( const OUString& i_rElementName, OUString& o_rNamespace, OUString& o_rLocalName );
protected:
- const ::rtl::OUString& getItemName() const { return m_sItemName; }
- const ::rtl::OUString& getItemType() const { return m_sItemType; }
- const ::rtl::OUStringBuffer& getAccumulatedCharacters() const { return m_aCharacters; }
+ const OUString& getItemName() const { return m_sItemName; }
+ const OUString& getItemType() const { return m_sItemType; }
+ const OUStringBuffer& getAccumulatedCharacters() const { return m_aCharacters; }
private:
oslInterlockedCount m_refCount;
// value of the config:name attribute, if any
- ::rtl::OUString m_sItemName;
+ OUString m_sItemName;
// value of the config:type attribute, if any
- ::rtl::OUString m_sItemType;
+ OUString m_sItemType;
// accumulated characters, if any
- ::rtl::OUStringBuffer m_aCharacters;
+ OUStringBuffer m_aCharacters;
};
//====================================================================
@@ -91,7 +91,7 @@ namespace dbaccess
// SettingsImport overridables
virtual ::rtl::Reference< SettingsImport > nextState(
- const ::rtl::OUString& i_rElementName
+ const OUString& i_rElementName
);
private:
@@ -110,7 +110,7 @@ namespace dbaccess
// SettingsImport overridables
virtual ::rtl::Reference< SettingsImport > nextState(
- const ::rtl::OUString& i_rElementName
+ const OUString& i_rElementName
);
protected:
@@ -135,7 +135,7 @@ namespace dbaccess
public:
// SettingsImport overridables
virtual ::rtl::Reference< SettingsImport > nextState(
- const ::rtl::OUString& i_rElementName
+ const OUString& i_rElementName
);
virtual void endElement();
@@ -163,7 +163,7 @@ namespace dbaccess
public:
// SettingsImport overridables
virtual ::rtl::Reference< SettingsImport > nextState(
- const ::rtl::OUString& i_rElementName
+ const OUString& i_rElementName
);
protected:
diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
index fec9492b22e7..bac839e28f09 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -52,7 +52,7 @@ namespace dbaccess
//--------------------------------------------------------------------
StorageOutputStream::StorageOutputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
- const ::rtl::OUString& i_rStreamName
+ const OUString& i_rStreamName
)
:m_rContext( i_rContext )
{
@@ -85,7 +85,7 @@ namespace dbaccess
//--------------------------------------------------------------------
StorageInputStream::StorageInputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
- const ::rtl::OUString& i_rStreamName
+ const OUString& i_rStreamName
)
:m_rContext( i_rContext )
{
diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx
index 9f9fb0f013b1..8f655959d43f 100644
--- a/dbaccess/source/core/recovery/storagestream.hxx
+++ b/dbaccess/source/core/recovery/storagestream.hxx
@@ -41,7 +41,7 @@ namespace dbaccess
StorageOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
- const ::rtl::OUString& i_rStreamName
+ const OUString& i_rStreamName
);
virtual ~StorageOutputStream();
@@ -73,7 +73,7 @@ namespace dbaccess
StorageInputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
- const ::rtl::OUString& i_rStreamName
+ const OUString& i_rStreamName
);
virtual ~StorageInputStream();
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
index fcce399dd92a..241e336f2652 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -67,9 +67,9 @@ namespace dbaccess
}
//--------------------------------------------------------------------------------------------------------------
- static const ::rtl::OUString& lcl_getLineFeed()
+ static const OUString& lcl_getLineFeed()
{
- static const ::rtl::OUString s_sLineFeed( sal_Unicode( '\n' ) );
+ static const OUString s_sLineFeed( sal_Unicode( '\n' ) );
return s_sLineFeed;
}
}
@@ -80,7 +80,7 @@ namespace dbaccess
//------------------------------------------------------------------------------------------------------------------
StorageTextOutputStream::StorageTextOutputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
- const ::rtl::OUString& i_rStreamName
+ const OUString& i_rStreamName
)
:StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName )
,m_pData( new StorageTextOutputStream_Data )
@@ -96,7 +96,7 @@ namespace dbaccess
}
//------------------------------------------------------------------------------------------------------------------
- void StorageTextOutputStream::writeLine( const ::rtl::OUString& i_rLine )
+ void StorageTextOutputStream::writeLine( const OUString& i_rLine )
{
m_pData->xTextOutput->writeString( i_rLine );
m_pData->xTextOutput->writeString( lcl_getLineFeed() );
diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx
index 37119d264afa..57c4599a05ba 100644
--- a/dbaccess/source/core/recovery/storagetextstream.hxx
+++ b/dbaccess/source/core/recovery/storagetextstream.hxx
@@ -39,11 +39,11 @@ namespace dbaccess
StorageTextOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
- const ::rtl::OUString& i_rStreamName
+ const OUString& i_rStreamName
);
~StorageTextOutputStream();
- void writeLine( const ::rtl::OUString& i_rLine );
+ void writeLine( const OUString& i_rLine );
void writeLine();
private:
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx
index d17593bc7a58..39a828ea589e 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -67,7 +67,7 @@ namespace dbaccess
struct StorageXMLOutputStream_Data
{
Reference< XDocumentHandler > xHandler;
- ::std::stack< ::rtl::OUString > aElements;
+ ::std::stack< OUString > aElements;
::rtl::Reference< SvXMLAttributeList > xAttributes;
};
@@ -77,7 +77,7 @@ namespace dbaccess
//------------------------------------------------------------------------------------------------------------------
StorageXMLOutputStream::StorageXMLOutputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
- const ::rtl::OUString& i_rStreamName )
+ const OUString& i_rStreamName )
:StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName )
,m_pData( new StorageXMLOutputStream_Data )
{
@@ -105,13 +105,13 @@ namespace dbaccess
}
//------------------------------------------------------------------------------------------------------------------
- void StorageXMLOutputStream::addAttribute( const ::rtl::OUString& i_rName, const ::rtl::OUString& i_rValue ) const
+ void StorageXMLOutputStream::addAttribute( const OUString& i_rName, const OUString& i_rValue ) const
{
m_pData->xAttributes->AddAttribute( i_rName, i_rValue );
}
//------------------------------------------------------------------------------------------------------------------
- void StorageXMLOutputStream::startElement( const ::rtl::OUString& i_rElementName ) const
+ void StorageXMLOutputStream::startElement( const OUString& i_rElementName ) const
{
ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
@@ -126,13 +126,13 @@ namespace dbaccess
ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
ENSURE_OR_RETURN_VOID( !m_pData->aElements.empty(), "no element on the stack" );
- const ::rtl::OUString sElementName( m_pData->aElements.top() );
+ const OUString sElementName( m_pData->aElements.top() );
m_pData->xHandler->endElement( sElementName );
m_pData->aElements.pop();
}
//------------------------------------------------------------------------------------------------------------------
- void StorageXMLOutputStream::ignorableWhitespace( const ::rtl::OUString& i_rWhitespace ) const
+ void StorageXMLOutputStream::ignorableWhitespace( const OUString& i_rWhitespace ) const
{
ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
@@ -140,7 +140,7 @@ namespace dbaccess
}
//------------------------------------------------------------------------------------------------------------------
- void StorageXMLOutputStream::characters( const ::rtl::OUString& i_rCharacters ) const
+ void StorageXMLOutputStream::characters( const OUString& i_rCharacters ) const
{
ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
@@ -161,7 +161,7 @@ namespace dbaccess
//------------------------------------------------------------------------------------------------------------------
StorageXMLInputStream::StorageXMLInputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
- const ::rtl::OUString& i_rStreamName )
+ const OUString& i_rStreamName )
:StorageInputStream( i_rContext, i_rParentStorage, i_rStreamName )
,m_pData( new StorageXMLInputStream_Data )
{
diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx
index a850b225b4fd..8fdb7305e274 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.hxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.hxx
@@ -42,20 +42,20 @@ namespace dbaccess
StorageXMLOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
- const ::rtl::OUString& i_rStreamName
+ const OUString& i_rStreamName
);
~StorageXMLOutputStream();
// StorageOutputStream overridables
virtual void close();
- void addAttribute( const ::rtl::OUString& i_rName, const ::rtl::OUString& i_rValue ) const;
+ void addAttribute( const OUString& i_rName, const OUString& i_rValue ) const;
- void startElement( const ::rtl::OUString& i_rElementName ) const;
+ void startElement( const OUString& i_rElementName ) const;
void endElement() const;
- void ignorableWhitespace( const ::rtl::OUString& i_rWhitespace ) const;
- void characters( const ::rtl::OUString& i_rCharacters ) const;
+ void ignorableWhitespace( const OUString& i_rWhitespace ) const;
+ void characters( const OUString& i_rCharacters ) const;
private:
StorageXMLOutputStream(); // never implemented
@@ -76,7 +76,7 @@ namespace dbaccess
StorageXMLInputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
- const ::rtl::OUString& i_rStreamName
+ const OUString& i_rStreamName
);
~StorageXMLInputStream();
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index e70acbbf6561..af11780ea5fc 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -87,7 +87,7 @@ namespace dbaccess
namespace
{
// .........................................................................
- static const ::rtl::OUString& lcl_getComponentStorageBaseName( const SubComponentType i_eType )
+ static const OUString& lcl_getComponentStorageBaseName( const SubComponentType i_eType )
{
static const OUString s_sFormBaseName( "form" );
static const OUString s_sReportBaseName( "report" );
@@ -109,7 +109,7 @@ namespace dbaccess
}
OSL_FAIL( "lcl_getComponentStorageBaseName: unimplemented case!" );
- static const ::rtl::OUString s_sFallback;
+ static const OUString s_sFallback;
return s_sFallback;
}
@@ -147,7 +147,7 @@ namespace dbaccess
// .........................................................................
static Reference< XCommandProcessor > lcl_getSubComponentDef_nothrow( const Reference< XDatabaseDocumentUI >& i_rAppUI,
- const SubComponentType i_eType, const ::rtl::OUString& i_rName )
+ const SubComponentType i_eType, const OUString& i_rName )
{
Reference< XController > xController( i_rAppUI, UNO_QUERY_THROW );
ENSURE_OR_RETURN( ( i_eType == FORM ) || ( i_eType == REPORT ), "lcl_getSubComponentDef_nothrow: illegal controller", NULL );
@@ -206,19 +206,19 @@ namespace dbaccess
}
public:
- virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue );
+ virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue );
virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue );
virtual void StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace );
virtual void EndElement ( const sal_Bool i_bIgnoreWhitespace );
- virtual void Characters( const ::rtl::OUString& i_rCharacters );
+ virtual void Characters( const OUString& i_rCharacters );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
GetComponentContext() const;
private:
- ::rtl::OUString impl_prefix( const ::xmloff::token::XMLTokenEnum i_eToken )
+ OUString impl_prefix( const ::xmloff::token::XMLTokenEnum i_eToken )
{
- ::rtl::OUStringBuffer aQualifiedName( m_aNamespace );
+ OUStringBuffer aQualifiedName( m_aNamespace );
aQualifiedName.append( sal_Unicode( ':' ) );
aQualifiedName.append( ::xmloff::token::GetXMLToken( i_eToken ) );
return aQualifiedName.makeStringAndClear();
@@ -227,11 +227,11 @@ namespace dbaccess
private:
const Reference<XComponentContext>& m_rContext;
const StorageXMLOutputStream& m_rDelegator;
- const ::rtl::OUStringBuffer m_aNamespace;
+ const OUStringBuffer m_aNamespace;
};
//--------------------------------------------------------------------
- void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue )
+ void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue )
{
m_rDelegator.addAttribute( impl_prefix( i_eName ), i_rValue );
}
@@ -260,7 +260,7 @@ namespace dbaccess
}
//--------------------------------------------------------------------
- void SettingsExportContext::Characters( const ::rtl::OUString& i_rCharacters )
+ void SettingsExportContext::Characters( const OUString& i_rCharacters )
{
m_rDelegator.characters( i_rCharacters );
}
@@ -292,11 +292,11 @@ namespace dbaccess
// XDocumentHandler
virtual void SAL_CALL startDocument( ) throw (SAXException, RuntimeException);
virtual void SAL_CALL endDocument( ) throw (SAXException, RuntimeException);
- virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException);
- virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (SAXException, RuntimeException);
- virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (SAXException, RuntimeException);
- virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException);
- virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (SAXException, RuntimeException);
+ virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException);
+ virtual void SAL_CALL endElement( const OUString& aName ) throw (SAXException, RuntimeException);
+ virtual void SAL_CALL characters( const OUString& aChars ) throw (SAXException, RuntimeException);
+ virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException);
+ virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (SAXException, RuntimeException);
virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) throw (SAXException, RuntimeException);
const ::comphelper::NamedValueCollection& getSettings() const { return m_aSettings; }
@@ -317,7 +317,7 @@ namespace dbaccess
}
//--------------------------------------------------------------------
- void SAL_CALL SettingsDocumentHandler::startElement( const ::rtl::OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException)
+ void SAL_CALL SettingsDocumentHandler::startElement( const OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException)
{
::rtl::Reference< SettingsImport > pNewState;
@@ -349,7 +349,7 @@ namespace dbaccess
}
//--------------------------------------------------------------------
- void SAL_CALL SettingsDocumentHandler::endElement( const ::rtl::OUString& i_Name ) throw (SAXException, RuntimeException)
+ void SAL_CALL SettingsDocumentHandler::endElement( const OUString& i_Name ) throw (SAXException, RuntimeException)
{
ENSURE_OR_THROW( !m_aStates.empty(), "no active element" );
(void)i_Name;
@@ -360,7 +360,7 @@ namespace dbaccess
}
//--------------------------------------------------------------------
- void SAL_CALL SettingsDocumentHandler::characters( const ::rtl::OUString& i_Chars ) throw (SAXException, RuntimeException)
+ void SAL_CALL SettingsDocumentHandler::characters( const OUString& i_Chars ) throw (SAXException, RuntimeException)
{
ENSURE_OR_THROW( !m_aStates.empty(), "no active element" );
@@ -369,14 +369,14 @@ namespace dbaccess
}
//--------------------------------------------------------------------
- void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException)
+ void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException)
{
// ignore them - that's why they're called "ignorable"
(void)aWhitespaces;
}
//--------------------------------------------------------------------
- void SAL_CALL SettingsDocumentHandler::processingInstruction( const ::rtl::OUString& i_Target, const ::rtl::OUString& i_Data ) throw (SAXException, RuntimeException)
+ void SAL_CALL SettingsDocumentHandler::processingInstruction( const OUString& i_Target, const OUString& i_Data ) throw (SAXException, RuntimeException)
{
OSL_FAIL( "SettingsDocumentHandler::processingInstruction: unexpected ..." );
(void)i_Target;
@@ -393,7 +393,7 @@ namespace dbaccess
//= SubComponentRecovery
//====================================================================
//--------------------------------------------------------------------
- const ::rtl::OUString SubComponentRecovery::getComponentsStorageName( const SubComponentType i_eType )
+ const OUString SubComponentRecovery::getComponentsStorageName( const SubComponentType i_eType )
{
static const OUString s_sFormsStorageName( "forms" );
static const OUString s_sReportsStorageName( "reports" );
@@ -418,7 +418,7 @@ namespace dbaccess
}
OSL_FAIL( "SubComponentRecovery::getComponentsStorageName: unimplemented case!" );
- static const ::rtl::OUString s_sFallback;
+ static const OUString s_sFallback;
return s_sFallback;
}
@@ -431,13 +431,13 @@ namespace dbaccess
return;
// open the sub storage for the given kind of components
- const ::rtl::OUString& rStorageName( getComponentsStorageName( m_eType ) );
+ const OUString& rStorageName( getComponentsStorageName( m_eType ) );
const Reference< XStorage > xComponentsStorage( i_rRecoveryStorage->openStorageElement(
rStorageName, ElementModes::READWRITE ), UNO_QUERY_THROW );
// find a free sub storage name, and create Yet Another Sub Storage
- const ::rtl::OUString& rBaseName( lcl_getComponentStorageBaseName( m_eType ) );
- const ::rtl::OUString sStorName = ::dbtools::createUniqueName( xComponentsStorage.get(), rBaseName, true );
+ const OUString& rBaseName( lcl_getComponentStorageBaseName( m_eType ) );
+ const OUString sStorName = ::dbtools::createUniqueName( xComponentsStorage.get(), rBaseName, true );
const Reference< XStorage > xObjectStor( xComponentsStorage->openStorageElement(
sStorName, ElementModes::READWRITE ), UNO_QUERY_THROW );
@@ -473,13 +473,13 @@ namespace dbaccess
void SubComponentRecovery::impl_identifyComponent_throw()
{
// ask the controller
- Pair< sal_Int32, ::rtl::OUString > aComponentIdentity = m_xDocumentUI->identifySubComponent( m_xComponent );
+ Pair< sal_Int32, OUString > aComponentIdentity = m_xDocumentUI->identifySubComponent( m_xComponent );
m_eType = lcl_databaseObjectToSubComponentType( aComponentIdentity.First );
m_aCompDesc.sName = aComponentIdentity.Second;
// what the controller didn't give us is the information whether this is in edit mode or not ...
Reference< XModuleManager2 > xModuleManager( ModuleManager::create(m_rContext) );
- const ::rtl::OUString sModuleIdentifier = xModuleManager->identify( m_xComponent );
+ const OUString sModuleIdentifier = xModuleManager->identify( m_xComponent );
switch ( m_eType )
{
@@ -563,7 +563,7 @@ namespace dbaccess
//--------------------------------------------------------------------
Reference< XComponent > SubComponentRecovery::impl_recoverSubDocument_throw( const Reference< XStorage >& i_rRecoveryStorage,
- const ::rtl::OUString& i_rComponentName, const bool i_bForEditing )
+ const OUString& i_rComponentName, const bool i_bForEditing )
{
Reference< XComponent > xSubComponent;
Reference< XCommandProcessor > xDocDefinition;
@@ -613,7 +613,7 @@ namespace dbaccess
//--------------------------------------------------------------------
Reference< XComponent > SubComponentRecovery::impl_recoverQueryDesign_throw( const Reference< XStorage >& i_rRecoveryStorage,
- const ::rtl::OUString& i_rComponentName, const bool i_bForEditing )
+ const OUString& i_rComponentName, const bool i_bForEditing )
{
Reference< XComponent > xSubComponent;
@@ -667,7 +667,7 @@ namespace dbaccess
//--------------------------------------------------------------------
Reference< XComponent > SubComponentRecovery::recoverFromStorage( const Reference< XStorage >& i_rRecoveryStorage,
- const ::rtl::OUString& i_rComponentName, const bool i_bForEditing )
+ const OUString& i_rComponentName, const bool i_bForEditing )
{
Reference< XComponent > xSubComponent;
switch ( m_eType )
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
index 8e70be04efca..6c4cac5f99f1 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
@@ -72,11 +72,11 @@ namespace dbaccess
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
recoverFromStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage,
- const ::rtl::OUString& i_rComponentName,
+ const OUString& i_rComponentName,
const bool i_bForEditing
);
- static const ::rtl::OUString getComponentsStorageName( const SubComponentType i_eType );
+ static const OUString getComponentsStorageName( const SubComponentType i_eType );
private:
void impl_saveSubDocument_throw(
@@ -90,14 +90,14 @@ namespace dbaccess
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
impl_recoverSubDocument_throw(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage,
- const ::rtl::OUString& i_rComponentName,
+ const OUString& i_rComponentName,
const bool i_bForEditing
);
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
impl_recoverQueryDesign_throw(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage,
- const ::rtl::OUString& i_rComponentName,
+ const OUString& i_rComponentName,
const bool i_bForEditing
);
diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx
index 3ff36d791b0c..2682ba81a28e 100644
--- a/dbaccess/source/core/recovery/subcomponents.hxx
+++ b/dbaccess/source/core/recovery/subcomponents.hxx
@@ -52,7 +52,7 @@ namespace dbaccess
// -------------------------------------------------------------------
struct DBACCESS_DLLPRIVATE SubComponentDescriptor
{
- ::rtl::OUString sName;
+ OUString sName;
bool bForEditing;
SubComponentDescriptor()
@@ -61,7 +61,7 @@ namespace dbaccess
{
}
- SubComponentDescriptor( const ::rtl::OUString& i_rName, const bool i_bForEditing )
+ SubComponentDescriptor( const OUString& i_rName, const bool i_bForEditing )
:sName( i_rName )
,bForEditing( i_bForEditing )
{
@@ -69,7 +69,7 @@ namespace dbaccess
};
// -------------------------------------------------------------------
- typedef ::boost::unordered_map< ::rtl::OUString, SubComponentDescriptor, ::rtl::OUStringHash > MapStringToCompDesc;
+ typedef ::boost::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc;
typedef ::std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-06 14:55:38 +0000