summaryrefslogtreecommitdiff
path: root/accessibility/source/extended
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-07 15:32:30 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-07 18:43:31 +0100
commit2935c2999e699ee28bb96fb8680868ec74e20893 (patch)
treeec9d890de8830706302904314ee22aadd57138a2 /accessibility/source/extended
parent2b04d0a17f74a5e8b2f81521710ee91d4daa267f (diff)
auto_ptr -> scoped_ptr
Change-Id: I05c461deca118f1a1b75d94b4d00ce797987e8d6
Diffstat (limited to 'accessibility/source/extended')
-rw-r--r--accessibility/source/extended/textwindowaccessibility.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 002326fed912..d13525df8a2c 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1800,13 +1800,11 @@ void Document::init()
if (m_xParagraphs.get() == 0)
{
::sal_uLong nCount = m_rEngine.GetParagraphCount();
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< Paragraphs > p(new Paragraphs);
- SAL_WNODEPRECATED_DECLARATIONS_POP
- p->reserve(static_cast< Paragraphs::size_type >(nCount));
+ m_xParagraphs.reset(new Paragraphs);
+ m_xParagraphs->reserve(static_cast< Paragraphs::size_type >(nCount));
// numeric overflow is harmless here
for (::sal_uLong i = 0; i < nCount; ++i)
- p->push_back(ParagraphInfo(static_cast< ::sal_Int32 >(
+ m_xParagraphs->push_back(ParagraphInfo(static_cast< ::sal_Int32 >(
m_rEngine.GetTextHeight(i))));
// XXX numeric overflow
m_nViewOffset = static_cast< ::sal_Int32 >(
@@ -1814,7 +1812,6 @@ void Document::init()
m_nViewHeight = static_cast< ::sal_Int32 >(
m_rView.GetWindow()->GetOutputSizePixel().Height());
// XXX numeric overflow
- m_xParagraphs = p;
determineVisibleRange();
m_nSelectionFirstPara = -1;
m_nSelectionFirstPos = -1;