Commit Graph

31 Commits

Author SHA1 Message Date
Jan Holesovsky
120922361a i#23187: Fix crash of the document.
The mbLayoutInProgress bool was effectively unused - only set and reset, but
the only place that was checking for that was in lcl_RecalcRow(), again, only
to set and reset it.

Worse - with the document from i#23187, the mbLayoutInProgress was set / reset
on a page already disposed in SwFrm::InsertPage() which was causing the crash
here.

So let's get rid of all this mbLayoutInProgress, its getter and setter, and
NotifyLayoutOfPageInProgress class.

Valgrind, thank you that you exist, would have never found it without you! :-)

Change-Id: I9a9b604f8a21bb50e21af1b20b8db76d2c0504bd
2013-04-12 17:10:53 +02:00
Michael Meeks
caaeb0a046 re-base on ALv2 code. Includes:
Patches contributed by Oliver-Rainer Wittmann
    sw34bf06: #i117783# - Writer's implementation of XPagePrintable -
    apply print settings to new printing routines
    http://svn.apache.org/viewvc?view=revision&revision=1172115
    sw34bf06: #o12311627# use <rtl_random> methods to
    create unique ids for list styles and list ids
    http://svn.apache.org/viewvc?view=revision&revision=1172112
    sw34bf06 #i114725#,#i115828# - method <SwDoc::ClearDoc()> -
    clear list structures completely
    http://svn.apache.org/viewvc?view=revision&revision=1172122
    i#118572 - remove ui string and help content regarding usage of
    Java Mail in Writer's Mail Merge as Java Mail is not used.
    http://svn.apache.org/viewvc?view=revision&revision=1197035

    Patches contributed by Mathias Bauer
    cws mba34issues01: #i117718#: provide filter name in
    case storage of medium does not allow to detect one
    http://svn.apache.org/viewvc?view=revision&revision=1172350
    cws mba34issues01: #i117721#: directly provide
    parameters retrieved from SfxMedium
    http://svn.apache.org/viewvc?view=revision&revision=1172353
    gnumake4 work variously
    http://svn.apache.org/viewvc?view=revision&revision=1394707
    http://svn.apache.org/viewvc?view=revision&revision=1394326
    http://svn.apache.org/viewvc?view=revision&revision=1396797
    http://svn.apache.org/viewvc?view=revision&revision=1397315
    cws mba34issues01: #i117723#: convert assertion into trace
    http://svn.apache.org/viewvc?view=revision&revision=1172355
    cws mba34issues01: #i117699#: keep layout alive until swdoc dies
    http://svn.apache.org/viewvc?view=revision&revision=1172362
    cws mba34issues01: #i117943#: missing color attributes in RTF clipboard
    http://svn.apache.org/viewvc?view=revision&revision=1172363

    Patch contributed by Henning Brinkmann
    imported patch i#103878
    http://svn.apache.org/viewvc?view=revision&revision=1172109

    Patches contributed by Michael Stahl
    sw34bf06: #i117955#: WW8 export: disable storing of section breaks in endnotes
    http://svn.apache.org/viewvc?view=revision&revision=1172119

    Patch contributed by imacat
    Fixed the Asian language work count.
    http://svn.apache.org/viewvc?view=revision&revision=1241345

    Patch contributed by Pedro Giffuni
    i#20878 - Add comment with BZ issue for reference.
    http://svn.apache.org/viewvc?view=revision&revision=1244517

    Patch contributed by Andre Fischer
    Do not add targets for junit tests when junit is disabled.
    http://svn.apache.org/viewvc?view=revision&revision=1241508

add writerperfect dependency.
2012-11-30 10:10:38 +00:00
Luboš Luňák
21d10c6f32 mark lcl_ functions static or rename them if they are not local at all
http://lists.freedesktop.org/archives/libreoffice/2012-October/039639.html

