[Libreoffice-commits] core.git: 2 commits - sfx2/source svx/source

2023-11-08 Thread Noel Grandin (via logerrit) 
 sfx2/source/doc/objmisc.cxx  |2 +-
 sfx2/source/doc/objxtor.cxx  |1 +
 sfx2/source/inc/objshimp.hxx |2 +-
 svx/source/form/fmundo.cxx   |   33 -
 svx/source/inc/fmundo.hxx|7 +--
 5 files changed, 20 insertions(+), 25 deletions(-)

New commits:
commit 358d31b4c862782a3717b8ad00cd8d5ddd6ea1e3
Author: Noel Grandin 
AuthorDate: Wed Nov 8 10:14:19 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 9 06:24:44 2023 +0100

loplugin:fieldcast in SfxObjectShell_Impl

Change-Id: Iae953c39abd66bf1a484590d322974382f25d278
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159173
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index c6bd3b62ddd6..dbd8c5ea059b 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1582,7 +1582,7 @@ SvKeyValueIterator* SfxObjectShell::GetHeaderAttributes()
 DBG_ASSERT( pMedium, "No Medium" );
 pImpl->xHeaderAttributes = new SfxHeaderAttributes_Impl( this );
 }
-return static_cast( pImpl->xHeaderAttributes.get() );
+return pImpl->xHeaderAttributes.get();
 }
 
 void SfxObjectShell::ClearHeaderAttributesForSourceViewHack()
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 8c3029edd128..b29db8f509b2 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -78,6 +78,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index e7cf6e6ee062..793b4388702a 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -103,7 +103,7 @@ struct SfxObjectShell_Impl final : public 
::sfx2::IMacroDocumentAccess
 boolbModalMode;
 boolbRunningMacro;
 boolbReadOnlyUI;
-tools::SvRef  xHeaderAttributes;
+tools::SvRef  xHeaderAttributes;
 ::rtl::Reference< SfxBaseModel >
 pBaseModel;
 sal_uInt16  nStyleFilter;
commit a4f52e3bb7f034035ba90ac95611253098959dfd
Author: Noel Grandin 
AuthorDate: Wed Nov 8 09:54:40 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 9 06:24:34 2023 +0100

loplugin:fieldcast in FmXUndoEnvironment

which means we can also use unique_ptr to manage this field.

Change-Id: Icf31fa718af455148601efafbcc69067c5c27a16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159172
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 0c554afb4b02..9bbe99a81d6e 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -151,6 +151,9 @@ struct PropertyInfo
 // as if it's transient or 
persistent
 };
 
+}
+
+
 struct PropertySetInfo
 {
 typedef std::map AllProperties;
@@ -160,17 +163,11 @@ struct PropertySetInfo
 // sal_False -> the set has _no_ 
such property or its value isn't empty
 };
 
-}
-
-typedef std::map, PropertySetInfo> 
PropertySetInfoCache;
-
-
 static OUString static_STR_UNDO_PROPERTY;
 
 
 FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
:rModel( _rModel )
-   ,m_pPropertySetCache( nullptr )
,m_pScriptingEnv( new svxform::FormScriptingEnvironment( 
_rModel ) )
,m_Locks( 0 )
,bReadOnly( false )
@@ -189,9 +186,6 @@ FmXUndoEnvironment::~FmXUndoEnvironment()
 {
 if ( !m_bDisposed )   // i120746, call FormScriptingEnvironment::dispose 
to avoid memory leak
 m_pScriptingEnv->dispose();
-
-if (m_pPropertySetCache)
-delete static_cast(m_pPropertySetCache);
 }
 
 void FmXUndoEnvironment::dispose()
@@ -515,10 +509,9 @@ void SAL_CALL FmXUndoEnvironment::disposing(const 
EventObject& e)
 Reference< XPropertySet > xSourceSet(e.Source, UNO_QUERY);
 if (xSourceSet.is())
 {
-PropertySetInfoCache* pCache = 
static_cast(m_pPropertySetCache);
-PropertySetInfoCache::iterator aSetPos = pCache->find(xSourceSet);
-if (aSetPos != pCache->end())
-pCache->erase(aSetPos);
+PropertySetInfoCache::iterator aSetPos = 
m_pPropertySetCache->find(xSourceSet);
+if (aSetPos != m_pPropertySetCache->end())
+m_pPropertySetCache->erase(aSetPos);
 }
 }
 }
@@ -573,12 +566,11 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const 
PropertyChangeEvent& evt)
 //   which does not have a "ExternalData" property being 
 
 if (!m_pPropertySetCache)
-m_pPropertySetCache = new PropertySetInfoCache;
-PropertySetInfoCache* pCache = 
static_cast(m_pPropertySetCache);
+m_pPropertySetCache = std::make_unique();
 
 // let's see if we know something ab

