mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,405 Commits 1 Branch 0 Tags
ff127a7ac72a71488f899149a1fd64ee26c2f3a0
Commit Graph

125 Commits

Author SHA1 Message Date
Rüdiger Timm
5181280c34 INTEGRATION: CWS changefileheader (1.123.16); FILE MERGED 
2008/04/01 16:09:37 thb 1.123.16.3: #i85898# Stripping all external header guards
2008/04/01 13:04:38 thb 1.123.16.2: #i85898# Stripping all external header guards
2008/03/31 16:28:05 rt 1.123.16.1: #i87441# Change license header to LPGL v3.
 2008-04-10 20:41:23 +00:00
Kurt Zenker
bb9c4485d5 INTEGRATION: CWS dbodf11 (1.100.64); FILE MERGED 
2008/04/01 11:10:19 oj 1.100.64.4: RESYNC: (1.115-1.123); FILE MERGED
2007/12/19 12:49:02 oj 1.100.64.3: RESYNC: (1.112-1.115); FILE MERGED
2007/10/22 13:01:53 oj 1.100.64.2: RESYNC: (1.100-1.112); FILE MERGED
2007/02/02 12:10:46 oj 1.100.64.1: some new tokens for db
 2008-04-03 15:45:02 +00:00
Rüdiger Timm
3968b61ecf INTEGRATION: CWS impresstables2 (1.109.30); FILE MERGED 
2008/03/11 18:22:17 cl 1.109.30.7: RESYNC: (1.116-1.122); FILE MERGED
2008/03/06 18:12:11 cl 1.109.30.6: fixing merge errors
2008/02/24 00:21:38 cl 1.109.30.5: RESYNC: (1.115-1.116); FILE MERGED
2007/12/01 19:18:40 cl 1.109.30.4: RESYNC: (1.112-1.115); FILE MERGED
2007/11/29 18:50:16 cl 1.109.30.3: #i68103# working on table templates
2007/10/11 21:31:11 cl 1.109.30.2: RESYNC: (1.109-1.112); FILE MERGED
2007/09/20 15:11:47 cl 1.109.30.1: #i68103# table templates import
 2008-03-12 09:30:27 +00:00
Kurt Zenker
4dcc88680a INTEGRATION: CWS cjksp1_DEV300 (1.103.14); FILE MERGED 
2007/12/17 02:47:20 pflin 1.103.14.6: RESYNC: (1.112-1.115); FILE MERGED
2007/11/11 03:10:31 pflin 1.103.14.5: not write layout-grid-standard-mode inside the <style:page-layout>
2007/09/27 04:28:18 pflin 1.103.14.4: RESYNC: (1.105-1.112); FILE MERGED
2007/07/03 04:39:37 pflin 1.103.14.3: RESYNC: (1.104-1.105); FILE MERGED
2007/05/08 10:13:28 pflin 1.103.14.2: RESYNC: (1.103-1.104); FILE MERGED
2007/04/23 07:58:07 pflin 1.103.14.1: Text grid enhancement: support xml filter
 2008-03-07 15:17:03 +00:00
Kurt Zenker
89143347dc INTEGRATION: CWS chart20_DEV300 (1.116.6); FILE MERGED 
2008/02/21 15:59:49 bm 1.116.6.1: #i366# error bars from cell ranges
 2008-03-06 16:15:08 +00:00
Kurt Zenker
c2f1c964e1 #i10000# conflict fixed 2008-03-06 09:34:55 +00:00
Kurt Zenker
739df3d2ce INTEGRATION: CWS swnewlistlevelattrs_DEV300 (1.115.32); FILE MERGED 
2008/01/18 08:04:19 od 1.115.32.1: #i85348# tokens for new list level attributes
 2008-03-06 09:27:49 +00:00
