rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into f17

Browse Source
This commit is contained in:
Caolán McNamara 2012-02-16 12:10:48 +00:00
commit 054d9b4323
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0001-Fix-fdo-45177-avoid-linked-undo-for-the-while.patch Normal file
View File

@ -0,0 +1,37 @@
From 5b28f3488a033bd38b31071463b112df1713b64b Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@suse.com>
Date: Wed, 15 Feb 2012 16:51:52 +0100
Subject: [PATCH] Fix fdo#45177 - avoid linked undo for the while.
While I try to wrap head around subtleties for linked undo in
Impress outline view, disable that here for the while. Better than
a crash for sure.
(cherry picked from commit 57e6f04066cfddfa79eb2b79cf5c45653c79eff3)
Conflicts:
sd/source/ui/view/outlview.cxx
---
sd/source/ui/view/outlview.cxx | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 53ebbb4..cdd442d 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1672,12 +1672,6 @@ void OutlineView::EndModelChange()
DBG_ASSERT( bHasUndoActions == (mpOutliner->GetUndoManager().GetUndoActionCount() != 0), "sd::OutlineView::EndModelChange(), undo actions not in sync!" );
- if( bHasUndoActions )
- {
- SfxLinkUndoAction* pLink = new SfxLinkUndoAction(pDocUndoMgr);
- mpOutliner->GetUndoManager().AddUndoAction(pLink);
- }
-
mpOutliner->GetUndoManager().LeaveListAction();
if( bHasUndoActions && mpOutliner->GetEditEngine().HasTriedMergeOnLastAddUndo() )
--
1.7.7.6

7
libreoffice.spec
View File

@ -35,7 +35,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.3
Release: 5%{?dist}
Release: 6%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@ -131,6 +131,7 @@ Patch17: 0001-make-hsqldb-build-with-java-1.7.patch
Patch18: libreoffice-ensure-non-broken-xml-tree.patch
Patch19: 0001-preserve-timestamps-for-.py-files.patch
Patch20: 0001-Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch
Patch21: 0001-Fix-fdo-45177-avoid-linked-undo-for-the-while.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@ -971,6 +972,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch18 -p1 -b .ensure-non-broken-xml-tree.patch
%patch19 -p1 -b .preserve-timestamps-for-.py-files.patch
%patch20 -p1 -b .Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch
%patch21 -p1 -b .fdo45177-avoid-linked-undo-for-the-while.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@ -2247,6 +2249,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Thu Feb 16 2012 Caolán McNamara <caolanm@redhat.com> - 3.5.0.3-6.UNBUILT
- Resolves: fdo#45177 avoid linked undo crash
* Tue Feb 14 2012 Stephan Bergmann <sbergman@redhat.com> - 3.5.0.3-5
- Resolves rhbz#789622: Adapt SDK to changed paths in LO installation