David Tardon
13 years ago
parent
69cff11834
commit
9390cab8ee
@ -1,34 +0,0 @@
|
||||
From d57887eaad534ca51fc4975918fab66b2f93633d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Tue, 6 Dec 2011 16:26:05 +0000
|
||||
Subject: [PATCH] Resolves: rhbz#759647 ::dispose clears mpPresTimer before
|
||||
releaseTimer called
|
||||
|
||||
---
|
||||
slideshow/source/engine/slideshowimpl.cxx | 8 ++++++--
|
||||
1 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
|
||||
index 5be3b62..4277280 100644
|
||||
--- a/slideshow/source/engine/slideshowimpl.cxx
|
||||
+++ b/slideshow/source/engine/slideshowimpl.cxx
|
||||
@@ -2025,10 +2025,14 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
|
||||
// that have zero delay. While the timer is stopped these events
|
||||
// are processed in the same run.
|
||||
{
|
||||
+ //Get a shared-ptr that outlives the scope-guard which will
|
||||
+ //ensure that the pointed-to-item exists in the case of a
|
||||
+ //::dispose clearing mpPresTimer
|
||||
+ boost::shared_ptr<canvas::tools::ElapsedTime> xTimer(mpPresTimer);
|
||||
comphelper::ScopeGuard scopeGuard(
|
||||
boost::bind( &canvas::tools::ElapsedTime::releaseTimer,
|
||||
- boost::cref(mpPresTimer) ) );
|
||||
- mpPresTimer->holdTimer();
|
||||
+ boost::cref(xTimer) ) );
|
||||
+ xTimer->holdTimer();
|
||||
|
||||
// process queues
|
||||
maEventQueue.process();
|
||||
--
|
||||
1.7.6.4
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 17c7711948f8157478dc3abe9c52b8078fd8b5a9 Mon Sep 17 00:00:00 2001
|
||||
From: Kohei Yoshida <kohei.yoshida@suse.com>
|
||||
Date: Wed, 7 Dec 2011 10:38:25 -0500
|
||||
Subject: [PATCH] fdo#43308: Set the logic straight for "center across
|
||||
selection" setting.
|
||||
|
||||
Another unfortunate logic change introduced via DECLARE_LIST removal.
|
||||
Reverting the logic to the original one.
|
||||
---
|
||||
sc/source/filter/excel/xistyle.cxx | 12 +++---------
|
||||
1 files changed, 3 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
|
||||
index d2d4467..2131095 100644
|
||||
--- a/sc/source/filter/excel/xistyle.cxx
|
||||
+++ b/sc/source/filter/excel/xistyle.cxx
|
||||
@@ -1824,15 +1824,9 @@ void XclImpXFRangeBuffer::SetXF( const ScAddress& rScPos, sal_uInt16 nXFIndex, X
|
||||
if( pXF && ((pXF->GetHorAlign() == EXC_XF_HOR_CENTER_AS) || (pXF->GetHorAlign() == EXC_XF_HOR_FILL)) )
|
||||
{
|
||||
// expand last merged range if this attribute is set repeatedly
|
||||
- if ( !maMergeList.empty() )
|
||||
- {
|
||||
- ScRange* pRange = maMergeList.back();
|
||||
- if( (pRange->aEnd.Row() == nScRow)
|
||||
- && (pRange->aEnd.Col() + 1 == nScCol)
|
||||
- && (eMode == xlXFModeBlank)
|
||||
- )
|
||||
- pRange->aEnd.IncCol();
|
||||
- }
|
||||
+ ScRange* pRange = maMergeList.empty() ? NULL : maMergeList.back();
|
||||
+ if (pRange && (pRange->aEnd.Row() == nScRow) && (pRange->aEnd.Col() + 1 == nScCol) && (eMode == xlXFModeBlank))
|
||||
+ pRange->aEnd.IncCol();
|
||||
else if( eMode != xlXFModeBlank ) // do not merge empty cells
|
||||
SetMerge( nScCol, nScRow );
|
||||
}
|
||||
--
|
||||
1.7.6.4
|
||||
|
||||
Loading…
Reference in new issue