Svx and sw code cleanup

Change-Id: Ie93861f32ac23379dc1f0fd973612645e776cc1e

1 files changed, 4 insertions, 5 deletions

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index a33b12bec00a..c4630c2831f2 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -714,23 +714,22 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             {
                 WaitObject aWait( (Window*)GetActiveWindow() );
 
-                // switch on undo for the next operations
-                mpDrawView->BegUndo(
-                    String(
-                    SdResId (nSId==SID_CONVERT_TO_METAFILE ? STR_UNDO_CONVERT_TO_METAFILE : STR_UNDO_CONVERT_TO_BITMAP)));
-
                 // create SdrGrafObj from metafile/bitmap
                 Graphic aGraphic;
                 switch (nSId)
                 {
                     case SID_CONVERT_TO_METAFILE:
                     {
+                        // switch on undo for the next operations
+                        mpDrawView->BegUndo( String( SdResId( STR_UNDO_CONVERT_TO_METAFILE )));
                         GDIMetaFile aMetaFile(mpDrawView->GetAllMarkedMetaFile ());
                         aGraphic = Graphic(aMetaFile);
                     }
                     break;
                     case SID_CONVERT_TO_BITMAP:
                     {
+                        // switch on undo for the next operations
+                        mpDrawView->BegUndo( String( SdResId( STR_UNDO_CONVERT_TO_BITMAP )));
                         Bitmap aBitmap (mpDrawView->GetAllMarkedBitmap ());
                         aGraphic = Graphic(aBitmap);
                     }