diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-15 19:35:25 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-15 21:19:09 -0400 |
| commit | 1fda1581d8ff8e85a4fa0e73e5147fd6798895e9 (patch) | |
| tree | 83b76e5ff67b37186a43a1ff12789448c4cc5b33 | |
| parent | d3f62f190e454946ec6be518f6a440bb39b8f584 (diff) | |
suppress auto_ptr warnings
Change-Id: I2486a2d0647e425e7607b0a7a56ea3bf130ed0e2
| -rw-r--r-- | svx/inc/svx/AccessibleTextHelper.hxx | 4 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleEmptyEditSource.hxx | 2 | ||||
| -rw-r--r-- | svx/source/table/accessiblecell.cxx | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/svx/inc/svx/AccessibleTextHelper.hxx index 9d4689687295..c930af0cb2e4 100644 --- a/svx/inc/svx/AccessibleTextHelper.hxx +++ b/svx/inc/svx/AccessibleTextHelper.hxx @@ -124,7 +124,9 @@ namespace accessibility model) contained in the given SvxEditSource. */ + SAL_WNODEPRECATED_DECLARATIONS_PUSH explicit AccessibleTextHelper( ::std::auto_ptr< SvxEditSource > pEditSource ); + SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~AccessibleTextHelper(); protected: @@ -185,7 +187,9 @@ namespace accessibility The new edit source to set. Object ownership is transferred from the caller to the callee. */ + SAL_WNODEPRECATED_DECLARATIONS_PUSH virtual void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException)); + SAL_WNODEPRECATED_DECLARATIONS_POP /** Set the event source diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx index 89d71dd6b36f..3e1052bd8993 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx @@ -77,7 +77,9 @@ namespace accessibility @dyn */ + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< SvxEditSource > mpEditSource; + SAL_WNODEPRECATED_DECLARATIONS_POP SdrObject& mrObj; SdrView& mrView; diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 4d28f53e3a15..43249d90492c 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -82,7 +82,9 @@ void AccessibleCell::Init (void) if( pOutlinerParaObject ) { // non-empty text -> use full-fledged edit source right away + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<SvxEditSource> pEditSource( new SvxTextEditSource( mxCell->GetObject(), mxCell.get(), *pView, *pWindow) ); + SAL_WNODEPRECATED_DECLARATIONS_POP mpText = new AccessibleTextHelper( pEditSource ); mpText->SetEventSource(this); } |