summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/tabledesign
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-03-30 13:13:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-03-30 16:31:21 +0200
commite6573fa894a7ef1e83f9d7785a61fdcabfe24939 (patch)
tree2cf1a262471d2d5e528153ce15c632aafa926033 /dbaccess/source/ui/tabledesign
parentaa24771563425072c710e8c426323ed311437f13 (diff)
tdf#131576 Fields not displayed as expected in Base's Table Wizard
this is similar to the problem of tdf#130623 "Base: Empty Field Properties" so take that solution and move it down the the shared component Change-Id: I15e26ca1c781b3a90ece2073112953cc40083d15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91362 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ui/tabledesign')
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx24
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx7
2 files changed, 1 insertions, 30 deletions
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index c39a3f6b9581..1a052c19007a 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -33,10 +33,6 @@ OFieldDescGenWin::OFieldDescGenWin( vcl::Window* pParent, OTableDesignHelpBar* p
m_pFieldControl = VclPtr<OTableFieldControl>::Create(this,pHelp);
m_pFieldControl->SetHelpId(HID_TAB_DESIGN_FIELDCONTROL);
m_pFieldControl->Show();
-
- maLayoutIdle.SetPriority(TaskPriority::RESIZE);
- maLayoutIdle.SetInvokeHandler( LINK( this, OFieldDescGenWin, ImplHandleLayoutTimerHdl ) );
- maLayoutIdle.SetDebugName( "OFieldDescGenWin maLayoutIdle" );
}
OFieldDescGenWin::~OFieldDescGenWin()
@@ -46,7 +42,6 @@ OFieldDescGenWin::~OFieldDescGenWin()
void OFieldDescGenWin::dispose()
{
- maLayoutIdle.Stop();
m_pFieldControl.disposeAndClear();
TabPage::dispose();
}
@@ -58,29 +53,12 @@ void OFieldDescGenWin::Init()
m_pFieldControl->Init();
}
-void OFieldDescGenWin::queue_resize(StateChangedType eReason)
-{
- TabPage::queue_resize(eReason);
- if (!m_pFieldControl)
- return;
- if (maLayoutIdle.IsActive())
- return;
- maLayoutIdle.Start();
-}
-
-IMPL_LINK_NOARG(OFieldDescGenWin, ImplHandleLayoutTimerHdl, Timer*, void)
+void OFieldDescGenWin::Resize()
{
- if (!m_pFieldControl)
- return;
m_pFieldControl->SetPosSizePixel(Point(0,0),GetSizePixel());
m_pFieldControl->Resize();
}
-void OFieldDescGenWin::Resize()
-{
- queue_resize();
-}
-
void OFieldDescGenWin::SetReadOnly( bool bReadOnly )
{
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
index 47874ff5bcc2..b43f8d1fa841 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_FIELDDESCGENWIN_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_FIELDDESCGENWIN_HXX
-#include <vcl/idle.hxx>
#include <vcl/tabpage.hxx>
#include <IClipBoardTest.hxx>
@@ -34,10 +33,6 @@ namespace dbaui
{
VclPtr<OTableFieldControl> m_pFieldControl;
- Idle maLayoutIdle;
-
- DECL_LINK(ImplHandleLayoutTimerHdl, Timer*, void);
-
protected:
virtual void Resize() override;
@@ -46,8 +41,6 @@ namespace dbaui
virtual ~OFieldDescGenWin() override;
virtual void dispose() override;
- virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override;
-
virtual void GetFocus() override;
virtual void LoseFocus() override;
void Init();