Commit Graph

68 Commits

Author SHA1 Message Date
Thomas Arnhold
9a9b5ec694 Remove dates and two unused code segments. 2011-01-18 08:19:55 +01:00
Takeshi Abe
093b3ed230 Replace all occured, occurance etc. 2010-12-05 17:16:16 +00:00
Jan Holesovsky
1a6bf8c433 Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
	sw/inc/SwNumberTree.hxx
	sw/inc/calbck.hxx
	sw/inc/tox.hxx
	sw/inc/viscrs.hxx
	sw/source/core/doc/docnum.cxx
	sw/source/core/docnode/finalthreadmanager.cxx
	sw/source/core/docnode/ndnum.cxx
	sw/source/core/docnode/ndtbl.cxx
	sw/source/core/draw/dcontact.cxx
	sw/source/core/edit/edlingu.cxx
	sw/source/core/edit/ednumber.cxx
	sw/source/core/except/errhdl.cxx
	sw/source/core/fields/chpfld.cxx
	sw/source/core/fields/fldbas.cxx
	sw/source/core/frmedt/fetab.cxx
	sw/source/core/layout/flycnt.cxx
	sw/source/core/layout/makefile.mk
	sw/source/core/layout/pagechg.cxx
	sw/source/core/layout/tabfrm.cxx
	sw/source/core/ole/ndole.cxx
	sw/source/core/text/makefile.mk
	sw/source/core/txtnode/txtedt.cxx
	sw/source/filter/basflt/fltini.cxx
	sw/source/filter/html/swhtml.cxx
	sw/source/filter/ww1/fltshell.cxx
	sw/source/filter/ww1/w1sprm.cxx
	sw/source/filter/ww8/wrtw8nds.cxx
	sw/source/filter/ww8/wrtw8num.cxx
	sw/source/filter/ww8/ww8par3.cxx
	sw/source/filter/ww8/ww8par5.cxx
	sw/source/filter/ww8/ww8par6.cxx
	sw/source/filter/xml/xmltble.cxx
	sw/source/filter/xml/xmltbli.cxx
	sw/source/ui/dbui/dbinsdlg.cxx
	sw/source/ui/dbui/mmoutputpage.cxx
	sw/source/ui/dialog/swdlgfact.cxx
	sw/source/ui/docvw/edtwin.cxx
	sw/source/ui/docvw/srcedtw.cxx
2010-11-25 18:50:04 +01:00
Cédric Bosdonnat
c16ba8a04f Removed DBG_UTIL from sw
* Fixed the different dbglevel builds
* This needed to change all the sw local ASSERT to OSL_ENSURE...
2010-11-25 17:12:34 +01:00
Kayo Hamid
dd3fac4315 remove dead code 2010-11-16 10:46:07 +01: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
Vladimir Glazunov
7e12418df5 CWS-TOOLING: integrate CWS changefileheader2 2010-02-17 10:32:35 +01: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
Mathias Bauer
b08e1a88df CWS svxsplit: merge with m71 2010-02-04 17:59:58 +01:00
Michael Stahl
dd19343634 merge DEV300_m70 2010-01-26 14:45:09 +01:00
Mathias Bauer
55f1f483cf #i107450#: build all other modules with new editeng lib 2010-01-08 18:32:51 +01:00
Michael Stahl
733b831970 swunolocking1: swtypes.hxx: rename frame anchor types
enum RndStdIds: rename frame anchor types (FLY_*) to be more intuitive.
 [note the completely ridiculous number of files that care about anchor types]
