diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-22 15:36:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-23 09:54:16 +0200 |
| commit | 27ce6af929d12dcbd9aeddcceef5596ae21cdb10 (patch) | |
| tree | 769dc4eb9e9c52f5c8f6d110e30ff006ed46a398 /sd | |
| parent | 2e8523f4083965085e19adac1e97eb3fb794d1db (diff) | |
convert SdrMergeMode to scoped enum
Change-Id: I4569733d0c0b4a63e364f0d136bef8de71d62724
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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 (); |