[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/source
Caolán McNamara
caolanm at redhat.com
Thu Dec 3 04:00:46 PST 2015
sfx2/source/dialog/dinfdlg.cxx | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 69725ffe0d17811984c8d52073262b5e76ae7080
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 3 09:12:40 2015 +0000
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 at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 0e47101..6de3b56 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 ) );
More information about the Libreoffice-commits
mailing list