Change-Id: I21e12d6a4dfb9697d2346a4e564e96af0ad03f96
2012-10-12 16:56:54 +02:00
Júlio Hoffimann
ac6c250d9e left arrow comments removed // <-- 2011-04-22 16:04:20 +02:00
Cédric Bosdonnat
0772e9af0e layout dumper: dump anchored objects too 2011-04-13 15:55:38 +02:00
Robert Roth
db8ad987be Bogus comments, commented lines removed, some german comments translated. 2010-11-01 21:04:41 +00:00
Sebastian Spaeth
61355e51b8 Add vim/emacs modelines to all source files
Fixes #fdo30794 Based on bin/add-modelines script (originally posted
in mail 1286706307.1871.1399280959@webmail.messagingengine.com)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-14 17:16:56 +02:00
Jens-Heiner Rechtien
1a359bd2a8 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Jens-Heiner Rechtien
48119ae058 CWS-TOOLING: integrate CWS libmsword
2008-12-18 12:33:19 +0100 kendy  r265681 : Export less symbols.
2008-12-17 19:26:56 +0100 kendy  r265655 : Move libmsword to the -writer package.
2008-12-15 17:46:16 +0100 kendy  r265516 : Enable exceptions for iodetect.cxx.
2008-12-15 15:17:53 +0100 kendy  r265504 : Deliver the msword.dll.
2008-12-09 19:38:17 +0100 kendy  r265138 : Remove accidentally added method.
2008-12-09 19:33:57 +0100 kendy  r265137 : Fix linking on Win32.
2008-12-09 18:37:16 +0100 kendy  r265135 : Move SwFltControlStack::Delete() to ww1/fltshell.cxx to fix linking.
2008-12-09 18:01:56 +0100 kendy  r265127 : Visibility fixes.
2008-12-09 15:51:52 +0100 kendy  r265109 : Fix ambiguous usage of class Color.
2008-12-09 14:54:27 +0100 kendy  r265091 : Add #include "precompiled_sw.hxx" to fix --enable-pch build.
2008-12-09 14:44:59 +0100 kendy  r265088 : Add #include "precompiled_sw.hxx" to fix --enable-pch build.
2008-12-08 19:14:49 +0100 kendy  r265015 : #i96313# Get rid of inc/iodetect.cxx, it's a really bad idea to share
code by #ifdefing parts of it, and #including a .cxx file ;-)
This change moves it to iodetect.cxx, which is compiled to a .o/.obj
that is used where needed.
2008-11-20 17:45:08 +0100 kendy  r264083 : #i96313# Make the destruction of Readers consistent.
2008-11-20 17:18:11 +0100 kendy  r264070 : #i96313# Added missing SW_DLLPUBLIC for (Import|Export)(DOC|RTF).
2008-11-18 19:21:07 +0100 kendy  r263797 : #i96313# Remove accidentally added file.
2008-11-18 17:14:31 +0100 kendy  r263790 : #i96313# Split doc and rtf filters into a separate library
From: Radek Doulik <rodo@novell.com>
fix SwFieldBookmark class visibility (suggested by kendy)
2008-11-18 17:14:01 +0100 kendy  r263789 : #i96313# Split doc and rtf filters into a separate library
From: Fridrich Strba <fstrba@novell.com>
add visibility markup to allow linking
2008-11-18 17:13:29 +0100 kendy  r263788 : #i96313# Split doc and rtf filters into a separate library
From: Jan Holesovsky <kendy@suse.cz>
Visibility markup for libmsword.
This is the most trivial approach, every class that had a symbol that needed
to be visible was marked with SW_DLLPUBLIC; the correct (but more time
consuming) way would be to mark just the exact methods that were needed.
To be done later if generally shows that the separate libmsword makes sense;
and also now we have the upper limit of symbols that needed to be added, and
we can only make it better [decrease the number] ;-)
2008-11-18 17:12:58 +0100 kendy  r263787 : #i96313# Split doc and rtf filters into a separate library
From: Jan Holesovsky <kendy@suse.cz>
Added the missing msword.map.
2008-11-18 17:12:25 +0100 kendy  r263786 : #i96313# Split doc and rtf filters into a separate library
From: Jan Holesovsky <kendy@suse.cz>
scp2 change for libmsword.
2008-11-18 17:11:55 +0100 kendy  r263785 : #i96313# Split doc and rtf filters into a separate library
From: Jan Holesovsky <kendy@suse.cz>
Convert the binary .doc and .rtf filters into a separate library.
It is called 'libmsword' and loaded on demand when either of the formats
(.doc, .rtf) is loaded or saved.
2009-01-05 14:06:42 +00:00
Oliver Bolte
56a1f3affc CWS-TOOLING: integrate CWS cmcfixes49 2008-10-10 13:02:43 +00:00
Rüdiger Timm
04bb62c59c INTEGRATION: CWS changefileheader (1.21.438); FILE MERGED
2008/04/01 15:56:06 thb 1.21.438.3: #i85898# Stripping all external header guards
2008/04/01 12:53:26 thb 1.21.438.2: #i85898# Stripping all external header guards
2008/03/31 16:52:33 rt 1.21.438.1: #i87441# Change license header to LPGL v3.
2008-04-10 09:48:36 +00:00
Rüdiger Timm
2151522a01 INTEGRATION: CWS os94 (1.20.186); FILE MERGED
2007/03/12 08:07:27 os 1.20.186.1: #i75235# unused methods removed
2007-04-25 07:51:09 +00:00
Vladimir Glazounov
679a7821cf INTEGRATION: CWS swqbf88 (1.19.26); FILE MERGED
2006/10/05 09:21:06 od 1.19.26.1: #i70122# classes <SwAnchoredObject> and <SwAnchoredDrawObject>
	 - introduce new method <GetObjBoundRect()> to retrieve bounding
	   rectangle of an anchored object.
