merge with DEV300_m71

6 files changed, 94 insertions, 118 deletions

diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index a3fbd23474..88b9e291a4 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -30,16 +30,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
 #include <vos/mutex.hxx>
 #include <sfx2/sfxbasecontroller.hxx>
 #include <SwXDocumentSettings.hxx>
 #include <SwXPrintPreviewSettings.hxx>
-#ifndef _COMPHELPER_MASTERPROPERTSETINFO_HXX_
 #include <comphelper/MasterPropertySetInfo.hxx>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 #include <doc.hxx>
@@ -50,7 +47,6 @@
 #include <editsh.hxx>
 #include <drawdoc.hxx>
 #include <svl/zforlist.hxx>
-#include <unoobj.hxx>
 #include <unotxdoc.hxx>
 #include <cmdid.h>
 #include <svx/zoomitem.hxx>
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index df941b500a..74158364f2 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -34,10 +34,7 @@
 
 #define _SVSTDARR_STRINGS
 
-
-#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
 #include <vos/mutex.hxx>
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
@@ -52,7 +49,10 @@
 #include <gloslst.hxx>
 #include <unoatxt.hxx>
 #include <unomap.hxx>
-#include <unoobj.hxx>
+#include <unomid.h>
+#include <unotextbodyhf.hxx>
+#include <unotextrange.hxx>
+#include <TextCursorHelper.hxx>
 #include <swevent.hxx>
 #include <doc.hxx>
 #include <unocrsr.hxx>
@@ -68,6 +68,7 @@
 
 #include <memory>
 
+
 SV_IMPL_REF ( SwDocShell )
 using namespace ::com::sun::star;
 using ::rtl::OUString;
@@ -410,25 +411,25 @@ sal_Bool lcl_CopySelToDoc( SwDoc* pInsDoc, OTextCursorHelper* pxCursor, SwXTextR
     SwCntntNode * pNd = aIdx.GetNode().GetCntntNode();
     SwPosition aPos( aIdx, SwIndex( pNd, pNd->Len() ));
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     pInsDoc->LockExpFlds();
     {
+        SwDoc *const pDoc((pxCursor) ? pxCursor->GetDoc() : pxRange->GetDoc());
+        SwPaM aPam(pDoc->GetNodes());
+        SwPaM * pPam(0);
         if(pxCursor)
         {
-            SwPaM* pUnoCrsr = pxCursor->GetPaM();
-            bRet = pxCursor->GetDoc()->CopyRange( *pUnoCrsr, aPos, false )
-                || bRet;
+            pPam = pxCursor->GetPaM();
         }
         else
         {
-            const ::sw::mark::IMark* const pBkmk = pxRange->GetBookmark();
-            if(pBkmk && pBkmk->IsExpanded())
+            if (pxRange->GetPositions(aPam))
             {
-                SwPaM aTmp(pBkmk->GetOtherMarkPos(), pBkmk->GetMarkPos());
-                bRet = pxRange->GetDoc()->CopyRange(aTmp, aPos, false)
-                    || bRet;
+                pPam = & aPam;
             }
         }
+        if (!pPam) { return false; }
+        bRet = pDoc->CopyRange( *pPam, aPos, false ) || bRet;
     }
 
     pInsDoc->UnlockExpFlds();
@@ -1112,7 +1113,7 @@ void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextR
     }
 
     SwDoc* pDoc = 0;
-    if ( pRange && pRange->GetBookmark())
+    if (pRange)
         pDoc = pRange->GetDoc();
     else if ( pCursor )
         pDoc = pCursor->GetDoc();
@@ -1130,29 +1131,23 @@ void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextR
 
     if(!pDoc)
         throw uno::RuntimeException();
-    SwPaM* pInsertPaM = 0;
-    if(pRange)
+
+    SwPaM InsertPaM(pDoc->GetNodes());
+    if (pRange)
     {
-        const ::sw::mark::IMark* const pBkmk = pRange->GetBookmark();
-        if(pBkmk->IsExpanded())
-            pInsertPaM = new SwPaM(pBkmk->GetOtherMarkPos(), pBkmk->GetMarkPos());
-        else
-            pInsertPaM = new SwPaM(pBkmk->GetMarkPos());
+        if (!pRange->GetPositions(InsertPaM))
+        {
+            throw uno::RuntimeException();
+        }
     }
     else
     {
-        SwPaM* pCrsr = pCursor->GetPaM();
-        if(pCrsr->HasMark())
-            pInsertPaM = new SwPaM(*pCrsr->GetPoint(), *pCrsr->GetMark());
-        else
-            pInsertPaM = new SwPaM(*pCrsr->GetPoint());
+        InsertPaM = *pCursor->GetPaM();
     }
 
