From b24a9f8b3537ee5c200c1d52fc51157f1ac55e9d Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Sun, 12 Mar 2017 20:29:25 +0200
Subject: make o3tl::strong_int constructor explicit

Could have sworn I did this originally, somehow it got lost.
Also fix a thinko in tools::ResId I introduced in commit
2b70fb58be039fbd05ea833a40b1b3e9f922e45c
"Use o3tl::strong_int on RESOURCE_TYPE"

Change-Id: Id3b39962255297010cd1feaaca6d822168311081
Reviewed-on: https://gerrit.libreoffice.org/35108
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 rsc/inc/rscdb.hxx           | 10 +++++-----
 rsc/inc/rsctop.hxx          |  4 ++--
 rsc/source/parser/rscdb.cxx |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'rsc')

diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index d39da67650a9..b8d3be9d2958 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -41,18 +41,18 @@ enum class MapUnit;
 
 struct WriteRcContext
 {
-    FILE *              fOutput;
+    FILE *         fOutput;
     OString        aOutputRc;
     OString        aOutputSysList;
-    RscCmdLine*         pCmdLine;
+    RscCmdLine*    pCmdLine;
 };
 
 // table for system dependent resources
 struct RscSysEntry
 {
     sal_uInt32      nKey;
-    sal_uInt32      nRscTyp;
-    OString    aFileName;
+    RESOURCE_TYPE   nRscTyp;
+    OString         aFileName;
     sal_uInt32      nTyp;
     sal_uInt32      nRefId;
 };
@@ -129,7 +129,7 @@ public:
     void              SetSysSearchPath( const OString& rStr ) { aSysSearchPath = rStr; }
                       // deletes all resource objects of this file
     void              Delete( RscFileTab::Index lFileKey );
-    sal_uInt32        PutSysName( sal_uInt32 nRscTyp, char * pName );
+    sal_uInt32        PutSysName( RESOURCE_TYPE nRscTyp, char * pName );
     void              ClearSysNames();
     ERRTYPE           WriteRc( WriteRcContext& rContext );
     void              WriteSrc( FILE * fOutput, RscFileTab::Index nFileIndex );
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index 1a5afad988bf..43f118ed98d5 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -44,7 +44,7 @@ class RscTop : public RefNode
 {
     RscTop *        pSuperClass;
     RSCINST         aDfltInst;
-    sal_uInt32          nTypId;
+    RESOURCE_TYPE   nTypId;
     RscTop *        pRefClass;
 
 protected:
@@ -59,7 +59,7 @@ public:
             RscTop* GetSuperClass() const
                     { return pSuperClass; }
                     // returns the type identifier
-            sal_uInt32  GetTypId() const
+            RESOURCE_TYPE GetTypId() const
                     { return nTypId; };
                     // returns the super class
             bool    InHierarchy( RscTop * pClass );
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 36fd2de97c79..9232c8fa0d2e 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -200,7 +200,7 @@ void RscTypCont::ClearSysNames()
     aSysLst.clear();
 }
 
-sal_uInt32 RscTypCont::PutSysName( sal_uInt32 nRscTyp, char * pFileName )
+sal_uInt32 RscTypCont::PutSysName( RESOURCE_TYPE nRscTyp, char * pFileName )
 {
     RscSysEntry *pFoundEntry = nullptr;
 
-- 
cgit