diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-31 12:28:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-31 17:25:52 +0000 |
| commit | 1fd280f2c63cdf8d24b48c02fe384f0bc20682c1 (patch) | |
| tree | 35b84f9730d7a6def967869336cc437e94ca6439 /writerfilter/source/dmapper/DomainMapper_Impl.cxx | |
| parent | Revert "tdf#89756 swich postfix to prefix operators" (diff) | |
| download | core-1fd280f2c63cdf8d24b48c02fe384f0bc20682c1.tar.gz core-1fd280f2c63cdf8d24b48c02fe384f0bc20682c1.zip | |
boost::tuple -> std::tuple
Change-Id: Ia08c184b792ff73d3ed49d6a5d54dec1a35943e9
Reviewed-on: https://gerrit.libreoffice.org/21955
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index eeb11a06d73c..797e54d2ad3c 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -74,7 +74,7 @@ #include <oox/token/tokens.hxx> #include <map> -#include <boost/tuple/tuple.hpp> +#include <tuple> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> @@ -2288,7 +2288,7 @@ static OUString lcl_ExtractToken(OUString const& rCommand, return token.makeStringAndClear(); } -boost::tuple<OUString, std::vector<OUString>, std::vector<OUString> > +std::tuple<OUString, std::vector<OUString>, std::vector<OUString> > lcl_SplitFieldCommand(const OUString& rCommand) { OUString sType; @@ -2330,10 +2330,9 @@ lcl_SplitFieldCommand(const OUString& rCommand) } } while (nStartIndex < rCommand.getLength()); - return boost::make_tuple(sType, arguments, switches); + return std::make_tuple(sType, arguments, switches); } - OUString lcl_ExctractAskVariableAndHint( const OUString& rCommand, OUString& rHint ) { // the first word after "ASK " is the variable @@ -3555,13 +3554,13 @@ void DomainMapper_Impl::CloseFieldCommand() { uno::Reference< uno::XInterface > xFieldInterface; - boost::tuple<OUString, std::vector<OUString>, std::vector<OUString> > const + std::tuple<OUString, std::vector<OUString>, std::vector<OUString> > const field(lcl_SplitFieldCommand(pContext->GetCommand())); - OUString const sFirstParam(boost::get<1>(field).empty() - ? OUString() : boost::get<1>(field).front()); + OUString const sFirstParam(std::get<1>(field).empty() + ? OUString() : std::get<1>(field).front()); FieldConversionMap_t::iterator const aIt = - aFieldConversionMap.find(boost::get<0>(field)); + aFieldConversionMap.find(std::get<0>(field)); if(aIt != aFieldConversionMap.end()) { bool bCreateEnhancedField = false; @@ -3614,7 +3613,7 @@ void DomainMapper_Impl::CloseFieldCommand() { FieldConversionMap_t aEnhancedFieldConversionMap = lcl_GetEnhancedFieldConversion(); FieldConversionMap_t::iterator aEnhancedIt = - aEnhancedFieldConversionMap.find(boost::get<0>(field)); + aEnhancedFieldConversionMap.find(std::get<0>(field)); if ( aEnhancedIt != aEnhancedFieldConversionMap.end()) sServiceName += OUString::createFromAscii(aEnhancedIt->second.cFieldServiceName ); } |