diff options
| -rw-r--r-- | drawinglayer/README | 2 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/vclpixelprocessor2d.hxx | 4 | ||||
| -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 | ||||
| -rw-r--r-- | winaccessibility/inc/AccObjectManagerAgent.hxx | 4 |
6 files changed, 11 insertions, 12 deletions
diff --git a/drawinglayer/README b/drawinglayer/README index d950f29cfddb..b530ba6fedac 100644 --- a/drawinglayer/README +++ b/drawinglayer/README @@ -19,7 +19,7 @@ A stripped down version with extended comments: VirtualDevice aVirtualDevice; // Create processor and draw primitives, to get it ready for rendering. - boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D( + std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D( drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(...)); if (pProcessor2D) diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx index 3a70dd8a4eb0..6699934c1409 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx @@ -25,7 +25,7 @@ #include "vclprocessor2d.hxx" #include <vcl/outdev.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> // predefines @@ -53,7 +53,7 @@ namespace drawinglayer { private: struct Impl; - boost::scoped_ptr<Impl> m_pImpl; + std::unique_ptr<Impl> m_pImpl; protected: /* the local processor for BasePrinitive2D-Implementation based primitives, 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 ) diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx b/winaccessibility/inc/AccObjectManagerAgent.hxx index 7e685b772bed..568d8e4ffaff 100644 --- a/winaccessibility/inc/AccObjectManagerAgent.hxx +++ b/winaccessibility/inc/AccObjectManagerAgent.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTMANAGERAGENT_HXX #define INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTMANAGERAGENT_HXX -#include <boost/scoped_ptr.hpp> +#include <memory> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -37,7 +37,7 @@ class AccObjectManagerAgent { private: - boost::scoped_ptr<AccObjectWinManager> pWinManager; + std::unique_ptr<AccObjectWinManager> pWinManager; public: |