2010-01-05 16:37:41 +01:00
Mathias Bauer
b2bebad784 #i103452#: replace PRODUCT by !DBG_UTIL; replace assert by OSL_ASSERT where possible 2009-07-10 14:03:42 +02:00
Rüdiger Timm
a95496deaa INTEGRATION: CWS swlists01 (1.52.130); FILE MERGED
2008/05/19 07:55:09 od 1.52.130.3: RESYNC: (1.53-1.54); FILE MERGED
2008/05/08 16:32:09 od 1.52.130.2: RESYNC: (1.52-1.53); FILE MERGED
2008/03/06 09:54:20 od 1.52.130.1: #i86732# refactoring due to revised <SwFmt> interface
2008-06-13 08:59:51 +00:00
Vladimir Glazounov
9a356501c1 INTEGRATION: CWS sw241bf01_DEV300 (1.52.150); FILE MERGED
2008/04/22 08:29:48 od 1.52.150.1: #i87493# method <SwPageFrm::AppendFlyToPage(..)>
	 - assure consistent data structures for managing anchored objects
2008-05-14 12:30:33 +00:00
Rüdiger Timm
17a237047f INTEGRATION: CWS changefileheader (1.52.184); FILE MERGED
2008/04/01 15:57:15 thb 1.52.184.3: #i85898# Stripping all external header guards
2008/04/01 12:54:13 thb 1.52.184.2: #i85898# Stripping all external header guards
2008/03/31 16:54:21 rt 1.52.184.1: #i87441# Change license header to LPGL v3.
2008-04-10 13:44:27 +00:00
Ivo Hinkelmann
e233ea48af INTEGRATION: CWS os107 (1.51.76); FILE MERGED
2007/11/07 10:23:47 os 1.51.76.1: #i83400#(OD) prevent setting of illegal ordinal numbers
2007-11-21 17:19:32 +00:00
Jens-Heiner Rechtien
20eab16732 INTEGRATION: CWS swwarnings (1.49.102); FILE MERGED
2007/09/24 07:02:59 os 1.49.102.6: RESYNC: (1.49-1.50); FILE MERGED
2007/05/16 10:17:30 tl 1.49.102.5: #i69287# warning-free code
2007/04/03 12:59:57 tl 1.49.102.4: #i69287# warning-free code
2007/03/08 08:23:47 fme 1.49.102.3: #i69287# Warning free code
2007/03/05 12:45:29 tl 1.49.102.2: #i69287# warning-free code
2007/02/22 15:06:34 tl 1.49.102.1: #i69287# warning-free code
2007-09-27 08:02:46 +00:00
Vladimir Glazounov
cb7190187b INTEGRATION: CWS loopcontrol (1.49.340); FILE MERGED
2007/09/05 08:13:27 fme 1.49.340.1: #i81146# Implement various loop controls
2007-09-20 10:49:11 +00:00
Jens-Heiner Rechtien
c66a52ac5d INTEGRATION: CWS smarttags (1.48.110); FILE MERGED
2006/12/21 10:43:04 jakob_lechner 1.48.110.1: #i72705#: support for smarttags
2007-01-02 15:48:59 +00:00
Oliver Bolte
c89eea383c INTEGRATION: CWS pchfix02 (1.47.2); FILE MERGED
2006/09/01 17:51:48 kaib 1.47.2.1: #i68856# Added header markers and pch files
2006-09-16 20:18:44 +00:00
Jens-Heiner Rechtien
b4846bff82 INTEGRATION: CWS writercorehandoff (1.42.78); FILE MERGED
2006/07/27 14:44:42 fme 1.42.78.6: RESYNC: (1.45-1.46); FILE MERGED
2006/04/28 13:33:43 fme 1.42.78.5: RESYNC: (1.44-1.45); FILE MERGED
2005/10/25 08:31:51 tra 1.42.78.4: RESYNC: (1.43-1.44); FILE MERGED
2005/09/13 14:07:17 tra 1.42.78.3: RESYNC: (1.42-1.43); FILE MERGED
2005/07/14 05:01:17 fme 1.42.78.2: #i50348# Make SwDoc accessible via interfaces
2005/07/12 11:21:32 tra 1.42.78.1: #i50348#make SwDoc interface based
2006-08-14 15:26:17 +00:00
Oliver Bolte
6b17088333 INTEGRATION: CWS wordcountopt (1.44.288); FILE MERGED
2006/05/03 07:36:59 fme 1.44.288.2: RESYNC: (1.44-1.45); FILE MERGED
2006/05/02 08:33:19 fme 1.44.288.1: #i64985# Word count should be done during idle time
2006-07-10 14:29:47 +00:00
Kurt Zenker
11f1cc9b79 INTEGRATION: CWS swqbf58 (1.44.234); FILE MERGED
2006/04/18 08:26:25 od 1.44.234.1: #b6403541# method <SwFlyFreeFrm::MakeAll()> - minor correction.
2006-04-26 13:13:09 +00:00
Jens-Heiner Rechtien
bf479de88b INTEGRATION: CWS swqbf35 (1.42.134); FILE MERGED
2005/09/22 16:09:15 fme 1.42.134.2: RESYNC: (1.42-1.43); FILE MERGED
2005/06/30 09:14:38 od 1.42.134.1: #i50432# <SwPageFrm::PlaceFly(..)>
         - adjust synopsis of method
         - consider the case the page frame is an empty page
           --> append fly frame at next page frame.
