diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-16 13:41:29 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-17 07:52:09 +0200 |
commit | fb4bf693999b8a1ebf79bad0d223ae2d4398cf81 (patch) | |
tree | f13b1c43880542447dcd3866cadca42e354cfbff | |
parent | 1920061bb2f35df638a638ffebae25245e6ec450 (diff) |
remove unused KeywordsOnly from IdentifierTranslationMode
Change-Id: I7262e618a14fa9e025d269b560da752e3200309d
-rw-r--r-- | codemaker/source/commoncpp/commoncpp.cxx | 5 | ||||
-rw-r--r-- | include/codemaker/commoncpp.hxx | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index d2c5915f2e28..4f1840c54e43 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -169,8 +169,7 @@ OString translateUnoToCppIdentifier( || unoIdentifier == "xor" /* unoIdentifier == "xor_eq" */ // Standard macros: - || (transmode != IdentifierTranslationMode::KeywordsOnly - && (unoIdentifier == "BUFSIZ" + || (unoIdentifier == "BUFSIZ" || unoIdentifier == "CLOCKS_PER_SEC" || unoIdentifier == "EDOM" || unoIdentifier == "EOF" @@ -264,7 +263,7 @@ OString translateUnoToCppIdentifier( || unoIdentifier == "UCHAR_MAX" || unoIdentifier == "UINT_MAX" || unoIdentifier == "ULONG_MAX" - || unoIdentifier == "USHRT_MAX")) + || unoIdentifier == "USHRT_MAX") || (transmode == IdentifierTranslationMode::Global && (// Standard types: /* unoIdentifier == "clock_t" */ diff --git a/include/codemaker/commoncpp.hxx b/include/codemaker/commoncpp.hxx index a1a8e9180e59..29e2c9dfc2e1 100644 --- a/include/codemaker/commoncpp.hxx +++ b/include/codemaker/commoncpp.hxx @@ -47,8 +47,7 @@ rtl::OString translateUnoToCppType( enum class IdentifierTranslationMode { Global, - NonGlobal, - KeywordsOnly + NonGlobal }; rtl::OString translateUnoToCppIdentifier( |