Oliver Bolte
a294f08b81 INTEGRATION: CWS custommeta (1.115.12); FILE MERGED 
2008/02/26 10:33:32 mst 1.115.12.2: RESYNC: (1.115-1.116); FILE MERGED
2008/01/16 14:56:55 mst 1.115.12.1: remove import of obsolete text:user-info-0 elements
cvs archeology revealed these have never been written by a published OOo version
- xmloff/source/core/xmltoken.cxx, xmloff/inc/{xmlkywd.hxx,txtimp.hxx},
  xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/text/txtimp.cxx:
  + remove tokens user-info-[0-3]
  + remove XML_TOK_TEXT_DOCUMENT_INFORMATION_[0-3] from enum XMLTextPElemTokens
  + remove XML_USER_INFO[0-3]
- xmloff/source/text/txtfldi.cxx:
  + remove all handling of user-info-[0-3] tokens
  + fix bug: the fixed attribute of text:user-defined fields was ignored
 2008-02-26 12:34:59 +00:00
Oliver Bolte
eaf943c308 INTEGRATION: CWS swcrossref01_DEV300 (1.111.4); FILE MERGED 
2007/12/03 09:26:23 od 1.111.4.3: RESYNC: (1.112-1.115); FILE MERGED
2007/10/01 10:51:47 od 1.111.4.2: RESYNC: (1.111-1.112); FILE MERGED
merge conflict resolved.
2007/09/17 12:41:52 od 1.111.4.1: #i81002# new strng for new XML tokens XML_NUMBER_NO_SUPERIOR and
	 XML_NUMBER_ALL_SUPERIOR
 2008-02-26 10:01:01 +00:00
Rüdiger Timm
f80b525278 INTEGRATION: CWS chart19 (1.113.10); FILE MERGED 
2007/12/18 13:44:21 bm 1.113.10.2: RESYNC: (1.113-1.115); FILE MERGED
2007/12/15 14:35:10 iha 1.113.10.1: #i16776# starting angle for pie charts
 2008-02-18 14:34:20 +00:00
Ivo Hinkelmann
449c73b523 INTEGRATION: CWS chart17 (1.112.12); FILE MERGED 
2007/11/05 14:43:53 iha 1.112.12.3: #i63857#, #i4039# more flexible placement of data point labels, best fit for pie labels
2007/10/30 13:55:01 bm 1.112.12.2: RESYNC: (1.112-1.113); FILE MERGED
2007/10/12 12:38:51 bm 1.112.12.1: #i7998# equations for regression curves
 2007-11-23 11:18:23 +00:00
Rüdiger Timm
46b603d0bd INTEGRATION: CWS dbodf12import (1.112.24); FILE MERGED 
2007/11/01 09:18:12 oj 1.112.24.1: #i83190# new token for odf 12 database
 2007-11-09 07:10:50 +00:00
Vladimir Glazounov
7c25a23299 INTEGRATION: CWS chart14 (1.110.10); FILE MERGED 
2007/10/02 08:42:52 bm 1.110.10.6: #i26795# export Property GroupBarPerAxis as group-bars-per-axis attribute
2007/09/28 10:38:15 iha 1.110.10.5: #i82051# Allow to display each part of a data label in a separate line
2007/09/24 11:29:16 bm 1.110.10.4: RESYNC: (1.110-1.112); FILE MERGED
2007/09/20 11:34:59 iha 1.110.10.3: #i24614# enable reverse scales
2007/09/20 07:38:04 iha 1.110.10.2: #i43489# allow to display value and percentage at the same time
2007/08/10 21:58:04 iha 1.110.10.1: #i37792# number format for data labels
 2007-10-22 15:34:55 +00:00
Vladimir Glazounov
f1fb2f54e6 INTEGRATION: CWS navorder (1.105.22); FILE MERGED 
2007/07/05 14:34:18 af 1.105.22.2: RESYNC: (1.105-1.107); FILE MERGED
2007/06/21 13:35:44 cl 1.105.22.1: #i68097# added draw:nav-order attribute
 2007-08-28 12:34:08 +00:00
Ivo Hinkelmann
d4d2b98d0d INTEGRATION: CWS calcodfrng (1.110.2); FILE MERGED 
2007/08/07 14:39:31 er 1.110.2.1: #i80033# ODF RNG: table:dependency instead of table:dependence
 2007-08-20 15:32:17 +00:00