2005-09-28 10:12:03 +00:00
Rüdiger Timm
ebfe17d2da INTEGRATION: CWS ooo19126 (1.42.216); FILE MERGED
2005/09/05 13:40:16 rt 1.42.216.1: #i54170# Change license header: remove SISSL
2005-09-09 03:12:55 +00:00
Rüdiger Timm
4518bf1c9a INTEGRATION: CWS swqod04 (1.41.4); FILE MERGED
2005/03/30 15:13:09 od 1.41.4.1: #i43913# <CalcClipRect(..)> - consider, that table cell can exceed its
	 upper printing bottom
2005-04-01 15:35:32 +00:00
Vladimir Glazounov
c0f50e19ef INTEGRATION: CWS swqbugfixes17 (1.40.34); FILE MERGED
2005/03/03 12:00:46 od 1.40.34.1: #i43771# class <SwFlyFreeFrm> - implementation of overloaded method <IsFormatPossible()>
2005-03-23 11:59:40 +00:00
Vladimir Glazounov
1b6c84b2af INTEGRATION: CWS os51 (1.39.52); FILE MERGED
2005/01/20 15:20:00 od 1.39.52.1: #118546# - environment of anchored object, which doesn't follows the text
	   flow is always the page frame
2005-02-16 16:01:15 +00:00
Vladimir Glazounov
d19fd7ce23 INTEGRATION: CWS swqbugfixes10 (1.38.4); FILE MERGED
2004/11/29 16:09:31 od 1.38.4.2: #i34753# - no <MakeObjPos()> for at-page and at-fly anchored Writer fly
	   frame under certain conditions.
2004/11/29 15:36:45 od 1.38.4.1: #i37068# - handling of <mbNoMoveOnCheckClip>
2004-12-23 09:07:54 +00:00
Oliver Bolte
9832771cfe INTEGRATION: CWS swqbugfixes09 (1.37.108); FILE MERGED
2004/11/03 12:22:53 od 1.37.108.3: #114798# <SwFlyFreeFrm::MakeAll> - guard on invalidate position, if
         Writer fly frame is clipped.
2004/11/01 08:34:18 od 1.37.108.2: #i36347# class <SwFlyFreeFrm> - new member <mbNoCheckClip> and
         its dependence on call of method <CheckClip(..)>
2004/10/18 06:51:07 od 1.37.108.1: #i26945# <CalcClipRect(..)> - correction due to object positioning
2004-11-16 14:45:55 +00:00
Kurt Zenker
f85a48bbf1 INTEGRATION: CWS swobjpos04 (1.30.88); FILE MERGED
2004/07/14 07:33:17 od 1.30.88.8: resolve merge conflict
2004/07/13 01:35:03 od 1.30.88.7: RESYNC: (1.30-1.36); FILE MERGED
resolve merge conflicts.
2004/07/12 08:15:38 od 1.30.88.6: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:23 od 1.30.88.5: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:56 od 1.30.88.4: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 13:41:11 od 1.30.88.3: #i28701# - further adjustments for the new positioning of floating
	   screen objects.
