Commit Graph

439 Commits

Author SHA1 Message Date
Vladimir Glazounov
91fbb01bbe INTEGRATION: CWS sw011 (1.33.12); FILE MERGED
2003/04/11 07:09:27 od 1.33.12.1: #108698# <SwTabFrm::MakeAll()> - join all follows, which are placed on the same page/column
2003-04-17 15:08:04 +00:00
Vladimir Glazounov
118dfcf180 INTEGRATION: CWS sw011 (1.22.2.2.26); FILE MERGED
2003/04/11 13:21:35 od 1.22.2.2.26.3: #108824# <SwFrm::GetPrevSctLeaf(..)> - consider zombie sections, but investigate next frames of found zombie section
2003/04/11 07:06:46 fme 1.22.2.2.26.2: #108619# #108745# Fly frames and footer loops
2003/04/07 10:48:25 od 1.22.2.2.26.1: #108446# - <SwSectionFrm::CalcFtnCntnt()> - consider that footnote/endnote can move; include changes from 108339
2003-04-17 15:07:52 +00:00
Vladimir Glazounov
a9b6109c0d INTEGRATION: CWS sw011 (1.2.174); FILE MERGED
2003/04/02 15:32:51 fme 1.2.174.1: #102759# You cannot trust the frame sizes stored in the layout cache
2003-04-17 15:07:40 +00:00
Vladimir Glazounov
9fea8bf859 INTEGRATION: CWS sw011 (1.10.146); FILE MERGED
2003/04/11 07:18:27 od 1.10.146.2: #108698# <SwLayHelper::CheckInsert(..) - improve split heuristic for bug table and split big table even its the first
2003/04/02 15:32:51 fme 1.10.146.1: #102759# You cannot trust the frame sizes stored in the layout cache
2003-04-17 15:07:29 +00:00
Vladimir Glazounov
3df5fc70b9 INTEGRATION: CWS sw011 (1.11.12); FILE MERGED
2003/04/14 08:53:20 od 1.11.12.2: #108719# <SwHeadFootFrm::GrowFrm(..)/ShrinkFrm(..)> - notify fly frames only for header frames height change.
2003/04/11 07:32:05 od 1.11.12.1: #108719# <SwHeadFootFrm::GrowFrm(..)/ShrinkFrm(..)> - notify fly frames of header/footer height change, if necessary
2003-04-17 15:07:18 +00:00
Vladimir Glazounov
c76dc0f9d8 INTEGRATION: CWS sw011 (1.18.146); FILE MERGED
2003/04/07 10:45:41 od 1.18.146.1: #108446# - extend <SwFtnBossFrm::CollectFtns(..)> and <SwFtnBossFrm::_CollectFtns(..)>
2003-04-17 15:07:07 +00:00
Vladimir Glazounov
ca05d1156e INTEGRATION: CWS sw011 (1.41.2.1.66); FILE MERGED
2003/04/11 07:06:45 fme 1.41.2.1.66.2: #108619# #108745# Fly frames and footer loops
2003/04/07 10:43:02 od 1.41.2.1.66.1: #108446# - include fix for task 108339
2003-04-17 15:06:56 +00:00
Vladimir Glazounov
0c823103c6 INTEGRATION: CWS sw011 (1.15.2.1.104); FILE MERGED
2003/04/07 10:40:34 od 1.15.2.1.104.1: #108446# <SwFrm::_FindNext()> - check for endnote, only if dedicated found next isn't contained in a section, which collects its endnotes
2003-04-17 15:06:34 +00:00
Vladimir Glazounov
9ed4cc4545 INTEGRATION: CWS sw011 (1.33.2.2.66); FILE MERGED
2003/04/11 13:17:56 od 1.33.2.2.66.2: #108824# <SwCntntFrm::_WouldFit(..)> - warning and return TRUE, if last follow of <this> isn't valid on checking next for keep attribute
2003/04/07 10:35:15 od 1.33.2.2.66.1: #108446# <SwCntntFrm::MakeAll()> - direct move forward after text formatting, if text formatting detects the necessity of the move forward
2003-04-17 15:06:21 +00:00
Vladimir Glazounov
ad82756171 INTEGRATION: CWS os8 (1.38.2.2.20); FILE MERGED
2003/04/03 07:11:06 os 1.38.2.2.20.1: #108583# precompiled headers removed
2003-04-17 13:16:40 +00:00
Vladimir Glazounov
3d2e0705a3 INTEGRATION: CWS os8 (1.6.138); FILE MERGED
2003/04/03 07:11:05 os 1.6.138.1: #108583# precompiled headers removed
2003-04-17 13:16:27 +00:00
Vladimir Glazounov
b2d683c321 INTEGRATION: CWS os8 (1.1.1.1.182); FILE MERGED
2003/04/03 07:11:05 os 1.1.1.1.182.1: #108583# precompiled headers removed
2003-04-17 13:16:15 +00:00
Vladimir Glazounov
68ffa9684a INTEGRATION: CWS os8 (1.25.2.3.48); FILE MERGED
2003/04/03 07:11:04 os 1.25.2.3.48.1: #108583# precompiled headers removed
2003-04-17 13:16:02 +00:00
Vladimir Glazounov
fb1ac70632 INTEGRATION: CWS os8 (1.31.2.3.20); FILE MERGED
2003/04/07 22:15:10 os 1.31.2.3.20.2: RESYNC: (1.31.2.3-1.33); FILE MERGED
2003/04/03 07:11:04 os 1.31.2.3.20.1: #108583# precompiled headers removed
2003-04-17 13:15:49 +00:00
Vladimir Glazounov
dd964c72ea INTEGRATION: CWS os8 (1.31.138); FILE MERGED
2003/04/03 07:11:04 os 1.31.138.1: #108583# precompiled headers removed
2003-04-17 13:15:37 +00:00
Vladimir Glazounov
06ea859fae INTEGRATION: CWS os8 (1.22.2.2.20); FILE MERGED
2003/04/03 07:11:03 os 1.22.2.2.20.1: #108583# precompiled headers removed
2003-04-17 13:15:25 +00:00
Vladimir Glazounov
fba14cabdf INTEGRATION: CWS os8 (1.56.2.9.18); FILE MERGED
2003/04/07 22:14:58 os 1.56.2.9.18.2: RESYNC: (1.56.2.9-1.58); FILE MERGED
2003/04/03 07:11:02 os 1.56.2.9.18.1: #108583# precompiled headers removed
2003-04-17 13:15:09 +00:00
Vladimir Glazounov
b4c13609bb INTEGRATION: CWS os8 (1.2.146); FILE MERGED
2003/04/07 22:14:51 os 1.2.146.2: RESYNC: (1.2-1.3); FILE MERGED
2003/04/03 07:11:02 os 1.2.146.1: #108583# precompiled headers removed
2003-04-17 13:14:40 +00:00
Vladimir Glazounov
27d4eb20e0 INTEGRATION: CWS os8 (1.24.2.2.48); FILE MERGED
2003/04/03 07:11:01 os 1.24.2.2.48.1: #108583# precompiled headers removed
2003-04-17 13:14:24 +00:00
Vladimir Glazounov
125f15b852 INTEGRATION: CWS os8 (1.17.148); FILE MERGED
2003/04/03 07:11:01 os 1.17.148.1: #108583# precompiled headers removed
2003-04-17 13:14:10 +00:00
Vladimir Glazounov
52b3b1338a INTEGRATION: CWS os8 (1.4.160); FILE MERGED
2003/04/03 07:11:00 os 1.4.160.1: #108583# precompiled headers removed
2003-04-17 13:13:58 +00:00
Vladimir Glazounov
5640171417 INTEGRATION: CWS os8 (1.2.170); FILE MERGED
2003/04/03 07:11:00 os 1.2.170.1: #108583# precompiled headers removed
2003-04-17 13:13:47 +00:00
Vladimir Glazounov
826c7b1f2e INTEGRATION: CWS os8 (1.10.138); FILE MERGED
2003/04/03 07:11:00 os 1.10.138.1: #108583# precompiled headers removed
2003-04-17 13:13:35 +00:00
Vladimir Glazounov
befcdacf28 INTEGRATION: CWS os8 (1.23.2.1.48); FILE MERGED
2003/04/07 22:14:40 os 1.23.2.1.48.2: RESYNC: (1.23.2.1-1.25); FILE MERGED
2003/04/03 07:10:59 os 1.23.2.1.48.1: #108583# precompiled headers removed
2003-04-17 13:13:22 +00:00
Vladimir Glazounov
9299c8bf57 INTEGRATION: CWS os8 (1.10.4.1.58); FILE MERGED
2003/04/03 07:10:59 os 1.10.4.1.58.1: #108583# precompiled headers removed
2003-04-17 13:13:09 +00:00
Vladimir Glazounov
ae76a54a44 INTEGRATION: CWS os8 (1.18.138); FILE MERGED
2003/04/03 07:10:58 os 1.18.138.1: #108583# precompiled headers removed
2003-04-17 13:12:56 +00:00
Vladimir Glazounov
b0fccf9ff0 INTEGRATION: CWS os8 (1.41.2.1.58); FILE MERGED
2003/04/03 07:10:58 os 1.41.2.1.58.1: #108583# precompiled headers removed
2003-04-17 13:12:43 +00:00
Vladimir Glazounov
cf584cb73d INTEGRATION: CWS os8 (1.1.1.1.182); FILE MERGED
2003/04/03 07:10:58 os 1.1.1.1.182.1: #108583# precompiled headers removed
2003-04-17 13:12:32 +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
Vladimir Glazounov
8e5b134d90 INTEGRATION: CWS os8 (1.4.144); FILE MERGED
2003/04/03 07:10:57 os 1.4.144.1: #108583# precompiled headers removed
2003-04-17 13:12:06 +00:00
Vladimir Glazounov
1496731592 INTEGRATION: CWS os8 (1.28.2.1.20); FILE MERGED
2003/04/03 07:10:56 os 1.28.2.1.20.1: #108583# precompiled headers removed
2003-04-17 13:11:54 +00:00
Vladimir Glazounov
1223a91e61 INTEGRATION: CWS os8 (1.37.2.2.48); FILE MERGED
2003/04/03 07:10:56 os 1.37.2.2.48.1: #108583# precompiled headers removed
2003-04-17 13:11:40 +00:00
Vladimir Glazounov
4bebbbc7cb INTEGRATION: CWS os8 (1.20.2.1.58); FILE MERGED
2003/04/03 07:10:55 os 1.20.2.1.58.1: #108583# precompiled headers removed
2003-04-17 13:11:29 +00:00
Vladimir Glazounov
832e0f9a6a INTEGRATION: CWS os8 (1.15.2.1.96); FILE MERGED
2003/04/03 07:10:55 os 1.15.2.1.96.1: #108583# precompiled headers removed
2003-04-17 13:11:19 +00:00
Vladimir Glazounov
c418f2fd6d INTEGRATION: CWS os8 (1.4.150); FILE MERGED
2003/04/03 07:10:54 os 1.4.150.1: #108583# precompiled headers removed
2003-04-17 13:11:05 +00:00
Vladimir Glazounov
99cd85556b INTEGRATION: CWS os8 (1.10.146); FILE MERGED
2003/04/03 07:10:54 os 1.10.146.1: #108583# precompiled headers removed
2003-04-17 13:10:53 +00:00
Vladimir Glazounov
6e4f267bcc INTEGRATION: CWS os8 (1.33.2.2.58); FILE MERGED
2003/04/03 07:10:54 os 1.33.2.2.58.1: #108583# precompiled headers removed
2003-04-17 13:10:41 +00:00
Vladimir Glazounov
f7fc4c03ae INTEGRATION: CWS os8 (1.36.4.1.48); FILE MERGED
2003/04/03 07:10:53 os 1.36.4.1.48.1: #108583# precompiled headers removed
2003-04-17 13:10:28 +00:00
Vladimir Glazounov
c49d959850 INTEGRATION: CWS sw009 (1.31.2.2.44); FILE MERGED
2003/04/03 10:39:40 hbrinkm 1.31.2.2.44.3: RESYNC: (1.31.2.2-1.31.2.3); FILE MERGED
2003/03/21 13:17:45 od 1.31.2.2.44.2: #108340# <SwTabFrm::Cut()> - init local variable <pSct>
2003/03/14 11:34:49 od 1.31.2.2.44.1: #i9040# <SwTabFrm::Format(..)> - adjustment for correct table alignment
2003-04-17 09:44:41 +00:00
Vladimir Glazounov
c3f6999c11 INTEGRATION: CWS sw009 (1.38.2.1.44); FILE MERGED
2003/04/03 10:39:12 hbrinkm 1.38.2.1.44.2: RESYNC: (1.38.2.1-1.38.2.2); FILE MERGED
2003/03/17 12:26:20 od 1.38.2.1.44.1: #i11760# <SwLayoutFrm::FormatWidthCols(..)> - adjust method call <CalcCntnt(..)> to avoid follow format of text frames
2003-04-17 09:12:48 +00:00
Vladimir Glazounov
726d2d45eb INTEGRATION: CWS sw009 (1.22.2.1.24); FILE MERGED
2003/04/03 10:39:34 hbrinkm 1.22.2.1.24.3: RESYNC: (1.22.2.1-1.22.2.2); FILE MERGED
2003/03/28 08:58:29 od 1.22.2.1.24.2: #i12711# <SwSectionFrm::MoveCntntAndDelete(..)> - check for parent section merge, even if section doesn't contain content
2003/03/25 13:50:43 od 1.22.2.1.24.1: #108339# <SwSectioFrm::SplitSect(..)> - correct determination of layout frame for restoring content
2003-04-17 09:12:26 +00:00
Vladimir Glazounov
4a0ed4a893 INTEGRATION: CWS sw009 (1.41.2.1.44); FILE MERGED
2003/04/01 06:35:10 fme 1.41.2.1.44.3: #108369# Calculation of scaling of OLE objects should be performed _after_ call of PrtOLENotify
2003/03/25 13:52:53 od 1.41.2.1.44.2: #108339# <_InsertCnt(..)> - init of section direct after insertion into layout
2003/03/24 15:56:09 dvo 1.41.2.1.44.1: #108116# to avoid problems with GCLines later, it is necessary for the document
         to always be in GCLines-clean state. To achieve this, the Layout will
         call GCLines on any new table it encounters. UpdateTblFlds ensures
         that formulas still work correctly.