[Libreoffice-commits] core.git: 2 commits - sfx2/source svx/source

2018-04-15 Thread heiko tietze 
 sfx2/source/control/recentdocsview.cxx |   19 +--
 svx/source/stbctrls/zoomsliderctrl.cxx |   17 ++---
 2 files changed, 19 insertions(+), 17 deletions(-)

New commits:
commit 04ee7404f3d00d6748324b6f60736a9326920b64
Author: heiko tietze 
Date:   Sun Apr 15 12:02:20 2018 +0200

tdf#108556 - Start center welcome text should respect window width

Wordwrap on second line added

Change-Id: I1b50173eca4fa1c19d25291413fa0bebbcad9190
Reviewed-on: https://gerrit.libreoffice.org/52906
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 0318b6bcf140..31591e3db568 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -346,22 +346,21 @@ void RecentDocsView::Paint(vcl::RenderContext& 
rRenderContext, const tools::Rect
 
 long nTextHeight = rRenderContext.GetTextHeight();
 
-long nTextWidth1 = rRenderContext.GetTextWidth(maWelcomeLine1);
-long nTextWidth2 = rRenderContext.GetTextWidth(maWelcomeLine2);
-
 const Size& rImgSize = maWelcomeImage.GetSizePixel();
 const Size& rSize = GetSizePixel();
 
 const int nX = (rSize.Width() - rImgSize.Width())/2;
-const int nY = (rSize.Height() - 3 * nTextHeight - 
rImgSize.Height())/2;
-
+int nY = (rSize.Height() - 3 * nTextHeight - rImgSize.Height())/2;
 Point aImgPoint(nX, nY);
-Point aStr1Point((rSize.Width() - nTextWidth1)/2, nY + 
rImgSize.Height());
-Point aStr2Point((rSize.Width() - nTextWidth2)/2, nY + 
rImgSize.Height() + 1.5 * nTextHeight);
-
 rRenderContext.DrawImage(aImgPoint, rImgSize, maWelcomeImage);
-rRenderContext.DrawText(aStr1Point, maWelcomeLine1);
-rRenderContext.DrawText(aStr2Point, maWelcomeLine2);
+
+nY = nY + rImgSize.Height();
+rRenderContext.DrawText(tools::Rectangle(0, nY, rSize.Width(), nY + 
nTextHeight),
+maWelcomeLine1,
+DrawTextFlags::Center);
+rRenderContext.DrawText(tools::Rectangle(0, nY + 1.5 * nTextHeight, 
rSize.Width(), rSize.Height()),
+maWelcomeLine2,
+DrawTextFlags::MultiLine | 
DrawTextFlags::WordBreak | DrawTextFlags::Center);
 
 rRenderContext.Pop();
 }
commit 7d10bcb23624db11ca6445f5cb33a28660f16fd4
Author: heiko tietze 
Date:   Sun Apr 15 16:39:40 2018 +0200

tdf#50507 - zoom slider always looks like disabled

Slider smaller, in darkshadow color and with a tiny shadow

Change-Id: I0e5253648749fb4190c03ab458498d64dc0388c5
Reviewed-on: https://gerrit.libreoffice.org/52912
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx 
b/svx/source/stbctrls/zoomsliderctrl.cxx
index 449a1a9bc6fc..a8afa60b4cb7 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -235,8 +235,8 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& 
rUsrEvt )
 tools::Rectangle   aRect = rUsrEvt.GetRect();
 tools::Rectangle   aSlider = aRect;
 
-long nSliderHeight  = 2 * pDev->GetDPIScaleFactor();
-long nSnappingHeight = 4 * pDev->GetDPIScaleFactor();
+long nSliderHeight  = 1 * pDev->GetDPIScaleFactor();
+long nSnappingHeight = 2 * pDev->GetDPIScaleFactor();
 
 aSlider.AdjustTop((aControlRect.GetHeight() - nSliderHeight)/2 );
 aSlider.SetBottom( aSlider.Top() + nSliderHeight - 1 );
@@ -247,9 +247,15 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& 
rUsrEvt )
 Color   aOldFillColor = pDev->GetFillColor();
 
 const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
-pDev->SetLineColor( rStyleSettings.GetShadowColor() );
-pDev->SetFillColor( rStyleSettings.GetShadowColor() );
+pDev->SetLineColor( rStyleSettings.GetDarkShadowColor() );
+pDev->SetFillColor( rStyleSettings.GetDarkShadowColor() );
 