2004/05/24 13:11:31 od 1.30.88.2: #i28701# - usage of new class <SwSortedObjs>
         - adjustments for the new positioning of floating screen objects
2004/05/07 15:31:34 od 1.30.88.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:09:33 +00:00
Hans-Joachim Lankenau
92c0017265 #i10000# fix merge problems 2004-06-30 14:20:18 +00:00
Kurt Zenker
81279eef1c INTEGRATION: CWS swqbugfixes02 (1.31.18); FILE MERGED
2004/06/16 19:18:14 fme 1.31.18.2: RESYNC: (1.31-1.32); FILE MERGED
2004/06/04 13:20:07 od 1.31.18.1: #i29879# <SwFlyFreeFrm::~SwFlyFreeFrm()> - remove also to-frame anchored
	 Writer fly frames from its page.
2004-06-29 07:09:02 +00:00
Hans-Joachim Lankenau
98647bc244 INTEGRATION: CWS swdrawpositioning (1.29.6); FILE MERGED
2004/06/21 07:23:02 od 1.29.6.4: RESYNC: (1.30-1.32); FILE MERGED
2004/04/23 09:12:54 od 1.29.6.3: #i26791# - adjustments for the unification of the positioning of Writer
	   fly frames and drawing objects
2004/04/08 09:20:39 od 1.29.6.2: RESYNC: (1.29-1.30); FILE MERGED
2004/04/07 12:07:09 od 1.29.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
2004-06-28 12:54:56 +00:00
Hans-Joachim Lankenau
2b3a19b1b8 INTEGRATION: CWS swqbugfixes01 (1.30.100); FILE MERGED
2004/06/04 10:42:22 od 1.30.100.2: RESYNC: (1.30-1.31); FILE MERGED
2004/06/02 07:17:27 od 1.30.100.1: #i29778# method <CalcClipRect(..)> - no calculation of upper frames any more
2004-06-28 11:59:45 +00:00
Oliver Bolte
d2d16d13fe INTEGRATION: CWS fmebugs02 (1.30.48); FILE MERGED
2004/05/19 12:53:49 fme 1.30.48.1: #i29333# Do not set size attribute of ole objects the 0
2004-06-04 07:51:44 +00:00
Kurt Zenker
b87a57240a INTEGRATION: CWS swautowidth (1.30.16); FILE MERGED
2004/04/05 13:09:08 fme 1.30.16.1: i27205# Feature - Automatic frame width
2004-05-18 13:50:59 +00:00
Oliver Bolte
7e7bb07652 INTEGRATION: CWS fmebugs01 (1.24.112); FILE MERGED
2004/03/05 15:08:57 fme 1.24.112.2: RESYNC: (1.24-1.26); FILE MERGED
2004/03/05 09:55:24 fme 1.24.112.1: #111909# Objects anchored as character may exceed right margins
2004-03-17 11:49:35 +00:00
Jens-Heiner Rechtien
4ab35e9fb1 #100000#: backout revision 1.27 2004-03-08 14:56:32 +00:00
Jens-Heiner Rechtien
08f0c8caa3 INTEGRATION: CWS swobjpos03 (1.23.56); FILE MERGED
2004/02/16 10:09:32 od 1.23.56.4: RESYNC: (1.23-1.25); FILE MERGED
resolve merge conflicts.
2003/11/21 09:36:30 od 1.23.56.3: #113049# - further adjustment for isolated positioning algorithms
2003/11/10 13:23:52 od 1.23.56.2: #113049# - further improvements to the isolated object positioning algorithms
#i22305# <CalcClipRect(..)> - consider 'Follow text flow' for to-frame
	 anchored Writer fly frames.
