Commit Graph

452 Commits

Author SHA1 Message Date
Rüdiger Timm
40c6073d5d INTEGRATION: CWS impress5ea1 (1.108.102); FILE MERGED
2004/03/13 23:30:21 cl 1.108.102.2: RESYNC: (1.108-1.109); FILE MERGED
2004/03/11 14:54:31 cl 1.108.102.1: #17343# skip invalid properties
2004-03-30 13:31:57 +00:00
Rüdiger Timm
ad9ac6d0d3 INTEGRATION: CWS impress5ea1 (1.21.74); FILE MERGED
2004/03/11 14:54:31 cl 1.21.74.1: #17343# skip invalid properties
2004-03-30 13:31:38 +00:00
Jens-Heiner Rechtien
cda704ab1b #i10000#: syntax 2004-03-11 15:28:14 +00:00
Jens-Heiner Rechtien
124ffb072a INTEGRATION: CWS swobjpos03 (1.22.104); FILE MERGED
2003/11/21 08:41:18 od 1.22.104.2: #i22341# property map <pXML_VertRel_Enum> - extend by entry for new
	 vertical orientation <RelOrientation::TEXT_LINE>
2003/10/27 12:49:33 od 1.22.104.1: merging changes from cws swobjpos02
2004-03-08 13:10:20 +00:00
Kurt Zenker
8c33059376 INTEGRATION: CWS hiddentext (1.72.94); FILE MERGED
2004/02/16 09:05:18 fme 1.72.94.3: RESYNC: (1.73-1.74); FILE MERGED
2004/02/10 10:08:22 fme 1.72.94.2: RESYNC: (1.72-1.73); FILE MERGED
2004/01/06 12:39:21 dvo 1.72.94.1: #i23659# load/save hidden flag (text:display=none/true)
2004-02-26 14:46:38 +00:00
Jens-Heiner Rechtien
095f28ddbe INTEGRATION: CWS swobjpos02 (1.72.32); FILE MERGED
2004/01/21 08:57:54 od 1.72.32.2: RESYNC: (1.72-1.73); FILE MERGED
resolve merge conflict.
2003/10/14 10:36:29 od 1.72.32.1: #i18732# - add new item for new option 'FollowTextFlow' to the corresponding
	   property maps for load and save.
2004-02-02 17:45:46 +00:00
Jens-Heiner Rechtien
e74e2d7b31 INTEGRATION: CWS swobjpos02 (1.22.78); FILE MERGED
2003/10/13 15:11:27 od 1.22.78.1: #i18732# - allow vertical alignment at page areas for 'to paragraph' and
	   'to-character' anchored fly frames.
2004-02-02 17:45:25 +00:00
Oliver Bolte
ba812e4dc6 INTEGRATION: CWS cellbreak (1.17.210); FILE MERGED
2003/11/21 16:37:07 dvo 1.17.210.1: #i2109# set file format default for style:keep-together (for table rows) to
        'false' (app default is true)
2004-01-13 10:33:53 +00:00
Oliver Bolte
6d776bf759 INTEGRATION: CWS cellbreak (1.72.70); FILE MERGED
2003/11/21 16:37:06 dvo 1.72.70.1: #i2109# set file format default for style:keep-together (for table rows) to
        'false' (app default is true)
