diff options
Diffstat (limited to 'sw/source/core/unocore/unotext.cxx')
| -rw-r--r-- | sw/source/core/unocore/unotext.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 860ffc71cd0f..594c3cf2d159 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -121,6 +121,7 @@ public: bool CheckForOwnMember(const SwPaM & rPaM) throw (lang::IllegalArgumentException, uno::RuntimeException); + SAL_WNODEPRECATED_DECLARATIONS_PUSH void ConvertCell( const bool bFirstCell, const uno::Sequence< uno::Reference< text::XTextRange > > & rCell, @@ -128,6 +129,7 @@ public: ::std::auto_ptr< SwPaM > & rpFirstPaM, SwPaM & rLastPaM, bool & rbExcept); + SAL_WNODEPRECATED_DECLARATIONS_POP }; @@ -1552,7 +1554,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) } uno::Reference< text::XTextContent > xRet; SwUnoInternalPaM aStartPam(*GetDoc()); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< SwUnoInternalPaM > pEndPam(new SwUnoInternalPaM(*GetDoc())); + SAL_WNODEPRECATED_DECLARATIONS_POP if (!::sw::XTextRangeToSwPaM(aStartPam, xStart) || !::sw::XTextRangeToSwPaM(*pEndPam, xEnd)) { @@ -1779,6 +1783,7 @@ static bool lcl_SimilarPosition( const sal_Int32 nPos1, const sal_Int32 nPos2 ) return abs( nPos1 - nPos2 ) < COL_POS_FUZZY; } +SAL_WNODEPRECATED_DECLARATIONS_PUSH void SwXText::Impl::ConvertCell( const bool bFirstCell, const uno::Sequence< uno::Reference< text::XTextRange > > & rCell, @@ -1938,6 +1943,7 @@ void SwXText::Impl::ConvertCell( rpFirstPaM.reset(new SwPaM(*aStartCellPam.Start())); } } +SAL_WNODEPRECATED_DECLARATIONS_POP typedef uno::Sequence< text::TableColumnSeparator > TableColumnSeparators; @@ -2169,7 +2175,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) //at first collect the text ranges as SwPaMs const uno::Sequence< uno::Sequence< uno::Reference< text::XTextRange > > >* pTableRanges = rTableRanges.getConstArray(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr < SwPaM > pFirstPaM; + SAL_WNODEPRECATED_DECLARATIONS_POP std::vector< std::vector<SwNodeRange> > aTableNodes; bool bExcept = false; SwPaM aLastPaM(m_pImpl->m_pDoc->GetNodes()); @@ -2509,8 +2517,10 @@ throw (uno::RuntimeException) SwNode& rNode = GetDoc()->GetNodes().GetEndOfContent(); SwPosition aPos(rNode); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<SwUnoCrsr> pUnoCursor( GetDoc()->CreateUnoCrsr(aPos, sal_False)); + SAL_WNODEPRECATED_DECLARATIONS_POP pUnoCursor->Move(fnMoveBackward, fnGoDoc); const uno::Reference< container::XEnumeration > xRet = new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_BODY); @@ -2785,8 +2795,10 @@ throw (uno::RuntimeException) const SwFmtCntnt& rFlyCntnt = rHeadFootFmt.GetCntnt(); const SwNode& rNode = rFlyCntnt.GetCntntIdx()->GetNode(); SwPosition aPos(rNode); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<SwUnoCrsr> pUnoCursor( GetDoc()->CreateUnoCrsr(aPos, sal_False)); + SAL_WNODEPRECATED_DECLARATIONS_POP pUnoCursor->Move(fnMoveForward, fnGoNode); aRef = new SwXParagraphEnumeration(this, pUnoCursor, (m_pImpl->m_bIsHeader) ? CURSOR_HEADER : CURSOR_FOOTER); |