wizards/com/sun/star/wizards/db/DBMetaData.java | 7 +- wizards/com/sun/star/wizards/db/RecordParser.java | 2 wizards/com/sun/star/wizards/form/DataEntrySetter.java | 12 ++-- wizards/com/sun/star/wizards/form/FieldLinker.java | 24 ++++---- wizards/com/sun/star/wizards/form/Finalizer.java | 8 +- wizards/com/sun/star/wizards/form/FormConfiguration.java | 10 +-- wizards/com/sun/star/wizards/form/FormDocument.java | 2 wizards/com/sun/star/wizards/form/StyleApplier.java | 10 +-- wizards/com/sun/star/wizards/form/UIControlArranger.java | 18 +++--- wizards/com/sun/star/wizards/query/Finalizer.java | 12 ++-- wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 6 +- wizards/com/sun/star/wizards/report/ReportFinalizer.java | 16 ++--- wizards/com/sun/star/wizards/report/ReportLayouter.java | 28 ++++----- wizards/com/sun/star/wizards/table/FieldFormatter.java | 12 ++-- wizards/com/sun/star/wizards/table/Finalizer.java | 16 ++--- wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 18 +++--- wizards/com/sun/star/wizards/table/ScenarioSelector.java | 12 ++-- wizards/com/sun/star/wizards/ui/AggregateComponent.java | 20 +++--- wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 4 - wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 2 wizards/com/sun/star/wizards/ui/FieldSelection.java | 12 ++-- wizards/com/sun/star/wizards/ui/FilterComponent.java | 32 +++++------ wizards/com/sun/star/wizards/ui/SortingComponent.java | 28 ++++----- wizards/com/sun/star/wizards/ui/UnoDialog.java | 2 24 files changed, 158 insertions(+), 155 deletions(-)
New commits: commit 0b642c711e3c60651a189073e594acc26e0d381d Author: Caolán McNamara <[email protected]> AuthorDate: Fri Sep 20 09:27:23 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Sep 20 17:06:04 2024 +0200 cid#1607206 PA: Public Attribute Change-Id: I27a8247f0674c90ea16f896c1aba465aeeaa9992 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173720 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/wizards/com/sun/star/wizards/form/DataEntrySetter.java b/wizards/com/sun/star/wizards/form/DataEntrySetter.java index 4b4a3e0cf9ac..e31c7ee285fb 100644 --- a/wizards/com/sun/star/wizards/form/DataEntrySetter.java +++ b/wizards/com/sun/star/wizards/form/DataEntrySetter.java @@ -41,12 +41,12 @@ public class DataEntrySetter { short curtabindex = (short) (FormWizard.SODATA_PAGE * 100); Integer IDataStep = Integer.valueOf(FormWizard.SODATA_PAGE); - String sNewDataOnly = CurUnoDialog.m_oResource.getResText("RID_FORM_44"); - String sDisplayAllData = CurUnoDialog.m_oResource.getResText("RID_FORM_46"); - String sNoModification = CurUnoDialog.m_oResource.getResText("RID_FORM_47"); // AllowUpdates - String sNoDeletion = CurUnoDialog.m_oResource.getResText("RID_FORM_48"); // AllowDeletes - String sNoAddition = CurUnoDialog.m_oResource.getResText("RID_FORM_49"); // AllowInserts - String sdontdisplayExistingData = CurUnoDialog.m_oResource.getResText("RID_FORM_45"); + String sNewDataOnly = CurUnoDialog.getResource().getResText("RID_FORM_44"); + String sDisplayAllData = CurUnoDialog.getResource().getResText("RID_FORM_46"); + String sNoModification = CurUnoDialog.getResource().getResText("RID_FORM_47"); // AllowUpdates + String sNoDeletion = CurUnoDialog.getResource().getResText("RID_FORM_48"); // AllowDeletes + String sNoAddition = CurUnoDialog.getResource().getResText("RID_FORM_49"); // AllowInserts + String sdontdisplayExistingData = CurUnoDialog.getResource().getResText("RID_FORM_45"); CurUnoDialog.insertRadioButton("optNewDataOnly", new XItemListenerAdapter() { @Override diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java index 71b75959a7e2..35c325d10d9d 100644 --- a/wizards/com/sun/star/wizards/form/FieldLinker.java +++ b/wizards/com/sun/star/wizards/form/FieldLinker.java @@ -41,7 +41,7 @@ public class FieldLinker extends DBLimitedFieldSelection private XListBox[] lstMasterFields; private int[] SOLINKLST = null; private String[] sSlaveListHeader; - private String[] sMasterListHeader; //CurUnoDialog.m_oResource.getResText("RID_FORM_40"); + private String[] sMasterListHeader; //CurUnoDialog.getResource().getResText("RID_FORM_40"); public FieldLinker(WizardDialog _CurUnoDialog, int iStep, int iCompPosY, int _firsthelpid) { @@ -63,16 +63,16 @@ public class FieldLinker extends DBLimitedFieldSelection int SOSECLINKLST = 1; int SOTHIRDLINKLST = 2; int SOFOURTHLINKLST = 3; - sSlaveListHeader = new String[4]; //new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40); - sSlaveListHeader[0] = CurUnoDialog.m_oResource.getResText("RID_FORM_20"); - sSlaveListHeader[1] = CurUnoDialog.m_oResource.getResText("RID_FORM_21"); - sSlaveListHeader[2] = CurUnoDialog.m_oResource.getResText("RID_FORM_22"); - sSlaveListHeader[3] = CurUnoDialog.m_oResource.getResText("RID_FORM_23"); - sMasterListHeader = new String[4]; // new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40); - sMasterListHeader[0] = CurUnoDialog.m_oResource.getResText("RID_FORM_24"); - sMasterListHeader[1] = CurUnoDialog.m_oResource.getResText("RID_FORM_25"); - sMasterListHeader[2] = CurUnoDialog.m_oResource.getResText("RID_FORM_26"); - sMasterListHeader[3] = CurUnoDialog.m_oResource.getResText("RID_FORM_27"); + sSlaveListHeader = new String[4]; //new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.getResource().getResText(UIConsts.RID_FORM + 40); + sSlaveListHeader[0] = CurUnoDialog.getResource().getResText("RID_FORM_20"); + sSlaveListHeader[1] = CurUnoDialog.getResource().getResText("RID_FORM_21"); + sSlaveListHeader[2] = CurUnoDialog.getResource().getResText("RID_FORM_22"); + sSlaveListHeader[3] = CurUnoDialog.getResource().getResText("RID_FORM_23"); + sMasterListHeader = new String[4]; // new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.getResource().getResText(UIConsts.RID_FORM + 40); + sMasterListHeader[0] = CurUnoDialog.getResource().getResText("RID_FORM_24"); + sMasterListHeader[1] = CurUnoDialog.getResource().getResText("RID_FORM_25"); + sMasterListHeader[2] = CurUnoDialog.getResource().getResText("RID_FORM_26"); + sMasterListHeader[3] = CurUnoDialog.getResource().getResText("RID_FORM_27"); SOLINKLST = new int[] { SOFIRSTLINKLST, SOSECLINKLST, SOTHIRDLINKLST, SOFOURTHLINKLST @@ -272,7 +272,7 @@ public class FieldLinker extends DBLimitedFieldSelection int iduplicate = JavaTools.getDuplicateFieldIndex(LinkFieldNames); if (iduplicate != -1) { - String sLinkFieldsAreDuplicate = CurUnoDialog.m_oResource.getResText("RID_FORM_19"); + String sLinkFieldsAreDuplicate = CurUnoDialog.getResource().getResText("RID_FORM_19"); String sLocLinkFieldsAreDuplicate = JavaTools.replaceSubString(sLinkFieldsAreDuplicate, LinkFieldNames[0][iduplicate], "<FIELDNAME1>"); sLocLinkFieldsAreDuplicate = JavaTools.replaceSubString(sLocLinkFieldsAreDuplicate, LinkFieldNames[1][iduplicate], "<FIELDNAME2>"); CurUnoDialog.setCurrentStep(FormWizard.SOFIELDLINKER_PAGE); diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java index 1fa97b0ac56f..a6c822231e1c 100644 --- a/wizards/com/sun/star/wizards/form/Finalizer.java +++ b/wizards/com/sun/star/wizards/form/Finalizer.java @@ -43,10 +43,10 @@ public class Finalizer this.CurUnoDialog = _CurUnoDialog; short curtabindex = (short) (FormWizard.SOSTORE_PAGE * 100); - String slblFormName = CurUnoDialog.m_oResource.getResText("RID_FORM_50"); - String slblProceed = CurUnoDialog.m_oResource.getResText("RID_FORM_51"); - String sWorkWithForm = CurUnoDialog.m_oResource.getResText("RID_FORM_52"); - String sModifyForm = CurUnoDialog.m_oResource.getResText("RID_FORM_53"); + String slblFormName = CurUnoDialog.getResource().getResText("RID_FORM_50"); + String slblProceed = CurUnoDialog.getResource().getResText("RID_FORM_51"); + String sWorkWithForm = CurUnoDialog.getResource().getResText("RID_FORM_52"); + String sModifyForm = CurUnoDialog.getResource().getResText("RID_FORM_53"); CurUnoDialog.insertLabel("lblFormName", new String[] { diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index 9f74c2437987..6f73f86a825e 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -56,11 +56,11 @@ public class FormConfiguration this.CurUnoDialog = _CurUnoDialog; short curtabindex = (short) (FormWizard.SOSUBFORM_PAGE * 100); Integer ISubFormStep = Integer.valueOf(FormWizard.SOSUBFORM_PAGE); - String sOnExistingRelation = CurUnoDialog.m_oResource.getResText("RID_FORM_5"); - String sOnManualRelation = CurUnoDialog.m_oResource.getResText("RID_FORM_7"); - String sSelectManually = CurUnoDialog.m_oResource.getResText("RID_FORM_4"); - String sSelectRelation = CurUnoDialog.m_oResource.getResText("RID_FORM_8"); - String sSubFormDescription = CurUnoDialog.m_oResource.getResText("RID_FORM_3"); + String sOnExistingRelation = CurUnoDialog.getResource().getResText("RID_FORM_5"); + String sOnManualRelation = CurUnoDialog.getResource().getResText("RID_FORM_7"); + String sSelectManually = CurUnoDialog.getResource().getResText("RID_FORM_4"); + String sSelectRelation = CurUnoDialog.getResource().getResText("RID_FORM_8"); + String sSubFormDescription = CurUnoDialog.getResource().getResText("RID_FORM_3"); // CheckBox 'Add sub form' chkcreateSubForm = CurUnoDialog.insertCheckBox("chkcreateSubForm", new XItemListenerAdapter() { diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index f780273a9718..508773d1018e 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -70,11 +70,11 @@ public class StyleApplier xPageStylePropertySet = oTextStyleHandler.getStyleByName("PageStyles", "Standard"); short curtabindex = (short) (FormWizard.SOSTYLE_PAGE * 100); Integer IStyleStep = Integer.valueOf(FormWizard.SOSTYLE_PAGE); - String sPageStyles = CurUnoDialog.m_oResource.getResText("RID_FORM_86"); - String sNoBorder = CurUnoDialog.m_oResource.getResText("RID_FORM_29"); - String s3DLook = CurUnoDialog.m_oResource.getResText("RID_FORM_30"); - String sFlat = CurUnoDialog.m_oResource.getResText("RID_FORM_31"); - String sFieldBorder = CurUnoDialog.m_oResource.getResText("RID_FORM_28"); + String sPageStyles = CurUnoDialog.getResource().getResText("RID_FORM_86"); + String sNoBorder = CurUnoDialog.getResource().getResText("RID_FORM_29"); + String s3DLook = CurUnoDialog.getResource().getResText("RID_FORM_30"); + String sFlat = CurUnoDialog.getResource().getResText("RID_FORM_31"); + String sFieldBorder = CurUnoDialog.getResource().getResText("RID_FORM_28"); setStyles(); short[] SelLayoutPos; SelLayoutPos = new short[] diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java index 78dc5969e518..7bb53dd49085 100644 --- a/wizards/com/sun/star/wizards/form/UIControlArranger.java +++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java @@ -63,9 +63,9 @@ public class UIControlArranger this.curFormDocument = _curFormDocument; curtabindex = (short) (FormWizard.SOCONTROL_PAGE * 100); IControlStep = Integer.valueOf(FormWizard.SOCONTROL_PAGE); - String sLabelPlacment = CurUnoDialog.m_oResource.getResText("RID_FORM_32"); - String sAlignLeft = CurUnoDialog.m_oResource.getResText("RID_FORM_33"); - String sAlignRight = CurUnoDialog.m_oResource.getResText("RID_FORM_34"); + String sLabelPlacment = CurUnoDialog.getResource().getResText("RID_FORM_32"); + String sAlignLeft = CurUnoDialog.getResource().getResText("RID_FORM_33"); + String sAlignRight = CurUnoDialog.getResource().getResText("RID_FORM_34"); // Label "Label Placement" ----------------- flnLabelPlacement = CurUnoDialog.insertFixedLine("lnLabelPlacement", @@ -116,21 +116,21 @@ public class UIControlArranger imageModel.addElement(ARRANGEFREE); // "Columnar - Labels Left" - helpTexts.put(ARRANGELISTSIDE, CurUnoDialog.m_oResource.getResText("RID_FORM_36")); + helpTexts.put(ARRANGELISTSIDE, CurUnoDialog.getResource().getResText("RID_FORM_36")); // "Columnar - Labels of Top" - helpTexts.put(ARRANGELISTTOP, CurUnoDialog.m_oResource.getResText("RID_FORM_37")); + helpTexts.put(ARRANGELISTTOP, CurUnoDialog.getResource().getResText("RID_FORM_37")); // "As Data Sheet" - helpTexts.put(ARRANGETABLE, CurUnoDialog.m_oResource.getResText("RID_FORM_40")); + helpTexts.put(ARRANGETABLE, CurUnoDialog.getResource().getResText("RID_FORM_40")); // "In Blocks - Labels Above" - helpTexts.put(ARRANGEFREE, CurUnoDialog.m_oResource.getResText("RID_FORM_39")); + helpTexts.put(ARRANGEFREE, CurUnoDialog.getResource().getResText("RID_FORM_39")); - String sMainArrangementHeader = CurUnoDialog.m_oResource.getResText("RID_FORM_41"); // "Arrangement of the main form" + String sMainArrangementHeader = CurUnoDialog.getResource().getResText("RID_FORM_41"); // "Arrangement of the main form" m_aArrangeList[0] = new ArrangeButtonList(0, imageModel, sMainArrangementHeader); - String sSubArrangementHeader = CurUnoDialog.m_oResource.getResText("RID_FORM_42"); // "Arrangement of the sub form" + String sSubArrangementHeader = CurUnoDialog.getResource().getResText("RID_FORM_42"); // "Arrangement of the sub form" m_aArrangeList[1] = new ArrangeButtonList(1, imageModel, sSubArrangementHeader); enableAlignControlGroup(false); } diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java index 6a556beffe12..a7c82fa55235 100644 --- a/wizards/com/sun/star/wizards/query/Finalizer.java +++ b/wizards/com/sun/star/wizards/query/Finalizer.java @@ -52,12 +52,12 @@ public class Finalizer String reslblHowGoOn; this.m_queryWizard = i_queryWizard; this.CurDBMetaData = _CurDBMetaData; - reslblQueryTitle = m_queryWizard.m_oResource.getResText("RID_QUERY_5"); - resoptDisplayQuery = m_queryWizard.m_oResource.getResText("RID_QUERY_6"); - resoptModifyQuery = m_queryWizard.m_oResource.getResText("RID_QUERY_7"); - resflnSummary = m_queryWizard.m_oResource.getResText("RID_QUERY_87"); - reslblHowGoOn = m_queryWizard.m_oResource.getResText("RID_QUERY_8"); - resQuery = m_queryWizard.m_oResource.getResText("RID_QUERY_1"); + reslblQueryTitle = m_queryWizard.getResource().getResText("RID_QUERY_5"); + resoptDisplayQuery = m_queryWizard.getResource().getResText("RID_QUERY_6"); + resoptModifyQuery = m_queryWizard.getResource().getResText("RID_QUERY_7"); + resflnSummary = m_queryWizard.getResource().getResText("RID_QUERY_87"); + reslblHowGoOn = m_queryWizard.getResource().getResText("RID_QUERY_8"); + resQuery = m_queryWizard.getResource().getResText("RID_QUERY_1"); int curHelpIndex = 40955; m_queryWizard.insertLabel("lblQueryTitle", new String[] diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java index 3cb9bed91e97..db5c3c3270e7 100644 --- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java +++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java @@ -38,8 +38,8 @@ public class GroupFieldHandler extends FieldSelection public GroupFieldHandler(IReportDocument _CurReportDocument, WizardDialog _CurUnoDialog) { super(_CurUnoDialog, ReportWizard.SOGROUPPAGE, 95, 27, 210, 127, - _CurUnoDialog.m_oResource.getResText("RID_REPORT_19"), - _CurUnoDialog.m_oResource.getResText("RID_REPORT_50"), 34340, false); + _CurUnoDialog.getResource().getResText("RID_REPORT_19"), + _CurUnoDialog.getResource().getResText("RID_REPORT_50"), 34340, false); try { @@ -48,7 +48,7 @@ public class GroupFieldHandler extends FieldSelection CurUnoDialog.setControlProperty("lstFields_2", "MultiSelection", Boolean.FALSE); CurUnoDialog.setControlProperty("lstSelFields_2", "MultiSelection", Boolean.FALSE); addFieldSelectionListener(new FieldSelectionListener()); - String sNote = ReportWizard.getBlindTextNote(_CurReportDocument, _CurUnoDialog.m_oResource); + String sNote = ReportWizard.getBlindTextNote(_CurReportDocument, _CurUnoDialog.getResource()); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblBlindTextNote_1", new String[] { diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index 048c2d3e92e2..46d28a392a2b 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -47,13 +47,13 @@ public class ReportFinalizer this.CurReportDocument = _CurReportDocument; short curtabindex = (short) (ReportWizard.SOSTOREPAGE * 100); - String sSaveAsTemplate = CurUnoDialog.m_oResource.getResText("RID_REPORT_40"); - String sUseTemplate = CurUnoDialog.m_oResource.getResText("RID_REPORT_41"); - String sEditTemplate = CurUnoDialog.m_oResource.getResText("RID_REPORT_42"); - String sSaveAsDocument = CurUnoDialog.m_oResource.getResText("RID_REPORT_43"); - String sReportTitle = CurUnoDialog.m_oResource.getResText("RID_REPORT_33"); - String slblHowProceed = CurUnoDialog.m_oResource.getResText("RID_REPORT_78"); - String slblChooseReportKind = CurUnoDialog.m_oResource.getResText("RID_REPORT_79"); + String sSaveAsTemplate = CurUnoDialog.getResource().getResText("RID_REPORT_40"); + String sUseTemplate = CurUnoDialog.getResource().getResText("RID_REPORT_41"); + String sEditTemplate = CurUnoDialog.getResource().getResText("RID_REPORT_42"); + String sSaveAsDocument = CurUnoDialog.getResource().getResText("RID_REPORT_43"); + String sReportTitle = CurUnoDialog.getResource().getResText("RID_REPORT_33"); + String slblHowProceed = CurUnoDialog.getResource().getResText("RID_REPORT_78"); + String slblChooseReportKind = CurUnoDialog.getResource().getResText("RID_REPORT_79"); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblTitle", new String[] @@ -250,7 +250,7 @@ public class ReportFinalizer return false; } } - String sMsgReportDocumentNameDuplicate = CurUnoDialog.m_oResource.getResText("RID_REPORT_76"); + String sMsgReportDocumentNameDuplicate = CurUnoDialog.getResource().getResText("RID_REPORT_76"); String sShowMsgReportNameisDuplicate = JavaTools.replaceSubString(sMsgReportDocumentNameDuplicate, StoreName, "%REPORTNAME"); /* int iMsg = */ CurUnoDialog.showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sShowMsgReportNameisDuplicate); CurUnoDialog.enableFinishButton(false); diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 29f7b2d1e584..a03b875602f4 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -65,12 +65,12 @@ public class ReportLayouter this.CurUnoDialog = _CurUnoDialog; this.CurReportDocument = _CurReportDocument; //TODO the constructor for the OfficePathRetriever is redundant and should be instantiated elsewhere - String slblDataStructure = CurUnoDialog.m_oResource.getResText("RID_REPORT_15"); - String slblPageLayout = CurUnoDialog.m_oResource.getResText("RID_REPORT_16"); + String slblDataStructure = CurUnoDialog.getResource().getResText("RID_REPORT_15"); + String slblPageLayout = CurUnoDialog.getResource().getResText("RID_REPORT_16"); - String sOrientationHeader = CurUnoDialog.m_oResource.getResText("RID_REPORT_22"); - String sOrientVertical = CurUnoDialog.m_oResource.getResText("RID_REPORT_23"); - String sOrientHorizontal = CurUnoDialog.m_oResource.getResText("RID_REPORT_24"); + String sOrientationHeader = CurUnoDialog.getResource().getResText("RID_REPORT_22"); + String sOrientVertical = CurUnoDialog.getResource().getResText("RID_REPORT_23"); + String sOrientHorizontal = CurUnoDialog.getResource().getResText("RID_REPORT_24"); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblContent", new String[] @@ -179,7 +179,7 @@ public class ReportLayouter Short.valueOf("0"), 23, 164, 158, Boolean.FALSE, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), 30 }); - String sNote = ReportWizard.getBlindTextNote(CurReportDocument, CurUnoDialog.m_oResource); + String sNote = ReportWizard.getBlindTextNote(CurReportDocument, CurUnoDialog.getResource()); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblBlindTextNote_2", new String[] { @@ -336,31 +336,31 @@ public class ReportLayouter String text = item.getString().trim().toLowerCase(); if (text.equals("#titleconst#")) { - teTitleconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText("RID_REPORT_86"), PropertyNames.EMPTY_STRING, m_xMSF); + teTitleconst = new PlaceholderTextElement(item, CurUnoDialog.getResource().getResText("RID_REPORT_86"), PropertyNames.EMPTY_STRING, m_xMSF); trTitleconst = item; constRangeList.remove(i--); - writeTitle(teTitleconst, trTitleconst, CurUnoDialog.m_oResource.getResText("RID_REPORT_86")); + writeTitle(teTitleconst, trTitleconst, CurUnoDialog.getResource().getResText("RID_REPORT_86")); } else if (text.equals("#authorconst#")) { - teAuthorconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText("RID_REPORT_87"), PropertyNames.EMPTY_STRING, m_xMSF); + teAuthorconst = new PlaceholderTextElement(item, CurUnoDialog.getResource().getResText("RID_REPORT_87"), PropertyNames.EMPTY_STRING, m_xMSF); trAuthorconst = item; constRangeList.remove(i--); - writeTitle(teAuthorconst, trAuthorconst, CurUnoDialog.m_oResource.getResText("RID_REPORT_87")); + writeTitle(teAuthorconst, trAuthorconst, CurUnoDialog.getResource().getResText("RID_REPORT_87")); } else if (text.equals("#dateconst#")) { - teDateconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText("RID_REPORT_88"), PropertyNames.EMPTY_STRING, m_xMSF); + teDateconst = new PlaceholderTextElement(item, CurUnoDialog.getResource().getResText("RID_REPORT_88"), PropertyNames.EMPTY_STRING, m_xMSF); trDateconst = item; constRangeList.remove(i--); - writeTitle(teDateconst, trDateconst, CurUnoDialog.m_oResource.getResText("RID_REPORT_88")); + writeTitle(teDateconst, trDateconst, CurUnoDialog.getResource().getResText("RID_REPORT_88")); } else if (text.equals("#pageconst#")) { - tePageconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText("RID_REPORT_93"), PropertyNames.EMPTY_STRING, m_xMSF); + tePageconst = new PlaceholderTextElement(item, CurUnoDialog.getResource().getResText("RID_REPORT_93"), PropertyNames.EMPTY_STRING, m_xMSF); trPageconst = item; constRangeList.remove(i--); - writeTitle(tePageconst, trPageconst, CurUnoDialog.m_oResource.getResText("RID_REPORT_93")); + writeTitle(tePageconst, trPageconst, CurUnoDialog.getResource().getResText("RID_REPORT_93")); } } } diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index 75a1ade73a51..fe2bc6ce06d1 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -58,13 +58,13 @@ public class FieldFormatter implements XItemListener this.CurUnoDialog = _CurUnoDialog; curtabindex = (short) (TableWizard.SOFIELDSFORMATPAGE * 100); IFieldFormatStep = Integer.valueOf(TableWizard.SOFIELDSFORMATPAGE); - String sFieldName = CurUnoDialog.m_oResource.getResText("RID_TABLE_23"); - String sFieldNames = CurUnoDialog.m_oResource.getResText("RID_TABLE_25"); - String sfieldinfo = CurUnoDialog.m_oResource.getResText("RID_TABLE_20"); - String sbtnplushelptext = CurUnoDialog.m_oResource.getResText("RID_TABLE_45"); - String sbtnminushelptext = CurUnoDialog.m_oResource.getResText("RID_TABLE_46"); + String sFieldName = CurUnoDialog.getResource().getResText("RID_TABLE_23"); + String sFieldNames = CurUnoDialog.getResource().getResText("RID_TABLE_25"); + String sfieldinfo = CurUnoDialog.getResource().getResText("RID_TABLE_20"); + String sbtnplushelptext = CurUnoDialog.getResource().getResText("RID_TABLE_45"); + String sbtnminushelptext = CurUnoDialog.getResource().getResText("RID_TABLE_46"); - suntitled = CurUnoDialog.m_oResource.getResText("RID_TABLE_43"); + suntitled = CurUnoDialog.getResource().getResText("RID_TABLE_43"); CurUnoDialog.insertLabel("lblFieldNames", new String[] diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java index ce6c4bb3151c..fd4567a584e3 100644 --- a/wizards/com/sun/star/wizards/table/Finalizer.java +++ b/wizards/com/sun/star/wizards/table/Finalizer.java @@ -51,14 +51,14 @@ public class Finalizer this.curtabledescriptor = _curtabledescriptor; short curtabindex = (short) (TableWizard.SOFINALPAGE * 100); Integer IFINALSTEP = Integer.valueOf(TableWizard.SOFINALPAGE); - String slblTableName = CurUnoDialog.m_oResource.getResText("RID_TABLE_34"); - String slblProceed = CurUnoDialog.m_oResource.getResText("RID_TABLE_36"); - String sWorkWithTable = CurUnoDialog.m_oResource.getResText("RID_TABLE_38"); - String sStartFormWizard = CurUnoDialog.m_oResource.getResText("RID_TABLE_39"); - String sModifyTable = CurUnoDialog.m_oResource.getResText("RID_TABLE_37"); - String sCongratulations = CurUnoDialog.m_oResource.getResText("RID_TABLE_35"); - String slblCatalog = CurUnoDialog.m_oResource.getResText("RID_TABLE_49"); - String slblSchema = CurUnoDialog.m_oResource.getResText("RID_TABLE_50"); + String slblTableName = CurUnoDialog.getResource().getResText("RID_TABLE_34"); + String slblProceed = CurUnoDialog.getResource().getResText("RID_TABLE_36"); + String sWorkWithTable = CurUnoDialog.getResource().getResText("RID_TABLE_38"); + String sStartFormWizard = CurUnoDialog.getResource().getResText("RID_TABLE_39"); + String sModifyTable = CurUnoDialog.getResource().getResText("RID_TABLE_37"); + String sCongratulations = CurUnoDialog.getResource().getResText("RID_TABLE_35"); + String slblCatalog = CurUnoDialog.getResource().getResText("RID_TABLE_49"); + String slblSchema = CurUnoDialog.getResource().getResText("RID_TABLE_50"); String[] sCatalogNames = curtabledescriptor.getCatalogNames(); String[] sSchemaNames = curtabledescriptor.getSchemaNames(); int nListBoxPosX = 97; diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index 289f76dd36d4..633eb906e841 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -62,15 +62,15 @@ public class PrimaryKeyHandler implements XFieldSelectionListener bAutoPrimaryKeysupportsAutoIncrementation = curTableDescriptor.oTypeInspector.isAutoIncrementationSupported(); short curtabindex = (short) ((TableWizard.SOPRIMARYKEYPAGE * 100) - 20); Integer IPRIMEKEYSTEP = Integer.valueOf(TableWizard.SOPRIMARYKEYPAGE); - final String sExplanations = CurUnoDialog.m_oResource.getResText("RID_TABLE_26"); - final String screatePrimaryKey = CurUnoDialog.m_oResource.getResText("RID_TABLE_27"); - final String slblPrimeFieldName = CurUnoDialog.m_oResource.getResText("RID_TABLE_31"); - final String sApplyAutoValue = CurUnoDialog.m_oResource.getResText("RID_TABLE_33"); - final String sAddAutomatically = CurUnoDialog.m_oResource.getResText("RID_TABLE_28"); - final String sUseExisting = CurUnoDialog.m_oResource.getResText("RID_TABLE_29"); - final String sUseSeveral = CurUnoDialog.m_oResource.getResText("RID_TABLE_30"); - final String slblAvailableFields = CurUnoDialog.m_oResource.getResText("RID_QUERY_4"); - final String slblSelPrimaryFields = CurUnoDialog.m_oResource.getResText("RID_TABLE_32"); + final String sExplanations = CurUnoDialog.getResource().getResText("RID_TABLE_26"); + final String screatePrimaryKey = CurUnoDialog.getResource().getResText("RID_TABLE_27"); + final String slblPrimeFieldName = CurUnoDialog.getResource().getResText("RID_TABLE_31"); + final String sApplyAutoValue = CurUnoDialog.getResource().getResText("RID_TABLE_33"); + final String sAddAutomatically = CurUnoDialog.getResource().getResText("RID_TABLE_28"); + final String sUseExisting = CurUnoDialog.getResource().getResText("RID_TABLE_29"); + final String sUseSeveral = CurUnoDialog.getResource().getResText("RID_TABLE_30"); + final String slblAvailableFields = CurUnoDialog.getResource().getResText("RID_QUERY_4"); + final String slblSelPrimaryFields = CurUnoDialog.getResource().getResText("RID_TABLE_32"); CurUnoDialog.insertLabel("lblExplanation", new String[] { diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 7207005894da..abf67b01f9a0 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -71,12 +71,12 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X bcolumnnameislimited = (imaxcolumnchars > 0) && (imaxcolumnchars < 16); addFieldSelectionListener(this); short pretabindex = (short) (50); - String sExplanation = CurUnoDialog.m_oResource.getResText("RID_TABLE_14"); - String sCategories = CurUnoDialog.m_oResource.getResText("RID_TABLE_15"); - String sBusiness = CurUnoDialog.m_oResource.getResText("RID_TABLE_16"); - String sPrivate = CurUnoDialog.m_oResource.getResText("RID_TABLE_17"); - String sTableNames = CurUnoDialog.m_oResource.getResText("RID_TABLE_18"); - smytable = CurUnoDialog.m_oResource.getResText("RID_TABLE_44"); + String sExplanation = CurUnoDialog.getResource().getResText("RID_TABLE_14"); + String sCategories = CurUnoDialog.getResource().getResText("RID_TABLE_15"); + String sBusiness = CurUnoDialog.getResource().getResText("RID_TABLE_16"); + String sPrivate = CurUnoDialog.getResource().getResText("RID_TABLE_17"); + String sTableNames = CurUnoDialog.getResource().getResText("RID_TABLE_18"); + smytable = CurUnoDialog.getResource().getResText("RID_TABLE_44"); Integer IMAINSTEP = Integer.valueOf(TableWizard.SOMAINPAGE); oCGCategory = new CGCategory(CurUnoDialog.xMSF); oCGTable = new CGTable(CurUnoDialog.xMSF); diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 6bc51b943115..1eaee1fb6ab4 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -180,18 +180,18 @@ public class AggregateComponent extends ControlScroller { if (i == 0) { - soptDetailQuery = CurUnoDialog.m_oResource.getResText("RID_QUERY_11"); - soptSummaryQuery = CurUnoDialog.m_oResource.getResText("RID_QUERY_12"); - slblAggregate = CurUnoDialog.m_oResource.getResText("RID_QUERY_16"); - slblFieldNames = CurUnoDialog.m_oResource.getResText("RID_QUERY_17"); + soptDetailQuery = CurUnoDialog.getResource().getResText("RID_QUERY_11"); + soptSummaryQuery = CurUnoDialog.getResource().getResText("RID_QUERY_12"); + slblAggregate = CurUnoDialog.getResource().getResText("RID_QUERY_16"); + slblFieldNames = CurUnoDialog.getResource().getResText("RID_QUERY_17"); sFunctions = new String[5]; - sFunctions[0] = CurUnoDialog.m_oResource.getResText("RID_QUERY_40"); - sFunctions[1] = CurUnoDialog.m_oResource.getResText("RID_QUERY_41"); - sFunctions[2] = CurUnoDialog.m_oResource.getResText("RID_QUERY_42"); - sFunctions[3] = CurUnoDialog.m_oResource.getResText("RID_QUERY_43"); - sFunctions[4] = CurUnoDialog.m_oResource.getResText("RID_QUERY_44"); + sFunctions[0] = CurUnoDialog.getResource().getResText("RID_QUERY_40"); + sFunctions[1] = CurUnoDialog.getResource().getResText("RID_QUERY_41"); + sFunctions[2] = CurUnoDialog.getResource().getResText("RID_QUERY_42"); + sFunctions[3] = CurUnoDialog.getResource().getResText("RID_QUERY_43"); + sFunctions[4] = CurUnoDialog.getResource().getResText("RID_QUERY_44"); - sDuplicateAggregateFunction = CurUnoDialog.m_oResource.getResText("RID_QUERY_90"); + sDuplicateAggregateFunction = CurUnoDialog.getResource().getResText("RID_QUERY_90"); } if (ControlRowVector == null) { diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index 8cd37ee0ad0e..6499fdbd79a8 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -137,7 +137,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< { if (sQueryPrefix == null) { - sQueryPrefix = CurUnoDialog.m_oResource.getResText("RID_QUERY_22"); + sQueryPrefix = CurUnoDialog.getResource().getResText("RID_QUERY_22"); } return sQueryPrefix; } @@ -165,7 +165,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< { if (sTablePrefix == null) { - sTablePrefix = CurUnoDialog.m_oResource.getResText("RID_QUERY_21"); + sTablePrefix = CurUnoDialog.getResource().getResText("RID_QUERY_21"); } return sTablePrefix; } diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java index f7c8e942e12d..1329406506a5 100644 --- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java @@ -43,7 +43,7 @@ public abstract class DBLimitedFieldSelection this.CurUnoDialog = _CurUnoDialog; FirstHelpIndex = _FirstHelpIndex; curtabindex = (short) (iStep * 100); - sNoField = CurUnoDialog.m_oResource.getResText("RID_REPORT_8"); + sNoField = CurUnoDialog.getResource().getResText("RID_REPORT_8"); IStep = Integer.valueOf(iStep); iCurPosY = iCompPosY; for (int i = 0; i < rowcount; i++) diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index b9d2bba3d84b..dc9f83dbec7c 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -143,12 +143,12 @@ public class FieldSelection { try { - final String AccessTextMoveSelected = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_39"); - final String AccessTextRemoveSelected = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_40"); - final String AccessTextMoveAll = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_41"); - final String AccessTextRemoveAll = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_42"); - final String AccessMoveFieldUp = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_43"); - final String AccessMoveFieldDown = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_44"); + final String AccessTextMoveSelected = CurUnoDialog.getResource().getResText("RID_DB_COMMON_39"); + final String AccessTextRemoveSelected = CurUnoDialog.getResource().getResText("RID_DB_COMMON_40"); + final String AccessTextMoveAll = CurUnoDialog.getResource().getResText("RID_DB_COMMON_41"); + final String AccessTextRemoveAll = CurUnoDialog.getResource().getResText("RID_DB_COMMON_42"); + final String AccessMoveFieldUp = CurUnoDialog.getResource().getResText("RID_DB_COMMON_43"); + final String AccessMoveFieldDown = CurUnoDialog.getResource().getResText("RID_DB_COMMON_44"); FirstHelpIndex = _FirstHelpIndex; short curtabindex = UnoDialog.setInitialTabindex(_iStep); diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 2a91ed124eb7..59b701ccf880 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -376,23 +376,23 @@ public class FilterComponent boolean bEnabled; sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), "optMatchAll"); - String soptMatchAll = CurUnoDialog.m_oResource.getResText("RID_QUERY_9"); - String soptMatchAny = CurUnoDialog.m_oResource.getResText("RID_QUERY_10"); - slblFieldNames = CurUnoDialog.m_oResource.getResText("RID_QUERY_17"); - slblOperators = CurUnoDialog.m_oResource.getResText("RID_QUERY_24"); - slblValue = CurUnoDialog.m_oResource.getResText("RID_QUERY_25"); + String soptMatchAll = CurUnoDialog.getResource().getResText("RID_QUERY_9"); + String soptMatchAny = CurUnoDialog.getResource().getResText("RID_QUERY_10"); + slblFieldNames = CurUnoDialog.getResource().getResText("RID_QUERY_17"); + slblOperators = CurUnoDialog.getResource().getResText("RID_QUERY_24"); + slblValue = CurUnoDialog.getResource().getResText("RID_QUERY_25"); sLogicOperators = new String[10]; // =, <>, <, >, <=, >=, like, !like, is null, !is null - sLogicOperators[0] = CurUnoDialog.m_oResource.getResText("RID_QUERY_26"); - sLogicOperators[1] = CurUnoDialog.m_oResource.getResText("RID_QUERY_27"); - sLogicOperators[2] = CurUnoDialog.m_oResource.getResText("RID_QUERY_28"); - sLogicOperators[3] = CurUnoDialog.m_oResource.getResText("RID_QUERY_29"); - sLogicOperators[4] = CurUnoDialog.m_oResource.getResText("RID_QUERY_30"); - sLogicOperators[5] = CurUnoDialog.m_oResource.getResText("RID_QUERY_31"); - sLogicOperators[6] = CurUnoDialog.m_oResource.getResText("RID_QUERY_32"); - sLogicOperators[7] = CurUnoDialog.m_oResource.getResText("RID_QUERY_33"); - sLogicOperators[8] = CurUnoDialog.m_oResource.getResText("RID_QUERY_34"); - sLogicOperators[9] = CurUnoDialog.m_oResource.getResText("RID_QUERY_35"); - sDuplicateCondition = CurUnoDialog.m_oResource.getResText("RID_QUERY_89"); + sLogicOperators[0] = CurUnoDialog.getResource().getResText("RID_QUERY_26"); + sLogicOperators[1] = CurUnoDialog.getResource().getResText("RID_QUERY_27"); + sLogicOperators[2] = CurUnoDialog.getResource().getResText("RID_QUERY_28"); + sLogicOperators[3] = CurUnoDialog.getResource().getResText("RID_QUERY_29"); + sLogicOperators[4] = CurUnoDialog.getResource().getResText("RID_QUERY_30"); + sLogicOperators[5] = CurUnoDialog.getResource().getResText("RID_QUERY_31"); + sLogicOperators[6] = CurUnoDialog.getResource().getResText("RID_QUERY_32"); + sLogicOperators[7] = CurUnoDialog.getResource().getResText("RID_QUERY_33"); + sLogicOperators[8] = CurUnoDialog.getResource().getResText("RID_QUERY_34"); + sLogicOperators[9] = CurUnoDialog.getResource().getResText("RID_QUERY_35"); + sDuplicateCondition = CurUnoDialog.getResource().getResText("RID_QUERY_89"); // create Radiobuttons // * match all diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index 55c0f52cb5f2..f90f397e1c4c 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -129,20 +129,20 @@ public class SortingComponent private boolean getResources() { - sSortHeader[0] = CurUnoDialog.m_oResource.getResText("RID_REPORT_20"); - sSortHeader[1] = CurUnoDialog.m_oResource.getResText("RID_REPORT_21"); - sSortHeader[2] = CurUnoDialog.m_oResource.getResText("RID_REPORT_51"); - sSortHeader[3] = CurUnoDialog.m_oResource.getResText("RID_REPORT_52"); - sSortAscend[0] = CurUnoDialog.m_oResource.getResText("RID_REPORT_36"); - sSortAscend[1] = CurUnoDialog.m_oResource.getResText("RID_REPORT_53"); - sSortAscend[2] = CurUnoDialog.m_oResource.getResText("RID_REPORT_54"); - sSortAscend[3] = CurUnoDialog.m_oResource.getResText("RID_REPORT_55"); - sSortDescend[0] = CurUnoDialog.m_oResource.getResText("RID_REPORT_37"); - sSortDescend[1] = CurUnoDialog.m_oResource.getResText("RID_REPORT_56"); - sSortDescend[2] = CurUnoDialog.m_oResource.getResText("RID_REPORT_57"); - sSortDescend[3] = CurUnoDialog.m_oResource.getResText("RID_REPORT_58"); - sSortCriteriaisduplicate = CurUnoDialog.m_oResource.getResText("RID_REPORT_74"); - sNoSorting = CurUnoDialog.m_oResource.getResText("RID_REPORT_8"); + sSortHeader[0] = CurUnoDialog.getResource().getResText("RID_REPORT_20"); + sSortHeader[1] = CurUnoDialog.getResource().getResText("RID_REPORT_21"); + sSortHeader[2] = CurUnoDialog.getResource().getResText("RID_REPORT_51"); + sSortHeader[3] = CurUnoDialog.getResource().getResText("RID_REPORT_52"); + sSortAscend[0] = CurUnoDialog.getResource().getResText("RID_REPORT_36"); + sSortAscend[1] = CurUnoDialog.getResource().getResText("RID_REPORT_53"); + sSortAscend[2] = CurUnoDialog.getResource().getResText("RID_REPORT_54"); + sSortAscend[3] = CurUnoDialog.getResource().getResText("RID_REPORT_55"); + sSortDescend[0] = CurUnoDialog.getResource().getResText("RID_REPORT_37"); + sSortDescend[1] = CurUnoDialog.getResource().getResText("RID_REPORT_56"); + sSortDescend[2] = CurUnoDialog.getResource().getResText("RID_REPORT_57"); + sSortDescend[3] = CurUnoDialog.getResource().getResText("RID_REPORT_58"); + sSortCriteriaisduplicate = CurUnoDialog.getResource().getResText("RID_REPORT_74"); + sNoSorting = CurUnoDialog.getResource().getResText("RID_REPORT_8"); return true; } diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 68672c4d1d99..9e5b439fc532 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -48,7 +48,7 @@ public class UnoDialog private XInterface xUnoDialog; private XVclWindowPeer xVclWindowPeer; private HashMap<String, Integer> ControlList; - public Resource m_oResource; + protected Resource m_oResource; public XWindowPeer xWindowPeer = null; private PeerConfig m_oPeerConfig; commit 6cbd95b560016d7e55c42bec622f06e22b6d4ac6 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Sep 20 09:20:37 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Sep 20 17:05:54 2024 +0200 cid#1607639 PA: Public Attribute Change-Id: Ie7a2e95cb46c0472692e91c57f0bbf4714a4a1e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173719 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 6367c3800536..6637f759331c 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -87,7 +87,7 @@ public class DBMetaData private XPropertySet xDataSourcePropertySet; private java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1); private Locale aLocale; - public String DataSourceName; + private String DataSourceName; public com.sun.star.sdbc.XConnection DBConnection; private com.sun.star.sdb.tools.XConnectionTools m_connectionTools; public com.sun.star.lang.XMultiServiceFactory xMSF; @@ -196,7 +196,10 @@ public class DBMetaData } } - + public String getDataSourceName() + { + return DataSourceName; + } public boolean hasTableByName(String _stablename) { diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index abe9e29d2acc..217e705faf6f 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -155,7 +155,7 @@ public class RecordParser extends QueryMetaData { try { - Helper.setUnoPropertyValue(xRowSet, "DataSourceName", DataSourceName); + Helper.setUnoPropertyValue(xRowSet, "DataSourceName", getDataSourceName()); Helper.setUnoPropertyValue(xRowSet, PropertyNames.ACTIVE_CONNECTION, DBConnection); Helper.setUnoPropertyValue(xRowSet, PropertyNames.COMMAND, Command); Helper.setUnoPropertyValue(xRowSet, PropertyNames.COMMAND_TYPE, Integer.valueOf(_nCommandType)); // CommandType diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java index af72449501b0..e2241b1a3215 100644 --- a/wizards/com/sun/star/wizards/form/FormDocument.java +++ b/wizards/com/sun/star/wizards/form/FormDocument.java @@ -98,7 +98,7 @@ public class FormDocument extends TextDocument private String getDataSourceName() { - return this.oMainFormDBMetaData.DataSourceName; + return this.oMainFormDBMetaData.getDataSourceName(); } private void adjustPageStyle()
