summaryrefslogtreecommitdiff
path: root/dbaccess/source/filter/xml
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/filter/xml')
-rw-r--r--dbaccess/source/filter/xml/xmlAutoStyle.cxx6
-rw-r--r--dbaccess/source/filter/xml/xmlAutoStyle.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceInfo.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx22
-rw-r--r--dbaccess/source/filter/xml/xmlExport.hxx18
-rw-r--r--dbaccess/source/filter/xml/xmlHelper.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterList.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.hxx22
8 files changed, 39 insertions, 39 deletions
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx
index 2c1360f3c6ad..9e4fce628291 100644
--- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx
+++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx
@@ -30,7 +30,7 @@ namespace dbaxml
void OXMLAutoStylePoolP::exportStyleAttributes(
SvXMLAttributeList& rAttrList,
sal_Int32 nFamily,
- const ::std::vector< XMLPropertyState >& rProperties,
+ const std::vector< XMLPropertyState >& rProperties,
const SvXMLExportPropertyMapper& rPropExp
, const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap
@@ -40,8 +40,8 @@ void OXMLAutoStylePoolP::exportStyleAttributes(
if ( nFamily == XML_STYLE_FAMILY_TABLE_COLUMN )
{
rtl::Reference< XMLPropertySetMapper > aPropMapper = rODBExport.GetColumnStylesPropertySetMapper();
- ::std::vector< XMLPropertyState >::const_iterator i = rProperties.begin();
- ::std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end();
+ std::vector< XMLPropertyState >::const_iterator i = rProperties.begin();
+ std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end();
for ( ; i != aEnd ; ++i )
{
sal_Int16 nContextID = aPropMapper->GetEntryContextId(i->mnIndex);
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx
index 0445d9abc3cd..c8316cd7f1db 100644
--- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx
+++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx
@@ -33,7 +33,7 @@ namespace dbaxml
virtual void exportStyleAttributes(
SvXMLAttributeList& rAttrList,
sal_Int32 nFamily,
- const ::std::vector< XMLPropertyState >& rProperties,
+ const std::vector< XMLPropertyState >& rProperties,
const SvXMLExportPropertyMapper& rPropExp,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index 376dab7485da..c9abadae48ba 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -50,7 +50,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
bool bAutoEnabled = false;
bool bFoundField = false,bFoundThousand = false, bFoundCharset = false;
- ::std::vector< sal_uInt16 > aTokens;
+ std::vector< sal_uInt16 > aTokens;
for(sal_Int16 i = 0; i < nLength; ++i)
{
OUString sLocalName;
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 4d69dafdb2b4..02b1e754874c 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -180,7 +180,7 @@ namespace dbaxml
const XMLPropertyState& /*rProperty*/,
const SvXMLUnitConverter& /*rUnitConverter*/,
const SvXMLNamespaceMap& /*rNamespaceMap*/,
- const ::std::vector< XMLPropertyState > * /*pProperties*/ ,
+ const std::vector< XMLPropertyState > * /*pProperties*/ ,
sal_uInt32 /*nIdx*/ ) const override
{
// nothing to do here
@@ -646,7 +646,7 @@ void ODBExport::exportConnectionData()
}
template< typename T > void ODBExport::exportDataSourceSettingsSequence(
- ::std::vector< TypedPropertyValue >::iterator const & in)
+ std::vector< TypedPropertyValue >::iterator const & in)
{
OSequenceIterator< T > i( in->Value );
while (i.hasMoreElements())
@@ -663,8 +663,8 @@ void ODBExport::exportDataSourceSettings()
return;
SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, true, true);
- ::std::vector< TypedPropertyValue >::iterator aIter = m_aDataSourceSettings.begin();
- ::std::vector< TypedPropertyValue >::const_iterator aEnd = m_aDataSourceSettings.end();
+ std::vector< TypedPropertyValue >::iterator aIter = m_aDataSourceSettings.begin();
+ std::vector< TypedPropertyValue >::const_iterator aEnd = m_aDataSourceSettings.end();
for ( ; aIter != aEnd; ++aIter )
{
const bool bIsSequence = TypeClass_SEQUENCE == aIter->Type.getTypeClass();
@@ -1118,8 +1118,8 @@ void ODBExport::exportTables(bool _bExportContext)
void ODBExport::exportAutoStyle(XPropertySet* _xProp)
{
- typedef ::std::pair<TPropertyStyleMap*,sal_uInt16> TEnumMapperPair;
- typedef ::std::pair< rtl::Reference < SvXMLExportPropertyMapper> , TEnumMapperPair> TExportPropMapperPair;
+ typedef std::pair<TPropertyStyleMap*,sal_uInt16> TEnumMapperPair;
+ typedef std::pair< rtl::Reference < SvXMLExportPropertyMapper> , TEnumMapperPair> TExportPropMapperPair;
Reference<XColumnsSupplier> xSup(_xProp,UNO_QUERY);
if ( xSup.is() )
{
@@ -1129,7 +1129,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp)
,TExportPropMapperPair(m_xRowExportHelper,TEnumMapperPair(&m_aRowAutoStyleNames,XML_STYLE_FAMILY_TABLE_ROW))
};
- ::std::vector< XMLPropertyState > aPropertyStates;
+ std::vector< XMLPropertyState > aPropertyStates;
for (const auto & i : pExportHelper)
{
aPropertyStates = i.first->Filter(_xProp);
@@ -1177,11 +1177,11 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp)
};
for (const auto & i : pExportHelper)
{
- ::std::vector< XMLPropertyState > aPropStates = i.first->Filter( _xProp );
+ std::vector< XMLPropertyState > aPropStates = i.first->Filter( _xProp );
if ( !aPropStates.empty() )
{
- ::std::vector< XMLPropertyState >::iterator aItr = aPropStates.begin();
- ::std::vector< XMLPropertyState >::const_iterator aEnd = aPropStates.end();
+ std::vector< XMLPropertyState >::iterator aItr = aPropStates.begin();
+ std::vector< XMLPropertyState >::const_iterator aEnd = aPropStates.end();
const rtl::Reference < XMLPropertySetMapper >& pStyle = i.first->getPropertySetMapper();
while ( aItr != aEnd )
{
@@ -1207,7 +1207,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp)
}
if ( XML_STYLE_FAMILY_TABLE_CELL == i.second.second )
- ::std::copy( m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end(), ::std::back_inserter( aPropStates ));
+ std::copy( m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end(), std::back_inserter( aPropStates ));
if ( !aPropStates.empty() )
i.second.first->insert( TPropertyStyleMap::value_type(_xProp,GetAutoStylePool()->Add( i.second.second, aPropStates )));
}
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 840ea95c8f0a..b82ceeff3370 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -61,9 +61,9 @@ using namespace ::com::sun::star::xml::sax;
class ODBExport : public SvXMLExport
{
- typedef ::std::map< ::xmloff::token::XMLTokenEnum, OUString> TSettingsMap;
+ typedef std::map< ::xmloff::token::XMLTokenEnum, OUString> TSettingsMap;
- typedef ::std::pair< OUString ,OUString> TStringPair;
+ typedef std::pair< OUString ,OUString> TStringPair;
struct TDelimiter
{
OUString sText;
@@ -74,8 +74,8 @@ class ODBExport : public SvXMLExport
TDelimiter() : bUsed( false ) { }
};
- typedef ::std::map< Reference<XPropertySet> ,OUString > TPropertyStyleMap;
- typedef ::std::map< Reference<XPropertySet> ,Reference<XPropertySet> > TTableColumnMap;
+ typedef std::map< Reference<XPropertySet> ,OUString > TPropertyStyleMap;
+ typedef std::map< Reference<XPropertySet> ,Reference<XPropertySet> > TTableColumnMap;
struct TypedPropertyValue
{
@@ -91,10 +91,10 @@ class ODBExport : public SvXMLExport
}
};
- ::std::unique_ptr< TStringPair > m_aAutoIncrement;
- ::std::unique_ptr< TDelimiter > m_aDelimiter;
- ::std::vector< TypedPropertyValue > m_aDataSourceSettings;
- ::std::vector< XMLPropertyState > m_aCurrentPropertyStates;
+ std::unique_ptr< TStringPair > m_aAutoIncrement;
+ std::unique_ptr< TDelimiter > m_aDelimiter;
+ std::vector< TypedPropertyValue > m_aDataSourceSettings;
+ std::vector< XMLPropertyState > m_aCurrentPropertyStates;
TPropertyStyleMap m_aAutoStyleNames;
TPropertyStyleMap m_aCellAutoStyleNames;
TPropertyStyleMap m_aRowAutoStyleNames;
@@ -125,7 +125,7 @@ class ODBExport : public SvXMLExport
void exportAutoIncrement();
void exportCharSet();
template< typename T > void exportDataSourceSettingsSequence(
- ::std::vector< TypedPropertyValue >::iterator const & in);
+ std::vector< TypedPropertyValue >::iterator const & in);
void exportDataSourceSettings();
void exportForms();
void exportReports();
diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx
index 359647710922..2731ea6b058c 100644
--- a/dbaccess/source/filter/xml/xmlHelper.hxx
+++ b/dbaccess/source/filter/xml/xmlHelper.hxx
@@ -38,7 +38,7 @@ namespace dbaxml
class OPropertyHandlerFactory : public ::xmloff::OControlPropertyHandlerFactory
{
protected:
- mutable ::std::unique_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler;
+ mutable std::unique_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler;
public:
OPropertyHandlerFactory();
virtual ~OPropertyHandlerFactory() override;
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx
index 1a5f56a6a266..da60e351ea75 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx
@@ -27,8 +27,8 @@ namespace dbaxml
class ODBFilter;
class OXMLTableFilterList : public SvXMLImportContext
{
- ::std::vector< OUString> m_aPatterns;
- ::std::vector< OUString> m_aTypes;
+ std::vector< OUString> m_aPatterns;
+ std::vector< OUString> m_aTypes;
ODBFilter& GetOwnImport();
public:
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 171320c6fac3..ca92b750e99f 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -58,22 +58,22 @@ class ODBFilter : public SvXMLImport
{
public:
typedef std::map< OUString, Sequence<PropertyValue> > TPropertyNameMap;
- typedef ::std::vector< css::beans::PropertyValue> TInfoSequence;
+ typedef std::vector< css::beans::PropertyValue> TInfoSequence;
private:
TPropertyNameMap m_aQuerySettings;
TPropertyNameMap m_aTablesSettings;
TInfoSequence m_aInfoSequence;
- mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocElemTokenMap;
- mutable ::std::unique_ptr<SvXMLTokenMap> m_pDatabaseElemTokenMap;
- mutable ::std::unique_ptr<SvXMLTokenMap> m_pDataSourceElemTokenMap;
- mutable ::std::unique_ptr<SvXMLTokenMap> m_pLoginElemTokenMap;
- mutable ::std::unique_ptr<SvXMLTokenMap> m_pDatabaseDescriptionElemTokenMap;
- mutable ::std::unique_ptr<SvXMLTokenMap> m_pDataSourceInfoElemTokenMap;
- mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocumentsElemTokenMap;
- mutable ::std::unique_ptr<SvXMLTokenMap> m_pComponentElemTokenMap;
- mutable ::std::unique_ptr<SvXMLTokenMap> m_pQueryElemTokenMap;
- mutable ::std::unique_ptr<SvXMLTokenMap> m_pColumnElemTokenMap;
+ mutable std::unique_ptr<SvXMLTokenMap> m_pDocElemTokenMap;
+ mutable std::unique_ptr<SvXMLTokenMap> m_pDatabaseElemTokenMap;
+ mutable std::unique_ptr<SvXMLTokenMap> m_pDataSourceElemTokenMap;
+ mutable std::unique_ptr<SvXMLTokenMap> m_pLoginElemTokenMap;
+ mutable std::unique_ptr<SvXMLTokenMap> m_pDatabaseDescriptionElemTokenMap;
+ mutable std::unique_ptr<SvXMLTokenMap> m_pDataSourceInfoElemTokenMap;
+ mutable std::unique_ptr<SvXMLTokenMap> m_pDocumentsElemTokenMap;
+ mutable std::unique_ptr<SvXMLTokenMap> m_pComponentElemTokenMap;
+ mutable std::unique_ptr<SvXMLTokenMap> m_pQueryElemTokenMap;
+ mutable std::unique_ptr<SvXMLTokenMap> m_pColumnElemTokenMap;
mutable rtl::Reference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper;
mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper;
generated by cgit (git 2.34.1) at 2024-08-03 03:55:45 +0000