diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java index 4eab584967..ca5dcb967e 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java @@ -307,17 +307,6 @@ public WidgetProperty getProperty(String name) throws IllegalArgumentExceptio return super.getProperty(name); } - @Override - public Macros getEffectiveMacros() - { - final Macros macros = new Macros(super.getEffectiveMacros()); - - // Legacy "Linking Container" defined a "Linking Container ID" macro. - macros.add("LCID", getID()); - - return macros; - } - /** @return 'file' property */ public WidgetProperty propFile() { diff --git a/app/display/model/src/main/resources/display_model_preferences.properties b/app/display/model/src/main/resources/display_model_preferences.properties index d898002f26..55d3a38ef8 100644 --- a/app/display/model/src/main/resources/display_model_preferences.properties +++ b/app/display/model/src/main/resources/display_model_preferences.properties @@ -31,8 +31,9 @@ font_files=examples:font.def # * Must start with character # * May then contain characters or numbers # * May also contain underscores -# -macros=Value from Preferencestrue +# E.g. +# macros=Value from Preferencestrue +macros= # Timeout [ms] for loading files: Displays, but also color, font, widget class files