+// draw slider
+pDev->DrawRect( aSlider );
+// shadow
+pDev->SetLineColor( rStyleSettings.GetShadowColor() );
+pDev->DrawLine(Point(aSlider.Left()+1,aSlider.Bottom()+1), 
Point(aSlider.Right()+1,aSlider.Bottom()+1));
+pDev->SetLineColor( rStyleSettings.GetDarkShadowColor() );
 
 // draw snapping points:
 for ( std::vector< long >::const_iterator aSnappingPointIter = 
mxImpl->maSnappingPointOffsets.begin(),
@@ -263,9 +269,6 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& 
rUsrEvt )
 nSnapPosX, aSlider.Bottom() + nSnappingHeight ) );
 }
 
-// draw slider
-pDev->DrawRect( aSlider );
-
 // draw slider button
 Point aImagePoint = aRect.TopLeft();
 aImagePoint.AdjustX(Zoom2Offset( mxImpl->mnCurrentZoom ) );
___
Libreoffice-commits mailing list

[Libreoffice-commits] core.git: 2 commits - sfx2/source svx/source sw/source

2018-02-18 Thread Markus Mohrhard 
 sfx2/source/dialog/backingcomp.cxx |4 +++-
 svx/source/dialog/srchdlg.cxx  |2 ++
 sw/source/uibase/misc/redlndlg.cxx |2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 76aea63d8055e9bb8d2edc85a739c9a48a7f8d96
Author: Markus Mohrhard 
Date:   Sun Feb 18 19:03:48 2018 +0100

uitest: call base class Activate in modeless dialogs

Change-Id: I342e925a5dbc178962f720f1efc9ee001d235718
Reviewed-on: https://gerrit.libreoffice.org/49941
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index b9075133bad0..6a0701bb1aa0 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -614,6 +614,8 @@ void SvxSearchDialog::Activate()
 m_pMatchCaseCB->Check( pSearchItem->GetExact() );
 m_pJapMatchFullHalfWidthCB->Check( 
!pSearchItem->IsMatchFullHalfWidthForms() );
 }
+
+SfxModelessDialog::Activate();
 }
 
 
diff --git a/sw/source/uibase/misc/redlndlg.cxx 
b/sw/source/uibase/misc/redlndlg.cxx
index 05a9aa77265f..3ac0dbd537aa 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -112,10 +112,12 @@ void SwModelessRedlineAcceptDlg::Activate()
 if (!bMod)
 pSh->ResetModified();
 pImplDlg->Init();
+SfxModelessDialog::Activate();
 
 return;
 }
 
+SfxModelessDialog::Activate();
 pImplDlg->Activate();
 }
 
commit 3ed222f6497cf6b2b54d90a4de80fe2db9130f59
Author: Markus Mohrhard 
Date:   Sun Feb 18 18:21:04 2018 +0100

don't use the global mutex for UI stuff

This leads to deadlocks if one thread is using the process factory
while holding the SolarMutex and another thread is calling the
BackingComp::getTypes method.

Change-Id: Ib4750aa1ebbfbf4f8dcd09ec2a218202450f4928
Reviewed-on: https://gerrit.libreoffice.org/49940
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sfx2/source/dialog/backingcomp.cxx 
b/sfx2/source/dialog/backingcomp.cxx
index 76086dc404c7..8d4ee36b4dd4 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -90,6 +90,8 @@ private:
 /** the owner frame of this component. */
 css::uno::Reference< css::frame::XFrame > m_xFrame;
 
+osl::Mutex m_aTypeProviderMutex;
+
 public:
 
 explicit BackingComp();
@@ -235,7 +237,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL 
BackingComp::getTypes()
 if (!pTypeCollection)
 {
 /* GLOBAL SAFE { */
-::osl::MutexGuard aGlobalLock(::osl::Mutex::getGlobalMutex());
+::osl::MutexGuard aGlobalLock(m_aTypeProviderMutex);
 // Control these pointer again ... it can be, that another instance 
will be faster then this one!
 if (!pTypeCollection)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sfx2/source svx/source

2014-04-05 Thread Tor Lillqvist 
 sfx2/source/dialog/partwnd.cxx  |2 +-
 sfx2/source/dialog/recfloat.cxx |2 +-
 svx/source/form/filtnav.cxx |2 +-
 svx/source/form/fmPropBrw.cxx   |2 +-
 svx/source/form/fmexpl.cxx  |2 +-
 svx/source/form/tabwin.cxx  |2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e2598531c072163e5a239e104bf22f98e1e2291d
Author: Tor Lillqvist 
Date:   Sun Apr 6 09:25:02 2014 +0300

WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'

Change-Id: Ibc279b90a19dc38f61d3855346b26eea674fc097

diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 56e11fd..13f99e4 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1976,7 +1976,7 @@ bool FmFilterNavigatorWin::Close()
 void FmFilterNavigatorWin::FillInfo( SfxChildWinInfo& rInfo ) const
 {
 SfxDockingWindow::FillInfo( rInfo );
-rInfo.bVisible = sal_False;
+rInfo.bVisible = false;
 }
 
 
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 45357f9..7cafa10 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -482,7 +482,7 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& 
_rSelection )
 
 void FmPropBrw::FillInfo( SfxChildWinInfo& rInfo ) const
 {
-rInfo.bVisible = sal_False;
+rInfo.bVisible = false;
 rInfo.aExtraString = getCurrentPage();
 }
 
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 99fd2e5..c1ab382 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -612,7 +612,7 @@ namespace svxform
 void NavigatorFrame::FillInfo( SfxChildWinInfo& rInfo ) const
 {
 SfxDockingWindow::FillInfo( rInfo );
-rInfo.bVisible = sal_False;
+rInfo.bVisible = false;
 }
 
 
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 25472c7..2bdc7ed 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -420,7 +420,7 @@ void FmFieldWin::Resize()
 
 void FmFieldWin::FillInfo( SfxChildWinInfo& rInfo ) const
 {
-rInfo.bVisible = sal_False;
+rInfo.bVisible = false;
 }
 
 
