summaryrefslogtreecommitdiffstats
path: root/dbaccess/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui')
-rw-r--r--dbaccess/source/ui/app/AppController.cxx20
-rw-r--r--dbaccess/source/ui/app/AppControllerDnD.cxx3
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx6
-rw-r--r--dbaccess/source/ui/app/AppView.cxx6
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx6
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx4
-rw-r--r--dbaccess/source/ui/control/toolboxcontroller.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/JoinDesignView.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx12
-rw-r--r--dbaccess/source/ui/querydesign/QueryViewSwitch.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx6
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx6
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx6
14 files changed, 93 insertions, 0 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 9c349639445c..e02e1874f400 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -342,7 +342,9 @@ OApplicationController::~OApplicationController()
osl_incrementInterlockedCount( &m_refCount );
dispose();
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< Window> aTemp( getView() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
clearView();
DBG_DTOR(OApplicationController,NULL);
@@ -479,7 +481,9 @@ sal_Bool OApplicationController::Construct(Window* _pParent)
if ( !bSuccess )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< Window> aTemp( getView() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
clearView();
return sal_False;
}
@@ -1099,7 +1103,9 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
if ( !aArgs.getLength() )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( getView() ));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::std::vector<SotFormatStringId> aFormatIds;
getSupportedFormats(getContainer()->getElementType(),aFormatIds);
const ::std::vector<SotFormatStringId>::iterator aEnd = aFormatIds.end();
@@ -1855,7 +1861,9 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const
{
if ( isStandaloneDocument || !m_pSubComponentManager->activateSubFrame( _sName, _eType, _eOpenMode, xRet ) )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< OLinkedDocumentsAccess > aHelper = getDocumentsAccess( _eType );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( !aHelper->isConnected() )
break;
@@ -1877,7 +1885,9 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const
if ( !xConnection.is() )
break;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< DatabaseObjectView > pDesigner;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::comphelper::NamedValueCollection aArguments( _rAdditionalArguments );
Any aDataSource;
@@ -1962,7 +1972,9 @@ void OApplicationController::newElementWithPilot( ElementType _eType )
case E_REPORT:
case E_FORM:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( aHelper->isConnected() )
{
sal_Int32 nCommandType = -1;
@@ -1977,7 +1989,9 @@ void OApplicationController::newElementWithPilot( ElementType _eType )
case E_QUERY:
case E_TABLE:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( aHelper->isConnected() )
{
if ( E_QUERY == _eType )
@@ -2009,7 +2023,9 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType,
case E_FORM:
case E_REPORT:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess( _eType );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( !aHelper->isConnected() )
break;
@@ -2020,7 +2036,9 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType,
case E_QUERY:
case E_TABLE:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< DatabaseObjectView > pDesigner;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
SharedConnection xConnection( ensureConnection() );
if ( !xConnection.is() )
break;
@@ -2091,8 +2109,10 @@ void OApplicationController::renameEntry()
{
if ( xContainer.is() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< IObjectNameCheck > pNameChecker;
::std::auto_ptr< OSaveAsDlg > aDialog;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Reference<XRename> xRename;
const ElementType eType = getContainer()->getElementType();
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 7e8f56972e0f..f0e8ae74ec6e 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -470,6 +470,7 @@ void OApplicationController::getSelectionElementNames(::std::vector< ::rtl::OUSt
}
// -----------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< OLinkedDocumentsAccess > OApplicationController::getDocumentsAccess( ElementType _eType )
{
OSL_ENSURE( ( _eType == E_TABLE ) || ( _eType == E_QUERY ) || ( _eType == E_FORM ) || ( _eType == E_REPORT ),
@@ -489,6 +490,8 @@ void OApplicationController::getSelectionElementNames(::std::vector< ::rtl::OUSt
) );
return pDocuments;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
+
// -----------------------------------------------------------------------------
TransferableHelper* OApplicationController::copyObject()
{
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index c488a0cafa1f..c125979ed1fa 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -263,7 +263,9 @@ 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
m_pLists[i]->clearCurrentSelection(); // why a second time?
m_pLists[i] = NULL;
}
@@ -1173,9 +1175,11 @@ void OAppDetailPageHelper::showPreview( const ::rtl::OUString& _sDataSourceName,
}
Reference< XDatabaseDocumentUI > xApplication( getBorderWin().getView()->getAppController().getXController(), UNO_QUERY );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser(
getBorderWin().getView()->getORB(), xApplication, NULL, _bTable
) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pDispatcher->setTargetFrame( m_xFrame );
::comphelper::NamedValueCollection aArgs;
@@ -1218,7 +1222,9 @@ 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
sal_uInt16 pActions[] = { SID_DB_APP_DISABLE_PREVIEW
, SID_DB_APP_VIEW_DOC_PREVIEW
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 4974a3ef6333..2622c01146e9 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -105,13 +105,17 @@ OAppBorderWindow::~OAppBorderWindow()
if ( m_pPanel )
{
m_pPanel->Hide();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pPanel);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pPanel = NULL;
}
if ( m_pDetailView )
{
m_pDetailView->Hide();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pDetailView);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pDetailView = NULL;
}
@@ -241,7 +245,9 @@ OApplicationView::~OApplicationView()
{
stopComponentListening(m_xObject);
m_pWin->Hide();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pWin);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pWin = NULL;
}
}
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 3eadbe21154c..fb136694de8d 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -333,7 +333,9 @@ void SAL_CALL SbaTableQueryBrowser::disposing()
clearTreeModel();
// clear the tree model
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvLBoxTreeList> aTemp(m_pTreeModel);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pTreeModel = NULL;
}
@@ -2210,7 +2212,9 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce
//------------------------------------------------------------------------------
SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const String& _rName, void* _pUserData, EntryType _eEntryType )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Image aImage;
pImageProvider->getImages( _rName, getDatabaseObjectType( _eEntryType ), aImage );
@@ -3371,6 +3375,7 @@ sal_Bool SbaTableQueryBrowser::ensureConnection(SvLBoxEntry* _pAnyEntry, SharedC
}
// -----------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvLBoxEntry* _pAnyEntry )
{
::std::auto_ptr< ImageProvider > pImageProvider( new ImageProvider );
@@ -3379,6 +3384,7 @@ sal_Bool SbaTableQueryBrowser::ensureConnection(SvLBoxEntry* _pAnyEntry, SharedC
pImageProvider.reset( new ImageProvider( xConnection ) );
return pImageProvider;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
// -----------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::getExistentConnectionFor( SvLBoxEntry* _pAnyEntry, SharedConnection& _rConnection )
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 4e285f9b3172..4b4457fceaee 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -249,11 +249,15 @@ OFieldDescControl::~OFieldDescControl()
DBG_DTOR(OFieldDescControl,NULL);
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pVertScroll);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pVertScroll = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pHorzScroll);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pHorzScroll = NULL;
}
if ( m_bAdded )
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 5f36c9678b99..1590cc2eab4e 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -166,7 +166,9 @@ namespace dbaui
aFind->second = Event.IsEnabled;
if ( m_aCommandURL == aFind->first && !Event.IsEnabled )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<PopupMenu> pMenu = getMenu();
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uInt16 nCount = pMenu->GetItemCount();
for (sal_uInt16 i = 0; i < nCount; ++i)
{
@@ -185,6 +187,7 @@ namespace dbaui
}
}
// -----------------------------------------------------------------------------
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<PopupMenu> OToolboxController::getMenu()
{
::std::auto_ptr<PopupMenu> pMenu;
@@ -232,6 +235,7 @@ namespace dbaui
}
return pMenu;
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// -----------------------------------------------------------------------------
Reference< ::com::sun::star::awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException)
{
@@ -240,7 +244,9 @@ namespace dbaui
::osl::MutexGuard aGuard(m_aMutex);
ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent()));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<PopupMenu> pMenu = getMenu();
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uInt16 nSelected = pMenu->Execute(pToolBox, pToolBox->GetItemRect( m_nToolBoxId ),POPUPMENU_EXECUTE_DOWN);
// "cleanup" the toolbox state
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 397bb804c829..ab5a8927bad2 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -75,9 +75,13 @@ OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController
// -----------------------------------------------------------------------------
OJoinDesignView::~OJoinDesignView()
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aT3(m_pScrollWindow);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pScrollWindow = NULL;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aT2(m_pTableView);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pTableView = NULL;
}
// -------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index f2d906e5017a..6d5c6944f711 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -103,7 +103,9 @@ OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent)
OScrollWindowHelper::~OScrollWindowHelper()
{
DBG_DTOR(OScrollWindowHelper,NULL);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pCornerWindow);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pCornerWindow = NULL;
m_pTableView = NULL;
}
@@ -1632,7 +1634,9 @@ void OJoinTableView::clearLayoutInformation()
{
if ( aIter->second )
aIter->second->clearListBox();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(aIter->second);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
aIter->second = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 27912e355d69..8fc9e70e313b 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -789,7 +789,9 @@ namespace
::rtl::OUString aTmp = aCriteria;
::rtl::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
if (pParseNode.get())
{
if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -820,7 +822,9 @@ namespace
::rtl::OUString aTmp = aCriteria;
::rtl::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
if (pParseNode.get())
{
if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -1182,7 +1186,9 @@ namespace
::rtl::OUString aTmp = pEntryField->GetField();
::rtl::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
if (pParseNode.get())
{
::rtl::OUString sGroupBy;
@@ -2549,7 +2555,9 @@ 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
m_pSelectionBox = NULL;
DBG_DTOR(OQueryDesignView,NULL);
@@ -2952,7 +2960,9 @@ sal_Bool OQueryDesignView::checkStatement()
{
::connectivity::OSQLParser& rParser( rController.getParser() );
::rtl::OUString sErrorMessage;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, sal_True ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( pParseNode.get() )
{
OSQLParseNode* pNode = pParseNode->getChild(3)->getChild(1);
@@ -3066,7 +3076,9 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" 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
nType = DataType::DOUBLE;
if ( pParseNode.get() )
{
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 0ad058656489..e79bed250f34 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -57,11 +57,15 @@ OQueryViewSwitch::~OQueryViewSwitch()
{
DBG_DTOR(OQueryViewSwitch,NULL);
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pTextView);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pTextView = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pDesignView);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pDesignView = NULL;
}
}
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 4c5882c7ef9e..182128d36388 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -85,11 +85,15 @@ OTableBorderWindow::~OTableBorderWindow()
m_pFieldDescWin->Hide();
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pEditorCtrl);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pEditorCtrl = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pFieldDescWin);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pFieldDescWin = NULL;
}
@@ -222,7 +226,9 @@ OTableDesignView::~OTableDesignView()
m_pWin->Hide();
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pWin);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pWin = NULL;
}
}
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index ca2680fc09a8..913cdd2b4a01 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -95,15 +95,21 @@ OTableFieldDescWin::~OTableFieldDescWin()
m_pHeader->Hide();
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pGenPage);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pGenPage = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pHeader);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pHeader = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pHelpBar);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pHelpBar = NULL;
}
}
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 3fb4b032e3bc..52cbf98d4e5d 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -253,11 +253,13 @@ namespace dbaui
/** extracts the source object (table or query) described by the given descriptor,
relative to m_xSourceConnection
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ICopyTableSourceObject >
impl_extractSourceObject_throw(
const Reference< XPropertySet >& _rxDescriptor,
sal_Int32& _out_rCommandType
) const;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/** extracts the result set to copy records from, and the selection-related aspects, if any.
@@ -352,8 +354,10 @@ private:
// source
SharedConnection m_xSourceConnection;
sal_Int32 m_nCommandType;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ICopyTableSourceObject >
m_pSourceObject;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Reference< XResultSet > m_xSourceResultSet;
Sequence< Any > m_aSourceSelection;
sal_Bool m_bSourceSelectionBookmarks;
@@ -770,6 +774,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X
}
//-------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType ) const
{
OSL_PRECOND( _rxDescriptor.is() && m_xSourceConnection.is(), "CopyTableWizard::impl_extractSourceObject_throw: illegal arguments!" );
@@ -838,6 +843,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X
return pSourceObject;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
//-------------------------------------------------------------------------
void CopyTableWizard::impl_extractSourceResultSet_throw( const Reference< XPropertySet >& i_rDescriptor )
generated by cgit (git 2.34.1) at 2024-07-15 23:29:24 +0000