From 120621a128f4c2d4f39fd9f44c1a735d4c67991e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sat, 8 Oct 2016 18:51:39 +0100
Subject: de-src solo PushButton resource

Change-Id: Id6cd01c8bd4bf9ed36c17fd75ecce34eb7f36cc7
---
 dbaccess/source/ui/control/FieldDescControl.cxx | 4 +++-
 dbaccess/source/ui/inc/dbu_resource.hrc         | 4 ----
 dbaccess/source/ui/inc/dbu_tbl.hrc              | 3 ++-
 dbaccess/source/ui/tabledesign/table.src        | 3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 812c2049a622..ad41b38aaa70 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -868,10 +868,12 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
             pFormatSample->Enable(false);
             InitializeControl(pFormatSample,HID_TAB_ENT_FORMAT_SAMPLE,false);
 
-            pFormat = VclPtr<PushButton>::Create( this, ModuleRes(PB_FORMAT) );
+            pFormat = VclPtr<PushButton>::Create(this, WB_TABSTOP);
+            pFormat->SetText(ModuleRes(STR_BUTTON_FORMAT));
             const sal_Int32 nControlHeight = GetMaxControlHeight();
             pFormat->SetSizePixel(Size(nControlHeight, nControlHeight));
             pFormat->SetClickHdl( LINK( this, OFieldDescControl, FormatClickHdl ) );
+            pFormat->Show();
             InitializeControl(pFormat,HID_TAB_ENT_FORMAT,false);
         }
 
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 50d5789dda2a..cfe1de2e245a 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -216,10 +216,6 @@
 
 #define RSC_QUERY_OBJECT_TYPE           RID_UNTYPED_START +  4
 
-// various
-
-#define PB_FORMAT                       RID_MISC_START +  0
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_tbl.hrc b/dbaccess/source/ui/inc/dbu_tbl.hrc
index d47a76093eab..edcf7fc1b7c5 100644
--- a/dbaccess/source/ui/inc/dbu_tbl.hrc
+++ b/dbaccess/source/ui/inc/dbu_tbl.hrc
@@ -77,10 +77,11 @@
 #define STR_TABLEDESIGN_SAVE_ERROR          RID_STR_TBL_START + 53
 #define STR_TABLEDESIGN_COULD_NOT_DROP_COL  RID_STR_TBL_START + 54
 #define STR_COLUMN_DESCRIPTION              RID_STR_TBL_START + 55
+#define STR_BUTTON_FORMAT                   RID_STR_TBL_START + 56
 
 // please adjust checking before insert new strings
 
-#if STR_NO_TYPE_INFO_AVAILABLE > RID_STR_TBL_END
+#if STR_BUTTON_FORMAT > RID_STR_TBL_END
 #error Resource-Id Ueberlauf in #file, #line
 #endif
 
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index 90a4e0cf5280..1bcbf34a754d 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -296,9 +296,8 @@ String STR_HELP_AUTOINCREMENT
     Text [ en-US ] = "Choose if this field should contain AutoIncrement values.\n\nYou can not enter data in fields of this type. An intrinsic value will be assigned to each new record automatically (resulting from the increment of the previous record)." ;
 };
 
-PushButton PB_FORMAT
+String STR_BUTTON_FORMAT
 {
-    TabStop = TRUE ;
     Text [ en-US ] = "~...";
 };
 
-- 
cgit