[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sfx2/source svx/source

[Andre Fischer]

 sfx2/source/view/viewsh.cxx                         |    4 ++++
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |    9 +++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 5d8bbe5fe43f94d1c29dda7f1e6e06668a304f78
Author: Andre Fischer <af at apache.org>
Date:   Wed Jun 12 13:15:45 2013 +0000

    122453: Initialize and update units of PosSize panel spin fields.

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 1ebece0..d093d0b 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -720,6 +720,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:
@@ -732,6 +737,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
                     long mlOldWidth1 = pWidthItem->GetValue();
 
                     mlOldWidth1 = Fraction( mlOldWidth1 ) / maUIScale;
+                    SetFieldUnit( *mpMtrWidth, meDlgUnit, true );
                     SetMetricValue( *mpMtrWidth, mlOldWidth1, mePoolUnit );
                     mlOldWidth = mlOldWidth1;
                     break;
@@ -751,6 +757,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
                     long mlOldHeight1 = pHeightItem->GetValue();
 
                     mlOldHeight1 = Fraction( mlOldHeight1 ) / maUIScale;
+                    SetFieldUnit( *mpMtrHeight, meDlgUnit, true );
                     SetMetricValue( *mpMtrHeight, mlOldHeight1, mePoolUnit );
                     mlOldHeight = mlOldHeight1;
                     break;
@@ -769,6 +776,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
                 {
                     long nTmp = pItem->GetValue();
                     nTmp = Fraction( nTmp ) / maUIScale;
+                    SetFieldUnit( *mpMtrPosX, meDlgUnit, true );
                     SetMetricValue( *mpMtrPosX, nTmp, mePoolUnit );
                     break;
                 }
@@ -786,6 +794,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
                 {
                     long nTmp = pItem->GetValue();
                     nTmp = Fraction( nTmp ) / maUIScale;
+                    SetFieldUnit( *mpMtrPosY, meDlgUnit, true );
                     SetMetricValue( *mpMtrPosY, nTmp, mePoolUnit );
                     break;
                 }
commit f7f162aef22b025b0d0ffcd0bf0c5eead74143d0
Author: Andre Fischer <af at apache.org>
Date:   Wed Jun 12 13:14:18 2013 +0000

    122453: Invalidate slot servers for all view shells on OLE deactivation.

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 2009b0c..28f3925 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -988,6 +988,10 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ )
     // uno::Reference < frame::XFramesSupplier > xParentFrame( xOwnFrame->getCreator(), uno::UNO_QUERY );
     // if ( xParentFrame.is() )
     //     xParentFrame->setActiveFrame( uno::Reference < frame::XFrame >() );
+
+    // Make sure that slot servers are initialized or updated after
+    // an OLE object is deactivated.
+    pFrame->GetBindings().InvalidateAll(sal_True);
 }
 
 //--------------------------------------------------------------------