[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 5 commits - icon-themes/sifr sc/source sd/source svx/source
Julien Nabet
serval2412 at yahoo.fr
Tue Jun 6 08:06:49 UTC 2017
sc/source/core/data/table2.cxx | 4 ++--
sc/source/filter/excel/xetable.cxx | 2 +-
sd/source/ui/view/drviews2.cxx | 3 ++-
svx/source/accessibility/AccessibleFrameSelector.cxx | 2 ++
4 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit e19a986cb7a3d7dd2115a86e46fdb06043d9fb87
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat May 13 17:24:04 2017 +0200
tdf#101885: fix crash in AccFrameSelector
Deal with no parent case
0x00007ffff5e98240 in vcl::Window::GetChildCount() const ()
0 0x00007ffff5e98240 in vcl::Window::GetChildCount() const ()
1 0x00007ffff54f2d1f in svx::a11y::AccFrameSelector::getAccessibleIndexInParent() ()
See https://bugs.documentfoundation.org/attachment.cgi?id=127141
Change-Id: I795dc4c083d743466b5605d3dcc8f9fca8674c43
Reviewed-on: https://gerrit.libreoffice.org/37575
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
(cherry picked from commit c9275062ed745a8c5d52a3863299baf8bcf86ea7)
Reviewed-on: https://gerrit.libreoffice.org/38414
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Michael Meeks <michael.meeks at collabora.com>
(cherry picked from commit 75d14731e79b66a75e2d3327b94721f6218eb4d7)
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 26ae123968d0..00e1a28ecbb6 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -139,6 +139,8 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent( )
if( meBorder == FrameBorderType::NONE )
{
vcl::Window* pTabPage = mpFrameSel->GetParent();
+ if (!pTabPage)
+ return nIdx;
sal_Int32 nChildren = pTabPage->GetChildCount();
for( nIdx = 0; nIdx < nChildren; ++nIdx )
if( pTabPage->GetChild( static_cast< sal_uInt16 >( nIdx ) ) == mpFrameSel )
commit db67f74151a728717e350eba7c2f29d91e885c4e
Author: Eike Rathke <erack at redhat.com>
Date: Sat Jun 3 13:00:50 2017 +0200
sc::ColRowSpan::mnEnd is inclusive
Wrong since
commit 1e721077b43de84edab2a3ed2f316ddcbec6e3ec
Date: Tue Oct 7 00:22:32 2014 +0900
and
commit 91502a72c12c559442e8bf77c27a516b49c2a68d
Date: Thu Oct 9 14:44:27 2014 +0200
So HasAttribSelection() and HasSelectionMatrixFragment() did not query the
rightmost column of each marked range from ScMarkData.
Change-Id: Ie3aca26ee1b6c249c1135268dc0ad3ea053ea2b8
(cherry picked from commit 77d1e0c49adea959dd418de9b6cf9901e01be3ae)
Reviewed-on: https://gerrit.libreoffice.org/38371
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 7821c84215be4f3e968f9a6afd8f8325992ef03c)
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index a44ee8939730..7789b215504d 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1927,7 +1927,7 @@ bool ScTable::HasAttribSelection( const ScMarkData& rMark, HasAttrFlags nMask )
for (sc::ColRowSpan & aSpan : aSpans)
{
- for (SCCOLROW j = aSpan.mnStart; j < aSpan.mnEnd; ++j)
+ for (SCCOLROW j = aSpan.mnStart; j <= aSpan.mnEnd; ++j)
{
if (aCol[j].HasAttribSelection(rMark, nMask))
return true;
@@ -2209,7 +2209,7 @@ bool ScTable::HasSelectionMatrixFragment( const ScMarkData& rMark ) const
for (sc::ColRowSpan & aSpan : aSpans)
{
- for ( SCCOLROW j=aSpan.mnStart; j<aSpan.mnEnd; j++ )
+ for ( SCCOLROW j=aSpan.mnStart; j<=aSpan.mnEnd; j++ )
{
if ( aCol[j].HasSelectionMatrixFragment(rMark) )
return true;
commit 0079f0f52b2034557b1c8e7a063de0544e57f761
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri May 26 23:16:57 2017 +0900
tdf#108024 Keep original selection during DrawViewShell::FuTemporary()
Otherwise it was disposed in the middle of its own mouse event handler
FuSelection::MouseButtonUp().
Change-Id: I0d96048526dece7232e5a777364ad4da1d64c904
Reviewed-on: https://gerrit.libreoffice.org/37976
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
(cherry picked from commit 96d59ffc572c4cf112405a85aee3366d45bc7757)
Reviewed-on: https://gerrit.libreoffice.org/38302
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
(cherry picked from commit 64c8c76a1dca96cb2ceed2aced8ff4e5efd60aa9)
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 683b6fbfb187..7a5ef99fe9f3 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1110,7 +1110,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
// Set the selection tool as the old one. This in particular important for the
// zoom function, in which clicking without dragging zooms as well, and that
// makes exiting the object editing mode impossible.
- SetOldFunction( FuSelection::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
+ if (dynamic_cast<FuSelection*>( GetOldFunction().get() ) == nullptr)
+ SetOldFunction( FuSelection::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
Cancel();
rReq.Ignore ();
}
commit 4de3528c1c3e0d24dd6924f1c42ee07672b97a11
Author: Eike Rathke <erack at redhat.com>
Date: Thu Jun 1 20:50:27 2017 +0200
Resolves: tdf#108279 dimension rows are 32-bit and don't wrap at 64k
Change-Id: I7bf7a149fb1db526ef62bea2f52b200cf5053cc2
(cherry picked from commit 259c2409310814ae62c8d0aefef19a71e8d88dbe)
Reviewed-on: https://gerrit.libreoffice.org/38331
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
(cherry picked from commit 190c0d9ed02a5ed0659b07955b839bb16b1ba638)
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 45db9a1c8693..29257f2df5ed 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2309,7 +2309,7 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt
// find used row range
if( rRow->IsEnabled() )
{
- sal_uInt16 nXclRow = rRow->GetXclRow();
+ sal_uInt32 nXclRow = rRow->GetXclRow();
nFirstUsedXclRow = ::std::min< sal_uInt32 >( nFirstUsedXclRow, nXclRow );
nFirstFreeXclRow = ::std::max< sal_uInt32 >( nFirstFreeXclRow, nXclRow + 1 );
}
commit cd2106b1c36ebce1b08920e4176707f661a22bae
Author: Matthias Freund <matti_lx at secure.mailbox.org>
Date: Thu Jun 1 18:46:08 2017 +0200
tdf#75256 sifr icon theme - trackchangesbar
Fix for wrong filename for trackchangesbar
Change-Id: I3a286c87b6ca9e01a8e256acde00715a84f7b4d9
Reviewed-on: https://gerrit.libreoffice.org/38323
Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
Tested-by: Yousuf Philips <philipz85 at hotmail.com>
(cherry picked from commit 373c5775735858138a461548272175b3141a3e37)
diff --git a/icon-themes/sifr/cmd/lc_showtrackchanges.png b/icon-themes/sifr/cmd/lc_trackchangesbar.png
similarity index 100%
rename from icon-themes/sifr/cmd/lc_showtrackchanges.png
rename to icon-themes/sifr/cmd/lc_trackchangesbar.png
diff --git a/icon-themes/sifr/cmd/sc_showtrackchanges.png b/icon-themes/sifr/cmd/sc_trackchangesbar.png
similarity index 100%
rename from icon-themes/sifr/cmd/sc_showtrackchanges.png
rename to icon-themes/sifr/cmd/sc_trackchangesbar.png
More information about the Libreoffice-commits
mailing list