From 8215167bac4f34a2f1432ab247c8984d8f448372 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 12 Oct 2016 15:23:00 +0100 Subject: de-src RID_DB_TAB_EDITOR control Change-Id: Idba73ea9bf2486d40b24e59bf6f1f5092ec70558 --- dbaccess/source/ui/inc/dbu_resource.hrc | 4 ---- dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 16 +++++++++------- dbaccess/source/ui/tabledesign/table.src | 10 ---------- 3 files changed, 9 insertions(+), 21 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index cfe1de2e245a..01c1c789d6a9 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -141,10 +141,6 @@ #define RID_MENU_JOINVIEW_CONNECTION RID_MENU_START + 16 #define RID_MENU_JOINVIEW_TABLE RID_MENU_START + 17 -// controls - -#define RID_DB_TAB_EDITOR RID_CONTROL_START + 0 - // strings #define STR_TBL_TITLE RID_STR_GEN_START #define STR_ERROR_DURING_CREATION RID_STR_GEN_START + 1 diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 62dc378f5aa6..a774f583a4ee 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -35,14 +35,16 @@ using namespace ::com::sun::star::util; #define HANDLE_ID 0 OTableRowView::OTableRowView(vcl::Window* pParent) - :EditBrowseBox(pParent, ModuleRes(RID_DB_TAB_EDITOR),EditBrowseBoxFlags::NONE, - BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION | BrowserMode::AUTOSIZE_LASTCOL | - BrowserMode::KEEPHIGHLIGHT | BrowserMode::HLINES | BrowserMode::VLINES) - ,m_nDataPos(-1) - ,m_nCurrentPos(-1) - ,m_nCurUndoActId(0) + : EditBrowseBox(pParent, EditBrowseBoxFlags::NONE, WB_TABSTOP|WB_HIDE|WB_3DLOOK, + BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION | + BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::KEEPHIGHLIGHT | + BrowserMode::HLINES | BrowserMode::VLINES) + , m_nDataPos(-1) + , m_nCurrentPos(-1) + , m_nCurUndoActId(0) { - + SetHelpId(HID_TABDESIGN_BACKGROUND); + SetSizePixel(LogicToPixel(Size(40, 12), MapUnit::MapAppFont)); } void OTableRowView::Init() diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src index 1bcbf34a754d..d0dc8eeba6a6 100644 --- a/dbaccess/source/ui/tabledesign/table.src +++ b/dbaccess/source/ui/tabledesign/table.src @@ -123,16 +123,6 @@ String STR_TAB_TABLE_PROPERTIES Text [ en-US ] = "Table properties"; }; -Control RID_DB_TAB_EDITOR -{ - Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( 40 , 12 ) ; - TabStop = TRUE ; - SvLook = TRUE ; - Hide = TRUE ; - HelpId = HID_TABDESIGN_BACKGROUND ; -}; - Menu RID_TABLEDESIGNROWPOPUPMENU { ItemList = -- cgit