[Libreoffice-commits] core.git: 2 commits - dbaccess/inc dbaccess/qa dbaccess/source sw/inc sw/qa sw/source uui/inc uui/source
Caolán McNamara
caolanm at redhat.com
Thu Sep 17 06:12:34 PDT 2015
dbaccess/inc/pch/precompiled_dba.hxx | 1
dbaccess/inc/pch/precompiled_dbaxml.hxx | 1
dbaccess/inc/pch/precompiled_dbu.hxx | 2
dbaccess/inc/pch/precompiled_sdbt.hxx | 1
dbaccess/qa/unit/embeddeddb_performancetest.cxx | 6 +-
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 8 +-
dbaccess/source/core/dataaccess/databasecontext.hxx | 2
dbaccess/source/core/dataaccess/databasedocument.hxx | 1
dbaccess/source/core/dataaccess/intercept.cxx | 4 -
dbaccess/source/core/inc/ContentHelper.hxx | 4 -
dbaccess/source/core/inc/containerapprove.hxx | 4 -
dbaccess/source/filter/xml/xmlExport.cxx | 8 +-
dbaccess/source/sdbtools/connection/objectnames.cxx | 4 -
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 6 +-
dbaccess/source/ui/app/AppIconControl.cxx | 4 -
dbaccess/source/ui/app/AppTitleWindow.cxx | 1
dbaccess/source/ui/app/AppView.cxx | 1
dbaccess/source/ui/browser/brwview.cxx | 1
dbaccess/source/ui/browser/dbtreeview.cxx | 1
dbaccess/source/ui/browser/genericcontroller.cxx | 1
dbaccess/source/ui/browser/sbagrid.cxx | 4 -
dbaccess/source/ui/control/FieldDescControl.cxx | 1
dbaccess/source/ui/dlg/sqlmessage.cxx | 24 ++++----
dbaccess/source/ui/inc/DExport.hxx | 2
dbaccess/source/ui/inc/RelationDlg.hxx | 4 -
dbaccess/source/ui/inc/TableConnectionData.hxx | 4 -
dbaccess/source/ui/inc/TableController.hxx | 4 -
dbaccess/source/ui/inc/TableRowExchange.hxx | 6 +-
dbaccess/source/ui/inc/TableWindowData.hxx | 4 -
dbaccess/source/ui/inc/TypeInfo.hxx | 4 -
dbaccess/source/ui/inc/adtabdlg.hxx | 4 -
dbaccess/source/ui/inc/databaseobjectview.hxx | 2
dbaccess/source/ui/inc/dsmeta.hxx | 4 -
dbaccess/source/ui/inc/imageprovider.hxx | 4 -
dbaccess/source/ui/inc/propertystorage.hxx | 4 -
dbaccess/source/ui/inc/tabletree.hxx | 4 -
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 2
dbaccess/source/ui/misc/propertystorage.cxx | 4 -
dbaccess/source/ui/misc/singledoccontroller.cxx | 2
dbaccess/source/ui/querydesign/JoinController.cxx | 3 -
dbaccess/source/ui/querydesign/JoinTableView.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 12 ++--
dbaccess/source/ui/querydesign/QueryTextView.cxx | 1
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 1
dbaccess/source/ui/querydesign/TableWindow.cxx | 2
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 4 -
dbaccess/source/ui/relationdesign/RelationController.cxx | 6 +-
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 2
dbaccess/source/ui/tabledesign/TEditControl.cxx | 42 +++++++-------
dbaccess/source/ui/tabledesign/TEditControl.hxx | 10 +--
dbaccess/source/ui/tabledesign/TableController.cxx | 36 ++++++------
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 2
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 4 -
dbaccess/source/ui/tabledesign/TableFieldControl.cxx | 2
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 1
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 8 +-
dbaccess/source/ui/tabledesign/TableUndo.cxx | 44 +++++++--------
dbaccess/source/ui/tabledesign/TableUndo.hxx | 6 +-
sw/inc/IDocumentExternalData.hxx | 4 -
sw/inc/IDocumentMarkAccess.hxx | 6 +-
sw/inc/IMark.hxx | 18 +++---
sw/inc/comcore.hrc | 1
sw/inc/doc.hxx | 1
sw/inc/fesh.hxx | 1
sw/inc/flypos.hxx | 8 +-
sw/inc/fmtmeta.hxx | 11 +--
sw/inc/ndgrf.hxx | 7 +-
sw/inc/numrule.hxx | 2
sw/inc/pch/precompiled_msword.hxx | 1
sw/inc/pch/precompiled_sw.hxx | 2
sw/inc/pch/precompiled_swui.hxx | 1
sw/inc/pch/precompiled_vbaswobj.hxx | 1
sw/inc/txtfld.hxx | 4 -
sw/inc/undobj.hxx | 4 -
sw/inc/viewsh.hxx | 4 -
sw/qa/extras/inc/swmodeltestbase.hxx | 2
sw/qa/extras/uiwriter/uiwriter.cxx | 2
sw/source/core/doc/docbasic.cxx | 6 +-
sw/source/core/doc/docbm.cxx | 31 +++++-----
sw/source/core/doc/docdesc.cxx | 2
sw/source/core/doc/docfly.cxx | 6 +-
sw/source/core/doc/docglbl.cxx | 4 -
sw/source/core/doc/doclay.cxx | 43 +++++++++++---
sw/source/core/doc/docnew.cxx | 2
sw/source/core/doc/tblcpy.cxx | 4 -
sw/source/core/docnode/observablethread.cxx | 6 +-
sw/source/core/docnode/retrievedinputstreamdata.cxx | 4 -
sw/source/core/docnode/threadmanager.cxx | 2
sw/source/core/edit/autofmt.cxx | 6 +-
sw/source/core/edit/eddel.cxx | 6 +-
sw/source/core/frmedt/fecopy.cxx | 4 -
sw/source/core/frmedt/feflyole.cxx | 5 +
sw/source/core/frmedt/feshview.cxx | 3 +
sw/source/core/inc/MarkManager.hxx | 2
sw/source/core/inc/UndoManager.hxx | 6 +-
sw/source/core/inc/UndoNumbering.hxx | 1
sw/source/core/inc/observablethread.hxx | 7 +-
sw/source/core/inc/retrievedinputstreamdata.hxx | 9 +--
sw/source/core/inc/threadmanager.hxx | 7 +-
sw/source/core/txtnode/atrfld.cxx | 4 -
sw/source/core/txtnode/fmtatr2.cxx | 14 ++--
sw/source/core/undo/docundo.cxx | 2
sw/source/core/undo/untblk.cxx | 2
sw/source/core/unocore/unofield.cxx | 2
sw/source/core/unocore/unoportenum.cxx | 10 +--
sw/source/core/unocore/unorefmk.cxx | 6 +-
sw/source/ui/app/app.src | 5 +
sw/source/ui/dbui/addresslistdialog.cxx | 2
sw/source/ui/dbui/createaddresslistdialog.cxx | 1
sw/source/ui/dbui/mmaddressblockpage.cxx | 1
sw/source/ui/dbui/mmdocselectpage.cxx | 1
sw/source/ui/dbui/mmgreetingspage.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 1
sw/source/ui/dbui/mmoutputtypepage.cxx | 1
sw/source/ui/dbui/selectdbtabledialog.cxx | 1
sw/source/ui/dialog/uiregionsw.cxx | 8 +-
sw/source/ui/envelp/envfmt.cxx | 3 -
sw/source/ui/envelp/envprt.cxx | 1
sw/source/ui/envelp/labfmt.cxx | 1
sw/source/ui/envelp/labprt.cxx | 1
sw/source/ui/fldui/DropDownFieldDialog.cxx | 4 -
sw/source/ui/fldui/fldedt.cxx | 4 -
sw/source/ui/frmdlg/frmpage.cxx | 6 +-
sw/source/ui/index/cnttab.cxx | 1
sw/source/ui/index/swuiidxmrk.cxx | 1
sw/source/ui/misc/docfnote.cxx | 6 +-
sw/source/ui/misc/glossary.cxx | 6 +-
sw/source/ui/misc/insfnote.cxx | 4 -
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/misc/pgfnote.cxx | 4 -
sw/source/ui/misc/srtdlg.cxx | 4 -
sw/source/ui/table/convert.cxx | 4 -
sw/source/ui/table/instable.cxx | 4 -
sw/source/ui/table/tautofmt.cxx | 1
sw/source/ui/vba/vbadocumentproperties.cxx | 14 ++--
sw/source/uibase/app/appenv.cxx | 4 -
sw/source/uibase/app/applab.cxx | 8 +-
sw/source/uibase/app/docsh2.cxx | 10 +--
sw/source/uibase/app/docshini.cxx | 4 -
sw/source/uibase/app/swdllimpl.hxx | 4 -
sw/source/uibase/app/swmodul1.cxx | 4 -
sw/source/uibase/dbui/dbmgr.cxx | 10 +--
sw/source/uibase/dialog/regionsw.cxx | 10 +--
sw/source/uibase/dochdl/gloshdl.cxx | 8 +-
sw/source/uibase/dochdl/swdtflvr.cxx | 25 ++++----
sw/source/uibase/docvw/AnnotationWin.cxx | 6 +-
sw/source/uibase/docvw/DashedLine.cxx | 4 -
sw/source/uibase/docvw/HeaderFooterWin.cxx | 4 -
sw/source/uibase/docvw/PageBreakWin.cxx | 4 -
sw/source/uibase/docvw/PostItMgr.cxx | 4 -
sw/source/uibase/docvw/SidebarTxtControl.cxx | 4 -
sw/source/uibase/docvw/SidebarWin.cxx | 6 +-
sw/source/uibase/docvw/edtwin.cxx | 3 -
sw/source/uibase/lingu/hyp.cxx | 4 -
sw/source/uibase/misc/glosdoc.cxx | 6 +-
sw/source/uibase/misc/glshell.cxx | 4 -
sw/source/uibase/misc/redlndlg.cxx | 4 -
sw/source/uibase/shells/annotsh.cxx | 10 +--
sw/source/uibase/shells/basesh.cxx | 22 +++----
sw/source/uibase/shells/drawdlg.cxx | 8 +-
sw/source/uibase/shells/drawsh.cxx | 1
sw/source/uibase/shells/drwbassh.cxx | 10 +--
sw/source/uibase/shells/drwtxtex.cxx | 6 +-
sw/source/uibase/shells/drwtxtsh.cxx | 6 +-
sw/source/uibase/shells/frmsh.cxx | 8 +-
sw/source/uibase/shells/grfsh.cxx | 4 -
sw/source/uibase/shells/langhelper.cxx | 4 -
sw/source/uibase/shells/mediash.cxx | 6 +-
sw/source/uibase/shells/tabsh.cxx | 20 +++---
sw/source/uibase/shells/textfld.cxx | 10 +--
sw/source/uibase/shells/textidx.cxx | 10 +--
sw/source/uibase/shells/textsh1.cxx | 18 +++---
sw/source/uibase/shells/textsh2.cxx | 4 -
sw/source/uibase/shells/txtattr.cxx | 4 -
sw/source/uibase/shells/txtnum.cxx | 4 -
sw/source/uibase/sidebar/PagePropertyPanel.hxx | 13 ++--
sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 1
sw/source/uibase/table/tablemgr.cxx | 4 -
sw/source/uibase/uiview/pview.cxx | 4 -
sw/source/uibase/uiview/view0.cxx | 8 +-
sw/source/uibase/uiview/view2.cxx | 12 ++--
sw/source/uibase/uiview/viewdlg2.cxx | 6 +-
sw/source/uibase/uiview/viewling.cxx | 6 +-
sw/source/uibase/uiview/viewsrch.cxx | 4 -
sw/source/uibase/uno/SwXFilterOptions.cxx | 6 +-
sw/source/uibase/uno/unoatxt.cxx | 28 ++++-----
sw/source/uibase/uno/unomailmerge.cxx | 4 -
sw/source/uibase/uno/unotxdoc.cxx | 4 -
sw/source/uibase/utlui/content.cxx | 4 -
sw/source/uibase/utlui/glbltree.cxx | 16 ++---
sw/source/uibase/utlui/navipi.cxx | 6 +-
sw/source/uibase/utlui/numfmtlb.cxx | 4 -
uui/inc/pch/precompiled_uui.hxx | 1
uui/source/iahndl-authentication.cxx | 10 +--
uui/source/iahndl-errorhandler.cxx | 4 -
uui/source/iahndl-filter.cxx | 1
uui/source/iahndl-locking.cxx | 8 +-
uui/source/iahndl-ssl.cxx | 6 +-
uui/source/iahndl.cxx | 10 +--
199 files changed, 576 insertions(+), 605 deletions(-)
New commits:
commit 3647626309ef89bf90d8b6a6539d41d8deb6b482
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 17 13:55:28 2015 +0100
Give drawing objects unique names by default
when created through the UI, similar to how
frames and graphics get names.
This way they appear in the navigator by default
Change-Id: I5ec92221583494a0908948d6d0c0815980cb7050
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 5b26deb..f56dd08 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -39,6 +39,7 @@
#define STR_MULT_INTERACT_SPELL_WARN (RC_COMCORE_BEGIN + 14)
#define STR_SPELL_TITLE (RC_COMCORE_BEGIN + 15)
#define STR_HYPH_TITLE (RC_COMCORE_BEGIN + 16)
+#define STR_SHAPE_DEFNAME (RC_COMCORE_BEGIN + 17)
#define STR_REDLINE_INSERT (RC_COMCORE_BEGIN + 19)
#define STR_REDLINE_DELETE (RC_COMCORE_BEGIN + 20)
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 3b4d99a..1bbca5b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -729,6 +729,7 @@ public:
OUString GetUniqueGrfName() const;
OUString GetUniqueOLEName() const;
OUString GetUniqueFrameName() const;
+ OUString GetUniqueShapeName() const;
std::set<SwRootFrm*> GetAllLayouts();
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 2cda774..a219ac1 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -463,6 +463,7 @@ public:
OUString GetUniqueGrfName() const;
OUString GetUniqueOLEName() const;
OUString GetUniqueFrameName() const;
+ OUString GetUniqueShapeName() const;
/// Jump to named Fly (graphic/OLE).
bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL,
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index dc42c5c..93a8628 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1263,7 +1263,7 @@ SwFlyFrameFormat* SwDoc::InsertDrawLabel(
return pNewFormat;
}
-static OUString lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId )
+static OUString lcl_GetUniqueFlyName(const SwDoc* pDoc, sal_uInt16 nDefStrId, RES_FMT eType)
{
if( pDoc->IsInMailMerge())
{
@@ -1284,11 +1284,23 @@ static OUString lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId )
for( SwFrameFormats::size_type n = 0; n < rFormats.size(); ++n )
{
const SwFrameFormat* pFlyFormat = rFormats[ n ];
- if( RES_FLYFRMFMT == pFlyFormat->Which() &&
- pFlyFormat->GetName().startsWith( aName ) )
+ if (eType != pFlyFormat->Which())
+ continue;
+ OUString sName;
+ if (eType == RES_DRAWFRMFMT)
+ {
+ const SdrObject *pObj = pFlyFormat->FindSdrObject();
+ if (pObj)
+ sName = pObj->GetName();
+ }
+ else
+ {
+ sName = pFlyFormat->GetName();
+ }
+ if (sName.startsWith(aName))
{
// Only get and set the Flag
- const sal_Int32 nNum = pFlyFormat->GetName().copy( nNmLen ).toInt32()-1;
+ const sal_Int32 nNum = sName.copy(nNmLen).toInt32()-1;
if( nNum >= 0 && static_cast<SwFrameFormats::size_type>(nNum) < rFormats.size() )
aSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
}
@@ -1314,17 +1326,22 @@ static OUString lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId )
OUString SwDoc::GetUniqueGrfName() const
{
- return lcl_GetUniqueFlyName( this, STR_GRAPHIC_DEFNAME );
+ return lcl_GetUniqueFlyName(this, STR_GRAPHIC_DEFNAME, RES_FLYFRMFMT);
}
OUString SwDoc::GetUniqueOLEName() const
{
- return lcl_GetUniqueFlyName( this, STR_OBJECT_DEFNAME );
+ return lcl_GetUniqueFlyName(this, STR_OBJECT_DEFNAME, RES_FLYFRMFMT);
}
OUString SwDoc::GetUniqueFrameName() const
{
- return lcl_GetUniqueFlyName( this, STR_FRAME_DEFNAME );
+ return lcl_GetUniqueFlyName(this, STR_FRAME_DEFNAME, RES_FLYFRMFMT);
+}
+
+OUString SwDoc::GetUniqueShapeName() const
+{
+ return lcl_GetUniqueFlyName(this, STR_SHAPE_DEFNAME, RES_DRAWFRMFMT);
}
const SwFlyFrameFormat* SwDoc::FindFlyByName( const OUString& rName, sal_Int8 nNdTyp ) const
@@ -1362,12 +1379,18 @@ void SwDoc::SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName )
sal_uInt16 nTyp = STR_FRAME_DEFNAME;
const SwNodeIndex* pIdx = rFormat.GetContent().GetContentIdx();
if( pIdx && pIdx->GetNode().GetNodes().IsDocNodes() )
+ {
switch( GetNodes()[ pIdx->GetIndex() + 1 ]->GetNodeType() )
{
- case ND_GRFNODE: nTyp = STR_GRAPHIC_DEFNAME; break;
- case ND_OLENODE: nTyp = STR_OBJECT_DEFNAME; break;
+ case ND_GRFNODE:
+ nTyp = STR_GRAPHIC_DEFNAME;
+ break;
+ case ND_OLENODE:
+ nTyp = STR_OBJECT_DEFNAME;
+ break;
}
- sName = lcl_GetUniqueFlyName( this, nTyp );
+ }
+ sName = lcl_GetUniqueFlyName(this, nTyp, RES_FLYFRMFMT);
}
rFormat.SetName( sName, true );
getIDocumentState().SetModified();
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx
index 2faaab0..ca5b36f 100644
--- a/sw/source/core/frmedt/feflyole.cxx
+++ b/sw/source/core/frmedt/feflyole.cxx
@@ -92,6 +92,11 @@ OUString SwFEShell::GetUniqueFrameName() const
return GetDoc()->GetUniqueFrameName();
}
+OUString SwFEShell::GetUniqueShapeName() const
+{
+ return GetDoc()->GetUniqueShapeName();
+}
+
bool SwFEShell::FinishOLEObj() // Server is terminated
{
SfxInPlaceClient* pIPClient = GetSfxViewShell()->GetIPClient();
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 9000746..473f686 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1858,6 +1858,9 @@ bool SwFEShell::ImpEndCreate()
pAnch = pTmp;
}
+ if (rSdrObj.GetName().isEmpty())
+ rSdrObj.SetName(GetUniqueShapeName());
+
pContact->ConnectToLayout();
// mark object at frame the object is inserted at.
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index c4fee49..b60a7b0 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -396,6 +396,11 @@ String STR_FRAME_DEFNAME
Text [ en-US ] = "Frame" ;
};
+String STR_SHAPE_DEFNAME
+{
+ Text [ en-US ] = "Shape" ;
+};
+
String STR_REGION_DEFNAME
{
Text [ en-US ] = "Section" ;
commit ddc280920282ff3e2801e9a79f9dfa8a6c6f5699
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 17 11:30:13 2015 +0100
boost->std
Change-Id: Idfbcfa1e5ba7bff92e98693c33c4b33a6beda08f
diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx
index 0e5c763..bbc3909 100644
--- a/dbaccess/inc/pch/precompiled_dba.hxx
+++ b/dbaccess/inc/pch/precompiled_dba.hxx
@@ -24,7 +24,6 @@
#include <boost/bind.hpp>
#include <boost/noncopyable.hpp>
#include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/awt/DialogProvider.hpp>
#include <com/sun/star/awt/FontEmphasisMark.hpp>
#include <com/sun/star/awt/FontRelief.hpp>
diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx b/dbaccess/inc/pch/precompiled_dbaxml.hxx
index d4d2258..fa57699 100644
--- a/dbaccess/inc/pch/precompiled_dbaxml.hxx
+++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx
@@ -17,7 +17,6 @@
#include "sal/config.h"
#include <boost/noncopyable.hpp>
#include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/TextAlign.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx
index 9a4fa62..4f57dfa 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -31,8 +31,6 @@
#include <boost/noncopyable.hpp>
#include <boost/optional.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include <cassert>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
diff --git a/dbaccess/inc/pch/precompiled_sdbt.hxx b/dbaccess/inc/pch/precompiled_sdbt.hxx
index effddd5..3adffcb 100644
--- a/dbaccess/inc/pch/precompiled_sdbt.hxx
+++ b/dbaccess/inc/pch/precompiled_sdbt.hxx
@@ -16,7 +16,6 @@
#include <algorithm>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdb/ErrorCondition.hpp>
diff --git a/dbaccess/qa/unit/embeddeddb_performancetest.cxx b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
index a639d72..1af38cf 100644
--- a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
+++ b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
@@ -9,7 +9,7 @@
#include "dbtest_base.cxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <osl/file.hxx>
#include <osl/process.h>
#include <osl/time.h>
@@ -261,7 +261,7 @@ void EmbeddedDBPerformanceTest::performPreparedStatementInsertTest(
uno::Reference< XParameters > xParameters(xPreparedStatement, UNO_QUERY_THROW);
- ::boost::scoped_ptr< SvFileStream > pFile(getWordListStream());
+ std::unique_ptr< SvFileStream > pFile(getWordListStream());
OUString aWord;
sal_Int32 aID = 0;
@@ -297,7 +297,7 @@ void EmbeddedDBPerformanceTest::performStatementInsertTest(
uno::Reference< XStatement > xStatement =
xConnection->createStatement();
- ::boost::scoped_ptr< SvFileStream > pFile(getWordListStream());
+ std::unique_ptr< SvFileStream > pFile(getWordListStream());
OUString aWord;
sal_Int32 aID = 0;
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index b1cddd8..9504d74 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -57,7 +57,7 @@
#include <unotools/configmgr.hxx>
#include <unotools/sharedunocomponent.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::dbaccess;
using namespace ::dbtools;
@@ -657,7 +657,7 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const
aClauses.push_back( getSQLPart( eLoopParts, m_aSqlIterator, true ) );
// overwrite the one part in question here
- boost::scoped_ptr< TokenComposer > pComposer;
+ std::unique_ptr< TokenComposer > pComposer;
if ( ( _ePart == Where ) || ( _ePart == Having ) )
pComposer.reset( new FilterCreator );
else
@@ -789,7 +789,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
OUString sSQL( aSQL.makeStringAndClear() );
// normalize the statement so that it doesn't contain any application-level features anymore
OUString sError;
- const boost::scoped_ptr< OSQLParseNode > pStatementTree( m_aSqlParser.parseTree( sError, sSQL ) );
+ const std::unique_ptr< OSQLParseNode > pStatementTree( m_aSqlParser.parseTree( sError, sSQL ) );
OSL_ENSURE( pStatementTree.get(), "OSingleSelectQueryComposer::getColumns: could not parse the column retrieval statement!" );
if ( pStatementTree.get() )
if ( !pStatementTree->parseNodeToExecutableStatement( sSQL, m_xConnection, m_aSqlParser, NULL ) )
@@ -1737,7 +1737,7 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
const OSQLParseNode* pTempNode = m_aAdditiveIterator.getParseTree();
OUString aErrorMsg;
- boost::scoped_ptr<OSQLParseNode> pSqlParseNode( m_aSqlParser.parseTree(aErrorMsg,aSql));
+ std::unique_ptr<OSQLParseNode> pSqlParseNode( m_aSqlParser.parseTree(aErrorMsg,aSql));
if ( pSqlParseNode.get() )
{
m_aAdditiveIterator.setParseTree(pSqlParseNode.get());
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index b5e18ba..f190dea 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -45,8 +45,6 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-#include <boost/shared_ptr.hpp>
-
// needed for registration
namespace com { namespace sun { namespace star {
namespace lang
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 8d23ad3..0b5a75d 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -59,7 +59,6 @@
#include <cppuhelper/implbase3.hxx>
#include <rtl/ref.hxx>
-#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
namespace comphelper {
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 07d14d5..4513391 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -30,7 +30,7 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace dbaccess
{
@@ -179,7 +179,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal
IMPL_LINK_TYPED( OInterceptor, OnDispatch, void*, _pDispatcher, void )
{
- boost::scoped_ptr<DispatchHelper> pHelper( static_cast< DispatchHelper* >( _pDispatcher ) );
+ std::unique_ptr<DispatchHelper> pHelper( static_cast< DispatchHelper* >( _pDispatcher ) );
try
{
if ( m_pContentHolder && m_pContentHolder->prepareClose() && m_xSlaveDispatchProvider.is() )
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index 3534bd1..f40579b 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -38,7 +38,7 @@
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/sdbcx/XRename.hpp>
#include <connectivity/sqlerror.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace com { namespace sun { namespace star { namespace beans {
struct PropertyValue;
@@ -75,7 +75,7 @@ namespace dbaccess
ODatabaseModelImpl* m_pDataSource; // this will stay alive as long as the content exists
};
- typedef ::boost::shared_ptr<OContentHelper_Impl> TContentPtr;
+ typedef std::shared_ptr<OContentHelper_Impl> TContentPtr;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyChangeListenerContainer;
diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx
index 1bc051d..8c81e97 100644
--- a/dbaccess/source/core/inc/containerapprove.hxx
+++ b/dbaccess/source/core/inc/containerapprove.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/uno/XInterface.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace dbaccess
{
@@ -56,7 +56,7 @@ namespace dbaccess
) = 0;
};
- typedef ::boost::shared_ptr< IContainerApprove > PContainerApprove;
+ typedef std::shared_ptr< IContainerApprove > PContainerApprove;
} // namespace dbaccess
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 62b2900..1e7ed78 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -53,7 +53,7 @@
#include <connectivity/dbtools.hxx>
#include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace dbaxml
{
@@ -833,7 +833,7 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection
{
if ( _xCollection.is() )
{
- boost::scoped_ptr<SvXMLElementExport> pComponents;
+ std::unique_ptr<SvXMLElementExport> pComponents;
if ( _bExportContext )
pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB, _eComponents, true, true));
Sequence< OUString> aSeq = _xCollection->getElementNames();
@@ -1113,7 +1113,7 @@ void ODBExport::exportQueries(bool _bExportContext)
Reference< XNameAccess > xCollection = xSup->getQueryDefinitions();
if ( xCollection.is() && xCollection->hasElements() )
{
- boost::scoped_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
+ std::unique_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
if ( _bExportContext )
pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportQuery) );
else
@@ -1133,7 +1133,7 @@ void ODBExport::exportTables(bool _bExportContext)
Reference< XNameAccess > xCollection = xSup->getTables();
if ( xCollection.is() && xCollection->hasElements() )
{
- boost::scoped_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
+ std::unique_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
if ( _bExportContext )
pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportTable) );
else
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index 500a603..91b4065 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -35,7 +35,7 @@
#include <rtl/ustrbuf.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace sdbtools
{
@@ -69,7 +69,7 @@ namespace sdbtools
virtual ~INameValidation() { }
};
- typedef ::boost::shared_ptr< INameValidation > PNameValidation;
+ typedef std::shared_ptr< INameValidation > PNameValidation;
// PlainExistenceCheck
class PlainExistenceCheck : public INameValidation
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index c3e6828..0228f6b 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -67,7 +67,7 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::dbaui;
using namespace ::com::sun::star::container;
@@ -1118,7 +1118,7 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName,
}
Reference< XDatabaseDocumentUI > xApplication( getBorderWin().getView()->getAppController().getXController(), UNO_QUERY );
- boost::scoped_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser(
+ std::unique_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser(
getBorderWin().getView()->getORB(),
xApplication, NULL, _bTable
) );
@@ -1164,7 +1164,7 @@ IMPL_LINK_NOARG_TYPED(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void)
m_aTBPreview->Update();
// execute the menu
- boost::scoped_ptr<PopupMenu> aMenu(new PopupMenu( ModuleRes( RID_MENU_APP_PREVIEW ) ));
+ std::unique_ptr<PopupMenu> aMenu(new PopupMenu( ModuleRes( RID_MENU_APP_PREVIEW ) ));
sal_uInt16 pActions[] = { SID_DB_APP_DISABLE_PREVIEW
, SID_DB_APP_VIEW_DOC_PREVIEW
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index d37b0a1..a78910f 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -25,7 +25,7 @@
#include <vcl/image.hxx>
#include "callbacks.hxx"
#include "AppElementType.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::dbaui;
// class OApplicationIconControl
@@ -73,7 +73,7 @@ void OApplicationIconControl::dispose()
SvxIconChoiceCtrlEntry* pEntry = GetEntry( i );
if ( pEntry )
{
- boost::scoped_ptr<ElementType> aType(static_cast<ElementType*>(pEntry->GetUserData()));
+ std::unique_ptr<ElementType> aType(static_cast<ElementType*>(pEntry->GetUserData()));
pEntry->SetUserData(NULL);
}
}
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 19da267..764656c 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -22,7 +22,6 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <tools/debug.hxx>
-#include <boost/scoped_ptr.hpp>
namespace dbaui
{
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 1ce3a3f..363d111 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -44,7 +44,6 @@
#include "browserids.hxx"
#include <unotools/pathoptions.hxx>
#include "IApplicationController.hxx"
-#include <boost/scoped_ptr.hpp>
using namespace ::dbaui;
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index aad77d2..7a93fe3 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/awt/XControlContainer.hpp>
#include "UITools.hxx"
#include <osl/diagnose.h>
-#include <boost/scoped_ptr.hpp>
using namespace dbaui;
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 8f252fb..19d25d17 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -22,7 +22,6 @@
#include "dbtreelistbox.hxx"
#include "dbtreemodel.hxx"
#include "dbaccess_helpid.hrc"
-#include <boost/scoped_ptr.hpp>
namespace dbaui
{
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 8811b5b..2c375e8 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -58,7 +58,6 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <rtl/ustring.hxx>
#include <o3tl/functional.hxx>
-#include <boost/scoped_ptr.hpp>
#include <cppuhelper/implbase1.hxx>
#include <limits>
#include <unordered_map>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index a1f1b70..deb636a 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -691,9 +691,9 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM
if(!xField.is())
break;
- ::std::vector< ::boost::shared_ptr<OTableRow> > vClipboardList;
+ ::std::vector< std::shared_ptr<OTableRow> > vClipboardList;
// send it to the clipboard
- vClipboardList.push_back(::boost::shared_ptr<OTableRow>(new OTableRow(xField)));
+ vClipboardList.push_back(std::shared_ptr<OTableRow>(new OTableRow(xField)));
OTableRowExchange* pData = new OTableRowExchange(vClipboardList);
Reference< css::datatransfer::XTransferable> xRef = pData;
pData->CopyToClipboard(GetParent());
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 92cde5c..92a4dc5 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -50,7 +50,6 @@
#include <comphelper/numbers.hxx>
#include <comphelper/string.hxx>
#include "UITools.hxx"
-#include <boost/scoped_ptr.hpp>
#include "dbu_control.hrc"
#include "dbu_tbl.hrc"
#include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 994fd81..ab0a577 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -111,21 +111,21 @@ namespace
class ProviderFactory
{
private:
- mutable ::boost::shared_ptr< IImageProvider > m_pErrorImage;
- mutable ::boost::shared_ptr< IImageProvider > m_pWarningsImage;
- mutable ::boost::shared_ptr< IImageProvider > m_pInfoImage;
- mutable ::boost::shared_ptr< ILabelProvider > m_pErrorLabel;
- mutable ::boost::shared_ptr< ILabelProvider > m_pWarningsLabel;
- mutable ::boost::shared_ptr< ILabelProvider > m_pInfoLabel;
+ mutable std::shared_ptr< IImageProvider > m_pErrorImage;
+ mutable std::shared_ptr< IImageProvider > m_pWarningsImage;
+ mutable std::shared_ptr< IImageProvider > m_pInfoImage;
+ mutable std::shared_ptr< ILabelProvider > m_pErrorLabel;
+ mutable std::shared_ptr< ILabelProvider > m_pWarningsLabel;
+ mutable std::shared_ptr< ILabelProvider > m_pInfoLabel;
public:
ProviderFactory()
{
}
- ::boost::shared_ptr< IImageProvider > getImageProvider( SQLExceptionInfo::TYPE _eType ) const
+ std::shared_ptr< IImageProvider > getImageProvider( SQLExceptionInfo::TYPE _eType ) const
{
- ::boost::shared_ptr< IImageProvider >* ppProvider( &m_pErrorImage );
+ std::shared_ptr< IImageProvider >* ppProvider( &m_pErrorImage );
sal_uInt16 nNormalImageID( BMP_EXCEPTION_ERROR );
switch ( _eType )
@@ -149,9 +149,9 @@ namespace
return *ppProvider;
}
- ::boost::shared_ptr< ILabelProvider > getLabelProvider( SQLExceptionInfo::TYPE _eType, bool _bSubLabel ) const
+ std::shared_ptr< ILabelProvider > getLabelProvider( SQLExceptionInfo::TYPE _eType, bool _bSubLabel ) const
{
- ::boost::shared_ptr< ILabelProvider >* ppProvider( &m_pErrorLabel );
+ std::shared_ptr< ILabelProvider >* ppProvider( &m_pErrorLabel );
sal_uInt16 nLabelID( STR_EXCEPTION_ERROR );
switch ( _eType )
@@ -181,8 +181,8 @@ namespace
{
SQLExceptionInfo::TYPE eType;
- ::boost::shared_ptr< IImageProvider > pImageProvider;
- ::boost::shared_ptr< ILabelProvider > pLabelProvider;
+ std::shared_ptr< IImageProvider > pImageProvider;
+ std::shared_ptr< ILabelProvider > pLabelProvider;
bool bSubEntry;
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index 55a08e9..4d3f18e 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -74,7 +74,7 @@ namespace dbaui
css::uno::Reference< css::container::XNameAccess> m_xTables; ///< container
SharedConnection m_xConnection; ///< dest conn
- ::boost::shared_ptr<IUpdateHelper> m_pUpdateHelper;
+ std::shared_ptr<IUpdateHelper> m_pUpdateHelper;
css::uno::Reference< css::sdbc::XResultSet > m_xResultSet;
css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; ///< a number formatter working with the connection's NumberFormatsSupplier
css::uno::Reference< css::uno::XComponentContext> m_xContext;
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 91ce6c8..2869d14 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
@@ -36,7 +36,7 @@ namespace dbaui
,public IRelationControlInterface
{
OModuleClient m_aModuleClient;
- boost::scoped_ptr<OTableListBoxControl> m_xTableControl;
+ std::unique_ptr<OTableListBoxControl> m_xTableControl;
OJoinTableView::OTableWindowMap* m_pTableMap;
VclPtr<RadioButton> m_pRB_NoCascUpd;
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index ddeea389..ab25f35 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.hxx
@@ -23,7 +23,7 @@
#include "TableWindowData.hxx"
#include <vector>
#include <tools/rtti.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace dbaui
{
@@ -103,7 +103,7 @@ namespace dbaui
virtual bool Update(){ return true; }
};
- typedef ::std::vector< ::boost::shared_ptr<OTableConnectionData> > TTableConnectionData;
+ typedef ::std::vector< ::std::shared_ptr<OTableConnectionData> > TTableConnectionData;
}
#endif
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index 931c4d0..b8820b3 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -39,7 +39,7 @@ namespace dbaui
{
private:
OModuleClient m_aModuleClient;
- ::std::vector< ::boost::shared_ptr<OTableRow> > m_vRowList;
+ ::std::vector< std::shared_ptr<OTableRow> > m_vRowList;
OTypeInfoMap m_aTypeInfo;
::std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex;
@@ -102,7 +102,7 @@ namespace dbaui
virtual void impl_onModifyChanged() SAL_OVERRIDE;
- inline ::std::vector< ::boost::shared_ptr<OTableRow> >& getRows() { return m_vRowList; }
+ inline ::std::vector< std::shared_ptr<OTableRow> >& getRows() { return m_vRowList; }
/// returns the position of the first empty row
sal_Int32 getFirstEmptyRowPosition();
diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx
index 45fa74b..764a182 100644
--- a/dbaccess/source/ui/inc/TableRowExchange.hxx
+++ b/dbaccess/source/ui/inc/TableRowExchange.hxx
@@ -22,16 +22,16 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <cppuhelper/implbase2.hxx>
#include <svtools/transfer.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace dbaui
{
class OTableRow;
class OTableRowExchange : public TransferableHelper
{
- ::std::vector< ::boost::shared_ptr<OTableRow> > m_vTableRow;
+ ::std::vector< std::shared_ptr<OTableRow> > m_vTableRow;
public:
- OTableRowExchange(const ::std::vector< ::boost::shared_ptr<OTableRow> >& _rvTableRow);
+ OTableRowExchange(const ::std::vector< std::shared_ptr<OTableRow> >& _rvTableRow);
protected:
virtual void AddSupportedFormats() SAL_OVERRIDE;
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx
index ce121a2..776d851 100644
--- a/dbaccess/source/ui/inc/TableWindowData.hxx
+++ b/dbaccess/source/ui/inc/TableWindowData.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <unotools/eventlisteneradapter.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace dbaui
@@ -90,7 +90,7 @@ namespace dbaui
virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE;
};
- typedef ::std::vector< ::boost::shared_ptr<OTableWindowData> > TTableWindowData;
+ typedef ::std::vector< std::shared_ptr<OTableWindowData> > TTableWindowData;
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWDATA_HXX
diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx
index dd7e41e..9d36403 100644
--- a/dbaccess/source/ui/inc/TypeInfo.hxx
+++ b/dbaccess/source/ui/inc/TypeInfo.hxx
@@ -23,8 +23,8 @@
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ColumnSearch.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <boost/shared_ptr.hpp>
#include <map>
+#include <memory>
namespace dbaui
{
@@ -106,7 +106,7 @@ const sal_uInt16 TYPE_BIT = 31;
};
- typedef ::boost::shared_ptr<OTypeInfo> TOTypeInfoSP;
+ typedef std::shared_ptr<OTypeInfo> TOTypeInfoSP;
typedef ::std::multimap<sal_Int32,TOTypeInfoSP> OTypeInfoMap;
/** return the most suitable typeinfo for a requested type
@param _rTypeInfo contains a map of type to typeinfo
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index bd14dee..0903fbf 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_ADTABDLG_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_ADTABDLG_HXX
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
@@ -63,7 +63,7 @@ namespace dbaui
VclPtr<OTableTreeListBox> m_pTableList;
VclPtr<SvTreeListBox> m_pQueryList;
- boost::scoped_ptr< TableObjectListFacade > m_xCurrentList;
+ std::unique_ptr< TableObjectListFacade > m_xCurrentList;
VclPtr<PushButton> m_pAddButton;
VclPtr<PushButton> m_pCloseButton;
diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx
index c22062a..a14d8c0 100644
--- a/dbaccess/source/ui/inc/databaseobjectview.hxx
+++ b/dbaccess/source/ui/inc/databaseobjectview.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <comphelper/namedvaluecollection.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace dbaui
{
diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx
index 63ef286..d7e62e5 100644
--- a/dbaccess/source/ui/inc/dsmeta.hxx
+++ b/dbaccess/source/ui/inc/dsmeta.hxx
@@ -27,7 +27,7 @@
#include "dsntypes.hxx"
#include "dsitems.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace dbaui
{
@@ -65,7 +65,7 @@ namespace dbaui
static AuthenticationMode getAuthentication( const OUString& _sURL );
private:
- ::boost::shared_ptr< DataSourceMetaData_Impl > m_pImpl;
+ std::shared_ptr< DataSourceMetaData_Impl > m_pImpl;
};
// FeatureSet
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index 4a74946..0d779f0 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdb/application/DatabaseObject.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace dbaui
{
@@ -40,7 +40,7 @@ namespace dbaui
class ImageProvider
{
private:
- ::boost::shared_ptr< ImageProvider_Data > m_pData;
+ std::shared_ptr< ImageProvider_Data > m_pData;
public:
/** creates a semi-functional ImageProvider instance
diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx
index 0d54f7a..2432064 100644
--- a/dbaccess/source/ui/inc/propertystorage.hxx
+++ b/dbaccess/source/ui/inc/propertystorage.hxx
@@ -21,8 +21,8 @@
#define INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSTORAGE_HXX
#include <com/sun/star/uno/Any.hxx>
-#include <boost/shared_ptr.hpp>
#include <map>
+#include <memory>
class SfxItemSet;
@@ -39,7 +39,7 @@ namespace dbaui
virtual ~PropertyStorage();
};
- typedef ::boost::shared_ptr< PropertyStorage > PPropertyStorage;
+ typedef std::shared_ptr< PropertyStorage > PPropertyStorage;
typedef ::std::map< sal_Int32, PPropertyStorage > PropertyValues;
// SetItemPropertyStorage
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index ea35a86..fdd64f5 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/sdb/application/NamedDatabaseObject.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace dbaui
{
@@ -40,7 +40,7 @@ class OTableTreeListBox : public OMarkableTreeListBox
protected:
css::uno::Reference< css::sdbc::XConnection >
m_xConnection; // the connection we're working for, set in implOnNewConnection, called by UpdateTableList
- boost::scoped_ptr< ImageProvider >
+ std::unique_ptr< ImageProvider >
m_xImageProvider; // provider for our images
bool m_bVirtualRoot; // should the first entry be visible
bool m_bNoEmptyFolders; // should empty catalogs/schematas be prevented from being displayed?
diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
index a6fcd56..b89f56e 100644
--- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
+++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
@@ -37,8 +37,8 @@
#include <tools/diagnose_ex.h>
#include <cppuhelper/exc_hlp.hxx>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
namespace dbaui
{
diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx
index 7fb7c99..ba9be1c 100644
--- a/dbaccess/source/ui/misc/propertystorage.cxx
+++ b/dbaccess/source/ui/misc/propertystorage.cxx
@@ -26,7 +26,7 @@
#include <osl/diagnose.h>
#include <cassert>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace dbaui
{
@@ -69,7 +69,7 @@ namespace dbaui
{
return false;
}
- boost::scoped_ptr< ITEMTYPE > pClone( pCloneItem);
+ std::unique_ptr< ITEMTYPE > pClone( pCloneItem);
assert(pClone.get());
pClone->SetValue( aValue );
_rSet.Put( *pClone );
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index ed6180b..45b4390 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -29,8 +29,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <osl/diagnose.h>
-#include <boost/scoped_ptr.hpp>
-
namespace dbaui
{
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index e57be72..312750b 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -56,9 +56,6 @@
#include "UITools.hxx"
#include <osl/diagnose.h>
-#include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::beans;
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 51e8374..9cfe84f 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -44,8 +44,6 @@
#include <cppuhelper/exc_hlp.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/diagnose_ex.h>
-#include <boost/bind.hpp>
-#include <boost/scoped_ptr.hpp>
#include <algorithm>
#include <functional>
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 764643d..4082adb1 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -55,7 +55,7 @@
#include "querycontainerwindow.hxx"
#include "sqlmessage.hxx"
#include <unotools/syslocale.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::dbaui;
using namespace ::utl;
@@ -791,7 +791,7 @@ namespace
OUString aTmp = aCriteria;
OUString aErrorMsg;
Reference<XPropertySet> xColumn;
- boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+ std::unique_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
if (pParseNode.get())
{
if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -822,7 +822,7 @@ namespace
OUString aTmp = aCriteria;
OUString aErrorMsg;
Reference<XPropertySet> xColumn;
- boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+ std::unique_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
if (pParseNode.get())
{
if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -1165,7 +1165,7 @@ namespace
OUString aTmp = pEntryField->GetField();
OUString aErrorMsg;
Reference<XPropertySet> xColumn;
- boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+ std::unique_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
if (pParseNode.get())
{
OUString sGroupBy;
@@ -2925,7 +2925,7 @@ OUString OQueryDesignView::getStatement()
{
::connectivity::OSQLParser& rParser( rController.getParser() );
OUString sErrorMessage;
- boost::scoped_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, true ) );
+ std::unique_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, true ) );
if ( pParseNode.get() )
{
OSQLParseNode* pNode = pParseNode->getChild(3)->getChild(1);
@@ -3037,7 +3037,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
sSql += " FROM x WHERE ";
sSql += pEntry->GetField();
sSql += _sCriteria;
- boost::scoped_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, true ) );
+ std::unique_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, true ) );
nType = DataType::DOUBLE;
if ( pParseNode.get() )
{
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 9c3e741..ff58450 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -31,7 +31,6 @@
#include <vcl/svapp.hxx>
#include <comphelper/types.hxx>
#include "QueryDesignView.hxx"
-#include <boost/scoped_ptr.hpp>
using namespace dbaui;
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index a527afd..be066e3 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -26,7 +26,6 @@
#include "adtabdlg.hxx"
#include "querycontroller.hxx"
#include "sqledit.hxx"
-#include <boost/scoped_ptr.hpp>
using namespace dbaui;
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 1ca5032..e922ebf 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -45,8 +45,6 @@
#include <connectivity/dbtools.hxx>
#include "svtools/treelistentry.hxx"
-#include <boost/scoped_ptr.hpp>
-
using namespace dbaui;
using namespace ::utl;
using namespace ::com::sun::star;
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index a3fffc9..0c6bec9 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/Frame.hpp>
#include <com/sun/star/util/XCloseable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace dbaui
{
@@ -61,7 +61,7 @@ namespace dbaui
void OQueryContainerWindow::dispose()
{
{
- boost::scoped_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch);
+ std::unique_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch);
m_pViewSwitch = NULL;
}
if ( m_pBeamer )
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 3cb5297..f86d61b 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -274,7 +274,7 @@ namespace
{
class RelationLoader : public ::osl::Thread
{
- typedef std::map<OUString, ::boost::shared_ptr<OTableWindowData>, ::comphelper::UStringMixLess> TTableDataHelper;
+ typedef std::map<OUString, ::std::shared_ptr<OTableWindowData>, ::comphelper::UStringMixLess> TTableDataHelper;
TTableDataHelper m_aTableData;
TTableConnectionData m_vTableConnectionData;
const Sequence< OUString> m_aTableList;
@@ -356,7 +356,7 @@ namespace
TTableDataHelper::iterator aFind = m_aTableData.find(sSourceName);
if ( aFind == m_aTableData.end() )
{
- aFind = m_aTableData.insert(TTableDataHelper::value_type(sSourceName,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xTableProp,sSourceName, sSourceName)))).first;
+ aFind = m_aTableData.insert(TTableDataHelper::value_type(sSourceName,::std::shared_ptr<OTableWindowData>(new OTableWindowData(xTableProp,sSourceName, sSourceName)))).first;
aFind->second->ShowAll(false);
}
TTableWindowData::value_type pReferencingTable = aFind->second;
@@ -389,7 +389,7 @@ namespace
if ( m_xTables->hasByName(sReferencedTable) )
{
Reference<XPropertySet> xReferencedTable(m_xTables->getByName(sReferencedTable),UNO_QUERY);
- aRefFind = m_aTableData.insert(TTableDataHelper::value_type(sReferencedTable,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xReferencedTable,sReferencedTable, sReferencedTable)))).first;
+ aRefFind = m_aTableData.insert(TTableDataHelper::value_type(sReferencedTable,::std::shared_ptr<OTableWindowData>(new OTableWindowData(xReferencedTable,sReferencedTable, sReferencedTable)))).first;
aRefFind->second->ShowAll(false);
}
else
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index f9413ce..87c4483 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -24,7 +24,7 @@
#include "TableFieldControl.hxx"
#include "TableDesignView.hxx"
#include "TEditControl.hxx"
-#include <boost/scoped_ptr.hpp>
+
using namespace dbaui;
// class OFieldDescGenWin
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 3cc5fd5..6744812 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -489,8 +489,8 @@ sal_Int32 OTableEditorCtrl::HasFieldName( const OUString& rFieldName )
::comphelper::UStringMixEqual bCase(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers());
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_pRowList->begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_pRowList->end();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_pRowList->begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_pRowList->end();
sal_Int32 nCount(0);
for(;aIter != aEnd;++aIter)
{
@@ -724,9 +724,9 @@ void OTableEditorCtrl::CopyRows()
pDescrWin->SaveData( pActRow->GetActFieldDescr() );
// Copy selected rows to the ClipboardList
- ::boost::shared_ptr<OTableRow> pClipboardRow;
- ::boost::shared_ptr<OTableRow> pRow;
- ::std::vector< ::boost::shared_ptr<OTableRow> > vClipboardList;
+ std::shared_ptr<OTableRow> pClipboardRow;
+ std::shared_ptr<OTableRow> pRow;
+ ::std::vector< std::shared_ptr<OTableRow> > vClipboardList;
vClipboardList.reserve(GetSelectRowCount());
for( long nIndex=FirstSelectedRow(); nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()); nIndex=NextSelectedRow() )
@@ -776,7 +776,7 @@ OUString OTableEditorCtrl::GenerateName( const OUString& rName )
void OTableEditorCtrl::InsertRows( long nRow )
{
- ::std::vector< ::boost::shared_ptr<OTableRow> > vInsertedUndoRedoRows; // need for undo/redo handling
+ ::std::vector< std::shared_ptr<OTableRow> > vInsertedUndoRedoRows; // need for undo/redo handling
// get rows from clipboard
TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
if(aTransferData.HasFormat(SotClipboardFormatId::SBA_TABED))
@@ -789,7 +789,7 @@ void OTableEditorCtrl::InsertRows( long nRow )
aStreamRef->ResetError();
long nInsertRow = nRow;
OUString aFieldName;
- ::boost::shared_ptr<OTableRow> pRow;
+ std::shared_ptr<OTableRow> pRow;
sal_Int32 nSize = 0;
(*aStreamRef).ReadInt32( nSize );
vInsertedUndoRedoRows.reserve(nSize);
@@ -806,7 +806,7 @@ void OTableEditorCtrl::InsertRows( long nRow )
pRow->GetActFieldDescr()->SetName( aFieldName );
pRow->SetPos(nInsertRow);
m_pRowList->insert( m_pRowList->begin()+nInsertRow,pRow );
- vInsertedUndoRedoRows.push_back(::boost::shared_ptr<OTableRow>(new OTableRow(*pRow)));
+ vInsertedUndoRedoRows.push_back(std::shared_ptr<OTableRow>(new OTableRow(*pRow)));
nInsertRow++;
}
}
@@ -841,7 +841,7 @@ void OTableEditorCtrl::DeleteRows()
RowRemoved( nIndex, 1 );
// Insert the empty row at the end
- m_pRowList->push_back( ::boost::shared_ptr<OTableRow>(new OTableRow()));
+ m_pRowList->push_back( std::shared_ptr<OTableRow>(new OTableRow()));
RowInserted( GetRowCount()-1, 1, true );
nIndex = FirstSelectedRow();
@@ -870,7 +870,7 @@ void OTableEditorCtrl::InsertNewRows( long nRow )
GetUndoManager().AddUndoAction( new OTableEditorInsNewUndoAct(this, nRow, nInsertRows) );
// Insert the number of selected rows
for( long i=nRow; i<(nRow+nInsertRows); i++ )
- m_pRowList->insert( m_pRowList->begin()+i ,::boost::shared_ptr<OTableRow>(new OTableRow()));
+ m_pRowList->insert( m_pRowList->begin()+i ,std::shared_ptr<OTableRow>(new OTableRow()));
RowInserted( nRow, nInsertRows, true );
GetView()->getController().setModified( sal_True );
@@ -1101,14 +1101,14 @@ sal_uInt32 OTableEditorCtrl::GetTotalCellWidth(long nRow, sal_uInt16 nColId)
OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow )
{
- std::vector< ::boost::shared_ptr<OTableRow> >::size_type nListCount(
+ std::vector< std::shared_ptr<OTableRow> >::size_type nListCount(
m_pRowList->size());
if( (nRow<0) || (sal::static_int_cast< unsigned long >(nRow)>=nListCount) )
{
OSL_FAIL("(nRow<0) || (nRow>=nListCount)");
return NULL;
}
- ::boost::shared_ptr<OTableRow> pRow = (*m_pRowList)[ nRow ];
+ std::shared_ptr<OTableRow> pRow = (*m_pRowList)[ nRow ];
if( !pRow )
return NULL;
return pRow->GetActFieldDescr();
@@ -1160,7 +1160,7 @@ bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ )
return false;
// If one of the selected rows is empty, Copy is not possible
- ::boost::shared_ptr<OTableRow> pRow;
+ std::shared_ptr<OTableRow> pRow;
long nIndex = FirstSelectedRow();
while( nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()) )
{
@@ -1319,7 +1319,7 @@ bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ )
// - No Memo or Image entries
// - DROP is not permitted (see above) and the column is not Required (not null flag is not set).
long nIndex = FirstSelectedRow();
- ::boost::shared_ptr<OTableRow> pRow;
+ std::shared_ptr<OTableRow> pRow;
while( nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()) )
{
pRow = (*m_pRowList)[nIndex];
@@ -1478,7 +1478,7 @@ IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedPaste, void*, void )
{ // Insertion is not allowed, only appending, so test if there are full cells after the PastePosition
sal_Int32 nFreeFromPos; // from here on there are only empty rows
- ::std::vector< ::boost::shared_ptr<OTableRow> >::reverse_iterator aIter = m_pRowList->rbegin();
+ ::std::vector< std::shared_ptr<OTableRow> >::reverse_iterator aIter = m_pRowList->rbegin();
for(nFreeFromPos = m_pRowList->size();
aIter != m_pRowList->rend() && (!(*aIter) || !(*aIter)->GetActFieldDescr() || (*aIter)->GetActFieldDescr()->GetName().isEmpty());
--nFreeFromPos, ++aIter)
@@ -1543,8 +1543,8 @@ void OTableEditorCtrl::SetPrimaryKey( bool bSet )
MultiSelection aDeletedPrimKeys;
aDeletedPrimKeys.SetTotalRange( Range(0,GetRowCount()) );
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end();
for(sal_Int32 nRow = 0;aIter != aEnd;++aIter,++nRow)
{
OFieldDescription* pFieldDescr = (*aIter)->GetActFieldDescr();
@@ -1563,7 +1563,7 @@ void OTableEditorCtrl::SetPrimaryKey( bool bSet )
while( nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()) )
{
// Set the key
- ::boost::shared_ptr<OTableRow> pRow = (*m_pRowList)[nIndex];
+ std::shared_ptr<OTableRow> pRow = (*m_pRowList)[nIndex];
OFieldDescription* pFieldDescr = pRow->GetActFieldDescr();
if(pFieldDescr)
AdjustFieldDescription(pFieldDescr,aInsertedPrimKeys,nIndex,false,true);
@@ -1586,8 +1586,8 @@ bool OTableEditorCtrl::IsPrimaryKey()
{
// Are all marked fields part of the Primary Key ?
long nPrimaryKeys = 0;
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end();
for(sal_Int32 nRow=0;aIter != aEnd;++aIter,++nRow)
{
if( IsRowSelected(nRow) && !(*aIter)->IsPrimaryKey() )
@@ -1612,7 +1612,7 @@ void OTableEditorCtrl::SwitchType( const TOTypeInfoSP& _pType )
if ( nRow < 0 || nRow > static_cast<long>(m_pRowList->size()) )
return;
// Show the new description
- ::boost::shared_ptr<OTableRow> pRow = (*m_pRowList)[nRow];
+ std::shared_ptr<OTableRow> pRow = (*m_pRowList)[nRow];
pRow->SetFieldType( _pType, true );
if ( _pType.get() )
{
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 686270e..20f3614 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -43,8 +43,8 @@ namespace dbaui
NONE
};
- ::std::vector< ::boost::shared_ptr<OTableRow> > m_aUndoList;
- ::std::vector< ::boost::shared_ptr<OTableRow> >* m_pRowList;
+ ::std::vector< ::std::shared_ptr<OTableRow> > m_aUndoList;
+ ::std::vector< ::std::shared_ptr<OTableRow> >* m_pRowList;
VclPtr<OSQLNameEdit> pNameCell;
VclPtr< ::svt::ListBoxControl> pTypeCell;
@@ -52,7 +52,7 @@ namespace dbaui
VclPtr<Edit> pDescrCell;
VclPtr<OTableFieldDescWin> pDescrWin; // properties of one column
- ::boost::shared_ptr<OTableRow> pActRow;
+ ::std::shared_ptr<OTableRow> pActRow;
ImplSVEvent * nCutEvent;
ImplSVEvent * nPasteEvent;
@@ -147,9 +147,9 @@ namespace dbaui
virtual OTableDesignView* GetView() const SAL_OVERRIDE;
- ::std::vector< ::boost::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; }
+ ::std::vector< ::std::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; }
- ::boost::shared_ptr<OTableRow> GetActRow(){ return pActRow; }
+ ::std::shared_ptr<OTableRow> GetActRow(){ return pActRow; }
void CellModified( long nRow, sal_uInt16 nColId );
void SetReadOnly( bool bRead=true );
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index ffa0228..252ba4b 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -682,8 +682,8 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup, boo
Reference<XAppend> xAppend(xColumns,UNO_QUERY);
OSL_ENSURE(xAppend.is(),"No XAppend Interface!");
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
for(;aIter != aEnd;++aIter)
{
OSL_ENSURE(*aIter,"OTableRow is null!");
@@ -775,7 +775,7 @@ void OTableController::loadData()
// if the data structure already exists, empty it
m_vRowList.clear();
- ::boost::shared_ptr<OTableRow> pTabEdRow;
+ std::shared_ptr<OTableRow> pTabEdRow;
Reference< XDatabaseMetaData> xMetaData = getMetaData( );
// fill data structure with data from DataDefinitionObject
if(m_xTable.is() && xMetaData.is())
@@ -869,8 +869,8 @@ void OTableController::loadData()
for(;pKeyBegin != pKeyEnd;++pKeyBegin)
{
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator rowIter = m_vRowList.begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator rowEnd = m_vRowList.end();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator rowIter = m_vRowList.begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator rowEnd = m_vRowList.end();
for(;rowIter != rowEnd;++rowIter)
{
if((*rowIter)->GetActFieldDescr()->GetName() == *pKeyBegin)
@@ -915,8 +915,8 @@ bool OTableController::checkColumns(bool _bNew)
DatabaseMetaData aMetaData( getConnection() );
::comphelper::UStringMixEqual bCase(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers());
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
for(;aIter != aEnd;++aIter)
{
OFieldDescription* pFieldDesc = (*aIter)->GetActFieldDescr();
@@ -924,7 +924,7 @@ bool OTableController::checkColumns(bool _bNew)
{
bFoundPKey |= (*aIter)->IsPrimaryKey();
// first check for duplicate names
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter2 = aIter+1;
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter2 = aIter+1;
for(;aIter2 != aEnd;++aIter2)
{
OFieldDescription* pCompareDesc = (*aIter2)->GetActFieldDescr();
@@ -948,7 +948,7 @@ bool OTableController::checkColumns(bool _bNew)
{
case RET_YES:
{
- ::boost::shared_ptr<OTableRow> pNewRow(new OTableRow());
+ std::shared_ptr<OTableRow> pNewRow(new OTableRow());
TOTypeInfoSP pTypeInfo = ::dbaui::queryPrimaryKeyType(m_aTypeInfo);
if ( !pTypeInfo.get() )
break;
@@ -998,8 +998,8 @@ void OTableController::alterColumns()
Reference< XDatabaseMetaData> xMetaData = getMetaData( );
::std::map< OUString,sal_Bool,::comphelper::UStringMixLess> aColumns(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers());
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
// first look for columns where something other than the name changed
sal_Int32 nPos = 0;
for(;aIter != aEnd;++aIter,++nPos)
@@ -1441,8 +1441,8 @@ void OTableController::reSyncRows()
{
bool bAlterAllowed = isAlterAllowed();
bool bAddAllowed = isAddAllowed();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
for(;aIter != aEnd;++aIter)
{
OSL_ENSURE(*aIter,"OTableRow is null!");
@@ -1466,8 +1466,8 @@ OUString OTableController::createUniqueName(const OUString& _rName)
::comphelper::UStringMixEqual bCase(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers());
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
for(sal_Int32 i=0;aIter != aEnd;++aIter)
{
OFieldDescription* pFieldDesc = (*aIter)->GetActFieldDescr();
@@ -1519,8 +1519,8 @@ void OTableController::reload()
sal_Int32 OTableController::getFirstEmptyRowPosition()
{
sal_Int32 nRet = -1;
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end();
for(;aIter != aEnd;++aIter)
{
if ( !*aIter || !(*aIter)->GetActFieldDescr() || (*aIter)->GetActFieldDescr()->GetName().isEmpty() )
@@ -1532,7 +1532,7 @@ sal_Int32 OTableController::getFirstEmptyRowPosition()
if ( nRet == -1 )
{
bool bReadRow = !isAddAllowed();
- ::boost::shared_ptr<OTableRow> pTabEdRow(new OTableRow());
+ std::shared_ptr<OTableRow> pTabEdRow(new OTableRow());
pTabEdRow->SetReadOnly(bReadRow);
nRet = m_vRowList.size();
m_vRowList.push_back( pTabEdRow);
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index 5c1fcc1..80d35b1 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -22,7 +22,7 @@
#include <svtools/svmedit.hxx>
#include <vcl/settings.hxx>
#include "dbaccess_helpid.hrc"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace dbaui;
#define STANDARD_MARGIN 6
// class OTableDesignHelpBar
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 2c02590..5029b3b 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -31,7 +31,7 @@
#include <unotools/syslocale.hxx>
#include <vcl/settings.hxx>
#include "UITools.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::dbaui;
using namespace ::utl;
@@ -303,7 +303,7 @@ void OTableDesignView::setReadOnly(bool _bReadOnly)
void OTableDesignView::reSync()
{
GetEditorCtrl()->DeactivateCell();
- ::boost::shared_ptr<OTableRow> pRow = (*GetEditorCtrl()->GetRowList())[GetEditorCtrl()->GetCurRow()];
+ std::shared_ptr<OTableRow> pRow = (*GetEditorCtrl()->GetRowList())[GetEditorCtrl()->GetCurRow()];
OFieldDescription* pFieldDescr = pRow ? pRow->GetActFieldDescr() : NULL;
if ( pFieldDescr )
GetDescWin()->DisplayData(pFieldDescr);
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index 87596e7..be3d5a1 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -62,7 +62,7 @@ bool OTableFieldControl::IsReadOnly()
bRead = true;
else
{
- ::boost::shared_ptr<OTableRow> pCurRow = GetCtrl()->GetActRow();
+ std::shared_ptr<OTableRow> pCurRow = GetCtrl()->GetActRow();
if( pCurRow )
bRead = pCurRow->IsReadOnly();
}
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 4506ce5..cf07ff4 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -26,7 +26,6 @@
#include <vcl/settings.hxx>
#include "dbaccess_helpid.hrc"
#include "moduledbu.hxx"
-#include <boost/scoped_ptr.hpp>
#define STANDARD_MARGIN 6
#define DETAILS_HEADER_HEIGHT 25
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index ee3e880..9a8c15f 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -26,7 +26,7 @@ namespace dbaui
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
- OTableRowExchange::OTableRowExchange(const ::std::vector< ::boost::shared_ptr<OTableRow> >& _rvTableRow)
+ OTableRowExchange::OTableRowExchange(const ::std::vector< std::shared_ptr<OTableRow> >& _rvTableRow)
: m_vTableRow(_rvTableRow)
{
}
@@ -34,12 +34,12 @@ namespace dbaui
{
if(nUserObjectId == SotClipboardFormatId::SBA_TABED)
{
- ::std::vector< ::boost::shared_ptr<OTableRow> >* pRows = static_cast< ::std::vector< ::boost::shared_ptr<OTableRow> >* >(pUserObject);
+ ::std::vector< std::shared_ptr<OTableRow> >* pRows = static_cast< ::std::vector< std::shared_ptr<OTableRow> >* >(pUserObject);
if(pRows)
{
(*rxOStm).WriteInt32( pRows->size() ); // first stream the size
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = pRows->begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = pRows->end();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = pRows->begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = pRows->end();
for(;aIter != aEnd;++aIter)
WriteOTableRow(*rxOStm, **aIter);
return true;
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index ec495aa..0c5d901 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -169,10 +169,10 @@ OTableEditorDelUndoAct::OTableEditorDelUndoAct( OTableEditorCtrl* pOwner) :
OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_ROWDELETED)
{
// fill DeletedRowList
- ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pOwner->GetRowList();
+ ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pOwner->GetRowList();
long nIndex = pOwner->FirstSelectedRow();
- ::boost::shared_ptr<OTableRow> pOriginalRow;
- ::boost::shared_ptr<OTableRow> pNewRow;
+ std::shared_ptr<OTableRow> pOriginalRow;
+ std::shared_ptr<OTableRow> pNewRow;
while( nIndex >= 0 )
{
@@ -193,11 +193,11 @@ void OTableEditorDelUndoAct::Undo()
{
// Insert the deleted line
sal_uLong nPos;
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end();
- ::boost::shared_ptr<OTableRow> pNewOrigRow;
- ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
+ std::shared_ptr<OTableRow> pNewOrigRow;
+ ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
for(;aIter != aEnd;++aIter)
{
@@ -215,9 +215,9 @@ void OTableEditorDelUndoAct::Redo()
{
// delete line again
sal_uLong nPos;
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end();
- ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end();
+ ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
for(;aIter != aEnd;++aIter)
{
@@ -233,7 +233,7 @@ void OTableEditorDelUndoAct::Redo()
// class OTableEditorInsUndoAct
OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner,
long nInsertPosition ,
- const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows)
+ const ::std::vector< std::shared_ptr<OTableRow> >& _vInsertedRows)
:OTableEditorUndoAct( pOwner,STR_TABED_UNDO_ROWINSERTED )
,m_vInsertedRows(_vInsertedRows)
,m_nInsPos( nInsertPosition )
@@ -248,7 +248,7 @@ OTableEditorInsUndoAct::~OTableEditorInsUndoAct()
void OTableEditorInsUndoAct::Undo()
{
// delete lines again
- ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
+ ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
for( long i=(m_nInsPos+m_vInsertedRows.size()-1); i>(m_nInsPos-1); i-- )
{
pOriginalRows->erase(pOriginalRows->begin()+i);
@@ -264,10 +264,10 @@ void OTableEditorInsUndoAct::Redo()
{
// insert lines again
long nInsertRow = m_nInsPos;
- ::boost::shared_ptr<OTableRow> pRow;
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vInsertedRows.begin();
- ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vInsertedRows.end();
- ::std::vector< ::boost::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
+ std::shared_ptr<OTableRow> pRow;
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aIter = m_vInsertedRows.begin();
+ ::std::vector< std::shared_ptr<OTableRow> >::iterator aEnd = m_vInsertedRows.end();
+ ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
for(;aIter != aEnd;++aIter)
{
pRow.reset(new OTableRow( **aIter ));
@@ -296,7 +296,7 @@ OTableEditorInsNewUndoAct::~OTableEditorInsNewUndoAct()
void OTableEditorInsNewUndoAct::Undo()
{
// delete inserted lines
- ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
+ ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
for( long i=(m_nInsPos+m_nInsRows-1); i>(m_nInsPos-1); i-- )
{
@@ -312,10 +312,10 @@ void OTableEditorInsNewUndoAct::Undo()
void OTableEditorInsNewUndoAct::Redo()
{
// insert lines again
- ::std::vector< ::boost::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
+ ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
for( long i=m_nInsPos; i<(m_nInsPos+m_nInsRows); i++ )
- pRowList->insert( pRowList->begin()+i,::boost::shared_ptr<OTableRow>(new OTableRow()) );
+ pRowList->insert( pRowList->begin()+i,std::shared_ptr<OTableRow>(new OTableRow()) );
pTabEdCtrl->RowInserted( m_nInsPos, m_nInsRows, true );
pTabEdCtrl->InvalidateHandleColumn();
@@ -338,8 +338,8 @@ OPrimKeyUndoAct::~OPrimKeyUndoAct()
void OPrimKeyUndoAct::Undo()
{
- ::std::vector< ::boost::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
- ::boost::shared_ptr<OTableRow> pRow;
+ ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
+ std::shared_ptr<OTableRow> pRow;
long nIndex;
// delete inserted keys
@@ -364,7 +364,7 @@ void OPrimKeyUndoAct::Undo()
void OPrimKeyUndoAct::Redo()
{
- ::std::vector< ::boost::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
+ ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList();
long nIndex;
// delete the deleted keys
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx
index 420a230..d8b0905 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.hxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx
@@ -92,7 +92,7 @@ namespace dbaui
class OTableEditorDelUndoAct : public OTableEditorUndoAct
{
protected:
- ::std::vector< ::boost::shared_ptr<OTableRow> > m_aDeletedRows;
+ ::std::vector< std::shared_ptr<OTableRow> > m_aDeletedRows;
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;
@@ -105,7 +105,7 @@ namespace dbaui
class OTableEditorInsUndoAct : public OTableEditorUndoAct
{
protected:
- ::std::vector< ::boost::shared_ptr<OTableRow> > m_vInsertedRows;
+ ::std::vector< std::shared_ptr<OTableRow> > m_vInsertedRows;
long m_nInsPos;
virtual void Undo() SAL_OVERRIDE;
@@ -114,7 +114,7 @@ namespace dbaui
TYPEINFO_OVERRIDE();
OTableEditorInsUndoAct( OTableEditorCtrl* pOwner,
long nInsertPosition,
- const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows);
+ const ::std::vector< std::shared_ptr<OTableRow> >& _vInsertedRows);
virtual ~OTableEditorInsUndoAct();
};
diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx
index 6f985f6..7ed3dfa 100644
--- a/sw/inc/IDocumentExternalData.hxx
+++ b/sw/inc/IDocumentExternalData.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_INC_IDOCUMENTEXTERNALDATA_HXX
#define INCLUDED_SW_INC_IDOCUMENTEXTERNALDATA_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <unordered_map>
namespace sw
@@ -39,7 +39,7 @@ public:
virtual ~ExternalData() {}
};
-typedef ::boost::shared_ptr<ExternalData> tExternalDataPointer;
+typedef std::shared_ptr<ExternalData> tExternalDataPointer;
}
class IDocumentExternalData
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 7de0f2f..4d8f984 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -22,7 +22,7 @@
#include <sal/types.h>
#include <IMark.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class SwPaM;
struct SwPosition;
@@ -50,7 +50,7 @@ class IDocumentMarkAccess
NAVIGATOR_REMINDER
};
- typedef ::boost::shared_ptr< ::sw::mark::IMark> pMark_t;
+ typedef std::shared_ptr< ::sw::mark::IMark> pMark_t;
typedef ::std::vector< pMark_t > container_t;
typedef container_t::iterator iterator_t;
typedef container_t::const_iterator const_iterator_t;
@@ -179,7 +179,7 @@ class IDocumentMarkAccess
@param ppMark
[in] an iterator pointing to the Mark to be deleted.
*/
- virtual ::boost::shared_ptr<ILazyDeleter>
+ virtual std::shared_ptr<ILazyDeleter>
deleteMark(const IDocumentMarkAccess::const_iterator_t& ppMark) =0;
/** Deletes a mark.
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 56850f8..b72ec6c 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -23,8 +23,8 @@
#include <calbck.hxx>
#include <pam.hxx>
#include <boost/operators.hpp>
-#include <boost/shared_ptr.hpp>
#include <map>
+#include <memory>
#include <swdllapi.h>
struct SwPosition;
@@ -133,18 +133,18 @@ namespace sw { namespace mark
struct CompareIMarkStartsAfter
{
bool operator()(SwPosition const& rPos,
- boost::shared_ptr<sw::mark::IMark> const& pMark)
+ std::shared_ptr<sw::mark::IMark> const& pMark)
{
return pMark->StartsAfter(rPos);
}
#ifdef DBG_UTIL
- bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark,
+ bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark,
SwPosition const& rPos)
{
return pMark->StartsBefore(rPos);
}
- bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark1,
- boost::shared_ptr<sw::mark::IMark> const& pMark2)
+ bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark1,
+ std::shared_ptr<sw::mark::IMark> const& pMark2)
{
return (*pMark1) < (*pMark2);
}
@@ -155,19 +155,19 @@ namespace sw { namespace mark
// so it needs 3 overloads...
struct CompareIMarkStartsBefore
{
- bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark,
+ bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark,
SwPosition const& rPos)
{
return pMark->StartsBefore(rPos);
}
#ifdef DBG_UTIL
bool operator()(SwPosition const& rPos,
- boost::shared_ptr<sw::mark::IMark> const& pMark)
+ std::shared_ptr<sw::mark::IMark> const& pMark)
{
return pMark->StartsAfter(rPos);
}
- bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark1,
- boost::shared_ptr<sw::mark::IMark> const& pMark2)
+ bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark1,
+ std::shared_ptr<sw::mark::IMark> const& pMark2)
{
return (*pMark1) < (*pMark2);
}
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index 0a912d06..a925524 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_INC_FLYPOS_HXX
#include <swdllapi.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <set>
class SwFrameFormat;
@@ -45,10 +45,10 @@ public:
// SwPosFlyFrms can be handled by value (as return value), only refcounts to
// contained SwPosFlyFrm* will be copied. When releasing the last SwPosFlyFrmPtr
// instance the allocated instance will be freed. The array is sorted by
-// GetNdIndex by using a ::std::set container.
-typedef ::boost::shared_ptr< SwPosFlyFrm > SwPosFlyFrmPtr;
+// GetNdIndex by using a std::set container.
+typedef std::shared_ptr< SwPosFlyFrm > SwPosFlyFrmPtr;
struct SwPosFlyFrmCmp { bool operator()(const SwPosFlyFrmPtr& rA, const SwPosFlyFrmPtr& rB) const; };
-typedef ::std::set< SwPosFlyFrmPtr, SwPosFlyFrmCmp > SwPosFlyFrms;
+typedef std::set< SwPosFlyFrmPtr, SwPosFlyFrmCmp > SwPosFlyFrms;
#endif // INCLUDED_SW_INC_FLYPOS_HXX
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index ac4747a..1ce3493 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -26,9 +26,8 @@
#include <sfx2/Metadatable.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
#include <vector>
namespace com { namespace sun { namespace star {
@@ -91,7 +90,7 @@ private:
friend class SwTextMeta; ///< needs SetTextAttr, DoCopy
friend class ::sw::Meta; ///< needs m_pTextAttr
- ::boost::shared_ptr< ::sw::Meta > m_pMeta;
+ std::shared_ptr< ::sw::Meta > m_pMeta;
SwTextMeta * m_pTextAttr;
SwTextMeta * GetTextAttr() { return m_pTextAttr; }
@@ -105,7 +104,7 @@ private:
public:
/// takes ownership
- explicit SwFormatMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
+ explicit SwFormatMeta( std::shared_ptr< ::sw::Meta > const & i_pMeta,
const sal_uInt16 i_nWhich );
virtual ~SwFormatMeta();
@@ -198,12 +197,12 @@ class MetaFieldManager
: private ::boost::noncopyable
{
private:
- typedef ::std::vector< ::boost::weak_ptr<MetaField> > MetaFieldList_t;
+ typedef ::std::vector< std::weak_ptr<MetaField> > MetaFieldList_t;
MetaFieldList_t m_MetaFields;
public:
MetaFieldManager();
- ::boost::shared_ptr<MetaField> makeMetaField(
+ std::shared_ptr<MetaField> makeMetaField(
SwFormatMeta * const i_pFormat = 0,
const sal_uInt32 nNumberFormat = SAL_MAX_UINT32,
const bool bIsFixedLanguage = false );
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 65da31e..bef4765 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -23,8 +23,7 @@
#include <svtools/grfmgr.hxx>
#include <ndnotxt.hxx>
#include <com/sun/star/embed/XStorage.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
class SwAsyncRetrieveInputStreamThreadConsumer;
class SwGrfFormatColl;
@@ -49,7 +48,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
bool bFrameInPaint :1; ///< To avoid Start-/EndActions in Paint via SwapIn.
bool bScaleImageMap :1; ///< Scale image map in SetTwipSize.
- boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
+ std::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
bool mbLinkedInputStreamReady;
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
bool mbIsStreamReadOnly;
@@ -193,7 +192,7 @@ public:
/// Returns the with our graphic attributes filled Graphic-Attr-Structure.
GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const;
- boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;}
+ std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;}
bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;}
void TriggerAsyncRetrieveInputStream();
void ApplyInputStream(
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 79aa6fe..ad2283d 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -141,7 +141,7 @@ private:
const SvxNumberFormat::SvxNumPositionAndSpaceMode meDefaultNumberFormatPositionAndSpaceMode;
OUString msDefaultListId;
- boost::shared_ptr<SfxGrabBagItem> mpGrabBagItem; ///< Style InteropGrabBag.
+ std::shared_ptr<SfxGrabBagItem> mpGrabBagItem; ///< Style InteropGrabBag.
public:
/// add parameter <eDefaultNumberFormatPositionAndSpaceMode>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 935cb97..861b4b2 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -20,7 +20,6 @@
#include <basic/basmgr.hxx>
#include <boost/noncopyable.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 0ace20a..245458c 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -48,8 +48,6 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/optional.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/tuple/tuple.hpp>
#include <cassert>
#include <cctype>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 8ee8cc4..b16d1ef 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -18,7 +18,6 @@
#include <basic/basmgr.hxx>
#include <basic/sbmod.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index fbdfc6f..15c2d2c 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -15,7 +15,6 @@
*/
#include <basic/sbuno.hxx>
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/awt/FontUnderline.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index d4189ed..92a6d7c 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -23,7 +23,7 @@
#include <rtl/ustring.hxx>
#include <osl/diagnose.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class SwPaM;
class SwTextNode;
@@ -70,7 +70,7 @@ public:
// return text selection for the given field
static void GetPamForTextField( const SwTextField& rTextField,
- boost::shared_ptr< SwPaM >& rPamForTextField );
+ std::shared_ptr< SwPaM >& rPamForTextField );
};
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 34cea59..400d1d7 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -22,8 +22,6 @@
#include <vector>
#include <memory>
-#include <boost/shared_ptr.hpp>
-
#include <svl/undo.hxx>
#include <SwRewriter.hxx>
@@ -223,7 +221,7 @@ class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveContent
{
SwTextFormatColl *pTextFormatColl, *pLastNdColl;
std::vector<SwFrameFormat*>* pFrameFormats;
- ::std::vector< ::boost::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos;
+ ::std::vector< std::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos;
SwRedlineData* pRedlData;
bool bSttWasTextNd;
protected:
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 2ae2a2b..1c4d944 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -26,7 +26,7 @@
#include <swtypes.hxx>
#include <ring.hxx>
#include <swrect.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <stack>
#include <vcl/mapmod.hxx>
#include <vcl/print.hxx>
@@ -90,7 +90,7 @@ namespace vcl
// Currently the Preview flag is needed for DrawPage.
#define VSHELLFLAG_ISPREVIEW ((long)0x1)
#define VSHELLFLAG_SHARELAYOUT ((long)0x2)
-typedef boost::shared_ptr<SwRootFrm> SwRootFrmPtr;
+typedef std::shared_ptr<SwRootFrm> SwRootFrmPtr;
class SwViewShell;
class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index adf21ba..c404e46 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -668,7 +668,7 @@ protected:
// Read the XML stream we're interested in.
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), url);
uno::Reference<io::XInputStream> xInputStream(xNameAccess->getByName(rStreamName), uno::UNO_QUERY);
- boost::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
+ std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
xmlDocPtr pXmlDoc = parseXmlStream(pStream.get());
pXmlDoc->name = reinterpret_cast<char *>(xmlStrdup(reinterpret_cast<xmlChar const *>(OUStringToOString(maTempFile.GetURL(), RTL_TEXTENCODING_UTF8).getStr())));
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 752343b..d9c67b9 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -440,7 +440,7 @@ void SwUiWriterTest::testExportRTF()
pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 3, /*bBasicCall=*/false);
// Create the clipboard document.
- boost::shared_ptr<SwDoc> pClpDoc(new SwDoc());
+ std::shared_ptr<SwDoc> pClpDoc(new SwDoc());
pClpDoc->SetClipBoard(true);
pWrtShell->Copy(pClpDoc.get());
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 48c92bb..f6daa8e 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -31,7 +31,7 @@
#include <doc.hxx>
#include <docsh.hxx>
#include <swevent.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
@@ -99,7 +99,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray* pArgs )
break;
case EXTENDED_STYPE:
{
- boost::scoped_ptr<Sequence<Any> > pUnoArgs;
+ std::unique_ptr<Sequence<Any> > pUnoArgs;
if( pArgs )
{
// better to rename the local function to lcl_translateBasic2Uno and
@@ -212,7 +212,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
}
else if( EXTENDED_STYPE == rMacro.GetScriptType() )
{
- boost::scoped_ptr<Sequence<Any> > pUnoArgs;
+ std::unique_ptr<Sequence<Any> > pUnoArgs;
if( pArgs )
{
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index ff66dbf..916323e 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -53,7 +53,6 @@
#include <edimp.hxx>
#include <tools/datetimeutils.hxx>
-using namespace ::boost;
using namespace ::sw::mark;
namespace
@@ -385,31 +384,31 @@ namespace sw { namespace mark
switch(eType)
{
case IDocumentMarkAccess::MarkType::TEXT_FIELDMARK:
- pMark = boost::shared_ptr<IMark>(new TextFieldmark(rPaM));
+ pMark = std::shared_ptr<IMark>(new TextFieldmark(rPaM));
break;
case IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK:
- pMark = boost::shared_ptr<IMark>(new CheckboxFieldmark(rPaM));
+ pMark = std::shared_ptr<IMark>(new CheckboxFieldmark(rPaM));
break;
case IDocumentMarkAccess::MarkType::NAVIGATOR_REMINDER:
- pMark = boost::shared_ptr<IMark>(new NavigatorReminder(rPaM));
+ pMark = std::shared_ptr<IMark>(new NavigatorReminder(rPaM));
break;
case IDocumentMarkAccess::MarkType::BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new Bookmark(rPaM, vcl::KeyCode(), rName, OUString()));
+ pMark = std::shared_ptr<IMark>(new Bookmark(rPaM, vcl::KeyCode(), rName, OUString()));
break;
case IDocumentMarkAccess::MarkType::DDE_BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new DdeBookmark(rPaM));
+ pMark = std::shared_ptr<IMark>(new DdeBookmark(rPaM));
break;
case IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, vcl::KeyCode(), rName, OUString()));
+ pMark = std::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, vcl::KeyCode(), rName, OUString()));
break;
case IDocumentMarkAccess::MarkType::CROSSREF_NUMITEM_BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, vcl::KeyCode(), rName, OUString()));
+ pMark = std::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, vcl::KeyCode(), rName, OUString()));
break;
case IDocumentMarkAccess::MarkType::UNO_BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new UnoMark(rPaM));
+ pMark = std::shared_ptr<IMark>(new UnoMark(rPaM));
break;
case IDocumentMarkAccess::MarkType::ANNOTATIONMARK:
- pMark = boost::shared_ptr<IMark>(new AnnotationMark( rPaM, rName ));
+ pMark = std::shared_ptr<IMark>(new AnnotationMark( rPaM, rName ));
break;
}
assert(pMark.get() &&
@@ -801,7 +800,7 @@ namespace sw { namespace mark
// fdo#61016 delay the deletion of the fieldmark characters
// to prevent that from deleting the marks on that position
// which would invalidate the iterators in vMarksToDelete
- std::vector< ::boost::shared_ptr<ILazyDeleter> > vDelay;
+ std::vector< std::shared_ptr<ILazyDeleter> > vDelay;
vDelay.reserve(vMarksToDelete.size());
// If needed, sort mark containers containing subsets of the marks
@@ -837,10 +836,10 @@ namespace sw { namespace mark
struct LazyFieldmarkDeleter : public IDocumentMarkAccess::ILazyDeleter
{
- ::boost::shared_ptr<IMark> const m_pFieldmark;
+ std::shared_ptr<IMark> const m_pFieldmark;
SwDoc *const m_pDoc;
LazyFieldmarkDeleter(
- ::boost::shared_ptr<IMark> const& pMark, SwDoc *const pDoc)
+ std::shared_ptr<IMark> const& pMark, SwDoc *const pDoc)
: m_pFieldmark(pMark), m_pDoc(pDoc)
{ }
virtual ~LazyFieldmarkDeleter()
@@ -852,10 +851,10 @@ namespace sw { namespace mark
}
};
- ::boost::shared_ptr<IDocumentMarkAccess::ILazyDeleter>
+ std::shared_ptr<IDocumentMarkAccess::ILazyDeleter>
MarkManager::deleteMark(const const_iterator_t& ppMark)
{
- ::boost::shared_ptr<ILazyDeleter> ret;
+ std::shared_ptr<ILazyDeleter> ret;
if (ppMark == m_vAllMarks.end()) return ret;
switch(IDocumentMarkAccess::GetType(**ppMark))
@@ -1034,7 +1033,7 @@ namespace sw { namespace mark
for (IDocumentMarkAccess::const_iterator_t aI = m_vFieldmarks.begin(),
aEnd = m_vFieldmarks.end(); aI != aEnd; ++aI)
{
- boost::shared_ptr<IMark> xI = *aI;
+ std::shared_ptr<IMark> xI = *aI;
const SwPosition &rStart = xI->GetMarkPos();
if (!rPaM.ContainsPosition(rStart))
continue;
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 420478e..1463650 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -59,8 +59,6 @@
#include <unotools/configmgr.hxx>
#include <unotools/syslocale.hxx>
-#include <boost/scoped_ptr.hpp>
-
using namespace com::sun::star;
static void lcl_DefaultPageFormat( sal_uInt16 nPoolFormatId,
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 0a89b4f..380dbfc 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -60,7 +60,7 @@
#include <dflyobj.hxx>
#include <undoflystrattr.hxx>
#include <calbck.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
//UUUU
#include <svx/xbtmpit.hxx>
@@ -509,7 +509,7 @@ bool SwDoc::SetFlyFrmAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet )
if( !rSet.Count() )
return false;
- boost::scoped_ptr<SwUndoFormatAttrHelper> pSaveUndo;
+ std::unique_ptr<SwUndoFormatAttrHelper> pSaveUndo;
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -726,7 +726,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
// anchored object the complete <SwPosition> is kept, because the
// anchor index position could be moved, if the object again is
// anchored as character.
- boost::scoped_ptr<const SwPosition> xOldAsCharAnchorPos;
+ std::unique_ptr<const SwPosition> xOldAsCharAnchorPos;
const RndStdIds eOldAnchorType = pContact->GetAnchorId();
if ( !_bSameOnly && eOldAnchorType == FLY_AS_CHAR )
{
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index b6991e4..a16d4d0 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -47,7 +47,7 @@
#include <doctxm.hxx>
#include <poolfmt.hxx>
#include <calbck.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
@@ -162,7 +162,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
sal_uInt16 nOutl = 0;
SwOutlineNodes* pOutlNds = const_cast<SwOutlineNodes*>(&GetNodes().GetOutLineNds());
- boost::scoped_ptr<SwOutlineNodes> xTmpOutlNds;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list