Jens-Heiner Rechtien
5bd5657af9 INTEGRATION: CWS oasisrng03 (1.105.48); FILE MERGED 
2007/08/01 22:16:59 cl 1.105.48.3: RESYNC: (1.107-1.109); FILE MERGED
2007/07/10 08:47:18 ama 1.105.48.2: RESYNC: (1.105-1.107); FILE MERGED
Resync conflict solved
2007/07/02 14:18:25 ama 1.105.48.1: #139736#: page-continuation
 2007-08-03 11:53:36 +00:00
Rüdiger Timm
ae1c7ed386 INTEGRATION: CWS swsoftpagebreak (1.105.4); FILE MERGED 
2007/06/22 12:49:55 ama 1.105.4.2: Fix #i78650#: Use soft page breaks
2007/06/19 10:49:41 ama 1.105.4.1: #i78650#: Soft page break
 2007-07-06 11:21:09 +00:00
Rüdiger Timm
88c16bb6d4 INTEGRATION: CWS oj14 (1.100.14); FILE MERGED 
2007/06/04 18:04:17 oj 1.100.14.9: RESYNC: (1.103-1.105); FILE MERGED
2007/04/25 08:18:21 oj 1.100.14.8: correct order
2007/04/18 08:28:19 oj 1.100.14.7: RESYNC: (1.102-1.103); FILE MERGED
2007/03/15 14:53:29 oj 1.100.14.6: renaming of token
2007/03/05 06:45:55 oj 1.100.14.5: rename attribute
2007/02/21 07:09:27 oj 1.100.14.4: new token
2007/02/20 12:01:29 oj 1.100.14.3: rename element
2006/12/19 14:00:42 oj 1.100.14.2: two new tokens
2006/11/07 19:15:43 oj 1.100.14.1: correct vector usage and new token
 2007-07-06 08:43:54 +00:00
Rüdiger Timm
1dbe335cf6 INTEGRATION: CWS chart06 (1.105.12); FILE MERGED 
2007/06/11 09:01:05 iha 1.105.12.1: #i67754# right-angled-axes option for 3D charts
 2007-07-03 12:22:45 +00:00
Jens-Heiner Rechtien
cd76425d69 INTEGRATION: CWS vgbugs07 (1.105.14); FILE MERGED 
2007/06/04 13:23:22 vg 1.105.14.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
 2007-06-27 13:58:26 +00:00
Vladimir Glazounov
ee49177793 INTEGRATION: CWS chart2mst3 (1.97.40); FILE MERGED 
2007/04/24 21:37:00 bm 1.97.40.4: RESYNC: (1.102-1.104); FILE MERGED
2006/11/24 21:25:45 bm 1.97.40.3: RESYNC: (1.99-1.100); FILE MERGED
2006/10/19 10:06:18 bm 1.97.40.2: RESYNC: (1.97-1.99); FILE MERGED
2006/08/24 14:46:27 iha 1.97.40.1: #i46521# replace modal x value sorting dialog by a checkbox in the chartwizard; perform sorting in view only and not in cached data
 2007-05-22 15:10:02 +00:00
Ivo Hinkelmann
eaf9c4ca23 INTEGRATION: CWS impressrng01_SRC680 (1.100.16); FILE MERGED 
2007/04/04 12:12:56 thb 1.100.16.1: #i76080# Fixed typo in token list (extraneous space)
 2007-04-16 12:09:06 +00:00
Oliver Bolte
98e02caeb1 INTEGRATION: CWS hb02 (1.100.54); FILE MERGED 
2007/02/05 16:25:45 hbrinkm 1.100.54.1: #144146# new tokens help and hint
 2007-03-09 12:04:58 +00:00
Rüdiger Timm
e3fd43983a #i10000# Reverted last commit. Should have gone to a CWS, not into HEAD directly. 2007-02-01 08:26:54 +00:00
Henning Brinkmann
c55ddfbb98 #144146# XMLTextFieldExport: new attributes: text:hint, text:help 2007-01-30 13:50:24 +00:00
Jens-Heiner Rechtien
5b2bccf292 INTEGRATION: CWS impress108 (1.98.6); FILE MERGED 
2006/09/28 11:33:38 sj 1.98.6.1: #140293# fixed typo
 2006-10-24 12:33:59 +00:00