2003/10/27 13:03:54 od 1.23.56.1: merging changes from swobjpos02
2004-03-08 13:00:43 +00:00
Kurt Zenker
ab7319cefd INTEGRATION: CWS os24 (1.23.82); FILE MERGED 2004-03-08 12:30:16 +00:00
Kurt Zenker
155743c51f INTEGRATION: CWS hiddentext (1.24.18); FILE MERGED
2004/02/16 08:50:54 fme 1.24.18.2: RESYNC: (1.24-1.25); FILE MERGED
2004/01/19 10:09:14 od 1.24.18.1: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004-02-26 14:30:25 +00:00
Jens-Heiner Rechtien
7c7e5788da INTEGRATION: CWS swobjpos02 (1.22.52); FILE MERGED
2004/01/13 13:31:20 od 1.22.52.5: RESYNC: (1.23-1.24); FILE MERGED
2003/11/18 11:01:06 od 1.22.52.4: #110978# - further adjustments for isolated object positioning algorithms
2003/10/15 12:49:53 od 1.22.52.3: RESYNC: (1.22-1.23); FILE MERGED
resolved conflicts.
2003/10/09 15:06:54 od 1.22.52.2: #110978# - further adjustments for isolated positioning algorithm
2003/10/02 10:38:09 od 1.22.52.1: #i18732# method <CalcClipRect(..)> - adjustments for new option 'FollowTextFlow'
	 and alignment at page areas.
2004-02-02 17:21:32 +00:00
Rüdiger Timm
d7a639b51c INTEGRATION: CWS aw003 (1.20.6); FILE MERGED
2003/10/23 14:39:29 aw 1.20.6.5: #111111#
Changed GetBoundRect() to GetCurrentBoundRect() and GetLastBoundRect()
2003/10/07 15:02:25 aw 1.20.6.4: RESYNC: (1.22-1.23); FILE MERGED
2003/08/20 11:30:26 aw 1.20.6.3: RESYNC: (1.21-1.22); FILE MERGED
2003/06/30 18:11:34 aw 1.20.6.2: RESYNC: (1.20-1.21); FILE MERGED
2003/06/30 13:38:29 aw 1.20.6.1: #110094#
2003-11-24 15:05:38 +00:00
Oliver Bolte
cef959f8b0 INTEGRATION: CWS geordi2q04 (1.22.106); FILE MERGED
2003/09/02 10:38:03 rt 1.22.106.1: #111934#: Join CWS sw7pp1.
2003-09-04 10:47:26 +00:00
Vladimir Glazounov
d7982bdbe0 INTEGRATION: CWS aig02 (1.20.38); FILE MERGED
2003/06/24 08:43:19 od 1.20.38.3: RESYNC: (1.20-1.21); FILE MERGED
2003/06/23 15:25:52 od 1.20.38.2: #108784# - further adjustments for supporting drawing objects in header/footer
2003/05/22 10:52:14 od 1.20.38.1: #108784# class <SwPageFrm> - adjustments for drawing objects in header/footer
2003-07-04 12:21:56 +00:00
Vladimir Glazounov
856947b762 INTEGRATION: CWS sw015 (1.20.34); FILE MERGED
2003/05/20 08:31:43 fme 1.20.34.2: #109653# No proportional scaling of graphics and OLE in footer or header
2003/05/19 09:03:34 fme 1.20.34.1: #109653# Proportional scaling of graphics
2003-06-10 12:18:23 +00:00
Vladimir Glazounov
18200568bc INTEGRATION: CWS os8 (1.19.142); FILE MERGED
2003/04/03 07:10:57 os 1.19.142.1: #108583# precompiled headers removed
2003-04-17 13:12:19 +00:00
Andreas Martens
9afb6809ec Fix #100979#: Loop in footer 2002-09-12 08:26:38 +00:00