diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:00:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:05 +0100 |
| commit | 871426533f7afe31bc451fa6b407b83db8e52827 (patch) | |
| tree | ed60cee61ebee91994eaffc9c9a3638836ed2ab4 /dbaccess/source/ui/app/AppController.cxx | |
| parent | should be > 4, not > 5 (diff) | |
| download | core-871426533f7afe31bc451fa6b407b83db8e52827.tar.gz core-871426533f7afe31bc451fa6b407b83db8e52827.zip | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'dbaccess/source/ui/app/AppController.cxx')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 20 |
1 files changed, 20 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(); |