2006-11-01 14:09:05 +00:00
Oliver Bolte
cb14166ec0 INTEGRATION: CWS swqbf81 (1.17.22); FILE MERGED
2006/08/21 10:07:10 od 1.17.22.2: RESYNC: (1.17-1.18); FILE MERGED
2006/08/21 07:01:45 od 1.17.22.1: #i68520# - performance improvement:
	   - introduce cache for bounding rectangle of anchored objects
	     and implement usage of this cache.
2006-09-15 10:39:31 +00:00
Jens-Heiner Rechtien
87ff4edf80 INTEGRATION: CWS writercorehandoff (1.13.78); FILE MERGED
2006/07/27 14:33:14 fme 1.13.78.5: RESYNC: (1.16-1.17); FILE MERGED
2006/04/05 12:51:23 tra 1.13.78.4: RESYNC: (1.15-1.16); FILE MERGED
2005/10/25 08:21:14 tra 1.13.78.3: RESYNC: (1.14-1.15); FILE MERGED
2005/09/13 11:14:00 tra 1.13.78.2: RESYNC: (1.13-1.14); FILE MERGED
2005/06/06 07:07:20 tra 1.13.78.1: Unnecessary includes removed #i50348#
2006-08-14 14:16:14 +00:00
Rüdiger Timm
0363f80b3b INTEGRATION: CWS swqbf75 (1.16.190); FILE MERGED
2006/07/24 11:37:17 od 1.16.190.1: #b6449874# class <SwAnchoredObject>
	   - new method <SetTmpConsiderWrapInfluenceOfOtherObjs(..)>
2006-07-26 07:16:37 +00:00
Oliver Bolte
5da86ad45c INTEGRATION: CWS swdrawobjpos203 (1.15.230); FILE MERGED
2006/03/20 08:17:13 od 1.15.230.1: #i62875# class <SwAnchoredObject>:
	 - method <UpdateLayoutDir()> is virtual now.
2006-03-22 11:21:55 +00:00
Jens-Heiner Rechtien
0a1b3405ab INTEGRATION: CWS swqbf35 (1.13.134); FILE MERGED
2005/09/22 12:27:00 fme 1.13.134.2: RESYNC: (1.13-1.14); FILE MERGED
2005/08/09 07:03:10 od 1.13.134.1: #i52904# class <SwObjPositioningInProgress>
	 - consider nested usage of this class
2005-09-28 10:02:25 +00:00
Rüdiger Timm
5140b073b0 INTEGRATION: CWS ooo19126 (1.13.216); FILE MERGED
2005/09/05 13:35:38 rt 1.13.216.1: #i54170# Change license header: remove SISSL
2005-09-09 00:32:40 +00:00
Rüdiger Timm
c5f56fd970 INTEGRATION: CWS swqod03 (1.12.2); FILE MERGED
2005/03/30 08:40:30 od 1.12.2.1: #120729# class <SwAnchoredObject> - add friend method <lcl_HideObj(..)>
	 it's needed for the hotfix.
2005-04-01 15:34:22 +00:00
Vladimir Glazounov
fdb7a48705 INTEGRATION: CWS swqbugfixes16 (1.10.76); FILE MERGED
2005/03/03 08:36:55 od 1.10.76.3: RESYNC: (1.10-1.11); FILE MERGED
2005/03/03 07:37:04 od 1.10.76.2: #i43913# class <SwAnchoredObject> - new method <ResetLayoutProcessBools()>
2005/02/22 13:28:53 od 1.10.76.1: #i43255# class <SwAnchoredObject>
	 - new method <ConsiderObjWrapInfluenceOfOtherObjs()>
2005-03-23 10:50:28 +00:00
Vladimir Glazounov
2150614051 INTEGRATION: CWS swqbugfixes14 (1.10.4); FILE MERGED
2005/01/28 12:34:28 od 1.10.4.1: #i33818# <SwAnchoredObject::GetRelPosToPageFrm(..)> - adjustment to
	 improvement WW8 export of anchored object positions.
