diff options
133 files changed, 394 insertions, 462 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 068c27e64e1c..184c86f42875 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DESKTOP_INC_APP_HXX #include <boost/optional.hpp> -#include <boost/scoped_ptr.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <sal/log.hxx> #include <vcl/svapp.hxx> @@ -31,6 +30,7 @@ #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/uno/Reference.h> #include <osl/mutex.hxx> +#include <memory> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; @@ -176,7 +176,7 @@ class Desktop : public Application OUString m_aBootstrapErrorMessage; BootstrapStatus m_aBootstrapStatus; - boost::scoped_ptr<Lockfile> m_xLockfile; + std::unique_ptr<Lockfile> m_xLockfile; Timer m_firstRunTimer; static ResMgr* pResMgr; diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index b17f82566daf..3f4d680b7aa4 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -9,7 +9,7 @@ #include <LibreOfficeKit/LibreOfficeKit.h> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> #include "../../source/inc/desktopdllapi.h" using namespace css; @@ -19,7 +19,7 @@ namespace desktop { struct DESKTOP_DLLPUBLIC LibLODocument_Impl : public _LibreOfficeKitDocument { uno::Reference<css::lang::XComponent> mxComponent; - shared_ptr< LibreOfficeKitDocumentClass > m_pDocumentClass; + std::shared_ptr< LibreOfficeKitDocumentClass > m_pDocumentClass; explicit LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent); ~LibLODocument_Impl(); diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx index b2b593bc3bd6..3c4ae1e19f74 100644 --- a/desktop/inc/pch/precompiled_deploymentgui.hxx +++ b/desktop/inc/pch/precompiled_deploymentgui.hxx @@ -17,8 +17,6 @@ #include <algorithm> #include <boost/bind.hpp> #include <boost/optional.hpp> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Toolkit.hpp> diff --git a/desktop/inc/pch/precompiled_deploymentmisc.hxx b/desktop/inc/pch/precompiled_deploymentmisc.hxx index 2eae9cde13fb..f2fcae9cc3ab 100644 --- a/desktop/inc/pch/precompiled_deploymentmisc.hxx +++ b/desktop/inc/pch/precompiled_deploymentmisc.hxx @@ -17,7 +17,6 @@ #include <boost/noncopyable.hpp> #include <boost/optional.hpp> #include <memory> -#include <boost/shared_ptr.hpp> #include <com/sun/star/beans/Optional.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index c4c2e7001d86..40dca8259e6b 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -21,8 +21,6 @@ #include <algorithm> #include <basic/sbstar.hxx> #include <memory> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> #include <cassert> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 977c65770499..32240d02349b 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <boost/shared_ptr.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XLocalizable.hpp> diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 9cc3ce4a78f5..eeb491342e12 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -24,7 +24,6 @@ #include "officeipcthread.hxx" #include "cmdlineargs.hxx" #include "dispatchwatcher.hxx" -#include <boost/scoped_ptr.hpp> #include <stdio.h> #include <osl/process.h> #include <sal/log.hxx> @@ -751,7 +750,7 @@ void OfficeIPCThread::execute() if (aArguments.isEmpty()) continue; - boost::scoped_ptr< CommandLineArgs > aCmdLineArgs; + std::unique_ptr< CommandLineArgs > aCmdLineArgs; try { Parser p(aArguments); diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 3cb4d394fe14..86cf478cf5ad 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -21,7 +21,6 @@ #include <cassert> -#include <boost/shared_ptr.hpp> #include <com/sun/star/uno/Exception.hpp> #include <comphelper/configuration.hxx> #include "config_folders.h" diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index fea7d6b0ccec..a9c081199404 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -71,9 +71,8 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <map> +#include <memory> #include <vector> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::system; @@ -495,7 +494,7 @@ IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleOptionsBtn, Button*, void) if ( pFact ) { OUString sExtensionId = GetEntryData( nActive )->m_xPackage->getIdentifier().Value; - boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateOptionsDialog( this, sExtensionId, OUString() )); + std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateOptionsDialog( this, sExtensionId, OUString() )); pDlg->Execute(); } diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 39ffeffd37ff..359b46ef0e8c 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -77,8 +77,7 @@ #include "dp_version.hxx" #include <queue> -#include <boost/shared_ptr.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> #ifdef WNT #if defined _MSC_VER @@ -212,7 +211,7 @@ struct ExtensionCmd m_vExtensionList( vExtensionList ) {}; }; -typedef ::boost::shared_ptr< ExtensionCmd > TExtensionCmd; +typedef std::shared_ptr< ExtensionCmd > TExtensionCmd; class ExtensionCmdQueue::Thread: public salhelper::Thread diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index f18cf82d3bde..29b6891bfa25 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/deployment/XPackage.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace dp_gui { @@ -51,7 +51,7 @@ class TheExtensionManager; struct Entry_Impl; -typedef ::boost::shared_ptr< Entry_Impl > TEntry_Impl; +typedef std::shared_ptr< Entry_Impl > TEntry_Impl; struct Entry_Impl { diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx index 1f6d5236de94..3b75b8058c5c 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx @@ -23,9 +23,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <boost/shared_ptr.hpp> - - namespace com { namespace sun { namespace star { namespace deployment { class XPackage; }}}} diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 2c0a165d7c5f..1b2132ccd37f 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -42,7 +42,6 @@ #include <com/sun/star/deployment/ExtensionManager.hpp> #include <com/sun/star/task/OfficeRestartManager.hpp> #include <memory> -#include <boost/shared_ptr.hpp> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <salhelper/linkhelper.hxx> @@ -75,11 +74,11 @@ namespace dp_misc { namespace { struct UnoRc : public rtl::StaticWithInit< - boost::shared_ptr<rtl::Bootstrap>, UnoRc> { - const boost::shared_ptr<rtl::Bootstrap> operator () () { + std::shared_ptr<rtl::Bootstrap>, UnoRc> { + const std::shared_ptr<rtl::Bootstrap> operator () () { OUString unorc( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("louno") ); ::rtl::Bootstrap::expandMacros( unorc ); - ::boost::shared_ptr< ::rtl::Bootstrap > ret( + std::shared_ptr< ::rtl::Bootstrap > ret( new ::rtl::Bootstrap( unorc ) ); OSL_ASSERT( ret->getHandle() != 0 ); return ret; @@ -110,7 +109,7 @@ const OUString OfficePipeId::operator () () reinterpret_cast<sal_uInt8 const *>(userPath.getStr()); sal_Size size = (userPath.getLength() * sizeof (sal_Unicode)); sal_uInt32 md5_key_len = rtl_digest_queryLength( digest ); - ::std::unique_ptr<sal_uInt8[]> md5_buf( new sal_uInt8 [ md5_key_len ] ); + std::unique_ptr<sal_uInt8[]> md5_buf( new sal_uInt8 [ md5_key_len ] ); rtl_digest_init( digest, data, static_cast<sal_uInt32>(size) ); rtl_digest_update( digest, data, static_cast<sal_uInt32>(size) ); diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 87471454b5d2..046182330b48 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -13,8 +13,7 @@ #include <string.h> #include <stdlib.h> -#include <boost/shared_ptr.hpp> -#include <boost/weak_ptr.hpp> +#include <memory> #include <boost/property_tree/json_parser.hpp> #define LOK_USE_UNSTABLE_API @@ -83,13 +82,11 @@ using namespace vcl; using namespace desktop; using namespace utl; -using namespace boost; - struct LibLibreOffice_Impl; static LibLibreOffice_Impl *gImpl = NULL; -static weak_ptr< LibreOfficeKitClass > gOfficeClass; -static weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass; +static std::weak_ptr< LibreOfficeKitClass > gOfficeClass; +static std::weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass; typedef struct { @@ -310,7 +307,7 @@ static void lo_registerCallback (LibreOfficeKit* pThis, struct LibLibreOffice_Impl : public _LibreOfficeKit { OUString maLastExceptionMsg; - shared_ptr< LibreOfficeKitClass > m_pOfficeClass; + std::shared_ptr< LibreOfficeKitClass > m_pOfficeClass; oslThread maThread; LibreOfficeKitCallback mpCallback; void *mpCallbackData; diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 5cb213ef80c0..6126cdd7b978 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -38,8 +38,6 @@ #include "com/sun/star/security/DocumentDigitalSignatures.hpp" #include "com/sun/star/security/XCertificate.hpp" -#include <boost/shared_ptr.hpp> - static ResMgr& getPDFFilterResMgr() { static ResMgr *pRes = ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILanguageTag()); diff --git a/forms/source/inc/commanddescriptionprovider.hxx b/forms/source/inc/commanddescriptionprovider.hxx index 8369e1816b1a..75a695b8e65b 100644 --- a/forms/source/inc/commanddescriptionprovider.hxx +++ b/forms/source/inc/commanddescriptionprovider.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace frm @@ -41,7 +41,7 @@ namespace frm virtual ~ICommandDescriptionProvider() { } }; - typedef ::boost::shared_ptr< const ICommandDescriptionProvider > PCommandDescriptionProvider; + typedef std::shared_ptr< const ICommandDescriptionProvider > PCommandDescriptionProvider; //= factory diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx index 9c7107b5e611..21cc14a5af7e 100644 --- a/forms/source/inc/commandimageprovider.hxx +++ b/forms/source/inc/commandimageprovider.hxx @@ -25,7 +25,7 @@ #include <vcl/image.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> namespace frm @@ -50,7 +50,7 @@ namespace frm virtual ~ICommandImageProvider() { } }; - typedef ::boost::shared_ptr< const ICommandImageProvider > PCommandImageProvider; + typedef std::shared_ptr< const ICommandImageProvider > PCommandImageProvider; //= factory diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index 1455d9b42e1b..9cdd7c9587ad 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -23,7 +23,7 @@ #include <vcl/toolbox.hxx> #include <vcl/field.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> namespace frm @@ -55,9 +55,9 @@ namespace frm private: const IFeatureDispatcher* m_pDispatcher; - const ::boost::shared_ptr< const ICommandImageProvider > + const std::shared_ptr< const ICommandImageProvider > m_pImageProvider; - const ::boost::shared_ptr< const ICommandDescriptionProvider > + const std::shared_ptr< const ICommandDescriptionProvider > m_pDescriptionProvider; ImageSize m_eImageSize; VclPtr<ImplNavToolBar> m_pToolbar; @@ -67,8 +67,8 @@ namespace frm NavigationToolBar( vcl::Window* _pParent, WinBits _nStyle, - const ::boost::shared_ptr< const ICommandImageProvider >& _pImageProvider, - const ::boost::shared_ptr< const ICommandDescriptionProvider >& _pDescriptionProvider + const std::shared_ptr< const ICommandImageProvider >& _pImageProvider, + const std::shared_ptr< const ICommandDescriptionProvider >& _pDescriptionProvider ); virtual ~NavigationToolBar( ); virtual void dispose() SAL_OVERRIDE; diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 09663f3108e3..a115918843a0 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -59,7 +59,6 @@ #include <com/sun/star/sheet/FormulaMapGroupSpecialOffset.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <boost/ref.hpp> -#include <boost/shared_ptr.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <map> diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 0f85df095923..98ad3d39cab5 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -30,7 +30,6 @@ #include <vcl/button.hxx> #include <svtools/treelistbox.hxx> -#include <boost/shared_ptr.hpp> #include <vector> #include "formula/omoduleclient.hxx" diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx index 0b0b0fad6ee3..6982b11eea14 100644 --- a/helpcompiler/inc/HelpCompiler.hxx +++ b/helpcompiler/inc/HelpCompiler.hxx @@ -31,8 +31,6 @@ #include <algorithm> #include <ctype.h> -#include <boost/shared_ptr.hpp> - #include <libxml/xmlmemory.h> #include <libxml/debugXML.h> #include <libxml/HTMLtree.h> diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index de7ccea88419..b8724caeb8f9 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -26,7 +26,7 @@ #include <cstdlib> #include <cstring> -#include "boost/scoped_ptr.hpp" +#include <memory> #include "rtl/strbuf.hxx" #include "helper.hxx" @@ -41,7 +41,7 @@ namespace { namespace global { OString inputPathname; -boost::scoped_ptr< CfgParser > parser; +std::unique_ptr< CfgParser > parser; } } diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index a56e1a978890..593801d0973f 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -25,13 +25,13 @@ #include "helper.hxx" #include "srclex.hxx" -#include "boost/scoped_ptr.hpp" #include <cstdio> #include <cstdlib> #include "common.hxx" #include "export.hxx" #include "tokens.h" #include <iostream> +#include <memory> #include <rtl/strbuf.hxx> void yyerror( const char * ); @@ -44,7 +44,7 @@ MergeDataFile * pMergeDataFile = 0; //TODO namespace global { OString inputPathname; -boost::scoped_ptr< Export > exporter; +std::unique_ptr< Export > exporter; } diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx index 515fe8e0e978..d176c3ba4142 100644 --- a/libreofficekit/qa/unit/tiledrendering.cxx +++ b/libreofficekit/qa/unit/tiledrendering.cxx @@ -8,7 +8,6 @@ */ #include <memory> -#include <boost/scoped_ptr.hpp> #include <boost/property_tree/json_parser.hpp> #include <cppunit/TestFixture.h> #include <cppunit/plugin/TestPlugIn.h> @@ -86,7 +85,7 @@ void TiledRenderingTest::runAllTests() OUString sUserInstallURL = aWorkdirRootURL + "/unittest"; rtl::Bootstrap::set(OUString("UserInstallation"), sUserInstallURL); - scoped_ptr< Office > pOffice( lok_cpp_init( + std::unique_ptr< Office > pOffice( lok_cpp_init( m_sLOPath.c_str() ) ); CPPUNIT_ASSERT( pOffice.get() ); @@ -102,7 +101,7 @@ void TiledRenderingTest::runAllTests() void TiledRenderingTest::testDocumentLoadFail( Office* pOffice ) { const string sDocPath = m_sSrcRoot + "/libreofficekit/qa/data/IDONOTEXIST.odt"; - scoped_ptr< Document> pDocument( pOffice->documentLoad( sDocPath.c_str() ) ); + std::unique_ptr< Document> pDocument( pOffice->documentLoad( sDocPath.c_str() ) ); CPPUNIT_ASSERT( !pDocument.get() ); // TODO: we probably want to have some way of returning what // the cause of failure was. getError() will return @@ -115,7 +114,7 @@ void TiledRenderingTest::testDocumentLoadFail( Office* pOffice ) int getDocumentType( Office* pOffice, const string& rPath ) { - scoped_ptr< Document> pDocument( pOffice->documentLoad( rPath.c_str() ) ); + std::unique_ptr< Document> pDocument( pOffice->documentLoad( rPath.c_str() ) ); CPPUNIT_ASSERT( pDocument.get() ); return pDocument->getDocumentType(); } @@ -156,7 +155,7 @@ void TiledRenderingTest::testImpressSlideNames( Office* pOffice ) // Hence forcefully remove it here. remove( sLockFile.c_str() ); - scoped_ptr< Document> pDocument( pOffice->documentLoad( sDocPath.c_str() ) ); + std::unique_ptr< Document> pDocument( pOffice->documentLoad( sDocPath.c_str() ) ); CPPUNIT_ASSERT( pDocument->getParts() == 3 ); CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 0 ), "TestText1" ) == 0 ); @@ -174,7 +173,7 @@ void TiledRenderingTest::testCalcSheetNames( Office* pOffice ) // FIXME: LOK will fail when trying to open a locked file remove( sLockFile.c_str() ); - scoped_ptr< Document> pDocument( pOffice->documentLoad( sDocPath.c_str() ) ); + std::unique_ptr< Document> pDocument( pOffice->documentLoad( sDocPath.c_str() ) ); CPPUNIT_ASSERT( pDocument->getParts() == 3 ); CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 0 ), "TestText1" ) == 0 ); @@ -207,11 +206,11 @@ void TiledRenderingTest::testOverlay( Office* /*pOffice*/ ) // test it's entirely possible that an unwanted lock file will remain. // Hence forcefully remove it here. remove( sLockFile.c_str() ); - scoped_ptr< Office > pOffice( lok_cpp_init( + std::unique_ptr< Office > pOffice( lok_cpp_init( m_sLOPath.c_str() ) ); assert( pOffice.get() ); - scoped_ptr< Document> pDocument( pOffice->documentLoad( + std::unique_ptr< Document> pDocument( pOffice->documentLoad( sDocPath.c_str() ) ); if ( !pDocument.get() ) diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx index ba67076cc0f8..ab86dfb7b1df 100644 --- a/linguistic/source/defs.hxx +++ b/linguistic/source/defs.hxx @@ -25,13 +25,11 @@ #include <com/sun/star/linguistic2/XHyphenator.hpp> #include <com/sun/star/linguistic2/XThesaurus.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> class SvStream; - - -typedef boost::shared_ptr< SvStream > SvStreamPtr; +typedef std::shared_ptr< SvStream > SvStreamPtr; struct LangSvcEntries { diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index fc93d5d97ad0..ae0da9935c13 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -682,7 +682,7 @@ void HyphenatorDispatcher::SetServiceList( const Locale &rLocale, } else { - boost::shared_ptr< LangSvcEntries_Hyph > pTmpEntry( new LangSvcEntries_Hyph( rSvcImplNames[0] ) ); + std::shared_ptr< LangSvcEntries_Hyph > pTmpEntry( new LangSvcEntries_Hyph( rSvcImplNames[0] ) ); pTmpEntry->aSvcRefs = Sequence< Reference < XHyphenator > >( 1 ); aSvcMap[ nLanguage ] = pTmpEntry; } diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index f887dabf9bd8..8360e32ffcc6 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -32,8 +32,8 @@ #include <cppuhelper/implbase.hxx> -#include <boost/shared_ptr.hpp> #include <map> +#include <memory> #include "lngopt.hxx" #include "linguistic/misc.hxx" @@ -49,7 +49,7 @@ class HyphenatorDispatcher : >, public LinguDispatcher { - typedef boost::shared_ptr< LangSvcEntries_Hyph > LangSvcEntries_Hyph_Ptr_t; + typedef std::shared_ptr< LangSvcEntries_Hyph > LangSvcEntries_Hyph_Ptr_t; typedef std::map< LanguageType, LangSvcEntries_Hyph_Ptr_t > HyphSvcByLangMap_t; HyphSvcByLangMap_t aSvcMap; diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 83bfbadada9a..70cb45f2f1eb 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -820,7 +820,7 @@ void SpellCheckerDispatcher::SetServiceList( const Locale &rLocale, } else { - boost::shared_ptr< LangSvcEntries_Spell > pTmpEntry( new LangSvcEntries_Spell( rSvcImplNames ) ); + std::shared_ptr< LangSvcEntries_Spell > pTmpEntry( new LangSvcEntries_Spell( rSvcImplNames ) ); pTmpEntry->aSvcRefs = Sequence< Reference < XSpellChecker > >( nLen ); aSvcMap[ nLanguage ] = pTmpEntry; } diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index c50ec33123da..1b99c7d0aa4d 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -36,8 +36,8 @@ #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp> -#include <boost/shared_ptr.hpp> #include <map> +#include <memory> #include <unotools/charclass.hxx> class LngSvcMgr; @@ -51,7 +51,7 @@ class SpellCheckerDispatcher : >, public LinguDispatcher { - typedef boost::shared_ptr< LangSvcEntries_Spell > LangSvcEntries_Spell_Ptr_t; + typedef std::shared_ptr< LangSvcEntries_Spell > LangSvcEntries_Spell_Ptr_t; typedef std::map< LanguageType, LangSvcEntries_Spell_Ptr_t > SpellSvcByLangMap_t; SpellSvcByLangMap_t aSvcMap; LinguOptions aOpt; diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index 2ccb8550921a..a0027a10c5cf 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -226,7 +226,7 @@ void ThesaurusDispatcher::SetServiceList( const Locale &rLocale, } else { - boost::shared_ptr< LangSvcEntries_Thes > pTmpEntry( new LangSvcEntries_Thes( rSvcImplNames ) ); + std::shared_ptr< LangSvcEntries_Thes > pTmpEntry( new LangSvcEntries_Thes( rSvcImplNames ) ); pTmpEntry->aSvcRefs = Sequence< Reference < XThesaurus > >( nLen ); aSvcMap[ nLanguage ] = pTmpEntry; } diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index bd1523349d0c..f16ee02bf101 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -37,8 +37,8 @@ #include <osl/mutex.hxx> -#include <boost/shared_ptr.hpp> #include <map> +#include <memory> #include "lngopt.hxx" @@ -51,7 +51,7 @@ class ThesaurusDispatcher : >, public LinguDispatcher { - typedef boost::shared_ptr< LangSvcEntries_Thes > LangSvcEntries_Thes_Ptr_t; + typedef std::shared_ptr< LangSvcEntries_Thes > LangSvcEntries_Thes_Ptr_t; typedef std::map< LanguageType, LangSvcEntries_Thes_Ptr_t > ThesSvcByLangMap_t; ThesSvcByLangMap_t aSvcMap; diff --git a/lotuswordpro/inc/pch/precompiled_lwpft.hxx b/lotuswordpro/inc/pch/precompiled_lwpft.hxx index ae9daf31e3d1..fe3db8d85295 100644 --- a/lotuswordpro/inc/pch/precompiled_lwpft.hxx +++ b/lotuswordpro/inc/pch/precompiled_lwpft.hxx @@ -19,7 +19,6 @@ #include <assert.h> #include <boost/cast.hpp> #include <memory> -#include <boost/scoped_ptr.hpp> #include <cassert> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx index c77114fe8a34..01250b9bb286 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx @@ -129,7 +129,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid } LwpObjectID aBulletID = pBullOver->GetSilverBullet(); - boost::shared_ptr<LwpBulletOverride> pBulletOver(pBullOver->clone()); + std::shared_ptr<LwpBulletOverride> pBulletOver(pBullOver->clone()); sal_uInt16 nNameIndex = 0; std::vector <OverridePair>::iterator iter; diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx index a256a899d266..98a83ab2733d 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx @@ -61,8 +61,7 @@ #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBULLETSTYLEMGR_HXX #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBULLETSTYLEMGR_HXX -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> #include "lwpheader.hxx" #include "lwpfoundry.hxx" @@ -90,7 +89,7 @@ public: inline void SetCurrentSilverBullet(const LwpObjectID& rNewID); private: - typedef std::pair<boost::shared_ptr<LwpBulletOverride>, LwpObjectID> OverridePair; + typedef std::pair<std::shared_ptr<LwpBulletOverride>, LwpObjectID> OverridePair; std::vector <OUString> m_vStyleNameList; std::vector <OverridePair> m_vIDsPairList; LwpFoundry* m_pFoundry; @@ -98,7 +97,7 @@ private: bool m_bContinue; bool m_bIsBulletSkipped; LwpObjectID m_aCurrentNumberingID; - boost::scoped_ptr<LwpNumberingOverride> m_pCurrentNumOverride; + std::unique_ptr<LwpNumberingOverride> m_pCurrentNumOverride; }; inline void LwpBulletStyleMgr::SetFoundry(LwpFoundry* pFoundry) diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx index 68ff39c9fb91..fcf84ef77055 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.cxx +++ b/lotuswordpro/source/filter/lwpcelllayout.cxx @@ -743,7 +743,7 @@ LwpCellBorderType LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal LwpCellLayout * pLeftNeighbour = GetCellByRowCol(nRow+iLoop, GetLeftColID(nCol), pTableLayout); if (pLeftNeighbour) { - boost::scoped_ptr<XFBorders> pNeighbourBorders(pLeftNeighbour->GetXFBorders()); + std::unique_ptr<XFBorders> pNeighbourBorders(pLeftNeighbour->GetXFBorders()); if (pNeighbourBorders) { XFBorder& rRightBorder = pNeighbourBorders->GetRight(); @@ -770,7 +770,7 @@ LwpCellBorderType LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal LwpCellLayout * pBelowNeighbour = GetCellByRowCol(nRow + nRowSpan, nCol+iLoop, pTableLayout); if (pBelowNeighbour) { - boost::scoped_ptr<XFBorders> pBelowBorders(pBelowNeighbour->GetXFBorders()); + std::unique_ptr<XFBorders> pBelowBorders(pBelowNeighbour->GetXFBorders()); if (pBelowBorders) { XFBorder& rTopBorder = pBelowBorders->GetTop(); diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index 8f93df0ce5cd..f84f700b79fd 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -79,7 +79,7 @@ #include <sfx2/docfile.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::cppu; using namespace ::com::sun::star::lang; @@ -109,13 +109,13 @@ using namespace OpenStormBento; pCompressed->Read(buffer, 16); aDecompressed->Write(buffer, 16); - boost::scoped_ptr<LwpSvStream> aLwpStream(new LwpSvStream(pCompressed)); + std::unique_ptr<LwpSvStream> aLwpStream(new LwpSvStream(pCompressed)); LtcBenContainer* pBentoContainer; sal_uLong ulRet = BenOpenContainer(aLwpStream.get(), &pBentoContainer); if (ulRet != BenErr_OK) return false; - boost::scoped_ptr<LtcUtBenValueStream> aWordProData(pBentoContainer->FindValueStreamWithPropertyName("WordProData")); + std::unique_ptr<LtcUtBenValueStream> aWordProData(pBentoContainer->FindValueStreamWithPropertyName("WordProData")); if (!aWordProData.get()) return false; @@ -182,9 +182,9 @@ int ReadWordproFile(SvStream &rStream, uno::Reference<css::xml::sax::XDocumentHa try { LwpSvStream *pRawLwpSvStream = NULL; - boost::scoped_ptr<LwpSvStream> aLwpSvStream; - boost::scoped_ptr<LwpSvStream> aCompressedLwpSvStream; - boost::scoped_ptr<SvStream> aDecompressed; + std::unique_ptr<LwpSvStream> aLwpSvStream; + std::unique_ptr<LwpSvStream> aCompressedLwpSvStream; + std::unique_ptr<SvStream> aDecompressed; if (GetLwpSvStream(&rStream, pRawLwpSvStream) && pRawLwpSvStream) { SvStream *pDecompressed = pRawLwpSvStream->GetStream(); @@ -203,7 +203,7 @@ int ReadWordproFile(SvStream &rStream, uno::Reference<css::xml::sax::XDocumentHa aLwpSvStream.reset(pRawLwpSvStream); - boost::scoped_ptr<IXFStream> pStrm(new XFSaxStream(xHandler)); + std::unique_ptr<IXFStream> pStrm(new XFSaxStream(xHandler)); Lwp9Reader reader(aLwpSvStream.get(), pStrm.get()); //Reset all static objects,because this function may be called many times. XFGlobalReset(); diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 4499b53af8e5..becdbec6af40 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -60,7 +60,7 @@ */ #include <stdio.h> -#include <boost/scoped_ptr.hpp> +#include <memory> #include "lwp9reader.hxx" #include "lwpgrfobj.hxx" @@ -342,7 +342,7 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*& pGrafData) // if small file, use the compressed stream for BENTO LwpSvStream* pStream = m_pStrm->GetCompressedStream() ? m_pStrm->GetCompressedStream(): m_pStrm; - boost::scoped_ptr<OpenStormBento::LtcBenContainer> pBentoContainer; + std::unique_ptr<OpenStormBento::LtcBenContainer> pBentoContainer; { OpenStormBento::LtcBenContainer* pTmp(0); sal_uLong ulRet = OpenStormBento::BenOpenContainer(pStream, &pTmp); diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index a08e1f09c68e..1d51cc2da907 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -1544,7 +1544,7 @@ XFColumns* LwpLayout::GetXFColumns() XFColumns* pColumns = new XFColumns(); //set XFColumnSep - boost::scoped_ptr<XFColumnSep> pColumnSep(GetColumnSep()); + std::unique_ptr<XFColumnSep> pColumnSep(GetColumnSep()); if(pColumnSep) { pColumns->SetSeparator(*pColumnSep); diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index 981aab94f404..4718f42f7cf5 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -384,7 +384,7 @@ void LwpPara::RegisterStyle() OverrideAlignment(NULL,static_cast<LwpParaAlignProperty*>(pProps)->GetAlignment(),pOverStyle); else { - boost::scoped_ptr<LwpAlignmentOverride> const pAlign( + std::unique_ptr<LwpAlignmentOverride> const pAlign( rParaStyle.GetAlignment()->clone()); OverrideAlignment(pAlign.get(), static_cast<LwpParaAlignProperty*>(pProps)->GetAlignment(), @@ -411,7 +411,7 @@ void LwpPara::RegisterStyle() OverrideSpacing(NULL,static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),pOverStyle); else { - boost::scoped_ptr<LwpSpacingOverride> const + std::unique_ptr<LwpSpacingOverride> const pSpacing(rParaStyle.GetSpacing()->clone()); OverrideSpacing(pSpacing.get(), static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(), diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx index d9e0a31b65fd..b0d24878006e 100644 --- a/lotuswordpro/source/filter/lwppara.hxx +++ b/lotuswordpro/source/filter/lwppara.hxx @@ -61,7 +61,7 @@ #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARA_HXX #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARA_HXX -#include <boost/scoped_ptr.hpp> +#include <memory> #include "lwpfribheader.hxx" #include "lwpobj.hxx" @@ -227,7 +227,7 @@ protected: LwpObjectID m_aSilverBulletID; LwpSilverBullet* m_pSilverBullet; LwpBulletOverride* m_pBullOver; - boost::scoped_ptr<LwpNumberingOverride> m_pParaNumbering; + std::unique_ptr<LwpNumberingOverride> m_pParaNumbering; OUString m_aBulletStyleName; bool m_bBullContinue; //end add diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx index 50866f077ead..5784d345d1e9 100644 --- a/lotuswordpro/source/filter/lwppara1.cxx +++ b/lotuswordpro/source/filter/lwppara1.cxx @@ -350,7 +350,7 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl } LwpOverride* pBorder = pParaStyle->GetParaBorder(); - boost::scoped_ptr<LwpParaBorderOverride> pFinalBorder( + std::unique_ptr<LwpParaBorderOverride> pFinalBorder( pBorder ? polymorphic_downcast<LwpParaBorderOverride*>(pBorder->clone()) : new LwpParaBorderOverride) @@ -360,7 +360,7 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl pBorder = static_cast<LwpParaBorderProperty*>(pProps)->GetLocalParaBorder(); if (pBorder) { - boost::scoped_ptr<LwpParaBorderOverride> pLocalBorder( + std::unique_ptr<LwpParaBorderOverride> pLocalBorder( polymorphic_downcast<LwpParaBorderOverride*>(pBorder->clone())); pLocalBorder->Override(pFinalBorder.get()); } @@ -392,7 +392,7 @@ void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyl pBreaks = static_cast<LwpParaBreaksProperty*>(pProps)->GetLocalParaBreaks(); if (pBreaks) { - boost::scoped_ptr<LwpBreaksOverride> const pLocalBreaks( + std::unique_ptr<LwpBreaksOverride> const pLocalBreaks( polymorphic_downcast<LwpBreaksOverride*>(pBreaks->clone())); pLocalBreaks->Override(pFinalBreaks.get()); } @@ -473,7 +473,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps) : new LwpBulletOverride) ; - boost::scoped_ptr<LwpBulletOverride> const pLocalBullet2(pLocalBullet->clone()); + std::unique_ptr<LwpBulletOverride> const pLocalBullet2(pLocalBullet->clone()); pLocalBullet2->Override(pFinalBullet.get()); aSilverBulletID = pFinalBullet->GetSilverBullet(); diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 9d67ea96ebaf..b83e517a408a 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -58,7 +58,7 @@ * For LWP filter architecture prototype ************************************************************************/ -#include <boost/scoped_ptr.hpp> +#include <memory> #include "lwpparastyle.hxx" #include "lwpfilehdr.hxx" @@ -174,7 +174,7 @@ void LwpParaStyle::Apply(XFParaStyle *pParaStyle) { if (!m_pBulletOverride->IsInValid())// for remove bullet indent in named bullet style { - boost::scoped_ptr<LwpIndentOverride> pNewIndent(pIndent->clone()); + std::unique_ptr<LwpIndentOverride> pNewIndent(pIndent->clone()); pNewIndent->SetMFirst(0); pNewIndent->SetMRest(0); ApplyIndent(NULL, pParaStyle, pNewIndent.get()); diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index 7d6e844e2933..c41e039f55a9 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -263,7 +263,7 @@ double LwpSuperTableLayout::GetTableWidth() void LwpSuperTableLayout::ApplyShadow(XFTableStyle *pTableStyle) { // use shadow property of supertable - boost::scoped_ptr<XFShadow> pXFShadow(GetXFShadow()); + std::unique_ptr<XFShadow> pXFShadow(GetXFShadow()); if(pXFShadow) { pTableStyle->SetShadow(pXFShadow->GetPosition(), pXFShadow->GetOffset(), pXFShadow->GetColor()); diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index aeb968693f7e..511e9013056f 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -23,7 +23,6 @@ #include "mysqlc_subcomponent.hxx" #include "mysqlc_types.hxx" -#include <boost/shared_ptr.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx index f5916c4b5567..b7f297a101c2 100644 --- a/oox/inc/drawingml/table/tablecell.hxx +++ b/oox/inc/drawingml/table/tablecell.hxx @@ -28,8 +28,6 @@ #include <drawingml/textliststyle.hxx> #include <com/sun/star/table/XCell.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/optional.hpp> #include <vector> #include <map> diff --git a/oox/inc/drawingml/table/tableproperties.hxx b/oox/inc/drawingml/table/tableproperties.hxx index eb3ba78cd017..21550bb56c76 100644 --- a/oox/inc/drawingml/table/tableproperties.hxx +++ b/oox/inc/drawingml/table/tableproperties.hxx @@ -25,10 +25,9 @@ #include <oox/helper/propertymap.hxx> #include <oox/drawingml/color.hxx> -#include <boost/shared_ptr.hpp> -#include <boost/optional.hpp> -#include <vector> #include <map> +#include <memory> +#include <vector> namespace oox { namespace drawingml { namespace table { @@ -43,7 +42,7 @@ public: std::vector< TableRow >& getTableRows() { return mvTableRows; }; OUString& getStyleId(){ return maStyleId; }; - boost::shared_ptr< TableStyle >& getTableStyle(){ return mpTableStyle; }; + std::shared_ptr< TableStyle >& getTableStyle(){ return mpTableStyle; }; bool& isRtl(){ return mbRtl; }; bool& isFirstRow(){ return mbFirstRow; }; bool& isFirstCol(){ return mbFirstCol; }; @@ -60,7 +59,7 @@ private: const TableStyle& getUsedTableStyle(const ::oox::core::XmlFilterBase& rFilterBase, TableStyle*& rTableStyleToDelete); OUString maStyleId; // either StyleId is available - boost::shared_ptr< TableStyle > mpTableStyle; // or the complete TableStyle + std::shared_ptr< TableStyle > mpTableStyle; // or the complete TableStyle std::vector< sal_Int32 > mvTableGrid; std::vector< TableRow > mvTableRows; diff --git a/oox/inc/drawingml/texteffectscontext.hxx b/oox/inc/drawingml/texteffectscontext.hxx index b8e3aeb4a4a0..825192616e0f 100644 --- a/oox/inc/drawingml/texteffectscontext.hxx +++ b/oox/inc/drawingml/texteffectscontext.hxx @@ -15,7 +15,7 @@ #include <oox/helper/grabbagstack.hxx> #include <oox/core/contexthandler2.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <vector> namespace oox { namespace drawingml { @@ -35,7 +35,7 @@ public: protected: std::vector<css::beans::PropertyValue>& mrTextEffectsProperties; - boost::scoped_ptr<oox::GrabBagStack> mpGrabBagStack; + std::unique_ptr<oox::GrabBagStack> mpGrabBagStack; sal_Int32 mnCurrentElement; private: diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index 7b81b907f624..623b19220981 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -34,7 +34,6 @@ #include <boost/bind.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> -#include <boost/scoped_ptr.hpp> #include <boost/noncopyable.hpp> #include <cassert> #include <com/sun/star/animations/AnimationCalcMode.hpp> diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx index 177a6aa4c556..602f8fe8f5f0 100644 --- a/oox/source/drawingml/diagram/constraintlistcontext.cxx +++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx @@ -49,7 +49,7 @@ ConstraintListContext::onCreateContext( ::sal_Int32 aElement, { case DGM_TOKEN( constr ): { - boost::shared_ptr< ConstraintAtom > pNode( new ConstraintAtom() ); + std::shared_ptr< ConstraintAtom > pNode( new ConstraintAtom() ); mpNode->addChild( pNode ); pNode->setFor( rAttribs.getToken( XML_for, XML_none ) ); diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx index 259ca3cb6755..9811c7f01bf1 100644 --- a/oox/source/drawingml/diagram/diagram.hxx +++ b/oox/source/drawingml/diagram/diagram.hxx @@ -21,11 +21,9 @@ #define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAM_HXX #include <map> +#include <memory> #include <vector> -#include <boost/shared_ptr.hpp> -#include <boost/enable_shared_from_this.hpp> - #include <rtl/ustring.hxx> #include "oox/drawingml/shape.hxx" @@ -150,7 +148,7 @@ typedef std::vector< Point > Points; } class LayoutNode; -typedef boost::shared_ptr< LayoutNode > LayoutNodePtr; +typedef std::shared_ptr< LayoutNode > LayoutNodePtr; typedef std::map< OUString, css::uno::Reference<css::xml::dom::XDocument> > DiagramDomMap; typedef css::uno::Sequence< css::uno::Sequence< css::uno::Any > > DiagramRelsMap; @@ -194,7 +192,7 @@ private: StringMap maPresOfNameMap; }; -typedef boost::shared_ptr< DiagramData > DiagramDataPtr; +typedef std::shared_ptr< DiagramData > DiagramDataPtr; class DiagramLayout { @@ -237,7 +235,7 @@ private: // clrData }; -typedef boost::shared_ptr< DiagramLayout > DiagramLayoutPtr; +typedef std::shared_ptr< DiagramLayout > DiagramLayoutPtr; struct DiagramStyle { @@ -291,7 +289,7 @@ private: DiagramRelsMap maDataRelsMap; }; -typedef boost::shared_ptr< Diagram > DiagramPtr; +typedef std::shared_ptr< Diagram > DiagramPtr; } } diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx index 5d20256caf6e..b27216a697c1 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx @@ -23,7 +23,7 @@ #include <map> #include <string> -#include <boost/shared_ptr.hpp> +#include <memory> #include <boost/array.hpp> #include <com/sun/star/uno/Any.hxx> @@ -35,7 +35,7 @@ namespace oox { namespace drawingml { class DiagramLayout; -typedef boost::shared_ptr< DiagramLayout > DiagramLayoutPtr; +typedef std::shared_ptr< DiagramLayout > DiagramLayoutPtr; // AG_IteratorAttributes struct IteratorAttr @@ -69,7 +69,7 @@ struct ConditionAttr struct LayoutAtomVisitor; class LayoutAtom; -typedef boost::shared_ptr< LayoutAtom > LayoutAtomPtr; +typedef std::shared_ptr< LayoutAtom > LayoutAtomPtr; /** abstract Atom for the layout */ class LayoutAtom @@ -171,7 +171,7 @@ private: ParamMap maMap; }; -typedef boost::shared_ptr< AlgAtom > AlgAtomPtr; +typedef std::shared_ptr< AlgAtom > AlgAtomPtr; class ForEachAtom : public LayoutAtom @@ -189,7 +189,7 @@ private: IteratorAttr maIter; }; -typedef boost::shared_ptr< ForEachAtom > ForEachAtomPtr; +typedef std::shared_ptr< ForEachAtom > ForEachAtomPtr; class ConditionAtom : public LayoutAtom @@ -210,7 +210,7 @@ private: std::vector< LayoutAtomPtr > mpElseChildNodes; }; -typedef boost::shared_ptr< ConditionAtom > ConditionAtomPtr; +typedef std::shared_ptr< ConditionAtom > ConditionAtomPtr; /** "choose" statements. Atoms will be tested in order. */ class ChooseAtom @@ -269,7 +269,7 @@ private: sal_Int32 mnChildOrder; }; -typedef boost::shared_ptr< LayoutNode > LayoutNodePtr; +typedef std::shared_ptr< LayoutNode > LayoutNodePtr; struct LayoutAtomVisitor { diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index c92070648d73..cc3bb6ae87df 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -249,7 +249,7 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement, } case DGM_TOKEN( shape ): { - LayoutNodePtr pNode( boost::dynamic_pointer_cast< LayoutNode >( mpNode ) ); + LayoutNodePtr pNode(std::dynamic_pointer_cast<LayoutNode>(mpNode)); if( pNode ) { ShapePtr pShape; @@ -319,7 +319,7 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement, break; case DGM_TOKEN( varLst ): { - LayoutNodePtr pNode( boost::dynamic_pointer_cast< LayoutNode >( mpNode ) ); + LayoutNodePtr pNode(std::dynamic_pointer_cast<LayoutNode>(mpNode)); if( pNode ) { return new LayoutVariablePropertySetContext( *this, pNode->variables() ); diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx index ac6a8624a40a..30bab795e2b7 100644 --- a/oox/source/drawingml/table/tablecontext.cxx +++ b/oox/source/drawingml/table/tablecontext.cxx @@ -59,7 +59,7 @@ TableContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeList& r break; case A_TOKEN( tableStyle ): // CT_TableStyle { - boost::shared_ptr< TableStyle >& rTableStyle = mrTableProperties.getTableStyle(); + std::shared_ptr< TableStyle >& rTableStyle = mrTableProperties.getTableStyle(); rTableStyle.reset( new TableStyle() ); return new TableStyleContext( *this, rAttribs, *rTableStyle ); } diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx index e996e1a1afe8..28a4b98ff646 100644 --- a/oox/source/drawingml/texteffectscontext.cxx +++ b/oox/source/drawingml/texteffectscontext.cxx @@ -109,7 +109,7 @@ TextEffectsContext::TextEffectsContext( std::vector<PropertyValue>& rTextEffectsProperties) : ContextHandler2(rParent) , mrTextEffectsProperties(rTextEffectsProperties) - , mpGrabBagStack(NULL) + , mpGrabBagStack(nullptr) , mnCurrentElement(aElementToken) { } diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx index 72b9f882b384..ca9aecf713e4 100644 --- a/oox/source/shape/ShapeContextHandler.hxx +++ b/oox/source/shape/ShapeContextHandler.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX #define INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX -#include <boost/shared_ptr.hpp> +#include <memory> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp> @@ -37,7 +37,7 @@ namespace oox { namespace shape { class ShapeFragmentHandler : public core::FragmentHandler2 { public: - typedef boost::shared_ptr<ShapeFragmentHandler> Pointer_t; + typedef std::shared_ptr<ShapeFragmentHandler> Pointer_t; explicit ShapeFragmentHandler(core::XmlFilterBase& rFilter, const OUString& rFragmentPath ) @@ -153,9 +153,9 @@ private: css::uno::Reference< css::uno::XComponentContext > m_xContext; drawingml::ShapePtr mpShape; - ::boost::shared_ptr< vml::Drawing > mpDrawing; + std::shared_ptr< vml::Drawing > mpDrawing; - typedef boost::shared_ptr<drawingml::GraphicShapeContext> + typedef std::shared_ptr<drawingml::GraphicShapeContext> GraphicShapeContextPtr; css::uno::Reference<XFastContextHandler> mxDrawingFragmentHandler; css::uno::Reference<XFastContextHandler> mxGraphicShapeContext; diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx index 06d4722bd8a4..171e27419a07 100644 --- a/oox/source/shape/ShapeFilterBase.hxx +++ b/oox/source/shape/ShapeFilterBase.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPEFILTERBASE_HXX #define INCLUDED_OOX_SOURCE_SHAPE_SHAPEFILTERBASE_HXX -#include <boost/shared_ptr.hpp> +#include <memory> #include <rtl/ref.hxx> #include "oox/vml/vmldrawing.hxx" #include "drawingml/table/tablestylelist.hxx" @@ -33,7 +33,7 @@ namespace shape { class ShapeFilterBase : public core::XmlFilterBase { public: - typedef boost::shared_ptr<ShapeFilterBase> Pointer_t; + typedef std::shared_ptr<ShapeFilterBase> Pointer_t; explicit ShapeFilterBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) @@ -64,7 +64,7 @@ private: virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; - ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; + std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; ::oox::drawingml::ThemePtr mpTheme; }; diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index d5b8532141c0..9e1b619d1061 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -45,7 +45,7 @@ #include <cppuhelper/propertysetmixin.hxx> #include <svx/unomod.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> namespace rptui @@ -87,8 +87,8 @@ namespace reportdesign ,public ::comphelper::IEmbeddedHelper { private: - ::boost::shared_ptr<OReportComponentProperties> m_aProps; - ::boost::shared_ptr<OReportDefinitionImpl> m_pImpl; + std::shared_ptr<OReportComponentProperties> m_aProps; + std::shared_ptr<OReportDefinitionImpl> m_pImpl; private: OReportDefinition(const OReportDefinition&) SAL_DELETED_FUNCTION; @@ -193,9 +193,9 @@ namespace reportdesign * * \return */ - ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const; + std::shared_ptr<rptui::OReportModel> getSdrModel() const; - static ::boost::shared_ptr<rptui::OReportModel> getSdrModel(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition); + static std::shared_ptr<rptui::OReportModel> getSdrModel(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition); private: DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 348a8cfb14ac..9e310e6a65ec 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -28,7 +28,7 @@ #include <svx/svdobj.hxx> #include <comphelper/uno3.hxx> #include <svx/fmglob.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> namespace com { namespace sun { namespace star { namespace report { @@ -93,7 +93,7 @@ public: @param _xComponent the report component */ REPORTDESIGN_DLLPUBLIC sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); -typedef ::std::pair< OUString, ::boost::shared_ptr<AnyConverter> > TPropertyConverter; +typedef ::std::pair< OUString, std::shared_ptr<AnyConverter> > TPropertyConverter; typedef std::map<OUString, TPropertyConverter> TPropertyNamePair; /** returns the property name map for the given property id @param _nObjectId the object id diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx index 04270c70d108..6ffaad730e83 100644 --- a/reportdesign/inc/conditionalexpression.hxx +++ b/reportdesign/inc/conditionalexpression.hxx @@ -23,10 +23,8 @@ #include "dllapi.h" #include <rtl/ustring.hxx> -#include <boost/shared_ptr.hpp> - #include <map> - +#include <memory> namespace rptui { @@ -87,7 +85,7 @@ namespace rptui eLessOrEqual = 7 }; - typedef ::boost::shared_ptr< ConditionalExpression > PConditionalExpression; + typedef std::shared_ptr< ConditionalExpression > PConditionalExpression; typedef ::std::map< ComparisonOperation, PConditionalExpression > ConditionalExpressions; diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index d917616b0f11..71533bc41962 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -18,8 +18,6 @@ #include <boost/bind.hpp> #include <boost/mem_fn.hpp> #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index e6b317fc9620..c7c9ffb0b591 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -127,7 +127,6 @@ #include <boost/bind.hpp> #include <boost/mem_fn.hpp> #include <boost/noncopyable.hpp> -#include <boost/noncopyable.hpp> // page styles #define SC_UNO_PAGE_LEFTBORDER "LeftBorder" @@ -196,7 +195,7 @@ namespace reportdesign using namespace comphelper; using namespace rptui; -void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,::boost::shared_ptr<rptui::OReportModel>& _rModel) +void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,std::shared_ptr<rptui::OReportModel>& _rModel) { uno::Reference<beans::XPropertySet> xProp(_xStorage,uno::UNO_QUERY); sal_Int32 nOpenMode = embed::ElementModes::READ; @@ -508,9 +507,9 @@ struct OReportDefinitionImpl uno::Reference< frame::XUntitledNumbers > m_xNumberedControllers; uno::Reference< document::XDocumentProperties > m_xDocumentProperties; - ::boost::shared_ptr< ::comphelper::EmbeddedObjectContainer> + std::shared_ptr< ::comphelper::EmbeddedObjectContainer> m_pObjectContainer; - ::boost::shared_ptr<rptui::OReportModel> m_pReportModel; + std::shared_ptr<rptui::OReportModel> m_pReportModel; ::rtl::Reference< ::dbaui::UndoManager > m_pUndoManager; OUString m_sCaption; OUString m_sCommand; @@ -2032,14 +2031,14 @@ uno::Reference< uno::XComponentContext > OReportDefinition::getContext() return m_aProps->m_xContext; } -::boost::shared_ptr<rptui::OReportModel> OReportDefinition::getSdrModel() const +std::shared_ptr<rptui::OReportModel> OReportDefinition::getSdrModel() const { return m_pImpl->m_pReportModel; } -::boost::shared_ptr<rptui::OReportModel> OReportDefinition::getSdrModel(const uno::Reference< report::XReportDefinition >& _xReportDefinition) +std::shared_ptr<rptui::OReportModel> OReportDefinition::getSdrModel(const uno::Reference< report::XReportDefinition >& _xReportDefinition) { - ::boost::shared_ptr<rptui::OReportModel> pReportModel; + std::shared_ptr<rptui::OReportModel> pReportModel; uno::Reference< lang::XUnoTunnel > xUT( _xReportDefinition, uno::UNO_QUERY ); if( xUT.is() ) pReportModel = reinterpret_cast<OReportDefinition*>(sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( OReportDefinition::getUnoTunnelImplementationId())))->getSdrModel(); diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index c5b14435b716..3163c6f749cd 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -198,7 +198,7 @@ void OSection::init() { SolarMutexGuard g; // lock while manipulating SdrModel uno::Reference< report::XReportDefinition> xReport = getReportDefinition(); - ::boost::shared_ptr<rptui::OReportModel> pModel = OReportDefinition::getSdrModel(xReport); + std::shared_ptr<rptui::OReportModel> pModel = OReportDefinition::getSdrModel(xReport); assert(pModel && "No model set at the report definition!"); if ( pModel ) { diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 00611a8835d9..ed997d94b63d 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -241,7 +241,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) static TPropertyNamePair s_aNameMap; if ( s_aNameMap.empty() ) { - ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); + std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter))); @@ -254,7 +254,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) static TPropertyNamePair s_aNameMap; if ( s_aNameMap.empty() ) { - ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); + std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARCOLOR,TPropertyConverter(PROPERTY_TEXTCOLOR,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARUNDERLINECOLOR,TPropertyConverter(PROPERTY_TEXTLINECOLOR,aNoConverter))); @@ -265,7 +265,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter))); - ::boost::shared_ptr<AnyConverter> aParaAdjust(new ParaAdjust()); + std::shared_ptr<AnyConverter> aParaAdjust(new ParaAdjust()); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aParaAdjust))); } return s_aNameMap; @@ -275,7 +275,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) static TPropertyNamePair s_aNameMap; if ( s_aNameMap.empty() ) { - ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); + std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARCOLOR,TPropertyConverter(PROPERTY_TEXTCOLOR,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARUNDERLINECOLOR,TPropertyConverter(PROPERTY_TEXTLINECOLOR,aNoConverter))); @@ -285,7 +285,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLTEXTEMPHASISMARK,TPropertyConverter(PROPERTY_FONTEMPHASISMARK,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter))); - ::boost::shared_ptr<AnyConverter> aParaAdjust(new ParaAdjust()); + std::shared_ptr<AnyConverter> aParaAdjust(new ParaAdjust()); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aParaAdjust))); } return s_aNameMap; @@ -296,7 +296,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) static TPropertyNamePair s_aNameMap; if ( s_aNameMap.empty() ) { - ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); + std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); s_aNameMap.insert(TPropertyNamePair::value_type(OUString("FillColor"),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aNoConverter))); } diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index bfd381c310cf..a06a99064472 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -39,7 +39,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <map> #include <memory> -#include <boost/shared_ptr.hpp> #include <xmloff/prhdlfac.hxx> #include <xmloff/xmlprmap.hxx> @@ -94,7 +93,7 @@ private: rtl::Reference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; Reference<XReportDefinition> m_xReportDefinition; - ::boost::shared_ptr<rptui::OReportModel> m_pReportModel; + std::shared_ptr<rptui::OReportModel> m_pReportModel; bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception); diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 6e94536c4ef0..6ee1da8aee58 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -27,7 +27,7 @@ #include <formula/tokenarray.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> #include "Formula.hxx" #include "AddField.hxx" @@ -45,7 +45,7 @@ namespace rptui FormulaDialog::FormulaDialog(vcl::Window* pParent , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory - , const ::boost::shared_ptr< IFunctionManager >& _pFunctionMgr + , const std::shared_ptr< IFunctionManager >& _pFunctionMgr , const OUString& _sFormula , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet , svl::SharedStringPool& rStrPool ) diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 56da7f6e9643..b961e5c48643 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -30,7 +30,6 @@ #include <vcl/layout.hxx> #include <vcl/scrbar.hxx> -#include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> #include <vector> diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index e756f8c16648..3825ac3a118d 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -35,7 +35,6 @@ #include <svl/SfxBroadcaster.hxx> #include "ReportDefines.hxx" #include <svtools/colorcfg.hxx> -#include <boost/shared_ptr.hpp> #include <svx/svdedtv.hxx> #include <vcl/tabpage.hxx> #include <vcl/splitwin.hxx> diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 1455d7e6260e..1a0245267e2e 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -22,9 +22,9 @@ #include <formula/formula.hxx> #include <formula/IControlReferenceHandler.hxx> -#include <boost/shared_ptr.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/report/meta/XFormulaParser.hpp> +#include <memory> namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; @@ -45,7 +45,7 @@ class OAddFieldWindow; class FormulaDialog : public formula::FormulaModalDialog, public formula::IControlReferenceHandler { - ::boost::shared_ptr< formula::IFunctionManager > m_aFunctionManager; + std::shared_ptr< formula::IFunctionManager > m_aFunctionManager; formula::FormEditData* m_pFormulaData; VclPtr<OAddFieldWindow> m_pAddField; ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > m_xRowSet; @@ -62,7 +62,7 @@ class FormulaDialog : public formula::FormulaModalDialog, public: FormulaDialog( vcl::Window* pParent , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory - , const ::boost::shared_ptr< formula::IFunctionManager >& _pFunctionMgr + , const std::shared_ptr< formula::IFunctionManager >& _pFunctionMgr , const OUString& _sFormula , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet , svl::SharedStringPool& rStrPool ); diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index 042e0a941c9c..43ce8bf69479 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -25,8 +25,8 @@ #include <com/sun/star/report/meta/XFunctionCategory.hpp> #include <com/sun/star/report/meta/XFunctionDescription.hpp> #include <map> +#include <memory> #include <vector> -#include <boost/shared_ptr.hpp> namespace rptui { @@ -36,8 +36,8 @@ class FunctionDescription; class FunctionManager : public formula::IFunctionManager { - typedef std::map< OUString, ::boost::shared_ptr< FunctionDescription > > TFunctionsMap; - typedef std::map< OUString, ::boost::shared_ptr< FunctionCategory > > TCategoriesMap; + typedef std::map< OUString, std::shared_ptr< FunctionDescription > > TFunctionsMap; + typedef std::map< OUString, std::shared_ptr< FunctionCategory > > TCategoriesMap; ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionManager> m_xMgr; mutable TCategoriesMap m_aCategories; mutable ::std::vector< TCategoriesMap::iterator > m_aCategoryIndex; @@ -50,7 +50,7 @@ public: virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const SAL_OVERRIDE; virtual sal_Unicode getSingleToken(const EToken _eToken) const SAL_OVERRIDE; - ::boost::shared_ptr< FunctionDescription > get(const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription) const; + std::shared_ptr< FunctionDescription > get(const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription) const; }; class FunctionDescription : public formula::IFunctionDescription @@ -79,7 +79,7 @@ public: class FunctionCategory : public formula::IFunctionCategory { - mutable ::std::vector< ::boost::shared_ptr< FunctionDescription > > m_aFunctions; + mutable ::std::vector< std::shared_ptr< FunctionDescription > > m_aFunctions; ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionCategory> m_xCategory; sal_uInt32 m_nFunctionCount; sal_uInt32 m_nNumber; diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx index 1d558da01329..42862241fa01 100644 --- a/reportdesign/source/ui/inc/MarkedSection.hxx +++ b/reportdesign/source/ui/inc/MarkedSection.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX -#include <boost/shared_ptr.hpp> - namespace rptui { class OSectionWindow; diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index b53f1b32bb85..508bed217faa 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -55,8 +55,8 @@ #include <sfx2/zoomitem.hxx> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> #include <functional> +#include <memory> class TransferableClipboardListener; class VclWindowEvent; @@ -109,7 +109,7 @@ namespace rptui mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; ::com::sun::star::awt::Size m_aVisualAreaSize; - ::boost::shared_ptr<rptui::OReportModel> + std::shared_ptr<rptui::OReportModel> m_aReportModel; OUString m_sName; /// name for the report definition OUString m_sLastActivePage; /// last active property browser page @@ -440,7 +440,7 @@ namespace rptui * * \return */ - ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_aReportModel;} + std::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_aReportModel;} inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext() const { return m_xContext; } inline sal_Int16 getZoomValue() const { return m_nZoomValue; } diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index 8253c11d7bdc..b60680822433 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -28,7 +28,6 @@ #include "dlgedfunc.hxx" #include <svtools/transfer.hxx> #include <rtl/ref.hxx> -#include <boost/shared_ptr.hpp> #include <memory> namespace rptui @@ -47,7 +46,7 @@ namespace rptui OSectionView* m_pView; VclPtr<OSectionWindow> m_pParent; ::std::unique_ptr<DlgEdFunc> m_pFunc; - ::boost::shared_ptr<OReportModel> m_pModel; + std::shared_ptr<OReportModel> m_pModel; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pMulti; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index 7c974bd0ad58..fd9eaabff3eb 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -27,7 +27,6 @@ #include <sfx2/zoomitem.hxx> #include <vector> -#include <boost/shared_ptr.hpp> #include <comphelper/propmultiplex.hxx> #include "MarkedSection.hxx" diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index 373c7a3dd40b..54a88b051e0a 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -27,7 +27,6 @@ #include <svx/svdedtv.hxx> #include <cppuhelper/basemutex.hxx> #include <rtl/ref.hxx> -#include <boost/shared_ptr.hpp> #include <vcl/dockwin.hxx> #include "MarkedSection.hxx" #include "ReportWindow.hxx" diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index 70a693ad81f2..5e232a14358a 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -34,7 +34,6 @@ #include <list> #include <map> -#include <boost/shared_ptr.hpp> namespace comphelper { diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index ce18a3e2f780..6f7fb265b0cb 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -147,7 +147,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface m_xReportComponent.set( xNameCont->getByName("ReportComponent"), uno::UNO_QUERY ); if ( m_xDataProvider.is() ) { - ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); + std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); TPropertyNamePair aPropertyMediation; aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_MASTERFIELDS, TPropertyConverter(PROPERTY_MASTERFIELDS,aNoConverter) ) ); aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_DETAILFIELDS, TPropertyConverter(PROPERTY_DETAILFIELDS,aNoConverter) ) ); diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 925fa01102fa..d14ee0aa43ba 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -62,7 +62,7 @@ const formula::IFunctionCategory* FunctionManager::getCategory(sal_uInt32 _nPos) if ( _nPos >= m_aCategoryIndex.size() ) { uno::Reference< report::meta::XFunctionCategory> xCategory = m_xMgr->getCategory(_nPos); - ::boost::shared_ptr< FunctionCategory > pCategory(new FunctionCategory(this,_nPos + 1,xCategory)); + std::shared_ptr< FunctionCategory > pCategory(new FunctionCategory(this,_nPos + 1,xCategory)); m_aCategoryIndex.push_back( m_aCategories.insert(TCategoriesMap::value_type(xCategory->getName(),pCategory)).first ); } return m_aCategoryIndex[_nPos]->second.get(); @@ -72,9 +72,9 @@ void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula { } -::boost::shared_ptr< FunctionDescription > FunctionManager::get(const uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription) const +std::shared_ptr< FunctionDescription > FunctionManager::get(const uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription) const { - ::boost::shared_ptr< FunctionDescription > pDesc; + std::shared_ptr< FunctionDescription > pDesc; if ( _xFunctionDescription.is() ) { const OUString sFunctionName = _xFunctionDescription->getName(); @@ -86,10 +86,10 @@ void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula TCategoriesMap::iterator aCategoryFind = m_aCategories.find(sCategoryName); if ( aCategoryFind == m_aCategories.end() ) { - aCategoryFind = m_aCategories.insert(TCategoriesMap::value_type(sCategoryName,::boost::shared_ptr< FunctionCategory > (new FunctionCategory(this,xCategory->getNumber() + 1,xCategory)))).first; + aCategoryFind = m_aCategories.insert(TCategoriesMap::value_type(sCategoryName,std::shared_ptr< FunctionCategory > (new FunctionCategory(this,xCategory->getNumber() + 1,xCategory)))).first; m_aCategoryIndex.push_back( aCategoryFind ); } - aFunctionFind = m_aFunctions.insert(TFunctionsMap::value_type(sFunctionName,::boost::shared_ptr<FunctionDescription>(new FunctionDescription(aCategoryFind->second.get(),_xFunctionDescription)))).first; + aFunctionFind = m_aFunctions.insert(TFunctionsMap::value_type(sFunctionName,std::shared_ptr<FunctionDescription>(new FunctionDescription(aCategoryFind->second.get(),_xFunctionDescription)))).first; } pDesc = aFunctionFind->second; } @@ -114,7 +114,7 @@ const formula::IFunctionDescription* FunctionCategory::getFunction(sal_uInt32 _n if ( _nPos >= m_aFunctions.size() && _nPos < m_nFunctionCount ) { uno::Reference< report::meta::XFunctionDescription> xFunctionDescription = m_xCategory->getFunction(_nPos); - ::boost::shared_ptr< FunctionDescription > pFunction = m_pFunctionManager->get(xFunctionDescription); + std::shared_ptr< FunctionDescription > pFunction = m_pFunctionManager->get(xFunctionDescription); m_aFunctions.push_back( pFunction ); } return m_aFunctions[_nPos].get(); diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 29b806314114..b6fc5c32dd9e 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -743,7 +743,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R if ( !_xShape.is() || !_rxParentWindow.is() ) return false; - ::boost::shared_ptr<rptui::OReportModel> pModel = ::reportdesign::OReportDefinition::getSdrModel(_xShape->getSection()->getReportDefinition()); + std::shared_ptr<rptui::OReportModel> pModel = ::reportdesign::OReportDefinition::getSdrModel(_xShape->getSection()->getReportDefinition()); vcl::Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow ); @@ -1020,7 +1020,7 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext("org.libreoffice.report.pentaho.SOFunctionManager",_xContext),uno::UNO_QUERY); if ( xMgr.is() ) { - ::boost::shared_ptr< formula::IFunctionManager > pFormulaManager(new FunctionManager(xMgr) ); + std::shared_ptr< formula::IFunctionManager > pFormulaManager(new FunctionManager(xMgr) ); ReportFormula aFormula( _in_out_rFormula ); LanguageTag aLangTag(LANGUAGE_SYSTEM); diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index 800669bbcd9f..05ccf2f84856 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -158,29 +158,29 @@ namespace rptui uno::Reference<awt::XControl> xControl; OReportController *pController = const_cast<OReportController *>(&m_rReportController); - ::boost::shared_ptr<OReportModel> pModel = pController->getSdrModel(); + std::shared_ptr<OReportModel> pModel = pController->getSdrModel(); - uno::Reference<report::XSection> xSection(_xFixedText->getSection()); - if ( xSection.is() ) + uno::Reference<report::XSection> xSection(_xFixedText->getSection()); + if ( xSection.is() ) + { + OReportPage *pPage = pModel->getPage(xSection); + const size_t nIndex = pPage->getIndexOf(_xFixedText.get()); + if (nIndex < pPage->GetObjCount() ) { - OReportPage *pPage = pModel->getPage(xSection); - const size_t nIndex = pPage->getIndexOf(_xFixedText.get()); - if (nIndex < pPage->GetObjCount() ) + SdrObject *pObject = pPage->GetObj(nIndex); + OUnoObject* pUnoObj = dynamic_cast<OUnoObject*>(pObject); + if ( pUnoObj ) // this doesn't need to be done for shapes { - SdrObject *pObject = pPage->GetObj(nIndex); - OUnoObject* pUnoObj = dynamic_cast<OUnoObject*>(pObject); - if ( pUnoObj ) // this doesn't need to be done for shapes + OSectionWindow* pSectionWindow = pController->getSectionWindow(xSection); + if (pSectionWindow != 0) { - OSectionWindow* pSectionWindow = pController->getSectionWindow(xSection); - if (pSectionWindow != 0) - { - OReportSection& aOutputDevice = pSectionWindow->getReportSection(); // OutputDevice - OSectionView& aSdrView = aOutputDevice.getSectionView(); // SdrView - xControl = pUnoObj->GetUnoControl(aSdrView, aOutputDevice); - } + OReportSection& aOutputDevice = pSectionWindow->getReportSection(); // OutputDevice + OSectionView& aSdrView = aOutputDevice.getSectionView(); // SdrView + xControl = pUnoObj->GetUnoControl(aSdrView, aOutputDevice); } } } + } return xControl; } diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 9203b9ede2d3..16ba46e9d97f 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -159,7 +159,7 @@ namespace rptui { uno::Reference<awt::XVclWindowPeer> xVclWindowPeer; - ::boost::shared_ptr<OReportModel> pModel = m_rReportController.getSdrModel(); + std::shared_ptr<OReportModel> pModel = m_rReportController.getSdrModel(); uno::Reference<report::XSection> xSection(_xComponent->getSection()); if ( xSection.is() ) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index f706f88351ce..b72523f890d9 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -143,7 +143,7 @@ #include <boost/mem_fn.hpp> #include <boost/bind.hpp> #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <cppuhelper/exc_hlp.hxx> #include <unotools/confignode.hxx> @@ -3021,7 +3021,7 @@ uno::Reference< sdbc::XRowSet > OReportController::getRowSet() xRowSetProp->setPropertyValue( PROPERTY_ACTIVECONNECTION, uno::makeAny( getConnection() ) ); xRowSetProp->setPropertyValue( PROPERTY_APPLYFILTER, uno::makeAny( sal_True ) ); - ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); + std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); TPropertyNamePair aPropertyMediation; aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_COMMAND, TPropertyConverter(PROPERTY_COMMAND,aNoConverter) ) ); aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_COMMANDTYPE, TPropertyConverter(PROPERTY_COMMANDTYPE,aNoConverter) ) ); @@ -3796,7 +3796,7 @@ void OReportController::switchReportSection(const sal_Int16 _nId) const OXUndoEnvironment::OUndoEnvLock aLock( m_aReportModel->GetUndoEnv() ); const bool bSwitchOn = !m_xReportDefinition->getReportHeaderOn(); - ::boost::scoped_ptr< UndoContext > pUndoContext; + std::unique_ptr< UndoContext > pUndoContext; if ( SID_REPORTHEADERFOOTER == _nId ) { const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); @@ -3845,7 +3845,7 @@ void OReportController::switchPageSection(const sal_Int16 _nId) const OXUndoEnvironment::OUndoEnvLock aLock( m_aReportModel->GetUndoEnv() ); const bool bSwitchOn = !m_xReportDefinition->getPageHeaderOn(); - ::boost::scoped_ptr< UndoContext > pUndoContext; + std::unique_ptr< UndoContext > pUndoContext; if ( SID_PAGEHEADERFOOTER == _nId ) { const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); @@ -4374,7 +4374,7 @@ SfxUndoManager& OReportController::getUndoManager() const DBG_TESTSOLARMUTEX(); // this is expected to be called during UI actions, so the SM is assumed to be locked - ::boost::shared_ptr< OReportModel > pReportModel( getSdrModel() ); + std::shared_ptr< OReportModel > pReportModel( getSdrModel() ); ENSURE_OR_THROW( !!pReportModel, "no access to our model" ); SfxUndoManager* pUndoManager( pReportModel->GetSdrUndoManager() ); diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 3ef67d927395..cd907eb04144 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -42,7 +42,6 @@ #include "helpids.hrc" #include "dlgedfac.hxx" -#include <boost/shared_ptr.hpp> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 04ec93133225..86cc85892602 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -38,13 +38,11 @@ #include <sal/log.hxx> #include <salhelper/thread.hxx> -#include <boost/optional.hpp> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> +#include <queue> +#include <memory> #include <stack> #include <unordered_map> #include <vector> -#include <queue> #include <cassert> #include <cstring> #include <libxml/parser.h> @@ -52,7 +50,7 @@ // Inverse of libxml's BAD_CAST. #define XML_CAST( str ) reinterpret_cast< const sal_Char* >( str ) -using namespace ::std; +using namespace std; using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star::uno; @@ -69,10 +67,10 @@ class FastLocatorImpl; struct NamespaceDefine; struct Entity; -typedef ::boost::shared_ptr< NamespaceDefine > NamespaceDefineRef; +typedef std::shared_ptr< NamespaceDefine > NamespaceDefineRef; typedef std::unordered_map< OUString, sal_Int32, - OUStringHash, ::std::equal_to< OUString > > NamespaceMap; + OUStringHash, std::equal_to< OUString > > NamespaceMap; typedef std::vector<Event> EventList; @@ -176,14 +174,14 @@ struct Entity : public ParserData void throwException( const ::rtl::Reference< FastLocatorImpl > &xDocumentLocator, bool mbDuringParse ); - ::std::stack< NameWithToken > maNamespaceStack; + std::stack< NameWithToken > maNamespaceStack; /* Context for main thread consuming events. * startElement() stores the data, which characters() and endElement() uses */ - ::std::stack< SaxContext> maContextStack; + std::stack< SaxContext> maContextStack; // Determines which elements of maNamespaceDefines are valid in current context - ::std::stack< sal_uInt32 > maNamespaceCount; - ::std::vector< NamespaceDefineRef > maNamespaceDefines; + std::stack< sal_uInt32 > maNamespaceCount; + std::vector< NamespaceDefineRef > maNamespaceDefines; explicit Entity( const ParserData& rData ); Entity( const Entity& rEntity ); @@ -260,7 +258,7 @@ private: ParserData maData; /// Cached parser configuration for next call of parseStream(). Entity *mpTop; /// std::stack::top() is amazingly slow => cache this. - ::std::stack< Entity > maEntities; /// Entity stack for each call of parseStream(). + std::stack< Entity > maEntities; /// Entity stack for each call of parseStream(). OUString pendingCharacters; /// Data from characters() callback that needs to be sent. }; diff --git a/sax/source/tools/CachedOutputStream.hxx b/sax/source/tools/CachedOutputStream.hxx index f11697871ad0..f32693e70f92 100644 --- a/sax/source/tools/CachedOutputStream.hxx +++ b/sax/source/tools/CachedOutputStream.hxx @@ -17,7 +17,7 @@ #include <cstring> #include <cstdlib> -#include <boost/shared_ptr.hpp> +#include <memory> namespace sax_fastparser { @@ -40,7 +40,7 @@ class CachedOutputStream uno_Sequence *pSeq; bool mbWriteToOutStream; /// ForMerge structure is used for sorting elements in Writer - boost::shared_ptr< ForMergeBase > mpForMerge; + std::shared_ptr< ForMergeBase > mpForMerge; public: CachedOutputStream() : mnCacheWrittenSize(0) @@ -61,7 +61,7 @@ public: mxOutputStream = xOutputStream; } - void setOutput( boost::shared_ptr< ForMergeBase > pForMerge ) + void setOutput( std::shared_ptr< ForMergeBase > pForMerge ) { flush(); mbWriteToOutStream = false; diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx index 32c0358ec618..0d0eb717c75f 100644 --- a/sax/source/tools/fastserializer.cxx +++ b/sax/source/tools/fastserializer.cxx @@ -334,13 +334,13 @@ namespace sax_fastparser { { if (rOrder.hasElements()) { - boost::shared_ptr< ForMerge > pSort( new ForSort(nTag, rOrder) ); + std::shared_ptr< ForMerge > pSort( new ForSort(nTag, rOrder) ); maMarkStack.push( pSort ); maCachedOutputStream.setOutput( pSort ); } else { - boost::shared_ptr< ForMerge > pMerge( new ForMerge(nTag) ); + std::shared_ptr< ForMerge > pMerge( new ForMerge(nTag) ); maMarkStack.push( pMerge ); maCachedOutputStream.setOutput( pMerge ); } diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx index 1f30313def4d..d5925fd9ebd8 100644 --- a/sax/source/tools/fastserializer.hxx +++ b/sax/source/tools/fastserializer.hxx @@ -29,7 +29,7 @@ #include <stack> #include <map> -#include <boost/shared_ptr.hpp> +#include <memory> namespace sax_fastparser { @@ -169,11 +169,11 @@ private: sal_Int32 const m_Tag; #ifdef DBG_UTIL // pending close tags, followed by pending open tags - ::std::deque<sal_Int32> m_DebugEndedElements; - ::std::deque<sal_Int32> m_DebugStartedElements; + std::deque<sal_Int32> m_DebugEndedElements; + std::deque<sal_Int32> m_DebugStartedElements; // ... and another buffer for maPostponed ... - ::std::deque<sal_Int32> m_DebugPostponedEndedElements; - ::std::deque<sal_Int32> m_DebugPostponedStartedElements; + std::deque<sal_Int32> m_DebugPostponedEndedElements; + std::deque<sal_Int32> m_DebugPostponedStartedElements; #endif ForMerge(sal_Int32 const nTag) : m_Tag(nTag) {} @@ -222,7 +222,7 @@ private: void sort(); }; - ::std::stack< boost::shared_ptr< ForMerge > > maMarkStack; + std::stack< std::shared_ptr< ForMerge > > maMarkStack; bool mbMarkStackEmpty; // Would be better to use OStringBuffer instead of these two // but then we couldn't get the rtl_String* member :-( @@ -231,7 +231,7 @@ private: TokenValueList maTokenValues; #ifdef DBG_UTIL - ::std::stack<sal_Int32> m_DebugStartedElements; + std::stack<sal_Int32> m_DebugStartedElements; #endif void writeTokenValueList(); diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index b4e6f5d38c73..03bf69dc691d 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -47,9 +47,7 @@ #include <boost/ptr_container/ptr_map.hpp> #include <boost/ptr_container/ptr_vector.hpp> #include <memory> -#include <boost/scoped_ptr.hpp> #include <boost/shared_array.hpp> -#include <boost/shared_ptr.hpp> #include <boost/tuple/tuple.hpp> #include <cassert> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index e611c6103cba..fc57dea7cef3 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -32,7 +32,7 @@ #include <sfx2/Metadatable.hxx> #include <sfx2/XmlIdRegistry.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; @@ -94,9 +94,9 @@ static bool operator==(beans::StringPair p1, beans::StringPair p2) void MetadatableTest::test() { - boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pReg( + std::unique_ptr< ::sfx2::IXmlIdRegistry > const pReg( ::sfx2::createXmlIdRegistry(false) ); - boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pRegClip( + std::unique_ptr< ::sfx2::IXmlIdRegistry > const pRegClip( ::sfx2::createXmlIdRegistry(true) ); MockMetadatable m1(*pReg); diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index f77141fd1e8f..121bc98c1db5 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -117,7 +117,7 @@ #include <unotools/extendedsecurityoptions.hxx> #include <rtl/instance.hxx> #include <rtl/strbuf.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; @@ -564,7 +564,7 @@ SfxApplication::ChooseScript() const SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL; uno::Reference< frame::XFrame > xFrame( pFrame ? pFrame->GetFrameInterface() : uno::Reference< frame::XFrame >() ); - boost::scoped_ptr<AbstractScriptSelectorDialog> pDlg( + std::unique_ptr<AbstractScriptSelectorDialog> pDlg( pFact->CreateScriptSelectorDialog( NULL, false, xFrame )); SAL_INFO( "sfx.appl", "done, now exec it"); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 0021c8ed0a80..1d6798d90a52 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -121,7 +121,7 @@ #include <officecfg/Office/Common.hxx> #include <officecfg/Setup.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -364,7 +364,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( pFrameItem ) xFrame = pFrameItem->GetFrame(); - boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( RID_SVXDLG_CUSTOMIZE, NULL, &aSet, xFrame )); @@ -534,7 +534,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if ( pFact ) { - boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( 0, RID_DEFAULTABOUT )); + std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( 0, RID_DEFAULTABOUT )); pDlg->Execute(); bDone = true; } @@ -1155,7 +1155,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) do // artificial loop for flow control { - boost::scoped_ptr<AbstractScriptSelectorDialog> pDlg(pFact->CreateScriptSelectorDialog( + std::unique_ptr<AbstractScriptSelectorDialog> pDlg(pFact->CreateScriptSelectorDialog( lcl_getDialogParent( xFrame, GetTopWindow() ), false, xFrame )); OSL_ENSURE( pDlg, "SfxApplication::OfaExec_Impl( SID_RUNMACRO ): no dialog!" ); if ( !pDlg ) @@ -1247,7 +1247,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) if ( pSet && pSet->GetItemState( pSetPool->GetWhich( SID_AUTO_CORRECT_DLG ), false, &pItem ) == SfxItemState::SET ) aSet.Put( *pItem ); - boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, NULL, &aSet, NULL )); + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, NULL, &aSet, NULL )); pDlg->Execute(); } diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 69eead54a5f0..28f7f0af15e4 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -68,7 +68,7 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/ucb/XContent.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; using namespace ::com::sun::star::ucb; @@ -193,7 +193,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert { // slot is a property const SfxType* pType = pSlot->GetType(); - boost::scoped_ptr<SfxPoolItem> pItem(pType->CreateItem()); + std::unique_ptr<SfxPoolItem> pItem(pType->CreateItem()); if ( !pItem ) { @@ -311,7 +311,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert for ( sal_uInt16 nArgs=0; nArgs<nMaxArgs; nArgs++ ) { const SfxFormalArgument &rArg = bIsMediaDescriptor ? aFormalArgs[nArgs] : pSlot->GetFormalArgument( nArgs ); - boost::scoped_ptr<SfxPoolItem> pItem(rArg.CreateItem()); + std::unique_ptr<SfxPoolItem> pItem(rArg.CreateItem()); if ( !pItem ) { #ifdef DBG_UTIL diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 4ba7106c9678..988e28b38b23 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <boost/scoped_ptr.hpp> +#include <memory> #include <vcl/toolbox.hxx> #include <tools/rcid.h> #include <unotools/moduleoptions.hxx> @@ -377,7 +377,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl(sal_uInt16 nId, SfxChildWinI { // load configuration - boost::scoped_ptr<SvtViewOptions> xWinOpt; + std::unique_ptr<SvtViewOptions> xWinOpt; // first see if a module specific id exists if (rInfo.aModule.getLength()) xWinOpt.reset(new SvtViewOptions(E_WINDOW, rInfo.aModule + "/" + OUString::number(nId))); diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index f1634ca14274..c18accc6f11d 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -39,7 +39,7 @@ #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; using namespace ::com::sun::star::frame; @@ -285,7 +285,7 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::An { // attempt to protect the document against the script tampering with its Undo Context - boost::scoped_ptr< ::framework::DocumentUndoGuard > pUndoGuard; + std::unique_ptr< ::framework::DocumentUndoGuard > pUndoGuard; if ( bIsDocBasic ) pUndoGuard.reset( new ::framework::DocumentUndoGuard( pDoc->GetModel() ) ); diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 20c09d9b0d3c..ced9245fb4cd 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -18,7 +18,7 @@ */ -#include <boost/scoped_ptr.hpp> +#include <memory> #include <vcl/msgbox.hxx> #include <svl/lstner.hxx> @@ -263,7 +263,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, const OUString& aEventName, cons void SfxEventConfiguration::ConfigureEvent( const OUString& aName, const SvxMacro& rMacro, SfxObjectShell *pDoc ) { - boost::scoped_ptr<SvxMacro> pMacro; + std::unique_ptr<SvxMacro> pMacro; if ( rMacro.HasMacro() ) pMacro.reset( new SvxMacro( rMacro.GetMacName(), rMacro.GetLibName(), rMacro.GetScriptType() ) ); PropagateEvent_Impl( pDoc ? pDoc : 0, aName, pMacro.get() ); diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 5a7d29ff01b5..3a0a1dd52bc4 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -64,7 +64,6 @@ #include <com/sun/star/frame/XModuleManager.hpp> #include <memory> -#include <boost/scoped_ptr.hpp> #include <boost/ptr_container/ptr_vector.hpp> #include <unordered_map> @@ -1108,7 +1107,7 @@ const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem* rDispatcher.Flush(); // get SlotServer (Slot+ShellLevel) and Shell from cache - ::boost::scoped_ptr<SfxStateCache> xCache; + std::unique_ptr<SfxStateCache> xCache; if ( !pCache ) { // Execution of non cached slots (Accelerators don't use Controllers) diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index d679263f5590..3bae014e1f10 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -39,7 +39,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace basegfx; using namespace basegfx::tools; @@ -1327,7 +1327,7 @@ BitmapEx ThumbnailView::readThumbnail(const OUString &msURL) BitmapEx aThumbnail; if (xIStream.is()) { - boost::scoped_ptr<SvStream> pStream ( + std::unique_ptr<SvStream> pStream ( ::utl::UcbStreamHelper::CreateStream (xIStream)); vcl::PNGReader aReader (*pStream); aThumbnail = aReader.Read (); diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 6cefb79764f0..c2605d3e617f 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -66,10 +66,9 @@ #include <sfx2/msgpool.hxx> #include <sfx2/objsh.hxx> -#include <boost/scoped_ptr.hpp> - #include <iostream> #include <map> +#include <memory> #include <sal/log.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> @@ -826,7 +825,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util } eMapUnit = GetCoreMetric( pShell->GetPool(), GetId() ); - boost::scoped_ptr<SfxAllItemSet> xSet(new SfxAllItemSet(pShell->GetPool())); + std::unique_ptr<SfxAllItemSet> xSet(new SfxAllItemSet(pShell->GetPool())); TransformParameters(GetId(), lNewArgs, *xSet, pSlot); if (xSet->Count()) { diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 078b9c821191..2bb0e711e7b0 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -73,7 +73,6 @@ #include <vcl/builderfactory.hxx> #include <algorithm> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx index c073542f6e58..eb1ba0ea2506 100644 --- a/sfx2/source/dialog/itemconnect.cxx +++ b/sfx2/source/dialog/itemconnect.cxx @@ -17,13 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <svl/itempool.hxx> #include <sfx2/itemconnect.hxx> - -#include <boost/shared_ptr.hpp> #include <list> -#include <svl/itempool.hxx> - - +#include <memory> namespace sfx { @@ -292,7 +289,7 @@ public: bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ); private: - typedef boost::shared_ptr< ItemConnectionBase > ItemConnectionRef; + typedef std::shared_ptr< ItemConnectionBase > ItemConnectionRef; typedef std::list< ItemConnectionRef > ItemConnectionList; typedef ItemConnectionList::iterator ItemConnectionListIt; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 8649a4d6ad98..251990c9b62d 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -18,7 +18,7 @@ */ #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <vcl/menu.hxx> #include <vcl/settings.hxx> @@ -2486,7 +2486,7 @@ IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void ) ToolBoxItemBits::DROPDOWN == (pBox->GetItemBits(nEntry)&ToolBoxItemBits::DROPDOWN)) { //create a popup menu in Writer - boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu); + std::unique_ptr<PopupMenu> pMenu(new PopupMenu); uno::Reference< container::XNameAccess > xNameAccess( frame::theUICommandDescription::get( ::comphelper::getProcessComponentContext()) ); diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 54e73aded93b..40c5ea0e433a 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 4b62de5ae926..fa92aeb900fd 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -121,7 +121,7 @@ #include <officecfg/Office/Common.hxx> #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -199,7 +199,7 @@ public: mutable INetURLObject* m_pURLObj; const SfxFilter* m_pFilter; - boost::scoped_ptr<SfxFilter> m_pCustomFilter; + std::unique_ptr<SfxFilter> m_pCustomFilter; SfxMedium* pAntiImpl; SvStream* m_pInStream; diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 1167db357c70..f4ad0b23df4d 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -53,7 +53,7 @@ #include "graphhelp.hxx" #include "doc.hrc" -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace css; @@ -184,7 +184,7 @@ bool GraphicHelper::getThumbnailFormatFromGDI_Impl(GDIMetaFile* pMetaFile, const if (!pMetaFile || !xStream.is()) return false; - boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xStream)); + std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xStream)); if (pStream->GetError()) return false; diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 4a01b2ef4ca6..234888b1407b 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -87,7 +87,7 @@ #include <svtools/sfxecode.hxx> #include "../appl/app.hrc" -#include <boost/scoped_ptr.hpp> +#include <memory> #include <com/sun/star/frame/Desktop.hpp> @@ -887,7 +887,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, aDialogFlags = SFXWB_SAVEACOPY; } - boost::scoped_ptr<sfx2::FileDialogHelper> pFileDlg; + std::unique_ptr<sfx2::FileDialogHelper> pFileDlg; OUString aDocServiceName = GetDocServiceName(); DBG_ASSERT( !aDocServiceName.isEmpty(), "No document service for this module set!" ); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index a45c99f00686..b838f148c0e6 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -125,7 +125,7 @@ #include <objstor.hxx> #include <appopen.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1567,7 +1567,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon if ( bCaughtException && bRaiseError ) { - boost::scoped_ptr< VclAbstractDialog > pScriptErrDlg; + std::unique_ptr< VclAbstractDialog > pScriptErrDlg; SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if ( pFact ) pScriptErrDlg.reset( pFact->CreateScriptErrorDialog( NULL, aException ) ); diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 82dd1496b69e..a08c65ddbb70 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -101,7 +101,7 @@ #include "guisaveas.hxx" #include <sfx2/templatedlg.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <cppuhelper/implbase.hxx> using namespace ::com::sun::star; diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index 00fa397d4ce6..e2fbfa5bfacd 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SFX2_SOURCE_DOC_OLEPROPS_HXX #include <map> -#include <boost/shared_ptr.hpp> +#include <memory> #include <osl/thread.h> #include <rtl/ustring.hxx> #include <sot/storage.hxx> @@ -126,7 +126,7 @@ public: void SetCodePage( sal_uInt16 nCodePage ); private: - typedef ::boost::shared_ptr< rtl_TextEncoding > TextEncRef; + typedef std::shared_ptr< rtl_TextEncoding > TextEncRef; TextEncRef mxTextEnc; }; @@ -226,7 +226,7 @@ private: sal_Int32 mnPropType; }; -typedef ::boost::shared_ptr< SfxOlePropertyBase > SfxOlePropertyRef; +typedef std::shared_ptr< SfxOlePropertyBase > SfxOlePropertyRef; /** Property representing the codepage used to encode bytestrings in the entire property set. */ @@ -353,7 +353,7 @@ private: bool mbSupportsDict; /// true = section supports dictionary. }; -typedef ::boost::shared_ptr< SfxOleSection > SfxOleSectionRef; +typedef std::shared_ptr< SfxOleSection > SfxOleSectionRef; diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index c5c71aab7ece..b5746ecfc8fc 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -26,7 +26,7 @@ #include <cppuhelper/implbase.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <boost/noncopyable.hpp> /** base class for sub components of an SfxBaseModel, which share their ref count and lifetime with the SfxBaseModel @@ -154,7 +154,7 @@ namespace sfx2 virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - ::boost::scoped_ptr< DocumentUndoManager_Impl > m_pImpl; + std::unique_ptr< DocumentUndoManager_Impl > m_pImpl; }; diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index 36b46eaa3aea..f6bc338cb91e 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -18,7 +18,7 @@ */ -#include <boost/shared_ptr.hpp> +#include <memory> #include <sfx2/imgmgr.hxx> #include <sfx2/sfx.hrc> @@ -71,7 +71,7 @@ public: namespace { - typedef std::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager_Impl> > SfxImageManagerImplMap; + typedef std::unordered_map< SfxModule*, std::shared_ptr<SfxImageManager_Impl> > SfxImageManagerImplMap; class theImageManagerImplMap : public rtl::Static<SfxImageManagerImplMap, theImageManagerImplMap> {}; @@ -246,7 +246,7 @@ SfxImageManager::~SfxImageManager() namespace { - typedef std::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager> > SfxImageManagerMap; + typedef std::unordered_map< SfxModule*, std::shared_ptr<SfxImageManager> > SfxImageManagerMap; class theImageManagerMap : public rtl::Static<SfxImageManagerMap, theImageManagerMap> {}; diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index c5ad671722a9..b93221263989 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -46,7 +46,6 @@ #include <sfx2/docfilt.hxx> #include <toolkit/awt/vclxdevice.hxx> -#include <boost/scoped_ptr.hpp> #include "view.hrc" #include "helpid.hrc" diff --git a/sot/inc/pch/precompiled_sot.hxx b/sot/inc/pch/precompiled_sot.hxx index eb156a53042c..e1da2bcaf5c3 100644 --- a/sot/inc/pch/precompiled_sot.hxx +++ b/sot/inc/pch/precompiled_sot.hxx @@ -18,7 +18,6 @@ #include <algorithm> #include <assert.h> #include <memory> -#include <boost/scoped_ptr.hpp> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index d22db40c8084..3a337d5e7d2a 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -36,7 +36,6 @@ #include <unotools/ucbhelper.hxx> #include <comphelper/processfactory.hxx> #include <memory> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; @@ -572,7 +571,7 @@ bool SotStorage::IsStorageFile( const OUString & rFileName ) aName = aObj.GetMainURL( INetURLObject::NO_DECODE ); } - boost::scoped_ptr<SvStream> pStm(::utl::UcbStreamHelper::CreateStream( aName, STREAM_STD_READ )); + std::unique_ptr<SvStream> pStm(::utl::UcbStreamHelper::CreateStream( aName, STREAM_STD_READ )); bool bRet = SotStorage::IsStorageFile( pStm.get() ); return bRet; } diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 7e1cfb4a8e78..6014af95ba9e 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -44,7 +44,6 @@ #include <com/sun/star/ucb/InteractiveIOException.hpp> #include <memory> -#include <boost/scoped_ptr.hpp> #include <rtl/digest.h> #include <osl/diagnose.h> #include <tools/ref.hxx> @@ -1627,7 +1626,7 @@ UCBStorage_Impl::UCBStorage_Impl( SvStream& rStream, UCBStorage* pStorage, bool m_aURL = aTemp; // copy data into the temporary file - boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( m_pTempFile->GetURL(), STREAM_STD_READWRITE, true /* bFileExists */ )); + std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( m_pTempFile->GetURL(), STREAM_STD_READWRITE, true /* bFileExists */ )); if ( pStream ) { rStream.Seek(0); @@ -1670,7 +1669,7 @@ void UCBStorage_Impl::Init() aObj.Append( OUString( "manifest.xml" ) ); // create input stream - boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ )); + std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ )); // no stream means no manifest.xml if ( pStream ) { @@ -2114,7 +2113,7 @@ sal_Int16 UCBStorage_Impl::Commit() { UCBStorageElement_Impl* pElement = m_aChildrenList[ i ]; ::ucbhelper::Content* pContent = pElement->GetContent(); - boost::scoped_ptr< ::ucbhelper::Content > xDeleteContent; + std::unique_ptr< ::ucbhelper::Content > xDeleteContent; if ( !pContent && pElement->IsModified() ) { // if the element has never been opened, no content has been created until now @@ -2247,7 +2246,7 @@ sal_Int16 UCBStorage_Impl::Commit() { // create a stream to write the manifest file - use a temp file OUString aURL( aNewSubFolder.getURL() ); - boost::scoped_ptr< ::utl::TempFile> pTempFile(new ::utl::TempFile( &aURL )); + std::unique_ptr< ::utl::TempFile> pTempFile(new ::utl::TempFile( &aURL )); // get the stream from the temp file and create an output stream wrapper SvStream* pStream = pTempFile->GetStream( STREAM_STD_READWRITE ); @@ -2283,7 +2282,7 @@ sal_Int16 UCBStorage_Impl::Commit() m_pContent->executeCommand( OUString("flush"), aAny ); if ( m_pSource != 0 ) { - boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( m_pTempFile->GetURL(), STREAM_STD_READ )); + std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( m_pTempFile->GetURL(), STREAM_STD_READ )); m_pSource->SetStreamSize(0); // m_pSource->Seek(0); pStream->ReadStream( *m_pSource ); @@ -2497,7 +2496,7 @@ bool UCBStorage::CopyStorageElement_Impl( UCBStorageElement_Impl& rElement, Base { // copy the streams data // the destination stream must not be open - boost::scoped_ptr<BaseStorageStream> pOtherStream(pDest->OpenStream( rNew, StreamMode::WRITE | StreamMode::SHARE_DENYALL, pImp->m_bDirect )); + std::unique_ptr<BaseStorageStream> pOtherStream(pDest->OpenStream( rNew, StreamMode::WRITE | StreamMode::SHARE_DENYALL, pImp->m_bDirect )); BaseStorageStream* pStream = NULL; bool bDeleteStream = false; @@ -2540,7 +2539,7 @@ bool UCBStorage::CopyStorageElement_Impl( UCBStorageElement_Impl& rElement, Base UCBStorage* pUCBCopy = PTR_CAST( UCBStorage, pStorage ); bool bOpenUCBStorage = pUCBDest && pUCBCopy; - boost::scoped_ptr<BaseStorage> pOtherStorage(bOpenUCBStorage ? + std::unique_ptr<BaseStorage> pOtherStorage(bOpenUCBStorage ? pDest->OpenUCBStorage( rNew, StreamMode::WRITE | StreamMode::SHARE_DENYALL, pImp->m_bDirect ) : pDest->OpenOLEStorage( rNew, StreamMode::WRITE | StreamMode::SHARE_DENYALL, pImp->m_bDirect )); diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx index 95de5f76dd8d..f497d3b44e7d 100644 --- a/svl/inc/pch/precompiled_svl.hxx +++ b/svl/inc/pch/precompiled_svl.hxx @@ -21,7 +21,6 @@ #include <boost/ptr_container/ptr_map.hpp> #include <boost/ptr_container/ptr_vector.hpp> #include <memory> -#include <boost/scoped_ptr.hpp> #include <cassert> #include <cmath> #include <com/sun/star/awt/Point.hpp> diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index f6ee9e245f8e..4d00395c1882 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -37,7 +37,7 @@ #include <svl/sharedstring.hxx> #include <unotools/syslocale.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <unicode/calendar.h> using namespace ::com::sun::star; @@ -81,7 +81,7 @@ private: LanguageType eLang, OUString& sExpected); void checkDateInput( SvNumberFormatter& rFormatter, const char* pTimezone, const char* pIsoDate ); - boost::scoped_ptr<icu::TimeZone> m_pDefaultTimeZone; + std::unique_ptr<icu::TimeZone> m_pDefaultTimeZone; }; Test::Test() @@ -351,10 +351,10 @@ void Test::testSharedStringPoolPurge() CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), aPool.getCountIgnoreCase()); // Now, create string objects on the heap. - boost::scoped_ptr<OUString> pStr1(new OUString("Andy")); - boost::scoped_ptr<OUString> pStr2(new OUString("andy")); - boost::scoped_ptr<OUString> pStr3(new OUString("ANDY")); - boost::scoped_ptr<OUString> pStr4(new OUString("Bruce")); + std::unique_ptr<OUString> pStr1(new OUString("Andy")); + std::unique_ptr<OUString> pStr2(new OUString("andy")); + std::unique_ptr<OUString> pStr3(new OUString("ANDY")); + std::unique_ptr<OUString> pStr4(new OUString("Bruce")); aPool.intern(*pStr1); aPool.intern(*pStr2); aPool.intern(*pStr3); diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index ef8640bea32a..dc524ac24aec 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -21,8 +21,8 @@ #define INCLUDED_SVL_SOURCE_INC_POOLIO_HXX #include <svl/SfxBroadcaster.hxx> -#include <boost/shared_ptr.hpp> #include <deque> +#include <memory> #include <unordered_map> #include <vector> @@ -60,7 +60,7 @@ struct SfxPoolVersion_Impl typedef std::vector<SfxPoolItem*> SfxPoolItemArrayBase_Impl; -typedef boost::shared_ptr< SfxPoolVersion_Impl > SfxPoolVersion_ImplPtr; +typedef std::shared_ptr< SfxPoolVersion_Impl > SfxPoolVersion_ImplPtr; /** * This array contains a set of SfxPoolItems, if those items are diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index c76d8f45adc1..20b9e3a719fa 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -28,6 +28,7 @@ #include <svl/smplhint.hxx> #include "poolio.hxx" +#include <algorithm> #include <vector> diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 3916db7e8038..66951f1340c0 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -22,7 +22,7 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <unordered_map> /* * UNO III Implementation @@ -233,7 +233,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn { // get the SfxPoolItem const SfxPoolItem* pItem = 0; - boost::scoped_ptr<SfxPoolItem> pNewItem; + std::unique_ptr<SfxPoolItem> pNewItem; SfxItemState eState = rSet.GetItemState( rEntry.nWID, true, &pItem ); if(SfxItemState::SET != eState && SFX_WHICH_MAX > rEntry.nWID ) pItem = &rSet.GetPool()->GetDefaultItem(rEntry.nWID); diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 441396054eab..bed569a1bac1 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -27,7 +27,7 @@ #include <svl/SfxBroadcaster.hxx> #include <svl/filerec.hxx> #include "poolio.hxx" -#include <boost/scoped_ptr.hpp> +#include <memory> /** * Returns the <SfxItemPool> that is being saved. @@ -236,7 +236,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const { sal_uLong nMark = rStream.Tell(); rStream.Seek( nItemStartPos + sizeof(sal_uInt16) ); - boost::scoped_ptr<SfxPoolItem> pClone(pItem->Create(rStream, nItemVersion )); + std::unique_ptr<SfxPoolItem> pClone(pItem->Create(rStream, nItemVersion )); sal_uInt16 nWh = pItem->Which(); SFX_ASSERT( rStream.Tell() == nMark, nWh,"asymmetric store/create" ); SFX_ASSERT( *pClone == *pItem, nWh, "unequal after store/create" ); diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx index 086c704d59cc..6f0de30bc450 100644 --- a/svl/source/misc/getstringresource.cxx +++ b/svl/source/misc/getstringresource.cxx @@ -20,9 +20,8 @@ #include <sal/config.h> #include <map> - +#include <memory> #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> #include <i18nlangtag/languagetag.hxx> #include <rtl/instance.hxx> #include <rtl/ustrbuf.hxx> @@ -62,7 +61,7 @@ SimpleResMgr * ResMgrMap::get(LanguageTag const & locale) { OUString code( locale.getBcp47()); Map::iterator i(map_.find(code)); if (i == map_.end()) { - boost::scoped_ptr< SimpleResMgr > mgr( + std::unique_ptr< SimpleResMgr > mgr( new SimpleResMgr("svl", locale)); i = map_.insert(Map::value_type(code, mgr.get())).first; mgr.reset(); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index d7596cb12f05..4a3067869419 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -50,7 +50,7 @@ #include <math.h> #include <limits> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1531,7 +1531,7 @@ bool SvNumberFormatter::GetPreviewString(const OUString& sFormatString, eLnge = ActLnge; sal_Int32 nCheckPos = -1; OUString sTmpString = sFormatString; - boost::scoped_ptr<SvNumberformat> p_Entry(new SvNumberformat(sTmpString, + std::unique_ptr<SvNumberformat> p_Entry(new SvNumberformat(sTmpString, pFormatScanner, pStringScanner, nCheckPos, @@ -1592,7 +1592,7 @@ bool SvNumberFormatter::GetPreviewStringGuess( const OUString& sFormatString, return true; } - boost::scoped_ptr<SvNumberformat> pEntry; + std::unique_ptr<SvNumberformat> pEntry; sal_Int32 nCheckPos = -1; OUString sTmpString; @@ -1635,7 +1635,7 @@ bool SvNumberFormatter::GetPreviewStringGuess( const OUString& sFormatString, eFormatLang = eLnge; pFormatScanner->SetConvertMode( eLnge, LANGUAGE_ENGLISH_US ); sTmpString = sFormatString; - boost::scoped_ptr<SvNumberformat> pEntry2(new SvNumberformat( sTmpString, pFormatScanner, + std::unique_ptr<SvNumberformat> pEntry2(new SvNumberformat( sTmpString, pFormatScanner, pStringScanner, nCheckPos2, eFormatLang )); pFormatScanner->SetConvertMode( false ); ChangeIntl( eLnge ); @@ -1679,7 +1679,7 @@ bool SvNumberFormatter::GetPreviewString( const OUString& sFormatString, eLnge = ActLnge; sal_Int32 nCheckPos = -1; OUString sTmpString = sFormatString; - boost::scoped_ptr<SvNumberformat> p_Entry(new SvNumberformat( sTmpString, + std::unique_ptr<SvNumberformat> p_Entry(new SvNumberformat( sTmpString, pFormatScanner, pStringScanner, nCheckPos, @@ -1732,7 +1732,7 @@ sal_uInt32 SvNumberFormatter::TestNewString(const OUString& sFormatString, sal_uInt32 nRes; sal_Int32 nCheckPos = -1; OUString sTmpString = sFormatString; - boost::scoped_ptr<SvNumberformat> pEntry(new SvNumberformat(sTmpString, + std::unique_ptr<SvNumberformat> pEntry(new SvNumberformat(sTmpString, pFormatScanner, pStringScanner, nCheckPos, @@ -1945,7 +1945,7 @@ sal_uInt32 SvNumberFormatter::GetFormatSpecialInfo( const OUString& rFormatStrin eLnge = ActLnge; OUString aTmpStr( rFormatString ); sal_Int32 nCheckPos = 0; - boost::scoped_ptr<SvNumberformat> pFormat(new SvNumberformat( aTmpStr, pFormatScanner, + std::unique_ptr<SvNumberformat> pFormat(new SvNumberformat( aTmpStr, pFormatScanner, pStringScanner, nCheckPos, eLnge )); if ( nCheckPos == 0 ) { @@ -3646,7 +3646,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() bInitializing = true; LanguageType eSysLang = SvtSysLocale().GetLanguageTag().getLanguageType(); - boost::scoped_ptr<LocaleDataWrapper> pLocaleData(new LocaleDataWrapper( + std::unique_ptr<LocaleDataWrapper> pLocaleData(new LocaleDataWrapper( ::comphelper::getProcessComponentContext(), SvtSysLocale().GetLanguageTag() )); // get user configured currency diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index e632c8f257a2..2dc1c54b86cc 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -45,7 +45,6 @@ #include <svl/nfsymbol.hxx> #include <cmath> -#include <boost/scoped_ptr.hpp> using namespace svt; diff --git a/unoxml/inc/pch/precompiled_unoxml.hxx b/unoxml/inc/pch/precompiled_unoxml.hxx index a5d60a5a0fbd..3f71b23adeec 100644 --- a/unoxml/inc/pch/precompiled_unoxml.hxx +++ b/unoxml/inc/pch/precompiled_unoxml.hxx @@ -16,7 +16,6 @@ #include <algorithm> #include <boost/bind.hpp> -#include <boost/shared_ptr.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index 3a97fb73426b..bf03d9ac5d87 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -21,7 +21,7 @@ #include <string.h> -#include <boost/shared_ptr.hpp> +#include <memory> #include <osl/diagnose.h> @@ -185,7 +185,7 @@ namespace DOM // this does not work if the attribute was created anew // xmlNodePtr pNode = m_aAttrPtr->parent; // xmlSetProp(pNode, m_aAttrPtr->name, xValue); - ::boost::shared_ptr<xmlChar const> const buffer( + std::shared_ptr<xmlChar const> const buffer( xmlEncodeEntitiesReentrant(m_aAttrPtr->doc, xValue), xmlFree); xmlFreeNodeList(m_aAttrPtr->children); m_aAttrPtr->children = diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx index 32a51de8d2dd..e1d7534edb21 100644 --- a/unoxml/source/dom/characterdata.cxx +++ b/unoxml/source/dom/characterdata.cxx @@ -21,7 +21,7 @@ #include <string.h> -#include <boost/shared_ptr.hpp> +#include <memory> #include <osl/diagnose.h> @@ -87,7 +87,7 @@ namespace DOM if (m_aNodePtr != NULL) { // get current data - ::boost::shared_ptr<xmlChar const> const pContent( + std::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); @@ -158,7 +158,7 @@ namespace DOM if (m_aNodePtr != NULL) { // get current data - ::boost::shared_ptr<xmlChar const> const pContent( + std::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); @@ -193,7 +193,7 @@ namespace DOM if (m_aNodePtr != NULL) { // get current data - ::boost::shared_ptr<xmlChar const> const pContent( + std::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); @@ -248,7 +248,7 @@ namespace DOM if (m_aNodePtr != NULL) { // get current data - ::boost::shared_ptr<xmlChar const> const pContent( + std::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index d2f03be30fc0..f3948b8f9453 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -26,7 +26,7 @@ #include <libxml/xmlerror.h> #include <libxml/tree.h> -#include <boost/shared_ptr.hpp> +#include <memory> #include <rtl/alloc.h> #include <rtl/ustrbuf.hxx> @@ -318,7 +318,7 @@ namespace DOM ::osl::MutexGuard const g(m_Mutex); - ::boost::shared_ptr<xmlParserCtxt> const pContext( + std::shared_ptr<xmlParserCtxt> const pContext( xmlNewParserCtxt(), xmlFreeParserCtxt); // register error functions to prevent errors being printed @@ -351,7 +351,7 @@ namespace DOM { ::osl::MutexGuard const g(m_Mutex); - ::boost::shared_ptr<xmlParserCtxt> const pContext( + std::shared_ptr<xmlParserCtxt> const pContext( xmlNewParserCtxt(), xmlFreeParserCtxt); pContext->_private = this; pContext->sax->error = error_func; diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index ee2a25c81cb6..48abfdd21649 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -21,7 +21,7 @@ #include <string.h> -#include <boost/shared_ptr.hpp> +#include <memory> #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> @@ -240,7 +240,7 @@ namespace DOM } // search properties OString o1 = OUStringToOString(name, RTL_TEXTENCODING_UTF8); - ::boost::shared_ptr<xmlChar const> const pValue( + std::shared_ptr<xmlChar const> const pValue( xmlGetProp(m_aNodePtr, reinterpret_cast<xmlChar const *>(o1.getStr())), xmlFree); OUString const ret( (pValue) ? OUString(reinterpret_cast<sal_Char const*>(pValue.get()), @@ -324,7 +324,7 @@ namespace DOM OString o2 = OUStringToOString(namespaceURI, RTL_TEXTENCODING_UTF8); xmlChar const*const pNS = reinterpret_cast<xmlChar const*>(o2.getStr()); - ::boost::shared_ptr<xmlChar const> const pValue( + std::shared_ptr<xmlChar const> const pValue( xmlGetNsProp(m_aNodePtr, pName, pNS), xmlFree); if (0 == pValue) { return OUString(); @@ -628,7 +628,7 @@ namespace DOM } OUString oldValue; AttrChangeType aChangeType = AttrChangeType_MODIFICATION; - ::boost::shared_ptr<xmlChar const> const pOld( + std::shared_ptr<xmlChar const> const pOld( xmlGetProp(m_aNodePtr, xName), xmlFree); if (pOld == 0) { aChangeType = AttrChangeType_ADDITION; @@ -711,7 +711,7 @@ namespace DOM OUString oldValue; AttrChangeType aChangeType = AttrChangeType_MODIFICATION; - ::boost::shared_ptr<xmlChar const> const pOld( + std::shared_ptr<xmlChar const> const pOld( xmlGetNsProp(m_aNodePtr, xLName, pNs->href), xmlFree); if (pOld == 0) { aChangeType = AttrChangeType_ADDITION; diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index c2603f34efb4..76e3fdf8c8e7 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -21,14 +21,14 @@ #include <string.h> -#include <set> #include <map> +#include <memory> +#include <set> #include <iterator> #include <functional> #include <algorithm> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> #include <boost/shared_array.hpp> #include <boost/bind.hpp> #include <boost/optional.hpp> @@ -121,7 +121,7 @@ bool isInternalContext(librdf_node *i_pNode) throw () // n.b.: librdf destructor functions dereference null pointers! -// so they need to be wrapped to be usable with boost::shared_ptr. +// so they need to be wrapped to be usable with std::shared_ptr. static void safe_librdf_free_world(librdf_world *const world) { if (world) { librdf_free_world(world); } @@ -211,12 +211,12 @@ public: }; struct Statement { - ::boost::shared_ptr<Resource> const pSubject; - ::boost::shared_ptr<URI> const pPredicate; - ::boost::shared_ptr<Node> const pObject; - Statement(::boost::shared_ptr<Resource> const& i_pSubject, - ::boost::shared_ptr<URI> const& i_pPredicate, - ::boost::shared_ptr<Node> const& i_pObject) + std::shared_ptr<Resource> const pSubject; + std::shared_ptr<URI> const pPredicate; + std::shared_ptr<Node> const pObject; + Statement(std::shared_ptr<Resource> const& i_pSubject, + std::shared_ptr<URI> const& i_pPredicate, + std::shared_ptr<Node> const& i_pObject) : pSubject(i_pSubject) , pPredicate(i_pPredicate) , pObject(i_pObject) @@ -242,9 +242,9 @@ public: const Node * i_pNode); static librdf_statement* mkStatement_Lock(librdf_world* i_pWorld, Statement const& i_rStatement); - static ::boost::shared_ptr<Resource> extractResource_NoLock( + static std::shared_ptr<Resource> extractResource_NoLock( const uno::Reference< rdf::XResource > & i_xResource); - static ::boost::shared_ptr<Node> extractNode_NoLock( + static std::shared_ptr<Node> extractNode_NoLock( const uno::Reference< rdf::XNode > & i_xNode); static Statement extractStatement_NoLock( const uno::Reference< rdf::XResource > & i_xSubject, @@ -426,7 +426,7 @@ private: And of course this is not documented anywhere that I could find. So we allocate a single world, and refcount that. */ - static boost::shared_ptr<librdf_world> m_pWorld; + static std::shared_ptr<librdf_world> m_pWorld; /// refcount static sal_uInt32 m_NumInstances; /// mutex for m_pWorld - redland is not as threadsafe as is often claimed @@ -434,9 +434,9 @@ private: // NB: sequence of the shared pointers is important! /// librdf repository storage - boost::shared_ptr<librdf_storage> m_pStorage; + std::shared_ptr<librdf_storage> m_pStorage; /// librdf repository model - boost::shared_ptr<librdf_model> m_pModel; + std::shared_ptr<librdf_model> m_pModel; /// all named graphs NamedGraphMap_t m_NamedGraphs; @@ -463,10 +463,10 @@ public: librdf_GraphResult(librdf_Repository *i_pRepository, ::osl::Mutex & i_rMutex, - boost::shared_ptr<librdf_stream> const& i_pStream, - boost::shared_ptr<librdf_node> const& i_pContext, - boost::shared_ptr<librdf_query> const& i_pQuery = - boost::shared_ptr<librdf_query>() ) + std::shared_ptr<librdf_stream> const& i_pStream, + std::shared_ptr<librdf_node> const& i_pContext, + std::shared_ptr<librdf_query> const& i_pQuery = + std::shared_ptr<librdf_query>() ) : m_xRep(i_pRepository) , m_rMutex(i_rMutex) , m_pQuery(i_pQuery) @@ -477,9 +477,9 @@ public: virtual ~librdf_GraphResult() { ::osl::MutexGuard g(m_rMutex); // lock mutex when destroying members - const_cast<boost::shared_ptr<librdf_stream>& >(m_pStream).reset(); - const_cast<boost::shared_ptr<librdf_node>& >(m_pContext).reset(); - const_cast<boost::shared_ptr<librdf_query>& >(m_pQuery).reset(); + const_cast<std::shared_ptr<librdf_stream>& >(m_pStream).reset(); + const_cast<std::shared_ptr<librdf_node>& >(m_pContext).reset(); + const_cast<std::shared_ptr<librdf_query>& >(m_pQuery).reset(); } // css::container::XEnumeration: @@ -499,9 +499,9 @@ private: // the query (in case this is a result of a graph query) // not that the redland documentation spells this out explicity, but // queries must be freed only after all the results are completely read - boost::shared_ptr<librdf_query> const m_pQuery; - boost::shared_ptr<librdf_node> const m_pContext; - boost::shared_ptr<librdf_stream> const m_pStream; + std::shared_ptr<librdf_query> const m_pQuery; + std::shared_ptr<librdf_node> const m_pContext; + std::shared_ptr<librdf_stream> const m_pStream; librdf_node* getContext_Lock() const; }; @@ -577,8 +577,8 @@ public: librdf_QuerySelectResult(librdf_Repository *i_pRepository, ::osl::Mutex & i_rMutex, - boost::shared_ptr<librdf_query> const& i_pQuery, - boost::shared_ptr<librdf_query_results> const& i_pQueryResult, + std::shared_ptr<librdf_query> const& i_pQuery, + std::shared_ptr<librdf_query_results> const& i_pQueryResult, uno::Sequence< OUString > const& i_rBindingNames ) : m_xRep(i_pRepository) , m_rMutex(i_rMutex) @@ -590,9 +590,9 @@ public: virtual ~librdf_QuerySelectResult() { ::osl::MutexGuard g(m_rMutex); // lock mutex when destroying members - const_cast<boost::shared_ptr<librdf_query_results>& >(m_pQueryResult) + const_cast<std::shared_ptr<librdf_query_results>& >(m_pQueryResult) .reset(); - const_cast<boost::shared_ptr<librdf_query>& >(m_pQuery).reset(); + const_cast<std::shared_ptr<librdf_query>& >(m_pQuery).reset(); } // css::container::XEnumeration: @@ -616,8 +616,8 @@ private: ::osl::Mutex & m_rMutex; // not that the redland documentation spells this out explicity, but // queries must be freed only after all the results are completely read - boost::shared_ptr<librdf_query> const m_pQuery; - boost::shared_ptr<librdf_query_results> const m_pQueryResult; + std::shared_ptr<librdf_query> const m_pQuery; + std::shared_ptr<librdf_query_results> const m_pQueryResult; uno::Sequence< OUString > const m_BindingNames; }; @@ -849,7 +849,7 @@ throw (uno::RuntimeException, -boost::shared_ptr<librdf_world> librdf_Repository::m_pWorld; +std::shared_ptr<librdf_world> librdf_Repository::m_pWorld; sal_uInt32 librdf_Repository::m_NumInstances = 0; osl::Mutex librdf_Repository::m_aMutex; @@ -913,7 +913,7 @@ uno::Reference< rdf::XBlankNode > SAL_CALL librdf_Repository::createBlankNode() throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); - const boost::shared_ptr<librdf_node> pNode( + const std::shared_ptr<librdf_node> pNode( librdf_new_node_from_blank_identifier(m_pWorld.get(), NULL), safe_librdf_free_node); if (!pNode) { @@ -1002,7 +1002,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, const OString context( OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); - const boost::shared_ptr<librdf_node> pContext( + const std::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), reinterpret_cast<const unsigned char*> (context.getStr())), safe_librdf_free_node); @@ -1013,7 +1013,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, const OString baseURI( OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) ); - const boost::shared_ptr<librdf_uri> pBaseURI( + const std::shared_ptr<librdf_uri> pBaseURI( librdf_new_uri(m_pWorld.get(), reinterpret_cast<const unsigned char*> (baseURI.getStr())), safe_librdf_free_uri); @@ -1021,7 +1021,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, throw uno::RuntimeException( "librdf_Repository::importGraph: librdf_new_uri failed", *this); } - const boost::shared_ptr<librdf_parser> pParser( + const std::shared_ptr<librdf_parser> pParser( librdf_new_parser(m_pWorld.get(), "rdfxml", NULL, NULL), safe_librdf_free_parser); if (!pParser) { @@ -1030,7 +1030,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "librdf_new_parser failed", *this); } - const boost::shared_ptr<librdf_stream> pStream( + const std::shared_ptr<librdf_stream> pStream( librdf_parser_parse_counted_string_as_stream(pParser.get(), reinterpret_cast<const unsigned char*>(buf.getConstArray()), buf.getLength(), pBaseURI.get()), @@ -1150,7 +1150,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, const OString context( OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); - const boost::shared_ptr<librdf_node> pContext( + const std::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), reinterpret_cast<const unsigned char*> (context.getStr())), safe_librdf_free_node); @@ -1161,7 +1161,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, } const OString baseURI( OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) ); - const boost::shared_ptr<librdf_uri> pBaseURI( + const std::shared_ptr<librdf_uri> pBaseURI( librdf_new_uri(m_pWorld.get(), reinterpret_cast<const unsigned char*> (baseURI.getStr())), safe_librdf_free_uri); @@ -1171,7 +1171,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "librdf_new_uri failed", *this); } - const boost::shared_ptr<librdf_stream> pStream( + const std::shared_ptr<librdf_stream> pStream( librdf_model_context_as_stream(m_pModel.get(), pContext.get()), safe_librdf_free_stream); if (!pStream) { @@ -1182,7 +1182,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, const char *format("rdfxml"); // #i116443#: abbrev breaks when certain URIs are used as data types // const char *format("rdfxml-abbrev"); - const boost::shared_ptr<librdf_serializer> pSerializer( + const std::shared_ptr<librdf_serializer> pSerializer( librdf_new_serializer(m_pWorld.get(), format, NULL, NULL), safe_librdf_free_serializer); if (!pSerializer) { @@ -1191,19 +1191,19 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "librdf_new_serializer failed", *this); } - const boost::shared_ptr<librdf_uri> pRelativeURI( + const std::shared_ptr<librdf_uri> pRelativeURI( librdf_new_uri(m_pWorld.get(), reinterpret_cast<const unsigned char*> ("http://feature.librdf.org/raptor-relativeURIs")), safe_librdf_free_uri); - const boost::shared_ptr<librdf_uri> pWriteBaseURI( + const std::shared_ptr<librdf_uri> pWriteBaseURI( librdf_new_uri(m_pWorld.get(), reinterpret_cast<const unsigned char*> ("http://feature.librdf.org/raptor-writeBaseURI")), safe_librdf_free_uri); - const boost::shared_ptr<librdf_node> p0( + const std::shared_ptr<librdf_node> p0( librdf_new_node_from_literal(m_pWorld.get(), reinterpret_cast<const unsigned char*> ("0"), NULL, 0), safe_librdf_free_node); - const boost::shared_ptr<librdf_node> p1( + const std::shared_ptr<librdf_node> p1( librdf_new_node_from_literal(m_pWorld.get(), reinterpret_cast<const unsigned char*> ("1"), NULL, 0), safe_librdf_free_node); @@ -1231,7 +1231,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, } size_t length; - const boost::shared_ptr<unsigned char> pBuf( + const std::shared_ptr<unsigned char> pBuf( librdf_serializer_serialize_stream_to_counted_string( pSerializer.get(), pBaseURI.get(), pStream.get(), &length), free); if (!pBuf) { @@ -1349,8 +1349,8 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception) isMetadatableWithoutMetadata(i_xObject)) { return new librdf_GraphResult(this, m_aMutex, - ::boost::shared_ptr<librdf_stream>(), - ::boost::shared_ptr<librdf_node>()); + std::shared_ptr<librdf_stream>(), + std::shared_ptr<librdf_node>()); } librdf_TypeConverter::Statement const stmt( @@ -1359,12 +1359,12 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception) ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked - const boost::shared_ptr<librdf_statement> pStatement( + const std::shared_ptr<librdf_statement> pStatement( librdf_TypeConverter::mkStatement_Lock(m_pWorld.get(), stmt), safe_librdf_free_statement); OSL_ENSURE(pStatement, "mkStatement failed"); - const boost::shared_ptr<librdf_stream> pStream( + const std::shared_ptr<librdf_stream> pStream( librdf_model_find_statements(m_pModel.get(), pStatement.get()), safe_librdf_free_stream); if (!pStream) { @@ -1374,7 +1374,7 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception) } return new librdf_GraphResult(this, m_aMutex, pStream, - ::boost::shared_ptr<librdf_node>()); + std::shared_ptr<librdf_node>()); } @@ -1385,7 +1385,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std ::osl::MutexGuard g(m_aMutex); const OString query( OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); - const boost::shared_ptr<librdf_query> pQuery( + const std::shared_ptr<librdf_query> pQuery( librdf_new_query(m_pWorld.get(), s_sparql, NULL, reinterpret_cast<const unsigned char*> (query.getStr()), NULL), safe_librdf_free_query); @@ -1394,7 +1394,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std "librdf_Repository::querySelect: " "librdf_new_query failed", *this); } - const boost::shared_ptr<librdf_query_results> pResults( + const std::shared_ptr<librdf_query_results> pResults( librdf_model_query_execute(m_pModel.get(), pQuery.get()), safe_librdf_free_query_results); if (!pResults || !librdf_query_results_is_bindings(pResults.get())) { @@ -1434,7 +1434,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std ::osl::MutexGuard g(m_aMutex); const OString query( OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); - const boost::shared_ptr<librdf_query> pQuery( + const std::shared_ptr<librdf_query> pQuery( librdf_new_query(m_pWorld.get(), s_sparql, NULL, reinterpret_cast<const unsigned char*> (query.getStr()), NULL), safe_librdf_free_query); @@ -1443,7 +1443,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std "librdf_Repository::queryConstruct: " "librdf_new_query failed", *this); } - const boost::shared_ptr<librdf_query_results> pResults( + const std::shared_ptr<librdf_query_results> pResults( librdf_model_query_execute(m_pModel.get(), pQuery.get()), safe_librdf_free_query_results); if (!pResults || !librdf_query_results_is_graph(pResults.get())) { @@ -1451,7 +1451,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std "librdf_Repository::queryConstruct: " "query result is null or not graph", *this); } - const boost::shared_ptr<librdf_stream> pStream( + const std::shared_ptr<librdf_stream> pStream( librdf_query_results_as_stream(pResults.get()), safe_librdf_free_stream); if (!pStream) { @@ -1461,7 +1461,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std } return new librdf_GraphResult(this, m_aMutex, pStream, - ::boost::shared_ptr<librdf_node>(), pQuery); + std::shared_ptr<librdf_node>(), pQuery); } sal_Bool SAL_CALL @@ -1472,7 +1472,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std const OString query( OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); - const boost::shared_ptr<librdf_query> pQuery( + const std::shared_ptr<librdf_query> pQuery( librdf_new_query(m_pWorld.get(), s_sparql, NULL, reinterpret_cast<const unsigned char*> (query.getStr()), NULL), safe_librdf_free_query); @@ -1481,7 +1481,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std "librdf_Repository::queryAsk: " "librdf_new_query failed", *this); } - const boost::shared_ptr<librdf_query_results> pResults( + const std::shared_ptr<librdf_query_results> pResults( librdf_model_query_execute(m_pModel.get(), pQuery.get()), safe_librdf_free_query_results); if (!pResults || !librdf_query_results_is_boolean(pResults.get())) { @@ -1578,11 +1578,11 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "cannot create literal", *this, uno::makeAny(iae)); } - ::boost::shared_ptr<librdf_TypeConverter::Resource> const pSubject( + std::shared_ptr<librdf_TypeConverter::Resource> const pSubject( librdf_TypeConverter::extractResource_NoLock(i_xSubject)); - ::boost::shared_ptr<librdf_TypeConverter::Node> const pContent( + std::shared_ptr<librdf_TypeConverter::Node> const pContent( librdf_TypeConverter::extractNode_NoLock(xContent)); - ::std::vector< ::boost::shared_ptr<librdf_TypeConverter::Resource> > + ::std::vector< std::shared_ptr<librdf_TypeConverter::Resource> > predicates; ::std::transform(i_rPredicates.begin(), i_rPredicates.end(), ::std::back_inserter(predicates), @@ -1599,13 +1599,13 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, } try { - for (::std::vector< ::boost::shared_ptr<librdf_TypeConverter::Resource> > + for (::std::vector< std::shared_ptr<librdf_TypeConverter::Resource> > ::iterator iter = predicates.begin(); iter != predicates.end(); ++iter) { addStatementGraph_Lock( librdf_TypeConverter::Statement(pSubject, - ::boost::dynamic_pointer_cast<librdf_TypeConverter::URI>(*iter), + std::dynamic_pointer_cast<librdf_TypeConverter::URI>(*iter), pContent), sContext, true); } @@ -1725,8 +1725,8 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception) isMetadatableWithoutMetadata(i_xObject)) { return new librdf_GraphResult(this, m_aMutex, - ::boost::shared_ptr<librdf_stream>(), - ::boost::shared_ptr<librdf_node>()); + std::shared_ptr<librdf_stream>(), + std::shared_ptr<librdf_node>()); } librdf_TypeConverter::Statement const stmt( @@ -1735,12 +1735,12 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception) ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked - const boost::shared_ptr<librdf_statement> pStatement( + const std::shared_ptr<librdf_statement> pStatement( librdf_TypeConverter::mkStatement_Lock(m_pWorld.get(), stmt), safe_librdf_free_statement); OSL_ENSURE(pStatement, "mkStatement failed"); - const boost::shared_ptr<librdf_stream> pStream( + const std::shared_ptr<librdf_stream> pStream( librdf_model_find_statements(m_pModel.get(), pStatement.get()), safe_librdf_free_stream); if (!pStream) { @@ -1757,7 +1757,7 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception) } return new librdf_GraphResult(this, m_aMutex, pStream, - ::boost::shared_ptr<librdf_node>()); + std::shared_ptr<librdf_node>()); } // css::lang::XInitialization: @@ -1799,7 +1799,7 @@ const NamedGraphMap_t::iterator librdf_Repository::clearGraph_Lock( const OString context( OUStringToOString(i_rGraphName, RTL_TEXTENCODING_UTF8) ); - const boost::shared_ptr<librdf_node> pContext( + const std::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), reinterpret_cast<const unsigned char*> (context.getStr())), safe_librdf_free_node); @@ -1866,7 +1866,7 @@ void librdf_Repository::addStatementGraph_Lock( const OString context( OUStringToOString(i_rGraphName, RTL_TEXTENCODING_UTF8) ); - const boost::shared_ptr<librdf_node> pContext( + const std::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), reinterpret_cast<const unsigned char*> (context.getStr())), safe_librdf_free_node); @@ -1875,7 +1875,7 @@ void librdf_Repository::addStatementGraph_Lock( "librdf_Repository::addStatement: " "librdf_new_node_from_uri_string failed", *this); } - const boost::shared_ptr<librdf_statement> pStatement( + const std::shared_ptr<librdf_statement> pStatement( librdf_TypeConverter::mkStatement_Lock(m_pWorld.get(), i_rStatement), safe_librdf_free_statement); OSL_ENSURE(pStatement, "mkStatement failed"); @@ -1884,7 +1884,7 @@ void librdf_Repository::addStatementGraph_Lock( // librdf_model_add_statement disallows duplicates while // librdf_model_context_add_statement allows duplicates { - const boost::shared_ptr<librdf_stream> pStream( + const std::shared_ptr<librdf_stream> pStream( librdf_model_find_statements_in_context(m_pModel.get(), pStatement.get(), pContext.get()), safe_librdf_free_stream); @@ -1930,7 +1930,7 @@ void librdf_Repository::removeStatementsGraph_NoLock( const OString context( OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); - const boost::shared_ptr<librdf_node> pContext( + const std::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), reinterpret_cast<const unsigned char*> (context.getStr())), safe_librdf_free_node); @@ -1939,12 +1939,12 @@ void librdf_Repository::removeStatementsGraph_NoLock( "librdf_Repository::removeStatements: " "librdf_new_node_from_uri_string failed", *this); } - const boost::shared_ptr<librdf_statement> pStatement( + const std::shared_ptr<librdf_statement> pStatement( librdf_TypeConverter::mkStatement_Lock(m_pWorld.get(), stmt), safe_librdf_free_statement); OSL_ENSURE(pStatement, "mkStatement failed"); - const boost::shared_ptr<librdf_stream> pStream( + const std::shared_ptr<librdf_stream> pStream( librdf_model_find_statements_in_context(m_pModel.get(), pStatement.get(), pContext.get()), safe_librdf_free_stream); @@ -1991,8 +1991,8 @@ librdf_Repository::getStatementsGraph_NoLock( isMetadatableWithoutMetadata(i_xObject)) { return new librdf_GraphResult(this, m_aMutex, - ::boost::shared_ptr<librdf_stream>(), - ::boost::shared_ptr<librdf_node>()); + std::shared_ptr<librdf_stream>(), + std::shared_ptr<librdf_node>()); } librdf_TypeConverter::Statement const stmt( @@ -2010,7 +2010,7 @@ librdf_Repository::getStatementsGraph_NoLock( const OString context( OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); - const boost::shared_ptr<librdf_node> pContext( + const std::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), reinterpret_cast<const unsigned char*> (context.getStr())), safe_librdf_free_node); @@ -2019,12 +2019,12 @@ librdf_Repository::getStatementsGraph_NoLock( "librdf_Repository::getStatements: " "librdf_new_node_from_uri_string failed", *this); } - const boost::shared_ptr<librdf_statement> pStatement( + const std::shared_ptr<librdf_statement> pStatement( librdf_TypeConverter::mkStatement_Lock(m_pWorld.get(), stmt), safe_librdf_free_statement); OSL_ENSURE(pStatement, "mkStatement failed"); - const boost::shared_ptr<librdf_stream> pStream( + const std::shared_ptr<librdf_stream> pStream( librdf_model_find_statements_in_context(m_pModel.get(), pStatement.get(), pContext.get()), safe_librdf_free_stream); @@ -2128,24 +2128,24 @@ librdf_uri* librdf_TypeConverter::mkURI_Lock( librdf_world* i_pWorld, } // extract blank or URI node - call without Mutex locked -::boost::shared_ptr<librdf_TypeConverter::Resource> +std::shared_ptr<librdf_TypeConverter::Resource> librdf_TypeConverter::extractResource_NoLock( const uno::Reference< rdf::XResource > & i_xResource) { if (!i_xResource.is()) { - return ::boost::shared_ptr<Resource>(); + return std::shared_ptr<Resource>(); } uno::Reference< rdf::XBlankNode > xBlankNode(i_xResource, uno::UNO_QUERY); if (xBlankNode.is()) { const OString label( OUStringToOString(xBlankNode->getStringValue(), RTL_TEXTENCODING_UTF8) ); - return ::boost::shared_ptr<Resource>(new BlankNode(label)); + return std::shared_ptr<Resource>(new BlankNode(label)); } else { // assumption: everything else is URI const OString uri( OUStringToOString(i_xResource->getStringValue(), RTL_TEXTENCODING_UTF8) ); - return ::boost::shared_ptr<Resource>(new URI(uri)); + return std::shared_ptr<Resource>(new URI(uri)); } } @@ -2183,12 +2183,12 @@ librdf_node* librdf_TypeConverter::mkResource_Lock( librdf_world* i_pWorld, } // extract blank or URI or literal node - call without Mutex locked -::boost::shared_ptr<librdf_TypeConverter::Node> +std::shared_ptr<librdf_TypeConverter::Node> librdf_TypeConverter::extractNode_NoLock( const uno::Reference< rdf::XNode > & i_xNode) { if (!i_xNode.is()) { - return ::boost::shared_ptr<Node>(); + return std::shared_ptr<Node>(); } uno::Reference< rdf::XResource > xResource(i_xNode, uno::UNO_QUERY); if (xResource.is()) { @@ -2198,7 +2198,7 @@ librdf_TypeConverter::extractNode_NoLock( OSL_ENSURE(xLiteral.is(), "mkNode: someone invented a new rdf.XNode and did not tell me"); if (!xLiteral.is()) { - return ::boost::shared_ptr<Node>(); + return std::shared_ptr<Node>(); } const OString val( OUStringToOString(xLiteral->getValue(), @@ -2213,7 +2213,7 @@ librdf_TypeConverter::extractNode_NoLock( type = OUStringToOString(xType->getStringValue(), RTL_TEXTENCODING_UTF8); } - return ::boost::shared_ptr<Node>(new Literal(val, lang, type)); + return std::shared_ptr<Node>(new Literal(val, lang, type)); } // create blank or URI or literal node @@ -2235,7 +2235,7 @@ librdf_node* librdf_TypeConverter::mkNode_Lock( librdf_world* i_pWorld, reinterpret_cast<const unsigned char*>(pLiteral->value.getStr()) , NULL, 0); } else { - const boost::shared_ptr<librdf_uri> pDatatype( + const std::shared_ptr<librdf_uri> pDatatype( mkURI_Lock(i_pWorld, *pLiteral->type), safe_librdf_free_uri); ret = librdf_new_node_from_typed_literal(i_pWorld, @@ -2265,13 +2265,13 @@ librdf_TypeConverter::Statement librdf_TypeConverter::extractStatement_NoLock( const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) { - ::boost::shared_ptr<Resource> const pSubject( + std::shared_ptr<Resource> const pSubject( extractResource_NoLock(i_xSubject)); const uno::Reference<rdf::XResource> xPredicate(i_xPredicate, uno::UNO_QUERY); - ::boost::shared_ptr<URI> const pPredicate( - ::boost::dynamic_pointer_cast<URI>(extractResource_NoLock(xPredicate))); - ::boost::shared_ptr<Node> const pObject(extractNode_NoLock(i_xObject)); + std::shared_ptr<URI> const pPredicate( + std::dynamic_pointer_cast<URI>(extractResource_NoLock(xPredicate))); + std::shared_ptr<Node> const pObject(extractNode_NoLock(i_xObject)); return Statement(pSubject, pPredicate, pObject); } diff --git a/unoxml/source/xpath/nodelist.cxx b/unoxml/source/xpath/nodelist.cxx index ee71e51927d9..4b54bdfb497d 100644 --- a/unoxml/source/xpath/nodelist.cxx +++ b/unoxml/source/xpath/nodelist.cxx @@ -29,7 +29,7 @@ namespace XPath CNodeList::CNodeList( ::rtl::Reference<DOM::CDocument> const& pDocument, ::osl::Mutex & rMutex, - boost::shared_ptr<xmlXPathObject> const& rxpathObj) + std::shared_ptr<xmlXPathObject> const& rxpathObj) : m_pDocument(pDocument) , m_rMutex(rMutex) , m_pNodeSet(0) diff --git a/unoxml/source/xpath/nodelist.hxx b/unoxml/source/xpath/nodelist.hxx index 2b5da0b45aef..0e0627d307a4 100644 --- a/unoxml/source/xpath/nodelist.hxx +++ b/unoxml/source/xpath/nodelist.hxx @@ -33,7 +33,7 @@ #include "libxml/tree.h" #include "libxml/xpath.h" -#include <boost/shared_ptr.hpp> +#include <memory> namespace DOM { class CDocument; @@ -49,14 +49,14 @@ namespace XPath ::rtl::Reference< DOM::CDocument > const m_pDocument; ::osl::Mutex & m_rMutex; /// retain the result set in case the CXPathObject is released - boost::shared_ptr<xmlXPathObject> m_pXPathObj; + std::shared_ptr<xmlXPathObject> m_pXPathObj; xmlNodeSetPtr m_pNodeSet; public: CNodeList( ::rtl::Reference<DOM::CDocument> const& pDocument, ::osl::Mutex & rMutex, - boost::shared_ptr<xmlXPathObject> const& rxpathObj); + std::shared_ptr<xmlXPathObject> const& rxpathObj); /** The number of nodes in the list. */ diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index 9cca92d85e6e..fca018cfd60a 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -356,7 +356,7 @@ namespace XPath } /* Create xpath evaluation context */ - ::boost::shared_ptr<xmlXPathContext> const xpathCtx( + std::shared_ptr<xmlXPathContext> const xpathCtx( xmlXPathNewContext(pDoc), xmlXPathFreeContext); if (xpathCtx == 0) { throw XPathException(); } @@ -373,7 +373,7 @@ namespace XPath /* run the query */ OString o1 = OUStringToOString(expr, RTL_TEXTENCODING_UTF8); xmlChar const *xStr = reinterpret_cast<xmlChar const *>(o1.getStr()); - ::boost::shared_ptr<xmlXPathObject> const xpathObj( + std::shared_ptr<xmlXPathObject> const xpathObj( xmlXPathEval(xStr, xpathCtx.get()), xmlXPathFreeObject); xmlSetGenericErrorFunc(NULL, NULL); if (0 == xpathObj) { diff --git a/unoxml/source/xpath/xpathobject.cxx b/unoxml/source/xpath/xpathobject.cxx index 636f0865c2f5..59f071313d29 100644 --- a/unoxml/source/xpath/xpathobject.cxx +++ b/unoxml/source/xpath/xpathobject.cxx @@ -62,7 +62,7 @@ namespace XPath CXPathObject::CXPathObject( ::rtl::Reference<DOM::CDocument> const& pDocument, ::osl::Mutex & rMutex, - ::boost::shared_ptr<xmlXPathObject> const& pXPathObj) + std::shared_ptr<xmlXPathObject> const& pXPathObj) : m_pDocument(pDocument) , m_rMutex(rMutex) , m_pXPathObj(pXPathObj) @@ -168,7 +168,7 @@ namespace XPath { ::osl::MutexGuard const g(m_rMutex); - ::boost::shared_ptr<xmlChar const> str( + std::shared_ptr<xmlChar const> str( xmlXPathCastToString(m_pXPathObj.get()), xmlFree); sal_Char const*const pS(reinterpret_cast<sal_Char const*>(str.get())); return OUString(pS, strlen(pS), RTL_TEXTENCODING_UTF8); diff --git a/unoxml/source/xpath/xpathobject.hxx b/unoxml/source/xpath/xpathobject.hxx index 7fba073607ec..ddd954644c8c 100644 --- a/unoxml/source/xpath/xpathobject.hxx +++ b/unoxml/source/xpath/xpathobject.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_UNOXML_SOURCE_XPATH_XPATHOBJECT_HXX #define INCLUDED_UNOXML_SOURCE_XPATH_XPATHOBJECT_HXX -#include <boost/shared_ptr.hpp> +#include <memory> #include <libxml/tree.h> #include <libxml/xpath.h> @@ -45,13 +45,13 @@ namespace XPath private: ::rtl::Reference< DOM::CDocument > const m_pDocument; ::osl::Mutex & m_rMutex; - boost::shared_ptr<xmlXPathObject> const m_pXPathObj; + std::shared_ptr<xmlXPathObject> const m_pXPathObj; css::xml::xpath::XPathObjectType const m_XPathObjectType; public: CXPathObject( ::rtl::Reference<DOM::CDocument> const& pDocument, ::osl::Mutex & rMutex, - ::boost::shared_ptr<xmlXPathObject> const& pXPathObj); + std::shared_ptr<xmlXPathObject> const& pXPathObj); /** get object type |