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 /formula | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/inc/formula/FormulaOpCodeMapperObj.hxx | 4 | ||||
| -rw-r--r-- | formula/inc/formula/formula.hxx | 4 | ||||
| -rw-r--r-- | formula/source/core/api/FormulaOpCodeMapperObj.cxx | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/formula/inc/formula/FormulaOpCodeMapperObj.hxx b/formula/inc/formula/FormulaOpCodeMapperObj.hxx index 78d44e91892a..7451013c16c7 100644 --- a/formula/inc/formula/FormulaOpCodeMapperObj.hxx +++ b/formula/inc/formula/FormulaOpCodeMapperObj.hxx @@ -45,14 +45,18 @@ class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2< ::com::sun::star::sheet::XFormulaOpCodeMapper, ::com::sun::star::lang::XServiceInfo > { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<FormulaCompiler> m_pCompiler; + SAL_WNODEPRECATED_DECLARATIONS_POP public: static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext); protected: + SAL_WNODEPRECATED_DECLARATIONS_PUSH FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler> _pCompiler); + SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~FormulaOpCodeMapperObj(); private: diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx index 8da444308d93..32643b5a4ba5 100644 --- a/formula/inc/formula/formula.hxx +++ b/formula/inc/formula/formula.hxx @@ -69,7 +69,9 @@ public: ,IControlReferenceHandler* _pDlg = NULL ); virtual ~FormulaModalDialog(); private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<FormulaDlg_Impl> m_pImpl; + SAL_WNODEPRECATED_DECLARATIONS_POP protected: void disableOk(); @@ -117,7 +119,9 @@ public: , IControlReferenceHandler* _pDlg = NULL ); virtual ~FormulaDlg(); private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<FormulaDlg_Impl> m_pImpl; + SAL_WNODEPRECATED_DECLARATIONS_POP DECL_LINK( UpdateFocusHdl, Timer*); protected: diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx index 50ed85868538..c3be20034d04 100644 --- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx +++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx @@ -44,10 +44,12 @@ sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const ::rtl::OUString return ::comphelper::findValue( getSupportedServiceNames_Static(), _rServiceName, sal_True ).getLength() != 0; } //------------------------------------------------------------------------ +SAL_WNODEPRECATED_DECLARATIONS_PUSH FormulaOpCodeMapperObj::FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler> _pCompiler) : m_pCompiler(_pCompiler) { } +SAL_WNODEPRECATED_DECLARATIONS_POP FormulaOpCodeMapperObj::~FormulaOpCodeMapperObj() { @@ -115,11 +117,14 @@ uno::Sequence< rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServ return aSeq; } +SAL_WNODEPRECATED_DECLARATIONS_PUSH uno::Reference< uno::XInterface > SAL_CALL FormulaOpCodeMapperObj::create( uno::Reference< uno::XComponentContext > const & /*_xContext*/) { return static_cast<sheet::XFormulaOpCodeMapper*>(new FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler>(new FormulaCompiler()))); } +SAL_WNODEPRECATED_DECLARATIONS_POP + // ----------------------------------------------------------------------------- // ============================================================================= |