[Libreoffice-commits] core.git: connectivity/source cui/source dbaccess/source
Takeshi Abe
tabe at fixedpoint.jp
Sat Feb 22 05:21:01 PST 2014
connectivity/source/commontools/predicateinput.cxx | 3 +
connectivity/source/drivers/hsqldb/HDriver.cxx | 4 +-
connectivity/source/drivers/jdbc/PreparedStatement.cxx | 3 +
connectivity/source/drivers/jdbc/ResultSet.cxx | 3 +
connectivity/source/drivers/odbc/OPreparedStatement.cxx | 3 +
connectivity/source/parse/sqliterator.cxx | 3 +
connectivity/source/parse/sqlnode.cxx | 3 +
cui/source/options/treeopt.cxx | 4 +-
dbaccess/source/core/dataaccess/intercept.cxx | 3 +
dbaccess/source/filter/xml/xmlExport.cxx | 13 ++------
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 14 +++-----
dbaccess/source/ui/app/AppTitleWindow.cxx | 4 +-
dbaccess/source/ui/app/AppView.cxx | 13 ++------
dbaccess/source/ui/browser/brwview.cxx | 5 +--
dbaccess/source/ui/browser/dbtreeview.cxx | 3 +
dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 3 +
dbaccess/source/ui/browser/genericcontroller.cxx | 3 +
dbaccess/source/ui/querydesign/JoinController.cxx | 3 +
dbaccess/source/ui/querydesign/JoinDesignView.cxx | 8 +----
dbaccess/source/ui/querydesign/JoinTableView.cxx | 9 +----
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 25 ++++------------
dbaccess/source/ui/querydesign/QueryTextView.cxx | 3 +
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 9 +----
dbaccess/source/ui/querydesign/TableWindow.cxx | 4 +-
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 5 +--
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 3 +
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 13 ++------
27 files changed, 75 insertions(+), 94 deletions(-)
New commits:
commit 3b06e5e646878c751c02f395dce9002822895f07
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Feb 22 21:51:27 2014 +0900
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I1ebfb33063d39f64dc59623df0f942501870c4e7
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index ca69ce7..79cc269 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -31,6 +31,7 @@
#include <connectivity/PColumn.hxx>
#include <comphelper/numbers.hxx>
+#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
//.........................................................................
@@ -344,7 +345,7 @@ namespace dbtools
{
// first try the international version
OUString sSql = "SELECT * FROM x WHERE " + sField + _rPredicateValue;
- ::std::auto_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, sal_True ) );
+ boost::scoped_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, sal_True ) );
nType = DataType::DOUBLE;
if ( pParseNode.get() )
{
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 37eee50..f11ca61 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -57,6 +57,8 @@
#include <o3tl/compat_functional.hxx>
+#include <boost/scoped_ptr.hpp>
+
//........................................................................
namespace connectivity
{
@@ -266,7 +268,7 @@ namespace connectivity
Reference<XStream > xStream = xStorage->openStreamElement(sProperties,ElementModes::READ);
if ( xStream.is() )
{
- ::std::auto_ptr<SvStream> pStream( ::utl::UcbStreamHelper::CreateStream(xStream) );
+ boost::scoped_ptr<SvStream> pStream( ::utl::UcbStreamHelper::CreateStream(xStream) );
if ( pStream.get() )
{
OString sLine;
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index c66b703..fa941de 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -34,6 +34,7 @@
#include "resource/sharedresources.hxx"
#include "java/LocalRef.hxx"
#include <string.h>
+#include <boost/scoped_ptr.hpp>
using namespace connectivity;
using namespace ::com::sun::star::uno;
@@ -340,7 +341,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter
case DataType::DECIMAL:
case DataType::NUMERIC:
{
- ::std::auto_ptr<java_math_BigDecimal> pBigDecimal;
+ boost::scoped_ptr<java_math_BigDecimal> pBigDecimal;
if ( x >>= nTemp)
{
pBigDecimal.reset(new java_math_BigDecimal(nTemp));
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 34526ca..1b3c38c 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -46,6 +46,7 @@
#include "java/LocalRef.hxx"
#include <string.h>
+#include <boost/scoped_ptr.hpp>
using namespace ::comphelper;
@@ -873,7 +874,7 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co
{
// convert parameter
double nTemp = 0.0;
- ::std::auto_ptr<java_math_BigDecimal> pBigDecimal;
+ boost::scoped_ptr<java_math_BigDecimal> pBigDecimal;
if ( x >>= nTemp)
{
pBigDecimal.reset(new java_math_BigDecimal(nTemp));
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index c0e4f0d..c5a3bdf 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -38,6 +38,7 @@
#include "connectivity/FValue.hxx"
#include "resource/common_res.hrc"
#include "connectivity/sqlparse.hxx"
+#include <boost/scoped_ptr.hpp>
#include <boost/type_traits/remove_reference.hpp>
#include <boost/type_traits/is_same.hpp>
@@ -77,7 +78,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString
OSQLParser aParser( comphelper::getComponentContext(_pConnection->getDriver()->getORB()) );
OUString sErrorMessage;
OUString sNewSql;
- ::std::auto_ptr<OSQLParseNode> pNode( aParser.parseTree(sErrorMessage,sql) );
+ boost::scoped_ptr<OSQLParseNode> pNode( aParser.parseTree(sErrorMessage,sql) );
if ( pNode.get() )
{ // special handling for parameters
OSQLParseNode::substituteParameterNames(pNode.get());
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 31a69ae..f896a1e 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -41,6 +41,7 @@
#include <iterator>
+#include <boost/scoped_ptr.hpp>
using namespace ::comphelper;
using namespace ::connectivity;
@@ -339,7 +340,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu
break;
OUString sError;
- ::std::auto_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser& >( m_rParser ).parseTree( sError, sSubQueryCommand, sal_False ) );
+ boost::scoped_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser& >( m_rParser ).parseTree( sError, sSubQueryCommand, sal_False ) );
if ( !pSubQueryNode.get() )
break;
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 2e60e8e..5ac2712 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -54,6 +54,7 @@
#include <tools/diagnose_ex.h>
#include <string.h>
#include <boost/bind.hpp>
+#include <boost/scoped_ptr.hpp>
#include <boost/static_assert.hpp>
#include <algorithm>
#include <functional>
@@ -687,7 +688,7 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw( OUStringBuffer& rStri
if ( bEscapeProcessing && rParam.pParser )
{
OUString sError;
- ::std::auto_ptr< OSQLParseNode > pSubQueryNode( rParam.pParser->parseTree( sError, sCommand, sal_False ) );
+ boost::scoped_ptr< OSQLParseNode > pSubQueryNode( rParam.pParser->parseTree( sError, sCommand, sal_False ) );
if ( pSubQueryNode.get() )
{
// parse the sub-select to SDBC level, too
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index aa4d775..d0f10f9 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -104,6 +104,8 @@
#include <sys/stat.h>
#endif
+#include <boost/scoped_ptr.hpp>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
@@ -2251,7 +2253,7 @@ void OfaTreeOptionsDialog::InsertNodes( const VectorOfNodes& rNodeList )
short OfaTreeOptionsDialog::Execute()
{
- ::std::auto_ptr< SvxDicListChgClamp > pClamp;
+ boost::scoped_ptr< SvxDicListChgClamp > pClamp;
if ( !bIsFromExtensionManager )
{
// collect all DictionaryList Events while the dialog is executed
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index ac6faff..fb9eb92 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -30,6 +30,7 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
+#include <boost/scoped_ptr.hpp>
namespace dbaccess
{
@@ -182,7 +183,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal
IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher )
{
- ::std::auto_ptr<DispatchHelper> pHelper( reinterpret_cast< DispatchHelper* >( _pDispatcher ) );
+ boost::scoped_ptr<DispatchHelper> pHelper( reinterpret_cast< DispatchHelper* >( _pDispatcher ) );
try
{
if ( m_pContentHolder && m_pContentHolder->prepareClose() && m_xSlaveDispatchProvider.is() )
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 866436e..5bd8dc5 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -52,6 +52,7 @@
#include <connectivity/dbtools.hxx>
#include <boost/optional.hpp>
+#include <boost/scoped_ptr.hpp>
namespace dbaxml
{
@@ -837,9 +838,7 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection
{
if ( _xCollection.is() )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<SvXMLElementExport> pComponents;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<SvXMLElementExport> pComponents;
if ( _bExportContext )
pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB, _eComponents, sal_True, sal_True));
Sequence< OUString> aSeq = _xCollection->getElementNames();
@@ -1119,9 +1118,7 @@ void ODBExport::exportQueries(sal_Bool _bExportContext)
Reference< XNameAccess > xCollection = xSup->getQueryDefinitions();
if ( xCollection.is() && xCollection->hasElements() )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
if ( _bExportContext )
pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportQuery) );
else
@@ -1141,9 +1138,7 @@ void ODBExport::exportTables(sal_Bool _bExportContext)
Reference< XNameAccess > xCollection = xSup->getTables();
if ( xCollection.is() && xCollection->hasElements() )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_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/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 2e58d1b..273e553 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -67,6 +67,8 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
+#include <boost/scoped_ptr.hpp>
+
using namespace ::dbaui;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::uno;
@@ -242,9 +244,7 @@ OAppDetailPageHelper::~OAppDetailPageHelper()
{
m_pLists[i]->clearCurrentSelection();
m_pLists[i]->Hide();
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<DBTreeListBox> aTemp(m_pLists[i]);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<DBTreeListBox> aTemp(m_pLists[i]);
m_pLists[i]->clearCurrentSelection(); // why a second time?
m_pLists[i] = NULL;
}
@@ -1140,12 +1140,10 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName,
}
Reference< XDatabaseDocumentUI > xApplication( getBorderWin().getView()->getAppController().getXController(), UNO_QUERY );
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser(
+ boost::scoped_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser(
getBorderWin().getView()->getORB(),
xApplication, NULL, _bTable
) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
pDispatcher->setTargetFrame( Reference<XFrame>(m_xFrame,UNO_QUERY_THROW) );
::comphelper::NamedValueCollection aArgs;
@@ -1188,9 +1186,7 @@ IMPL_LINK(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, /*pToolBox*/)
m_aTBPreview.Update();
// execute the menu
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<PopupMenu> aMenu(new PopupMenu( ModuleRes( RID_MENU_APP_PREVIEW ) ));
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_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/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 3f794cf..0e66f97 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -19,10 +19,10 @@
#include "AppTitleWindow.hxx"
#include "moduledbu.hxx"
-#include "memory"
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <tools/debug.hxx>
+#include <boost/scoped_ptr.hpp>
namespace dbaui
{
@@ -50,7 +50,7 @@ OTitleWindow::~OTitleWindow()
if ( m_pChild )
{
m_pChild->Hide();
- ::std::auto_ptr<Window> aTemp(m_pChild);
+ boost::scoped_ptr<Window> aTemp(m_pChild);
m_pChild = NULL;
}
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 056aa43..f4df7c5 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -44,6 +44,7 @@
#include "browserids.hxx"
#include <unotools/pathoptions.hxx>
#include "IApplicationController.hxx"
+#include <boost/scoped_ptr.hpp>
using namespace ::dbaui;
using namespace ::com::sun::star::uno;
@@ -89,17 +90,13 @@ OAppBorderWindow::~OAppBorderWindow()
if ( m_pPanel )
{
m_pPanel->Hide();
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aTemp(m_pPanel);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aTemp(m_pPanel);
m_pPanel = NULL;
}
if ( m_pDetailView )
{
m_pDetailView->Hide();
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aTemp(m_pDetailView);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aTemp(m_pDetailView);
m_pDetailView = NULL;
}
@@ -219,9 +216,7 @@ OApplicationView::~OApplicationView()
{
stopComponentListening(m_xObject);
m_pWin->Hide();
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aTemp(m_pWin);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aTemp(m_pWin);
m_pWin = NULL;
}
}
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index b0dc4f8..ea2d4d6 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -30,6 +30,7 @@
#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;
@@ -117,7 +118,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont
UnoDataBrowserView::~UnoDataBrowserView()
{
{
- ::std::auto_ptr<Splitter> aTemp(m_pSplitter);
+ boost::scoped_ptr<Splitter> aTemp(m_pSplitter);
m_pSplitter = NULL;
}
setTreeView(NULL);
@@ -160,7 +161,7 @@ void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView)
{
if (m_pTreeView)
{
- ::std::auto_ptr<Window> aTemp(m_pTreeView);
+ boost::scoped_ptr<Window> aTemp(m_pTreeView);
m_pTreeView = NULL;
}
m_pTreeView = _pTreeView;
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 74edd00..e769f37 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -22,6 +22,7 @@
#include "dbtreelistbox.hxx"
#include "dbtreemodel.hxx"
#include "dbaccess_helpid.hrc"
+#include <boost/scoped_ptr.hpp>
namespace dbaui
{
@@ -52,7 +53,7 @@ DBTreeView::~DBTreeView()
m_pTreeListBox->GetModel()->RemoveView(m_pTreeListBox);
m_pTreeListBox->DisconnectFromModel();
}
- ::std::auto_ptr<Window> aTemp(m_pTreeListBox);
+ boost::scoped_ptr<Window> aTemp(m_pTreeListBox);
m_pTreeListBox = NULL;
}
}
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 6fe80d8..7126134 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -27,6 +27,7 @@
#include "dbu_brw.hrc"
#include "dbtreemodel.hxx"
#include "svtools/treelistentry.hxx"
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::frame;
using namespace ::dbtools;
@@ -202,7 +203,7 @@ void SbaTableQueryBrowser::notifyHiContrastChanged()
}
// the connection to which this entry belongs, if any
- ::std::auto_ptr< ImageProvider > pImageProvider( getImageProviderFor( pEntryLoop ) );
+ boost::scoped_ptr< ImageProvider > pImageProvider( getImageProviderFor( pEntryLoop ) );
// the images for this entry
Image aImage;
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index f86f7fe..82e1b22 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -55,6 +55,7 @@
#include <rtl/ustring.hxx>
#include <algorithm>
#include <o3tl/compat_functional.hxx>
+#include <boost/scoped_ptr.hpp>
#include <boost/unordered_map.hpp>
#include <cppuhelper/implbase1.hxx>
#include <limits>
@@ -317,7 +318,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
catch(Exception&)
{
// no one clears my view if I won't
- ::std::auto_ptr<Window> aTemp(m_pView);
+ boost::scoped_ptr<Window> aTemp(m_pView);
m_pView = NULL;
throw;
}
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 8fe635a..75819b0 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -58,6 +58,7 @@
#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;
@@ -171,7 +172,7 @@ OJoinDesignView* OJoinController::getJoinView()
void OJoinController::disposing()
{
{
- ::std::auto_ptr< Window > pEnsureDelete( m_pAddTableDialog );
+ boost::scoped_ptr< Window > pEnsureDelete( m_pAddTableDialog );
m_pAddTableDialog = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index ce3a7ca..cfe2d69 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -61,13 +61,9 @@ OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController
OJoinDesignView::~OJoinDesignView()
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aT3(m_pScrollWindow);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aT3(m_pScrollWindow);
m_pScrollWindow = NULL;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aT2(m_pTableView);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aT2(m_pTableView);
m_pTableView = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 203452c..3c04399 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -45,6 +45,7 @@
#include <comphelper/processfactory.hxx>
#include <tools/diagnose_ex.h>
#include <boost/bind.hpp>
+#include <boost/scoped_ptr.hpp>
#include <algorithm>
#include <functional>
@@ -88,9 +89,7 @@ OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent)
OScrollWindowHelper::~OScrollWindowHelper()
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aTemp(m_pCornerWindow);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aTemp(m_pCornerWindow);
m_pCornerWindow = NULL;
m_pTableView = NULL;
}
@@ -1522,9 +1521,7 @@ void OJoinTableView::clearLayoutInformation()
{
if ( aIter->second )
aIter->second->clearListBox();
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aTemp(aIter->second);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aTemp(aIter->second);
aIter->second = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index dec894f..a98fa31 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -53,6 +53,7 @@
#include "querycontainerwindow.hxx"
#include "sqlmessage.hxx"
#include <unotools/syslocale.hxx>
+#include <boost/scoped_ptr.hpp>
using namespace ::dbaui;
using namespace ::utl;
@@ -790,9 +791,7 @@ namespace
OUString aTmp = aCriteria;
OUString aErrorMsg;
Reference<XPropertySet> xColumn;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
if (pParseNode.get())
{
if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -823,9 +822,7 @@ namespace
OUString aTmp = aCriteria;
OUString aErrorMsg;
Reference<XPropertySet> xColumn;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
if (pParseNode.get())
{
if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -1168,9 +1165,7 @@ namespace
OUString aTmp = pEntryField->GetField();
OUString aErrorMsg;
Reference<XPropertySet> xColumn;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
if (pParseNode.get())
{
OUString sGroupBy;
@@ -2521,9 +2516,7 @@ OQueryDesignView::~OQueryDesignView()
{
if ( m_pTableView )
::dbaui::notifySystemWindow(this,m_pTableView,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aTemp(m_pSelectionBox);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aTemp(m_pSelectionBox);
m_pSelectionBox = NULL;
}
@@ -2929,9 +2922,7 @@ OUString OQueryDesignView::getStatement()
{
::connectivity::OSQLParser& rParser( rController.getParser() );
OUString sErrorMessage;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, sal_True ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, sal_True ) );
if ( pParseNode.get() )
{
OSQLParseNode* pNode = pParseNode->getChild(3)->getChild(1);
@@ -3043,9 +3034,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
sSql += " FROM x WHERE ";
sSql += pEntry->GetField();
sSql += _sCriteria;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, sal_True ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, sal_True ) );
nType = DataType::DOUBLE;
if ( pParseNode.get() )
{
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 4ebfebd..d550877 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -31,6 +31,7 @@
#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;
@@ -51,7 +52,7 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)
OQueryTextView::~OQueryTextView()
{
- ::std::auto_ptr<Window> aTemp(m_pEdit);
+ boost::scoped_ptr<Window> aTemp(m_pEdit);
m_pEdit = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 21fbabb..fe4dc3f 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -26,6 +26,7 @@
#include "adtabdlg.hxx"
#include "querycontroller.hxx"
#include "sqledit.hxx"
+#include <boost/scoped_ptr.hpp>
using namespace dbaui;
using namespace ::com::sun::star::uno;
@@ -42,15 +43,11 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryContro
OQueryViewSwitch::~OQueryViewSwitch()
{
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aTemp(m_pTextView);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aTemp(m_pTextView);
m_pTextView = NULL;
}
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aTemp(m_pDesignView);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aTemp(m_pDesignView);
m_pDesignView = NULL;
}
}
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index f4e6a73..4b22d37 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -45,6 +45,8 @@
#include <connectivity/dbtools.hxx>
#include "svtools/treelistentry.hxx"
+#include <boost/scoped_ptr.hpp>
+
using namespace dbaui;
using namespace ::utl;
using namespace ::com::sun::star;
@@ -99,7 +101,7 @@ OTableWindow::~OTableWindow()
if (m_pListBox)
{
OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!");
- ::std::auto_ptr<Window> aTemp(m_pListBox);
+ boost::scoped_ptr<Window> aTemp(m_pListBox);
m_pListBox = NULL;
}
if ( m_pContainerListener.is() )
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 4bc0b92..aeb3137 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -31,6 +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>
namespace dbaui
{
@@ -56,7 +57,7 @@ namespace dbaui
OQueryContainerWindow::~OQueryContainerWindow()
{
{
- ::std::auto_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch);
+ boost::scoped_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch);
m_pViewSwitch = NULL;
}
if ( m_pBeamer )
@@ -70,7 +71,7 @@ namespace dbaui
xCloseable->close(sal_False); // false - holds the owner ship of this frame
}
- ::std::auto_ptr<Window> aTemp(m_pSplitter);
+ boost::scoped_ptr<Window> aTemp(m_pSplitter);
m_pSplitter = NULL;
}
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index 8ddece2..980da26 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -24,6 +24,7 @@
#include "TableFieldControl.hxx"
#include "TableDesignView.hxx"
#include "TEditControl.hxx"
+#include <boost/scoped_ptr.hpp>
using namespace dbaui;
// class OFieldDescGenWin
@@ -38,7 +39,7 @@ OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp
OFieldDescGenWin::~OFieldDescGenWin()
{
- ::std::auto_ptr<Window> aTemp(m_pFieldControl);
+ boost::scoped_ptr<Window> aTemp(m_pFieldControl);
m_pFieldControl = NULL;
}
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 3630278..d243b26 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -31,6 +31,7 @@
#include <unotools/syslocale.hxx>
#include <vcl/settings.hxx>
#include "UITools.hxx"
+#include <boost/scoped_ptr.hpp>
using namespace ::dbaui;
using namespace ::utl;
@@ -67,15 +68,11 @@ OTableBorderWindow::~OTableBorderWindow()
m_pFieldDescWin->Hide();
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aTemp(m_pEditorCtrl);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aTemp(m_pEditorCtrl);
m_pEditorCtrl = NULL;
}
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aTemp(m_pFieldDescWin);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aTemp(m_pFieldDescWin);
m_pFieldDescWin = NULL;
}
@@ -196,9 +193,7 @@ OTableDesignView::~OTableDesignView()
m_pWin->Hide();
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<Window> aTemp(m_pWin);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<Window> aTemp(m_pWin);
m_pWin = NULL;
}
}
More information about the Libreoffice-commits
mailing list