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 /reportdesign/source/ui/dlg/Formula.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 'reportdesign/source/ui/dlg/Formula.cxx')
| -rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 60e97c7257a5..5092c43265c2 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -42,6 +42,8 @@ #include <formula/funcutl.hxx> #include <formula/tokenarray.hxx> +#include <boost/scoped_ptr.hpp> + #include "Formula.hxx" #include "AddField.hxx" #include "helpids.hrc" @@ -103,7 +105,7 @@ FormulaDialog::~FormulaDialog() SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); - ::std::auto_ptr<Window> aTemp2(m_pAddField); + boost::scoped_ptr<Window> aTemp2(m_pAddField); m_pAddField = NULL; } } @@ -263,12 +265,14 @@ table::CellAddress FormulaDialog::getReferencePosition() const return table::CellAddress(); } // ----------------------------------------------------------------------------- +SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<formula::FormulaTokenArray> FormulaDialog::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList) { ::std::auto_ptr<formula::FormulaTokenArray> pArray(new FormulaTokenArray()); pArray->Fill(_aTokenList, NULL); return pArray; } +SAL_WNODEPRECATED_DECLARATIONS_POP // ============================================================================= } // rptui // ============================================================================= |