diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-18 15:37:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-19 08:02:51 +0000 |
| commit | f7ef1cbb83fdc6c43fa39fd50a9e12703e4fcf5f (patch) | |
| tree | ae237578179192c1b5bfbe63cc1c0f11c87acb64 /helpcompiler | |
| parent | f626b886d03f882fc72589db846f24df5290bb03 (diff) | |
boost->std
Change-Id: I5079e03f70370ed83a1158b2e278f48642108f08
Reviewed-on: https://gerrit.libreoffice.org/18692
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'helpcompiler')
| -rw-r--r-- | helpcompiler/source/HelpIndexer.cxx | 4 | ||||
| -rw-r--r-- | helpcompiler/source/HelpLinker.cxx | 3 | ||||
| -rw-r--r-- | helpcompiler/source/HelpLinker_main.cxx | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx index 05bc830ec829..63cf85af5c0a 100644 --- a/helpcompiler/source/HelpIndexer.cxx +++ b/helpcompiler/source/HelpIndexer.cxx @@ -14,8 +14,8 @@ #include <rtl/ustrbuf.hxx> #include <osl/file.hxx> #include <osl/thread.h> -#include <boost/scoped_ptr.hpp> #include <algorithm> +#include <memory> #include "LuceneHelper.hxx" @@ -42,7 +42,7 @@ bool HelpIndexer::indexDocuments() bool bUseCJK = sLang == "ja" || sLang == "ko" || sLang == "zh"; // Construct the analyzer appropriate for the given language - boost::scoped_ptr<lucene::analysis::Analyzer> analyzer; + std::unique_ptr<lucene::analysis::Analyzer> analyzer; if (bUseCJK) analyzer.reset(new lucene::analysis::LanguageBasedAnalyzer(L"cjk")); else diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index a977392de5ed..24653b44b254 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -37,7 +37,6 @@ #include <expat.h> #include <memory> -#include <boost/scoped_ptr.hpp> IndexerPreProcessor::IndexerPreProcessor ( const std::string& aModuleName, const fs::path& fsIndexBaseDir, @@ -945,7 +944,7 @@ bool compileExtensionHelp xmlSetStructuredErrorFunc( NULL, StructuredXMLErrorFunction ); try { - boost::scoped_ptr<HelpLinker> pHelpLinker(new HelpLinker()); + std::unique_ptr<HelpLinker> pHelpLinker(new HelpLinker()); pHelpLinker->main( args, &aStdStrExtensionPath, &aStdStrDestination, &aOfficeHelpPath ); } catch( const HelpProcessingException& e ) diff --git a/helpcompiler/source/HelpLinker_main.cxx b/helpcompiler/source/HelpLinker_main.cxx index e4e45fecf3c6..36826b49209c 100644 --- a/helpcompiler/source/HelpLinker_main.cxx +++ b/helpcompiler/source/HelpLinker_main.cxx @@ -19,9 +19,9 @@ #include <HelpCompiler.hxx> #include <HelpLinker.hxx> -#include <iostream> #include <sal/main.h> -#include <boost/scoped_ptr.hpp> +#include <iostream> +#include <memory> SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { std::vector<std::string> args; @@ -29,7 +29,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { args.push_back(std::string(argv[i])); try { - boost::scoped_ptr<HelpLinker> pHelpLinker(new HelpLinker()); + std::unique_ptr<HelpLinker> pHelpLinker(new HelpLinker()); pHelpLinker->main( args ); } catch( const HelpProcessingException& e ) |