mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#130623 host gtk FieldControl within the design view

Browse Source 
to make this work in master

Change-Id: I96a4e7fc0993fbdcf28e2ccad17573b93f4f99dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88570
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2020-02-12 20:37:30 +00:00
parent 2921147f01
commit dcf6fd8bb6
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dbaccess/source/ui/control/FieldDescControl.cxx
View File

@@ -75,9 +75,6 @@ namespace
OFieldDescControl::OFieldDescControl(weld::Container* pPage, vcl::Window* pParent, OTableDesignHelpBar* pHelpBar)
:TabPage(pPage ? Application::GetDefDialogParent() : pParent, WB_3DLOOK | WB_DIALOGCONTROL)
,m_xBuilder(pPage ? Application::CreateBuilder(pPage, "dbaccess/ui/fielddescpage.ui")
: Application::CreateInterimBuilder(this, "dbaccess/ui/fielddescpage.ui"))
,m_xContainer(m_xBuilder->weld_container("FieldDescPage"))
,pHelp( pHelpBar )
,m_pLastFocusWindow(nullptr)
,m_pActFocusWindow(nullptr)
@@ -89,6 +86,16 @@ OFieldDescControl::OFieldDescControl(weld::Container* pPage, vcl::Window* pParen
,m_bAdded(false)
,pActFieldDescr(nullptr)
{
if (pPage)
m_xBuilder.reset(Application::CreateBuilder(pPage, "dbaccess/ui/fielddescpage.ui"));
else
{
m_xVclContentArea = VclPtr<VclVBox>::Create(this);
m_xVclContentArea->Show();
m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea, "dbaccess/ui/fielddescpage.ui"));
}
m_xContainer = m_xBuilder->weld_container("FieldDescPage");
}
OFieldDescControl::~OFieldDescControl()
@@ -144,6 +151,7 @@ void OFieldDescControl::dispose()
m_xFormat.reset();
m_xContainer.reset();
m_xBuilder.reset();
m_xVclContentArea.disposeAndClear();
TabPage::dispose();
}
@@ -597,6 +605,8 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
m_xBoolDefault->show();
break;
}
queue_resize();
}
void OFieldDescControl::InitializeControl(OPropListBoxCtrl* _pControl,const OString& _sHelpId,bool _bAddChangeHandler)
@@ -692,6 +702,8 @@ void OFieldDescControl::DeactivateAggregate( EControlType eType )
lcl_HideAndDeleteControl(m_nPos,m_xBoolDefault,m_xBoolDefaultText);
break;
}
queue_resize();
}
void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )

2
dbaccess/source/ui/inc/FieldDescControl.hxx
View File

@@ -19,6 +19,7 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDDESCCONTROL_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDDESCCONTROL_HXX
#include <vcl/layout.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/weld.hxx>
#include "QEnumTypes.hxx"
@@ -66,6 +67,7 @@ namespace dbaui
class OFieldDescControl : public TabPage
{
private:
VclPtr<VclVBox> m_xVclContentArea;
std::unique_ptr<weld::Builder> m_xBuilder;
std::unique_ptr<weld::Container> m_xContainer;