diff options
Diffstat (limited to 'xmloff/source/text')
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 21 | ||||
| -rw-r--r-- | xmloff/source/text/txtlists.cxx | 16 |
2 files changed, 18 insertions, 19 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index eb087aab898c..542147dcae11 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -17,10 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <vector> - #include <memory> +#include <tuple> +#include <vector> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -524,18 +523,18 @@ struct XMLTextImportHelper::Impl - data structure contains more than one candidate for each list level of the outline style (#i69629#) */ - ::std::unique_ptr< ::std::vector< OUString > []> + std::unique_ptr< std::vector< OUString > []> m_xOutlineStylesCandidates; // start range, xml:id, RDFa stuff - typedef ::boost::tuple< + typedef std::tuple< uno::Reference<text::XTextRange>, OUString, std::shared_ptr< ::xmloff::ParsedRDFaAttributes > > BookmarkMapEntry_t; /// start ranges for open bookmarks - ::std::map< OUString, BookmarkMapEntry_t > m_BookmarkStartRanges; + std::map< OUString, BookmarkMapEntry_t > m_BookmarkStartRanges; - typedef ::std::vector< OUString > BookmarkVector_t; + typedef std::vector< OUString > BookmarkVector_t; BookmarkVector_t m_BookmarkVector; /// name of the last 'open' redline that started between paragraphs @@ -2492,7 +2491,7 @@ void XMLTextImportHelper::InsertBookmarkStartRange( std::shared_ptr< ::xmloff::ParsedRDFaAttributes > & i_rpRDFaAttributes) { m_xImpl->m_BookmarkStartRanges[sName] = - ::boost::make_tuple(rRange, i_rXmlId, i_rpRDFaAttributes); + std::make_tuple(rRange, i_rXmlId, i_rpRDFaAttributes); m_xImpl->m_BookmarkVector.push_back(sName); } @@ -2506,9 +2505,9 @@ bool XMLTextImportHelper::FindAndRemoveBookmarkStartRange( { Impl::BookmarkMapEntry_t & rEntry = (*m_xImpl->m_BookmarkStartRanges.find(sName)).second; - o_rRange.set(rEntry.get<0>()); - o_rXmlId = rEntry.get<1>(); - o_rpRDFaAttributes = rEntry.get<2>(); + o_rRange.set(std::get<0>(rEntry)); + o_rXmlId = std::get<1>(rEntry); + o_rpRDFaAttributes = std::get<2>(rEntry); m_xImpl->m_BookmarkStartRanges.erase(sName); Impl::BookmarkVector_t::iterator it(m_xImpl->m_BookmarkVector.begin()); while (it != m_xImpl->m_BookmarkVector.end() && it->compareTo(sName)!=0) diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index f3f6c4e24e32..2ec8dff91288 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -76,7 +76,7 @@ XMLTextListsHelper::~XMLTextListsHelper() void XMLTextListsHelper::PushListContext( XMLTextListBlockContext *i_pListBlock) { - mListStack.push(::boost::make_tuple(i_pListBlock, + mListStack.push(std::make_tuple(i_pListBlock, static_cast<XMLTextListItemContext*>(nullptr), static_cast<XMLNumberedParaContext*>(nullptr))); } @@ -84,7 +84,7 @@ void XMLTextListsHelper::PushListContext( void XMLTextListsHelper::PushListContext( XMLNumberedParaContext *i_pNumberedParagraph) { - mListStack.push(::boost::make_tuple( + mListStack.push(std::make_tuple( static_cast<XMLTextListBlockContext*>(nullptr), static_cast<XMLTextListItemContext*>(nullptr), i_pNumberedParagraph)); } @@ -103,11 +103,11 @@ void XMLTextListsHelper::ListContextTop( { if ( !mListStack.empty() ) { o_pListBlockContext = - static_cast<XMLTextListBlockContext*>(&mListStack.top().get<0>()); + static_cast<XMLTextListBlockContext*>(&std::get<0>(mListStack.top())); o_pListItemContext = - static_cast<XMLTextListItemContext *>(&mListStack.top().get<1>()); + static_cast<XMLTextListItemContext *>(&std::get<1>(mListStack.top())); o_pNumberedParagraphContext = - static_cast<XMLNumberedParaContext *>(&mListStack.top().get<2>()); + static_cast<XMLNumberedParaContext *>(&std::get<2>(mListStack.top())); } } @@ -116,13 +116,13 @@ void XMLTextListsHelper::SetListItem( XMLTextListItemContext *i_pListItem ) // may be cleared by ListBlockContext for upper list... if (i_pListItem) { assert(mListStack.size()); - assert(mListStack.top().get<0>() && + assert(std::get<0>(mListStack.top()) && "internal error: SetListItem: mListStack has no ListBlock"); - assert(!mListStack.top().get<1>() && + assert(!std::get<1>(mListStack.top()) && "error: SetListItem: list item already exists"); } if ( !mListStack.empty() ) { - mListStack.top().get<1>() = i_pListItem; + std::get<1>(mListStack.top()) = i_pListItem; } } |