From 1369a857a0b6bd28abc33086e01c74b7bfe57e89 Mon Sep 17 00:00:00 2001 From: Thomas Gutmann <41593722+speckyspooky@users.noreply.github.com> Date: Sat, 22 Jun 2024 14:14:00 +0200 Subject: [PATCH] Fix label localization for xlsx (#1745) (#1746) --- .../excel/handlers/TopLevelContentHandler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/uk.co.spudsoft.birt.emitters.excel/src/uk/co/spudsoft/birt/emitters/excel/handlers/TopLevelContentHandler.java b/engine/uk.co.spudsoft.birt.emitters.excel/src/uk/co/spudsoft/birt/emitters/excel/handlers/TopLevelContentHandler.java index 3d55a9cd4f7..a4ab8903ec3 100644 --- a/engine/uk.co.spudsoft.birt.emitters.excel/src/uk/co/spudsoft/birt/emitters/excel/handlers/TopLevelContentHandler.java +++ b/engine/uk.co.spudsoft.birt.emitters.excel/src/uk/co/spudsoft/birt/emitters/excel/handlers/TopLevelContentHandler.java @@ -1,14 +1,14 @@ /************************************************************************************* - * Copyright (c) 2011, 2012, 2013 James Talbut. + * Copyright (c) 2011, 2012, 2013, 2024 James Talbut and others * jim-emitters@spudsoft.co.uk * - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * https://www.eclipse.org/legal/epl-2.0/. - * + * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * James Talbut - Initial implementation. ************************************************************************************/ @@ -77,7 +77,7 @@ public void emitLabel(HandlerState state, ILabelContent label) throws BirtExcept log.debug("Creating row ", state.rowNum, " for label"); state.currentSheet.createRow(state.rowNum); - String labelText = (label.getLabelText() != null) ? label.getLabelText() : label.getText(); + String labelText = (label.getText() != null) ? label.getText() : label.getLabelText(); emitContent(state, label, labelText, (!"inline".equals(getStyleProperty(label, StyleConstants.STYLE_DISPLAY, "block"))));