2005-02-22 07:16:03 +00:00
Kurt Zenker
8b180340e7 INTEGRATION: CWS swqbugfixes12 (1.9.8); FILE MERGED
2005/01/11 12:26:20 od 1.9.8.2: #i40147# class <SwAnchoredObject> - new member <mbKeepPositionLockedForSection>
	 including accessor
2005/01/07 15:32:32 od 1.9.8.1: #i30669# - new methods <GetRelPosToAnchorFrm()>, <GetRelPosToPageFrm()>,
	   <GetRelPosToChar()> and <GetRelPosToLine()> to provide
	   needed layout information for WW8 filter.
2005-01-21 09:26:23 +00:00
Vladimir Glazounov
83791d7807 INTEGRATION: CWS swqbugfixes10 (1.8.4); FILE MERGED
2004/12/03 15:22:44 od 1.8.4.1: #115759# class <SwAnchoredObject> - new method <ClearVertPosOrientFrm()>
2004-12-23 09:01:24 +00:00
Oliver Bolte
f82bbf8936 INTEGRATION: CWS swqbugfixes09 (1.6.40); FILE MERGED
2004/11/15 14:05:51 od 1.6.40.3: RESYNC: (1.6-1.7); FILE MERGED
2004/10/26 08:22:15 od 1.6.40.2: #i35911# class <SwAnchoredObject> - new member <mbClearedEnvironment>
         inclusive accessors
2004/10/18 06:13:24 od 1.6.40.1: #i26945# class <SwAnchoredObject> - new methods <FindAnchorCharFrm()>
         and <GetAnchorFrmContainingAnchPos()>
2004-11-16 14:36:39 +00:00
Jens-Heiner Rechtien
e5e0bbd35d INTEGRATION: CWS swqbugfixes08 (1.6.4); FILE MERGED
2004/09/23 09:20:46 od 1.6.4.1: #i33751# class <SwAnchoredObject>
         - replace method <SwPageFrm& GetPageFrmOfAnchor()> by method
           <SwPageFrm* FindPageFrmOfAnchor()>
2004-11-09 12:42:09 +00:00
Oliver Bolte
8da692fa84 INTEGRATION: CWS swqbugfixes06 (1.4.8); FILE MERGED
2004/08/30 12:35:29 od 1.4.8.3: RESYNC: (1.4-1.5); FILE MERGED
2004/08/25 14:43:12 od 1.4.8.2: #i3317# class <SwAnchoredObject> - new member and methods to apply
        temporarly the 'straightforward positioning process' for the
        anchored object.
2004/08/12 14:19:22 od 1.4.8.1: #i28795# - correct comment for method <IsFormatPossible()>
2004-09-09 09:54:40 +00:00
Rüdiger Timm
df6086a779 INTEGRATION: CWS swdrawobjapi (1.2.60); FILE MERGED
2004/08/12 06:56:40 od 1.2.60.2: RESYNC: (1.2-1.4); FILE MERGED
resolve merge conflicts.
2004/07/29 13:20:05 od 1.2.60.1: #i31698# - adjustments for changed drawing object API in Writer
2004-08-23 07:00:41 +00:00
Oliver Düsterhoff
dcb4116047 #i28701# integration of cws swobjpos04 into master 2004-08-03 05:00:02 +00:00
Jens-Heiner Rechtien
fb0770f464 INTEGRATION: CWS swqbugfixes04 (1.2.22); FILE MERGED
2004/07/15 08:35:45 od 1.2.22.2: #117380# <SwAnchoredObject::CheckCharRectAndTopOfLine(..)>
	 - add parameter to control, if check for paragraph portion
	   information has to be done.
2004/07/14 13:46:55 od 1.2.22.1: #117380# class <SwAnchoredObject> - improve private methods
	 <_CheckCharRect(..)> and <_CheckTopOfLine(..)>
2004-08-02 12:04:47 +00:00
Hans-Joachim Lankenau
20db95b763 INTEGRATION: CWS swdrawpositioning (1.1.2); FILE ADDED
2004/06/01 12:01:09 od 1.1.2.3: #i26791# classes <SwAnchoredObject> and <SwAnchoredDrawObject> -
	 method to set and convert positioning attributes.
2004/04/23 07:23:56 od 1.1.2.2: #i26791# - adjustments for the unification of the positioning of Writer
	   fly frames and drawing objects
2004/04/07 08:58:17 od 1.1.2.1: #i26791# new class <SwAnchoredObject> for the unification of the positioning
	 of Writer fly frames and drawing objects.
2004-06-28 12:29:16 +00:00