From 5d6da5c1f774b02973085816bb0717d8a2c891a3 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Fri, 8 Jan 2010 17:13:53 +0100
Subject: swunolocking1: #i105557#: SwXTextRange:  move static methods to
 namespace sw.  clean up the implementation a little.

---
 sw/source/core/unocore/unodraw.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sw/source/core/unocore/unodraw.cxx')

diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 9a2eb1dfae45..c8a0b78bb48c 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -784,7 +784,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
     if( pDesc && (xRg = pDesc->GetTextRange()).is() )
     {
         pInternalPam = new SwUnoInternalPaM(*pDoc);
-        if(SwXTextRange::XTextRangeToSwPaM(*pInternalPam, xRg))
+        if (::sw::XTextRangeToSwPaM(*pInternalPam, xRg))
         {
             if(FLY_AT_FLY == aAnchor.GetAnchorId() &&
                                 !pInternalPam->GetNode()->FindFlyStartNode())
@@ -1302,7 +1302,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
                                         new SwUnoInternalPaM( *(pFmt->GetDoc()) );
                         uno::Reference< text::XTextRange > xRg;
                         aValue >>= xRg;
-                        if ( SwXTextRange::XTextRangeToSwPaM(*pInternalPam, xRg) )
+                        if (::sw::XTextRangeToSwPaM(*pInternalPam, xRg) )
                         {
                             if (aAnchor.GetAnchorId() == FLY_AS_CHAR)
                             {
@@ -1634,9 +1634,9 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
                     {
                         if ( aAnchor.GetCntntAnchor() )
                         {
-                            uno::Reference< text::XTextRange > xTextRange =
-                                SwXTextRange::CreateTextRangeFromPosition(
-                                                    pFmt->GetDoc(),
+                            const uno::Reference< text::XTextRange > xTextRange
+                                = SwXTextRange::CreateXTextRange(
+                                                    *pFmt->GetDoc(),
                                                     *aAnchor.GetCntntAnchor(),
                                                     0L );
                             aRet.setValue(&xTextRange, ::getCppuType((uno::Reference<text::XTextRange>*)0));
@@ -2203,7 +2203,7 @@ uno::Reference< text::XTextRange >  SwXShape::getAnchor(void) throw( uno::Runtim
             (rAnchor.GetCntntAnchor() && !rAnchor.GetPageNum()))
         {
             const SwPosition &rPos = *(pFmt->GetAnchor().GetCntntAnchor());
-            aRef = SwXTextRange::CreateTextRangeFromPosition(pFmt->GetDoc(), rPos, 0);
+            aRef = SwXTextRange::CreateXTextRange(*pFmt->GetDoc(), rPos, 0);
         }
     }
     else
-- 
cgit v1.2.3