RID_SBA_GRID_COLCTXMENU has the same odd pattern
Change-Id: Ie05b8d0fe706656f9d9fb66b43af11fac87c8d46
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 8d621a0..a3ee13a 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -648,7 +648,6 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM
bool bColAttrs = (nColId != (sal_uInt16)-1) && (nColId != 0);
if ( bColAttrs && !bDBIsReadOnly)
{
ScopedVclPtrInstance<PopupMenu> aNewItems(ModuleRes(RID_SBA_GRID_COLCTXMENU));
sal_uInt16 nPos = 0;
sal_uInt16 nModelPos = static_cast<SbaGridControl*>(GetParent())->GetModelColumnPos(nColId);
Reference< XPropertySet > xField = static_cast<SbaGridControl*>(GetParent())->getField(nModelPos);
@@ -667,14 +666,14 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM
case DataType::REF:
break;
default:
rMenu.InsertItem(ID_BROWSER_COLATTRSET, aNewItems->GetItemText(ID_BROWSER_COLATTRSET), MenuItemBits::NONE, OString(), nPos++);
rMenu.SetHelpId(ID_BROWSER_COLATTRSET, aNewItems->GetHelpId(ID_BROWSER_COLATTRSET));
rMenu.InsertItem(ID_BROWSER_COLATTRSET, ModuleRes(RID_STR_COLUMN_FORMAT).toString(), MenuItemBits::NONE, OString(), nPos++);
rMenu.SetHelpId(ID_BROWSER_COLATTRSET, HID_BROWSER_COLUMNFORMAT);
rMenu.InsertSeparator(OString(), nPos++);
}
}
rMenu.InsertItem(ID_BROWSER_COLWIDTH, aNewItems->GetItemText(ID_BROWSER_COLWIDTH), MenuItemBits::NONE, OString(), nPos++);
rMenu.SetHelpId(ID_BROWSER_COLWIDTH, aNewItems->GetHelpId(ID_BROWSER_COLWIDTH));
rMenu.InsertItem(ID_BROWSER_COLWIDTH, ModuleRes(RID_STR_COLUMN_WIDTH).toString(), MenuItemBits::NONE, OString(), nPos++);
rMenu.SetHelpId(ID_BROWSER_COLWIDTH, HID_BROWSER_COLUMNWIDTH);
rMenu.InsertSeparator(OString(), nPos++);
}
}
diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src
index 39c4cb2..a545840 100644
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ b/dbaccess/source/ui/browser/sbagrid.src
@@ -20,30 +20,14 @@
#include "dbaccess_helpid.hrc"
#include "browserids.hxx"
Menu RID_SBA_GRID_COLCTXMENU
String RID_STR_COLUMN_FORMAT
{
ItemList =
{
MenuItem
{
Identifier = ID_BROWSER_COLATTRSET ;
HelpID = HID_BROWSER_COLUMNFORMAT ;
Text [ en-US ] = "Column ~Format..." ;
};
MenuItem
{
Identifier = ID_BROWSER_COLWIDTH ;
HelpID = HID_BROWSER_COLUMNWIDTH ;
Text [ en-US ] = "Column ~Width..." ;
HelpID = HID_BROWSER_COLUMNWIDTH;
};
MenuItem
{
Identifier = ID_BROWSER_COLUMNINFO ;
HelpID = HID_BROWSER_COLUMNINFO ;
Text [ en-US ] = "Copy Column D~escription";
};
};
Text [ en-US ] = "Column ~Format...";
};
String RID_STR_COLUMN_WIDTH
{
Text [ en-US ] = "Column ~Width...";
};
String RID_STR_TABLE_FORMAT
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index a937ee8..0121edb 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -123,7 +123,6 @@
// menus
#define RID_SBA_GRID_COLCTXMENU RID_MENU_START + 2
#define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5
#define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6
#define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7
@@ -197,6 +196,8 @@
#define RID_STR_TABLE_FORMAT RID_STR_GEN_START + 65
#define RID_STR_ROW_HEIGHT RID_STR_GEN_START + 66
#define RID_STR_COPY RID_STR_GEN_START + 67
#define RID_STR_COLUMN_FORMAT RID_STR_GEN_START + 68
#define RID_STR_COLUMN_WIDTH RID_STR_GEN_START + 69
// untyped resources