2004-01-13 10:33:15 +00:00
Rüdiger Timm
4d7a755ea5 INTEGRATION: CWS ooo20031110 (1.12.94); FILE MERGED
2003/11/11 11:03:44 waratah 1.12.94.1: #i22301# Correct for scoping rules
2003-12-01 15:24:58 +00:00
Rüdiger Timm
c3b4fc9add INTEGRATION: CWS ooo20031110 (1.10.194); FILE MERGED
2003/11/11 11:03:43 waratah 1.10.194.1: #i22301# Correct for scoping rules
2003-12-01 15:24:44 +00:00
Rüdiger Timm
d1e6bd4e44 INTEGRATION: CWS ooo20031110 (1.5.194); FILE MERGED
2003/11/09 09:17:50 waratah 1.5.194.1: #i1858# switch from NULL to 0 - variable is not a pointer
2003-12-01 15:24:31 +00:00
Rüdiger Timm
0fc8eee3c2 INTEGRATION: CWS valgrind01 (1.20.170); FILE MERGED
2003/11/05 11:44:00 hr 1.20.170.1: #i20184#: fix uninitialized local variables
2003-11-25 09:52:42 +00:00
Hans-Joachim Lankenau
1e91e48af7 INTEGRATION: CWS os13 (1.46.10); FILE MERGED
2003/07/24 12:16:11 os 1.46.10.1: #i9569# support of 'CurrentPresentation' for conditional text field added
2003-08-19 11:02:52 +00:00
Rüdiger Timm
993a713b56 #100000# '#if SUPD' conditions removed in preparation of SRC680. 2003-08-07 11:30:06 +00:00
Vladimir Glazounov
967fb58921 INTEGRATION: CWS aig02 (1.37.26); FILE MERGED
2003/06/27 16:20:43 dvo 1.37.26.2: #108784# load text shapes in header/footer (don't convert to frame anymore)
2003/06/26 16:03:07 dvo 1.37.26.1: #108784# enable loading of shapes (but not controls) in header/footers
2003-07-04 12:28:16 +00:00
Vladimir Glazounov
9ad1f94ab1 INTEGRATION: CWS ooo11rc (1.99.30); FILE MERGED
2003/06/27 00:49:34 nick 1.99.30.1: IZ 15350: GCC 2 bug when member function is part of initialiser (on IRIX)
2003-07-02 13:09:38 +00:00
Jens-Heiner Rechtien
7212ca6178 INTEGRATION: CWS aig04 (1.99.28); FILE MERGED
2003/06/13 12:39:41 dvo 1.99.28.1: #108791# added load/save of drop down field (preliminary)
2003-06-30 14:59:45 +00:00
Jens-Heiner Rechtien
1b33680dde INTEGRATION: CWS aig04 (1.45.28); FILE MERGED
2003/06/17 09:54:50 dvo 1.45.28.2: #108791# load/save name property of drop down text field
2003/06/13 12:39:41 dvo 1.45.28.1: #108791# added load/save of drop down field (preliminary)
2003-06-30 14:59:33 +00:00
Jens-Heiner Rechtien
2051ddeca0 INTEGRATION: CWS aig04 (1.49.28); FILE MERGED
2003/06/20 14:50:57 os 1.49.28.3: RESYNC: (1.49-1.51); FILE MERGED
2003/06/17 09:54:50 dvo 1.49.28.2: #108791# load/save name property of drop down text field
2003/06/13 12:39:40 dvo 1.49.28.1: #108791# added load/save of drop down field (preliminary)
2003-06-30 14:59:20 +00:00
Vladimir Glazounov
2aa6fd2f4a INTEGRATION: CWS aig05 (1.70.38); FILE MERGED
2003/06/16 12:41:22 fme 1.70.38.2: RESYNC: (1.70-1.71); FILE MERGED
2003/05/27 12:30:54 dvo 1.70.38.1: #109700# load/save section margins
2003-06-20 08:39:40 +00:00
Rüdiger Timm
0636000a12 #100000# 2003-06-13 06:57:42 +00:00
Rüdiger Timm
de14c58d37 #100000# Rewinded last change, which concflicted with those before (wrongly resolved merge conflict?) 2003-06-13 06:56:20 +00:00
Vladimir Glazounov
439dd1d6db INTEGRATION: CWS mh11rc (1.49.26); FILE MERGED
2003/06/06 11:08:49 mh 1.49.26.1: join: from cws_srx644_ooo11beta2
2003-06-12 10:28:52 +00:00
Vladimir Glazounov
441a662e10 INTEGRATION: CWS mh11rc (1.5.132); FILE MERGED
2003/06/06 11:08:48 mh 1.5.132.1: join: from cws_srx644_ooo11beta2
2003-06-12 10:27:44 +00:00
Rüdiger Timm
d28da05595 INTEGRATION: CWS sw016 (1.49.24); FILE MERGED
2003/05/27 13:46:25 dvo 1.49.24.1: #i14863# fixed references to stack-allocated objects
2003-06-12 06:35:32 +00:00
Rüdiger Timm
1e0c6a9b05 INTEGRATION: CWS sw016 (1.55.34); FILE MERGED
2003/05/27 17:34:11 dvo 1.55.34.1: #109761# allow loading of plugins with either xlink:href or draw:mime-type
2003-06-12 06:35:19 +00:00
Rüdiger Timm
ada9470255 INTEGRATION: CWS sw016 (1.5.130); FILE MERGED
2003/05/27 13:46:25 dvo 1.5.130.1: #i14863# fixed references to stack-allocated objects
2003-06-12 06:35:08 +00:00
Rüdiger Timm
f39537b17a INTEGRATION: CWS sw016 (1.5.130); FILE MERGED
2003/05/27 13:46:26 dvo 1.5.130.1: #i14863# fixed references to stack-allocated objects
2003-06-12 06:34:57 +00:00
Rüdiger Timm
095bf51b64 INTEGRATION: CWS aig03 (1.70.34); FILE MERGED
2003/05/23 11:26:33 dvo 1.70.34.1: #1087779# load/save join-border paragraph attribute
2003-05-27 15:06:56 +00:00
Jens-Heiner Rechtien
dbffeb3f43 INTEGRATION: CWS apps61beta2 (1.96.2.1.30); FILE MERGED
2003/04/15 13:30:42 bm 1.96.2.1.30.2: RESYNC: (1.96.2.1-1.98); FILE MERGED
2003/04/10 18:13:58 cl 1.96.2.1.30.1: #108534# set paragraph depth before setting hard attributes
2003-04-28 15:08:33 +00:00
Vladimir Glazounov
c5bbc4137e INTEGRATION: CWS os8 (1.17.82); FILE MERGED
2003/04/10 17:05:57 dvo 1.17.82.1: #108730# load/save IsVisible property for database fields (text:display=none/value)
2003-04-17 12:17:04 +00:00
Vladimir Glazounov
27c2af2194 INTEGRATION: CWS os8 (1.44.6); FILE MERGED
2003/04/10 17:05:56 dvo 1.44.6.1: #108730# load/save IsVisible property for database fields (text:display=none/value)
2003-04-17 12:16:53 +00:00
Vladimir Glazounov
f835f70fa8 INTEGRATION: CWS os8 (1.48.6); FILE MERGED
2003/04/10 17:05:58 dvo 1.48.6.1: #108730# load/save IsVisible property for database fields (text:display=none/value)
2003-04-17 12:16:40 +00:00
Rüdiger Timm
8cc8a960f4 INTEGRATION: CWS draw8 (1.96.2.1.22); FILE MERGED
2003/03/12 10:27:54 aw 1.96.2.1.22.1: #107848# Initialize inside_deleted_section flag correctly
2003-04-08 14:30:44 +00:00
Rüdiger Timm
78e4fc7cc1 INTEGRATION: CWS draw8 (1.3.108); FILE MERGED
2003/03/24 14:41:59 thb 1.3.108.1: #107878# Corrected to array delete
2003-04-08 14:30:28 +00:00
Rüdiger Timm
a2187ac63b INTEGRATION: CWS draw8 (1.54.66); FILE MERGED
2003/04/03 14:39:20 aw 1.54.66.2: #107848#
One little optimization to not create a TextImportHelper if not needed.
2003/03/12 10:27:21 aw 1.54.66.1: #107848# Make adding the shepe to Z-Ordering dependent from if we are inside a inside_deleted_section (redlining). That is necessary since the shape will be removed again later. It would lead to errors if it would stay inside the Z-Ordering. Thus, the easiest way to solve that conflict is to not add it here.
2003-04-08 14:30:17 +00:00
Rüdiger Timm
2dc836906e INTEGRATION: CWS draw8 (1.1.106); FILE MERGED
2003/03/12 10:26:34 aw 1.1.106.1: #107848# Start- and EndElement are needed here to set the inside_deleted_section flag at the corresponding TextImportHelper
2003-04-08 14:30:00 +00:00
Rüdiger Timm
108b24b269 INTEGRATION: CWS draw8 (1.3.94); FILE MERGED
2003/03/12 10:26:21 aw 1.3.94.1: #107848# Start- and EndElement are needed here to set the inside_deleted_section flag at the corresponding TextImportHelper
2003-04-08 14:29:49 +00:00
Jens-Heiner Rechtien
00b722f8b9 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 17:21:03 +00:00
Michael Brauer
e767bb081e #100400#: export dummy headings to keep chapter numbering in master docs 2002-12-05 08:58:07 +00:00
Michael Brauer
0ec0670c50 #104647#: z-order for OLE objects 2002-11-25 16:11:55 +00:00
Daniel Vogelheim
0208d49561 #103096# enable proper number format handling for text fields
- previously, all text fields would write a number format with the current
  language
- previously, all text fields actually ignored that.

Now that this is changed, text fields with the IsFixedLanguage property not set
will write a number format in the default language
2002-11-21 16:32:32 +00:00
Frank Schönheit
ac5f39553c #102407# (on behalf of BerryJia@openoffice.org) added context flag to ParaAdjust map entry 2002-11-06 09:31:32 +00:00
Christian Lippka
330fbe24de #99928# add defaults for font properties if needed 2002-11-04 07:37:38 +00:00
Michael Brauer
7e8a421166 #96627# hyperlinks and contore for embedded objects in flat files 2002-10-31 09:26:33 +00:00
Daniel Vogelheim
6cdc42b064 #98749# allow loading of empty bibliography brackets (saving already worked) 2002-10-30 09:17:55 +00:00
Christian Lippka
d770113f2b #99928# add defaults for font properties if needed 2002-10-28 14:58:38 +00:00
Daniel Vogelheim
eede329833 #104601# enable writing/reading of Writer defaults for WritingMode 2002-10-15 08:34:57 +00:00
Michael Brauer
3faf2121b6 #97165#: frames didn't keep height if their size type was AUTO 2002-10-10 11:27:38 +00:00