Oliver Bolte
30b6adc99e INTEGRATION: CWS opofxmlstorage (1.97.126); FILE MERGED 
2006/08/16 15:59:28 mav 1.97.126.1: #i68684# support iconified objects
 2006-10-13 09:59:05 +00:00
Oliver Bolte
0385d54dca INTEGRATION: CWS pchfix02 (1.97.130); FILE MERGED 
2006/09/01 17:59:30 kaib 1.97.130.1: #i68856# Added header markers and pch files
 2006-09-17 09:24:00 +00:00
Rüdiger Timm
d477d61f26 INTEGRATION: CWS knumber (1.95.44); FILE MERGED 
2005/11/14 08:58:49 flr 1.95.44.1: #i52127# implement first step of numbered-paragraph
 2005-11-14 08:12:56 +00:00
Rüdiger Timm
499cc52031 INTEGRATION: CWS swnumtree (1.95.2); FILE MERGED 
2005/10/10 11:31:10 od 1.95.2.2: #i45784# - adjustment to make this change compatible
2005/09/27 15:26:42 hbrinkm 1.95.2.1: #i45784# restart-numbering
 2005-11-08 16:05:41 +00:00
Rüdiger Timm
a2df5c06f5 INTEGRATION: CWS ooo19126 (1.94.66); FILE MERGED 
2005/09/05 14:38:38 rt 1.94.66.1: #i54170# Change license header: remove SISSL
 2005-09-09 12:39:01 +00:00
Rüdiger Timm
2f17ba6a29 INTEGRATION: CWS swqbugfixes32 (1.93.30); FILE MERGED 
2005/05/13 08:33:30 od 1.93.30.1: #i49139# - replace XML tokens XML_HORIZONTAL_ON_LEFT_PAGES and
	   XML_HORIZONTAL_ON_RIGHT_PAGES by XML_HORIZONTAL_ON_EVEN
	   and XML_HORIZONTAL_ON_ODD
 2005-05-18 08:44:09 +00:00
Rüdiger Timm
267a643f54 INTEGRATION: CWS dr34 (1.89.6); FILE MERGED 
2005/03/11 17:26:41 dr 1.89.6.2: RESYNC: (1.89-1.90); FILE MERGED
2005/03/07 11:24:17 sab 1.89.6.1: #i44052#; don't remove tokens while scheduling
 2005-03-29 12:21:16 +00:00
Rüdiger Timm
b85cb5681a INTEGRATION: CWS groupingapi (1.68.16); FILE MERGED 
2005/03/11 20:09:35 sab 1.68.16.6: RESYNC: (1.85-1.90); FILE MERGED
2005/01/27 13:22:56 sab 1.68.16.5: RESYNC: (1.84-1.85); FILE MERGED
2005/01/07 10:10:53 sab 1.68.16.4: #i33817#, solve merge conflicts
2005/01/06 11:27:25 sab 1.68.16.3: RESYNC: (1.69-1.84); FILE MERGED
2004/09/06 10:44:15 sab 1.68.16.2: RESYNC: (1.68-1.69); FILE MERGED
2004/09/03 18:03:11 sab 1.68.16.1: #i33817#; add grouping API
 2005-03-29 11:48:55 +00:00
Vladimir Glazounov
104cb57450 INTEGRATION: CWS eforms4 (1.84.40); FILE MERGED 
2005/03/21 14:22:11 dvo 1.84.40.4: RESYNC: (1.89-1.90); FILE MERGED
2005/03/08 16:14:15 dvo 1.84.40.3: RESYNC: (1.87-1.89); FILE MERGED
2005/02/18 14:38:46 dvo 1.84.40.2: RESYNC: (1.84-1.87); FILE MERGED
2005/01/19 18:02:12 dvo 1.84.40.1: #i35399# recognize all XForms namespace URIs
 2005-03-23 10:24:34 +00:00
