From 620ca8c527fb77334bdb29eb4d00e8102b731bde Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Mon, 16 Apr 2012 23:48:35 -0400
Subject: Remove the last undo friend from ImpEditEngine.

---
 editeng/inc/editeng/editeng.hxx     |  2 ++
 editeng/source/editeng/editeng.cxx  |  5 +++++
 editeng/source/editeng/editundo.cxx | 12 ++++++------
 editeng/source/editeng/impedit.hxx  |  8 ++------
 4 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'editeng')

diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index a239b9f94958..043776bdd019 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -564,6 +564,8 @@ public:
     EditPaM ConnectContents(sal_uInt16 nLeftNode, bool bBackward);
 
     EditPaM InsertFeature(const EditSelection& rEditSelection, const SfxPoolItem& rItem);
+
+    EditSelection MoveParagraphs(const Range& rParagraphs, sal_uInt16 nNewPos, EditView* pCurView);
 };
 
 #endif // _MyEDITENG_HXX
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 4a1fa612698e..81ad8806b3a6 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -787,6 +787,11 @@ EditPaM EditEngine::InsertFeature(const EditSelection& rEditSelection, const Sfx
     return pImpEditEngine->ImpInsertFeature(rEditSelection, rItem);
 }
 
+EditSelection EditEngine::MoveParagraphs(const Range& rParagraphs, sal_uInt16 nNewPos, EditView* pCurView)
+{
+    return pImpEditEngine->MoveParagraphs(rParagraphs, nNewPos, pCurView);
+}
+
 uno::Reference<datatransfer::XTransferable> EditEngine::CreateTransferable(const EditSelection& rSelection)
 {
     return pImpEditEngine->CreateTransferable(rSelection);
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 9c370d16e23d..067d84fa8a10 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -448,7 +448,7 @@ EditUndoMoveParagraphs::~EditUndoMoveParagraphs()
 
 void EditUndoMoveParagraphs::Undo()
 {
-    DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" );
+    DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" );
     Range aTmpRange( nParagraphs );
     long nTmpDest = aTmpRange.Min();
 
@@ -465,15 +465,15 @@ void EditUndoMoveParagraphs::Undo()
     else
         nTmpDest += aTmpRange.Len();
 
-    EditSelection aNewSel( GetImpEditEngine()->MoveParagraphs( aTmpRange, (sal_uInt16)nTmpDest, 0 ) );
-    GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
+    EditSelection aNewSel = GetEditEngine()->MoveParagraphs(aTmpRange, (sal_uInt16)nTmpDest, 0);
+    GetEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
 }
 
 void EditUndoMoveParagraphs::Redo()
 {
-    DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" );
-    EditSelection aNewSel( GetImpEditEngine()->MoveParagraphs( nParagraphs, nDest, 0 ) );
-    GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
+    DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" );
+    EditSelection aNewSel = GetEditEngine()->MoveParagraphs(nParagraphs, nDest, 0);
+    GetEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
 }
 
 EditUndoSetStyleSheet::EditUndoSetStyleSheet( ImpEditEngine* _pImpEE, sal_uInt16 nP,
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 6e0ebb727d55..6b013bc3e866 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -380,12 +380,8 @@ public:
 
 class ImpEditEngine : public SfxListener, boost::noncopyable
 {
-    // The Undos have to manipulate directly ( private-Methods ),
-    // do that no new Undo is inserted!
-    friend class EditUndoMoveParagraphs;
-
-    friend class EditEngine;        // For access to Imp-Methods
-    friend class EditDbg;           // Debug Routines
+    friend class EditEngine;
+    friend class EditDbg;
 
 public:
     typedef std::vector<EditView*> ViewsType;
-- 
cgit