[Libreoffice-commits] .: 2 commits - sd/source

[Thorsten Behrens]

 sd/source/ui/func/fuoltext.cxx |    5 +----
 sd/source/ui/view/outlview.cxx |    6 ------
 2 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 57e6f04066cfddfa79eb2b79cf5c45653c79eff3
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Wed Feb 15 16:51:52 2012 +0100

    Fix fdo#45177 - avoid linked undo for the while.
    
    While I try to wrap head around subtleties for linked undo in
    Impress outline view, disable that here for the while. Better than
    a crash for sure.

diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 8d4d1cc..f4c9dfe 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1664,12 +1664,6 @@ void OutlineView::EndModelChange()
 
     DBG_ASSERT( bHasUndoActions == (mrOutliner.GetUndoManager().GetUndoActionCount() != 0), "sd::OutlineView::EndModelChange(), undo actions not in sync!" );
 
-    if( bHasUndoActions )
-    {
-        SfxLinkUndoAction* pLink = new SfxLinkUndoAction(pDocUndoMgr);
-        mrOutliner.GetUndoManager().AddUndoAction(pLink);
-    }
-
     mrOutliner.GetUndoManager().LeaveListAction();
 
     if( bHasUndoActions && mrOutliner.GetEditEngine().HasTriedMergeOnLastAddUndo() )
commit 4fa7f074b38a65a6e0b5e9ceb164f31ce8086042
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Wed Feb 15 16:50:59 2012 +0100

    Cleanup: auto_ptr uses as a plain scope guard.

diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index df1108f..c48c254 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -230,10 +230,7 @@ sal_Bool FuOutlineText::KeyInput(const KeyEvent& rKEvt)
     {
         mpWindow->GrabFocus();
 
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
-        SAL_WNODEPRECATED_DECLARATIONS_POP
-
+        boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
         if( (nKeyGroup != KEYGROUP_CURSOR) && (nKeyGroup != KEYGROUP_FKEYS) )
             aGuard.reset( new OutlineViewModelChangeGuard( *pOutlineView ) );