Vladimir Glazounov
f40551c814 INTEGRATION: CWS oasisbf5 (1.87.24); FILE MERGED 
2005/02/18 11:29:29 mib 1.87.24.2: #i42834#: xforms:submission renamed to form:xforms-submission
2005/02/15 13:52:38 mib 1.87.24.1: #i42834#: new SVG, XSL_FO and SMIL namespaces
 2005-03-08 14:09:52 +00:00
Vladimir Glazounov
60f4216033 INTEGRATION: CWS swqcore06 (1.85.16); FILE MERGED 
2005/02/10 13:01:08 hbrinkm 1.85.16.2: RESYNC: (1.85-1.87); FILE MERGED
2005/02/07 21:05:45 dvo 1.85.16.1: #i42220# load/save text:is-list-header flag
 2005-02-22 08:58:45 +00:00
Vladimir Glazounov
b2fb833ca8 INTEGRATION: CWS sj15 (1.85.22); FILE MERGED 
2005/02/04 17:12:35 sj 1.85.22.2: RESYNC: (1.85-1.87); FILE MERGED
2005/02/03 18:54:03 sj 1.85.22.1: #i41918# changed property name text-path-scale-x to text-path-scale
 2005-02-21 15:03:27 +00:00
Rüdiger Timm
4cd2d0688b INTEGRATION: CWS impress30 (1.85.2); FILE MERGED 
2005/01/19 15:15:50 bm 1.85.2.1: #i40657# token topLeftVertical (a smil subtype) was missing
 2005-01-28 14:35:26 +00:00
Rüdiger Timm
4d7dcdd23e INTEGRATION: CWS oasisbf4 (1.84.12); FILE MERGED 
2005/01/21 13:32:55 mib 1.84.12.3: RESYNC: (1.84-1.85); FILE MERGED
2004/12/14 16:27:56 sab 1.84.12.2: #i36650#; fix it again
2004/12/14 14:46:20 sab 1.84.12.1: #i36352#; fix it again
 2005-01-27 10:08:47 +00:00
Kurt Zenker
b196aa0e27 INTEGRATION: CWS impress25 (1.84.16); FILE MERGED 
2004/12/10 14:01:27 cl 1.84.16.1: #i38644# fixed namespace for smil
 2005-01-14 10:59:24 +00:00
Oliver Bolte
78eff56e97 #i10000# XML_BASE defined dublicate 2004-11-29 11:05:06 +00:00
Jens-Heiner Rechtien
5f8bf40b33 INTEGRATION: CWS swqcore01 (1.70.30); FILE MERGED 
2004/11/27 10:12:34 os 1.70.30.4: RESYNC: (1.73-1.78); FILE MERGED
2004/11/23 14:47:50 dvo 1.70.30.3: #i28755# main-entry (fix merge failure)
2004/11/17 14:34:23 hbrinkm 1.70.30.2: RESYNC: (1.70-1.73); FILE MERGED
2004/11/17 11:12:27 dvo 1.70.30.1: #i28755# handle text:main-etry (OOo) to text:main-entry (OASIS)
 2004-11-27 10:37:47 +00:00
Jens-Heiner Rechtien
111140ca13 INTEGRATION: CWS sysint1 (1.71.4); FILE MERGED 
2004/11/16 14:14:39 mib 1.71.4.1: #118415#: modified namespace URN
 2004-11-26 20:59:17 +00:00
