[Libreoffice-commits] core.git: wizards/com

[Damjan Jovanovic]

 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(-)

New commits:
commit 46b8d81ae82da848e70b0735b101b1f1cc4e6beb
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Sun Nov 8 14:34:28 2015 +0000

    Use UIConsts constants for offsets to resource IDs in main/wizards.
    
    (cherry picked from commit 95efcaf575dced8cc18f2ca9fb874d772ad23595)
    
    Change-Id: I8bb247c92f0326da916940f4fc7999d81998297a

diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java
index d664b28..02357fe 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 2233753..af9c9cb 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 fd76640..27e7eff 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