summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorAshod Nakashian <ashodnakashian@yahoo.com>2015-11-10 20:47:58 -0500
committerCaolán McNamara <caolanm@redhat.com>2015-11-12 10:55:41 +0000
commit1a494d9a00208eef790400bdbd8b3e5c7fed4886 (patch)
tree9e305bbf11be0aacfa3af942a7c250f423b629a9 /officecfg
parentd7801c39826f2f24f7340e1b25809d3bb65d6099 (diff)
Windows header sanitization
Isolation of windows headers using prewin.h and postwin.h headers and making headers dependent on them more self contained. Conversion of TCHAR to WCHAR and LPCTSTR to LPCWSTR etc. and cleanup of unnecessary casts. Change-Id: I7eff5c477d9223a064bfb4d962ff6d61960ee69c Reviewed-on: https://gerrit.libreoffice.org/19901 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/cppheader.xsl2
1 files changed, 2 insertions, 0 deletions
diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl
index a09043f4f8f8..1477b84b94db 100644
--- a/officecfg/registry/cppheader.xsl
+++ b/officecfg/registry/cppheader.xsl
@@ -93,6 +93,8 @@
</xsl:if>
<xsl:text>#include "comphelper/configuration.hxx"&#xA;</xsl:text>
<xsl:text>&#xA;</xsl:text>
+ <xsl:text>#undef RGB&#xA;</xsl:text>
+ <xsl:text>&#xA;</xsl:text>
<xsl:text>namespace officecfg { namespace </xsl:text>
<xsl:value-of select="$ns1"/>
<xsl:if test="$ns2">