Rüdiger Timm
d862fcdcc4 INTEGRATION: CWS presentationengine01 (1.52.14); FILE MERGED 
2004/11/22 23:09:10 thb 1.52.14.15: #i10000# Resolving merge problems: XMLImpressImport* no longer in the master version, removed
2004/11/17 19:08:04 thb 1.52.14.14: RESYNC: (1.69-1.73); FILE MERGED
2004/10/13 17:58:38 thb 1.52.14.13: #i10000# Removed merge artifact (introduced duplicate declaration of XML_DIAMOND token)
2004/10/12 22:21:41 thb 1.52.14.12: RESYNC: (1.68-1.69); FILE MERGED
2004/10/04 19:13:46 thb 1.52.14.11: #i34946# Added missing subtypes for slide transitions
2004/09/23 15:56:09 cl 1.52.14.10: final smil xml spec changes
2004/09/22 16:43:25 cl 1.52.14.9: smil spec update
2004/08/31 18:46:20 cl 1.52.14.8: added missing transition types and subtypes
2004/08/23 08:39:19 cl 1.52.14.7: resolved merge conflicts
2004/07/28 10:39:55 cl 1.52.14.6: fixes
2004/07/27 20:24:01 cl 1.52.14.5: fixes
2004/07/23 12:16:17 thb 1.52.14.4: RESYNC: (1.58-1.62); FILE MERGED
2004/07/06 12:52:19 thb 1.52.14.3: RESYNC: (1.52-1.58); FILE MERGED
2004/06/18 14:43:29 cl 1.52.14.2: initial after effect support
2004/04/16 12:43:42 cl 1.52.14.1: smil support for impress
 2004-11-26 18:30:53 +00:00
Rüdiger Timm
7e69244b6a INTEGRATION: CWS sj12 (1.70.4); FILE MERGED 
2004/11/16 17:48:28 sj 1.70.4.3: RESYNC: (1.70-1.73); FILE MERGED
2004/11/02 17:41:29 sj 1.70.4.2: #i36003,i36002# file format changes for custom shapes
2004/10/22 13:56:21 sj 1.70.4.1: #i36002# file format changes for custom shapes
 2004-11-26 13:09:14 +00:00
Rüdiger Timm
9b9a987eed INTEGRATION: CWS oasisbf2 (1.70.2); FILE MERGED 
2004/11/26 11:04:54 mib 1.70.2.6: RESYNC: (1.70-1.78); FILE MERGED
2004/11/03 14:15:53 mib 1.70.2.5: #i36525#: display error message for root elements with unknown namespace
2004/10/29 16:23:14 sab 1.70.2.4: #i36352#; correct spelling mistake
2004/10/28 11:56:44 sab 1.70.2.3: #i35794#; change attribute names
2004/10/26 14:59:49 mib 1.70.2.2: #i12228#: store default outline styles
2004/10/20 06:53:03 od 1.70.2.1: #i35017# - adjust tokens for com::sun::stat::text::WrapInfluenceOnPosition
 2004-11-26 11:58:56 +00:00
Rüdiger Timm
829d1f19a0 #i10000# Merge error: XML_READONLY was duplicate in source/core/xmltoken.cxx 2004-11-25 15:47:08 +00:00
Oliver Bolte
b6fa37af49 #i10000# solve wrong confict solving of merge problems, add change of CWS oasisbf3 2004-11-23 08:39:48 +00:00
Oliver Bolte
2d8e9c5f9f INTEGRATION: CWS eforms2 (1.48.22); FILE MERGED 
2004/11/07 02:01:06 dvo 1.48.22.11: RESYNC: (1.69-1.70); FILE MERGED
2004/10/08 12:20:57 dvo 1.48.22.10: RESYNC: (1.68-1.69); FILE MERGED
2004/08/17 15:03:57 dvo 1.48.22.9: #i31958# no double entries in enum
2004/08/16 19:56:12 dvo 1.48.22.8: RESYNC: (1.62-1.68); FILE MERGED
2004/07/27 12:06:33 fs 1.48.22.7: RESYNC: (1.58-1.62); FILE MERGED
2004/07/13 15:13:53 dvo 1.48.22.6: #114856# load data types from Schema fragements
2004/06/25 09:53:57 dvo 1.48.22.5: RESYNC: (1.54-1.58); FILE MERGED
2004/04/08 10:24:09 dvo 1.48.22.4: RESYNC: (1.51-1.54); FILE MERGED
2004/04/07 13:24:48 dvo 1.48.22.3: #114856# load/save <xforms:submission>
2004/03/16 19:05:49 dvo 1.48.22.2: RESYNC: (1.48-1.51); FILE MERGED
2004/01/28 14:47:15 dvo 1.48.22.1: #114856# add XForms token
 2004-11-16 13:00:00 +00:00