diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-12-03 09:12:40 +0000 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-12-03 12:00:25 +0000 |
commit | 69725ffe0d17811984c8d52073262b5e76ae7080 (patch) | |
tree | e31e7c545436806b2352c6aa07b407f4db6aadcd | |
parent | 945da612c70cc67c3b182c3f2ecdfd4333c8f456 (diff) |
Resolves: tdf#95960 displaced field value in user-defined properties
Change-Id: Idc9e8fd0c35de48a2366dca3850bcc4e69ef997f
(cherry picked from commit afc565bf26464a4999b45d8bc57545fa1ff534e5)
(cherry picked from commit 46c5197feec5e64544433f2d6e22cf986408552a)
Reviewed-on: https://gerrit.libreoffice.org/20368
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 0e47101b7385..6de3b56df334 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1449,16 +1449,19 @@ CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent, m_pCurrentLine (NULL), m_aNumberFormatter( ::comphelper::getProcessComponentContext(), Application::GetSettings().GetLanguageTag().getLanguageType() ) - { - m_aEditButton->SetPosSizePixel( - LogicToPixel(Point(159, 2), MAP_APPFONT), + Point aPos(LogicToPixel(Point(159, 2), MAP_APPFONT)); + + m_aEditButton->SetPosSizePixel(aPos, LogicToPixel(Size(RSC_CD_TEXTBOX_HEIGHT, RSC_CD_TEXTBOX_HEIGHT), MAP_APPFONT)); + m_aRemoveButton->SetSizePixel(LogicToPixel(Size(RSC_CD_PUSHBUTTON_HEIGHT, RSC_CD_PUSHBUTTON_HEIGHT), MAP_APPFONT)); - m_aValueEdit->SetPosSizePixel( - LogicToPixel(Point(159, 2), MAP_APPFONT), - LogicToPixel(Size(61, RSC_CD_TEXTBOX_HEIGHT), MAP_APPFONT)); + Size aSize(LogicToPixel(Size(61, RSC_CD_TEXTBOX_HEIGHT), MAP_APPFONT)); + m_aValueEdit->SetPosSizePixel(aPos, aSize); + m_aDurationField->SetPosSizePixel(aPos, aSize); + m_aDateField->SetPosSizePixel(aPos, aSize); + m_aTimeField->SetPosSizePixel(aPos, aSize); m_aEditLoseFocusIdle.SetPriority( SchedulerPriority::LOWEST ); m_aEditLoseFocusIdle.SetIdleHdl( LINK( this, CustomPropertiesWindow, EditTimeoutHdl ) ); |