swunolocking1: #i105557#: SwXParagraph: move static methods to namespace sw.

9 files changed, 18 insertions, 19 deletions

diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index b14aeb7dc3d9..add936e9c702 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -111,9 +111,6 @@ public:
     /// for SwXText
     void attachToText(SwXText & rParent, SwTxtNode & rTxtNode);
 
-    static bool getDefaultTextContentValue(::com::sun::star::uno::Any& rAny,
-        const ::rtl::OUString& rPropertyName, USHORT nWID = 0);
-
     // MetadatableMixin
     virtual ::sfx2::Metadatable* GetCoreObject();
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index c3c3d362db6b..164b35b703da 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -84,6 +84,9 @@ namespace sw {
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
         CreateParentXText(SwDoc & rDoc, const SwPosition& rPos);
 
+    bool GetDefaultTextContentValue(::com::sun::star::uno::Any& rAny,
+        const ::rtl::OUString& rPropertyName, USHORT nWID = 0);
+
 } // namespace sw
 
 
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index ad35f1f28b33..97e90488172a 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -37,7 +37,6 @@
 
 #include <TextCursorHelper.hxx>
 #include <unotextrange.hxx>
-#include <unoparagraph.hxx>
 #include <unomap.hxx>
 #include <unoprnms.hxx>
 #include <unoevtlstnr.hxx>
@@ -461,7 +460,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
     vos::OGuard g(Application::GetSolarMutex());
 
     uno::Any aRet;
-    if(!SwXParagraph::getDefaultTextContentValue(aRet, rPropertyName))
+    if (! ::sw::GetDefaultTextContentValue(aRet, rPropertyName))
     {
         if(rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_LINK_DISPLAY_NAME)))
         {
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 3d24e282f7c8..4511b455b5c9 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -526,7 +526,7 @@ uno::Any SwXFootnote::getPropertyValue( const OUString& rPropertyName )
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
     uno::Any aRet;
-    if(!SwXParagraph::getDefaultTextContentValue(aRet, rPropertyName))
+    if (! ::sw::GetDefaultTextContentValue(aRet, rPropertyName))
     {
         if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_START_REDLINE))||
                 rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_END_REDLINE)))
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 7119f3708711..8fad219d742e 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -57,7 +57,6 @@
 #include <pagedesc.hxx>
 #include <fmtcntnt.hxx>
 #include <unomap.hxx>
-#include <unoparagraph.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <doctxm.hxx>
@@ -1784,8 +1783,10 @@ uno::Any SwXDocumentIndexMark::getPropertyValue(const OUString& rPropertyName)
     const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(rPropertyName);
     if (!pEntry)
         throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
-    if(SwXParagraph::getDefaultTextContentValue(aRet, rPropertyName, pEntry->nWID))
+    if (::sw::GetDefaultTextContentValue(aRet, rPropertyName, pEntry->nWID))
+    {
         return aRet;
+    }
     if(pType && m_pTOXMark)
     {
         switch(pEntry->nWID)
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 8d6ee3f3a65d..8b04e34ac84e 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -512,8 +512,8 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                     + pPropertyNames[nProp],
                 static_cast< cppu::OWeakObject * >(&m_rThis));
         }
-        if (!SwXParagraph::getDefaultTextContentValue(
-            pValues[nProp], pPropertyNames[nProp], pEntry->nWID))
+        if (! ::sw::GetDefaultTextContentValue(
+                pValues[nProp], pPropertyNames[nProp], pEntry->nWID))
         {
             beans::PropertyState eTemp;
             const bool bDone = SwUnoCursorHelper::getCrsrPropertyValue(
@@ -788,7 +788,7 @@ throw (uno::RuntimeException)
                     // get property value
                     // (compare to SwXParagraph::getPropertyValue(s))
                     uno::Any aValue;
-                    if (!SwXParagraph::getDefaultTextContentValue(
+                    if (! ::sw::GetDefaultTextContentValue(
                                 aValue, pProp[i], pEntry->nWID ) )
                     {
                         SwPosition aPos( rTxtNode );
@@ -848,7 +848,7 @@ throw (uno::RuntimeException)
 /* -----------------------------12.09.00 11:09--------------------------------
 
  ---------------------------------------------------------------------------*/
-bool SwXParagraph::getDefaultTextContentValue(
+bool ::sw::GetDefaultTextContentValue(
         uno::Any& rAny, const OUString& rPropertyName, USHORT nWID)
 {
     if(!nWID)
@@ -1158,7 +1158,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
     SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow());
 
     uno::Any aRet;
-    if (SwXParagraph::getDefaultTextContentValue(aRet, rPropertyName))
+    if (::sw::GetDefaultTextContentValue(aRet, rPropertyName))
     {
         return aRet;
     }
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index a0903b6ea145..6b3ed8e04dd8 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -37,7 +37,6 @@
 #include <unomid.h>
 #include <unotextrange.hxx>
 #include <unorefmark.hxx>
-#include <unoparagraph.hxx>
 #include <unotextcursor.hxx>
 #include <unomap.hxx>
 #include <unocrsr.hxx>
@@ -510,7 +509,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 {
     // does not seem to need SolarMutex
     uno::Any aRet;
-    if(!SwXParagraph::getDefaultTextContentValue(aRet, rPropertyName))
+    if (! ::sw::GetDefaultTextContentValue(aRet, rPropertyName))
     {
         throw beans::UnknownPropertyException();
     }
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index fbe7e6e7eb5d..907a2a617c9b 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -47,7 +47,6 @@
 #include <fmtclds.hxx>
 #include <unotextrange.hxx>
 #include <unosection.hxx>
-#include <unoparagraph.hxx>
 #include <TextCursorHelper.hxx>
 #include <unoredline.hxx>
 #include <redline.hxx>
@@ -1186,7 +1185,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             case  FN_UNO_ANCHOR_TYPES:
             case  FN_UNO_TEXT_WRAP:
             case  FN_UNO_ANCHOR_TYPE:
-                SwXParagraph::getDefaultTextContentValue(
+                ::sw::GetDefaultTextContentValue(
                         pRet[nProperty], OUString(), pEntry->nWID);
             break;
             case FN_UNO_REDLINE_NODE_START:
@@ -1756,7 +1755,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
         case  FN_UNO_ANCHOR_TYPES:
         case  FN_UNO_TEXT_WRAP:
         case  FN_UNO_ANCHOR_TYPE:
-            SwXParagraph::getDefaultTextContentValue(aRet, OUString(), pEntry->nWID);
+            ::sw::GetDefaultTextContentValue(aRet, OUString(), pEntry->nWID);
         break;
         default:
         if(pFmt && pEntry->nWID <= SFX_WHICH_MAX)
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 2806a5984d24..b75d9dd93c0c 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3472,7 +3472,8 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be
                 case  FN_UNO_ANCHOR_TYPES:
                 case  FN_UNO_TEXT_WRAP:
                 case  FN_UNO_ANCHOR_TYPE:
-                    SwXParagraph::getDefaultTextContentValue(aRet, OUString(), pEntry->nWID);
+                    ::sw::GetDefaultTextContentValue(
+                            aRet, OUString(), pEntry->nWID);
                 break;
                 case FN_UNO_RANGE_ROW_LABEL:
                 {