diff options
author | Gabor Kelemen <gabor.kelemen.extern@allotropia.de> | 2023-02-15 01:18:28 +0100 |
---|---|---|
committer | Gabor Kelemen <kelemeng@ubuntu.com> | 2023-02-16 08:14:39 +0000 |
commit | 857b74041aa339e56ee8b2a05a910172753ed783 (patch) | |
tree | 7b5ba27120faa015f86080fd91bed13828470020 /xmloff/source/text | |
parent | 79176694ddc7bce40ce2b82d3f332be8642a5167 (diff) |
Drop 'using namespace ::std' in dirs [u-x]*
Change-Id: I8c044369826b00241496cfc7ba2463e507c0d1a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147077
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
Diffstat (limited to 'xmloff/source/text')
-rw-r--r-- | xmloff/source/text/XMLIndexTemplateContext.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/text/XMLSectionExport.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/text/txtflde.cxx | 17 | ||||
-rw-r--r-- | xmloff/source/text/txtimp.cxx | 5 | ||||
-rw-r--r-- | xmloff/source/text/txtparae.cxx | 23 | ||||
-rw-r--r-- | xmloff/source/text/txtsecte.cxx | 11 | ||||
-rw-r--r-- | xmloff/source/text/txtstyli.cxx | 1 |
7 files changed, 26 insertions, 33 deletions
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index 8dfa4b1fd984..a9b1e32f6a27 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -40,7 +40,6 @@ #include <algorithm> -using namespace ::std; using namespace ::xmloff::token; using ::com::sun::star::beans::XPropertySet; diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index f76c4f2815f1..cba9da2a7293 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -53,7 +53,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; -using namespace ::std; using namespace ::xmloff::token; using ::com::sun::star::beans::XPropertySet; diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 54341aab0b01..58ad8604f0a1 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -71,7 +71,6 @@ #include <vector> -using namespace ::std; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -764,13 +763,13 @@ void XMLTextFieldExport::ExportFieldAutoStyle( // a header text. Reference<XText> xOurText = GetToplevelText(rTextField->getAnchor()->getText()); - map<Reference<XText>, set<OUString> >::iterator aMapIter = + std::map<Reference<XText>, std::set<OUString> >::iterator aMapIter = pUsedMasters->find(xOurText); // insert a list for our XText (if necessary) if (aMapIter == pUsedMasters->end()) { - set<OUString> aSet; + std::set<OUString> aSet; (*pUsedMasters)[xOurText] = aSet; aMapIter = pUsedMasters->find(xOurText); } @@ -1903,10 +1902,10 @@ void XMLTextFieldExport::ExportFieldDeclarations( const Reference<XText> & rText ) { // store lists for decl elements - vector<OUString> aVarName; - vector<OUString> aUserName; - vector<OUString> aSeqName; - vector<OUString> aDdeName; + std::vector<OUString> aVarName; + std::vector<OUString> aUserName; + std::vector<OUString> aSeqName; + std::vector<OUString> aDdeName; // get text fields supplier and field master name access Reference<XTextFieldsSupplier> xTextFieldsSupp(GetExport().GetModel(), @@ -1929,7 +1928,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( "written out separately" ); if (nullptr != pUsedMasters) { - map<Reference<XText>, set<OUString> > ::iterator aMapIter = + std::map<Reference<XText>, std::set<OUString> > ::iterator aMapIter = pUsedMasters->find(rText); if (aMapIter != pUsedMasters->end()) { @@ -2199,7 +2198,7 @@ void XMLTextFieldExport::SetExportOnlyUsedFieldDeclarations( // create used masters set (if none is used) if (bExportOnlyUsed) - pUsedMasters.reset( new map<Reference<XText>, set<OUString> > ); + pUsedMasters.reset( new std::map<Reference<XText>, std::set<OUString> > ); } void XMLTextFieldExport::ExportElement(enum XMLTokenEnum eElementName, diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 87fd2b91283a..e9858e31a722 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -74,7 +74,6 @@ using ::com::sun::star::ucb::XAnyCompare; -using namespace ::std; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -340,8 +339,8 @@ namespace class FieldParamImporter { public: - typedef pair<OUString,OUString> field_param_t; - typedef vector<field_param_t> field_params_t; + typedef std::pair<OUString,OUString> field_param_t; + typedef std::vector<field_param_t> field_params_t; FieldParamImporter(const field_params_t* const pInParams, Reference<XNameContainer> const & xOutParams) : m_pInParams(pInParams) , m_xOutParams(xOutParams) diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 59e755f0e676..4775fbad9152 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -112,7 +112,6 @@ #include <o3tl/safeint.hxx> #include <comphelper/sequenceashashmap.hxx> -using namespace ::std; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -190,12 +189,12 @@ namespace class TextContentSet { public: - typedef list<Reference<XTextContent>> contents_t; - typedef back_insert_iterator<contents_t> inserter_t; + typedef std::list<Reference<XTextContent>> contents_t; + typedef std::back_insert_iterator<contents_t> inserter_t; typedef contents_t::const_iterator const_iterator_t; inserter_t getInserter() - { return back_insert_iterator<contents_t>(m_vTextContents); }; + { return std::back_insert_iterator<contents_t>(m_vTextContents); }; const_iterator_t getBegin() const { return m_vTextContents.begin(); }; const_iterator_t getEnd() const @@ -439,10 +438,10 @@ namespace xmloff const BoundFrames* GetShapes() const { return m_pShapes.get(); }; private: - unique_ptr<BoundFrames> m_pTexts; - unique_ptr<BoundFrames> m_pGraphics; - unique_ptr<BoundFrames> m_pEmbeddeds; - unique_ptr<BoundFrames> m_pShapes; + std::unique_ptr<BoundFrames> m_pTexts; + std::unique_ptr<BoundFrames> m_pGraphics; + std::unique_ptr<BoundFrames> m_pEmbeddeds; + std::unique_ptr<BoundFrames> m_pShapes; }; } @@ -680,7 +679,7 @@ void XMLTextParagraphExport::Add( XmlStyleFamily nFamily, } SAL_WARN_IF( !xPropMapper.is(), "xmloff", "There is the property mapper?" ); - vector< XMLPropertyState > aPropStates = + std::vector< XMLPropertyState > aPropStates = xPropMapper->Filter(GetExport(), rPropSet); aPropStates.insert( aPropStates.end(), aAddStates.begin(), aAddStates.end() ); @@ -806,7 +805,7 @@ void XMLTextParagraphExport::Add( XmlStyleFamily nFamily, } SAL_WARN_IF( !xPropMapper.is(), "xmloff", "There is the property mapper?" ); - vector<XMLPropertyState> aPropStates(xPropMapper->Filter(GetExport(), rPropSet)); + std::vector<XMLPropertyState> aPropStates(xPropMapper->Filter(GetExport(), rPropSet)); if( rPropSetHelper.hasProperty( NUMBERING_RULES_AUTO ) ) { @@ -903,7 +902,7 @@ OUString XMLTextParagraphExport::Find( SAL_WARN_IF( !xPropMapper.is(), "xmloff", "There is the property mapper?" ); if( !xPropMapper.is() ) return sName; - vector<XMLPropertyState> aPropStates(xPropMapper->Filter(GetExport(), rPropSet)); + std::vector<XMLPropertyState> aPropStates(xPropMapper->Filter(GetExport(), rPropSet)); aPropStates.insert( aPropStates.end(), aAddStates.begin(), aAddStates.end() ); if( std::any_of( aPropStates.begin(), aPropStates.end(), lcl_validPropState ) ) sName = GetAutoStylePool().Find( nFamily, sName, aPropStates ); @@ -918,7 +917,7 @@ OUString XMLTextParagraphExport::FindTextStyle( const XMLPropertyState** ppAddStates ) const { rtl::Reference < SvXMLExportPropertyMapper > xPropMapper(GetTextPropMapper()); - vector<XMLPropertyState> aPropStates(xPropMapper->Filter(GetExport(), rPropSet)); + std::vector<XMLPropertyState> aPropStates(xPropMapper->Filter(GetExport(), rPropSet)); // Get parent and remove hyperlinks (they aren't of interest) OUString sName; diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx index 9f27040ecc5e..13dad5332807 100644 --- a/xmloff/source/text/txtsecte.cxx +++ b/xmloff/source/text/txtsecte.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; -using namespace ::std; using ::com::sun::star::beans::XPropertySet; @@ -108,7 +107,7 @@ void XMLTextParagraphExport::exportListAndSectionChange( // Build stacks of old and new sections // Sections on top of mute sections should not be on the stack - vector< Reference<XTextSection> > aOldStack; + std::vector< Reference<XTextSection> > aOldStack; Reference<XTextSection> aCurrent(rPrevSection); while(aCurrent.is()) { @@ -121,7 +120,7 @@ void XMLTextParagraphExport::exportListAndSectionChange( aCurrent.set(aCurrent->getParentSection()); } - vector< Reference<XTextSection> > aNewStack; + std::vector< Reference<XTextSection> > aNewStack; aCurrent.set(rNextSection); bool bMute = false; while(aCurrent.is()) @@ -139,9 +138,9 @@ void XMLTextParagraphExport::exportListAndSectionChange( } // compare the two stacks - vector<Reference<XTextSection> > ::reverse_iterator aOld = + std::vector<Reference<XTextSection> > ::reverse_iterator aOld = aOldStack.rbegin(); - vector<Reference<XTextSection> > ::reverse_iterator aNew = + std::vector<Reference<XTextSection> > ::reverse_iterator aNew = aNewStack.rbegin(); // compare bottom sections and skip equal section while ( (aOld != aOldStack.rend()) && @@ -156,7 +155,7 @@ void XMLTextParagraphExport::exportListAndSectionChange( // (order: newest to oldest) if (aOld != aOldStack.rend()) { - vector<Reference<XTextSection> > ::iterator aOldForward( + std::vector<Reference<XTextSection> > ::iterator aOldForward( aOldStack.begin()); while ((aOldForward != aOldStack.end()) && (*aOldForward != *aOld)) diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 74b91d506e43..01a0deab4e4b 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -54,7 +54,6 @@ #include <xmloff/xmlerror.hxx> -using namespace ::std; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; |