commit 56b82942e82b155d4df3a925206678e5411eddf8
Author: Tor Lillqvist 
Date:   Sun Apr 6 09:18:43 2014 +0300

WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'

Change-Id: Ib477afa1740f14832f49ce85822410b2e9db8d46

diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index 27baa2b..f4ed1618 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -198,7 +198,7 @@ bool SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt )
 void SfxPartDockWnd_Impl::FillInfo( SfxChildWinInfo& rInfo ) const
 {
 SfxDockingWindow::FillInfo( rInfo );
-rInfo.bVisible = sal_False;
+rInfo.bVisible = false;
 }
 
 
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index 1f92599..83e85bd 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -225,7 +225,7 @@ bool SfxRecordingFloat_Impl::Close()
 void SfxRecordingFloat_Impl::FillInfo( SfxChildWinInfo& rInfo ) const
 {
 SfxFloatingWindow::FillInfo( rInfo );
-rInfo.bVisible = sal_False;
+rInfo.bVisible = false;
 }
 
 void SfxRecordingFloat_Impl::StateChanged( StateChangedType nStateChange )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sfx2/source svx/source

2014-03-06 Thread Michael Stahl 
 sfx2/source/doc/templatedlg.cxx |7 +--
 svx/source/dialog/svxruler.cxx  |3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 6b6ec280f3d7f35fb9c8c8ba92a31d51ab4dca16
Author: Michael Stahl 
Date:   Fri Mar 7 00:24:52 2014 +0100

fdo#74787, rhbz#1072553: fix Template Mananger import crash

File dialog causes call to ThumbnailView::LoseFocus() and clears
selected folders.

(regression from 0314034d8b23d5b69399cfcdf6b2f2add73f9f47)

Change-Id: Ic5f2602e9dd1d12aad8c68c48f6bbb119ee6492c

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index a853a33..2741d71 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -901,6 +901,9 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
 aFileDlg.AddFilter( sFilterName, sFilterExt );
 aFileDlg.SetCurrentFilter( sFilterName );
 
+// fdo#74787 file dialog causes ThumbnailView::LoseFocus() - save selection
+std::set 
selFolders(maSelFolders);
+
 ErrCode nCode = aFileDlg.Execute();
 
 if ( nCode == ERRCODE_NONE )
@@ -909,11 +912,11 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
 
 if (aFiles.hasElements())
 {
-if (!maSelFolders.empty())
+if (!selFolders.empty())
 {
 //Import to the selected regions
 std::set::const_iterator pIter;
-for (pIter = maSelFolders.begin(); pIter != 
maSelFolders.end(); ++pIter)
+for (pIter = selFolders.begin(); pIter != selFolders.end(); 
++pIter)
 {
 OUString aTemplateList;
 TemplateContainerItem *pFolder = 
(TemplateContainerItem*)(*pIter);
commit 958616a323b7fe6b42cd642394cd90a9cd82e7f9
Author: Michael Stahl 
Date:   Thu Mar 6 22:25:55 2014 +0100

rhbz#1072607: (hopefully) fix crash in SvxRuler::MouseMove()

Not sure why mpParaItem is 0 here, add a check like in every other
SvxRuler method.

(regression from 47a77d7dbc427e51421e2df8d59695834cb74980)

Change-Id: Ic11a4d0c9b6ca217cd59d1d3f6789592996d2c1d

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 9a51bcb..80e3b4d 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -581,6 +581,9 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt )
 {
 case RULER_TYPE_INDENT:
 {
+if (!mpParaItem.get())
+break;
+
 long nIndex = aSelection.nAryPos + INDENT_GAP;
 
 long nIndentValue = 0.0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sfx2/source svx/source

2013-06-12 Thread Andre Fischer 
 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 
Date:   Wed Jun 12 13:15:45 2013 +

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 
Date:   Wed Jun 12 13:14:18 2013 +

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