- Update to 5.4.0.1:
* First rc of the series, now only serious bugs will be fixed - Drop upstreamed patch 0001-undo-clone.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=509
This commit is contained in:
Tomáš Chvátal
committed by
Git OBS Bridge
Git OBS Bridge
parent
23a06c749a
commit
fc017d8841
@@ -1,90 +0,0 @@
|
||||
From cd38a25d41e1ce2acad25b1b5b2a5e77239e36ed Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tam=C3=A1s=20Zolnai?= <tamas.zolnai@collabora.com>
|
||||
Date: Mon, 12 Jun 2017 14:34:59 +0200
|
||||
Subject: tdf#108480: Undo from clone formating does not remove vertical
|
||||
alignment
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
In the related change:
|
||||
d36aa2ba3132ce62a370b7260ca620642cbf7dbf
|
||||
wrong method was used to set cell properties, which does
|
||||
not handle undo actions, so use the proper function.
|
||||
|
||||
Other issue was related to undo handling of vertical text
|
||||
alignment in general. In some cases undo actions were lost
|
||||
after user clicked out of the cell. It is because vertical
|
||||
alignment is not affecting the outliner and so the related
|
||||
undo actions were just dropped in EndTextEdit() method.
|
||||
|
||||
Change-Id: I3a6a95fac711056a658a3dee616733939cd13330
|
||||
Reviewed-on: https://gerrit.libreoffice.org/38699
|
||||
Tested-by: Jenkins <ci@libreoffice.org>
|
||||
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
|
||||
(cherry picked from commit 37d8ac12902506f4185e10f1de4f566dbaf53e42)
|
||||
Reviewed-on: https://gerrit.libreoffice.org/38724
|
||||
|
||||
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
|
||||
index ff71c07..ea521d7 100644
|
||||
--- a/svx/source/svdraw/svdedxv.cxx
|
||||
+++ b/svx/source/svdraw/svdedxv.cxx
|
||||
@@ -2228,9 +2228,8 @@ void SdrObjEditView::TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rForma
|
||||
if( pObj && (pObj->GetObjInventor() == SdrInventor::Default ) && (pObj->GetObjIdentifier() == OBJ_TABLE) )
|
||||
{
|
||||
auto pTable = static_cast<const sdr::table::SdrTableObj*>(pObj);
|
||||
- if (pTable->getActiveCell().is()) {
|
||||
- SfxItemSet const & rSet = pTable->GetActiveCellItemSet();
|
||||
- rFormatSet->Put(rSet);
|
||||
+ if (mxSelectionController.is() && pTable->getActiveCell().is()) {
|
||||
+ mxSelectionController->GetAttributes(*rFormatSet, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2378,8 +2377,8 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
|
||||
if( pObj && (pObj->GetObjInventor() == SdrInventor::Default) && (pObj->GetObjIdentifier() == OBJ_TABLE) )
|
||||
{
|
||||
auto pTable = static_cast<sdr::table::SdrTableObj*>(pObj);
|
||||
- if (pTable->getActiveCell().is()) {
|
||||
- pTable->SetMergedItemSetAndBroadcastOnActiveCell(rFormatSet);
|
||||
+ if (pTable->getActiveCell().is() && mxSelectionController.is()) {
|
||||
+ mxSelectionController->SetAttributes(rFormatSet, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
|
||||
index 4c51d41..ef58d32 100644
|
||||
--- a/svx/source/table/svdotable.cxx
|
||||
+++ b/svx/source/table/svdotable.cxx
|
||||
@@ -1768,18 +1768,19 @@ bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
|
||||
|
||||
void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
|
||||
{
|
||||
- if(rOutl.IsModified())
|
||||
+
|
||||
+ if (GetModel() && GetModel()->IsUndoEnabled() && !mpImpl->maUndos.empty())
|
||||
{
|
||||
- if( GetModel() && GetModel()->IsUndoEnabled() )
|
||||
- {
|
||||
- // These actions should be on the undo stack after text edit.
|
||||
- for (std::unique_ptr<SdrUndoAction>& pAction : mpImpl->maUndos)
|
||||
- GetModel()->AddUndo(pAction.release());
|
||||
- mpImpl->maUndos.clear();
|
||||
+ // These actions should be on the undo stack after text edit.
|
||||
+ for (std::unique_ptr<SdrUndoAction>& pAction : mpImpl->maUndos)
|
||||
+ GetModel()->AddUndo(pAction.release());
|
||||
+ mpImpl->maUndos.clear();
|
||||
|
||||
- GetModel()->AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*this) );
|
||||
- }
|
||||
+ GetModel()->AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*this));
|
||||
+ }
|
||||
|
||||
+ if(rOutl.IsModified())
|
||||
+ {
|
||||
OutlinerParaObject* pNewText = nullptr;
|
||||
Paragraph* p1stPara = rOutl.GetParagraph( 0 );
|
||||
sal_Int32 nParaAnz = rOutl.GetParagraphCount();
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5c13946d3496480caa638ee87e888437fe32c98aee24209714d1e4bb7336a080
|
||||
size 193405736
|
||||
3
libreoffice-5.4.0.1.tar.xz
Normal file
3
libreoffice-5.4.0.1.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:139c672f405ecbae84ad01fe401990b65dc29e7bdcbef83d9a7a3dec128e08dc
|
||||
size 192102356
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0660379842c191d16233466ebd0388c03ae193945c6e2a1680713cdbb3e15e77
|
||||
size 2324248
|
||||
3
libreoffice-help-5.4.0.1.tar.xz
Normal file
3
libreoffice-help-5.4.0.1.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2fc2b584f8c63b3c181f028deef9b44c4574af7c1e91710fa8d24def21f8e3cc
|
||||
size 2343100
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6eb70808ef78cc499dfda6bc4d4f7e06c4bb4b9537d5587a5d21e48c9107c824
|
||||
size 136326580
|
||||
3
libreoffice-translations-5.4.0.1.tar.xz
Normal file
3
libreoffice-translations-5.4.0.1.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6ba02ecf0c4a29205cfe691ed22ac732a2539bf3c2fcd14cd020eb8bdc28adca
|
||||
size 135955252
|
||||
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 24 09:51:43 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Update to 5.4.0.1:
|
||||
* First rc of the series, now only serious bugs will be fixed
|
||||
- Drop upstreamed patch 0001-undo-clone.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 21 13:04:49 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
|
||||
@@ -22,7 +22,8 @@
|
||||
%define numbertext_version 0.9.5
|
||||
# Urls
|
||||
%define external_url http://dev-www.libreoffice.org/src/
|
||||
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.4.0
|
||||
#%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.4.0
|
||||
%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
|
||||
# Wether to enable the kde integration
|
||||
%if 0%{?is_opensuse}
|
||||
%bcond_without kdeintegration
|
||||
@@ -35,7 +36,7 @@
|
||||
%bcond_with firebird
|
||||
%endif
|
||||
Name: libreoffice
|
||||
Version: 5.4.0.0.beta2
|
||||
Version: 5.4.0.1
|
||||
Release: 0
|
||||
Summary: A Free Office Suite (Framework)
|
||||
License: LGPL-3.0+ and MPL-2.0+
|
||||
@@ -83,7 +84,6 @@ Patch5: mediawiki-no-broken-help.diff
|
||||
# PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs
|
||||
Patch16: libreoffice-hotfix-disablebrokenshapetest.patch
|
||||
# PATCH-FIX-UPSTREAM taken from git will be in next release
|
||||
Patch17: 0001-undo-clone.patch
|
||||
Patch18: 0001-watermark.patch
|
||||
# try to save space by using hardlinks
|
||||
Patch990: install-with-hardlinks.diff
|
||||
@@ -914,7 +914,6 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%patch4
|
||||
%patch5
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch990 -p1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user