[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng include/svx svx/source

[matteocam]

 editeng/source/outliner/outlvw.cxx |    8 ++++----
 include/editeng/outliner.hxx       |    4 ++--
 include/svx/svdedxv.hxx            |    2 +-
 svx/source/svdraw/svdedxv.cxx      |    4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 39a980fa88eb65a9feaeeb1b7db7f2f78070055b
Author: matteocam <matteo.campane...@gmail.com>
Date:   Thu Jul 30 13:48:52 2015 +0200

    Change name to post-paste&cutting method
    
    Change-Id: Ie49890788ea0b7f3b58b3d4a854bbc0f09526bf9

diff --git a/editeng/source/outliner/outlvw.cxx 
b/editeng/source/outliner/outlvw.cxx
index bff66ad..16c416c 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -679,8 +679,8 @@ void OutlinerView::Cut()
         pEditView->Cut();
 
         // Chaining handling
-        if (aEndPasteLink.IsSet())
-            aEndPasteLink.Call(NULL);
+        if (aEndCutPasteLink.IsSet())
+            aEndCutPasteLink.Call(NULL);
     }
 }
 
@@ -712,8 +712,8 @@ void OutlinerView::PasteSpecial()
         pEditView->ShowCursor( true, true );
 
         // XXX: Not sure if this should be called right before ShowCursor
-        if (aEndPasteLink.IsSet())
-            aEndPasteLink.Call(NULL);
+        if (aEndCutPasteLink.IsSet())
+            aEndCutPasteLink.Call(NULL);
     }
 
 }
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 74c9f72..96105e6 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -215,7 +215,7 @@ private:
     EDITENG_DLLPRIVATE void         ImpPasted( sal_Int32 nStart, sal_Int32 
nPrevParaCount, sal_Int32 nSize);
     EDITENG_DLLPRIVATE sal_Int32    ImpCalcSelectedPages( bool 
bIncludeFirstSelected );
 
-    Link<> aEndPasteLink;
+    Link<> aEndCutPasteLink;
 
 public:
                 OutlinerView( Outliner* pOut, vcl::Window* pWindow );
@@ -376,7 +376,7 @@ public:
     OUString    GetSurroundingText() const;
     Selection   GetSurroundingTextSelection() const;
 
-    void        SetEndPasteLinkHdl(const Link<> &rLink) { aEndPasteLink = 
rLink; }
+    void        SetEndCutPasteLinkHdl(const Link<> &rLink) { aEndCutPasteLink 
= rLink; }
 };
 
 
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 6b6f27c..b5ee30b 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -128,7 +128,7 @@ protected:
     // handler for AutoGrowing text with active Outliner
     DECL_LINK(ImpOutlinerStatusEventHdl,EditStatus*);
     DECL_LINK(ImpChainingEventHdl,void*);
-    DECL_LINK(ImpAfterPasteChainingEventHdl,void*);
+    DECL_LINK(ImpAfterCutOrPasteChainingEventHdl,void*);
     DECL_LINK(ImpOutlinerCalcFieldValueHdl,EditFieldInfo*);
 
     // link for EndTextEditHdl
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 02f7df0..14f864a 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -525,7 +525,7 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SdrObjEditView,ImpAfterPasteChainingEventHdl)
+IMPL_LINK_NOARG(SdrObjEditView,ImpAfterCutOrPasteChainingEventHdl)
 {
     SdrTextObj* pTextObj = dynamic_cast< SdrTextObj * >( GetTextEditObject());
     if (!pTextObj)
@@ -800,7 +800,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
             pTextEditOutlinerView->ShowCursor();
             
pTextEditOutliner->SetStatusEventHdl(LINK(this,SdrObjEditView,ImpOutlinerStatusEventHdl));
             if (pTextObj->IsChainable()) {
-                
pTextEditOutlinerView->SetEndPasteLinkHdl(LINK(this,SdrObjEditView,ImpAfterPasteChainingEventHdl)
 );
+                
pTextEditOutlinerView->SetEndCutPasteLinkHdl(LINK(this,SdrObjEditView,ImpAfterCutOrPasteChainingEventHdl)
 );
                 /* We should call:
                  *
                     ImpChainingEventHdl(NULL);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits