diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index c82a46d5f845..aae997b0d58e 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -949,18 +949,28 @@ void LockedEmbedDocument_Impl::ExecuteMethod( sal_Int16 nId )
 {
     if ( m_pEmbedDocument )
     {
-        if ( nId == OLESERV_SAVEOBJECT )
-            m_pEmbedDocument->SaveObject();
-        else if ( nId == OLESERV_CLOSE )
-            m_pEmbedDocument->Close( 0 );
-        else if ( nId == OLESERV_NOTIFY )
-            m_pEmbedDocument->notify();
-        else if ( nId == OLESERV_NOTIFYCLOSING )
-            m_pEmbedDocument->OLENotifyClosing();
-        else if ( nId == OLESERV_SHOWOBJECT )
-            m_pEmbedDocument->ShowObject();
-        else if ( nId == OLESERV_DEACTIVATE )
-            m_pEmbedDocument->Deactivate();
+        switch( static_cast<OLEServ>(nId) )
+        {
+            case OLEServ::SaveObject:
+                m_pEmbedDocument->SaveObject();
+                break;
+            case OLEServ::Close:
+                m_pEmbedDocument->Close( 0 );
+                break;
+            case OLEServ::Notify:
+                m_pEmbedDocument->notify();
+                break;
+            case OLEServ::NotifyClosing:
+                m_pEmbedDocument->OLENotifyClosing();
+                break;
+            case OLEServ::ShowObject:
+                m_pEmbedDocument->ShowObject();
+                break;
+            case OLEServ::Deactivate:
+                m_pEmbedDocument->Deactivate();
+                break;
+            default:;
+        }
     }
 }
 
diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx
index 0a84b92c2cbe..093c5a2fcde3 100644
--- a/embedserv/source/inc/embeddocaccess.hxx
+++ b/embedserv/source/inc/embeddocaccess.hxx
@@ -19,13 +19,6 @@
 
 #pragma once
 
-#define OLESERV_SAVEOBJECT      1
-#define OLESERV_CLOSE           2
-#define OLESERV_NOTIFY          3
-#define OLESERV_NOTIFYCLOSING   4
-#define OLESERV_SHOWOBJECT      5
-#define OLESERV_DEACTIVATE      6
-
 #include <oleidl.h>
 #if defined __clang__
 #pragma clang diagnostic push
@@ -39,6 +32,15 @@
 #endif
 #include <cppuhelper/weak.hxx>
 
+enum class OLEServ : sal_Int16 {
+    SaveObject    = 1,
+    Close         = 2,
+    Notify        = 3,
+    NotifyClosing = 4,
+    ShowObject    = 5,
+    Deactivate    = 6
+};
+
 class EmbedDocument_Impl;
 struct LockedEmbedDocument_Impl
 {