sfx2/source/view/viewsh.cxx | 1 +
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 9 +++++++++
2 files changed, 10 insertions(+)
New commits:
commit 4ea968a7b051e4e0f6febeb9996ed7689b08672f
Author: Andre Fischer <a...@apache.org>
Date: Wed Jun 12 13:15:45 2013 +0000
Related: #i122453# Initialize and update units of PosSize panel spin fields
(cherry picked from commit 5d8bbe5fe43f94d1c29dda7f1e6e06668a304f78)
Change-Id: Ibfcca05efddbcee9983ac4d6bc75703234ea6d67
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index fdba30f..5854e36 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -716,6 +716,11 @@ void PosSizePropertyPanel::NotifyItemUpdate(
else
mbAdjustEnabled = false;
+ // Pool unit and dialog unit may have changed, make sure that we
+ // have the current values.
+ mePoolUnit = maTransfWidthControl.GetCoreMetric();
+ meDlgUnit = GetModuleFieldUnit();
+
switch (nSID)
{
case SID_ATTR_TRANSFORM_WIDTH:
@@ -728,6 +733,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
long mlOldWidth1 = pWidthItem->GetValue();
mlOldWidth1 = Fraction( mlOldWidth1 ) / maUIScale;
+ SetFieldUnit( *mpMtrWidth, meDlgUnit, true );
SetMetricValue( *mpMtrWidth, mlOldWidth1, mePoolUnit );
mlOldWidth = mlOldWidth1;
break;
@@ -747,6 +753,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
long mlOldHeight1 = pHeightItem->GetValue();
mlOldHeight1 = Fraction( mlOldHeight1 ) / maUIScale;
+ SetFieldUnit( *mpMtrHeight, meDlgUnit, true );
SetMetricValue( *mpMtrHeight, mlOldHeight1, mePoolUnit );
mlOldHeight = mlOldHeight1;
break;
@@ -765,6 +772,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
{
long nTmp = pItem->GetValue();
nTmp = Fraction( nTmp ) / maUIScale;
+ SetFieldUnit( *mpMtrPosX, meDlgUnit, true );
SetMetricValue( *mpMtrPosX, nTmp, mePoolUnit );
break;
}
@@ -782,6 +790,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
{
long nTmp = pItem->GetValue();
nTmp = Fraction( nTmp ) / maUIScale;
+ SetFieldUnit( *mpMtrPosY, meDlgUnit, true );
SetMetricValue( *mpMtrPosY, nTmp, mePoolUnit );
break;
}
commit 10b26c9af2f15b1634ba26c5d7c9382f7680beea
Author: Andre Fischer <a...@apache.org>
Date: Wed Jun 12 13:14:18 2013 +0000
Related: #i122453# Invalidate slot servers for all view shells...
on OLE deactivation
(cherry picked from commit f7f162aef22b025b0d0ffcd0bf0c5eead74143d0)
Conflicts:
sfx2/source/view/viewsh.cxx
Change-Id: Ia44ab98e273d3360b4d8ff2f2582cb04b4d43415
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 9c1d0f2..0ac1b20 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -913,6 +913,7 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient*
/*pClient*/ )
pFrame->GetDispatcher()->Update_Impl( sal_True );
pFrame->GetBindings().HidePopups(sal_False);
+ pFrame->GetBindings().InvalidateAll(sal_True);
}
//--------------------------------------------------------------------
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