-    SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(sGroupName);
-    sal_Bool bResult = pBlock && !pBlock->GetError() &&
-                pDoc->InsertGlossary( *pBlock, sEntryName, *pInsertPaM);
-    delete pBlock;
-    delete pInsertPaM;
+    ::std::auto_ptr<SwTextBlocks> pBlock(pGlossaries->GetGroupDoc(sGroupName));
+    const bool bResult = pBlock.get() && !pBlock->GetError()
+                    && pDoc->InsertGlossary( *pBlock, sEntryName, InsertPaM);
 
     if(!bResult)
         throw uno::RuntimeException();
diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx
index 44b82239b1..02e669d3b2 100644
--- a/sw/source/ui/uno/unodispatch.cxx
+++ b/sw/source/ui/uno/unodispatch.cxx
@@ -31,17 +31,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <vcl/svapp.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
+#include <svx/dataaccessdescriptor.hxx>
+
 #include <unodispatch.hxx>
-#include <unoobj.hxx>
+#include <unobaseclass.hxx>
 #include <view.hxx>
 #include <cmdid.h>
 #include "wrtsh.hxx"
 #include "dbmgr.hxx"
-#include <svx/dataaccessdescriptor.hxx>
+
 
 using namespace ::com::sun::star;
 using namespace rtl;
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index e06733b6cb..4d077c5b9f 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -35,7 +35,7 @@
 #include <swtypes.hxx>
 #include <tools/debug.hxx>
 #include <unomod.hxx>
-#include <unoobj.hxx>
+#include <unomid.h>
 #include <unoprnms.hxx>
 #include <unomap.hxx>
 #include <prtopt.hxx>
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index f06e71313d..405473c870 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -53,7 +53,10 @@
 #include <svl/stritem.hxx>
 #include <unotxdoc.hxx>
 #include <svl/numuno.hxx>
-#include <unoobj.hxx>
+#include <fldbas.hxx>
+#include <unotextbodyhf.hxx>
+#include <unotextrange.hxx>
+#include <unotextcursor.hxx>
 #include <unosett.hxx>
 #include <unocoll.hxx>
 #include <unoredlines.hxx>
@@ -764,19 +767,12 @@ Reference< util::XReplaceDescriptor >  SwXTextDocument::createReplaceDescriptor(
 SwUnoCrsr* 	SwXTextDocument::CreateCursorForSearch(Reference< XTextCursor > & xCrsr)
 {
     getText();
-     XText* pText = xBodyText.get();
+    XText *const pText = xBodyText.get();
     SwXBodyText* pBText = (SwXBodyText*)pText;
-    xCrsr = pBText->CreateTextCursor(sal_True);
+    SwXTextCursor *const pXTextCursor = pBText->CreateTextCursor(true);
+    xCrsr.set( static_cast<text::XWordCursor*>(pXTextCursor) );
 
-    Reference<XUnoTunnel> xRangeTunnel( xCrsr, UNO_QUERY);
-    SwXTextCursor* pxUnoCrsr = 0;
-    if(xRangeTunnel.is())
-    {
-        pxUnoCrsr = reinterpret_cast<SwXTextCursor*>(xRangeTunnel->getSomething(
-                                SwXTextCursor::getUnoTunnelId()));
-    }
-
-    SwUnoCrsr* 	pUnoCrsr = pxUnoCrsr->GetCrsr();
+    SwUnoCrsr *const pUnoCrsr = pXTextCursor->GetCursor();
     pUnoCrsr->SetRemainInSection(sal_False);
     return pUnoCrsr;
 }
@@ -1007,10 +1003,7 @@ Reference< XIndexAccess >
     if(!pResultCrsr)
         throw RuntimeException();
     Reference< XIndexAccess >  xRet;
-    if(nResult)
-        xRet = new SwXTextRanges(pResultCrsr);
-    else
-        xRet = new SwXTextRanges();
+    xRet = new SwXTextRanges( (nResult) ? pResultCrsr : 0 );
     delete pResultCrsr;
     return xRet;
 }
