summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-03-26 16:16:44 +0200
committerTor Lillqvist <tml@collabora.com>2019-09-20 12:56:10 +0200
commit0aa006a1429fa9bd58ed2362ce08791b377c8579 (patch)
tree9f744c6046d1c84b43a5cd26e3f86f2384779852 /svx
parentcd71c8f1d3eea5a17a209d98a568f8592a4e480b (diff)
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 <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdograf.cxx4
1 files changed, 4 insertions, 0 deletions
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())