this looks more like a "merge" than c34cc212

Change-Id: I36307a8b676327b050cb5b5073325131a62bbebd

this looks more like a "merge" than c34cc212
Change-Id: I36307a8b676327b050cb5b5073325131a62bbebd
4af664af · Michael Stahl · c34cc212 · 4af664af
Kaydet (Commit) 4af664af authored Nis 17, 2014 tarafından Michael Stahl
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

xmlithlp.cxx sw/source/filter/xml/xmlithlp.cxx +1 -1

No files found.
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -292,7 +292,7 @@ void sw_frmitems_MergeXMLVertPos( SvxGraphicPosition& ePos,
    case GPOS_LT:
    case GPOS_LM:
    case GPOS_LB:
-        ePos = eVert;
+        ePos = GPOS_MT==eVert ? GPOS_LT : (GPOS_MM==eVert ? GPOS_LM : GPOS_LB);
        break;

    case GPOS_MT: