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 /svx/source/form | |
parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'svx/source/form')
-rw-r--r-- | svx/source/form/dbtoolsclient.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmshell.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/fmvwimp.cxx | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index bc4310c7357c..d5bd1a431c90 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -320,6 +320,7 @@ namespace svxform } //---------------------------------------------------------------- + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ::dbtools::FormattedColumnValue > DBToolsObjectFactory::createFormattedColumnValue( const ::comphelper::ComponentContext& _rContext, const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& _rxColumn ) { @@ -328,6 +329,7 @@ namespace svxform pValue = getFactory()->createFormattedColumnValue( _rContext, _rxRowSet, _rxColumn ); return pValue; } + SAL_WNODEPRECATED_DECLARATIONS_POP //........................................................................ } // namespace svxform diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index df6aa255cc62..6602b1846acf 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -102,6 +102,8 @@ #include <comphelper/property.hxx> #include <com/sun/star/beans/PropertyValue.hpp> +#include <boost/scoped_ptr.hpp> + // wird fuer Invalidate verwendet -> mitpflegen // aufsteigend sortieren !!!!!! sal_uInt16 ControllerSlotMap[] = // slots des Controllers @@ -773,7 +775,7 @@ void FmFormShell::Execute(SfxRequest &rReq) DBG_ASSERT( pFact, "no dialog factory!" ); if ( pFact ) { - ::std::auto_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) ); + boost::scoped_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) ); DBG_ASSERT( dlg.get(), "Dialogdiet fail!" ); dlg->SetValue( rController->getCursor()->getRow() ); if ( dlg->Execute() == RET_OK ) @@ -1398,6 +1400,7 @@ namespace } //------------------------------------------------------------------------ +SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const { ::std::auto_ptr< ::svx::ISdrObjectFilter > pFilter; @@ -1407,6 +1410,7 @@ namespace return pFilter; } +SAL_WNODEPRECATED_DECLARATIONS_POP //------------------------------------------------------------------------ SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxModel, const SdrView& _rView, const OutputDevice& _rDevice, Reference< XControl >& _out_rxControl ) const diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 044335f0315a..37828f35c71f 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1559,7 +1559,9 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& bool bNeedLabel = ( _nControlObjectID != OBJ_FM_CHECKBOX ); // the label + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< SdrUnoObj > pLabel; + SAL_WNODEPRECATED_DECLARATIONS_POP Reference< XPropertySet > xLabelModel; if ( bNeedLabel ) { @@ -1591,8 +1593,10 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& } // the control + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< SdrUnoObj > pControl( dynamic_cast< SdrUnoObj* >( SdrObjFactory::MakeNewObject( _nInventor, _nControlObjectID, _pControlPage, _pModel ) ) ); + SAL_WNODEPRECATED_DECLARATIONS_POP OSL_ENSURE( pControl.get(), "FmXFormView::createControlLabelPair: could not create the control!" ); if ( !pControl.get() ) return false; |