1. mst
  2. ooo340

Commits

Ocke  committed 5b9e063

hsqldb19: merge conflict

  • Participants
  • Parent commits 12960fe
  • Branches default

Comments (0)

Files changed (1)

File wizards/com/sun/star/wizards/table/FieldFormatter.java

View file
     TableWizard CurUnoDialog;
     TableDescriptor curTableDescriptor;
     Object oColumnDescriptorModel;
+    XTextComponent txtfieldname;
     XListBox xlstFieldNames;
     XButton btnplus;
     XButton btnminus;
         this.CurUnoDialog = _CurUnoDialog;
         curtabindex = (short) (TableWizard.SOFIELDSFORMATPAGE * 100);
         IFieldFormatStep = new Integer(TableWizard.SOFIELDSFORMATPAGE);
+	String sFieldName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 23);
         String sFieldNames = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 25);
         String sfieldinfo = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 20);
         String sbtnplushelptext = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 45);