2003-04-17 09:12:14 +00:00
Vladimir Glazounov
2e77db0cf7 INTEGRATION: CWS sw009 (1.37.2.2.26); FILE MERGED
2003/03/17 12:23:55 od 1.37.2.2.26.1: #i11760# <CalcCntnt(..)> - new paramter <bNoCalcFollow> to control follow format of text frames
2003-04-17 09:12:00 +00:00
Vladimir Glazounov
9d96175620 INTEGRATION: CWS dbgmacros1 (1.38.2.2.28); FILE MERGED
2003/04/10 09:01:18 kso 1.38.2.2.28.1: #108413# - debug macro unification.
2003-04-15 15:52:29 +00:00
Vladimir Glazounov
37870970cf INTEGRATION: CWS dbgmacros1 (1.31.2.3.28); FILE MERGED
2003/04/11 08:10:42 kso 1.31.2.3.28.2: RESYNC: (1.31.2.3-1.33); FILE MERGED
2003/04/10 09:01:17 kso 1.31.2.3.28.1: #108413# - debug macro unification.
2003-04-15 15:52:17 +00:00
Vladimir Glazounov
148f06b836 INTEGRATION: CWS dbgmacros1 (1.22.2.2.28); FILE MERGED
2003/04/10 09:01:16 kso 1.22.2.2.28.1: #108413# - debug macro unification.
2003-04-15 15:52:05 +00:00
Vladimir Glazounov
71832cb834 INTEGRATION: CWS dbgmacros1 (1.56.2.9.28); FILE MERGED
2003/04/10 09:01:15 kso 1.56.2.9.28.1: #108413# - debug macro unification.
2003-04-15 15:51:53 +00:00
Vladimir Glazounov
92f3f2860f INTEGRATION: CWS dbgmacros1 (1.2.180); FILE MERGED
2003/04/10 09:01:15 kso 1.2.180.1: #108413# - debug macro unification.
2003-04-15 15:51:39 +00:00
Vladimir Glazounov
7bb98ae2a2 INTEGRATION: CWS dbgmacros1 (1.10.148); FILE MERGED
2003/04/10 09:01:14 kso 1.10.148.1: #108413# - debug macro unification.
2003-04-15 15:51:27 +00:00
Vladimir Glazounov
9f9e922540 INTEGRATION: CWS dbgmacros1 (1.23.2.1.32); FILE MERGED
2003/04/10 18:00:41 kso 1.23.2.1.32.2: RESYNC: (1.23.2.1-1.25); FILE MERGED
2003/04/10 09:01:14 kso 1.23.2.1.32.1: #108413# - debug macro unification.
2003-04-15 15:51:16 +00:00