From f464159fb212a61bdce2c6eb765733abe7ac4f0b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 21 Jul 2017 08:39:50 +0100
Subject: can use the "real" type for RES_SRCTYPES now

Change-Id: Ied1f7a8c4135d3fd6a4581ea5e92f89b2e6b3067
---
 sw/inc/cnttab.hrc | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'sw/inc')

diff --git a/sw/inc/cnttab.hrc b/sw/inc/cnttab.hrc
index b25e7a53dcc7..e593e3c3fb13 100644
--- a/sw/inc/cnttab.hrc
+++ b/sw/inc/cnttab.hrc
@@ -20,23 +20,17 @@
 #ifndef INCLUDED_SW_INC_CNTTAB_HRC
 #define INCLUDED_SW_INC_CNTTAB_HRC
 
+#include <tox.hxx>
+
 #define NC_(Context, String) (Context "\004" u8##String)
 
-const std::pair<const char*, int> RES_SRCTYPES[] =
+const std::pair<const char*, SwTOOElements> RES_SRCTYPES[] =
 {
-    /* ids from tox.hxx
-    SwTOOElements::Math        = 0x01,
-    SwTOOElements::Chart       = 0x02,
-    TOO_IMAGE       = 0x04,
-    SwTOOElements::Calc        = 0x08,
-    SwTOOElements::DrawImpress= 0x10,
-    SwTOOElements::Other       = 0x80
-    */
-    { NC_("RES_SRCTYPES", "%PRODUCTNAME Math") ,  1},
-    { NC_("RES_SRCTYPES", "%PRODUCTNAME Chart") , 2},
-    { NC_("RES_SRCTYPES", "%PRODUCTNAME Calc") ,  8},
-    { NC_("RES_SRCTYPES", "%PRODUCTNAME Draw/%PRODUCTNAME Impress") ,    16},
-    { NC_("RES_SRCTYPES", "Other OLE Objects"),   128},
+    { NC_("RES_SRCTYPES", "%PRODUCTNAME Math"), SwTOOElements::Math},
+    { NC_("RES_SRCTYPES", "%PRODUCTNAME Chart"), SwTOOElements::Chart},
+    { NC_("RES_SRCTYPES", "%PRODUCTNAME Calc"), SwTOOElements::Calc},
+    { NC_("RES_SRCTYPES", "%PRODUCTNAME Draw/%PRODUCTNAME Impress"), SwTOOElements::DrawImpress},
+    { NC_("RES_SRCTYPES", "Other OLE Objects"), SwTOOElements::Other},
 };
 
 #endif
-- 
cgit