Commit Graph

52 Commits

Author SHA1 Message Date
Ivo Hinkelmann
de9f3f835b INTEGRATION: CWS swcolsel (1.41.122); FILE MERGED
2007/11/08 16:03:44 ama 1.41.122.7: RESYNC: (1.48-1.50); FILE MERGED
2007/10/05 16:03:07 ama 1.41.122.6: RESYNC: (1.47-1.48); FILE MERGED
Merge conflicts solved
2007/08/21 14:36:03 ama 1.41.122.5: RESYNC: (1.45-1.47); FILE MERGED
2007/06/18 13:04:35 ama 1.41.122.4: RESYNC: (1.43-1.45); FILE MERGED
2007/05/09 09:37:40 ama 1.41.122.3: RESYNC: (1.42-1.43); FILE MERGED
2007/04/11 10:10:02 ama 1.41.122.2: RESYNC: (1.41-1.42); FILE MERGED
Resync conflict solved
2007/03/01 14:59:38 ama 1.41.122.1: #i75024#: Column selection
2007-11-22 14:32:53 +00:00
Rüdiger Timm
0d39d39c3d INTEGRATION: CWS swqbf105 (1.47.6); FILE MERGED
2007/10/04 17:01:39 od 1.47.6.2: RESYNC: (1.47-1.48); FILE MERGED
2007/08/30 09:41:11 ama 1.47.6.1: Fix #i75008#: Put table frame into the right section frame
2007-11-07 11:17:47 +00:00
Jens-Heiner Rechtien
cf833d0f44 INTEGRATION: CWS sw8u9bf02_SRC680 (1.47.12); FILE MERGED
2007/10/18 11:58:26 ama 1.47.12.1: Fix #i82698#: Correct and restore row span attribute for table split
2007-11-02 13:41:12 +00:00
Jens-Heiner Rechtien
eec7370915 INTEGRATION: CWS sw8u9bf01_SRC680 (1.47.88); FILE MERGED
2007/09/25 08:52:53 ama 1.47.88.1: Fix #i81755': Do not merge different table models
2007-11-01 12:44:26 +00:00
Jens-Heiner Rechtien
9552b09258 INTEGRATION: CWS swwarnings (1.41.124); FILE MERGED
2007/08/24 08:16:20 tl 1.41.124.11: #i69287# warning-free code
2007/08/20 15:28:13 tl 1.41.124.10: RESYNC: (1.45-1.47); FILE MERGED
2007/05/29 11:22:40 os 1.41.124.9: RESYNC: (1.42-1.45); FILE MERGED
2007/04/13 11:15:14 tl 1.41.124.8: #i69287# warning-free code
2007/04/11 10:33:20 os 1.41.124.7: RESYNC: (1.41-1.42); FILE MERGED
2007/04/03 12:59:40 tl 1.41.124.6: #i69287# warning-free code
2007/03/09 15:27:14 ama 1.41.124.5: #i69287#: warning free code
2007/03/09 15:04:10 ama 1.41.124.4: #i69287#: warning free code
2007/03/09 09:53:10 ama 1.41.124.3: #i69287#: warning free code
2007/03/05 12:45:24 tl 1.41.124.2: #i69287# warning-free code
2007/02/22 15:06:27 tl 1.41.124.1: #i69287# warning-free code
2007-09-27 07:41:43 +00:00
Jens-Heiner Rechtien
91fd96fea3 INTEGRATION: CWS swqbf102 (1.45.102); FILE MERGED
2007/07/26 11:51:17 ama 1.45.102.1: Fix #80050#: Deletion of a complete table check adjusted
2007-07-31 16:40:51 +00:00
Oliver Bolte
b2dc2ef4f3 INTEGRATION: CWS os100 (1.45.90); FILE MERGED
2007/07/11 07:39:50 os 1.45.90.1: #i65257# text append and convert interfaces
2007-07-18 11:56:12 +00:00
Vladimir Glazounov
dff770ddb2 INTEGRATION: CWS chart2mst3 (1.40.24); FILE MERGED
2007/05/14 19:10:58 bm 1.40.24.9: RESYNC: (1.42-1.44); FILE MERGED
2007/03/09 15:05:31 bm 1.40.24.8: merged changed from CWS swnewtable
2007/02/16 15:18:04 tl 1.40.24.7: #i74540# handling multiple charts; GetChartDataProvider improved
2007/02/07 19:10:53 iha 1.40.24.6: RESYNC: (1.40-1.41); FILE MERGED
2007/02/02 11:24:01 tl 1.40.24.5: #i55007# automatic chart update
2007/01/29 14:06:54 tl 1.40.24.4: #i55007#, #i73791# automatic update for charts, and update charts for undo-actions
2006/12/12 16:43:12 tl 1.40.24.3: #i71244# update charts in writer
2006/12/11 15:23:37 tl 1.40.24.2: #i71244# update charts in writer
2006/11/10 13:47:53 tl 1.40.24.1: #i71245#, #i69313#; old chart removed, fixed incorrectly shown default chart
2007-05-22 15:26:23 +00:00
Kurt Zenker
bda95a30ab INTEGRATION: CWS pchfix04 (1.41.4); FILE MERGED
2007/04/26 00:12:34 hjs 1.41.4.2: RESYNC: (1.41-1.42); FILE MERGED
2007/02/05 08:27:20 os 1.41.4.1: #i73604# usage of ITEMID_* removed
2007-05-10 14:57:19 +00:00
Rüdiger Timm
69a8b4010b INTEGRATION: CWS residcleanup (1.41.142); FILE MERGED
2007/03/20 15:32:00 pl 1.41.142.2: RESYNC: (1.41-1.42); FILE MERGED
2007/03/04 17:02:54 pl 1.41.142.1: #i73635# ResId cleanup
2007-04-26 07:49:40 +00:00
Vladimir Glazounov
797d1457e8 INTEGRATION: CWS swnewtable (1.39.14); FILE MERGED
2007/02/07 12:50:07 ama 1.39.14.16: #i4032#: New table model
2007/02/06 12:47:38 ama 1.39.14.15: #i4032#: New table model
2007/01/09 10:42:15 fme 1.39.14.14: RESYNC: (1.40-1.41); FILE MERGED
2006/12/06 15:39:38 ama 1.39.14.13: #i4032#: New table model
2006/12/05 15:41:09 ama 1.39.14.12: #i4032#: New table model
2006/12/01 13:04:54 ama 1.39.14.11: i4032#: New table model
2006/12/01 09:06:44 ama 1.39.14.10: i4032#: New table model
2006/11/21 09:48:24 fme 1.39.14.9: RESYNC: (1.39-1.40); FILE MERGED
2006/11/20 16:14:44 ama 1.39.14.8: #i4032#: New Table Model
2006/11/15 15:33:12 fme 1.39.14.7: #i4032# New table concept
2006/11/14 14:22:59 ama 1.39.14.6: #i4032#: New table model
2006/10/25 14:32:39 ama 1.39.14.5: #i4032#: New Table Model
2006/10/24 12:21:00 ama 1.39.14.4: #i4032#: New Table Model
2006/10/13 11:45:52 ama 1.39.14.3: #i4032#: New Table Model
2006/10/09 15:26:34 ama 1.39.14.2: #i4032#: New table model
2006/10/02 14:36:58 ama 1.39.14.1: #i4032#: New table model
2007-02-28 14:42:29 +00:00
Rüdiger Timm
31b12647ae INTEGRATION: CWS swautomatic01 (1.36.82); FILE MERGED
2006/10/10 17:22:04 fme 1.36.82.5: RESYNC: (1.38-1.40); FILE MERGED
2006/09/01 12:19:51 fme 1.36.82.4: RESYNC: (1.37-1.38); FILE MERGED
2006/08/10 16:15:42 fme 1.36.82.3: RESYNC: (1.36-1.37); FILE MERGED
2006/08/09 08:56:31 fme 1.36.82.2: #i64576# Automatic styles
2006/08/01 15:00:03 fme 1.36.82.1: #i64576# Automatic styles
2006-12-01 14:42:06 +00:00
Vladimir Glazounov
5ce8a6e30a INTEGRATION: CWS osxpatchpool (1.38.14); FILE MERGED
2006/08/28 12:33:40 obr 1.38.14.1: #i68810# applied 2nd patch from issue (tra)
2006-09-25 08:27:05 +00:00
Oliver Bolte
a4bace2208 INTEGRATION: CWS pchfix02 (1.38.2); FILE MERGED
2006/09/01 17:51:31 kaib 1.38.2.1: #i68856# Added header markers and pch files
2006-09-16 20:00:54 +00:00
Jens-Heiner Rechtien
2b4e88719b INTEGRATION: CWS writercorehandoff (1.27.88); FILE MERGED
2006/05/08 12:59:39 fme 1.27.88.17: RESYNC: (1.35-1.36); FILE MERGED
2006/05/03 07:43:19 fme 1.27.88.16: #i50348# make SwDoc interface based
2006/04/28 13:32:21 fme 1.27.88.15: RESYNC: (1.33-1.35); FILE MERGED
2006/03/17 08:03:24 tra 1.27.88.14: RESYNC: (1.31-1.33); FILE MERGED
2005/12/20 15:09:31 tra 1.27.88.13: RESYNC: (1.30-1.31); FILE MERGED
2005/11/04 12:57:58 tra 1.27.88.12: #i50348#
2005/10/25 08:26:41 tra 1.27.88.11: RESYNC: (1.28-1.29); FILE MERGED
2005/10/24 16:01:16 tra 1.27.88.10: #50348#
2005/10/06 08:08:39 tra 1.27.88.9: #50348#
2005/09/28 14:00:23 tra 1.27.88.8: #i50348#
2005/09/21 13:42:10 tra 1.27.88.7: #i50348#
2005/09/13 13:27:22 tra 1.27.88.6: RESYNC: (1.27-1.28); FILE MERGED
2005/08/31 12:50:50 tra 1.27.88.5: #i50348# Introducing IDocumentRedlineAccess interface
2005/07/14 05:01:11 fme 1.27.88.4: #i50348# Make SwDoc accessible via interfaces
2005/07/11 05:11:39 tra 1.27.88.3: #i50348#make SwDoc interface based
2005/06/07 14:13:36 fme 1.27.88.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:27:17 tra 1.27.88.1: Unnecessary includes removed #i50348#
2006-08-14 15:04:41 +00:00
Ivo Hinkelmann
6f1f11b3b3 INTEGRATION: CWS swqbf76 (1.36.126); FILE MERGED
2006/07/26 14:01:22 fme 1.36.126.1: #138500# SetTabCols via API does not work correctly. Removed GetTabCols call from SetTabCols. The caller of SetTabCols is now responsible for passing the old SwTabCols
2006-08-03 12:55:56 +00:00
Rüdiger Timm
51eb03967a INTEGRATION: CWS tabledefaults (1.34.14); FILE MERGED
2006/04/24 14:08:39 fme 1.34.14.1: #i60422# New defaults for tables
2006-05-04 08:15:16 +00:00
Jens-Heiner Rechtien
2523b8da78 INTEGRATION: CWS redline01 (1.33.72); FILE MERGED
2006/03/30 11:42:36 ama 1.33.72.1: Fix #b6341295#: Undo and Redo of table insertion with redlining
2006-04-19 13:19:05 +00:00
Vladimir Glazounov
d2adf38ebc INTEGRATION: CWS swstability01 (1.33.4); FILE MERGED
2006/02/09 15:54:57 ama 1.33.4.1: #130880# Crash when undo table to text of "complex" tables
2006-03-31 08:51:21 +00:00
Rüdiger Timm
e0ce3441ff INTEGRATION: CWS swqbf51 (1.31.28); FILE MERGED
2006/01/19 13:20:06 fme 1.31.28.1: #i60818# GetTabRows: rFill can may have only one entry if row height < ROW_FUZZY
2006-02-06 16:19:27 +00:00
Kurt Zenker
7ae12e6183 INTEGRATION: CWS swqbf49 (1.30.64); FILE MERGED
2005/12/22 10:45:21 od 1.30.64.5: RESYNC: (1.30-1.31); FILE MERGED
2005/12/05 12:42:14 od 1.30.64.4: #i27138# - include frmsh.hxx for <SwFrm::GetShell()>
2005/12/05 10:35:21 od 1.30.64.3: #i27138# - call <ViewShell::InvalidateAccessibleParaFlowRelation(..)>
           only if accessible shell exists.
2005/12/05 10:10:05 od 1.30.64.2: #i27138# - call <ViewShell::InvalidateAccessibleParaFlowRelation(..)>
	   only if accessible shell exists.
2005/12/05 09:57:29 od 1.30.64.1: #i27138# - <SwTableNode::MakeFrms(..)> and <SwTableNode::DelFrms()>
	   notify accessible paragraphs about changed relation.
2006-02-01 13:22:09 +00:00
Rüdiger Timm
faf2c6e65e INTEGRATION: CWS numberformat (1.29.38); FILE MERGED
2005/10/26 17:50:34 kendy 1.29.38.1: #i55546#
The ULONG -> sal_uInt32 patches related to NumberFormat extracted from ooo64bit02 CWS.
2005-12-14 13:48:05 +00:00
Jens-Heiner Rechtien
e70e65aa74 INTEGRATION: CWS swqbf40 (1.27.214); FILE MERGED
2005/10/12 12:09:38 fme 1.27.214.4: #121591# Check if pBoxFrm is destroyed during GetTblSel
2005/10/11 10:21:26 od 1.27.214.3: RESYNC: (1.28-1.29); FILE MERGED
resolve merge conflict.
2005/09/21 12:27:29 fme 1.27.214.2: RESYNC: (1.27-1.28); FILE MERGED
2005/09/12 10:05:03 fme 1.27.214.1: #121591# There seem to be a case where ImplFindTabFrm in GetTabRows returns 0. Make code robust
2005-10-27 14:59:47 +00:00
Jens-Heiner Rechtien
f335146ab4 INTEGRATION: CWS swqbf35 (1.27.142); FILE MERGED
2005/09/22 15:16:57 fme 1.27.142.2: RESYNC: (1.27-1.28); FILE MERGED
2005/08/03 11:35:56 fme 1.27.142.1: #i52781# Table row resize with mouse did not work correctly with nested tables
2005-09-28 10:05:44 +00:00
Rüdiger Timm
236bffa442 INTEGRATION: CWS ooo19126 (1.27.224); FILE MERGED
2005/09/05 13:39:23 rt 1.27.224.1: #i54170# Change license header: remove SISSL
2005-09-09 02:22:02 +00:00
Rüdiger Timm
ea45fec165 INTEGRATION: CWS swtableredline (1.24.26); FILE MERGED
2005/03/04 18:43:14 dvo 1.24.26.2: RESYNC: (1.24-1.26); FILE MERGED
2004/11/24 19:01:34 dvo 1.24.26.1: #i17764# do not remove table redlines when making changes to table structures
(fix moved from CWS OS42)
2005-03-29 10:48:29 +00:00
Kurt Zenker
a2d1864f1c INTEGRATION: CWS swqbugfixes12 (1.25.62); FILE MERGED
2005/01/07 09:06:33 fme 1.25.62.1: #i39552# Collection of column boxes has to be performed at the beginning of GetTabRows because it may trigger the formatting of an invalid table frame
2005-01-21 09:30:20 +00:00
Jens-Heiner Rechtien
c75b56e916 INTEGRATION: CWS os42 (1.23.104); FILE MERGED
2004/11/27 08:55:25 os 1.23.104.3: RESYNC: (1.23-1.24); FILE MERGED
2004/11/19 12:05:25 os 1.23.104.2: #i17764# redline in tables disabled, again
2004/11/10 17:33:46 dvo 1.23.104.1: #i17764# do not remove table redlines when making changes to table structures
2004-11-27 11:30:08 +00:00
Jens-Heiner Rechtien
9d66c755fd INTEGRATION: CWS swqbugfixes08 (1.22.2); FILE MERGED
2004/10/11 09:31:47 fme 1.22.2.3: RESYNC: (1.22-1.23); FILE MERGED
2004/10/08 15:04:03 fme 1.22.2.2: #i33394# Pass id to StartUndo()
2004/09/28 14:40:11 fme 1.22.2.1: #i34471# Delete table cursor in TextToTable because it may be called from SwUndoTblToTxt::Repeat()
2004-11-09 12:44:51 +00:00
Kurt Zenker
922abaf183 INTEGRATION: CWS mav09 (1.19.14); FILE MERGED
2004/09/16 19:37:26 mav 1.19.14.3: RESYNC: (1.20-1.22); FILE MERGED
2004/07/08 11:09:53 mav 1.19.14.2: RESYNC: (1.19-1.20); FILE MERGED
2004/05/18 16:48:10 mba 1.19.14.1: RESYNC to m39
2004-10-04 18:04:47 +00:00
Jens-Heiner Rechtien
6091f1acaa INTEGRATION: CWS swundo03 (1.20.10); FILE MERGED
2004/07/19 17:42:33 hbrinkm 1.20.10.2: #115582#
2004/06/21 16:20:12 hbrinkm 1.20.10.1: i28006
2004-09-08 13:54:19 +00:00
Oliver Bolte
a31d060e33 INTEGRATION: CWS tune05 (1.20.54); FILE MERGED
2004/07/22 10:37:00 cmc 1.20.54.3: #i30554# unused SwDoc methods
2004/06/30 08:33:18 cmc 1.20.54.2: #i30554# CopyTblInTbl unused now
2004/06/24 08:45:56 cmc 1.20.54.1: #i30554# only one of the lcl_IsItemSet are in use
2004-08-12 11:20:32 +00:00
Kurt Zenker
b411b292fc INTEGRATION: CWS swautowidth (1.18.68); FILE MERGED
2004/04/05 13:09:04 fme 1.18.68.1: i27205# Feature - Automatic frame width
2004-05-18 13:49:33 +00:00
Rüdiger Timm
2869aface5 INTEGRATION: CWS gt03 (1.17.78); FILE MERGED
2004/04/16 08:12:46 fme 1.17.78.4: #26165# Feature - Multiple headline rows in tables
2004/04/08 11:13:26 gt 1.17.78.3: #i26167# repeated rows
2004/03/24 08:25:23 gt 1.17.78.2: RESYNC: (1.17-1.18); FILE MERGED
2004/03/11 14:55:01 fme 1.17.78.1: #26165# Feature - Multiple headline rows in tables
2004-05-03 12:44:26 +00:00
Kurt Zenker
e43ef2da3e INTEGRATION: CWS os27 (1.16.66); FILE MERGED
2004/02/20 14:16:51 fme 1.16.66.20: #i24134# Feature - Modify table rows with the ruler
2004/02/13 16:47:07 fme 1.16.66.19: RESYNC: (1.16-1.17); FILE MERGED
2004/02/05 14:00:44 fme 1.16.66.18: #i24134# Feature - Modify table rows with the ruler - Last changes
2004/02/04 10:44:52 fme 1.16.66.17: #i24134# Feature - Modify table rows with the ruler
2004/02/03 16:03:37 fme 1.16.66.16: #i24134# Feature - Modify table rows with the ruler
2004/02/03 10:06:13 fme 1.16.66.15: #i24134# Feature - Modify table rows with the ruler
2004/02/02 07:35:42 fme 1.16.66.14: #i24134# Feature - Modify table rows with the ruler
2004/01/30 10:51:53 fme 1.16.66.13: #i24134# Feature - Modify table rows with the ruler
2004/01/30 08:45:39 fme 1.16.66.12: #i24134# Feature - Modify table rows with the ruler
2004/01/28 17:01:56 fme 1.16.66.11: #i24134# Feature - Modify table rows with the ruler
2004/01/28 11:46:26 fme 1.16.66.10: #i24134# Feature - Modify table rows with the rule
2004/01/27 07:42:40 fme 1.16.66.9: #i24134# Feature - Modify table rows with the rules
2004/01/26 14:40:45 fme 1.16.66.8: #i24134# Feature - Modify table rows with the rules
2004/01/26 13:14:44 fme 1.16.66.7: #i24134# Feature - Modify table rows with the rules
2004/01/26 12:47:34 fme 1.16.66.6: #i24134# Feature - Modify table rows with the rules
2004/01/26 11:08:07 fme 1.16.66.5: #i24134# Feature - Modify table rows with the rules
2004/01/26 10:33:51 fme 1.16.66.4: #i24134# Feature - Modify table rows with the rules
2004/01/26 09:34:33 fme 1.16.66.3: #i24134# Feature - Modify table rows with the rules
2004/01/23 14:44:05 fme 1.16.66.2: #i24134# Feature - Modify table rows with the ruler
2004/01/23 07:50:24 fme 1.16.66.1: #i24134# Feature - Modify table rows with the ruler
2004-02-26 10:38:57 +00:00
Jens-Heiner Rechtien
91a27f8818 INTEGRATION: CWS ooo20031216 (1.16.16); FILE MERGED
2003/12/13 13:46:28 waratah 1.16.16.1: #i22535# remove the __DELETE macro it is redundant
2004-02-04 13:08:15 +00:00
Rüdiger Timm
f2f93f6bbd INTEGRATION: CWS ooo20031110 (1.15.36); FILE MERGED
2003/11/13 10:56:25 waratah 1.15.36.1: #i22301# correct the for scope problems in the code
2003-12-01 16:02:14 +00:00
Oliver Bolte
5c94356d32 INTEGRATION: CWS geordi2q04 (1.14.154); FILE MERGED
2003/09/02 10:38:00 rt 1.14.154.1: #111934#: Join CWS sw7pp1.
2003-09-04 10:46:37 +00:00
Vladimir Glazounov
b8a9021f22 INTEGRATION: CWS sw013 (1.13.16); FILE MERGED
2003/05/13 10:04:53 hbrinkm 1.13.16.1: #109161# InsertTable
2003-05-28 11:51:10 +00:00
Vladimir Glazounov
7a487c0080 INTEGRATION: CWS sw011 (1.4.2.4.2.3.66); FILE MERGED
2003/04/03 15:52:09 dvo 1.4.2.4.2.3.66.1: #108450# properly handle redlining when (auto-)changing cell formats
2003-04-17 15:05:15 +00:00
Vladimir Glazounov
a1e540c072 INTEGRATION: CWS os8 (1.4.2.4.2.3.58); FILE MERGED
2003/04/03 07:10:18 os 1.4.2.4.2.3.58.1: #108583# precompiled headers removed
2003-04-17 12:57:06 +00:00
Vladimir Glazounov
eb9a98d25b INTEGRATION: CWS sw009 (1.4.2.4.2.3.44); FILE MERGED
2003/03/27 15:14:40 dvo 1.4.2.4.2.3.44.1: #106741# take care of (UNO-)cursors when deleting tables
2003-04-17 09:10:18 +00:00
Jens-Heiner Rechtien
70de0c38fd MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 14:45:43 +00:00
Frank Meies
380a116410 #103485# SplitRows with equal height 2002-11-15 08:56:50 +00:00
Frank Meies
59d56bb006 #102112# Initial height for TextToTable tables in vertical environment 2002-09-16 13:25:30 +00:00
Oliver Specht
cb622cc36c #100553# notify uno wrappers about table deletion 2002-09-12 09:12:28 +00:00
Daniel Vogelheim
903aaf975b #98895# prevent GPF when copying tables with OLE nodes within the same document
(by providing a value for SwDoc::pRefForDocShell during the copy operation)
2002-04-24 08:32:38 +00:00
jp
9df6611201 Task #92287#: optimize code and runtine for get selected row/box structure of tables 2002-03-21 12:13:35 +00:00
Andreas Martens
bb83bd2fb7 Fix #96678#: Vertical ruler 2002-03-07 10:38:00 +00:00
jp
0e8bfa306a Bug #87818#: TextToTable - calculate the correct with and split the node at the correct position 2001-06-07 11:54:12 +00:00