From 46b8d81ae82da848e70b0735b101b1f1cc4e6beb Mon Sep 17 00:00:00 2001 From: Damjan Jovanovic Date: Sun, 8 Nov 2015 14:34:28 +0000 Subject: Use UIConsts constants for offsets to resource IDs in main/wizards. (cherry picked from commit 95efcaf575dced8cc18f2ca9fb874d772ad23595) Change-Id: I8bb247c92f0326da916940f4fc7999d81998297a --- wizards/com/sun/star/wizards/common/FileAccess.java | 7 ++++++- wizards/com/sun/star/wizards/ui/AggregateComponent.java | 15 +++++++-------- wizards/com/sun/star/wizards/ui/FilterComponent.java | 15 +++++++-------- 3 files changed, 20 insertions(+), 17 deletions(-) (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java index d664b28bc5be..02357fe499aa 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.java +++ b/wizards/com/sun/star/wizards/common/FileAccess.java @@ -28,8 +28,13 @@ import java.util.Vector; import com.sun.star.io.XActiveDataSink; import com.sun.star.io.XInputStream; import com.sun.star.io.XTextInputStream; +import com.sun.star.lang.Locale; import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.ucb.*; +import com.sun.star.ucb.CommandAbortedException; +import com.sun.star.ucb.XFileIdentifierConverter; +import com.sun.star.ucb.XSimpleFileAccess; +import com.sun.star.ucb.XSimpleFileAccess2; +import com.sun.star.uno.Exception; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import com.sun.star.beans.PropertyValue; diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 2233753e601f..af9c9cb7d2e3 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -180,14 +180,13 @@ public class AggregateComponent extends ControlScroller { if (i == 0) { - int BaseID = 2300; - soptDetailQuery = CurUnoDialog.m_oResource.getResText(BaseID + 11); - soptSummaryQuery = CurUnoDialog.m_oResource.getResText(BaseID + 12); - slblAggregate = CurUnoDialog.m_oResource.getResText(BaseID + 16); - slblFieldNames = CurUnoDialog.m_oResource.getResText(BaseID + 17); - sFunctions = CurUnoDialog.m_oResource.getResArray(BaseID + 40, 5); - - sDuplicateAggregateFunction = CurUnoDialog.m_oResource.getResText(BaseID + 90); + soptDetailQuery = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 11); + soptSummaryQuery = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 12); + slblAggregate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 16); + slblFieldNames = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 17); + sFunctions = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_QUERY + 40, 5); + + sDuplicateAggregateFunction = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 90); } if (ControlRowVector == null) { diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index fd7664011c5e..27e7eff839f2 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -60,7 +60,6 @@ public class FilterComponent private final String slblOperators; private final String slblValue; private WizardDialog CurUnoDialog; - private static final int BaseID = 2300; private final String sIncSuffix; private final ControlRow[] oControlRows; private final String sDuplicateCondition; @@ -373,14 +372,14 @@ public class FilterComponent boolean bEnabled; sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), "optMatchAll"); - String soptMatchAll = CurUnoDialog.m_oResource.getResText(BaseID + 9); - String soptMatchAny = CurUnoDialog.m_oResource.getResText(BaseID + 10); - slblFieldNames = CurUnoDialog.m_oResource.getResText(BaseID + 17); - slblOperators = CurUnoDialog.m_oResource.getResText(BaseID + 24); - slblValue = CurUnoDialog.m_oResource.getResText(BaseID + 25); - sLogicOperators = CurUnoDialog.m_oResource.getResArray(BaseID + 26, 10 /* 7 */); // =, <>, <, >, <=, >=, like, !like, is null, !is null + String soptMatchAll = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 9); + String soptMatchAny = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 10); + slblFieldNames = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 17); + slblOperators = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 24); + slblValue = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 25); + sLogicOperators = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_QUERY + 26, 10 /* 7 */); // =, <>, <, >, <=, >=, like, !like, is null, !is null - sDuplicateCondition = CurUnoDialog.m_oResource.getResText(BaseID + 89); + sDuplicateCondition = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 89); // create Radiobuttons // * match all -- cgit