[TD]fix merge resolution error

FreeCAD · Dec 7, 2019 · efed66d · efed66d
1 parent c1f177b
commit efed66d
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp
@@ -363,6 +363,21 @@ void DrawView::handleChangedPropertyType(
                 static_cast<App::PropertyLinkList*>(prop)->setValue(link.getValue());
             }
         }
+
+    // property X had App::PropertyFloat and was changed to App::PropertyLength
+    // sb PropertyDistance.  some X,Y are relative to existing point on page
+    } else if (prop == &X && strcmp(TypeName, "App::PropertyFloat") == 0) {
+        App::PropertyFloat XProperty;
+        XProperty.setContainer(this);
+        // restore the PropertyFloat to be able to set its value
+        XProperty.Restore(reader);
+        X.setValue(XProperty.getValue());
+    } else if (prop == &Y && strcmp(TypeName, "App::PropertyFloat") == 0) {
+        App::PropertyFloat YProperty;
+        YProperty.setContainer(this);
+        YProperty.Restore(reader);
+        Y.setValue(YProperty.getValue());
+
 // property Rotation had App::PropertyFloat and was changed to App::PropertyAngle
     } else if (prop == &Rotation && strcmp(TypeName, "App::PropertyFloat") == 0) {
         App::PropertyFloat RotationProperty;