@@ -1030,11 +1023,10 @@ Reference< XInterface >  SwXTextDocument::findFirst(const Reference< util::XSear
     Reference< XInterface >  xRet;
     if(nResult)
     {
-        Reference< XTextRange >  xTempRange = SwXTextRange::CreateTextRangeFromPosition(
-                        pDocShell->GetDoc(),
-                        *pResultCrsr->GetPoint(),
-                        pResultCrsr->GetMark());
-        xRet = *new SwXTextCursor(xTempRange->getText(), pResultCrsr);
+        const uno::Reference< text::XText >  xParent =
+            ::sw::CreateParentXText(*pDocShell->GetDoc(),
+                    *pResultCrsr->GetPoint());
+        xRet = *new SwXTextCursor(xParent, *pResultCrsr);
         delete pResultCrsr;
     }
     return xRet;
@@ -1058,12 +1050,11 @@ Reference< XInterface >  SwXTextDocument::findNext(const Reference< XInterface >
     Reference< XInterface >  xRet;
     if(nResult)
     {
-        Reference< XTextRange >  xTempRange = SwXTextRange::CreateTextRangeFromPosition(
-                        pDocShell->GetDoc(),
-                        *pResultCrsr->GetPoint(),
-                        pResultCrsr->GetMark());
+        const uno::Reference< text::XText >  xParent =
+            ::sw::CreateParentXText(*pDocShell->GetDoc(),
+                    *pResultCrsr->GetPoint());
 
-        xRet = *new SwXTextCursor(xTempRange->getText(), pResultCrsr);
+        xRet = *new SwXTextCursor(xParent, *pResultCrsr);
         delete pResultCrsr;
     }
     return xRet;
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 6bcf01d50f..e2b40a8a9e 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -77,6 +77,10 @@
 #include <SwStyleNameMapper.hxx>
 #include <crsskip.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <unobookmark.hxx>
+#include <unoparagraph.hxx>
+#include <unocrsrhelper.hxx>
+#include <unotextrange.hxx>
 
 #include <svx/editview.hxx>
 #include <sfx2/docfile.hxx>
@@ -104,24 +108,8 @@ SV_IMPL_PTRARR( SelectionChangeListenerArr, XSelectionChangeListenerPtr );
  * --------------------------------------------------*/
 SwPaM* lcl_createPamCopy(const SwPaM& rPam)
 {
-    SwPaM* pRet = new SwPaM(*rPam.GetPoint());
-    if(rPam.HasMark())
-    {
-        pRet->SetMark();
-        *pRet->GetMark() = *rPam.GetMark();
-    }
-    if(rPam.GetNext() != (const Ring*)&rPam)
-    {
-        SwPaM *_pStartCrsr = (SwPaM *)rPam.GetNext();
-        do
-        {
-            //neuen PaM erzeugen
-            SwPaM* pPaM = new SwPaM(*_pStartCrsr);
-            //und in den Ring einfuegen
-            pPaM->MoveTo(pRet);
-
-        } while( (_pStartCrsr=(SwPaM *)_pStartCrsr->GetNext()) != rPam.GetNext() );
-    }
+    SwPaM *const pRet = new SwPaM(*rPam.GetPoint());
+    ::sw::DeepCopyPaM(rPam, *pRet);
     return pRet;
 }
 /******************************************************************
@@ -329,8 +317,9 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
                     : 0;
 
             if(pCursor && pCursor->GetDoc() == GetView()->GetDocShell()->GetDoc())
-                pPam = lcl_createPamCopy(*((SwXTextCursor*)pCursor)->GetPaM());
-
+            {
+                pPam = lcl_createPamCopy(*pCursor->GetPaM());
+            }
         }
         else if(xPosN.is() &&
             xIfcTunnel.is() &&
@@ -346,7 +335,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
         else if(!pFrame && !pCell && xPos.is())
         {
             SwUnoInternalPaM aPam(*pDoc);
-            if(SwXTextRange::XTextRangeToSwPaM(aPam, xPos))
+            if (::sw::XTextRangeToSwPaM(aPam, xPos))
             {
                 pPam = lcl_createPamCopy(aPam);
             }
@@ -429,19 +418,14 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
 
         if(xBkm.is() && xIfcTunnel.is())
         {
-            SwXBookmark* pBkm = reinterpret_cast<SwXBookmark*>(
-                    xIfcTunnel->getSomething(SwXBookmark::getUnoTunnelId()));
-            if(pBkm && pBkm->GetDoc() == pDoc)
+            ::sw::mark::IMark const*const pMark(
+                    SwXBookmark::GetBookmarkInDoc(pDoc, xIfcTunnel) );
+            if (pMark)
             {
-                IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess();
-                IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->findMark(pBkm->getName());
-                if( ppMark != pMarkAccess->getMarksEnd() )
-                {
-                    rSh.EnterStdMode();
-                    rSh.GotoMark( ppMark->get() );
-                }
-                return sal_True;
+                rSh.EnterStdMode();
+                rSh.GotoMark(pMark);
             }
+            return sal_True;
         }
         // IndexMark, Index, TextField, Draw, Section, Footnote, Paragraph
         //
@@ -1379,8 +1363,10 @@ void SwXTextViewCursor::gotoRange(
             throw  uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) );
 
         SwUnoInternalPaM rDestPam(*m_pView->GetDocShell()->GetDoc());
-        if(!SwXTextRange::XTextRangeToSwPaM( rDestPam, xRange))
-            throw IllegalArgumentException();
+        if (!::sw::XTextRangeToSwPaM(rDestPam, xRange))
+        {
+            throw uno::RuntimeException();
+        }
 
         ShellModes  eSelMode = m_pView->GetShellMode();
         SwWrtShell& rSh = m_pView->GetWrtShell();
@@ -1435,10 +1421,13 @@ void SwXTextViewCursor::gotoRange(
         {
             pSrcNode = pCursor->GetPaM()->GetNode();
         }
-        else if(pRange && pRange->GetBookmark())
+        else if (pRange)
         {
-            const ::sw::mark::IMark* const pBkmk = pRange->GetBookmark();
-            pSrcNode = &(pBkmk->GetMarkPos().nNode.GetNode());
+            SwPaM aPam(pRange->GetDoc()->GetNodes());
+            if (pRange->GetPositions(aPam))
+            {
+                pSrcNode = aPam.GetNode();
+            }
         }
         else if (pPara && pPara->GetTxtNode())
         {
@@ -1713,9 +1702,7 @@ uno::Reference< text::XText >  SwXTextViewCursor::getText(void) throw( uno::Runt
         SwWrtShell& rSh = m_pView->GetWrtShell();
         SwPaM* pShellCrsr = rSh.GetCrsr();
         SwDoc* pDoc = m_pView->GetDocShell()->GetDoc();
-        uno::Reference< text::XTextRange >  xRg = SwXTextRange::CreateTextRangeFromPosition(pDoc,
-                                    *pShellCrsr->Start(), 0);
-        xRet = xRg->getText();
+        xRet = ::sw::CreateParentXText(*pDoc, *pShellCrsr->Start());
     }
     else
         throw uno::RuntimeException();
@@ -1736,8 +1723,7 @@ uno::Reference< text::XTextRange >  SwXTextViewCursor::getStart(void) throw( uno
         SwWrtShell& rSh = m_pView->GetWrtShell();
         SwPaM* pShellCrsr = rSh.GetCrsr();
         SwDoc* pDoc = m_pView->GetDocShell()->GetDoc();
-        xRet = SwXTextRange::CreateTextRangeFromPosition(pDoc,
-                                    *pShellCrsr->Start(), 0);
+        xRet = SwXTextRange::CreateXTextRange(*pDoc, *pShellCrsr->Start(), 0);
     }
     else
         throw uno::RuntimeException();
@@ -1758,8 +1744,7 @@ uno::Reference< text::XTextRange >  SwXTextViewCursor::getEnd(void) throw( uno::
         SwWrtShell& rSh = m_pView->GetWrtShell();
         SwPaM* pShellCrsr = rSh.GetCrsr();
         SwDoc* pDoc = m_pView->GetDocShell()->GetDoc();
-        xRet = SwXTextRange::CreateTextRangeFromPosition(pDoc,
-                                        *pShellCrsr->End(), 0);
+        xRet = SwXTextRange::CreateXTextRange(*pDoc, *pShellCrsr->End(), 0);
     }
     else
         throw uno::RuntimeException();
@@ -1791,7 +1776,7 @@ OUString SwXTextViewCursor::getString(void) throw( uno::RuntimeException )
             {
                 SwWrtShell& rSh = m_pView->GetWrtShell();
                 SwPaM* pShellCrsr = rSh.GetCrsr();
-                SwXTextCursor::getTextFromPam(*pShellCrsr, uRet);
+                SwUnoCursorHelper::GetTextFromPam(*pShellCrsr, uRet);
             }
             default:;//prevent warning
         }
@@ -1823,7 +1808,7 @@ void SwXTextViewCursor::setString(const OUString& aString) throw( uno::RuntimeEx
             {
                 SwWrtShell& rSh = m_pView->GetWrtShell();
                 SwCursor* pShellCrsr = rSh.GetSwCrsr();
-                SwXTextCursor::SetString( *pShellCrsr, aString );
+                SwUnoCursorHelper::SetString(*pShellCrsr, aString);
             }
             default:;//prevent warning
         }
@@ -1852,7 +1837,10 @@ void  SwXTextViewCursor::setPropertyValue( const OUString& rPropertyName, const
         SwPaM* pShellCrsr = rSh.GetCrsr();
         SwNode *pNode = pShellCrsr->GetNode();
         if (pNode && pNode->IsTxtNode())
-            SwXTextCursor::SetPropertyValue(*pShellCrsr, *m_pPropSet, rPropertyName, aValue );
+        {
+            SwUnoCursorHelper::SetPropertyValue(
+                *pShellCrsr, *m_pPropSet, rPropertyName, aValue );
+        }
         else
             throw RuntimeException();
     }
@@ -1871,7 +1859,8 @@ Any  SwXTextViewCursor::getPropertyValue( const OUString& rPropertyName )
     {
         SwWrtShell& rSh = m_pView->GetWrtShell();
         SwPaM* pShellCrsr = rSh.GetCrsr();
-        aRet = SwXTextCursor::GetPropertyValue(  *pShellCrsr, *m_pPropSet, rPropertyName);
+        aRet = SwUnoCursorHelper::GetPropertyValue(
+                *pShellCrsr, *m_pPropSet, rPropertyName);
     }
     else
         throw RuntimeException();
@@ -1920,7 +1909,8 @@ PropertyState  SwXTextViewCursor::getPropertyState( const OUString& rPropertyNam
     {
         SwWrtShell& rSh = m_pView->GetWrtShell();
         SwPaM* pShellCrsr = rSh.GetCrsr();
-        eState = SwXTextCursor::GetPropertyState( *pShellCrsr, *m_pPropSet, rPropertyName);
+        eState = SwUnoCursorHelper::GetPropertyState(
+                *pShellCrsr, *m_pPropSet, rPropertyName);
     }
     else
         throw RuntimeException();
@@ -1938,7 +1928,8 @@ Sequence< PropertyState >  SwXTextViewCursor::getPropertyStates(
     {
         SwWrtShell& rSh = m_pView->GetWrtShell();
         SwPaM* pShellCrsr = rSh.GetCrsr();
-        aRet = SwXTextCursor::GetPropertyStates(*pShellCrsr, *m_pPropSet,  rPropertyNames);
+        aRet = SwUnoCursorHelper::GetPropertyStates(
+                *pShellCrsr, *m_pPropSet,  rPropertyNames);
     }
     return aRet;
 }
@@ -1953,7 +1944,8 @@ void  SwXTextViewCursor::setPropertyToDefault( const OUString& rPropertyName )
     {
         SwWrtShell& rSh = m_pView->GetWrtShell();
         SwPaM* pShellCrsr = rSh.GetCrsr();
-        SwXTextCursor::SetPropertyToDefault( *pShellCrsr, *m_pPropSet, rPropertyName);
+        SwUnoCursorHelper::SetPropertyToDefault(
+                *pShellCrsr, *m_pPropSet, rPropertyName);
     }
 }
 /*-- 29.06.00 17:33:43---------------------------------------------------
@@ -1968,7 +1960,8 @@ Any  SwXTextViewCursor::getPropertyDefault( const OUString& rPropertyName )
     {
         SwWrtShell& rSh = m_pView->GetWrtShell();
         SwPaM* pShellCrsr = rSh.GetCrsr();
-        aRet = SwXTextCursor::GetPropertyDefault( *pShellCrsr, *m_pPropSet, rPropertyName);
+        aRet = SwUnoCursorHelper::GetPropertyDefault(
+                *pShellCrsr, *m_pPropSet, rPropertyName);
     }
     return aRet;
 }