From 27ce6af929d12dcbd9aeddcceef5596ae21cdb10 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 22 Aug 2016 15:36:03 +0200
Subject: convert SdrMergeMode to scoped enum

Change-Id: I4569733d0c0b4a63e364f0d136bef8de71d62724
---
 sd/source/ui/view/drviews2.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sd')

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index db985f2db4eb..2957a580840f 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2212,7 +2212,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             else
             {
                 WaitObject aWait( GetActiveWindow() );
-                mpDrawView->MergeMarkedObjects(SDR_MERGE_MERGE);
+                mpDrawView->MergeMarkedObjects(SdrMergeMode::Merge);
             }
             Cancel();
             rReq.Done ();
@@ -2233,7 +2233,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             else
             {
                 WaitObject aWait( GetActiveWindow() );
-                mpDrawView->MergeMarkedObjects(SDR_MERGE_SUBSTRACT);
+                mpDrawView->MergeMarkedObjects(SdrMergeMode::Subtract);
             }
             Cancel();
             rReq.Done ();
@@ -2254,7 +2254,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             else
             {
                 WaitObject aWait( GetActiveWindow() );
-                mpDrawView->MergeMarkedObjects(SDR_MERGE_INTERSECT);
+                mpDrawView->MergeMarkedObjects(SdrMergeMode::Intersect);
             }
             Cancel();
             rReq.Done ();
-- 
cgit