Kaydet (Commit) fd1571e8 authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: use std::unique_ptr<> in dbinsdlg

Change-Id: If882d49c3abe236c8ca5af502a38947b98e34d5e
üst b3de73f3
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
#include <IDocumentMarkAccess.hxx> #include <IDocumentMarkAccess.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
#include <swuiexp.hxx> #include <swuiexp.hxx>
using namespace ::dbtools; using namespace ::dbtools;
...@@ -762,7 +762,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void ...@@ -762,7 +762,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void
SwAbstractDialogFactory* pFact = swui::GetFactory(); SwAbstractDialogFactory* pFact = swui::GetFactory();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTableTabDlg(pButton, rSh.GetAttrPool(), pTableSet, &rSh)); std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTableTabDlg(pButton, rSh.GetAttrPool(), pTableSet, &rSh));
OSL_ENSURE(pDlg, "Dialog creation failed!"); OSL_ENSURE(pDlg, "Dialog creation failed!");
if( RET_OK == pDlg->Execute() ) if( RET_OK == pDlg->Execute() )
pTableSet->Put( *pDlg->GetOutputItemSet() ); pTableSet->Put( *pDlg->GetOutputItemSet() );
...@@ -778,7 +778,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, AutoFormatHdl, Button*, pButton, void ) ...@@ -778,7 +778,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, AutoFormatHdl, Button*, pButton, void )
SwAbstractDialogFactory* pFact = swui::GetFactory(); SwAbstractDialogFactory* pFact = swui::GetFactory();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pView->GetWrtShellPtr(), false, pTAutoFormat)); std::unique_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pView->GetWrtShellPtr(), false, pTAutoFormat));
OSL_ENSURE(pDlg, "Dialog creation failed!"); OSL_ENSURE(pDlg, "Dialog creation failed!");
if( RET_OK == pDlg->Execute()) if( RET_OK == pDlg->Execute())
pDlg->FillAutoFormatOfIndex( pTAutoFormat ); pDlg->FillAutoFormatOfIndex( pTAutoFormat );
...@@ -986,7 +986,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, ...@@ -986,7 +986,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
if( rSh.HasSelection() ) if( rSh.HasSelection() )
rSh.DelRight(); rSh.DelRight();
boost::scoped_ptr<SwWait> pWait; std::unique_ptr<SwWait> pWait;
Reference< XColumnsSupplier > xColsSupp( xResultSet, UNO_QUERY ); Reference< XColumnsSupplier > xColsSupp( xResultSet, UNO_QUERY );
Reference <XNameAccess> xCols = xColsSupp->getColumns(); Reference <XNameAccess> xCols = xColsSupp->getColumns();
...@@ -1296,7 +1296,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, ...@@ -1296,7 +1296,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
case _DB_Column::DB_COL_FIELD: case _DB_Column::DB_COL_FIELD:
{ {
boost::scoped_ptr<SwDBField> pField(static_cast<SwDBField *>( std::unique_ptr<SwDBField> pField(static_cast<SwDBField *>(
pDBCol->DB_ColumnData.pField->CopyField())); pDBCol->DB_ColumnData.pField->CopyField()));
double nValue = DBL_MAX; double nValue = DBL_MAX;
...@@ -1660,7 +1660,7 @@ void SwInsertDBColAutoPilot::Load() ...@@ -1660,7 +1660,7 @@ void SwInsertDBColAutoPilot::Load()
pDataSourceProps[2] >>= nCommandType; pDataSourceProps[2] >>= nCommandType;
if(sSource.equals(aDBData.sDataSource) && sCommand.equals(aDBData.sCommand)) if(sSource.equals(aDBData.sDataSource) && sCommand.equals(aDBData.sCommand))
{ {
boost::scoped_ptr<_DB_ColumnConfigData> pNewData(new _DB_ColumnConfigData); std::unique_ptr<_DB_ColumnConfigData> pNewData(new _DB_ColumnConfigData);
pNewData->sSource = sSource; pNewData->sSource = sSource;
pNewData->sTable = sCommand; pNewData->sTable = sCommand;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment