Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
(cherry picked from commit 2df1c40b4b7cb3107a68984db644f10097f04c3c)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Norbert Thiebaud <nthiebaud@gmail.com>
|
|
This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.4.x release,
please use the 'libreoffice-3-4' branch. Well, this is most likely the
last 3.4.x bugfix release, so it probably does not make much sense.
If you want to build something cool, unstable, and risky, use master.
|
|
SwXTextField::setPropertyValue: call Expand() for all text fields
Fixes getPresentation returning stale values.
(regression from CWS sw34bf01, 8485708f3001fca132c3353c464fe7187ef62bed)
Also, without this the text formatting does not actually update and the new
content is not displayed until some other unrelated editing operation.
(cherry picked from commit e3dfae0741aae8581cd3fc713ba1b4459bb22d88)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
|
|
While only the text formatting is able to expand all fields correctly,
this is still good enough for many field types and fixes a race
condition when the field value is requested before layout is finished.
(regression from CWS sw34bf01, 8485708f3001fca132c3353c464fe7187ef62bed)
(cherry picked from commit 9519deda120b73b72e75d89c3b2ae3d66220ec2d)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
|
|
Since CWS swlayoutrefactoring the SwRootFrms are destroyed with
SwDoc::IsInDtor not set. This can cause at least reads of freed
SwRootFrm members when executing the dtors of SwRootFrm base class
SwLayoutFrm calling into SwRootFrm::GetPageAtPos.
Prevent this scenario by:
- moving the implementation of SwRootFrm base class dtors to new
methods SwFrm::Destroy and SwLayoutFrm::Destroy
- calling SwFrm::Destroy and SwLayoutFrm::Destroy explicitly before
SwRootFrm members are freed
(cherry picked from commit ebb74441790a9852b1a1532d6e025c324666f6fc)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Call SwRootFrm::RemoveFtns with the proper boolean to also eliminate
EndNotes, and fix a faulty while loop in RemoveFtns that's been preventing
removal of footnotes in certain sections since the dawn of CVS history.
(regression from CWS swlayoutrefactoring, crashes on bugdoc from i#101776)
(cherry picked from commit 962d0500c4debaef43e5f146e47e08c66d851562)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
|
|
This removes SwFlowFrm::bIsFollow, which is pointless duplication of
m_pPrecede; this fixes lots of assertions (probably some real problem as
well).
Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
|
|
The pPrecede member is not maintained properly when setting the
corresponding pFollow member.
The change in SwTxtFrm::JoinFrm() fixes the crash, the other changes
are perhaps fixes for other crashes...
(regression from cc3d0d182cafef9649e45f4657233ac2221fdd0a)
Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
|
|
Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
|
|
This plus e549f52f16c4a519ed3eddb9c66c19bacc247590 fixes the problem.
Signed-off-by: Eike Rathke <erack@redhat.com>
|
|
Signed-off-by: Noel Power <noel.power@novell.com>
|
|
Signed-off-by: Noel Power <noel.power@novell.com>
|
|
Apparently there is a check in SwDoc::SetAllUniqueFlyNames so that when
frames with certain anchor types are in a document, then SetLoaded()
is never called. Checking this flag via IsLoaded() here seems
unnecessary.
This problem was introduced with ebc5777548dea42ed966a16c66d879b1485bbfb4,
from CWS swlayoutrefactoring.
Signed-off-by: Noel Power <noel.power@novell.com>
|
|
The UndoRedoRedlineGuards that SwUndo::{Un,Re}doWithContext wants to
put on the stack aren't actually variables, so the destructor gets
invoked before the function call that the guard is supposed to protect.
Regression from CWS undoapi.
(cherry picked from commit 13424b43c25389e303774c3fb2f2beb3e20ceae5)
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
|
|
If there is a width in fo:border{,-left,-right,-top,-bottom}, then
it should not override the values from
style:border-line-width{,-left,-right,-top,-bottom}, which are more
specific in case of "double" borders.
Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
Signed-off-by: Noel Power <noel.power@novell.com>
|
|
The problem is that the width from the fo:border{,-left,-right,-top,-bottom}
attributes is effectively tripled for "double" borders.
Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
Signed-off-by: Noel Power <noel.power@novell.com>
|
|
(cherry picked from commit d83488f9795740857830aaf005e06e30d4e7d70c)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
|
|
Signed-off-by: Petr Mladek <pmladek@suse.cz>
|
|
Ensure that the printing temp selection document is not destroyed
prematurely by SwXTextView::NotifySelChanged, called via
ViewOptionAdjustStop, by retaining the temp doc object shell not
at the View but in SwRenderData.
Not restoring the view options for selections does not actually work,
because having a selection surprisingly does not imply printing a
temp document: the preview also uses a selection.
(view option regression from cd690d2e72be410058376c416a40ff5d918fb0f7)
backport of 89d2733e16ae6233deea6bef3193bd45c89b854c
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
|
|
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
Replace may delete nodes, so the current cursor position must be stored
in a way so that it is corrected when nodes are removed.
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
|
|
The fix for this (230fcf4a456636bb466f72834cd57238621d206d) was not
quite right; there are 2 different join modes, and moving the cursor
backward is required in one of them, but not the other.
This can be seen when doing replace all ^$ with several consecutive
empty lines.
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
|
|
commit 3524727db0f3cfecf3a47046795c527808c10c3e
Author: Caolán McNamara <caolanm@redhat.com>
Date: Thu Jun 23 15:14:00 2011 +0100
Related: #i58612# don't crash anyway
|
|
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
|
|
Seems the graphic load code is stupid and not using the path name /
file extension to guess file type, but only "magic byte" detection.
Giving filter framework the path now, so that .svg actually loads.
This parrots 050350f326629c6edffcdb2cf288893027f264e6, but for
Writer, which sadly sports its own Graphic implementation.
Signed-off-by: Noel Power <nopower@suse.com>
|
|
|
|
Signed-off-by: Michael Stahl <mst@openoffice.org>
|
|
Signed-off-by: Michael Stahl <mst@openoffice.org>
|
|
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
|
|
This fixes i#116448 - SwViewOption was allocated but never freed
during pdf export - killed mass document exporting via OOM
eventually.
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
|
|
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
|
|
|
|
|
Signed-off-by: Noel Power <noel.power@novell.com>
|
|
(cherry picked from commit 6f32f7f8896dcb21e983adcb61ed400db7389a34)
|
|
(cherry picked from commit a1c11fa56aef80b4a9a47054029613fb06a30832)
|
|
Complained about switching on an unitialized value
(cherry picked from commit 5d7caec204e704c62d670cc90a39e8cfc78479c6)
|
|
Fixed segfault due to reading an invalid pointer returned by GetStyle
Translated some of the comments
Added some proofing against similar bugs from GetStyle that may happen
in other edge cases
Fixed compile warning
(cherry picked from commit b2f9a798a010f76e887a7f10c6f0af667fe48e81)
|
|
(cherry picked from commit 560b004d9812a76783c701724043f6cee70c0928)
|
|
|
|
Signed-off-by: Noel Power <noel.power@novell.com>
|
|
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
|
|
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
|
|
|
|
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
|
|
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
|