desktop/inc/app.hxx | 4 desktop/inc/lib/init.hxx | 4 desktop/inc/pch/precompiled_deploymentgui.hxx | 2 desktop/inc/pch/precompiled_deploymentmisc.hxx | 1 desktop/inc/pch/precompiled_sofficeapp.hxx | 2 desktop/source/app/langselect.cxx | 1 desktop/source/app/officeipcthread.cxx | 3 desktop/source/app/userinstall.cxx | 1 desktop/source/deployment/gui/dp_gui_dialog2.cxx | 5 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 5 desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 4 desktop/source/deployment/gui/dp_gui_updatedata.hxx | 3 desktop/source/deployment/misc/dp_misc.cxx | 9 desktop/source/lib/init.cxx | 11 filter/source/pdf/impdialog.cxx | 2 forms/source/inc/commanddescriptionprovider.hxx | 4 forms/source/inc/commandimageprovider.hxx | 4 forms/source/solar/inc/navtoolbar.hxx | 10 formula/source/ui/dlg/formula.cxx | 1 formula/source/ui/dlg/funcpage.hxx | 1 helpcompiler/inc/HelpCompiler.hxx | 2 l10ntools/source/cfgmerge.cxx | 4 l10ntools/source/export.cxx | 4 libreofficekit/qa/unit/tiledrendering.cxx | 15 - linguistic/source/defs.hxx | 6 linguistic/source/hyphdsp.cxx | 2 linguistic/source/hyphdsp.hxx | 4 linguistic/source/spelldsp.cxx | 2 linguistic/source/spelldsp.hxx | 4 linguistic/source/thesdsp.cxx | 2 linguistic/source/thesdsp.hxx | 4 lotuswordpro/inc/pch/precompiled_lwpft.hxx | 1 lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 2 lotuswordpro/source/filter/lwpbulletstylemgr.hxx | 7 lotuswordpro/source/filter/lwpcelllayout.cxx | 4 lotuswordpro/source/filter/lwpfilter.cxx | 14 lotuswordpro/source/filter/lwpgrfobj.cxx | 4 lotuswordpro/source/filter/lwplayout.cxx | 2 lotuswordpro/source/filter/lwppara.cxx | 4 lotuswordpro/source/filter/lwppara.hxx | 4 lotuswordpro/source/filter/lwppara1.cxx | 8 lotuswordpro/source/filter/lwpparastyle.cxx | 4 lotuswordpro/source/filter/lwptablelayout.cxx | 2 mysqlc/source/mysqlc_connection.hxx | 1 oox/inc/drawingml/table/tablecell.hxx | 2 oox/inc/drawingml/table/tableproperties.hxx | 9 oox/inc/drawingml/texteffectscontext.hxx | 4 oox/inc/pch/precompiled_oox.hxx | 1 oox/source/drawingml/diagram/constraintlistcontext.cxx | 2 oox/source/drawingml/diagram/diagram.hxx | 12 oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 14 oox/source/drawingml/diagram/layoutnodecontext.cxx | 4 oox/source/drawingml/table/tablecontext.cxx | 2 oox/source/drawingml/texteffectscontext.cxx | 2 oox/source/shape/ShapeContextHandler.hxx | 8 oox/source/shape/ShapeFilterBase.hxx | 6 reportdesign/inc/ReportDefinition.hxx | 10 reportdesign/inc/RptDef.hxx | 4 reportdesign/inc/conditionalexpression.hxx | 6 reportdesign/inc/pch/precompiled_rptui.hxx | 2 reportdesign/source/core/api/ReportDefinition.cxx | 13 reportdesign/source/core/api/Section.cxx | 2 reportdesign/source/core/sdr/RptObject.cxx | 12 reportdesign/source/filter/xml/xmlfilter.hxx | 3 reportdesign/source/ui/dlg/Formula.cxx | 4 reportdesign/source/ui/inc/CondFormat.hxx | 1 reportdesign/source/ui/inc/DesignView.hxx | 1 reportdesign/source/ui/inc/Formula.hxx | 6 reportdesign/source/ui/inc/FunctionHelper.hxx | 10 reportdesign/source/ui/inc/MarkedSection.hxx | 2 reportdesign/source/ui/inc/ReportController.hxx | 6 reportdesign/source/ui/inc/ReportSection.hxx | 3 reportdesign/source/ui/inc/ReportWindow.hxx | 1 reportdesign/source/ui/inc/ScrollHelper.hxx | 1 reportdesign/source/ui/inc/SectionWindow.hxx | 1 reportdesign/source/ui/inspection/DataProviderHandler.cxx | 2 reportdesign/source/ui/misc/FunctionHelper.cxx | 12 reportdesign/source/ui/misc/UITools.cxx | 4 reportdesign/source/ui/report/FixedTextColor.cxx | 32 +- reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 2 reportdesign/source/ui/report/ReportController.cxx | 10 reportdesign/source/ui/report/ReportWindow.cxx | 1 sax/source/fastparser/fastparser.cxx | 22 - sax/source/tools/CachedOutputStream.hxx | 6 sax/source/tools/fastserializer.cxx | 4 sax/source/tools/fastserializer.hxx | 14 sfx2/inc/pch/precompiled_sfx.hxx | 2 sfx2/qa/cppunit/test_metadatable.cxx | 6 sfx2/source/appl/app.cxx | 4 sfx2/source/appl/appserv.cxx | 10 sfx2/source/appl/appuno.cxx | 6 sfx2/source/appl/childwin.cxx | 4 sfx2/source/appl/macroloader.cxx | 4 sfx2/source/config/evntconf.cxx | 4 sfx2/source/control/bindings.cxx | 3 sfx2/source/control/thumbnailview.cxx | 4 sfx2/source/control/unoctitm.cxx | 5 sfx2/source/dialog/dinfdlg.cxx | 1 sfx2/source/dialog/itemconnect.cxx | 9 sfx2/source/dialog/templdlg.cxx | 4 sfx2/source/dialog/versdlg.cxx | 1 sfx2/source/doc/docfile.cxx | 4 sfx2/source/doc/graphhelp.cxx | 4 sfx2/source/doc/guisaveas.cxx | 4 sfx2/source/doc/objmisc.cxx | 4 sfx2/source/doc/objserv.cxx | 2 sfx2/source/doc/oleprops.hxx | 8 sfx2/source/inc/docundomanager.hxx | 4 sfx2/source/toolbox/imgmgr.cxx | 6 sfx2/source/view/viewprn.cxx | 1 sot/inc/pch/precompiled_sot.hxx | 1 sot/source/sdstor/storage.cxx | 3 sot/source/sdstor/ucbstorage.cxx | 15 - svl/inc/pch/precompiled_svl.hxx | 1 svl/qa/unit/svl.cxx | 12 svl/source/inc/poolio.hxx | 4 svl/source/items/itempool.cxx | 1 svl/source/items/itemprop.cxx | 4 svl/source/items/poolio.cxx | 4 svl/source/misc/getstringresource.cxx | 5 svl/source/numbers/zforlist.cxx | 16 - svl/source/numbers/zformat.cxx | 1 svtools/inc/pch/precompiled_svt.hxx | 2 svtools/qa/unit/GraphicObjectTest.cxx | 1 svtools/source/control/roadmap.cxx | 1 svtools/source/table/tablecontrol_impl.hxx | 2 unoxml/inc/pch/precompiled_unoxml.hxx | 1 unoxml/source/dom/attr.cxx | 4 unoxml/source/dom/characterdata.cxx | 10 unoxml/source/dom/documentbuilder.cxx | 6 unoxml/source/dom/element.cxx | 10 unoxml/source/rdf/librdf_repository.cxx | 186 ++++++------- unoxml/source/xpath/nodelist.cxx | 2 unoxml/source/xpath/nodelist.hxx | 6 unoxml/source/xpath/xpathapi.cxx | 4 unoxml/source/xpath/xpathobject.cxx | 4 unoxml/source/xpath/xpathobject.hxx | 6 137 files changed, 394 insertions(+), 468 deletions(-)
New commits: commit eaf2c278888ebca0ac99055ee34df6f011da3596 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Sep 17 09:21:43 2015 +0100 boost->std Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 068c27e..184c86f 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 b17f825..3f4d680 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 b2b593b..3c4ae1e 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 2eae9cd..f2fcae9 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 c4c2e70..40dca82 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 977c657..32240d0 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 9cc3ce4..eeb4913 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 3cb4d39..86cf478 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 fea7d6b..a9c0811 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 39ffeff..359b46e 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 f18cf82..29b6891 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 1f6d523..3b75b80 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 2c0a165..1b2132c 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 8747145..0461823 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 5cb213e..6126cdd 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 8369e18..75a695b 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 9c7107b..21cc14a 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 1455d9b..9cdd7c9 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 09663f3..a115918 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 0f85df0..98ad3d3 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 0b0b0fa..6982b11 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 de7ccea..b8724ca 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 a56e1a9..593801d 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 515fe8e0..d176c3b 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 ba67076..ab86dfb 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 fc93d5d..ae0da99 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 f887dab..8360e32 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 83bfbad..70cb45f2 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 c50ec33..1b99c7d 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 2ccb855..a0027a1 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 bd15233..f16ee02 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 ae9daf31..fe3db8d 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 c77114f..01250b9 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 a256a89..98a83ab 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 68ff39c..fcf84ef 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 8f93df0..f84f700 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 4499b53..becdbec 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 a08e1f0..1d51cc2 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 981aab9..4718f42 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 d9e0a31..b0d2487 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 50866f0..5784d34 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 9d67ea9..b83e517 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 7d6e844..c41e039 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 aeb9686..511e901 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 f5916c4..b7f297a 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 eb3ba78..21550bb 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 b8e3aeb..8251926 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 7b81b90..623b192 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 177a6aa..602f8fe 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 259ca3c..9811c7f 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 5d20256..b27216a 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 c920706..cc3bb6a 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 ac6a862..30bab79 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 e996e1a..28a4b98 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 72b9f88..ca9aecf 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 06d4722..171e274 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 d5b8532..9e1b619 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 348a8cf..9e310e6a 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 04270c7..6ffaad7 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 d917616..71533bc 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 e6b317f..c7c9ffb 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 c5b1443..3163c6f 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 00611a8..ed997d9 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 bfd381c..a06a990 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 6e94536..6ee1da8 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 56da7f6..b961e5c 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 e756f8c..3825ac3 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 1455d7e..1a02452 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 042e0a9..43ce8bf 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 1d558da..4286224 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 b53f1b3..508bed2 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 8253c11..b606808 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 7c974bd..fd9eaab 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 373c7a3..54a88b0 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 70a693a..5e232a1 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 ce18a3e..6f7fb26 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 925fa01..d14ee0a 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 29b8063..b6fc5c3 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 800669b..05ccf2f 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 9203b9e..16ba46e 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 f706f88..b72523f 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 3ef67d9..cd907eb 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 04ec931..86cc858 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 f116978..f32693e 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 32c0358..0d0eb71 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 1f30313..d5925fd 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 b4e6f5d..03bf69d 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 e611c61..fc57dea 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 f77141f..121bc98 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 0021c8e..1d6798d 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 69eead5..28f7f0a 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 4ba7106..988e28b 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> ... etc. - the rest is truncated
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits