svx/source/svdraw/svdograf.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 0aa006a1429fa9bd58ed2362ce08791b377c8579
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Mar 26 16:16:44 2019 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Fri Sep 20 12:56:10 2019 +0200
Stopgap measure to fix compilation error on Windows
Somehow <windows.h> gets included here and it #defines GetMetaFile as
GetMetaFileA. Undo that.
Change-Id: Ia99c077ef7b3f845efabaf286f12e2688fe4a132
(cherry picked from commit c6056a8f913a161199a2833b6afa3735680a1c4d)
Reviewed-on: https://gerrit.libreoffice.org/79190
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 38e57ac81694..0e4413b3764f 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -866,6 +866,10 @@ GDIMetaFile
SdrGrafObj::getMetafileFromEmbeddedVectorGraphicData() const
return aRetval;
}
+#ifdef _WIN32
+#undef GetMetaFile
+#endif
+
GDIMetaFile SdrGrafObj::GetMetaFile(GraphicType &rGraphicType) const
{
if (isEmbeddedVectorGraphicData())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
