Commit Graph

85 Commits

Author SHA1 Message Date
Oliver Bolte
aa91dc0ccb CWS-TOOLING: integrate CWS sw32numbf01
2009-09-04 10:01:07 +0200 od  r275780 : #i95907# method <SwWrtShell::NumOfBulletOn(..)>
	 - adjust indentation of newly created automatic list style
	   --> due to MRU add actual paragraph indentation to created automatic list style's indentation
2009-09-02 11:57:40 +0200 od  r275703 : #i95907# method <SwTxtMargin::CtorInitTxtMargin(..)>
	 - correct handling of paragraph indents, when list level indents are applicable.
2009-09-01 16:59:47 +0200 od  r275671 : CWS-TOOLING: rebase CWS sw32numbf01 to trunk@275331 (milestone: DEV300:m56)
2009-08-28 16:42:34 +0200 od  r275540 : #i102458# method <SwFlowFrm::CalcUpperSpace(..)>
          - correct handling of leading line spacing
          method <GetSpacingValuesOfFrm(..)>
	  - add output parameter <obIsLineSpacingProportional>
2009-08-27 17:03:07 +0200 od  r275496 : #i101516# method <SwTxtNode::SwTxtNode(..)>
	  - in case that the paragraph is add to a list, apply paragraph style's assigned
            outline style list level as list level, if paragraph has no list level set already.
2009-08-27 15:23:34 +0200 od  r275489 : #i101234# method <SwWrtShell::NumOrBulletOn(..)>
	  - check before activation of certain list level of outline numbering, 
	    a numbering format is already set. In this only continue the outline numbering.
2009-08-27 14:15:07 +0200 od  r275483 : #i95907# method <SwWrtShell::NumOrBulletOn(..)>
	 - consider leading tab stops and intentation of paragraph first text line,
           when a new list style is created for its application to the selection.
2009-08-26 09:51:39 +0200 od  r275401 : #i86492# Adjust copy of text nodes regarding lists
         - copy of part of paragraph in list does not copy list style and list id
         - copy of paragraphs in list into another list continues destination list
         - copy of paragraphs (at least one not in a list) at empty paragraph following a list
           does not continue the destination list. 
2009-08-25 10:30:53 +0200 od  r275339 : #i101349# method <XMLTextImportHelper::SetStyleAndAttrs(..)
	  - assure that list style of automatic paragraph style is applied at paragraph.
2009-09-08 13:44:38 +00:00
Release Engineers
4439427aad CWS-TOOLING: integrate CWS sw32bf02
2009-08-25 15:52:04 +0200 hde  r275366 : reactived testcases hit by issue 102752
2009-08-21 13:52:17 +0200 od  r275245 : #i102921# delete files whose deletion has been forgotten in cws impress172
2009-08-21 11:20:47 +0200 od  r275225 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@275001 (milestone: DEV300:m55)
2009-08-20 16:21:30 +0200 od  r275191 : #i92511# method <lcl_MoveAllLowerObjs(..)>
	 - invalidation of cache for object rectangle inclusive spaces is needed.
2009-08-20 15:50:40 +0200 od  r275188 : #i96726# method <SwPagePreView::DocSzChgd(..)>
	 - trigger recalculation of page preview layout even if the count of pages is not changing
2009-08-20 12:37:32 +0200 od  r275172 : #i100466# correction for showing and hiding redlines
2009-08-18 13:25:18 +0200 od  r275100 : #i103817# method <XMLTextImportHelper::SetStyleAndAttrs(..)
          - assure that a heading applies the outline style, if no other list style is applied.
2009-08-18 13:21:38 +0200 od  r275098 : #i103817# allow the outline style - list style for outline numbering - to be set directly at the paragraph
2009-08-17 14:13:02 +0200 od  r275052 : #i103684# add missing documentation for new optional OutlineLevel attribute introduced in OOo 3.1
2009-08-17 14:00:25 +0200 od  r275049 : #i100481# method <XMLTextFrameContext_Impl::CreateChildContext(..)>#
	  - correct condition for handling embedded documents and embedded math objects
2009-08-12 14:11:34 +0200 od  r274891 : #i97379# assure that columns are not applied to fly frames, which represent graphics or embedded objects
2009-08-12 12:51:43 +0200 od  r274889 : #i101870# method <SwTxtNode::_MakeNewTxtNode(..)>
	  - perform action on different paragraph styles before applying new paragraph style
2009-08-12 12:24:44 +0200 od  r274888 : #i101092# method <ViewShell::Paint(..)>
	  - encapsulate paint of document background and document into pre and post drawing layer paint calls
2009-08-12 11:38:48 +0200 od  r274886 : #i98766# minor adjustment in order to be warning free under Mac port builds
2009-08-12 11:33:54 +0200 od  r274885 : #i99267# method <SwTabFrm::MakeAll()>
	 - reset <bSplit> after forward move to assure that follows can be joined, if further space is available.
2009-08-12 11:11:49 +0200 od  r274882 : #i98766# method <ViewShell::SmoothScroll(..)
	 - disable smooth scroll for Mac port builds
2009-08-10 12:17:58 +0200 od  r274801 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@274622 (milestone: DEV300:m54)
2009-07-21 16:56:45 +0200 od  r274206 : #i103685# method <SwTxtFormatter::NewTabPortion(..)>
	  - adjust condition to apply automatic tab stop at left margin correctly
	    in case that tab stops are not relative to indent
2009-07-10 11:53:53 +0200 od  r273883 : #i102752 method <SwDrawContact::Modify(..)>
	 - assure that a ShapePropertyChangeNotifier exists
2009-07-07 12:01:58 +0200 mst  r273788 : #i103304# apply patch by dtardon to fix bogus conditional
2009-07-07 09:01:13 +0200 od  r273767 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@273468 (milestone: DEV300:m51)
2009-08-27 14:36:29 +00:00
Jens-Heiner Rechtien
62ebbb006b CWS-TOOLING: integrate CWS os131
2009-07-14 15:57:33 +0200 os  r273979 : #i103542# no access to members after deletion
2009-06-15 13:18:52 +0200 os  r272980 : #i40827# wrong param in Copy() fixed
2009-06-15 10:09:27 +0200 os  r272964 : #i40827# first document copied with storage, later only copy SwDoc
2009-06-11 10:37:51 +0200 os  r272851 : CWS-TOOLING: rebase CWS os131 to trunk@272827 (milestone: DEV300:m50)
2009-06-08 10:07:50 +0200 os  r272721 : #i40827# warnings fixed
2009-06-04 16:31:04 +0200 os  r272644 : #i40827# enable document copies - inactive
2009-07-28 13:59:44 +00:00
Release Engineers
12a818ea7f CWS-TOOLING: integrate CWS os130a
2009-06-05 15:47:33 +0200 os  r272704 : #63267#
2009-06-05 15:44:03 +0200 os  r272703 : #i99578#
2009-06-05 15:43:27 +0200 os  r272702 : #i99529#
2009-06-05 15:41:39 +0200 os  r272701 : #i99526#
2009-06-05 15:39:32 +0200 os  r272700 : #i91534#
2009-06-05 15:37:12 +0200 os  r272699 : #i102000#
2009-06-05 15:34:12 +0200 os  r272698 : #i101952#
2009-06-05 15:32:31 +0200 os  r272697 : #i101814#
2009-06-05 15:28:55 +0200 os  r272695 : #i101214#
2009-06-05 15:25:05 +0200 os  r272694 : #i101007#
2009-06-05 15:22:49 +0200 os  r272692 : #i100487#
2009-06-05 15:17:13 +0200 os  r272691 : #100825#
2009-07-03 14:04:55 +00:00
Oliver Bolte
1524aa18b9 CWS-TOOLING: integrate CWS sw31bf04
2009-01-21 14:24:10 +0100 od  r266670 : #i59051# correction of metric change for PolyPolygonBezier needed
2009-01-21 09:35:44 +0100 od  r266632 : #i96062# adjustment of fix after rebasing
2009-01-21 09:34:56 +0100 od  r266631 : #i94152# adjustment of fix after rebasing
2009-01-20 16:43:12 +0100 od  r266596 : CWS-TOOLING: rebase CWS sw31bf04 to trunk@266428 (milestone: DEV300:m39)
2009-01-20 11:52:22 +0100 od  r266561 : #i94152 method <SwDoc::SetOutlineNumRule(..)>
	- assure that at outline list style registered text node have the correct list level set
2009-01-20 10:43:53 +0100 od  r266556 : #i93399# methods <SwNumRule::SetIndent(..)> and <SwNumRule::ChangeIndent(..)>
	 - adjust also the list tab position, if a list tab stop is applied
2009-01-16 16:26:56 +0100 od  r266432 : #i59051# adjust Writer's UNO-API for drawing objects
	 - correct conversion of "StartPosition" and "EndPosition"
	 - conversion of "PolyPolygonBezier"
2009-01-16 16:20:49 +0100 od  r266430 : #i59051# - adjust UNO-API of connector shape
	 -- convert "PolyPolygonBezier" to correct metric
	 -- convert "StartPosition" and "EndPosition" in set-method before applying anchor position
	 - adjust UNO-API of measure shape
	 -- convert "StartPosition" and "EndPosition" to correct metric
2009-01-16 15:01:21 +0100 od  r266419 : #i95698# method <SwFrm::GetPrevSctLeaf(..)>
	 - only columns as previous section leaves for tables inside sections, which are inside another table.
2009-01-14 14:34:58 +0100 od  r266304 : #i96092# method <HandleResetAttrAtTxtNode::~HandleResetAttrAtTxtNode()>
	 - set list level to outline level, if needed.
2009-01-13 17:09:43 +0100 od  r266238 : #i98037# method <SwWW8ImplReader::IsObjectLayoutInTableCell(..)>
	 - adjust evaluation of WW8 attributes
2009-01-13 11:49:48 +0100 od  r266203 : #i94187# method <SwTxtFormatter::NewTabPortion(..)>
	 - correct consideration of compatibility option TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST
2009-01-13 11:48:45 +0100 od  r266202 : #i94187# method <OutWW8_SwTxtNode(..)>
	 - set list style directly at paragraph only in position and space mode LABEL_WIDTH_AND_POSITION
2009-01-12 12:22:58 +0100 od  r266143 : #i70582# method <SwFlyAtCntFrm::SetAbsPos(..)> and local method <lcl_CalcDownDist(..)>
	 - correct determination of anchor's frame top for object positioning.
2009-02-13 10:05:35 +00:00
Kurt Zenker
ee5dcf56c5 CWS-TOOLING: integrate CWS cmcfixes52
2009-01-05 10:49:04 +0100 cmc  r265860 : #i97763# remove low-hanging warnings
2009-01-29 10:02:54 +00:00
Jens-Heiner Rechtien
57d9cc8bae CWS-TOOLING: integrate CWS outlinelevel
2008-12-19 10:32:51 +0100 od  r265718 : #i70748# method <SwWW8Writer::StartTOX(..)>
	 - correction for custom to outline style
	   assigned paragraph styles
2008-12-19 09:24:41 +0100 od  r265715 : #i70748# method <HandleModifyAtTxtNode(..)>
	 - retrieve former applied list style before potential
	   reset of empty list style due to set outline level
2008-12-17 15:33:57 +0100 hde  r265608 : #i97013#
2008-12-17 14:43:42 +0100 od  r265603 : #i70748# adjust fix i44177 - adjustment of to outline style assigned
	 paragraph styles only for OOo-Templates.
2008-12-17 12:59:42 +0100 od  r265598 : #i70748# method <XMLTextImportHelper::SetStyleAndAttrs(..)>
	 - special handling of OOo 2.x document regarding
	   outline numbering of headings.
2008-12-17 12:45:53 +0100 od  r265597 : #i70748# method <HandleModifyAtTxtNode(..)>
	 - correct determination of new and former applied list style
2008-12-17 10:18:41 +0100 od  r265581 : #i97312# method <XMLTextNumRuleInfo::Set(..)>
	 - check, if numbering rules instance contains any numbering rule.
2008-12-16 14:34:22 +0100 hde  r265542 : #i97013
2008-12-16 14:20:24 +0100 od  r265541 : #i70748# adjust documentation of "Which"-ID numbers
2008-12-16 14:19:49 +0100 od  r265539 : #i70748# Adjust Attribute-Function-Mapping table due to new attribute
2008-12-16 14:06:24 +0100 od  r265538 : #i70748# - Correct handling of to outline style assigned paragraph styles
	   on reset of all paragraph style attributes
	 - WW8 import: Consider refactoring of paragraph style's outline
	   level attribute - NO_NUMBERING define no longer exsits.
2008-12-16 10:37:19 +0100 od  r265530 : #i70478# Correction on moving outline paragraph up respectively down
	 in its outline level:
	 - Check also outline paragraph, which are not an outline via
	   a to outline style assigned paragraph style, if action is applicable.
2008-12-16 09:10:13 +0100 hde  r265523 : #i97277
2008-12-16 09:09:30 +0100 hde  r265522 : #i97277
2008-12-16 09:07:40 +0100 hde  r265521 : Added control and purged obsolete id's
2008-12-10 13:09:36 +0100 od  r265174 : #i70748# correction of previous fix due to warning-free code
2008-12-10 13:03:30 +0100 od  r265172 : #i70748# method <XMLTextImportHelper::SetStyleAndAttrs(..)>
	 - Due to performance issues avoid retrieving outline level value from paragraph's paragraph
	   style for each paragraph. Instead retrieve current outline level value from paragraph, 
           which is the inherited value from its paragraph style, and only when it is needed.
2008-12-09 16:50:36 +0100 ufi  r265117 : help
2008-12-09 16:49:50 +0100 ufi  r265116 : help
2008-12-09 15:45:05 +0100 od  r265107 : #i70748# method <XMLTextImportHelper::SetStyleAndAttrs(..)>
	 - some minor rework and check access to paragraph styles
2008-12-09 15:42:04 +0100 od  r265106 : #i70748# adjust name of local variable to avoid hiding of class variable
2008-12-09 15:40:51 +0100 od  r265105 : #i70748# correct initialization order
2008-12-09 15:35:07 +0100 od  r265101 : #i70748# remove duplicate entry in certain property map
2008-12-09 15:33:39 +0100 od  r265100 : #i70748# add end of file token
2008-12-07 15:11:54 +0100 zhaojianwei  r264952 : conflicts left not to be resolved when cws rebase
2008-12-04 14:52:21 +0100 zhaojianwei  r264846 : CWS-TOOLING: rebase CWS outlinelevel to trunk@264325 (milestone: DEV300:m36)
2008-11-28 03:42:09 +0100 zhaojianwei  r264525 : #i70748#: migrate CWS outlinelevel to SVN
2008-11-28 03:41:39 +0100 zhaojianwei  r264524 : #i70748#: migrate CWS outlinelevel to SVN
2008-11-28 03:41:11 +0100 zhaojianwei  r264523 : #i70748#: migrate CWS outlinelevel to SVN
2009-01-07 11:57:24 +00:00
Kurt Zenker
3cb05052a6 INTEGRATION: CWS tl58 (1.77.46); FILE MERGED
2008/08/06 10:16:15 od 1.77.46.1: #i92478# method <numfunc::CreateUniqueListId(..)>
	 - created list id now starts with "list" to conform to ID type
2008-08-14 18:44:11 +00:00
Rüdiger Timm
5f1b8e99a1 INTEGRATION: CWS sw30bf08 (1.75.32); FILE MERGED
2008/07/08 14:53:30 od 1.75.32.1: #i91400# tracking of list style name change in order to keep data about
	 the list style's default list up-to-date
2008-07-11 13:13:49 +00:00
Rüdiger Timm
0e5b16444d INTEGRATION: CWS sw30bf06 (1.73.88); FILE MERGED
2008/06/19 10:52:56 od 1.73.88.2: RESYNC: (1.73-1.75); FILE MERGED
2008/06/17 09:07:56 od 1.73.88.1: #i87166# method <lcl_ChgNumRule(..)>
	 - Do NOT change list style type
2008-07-08 07:21:16 +00:00
Rüdiger Timm
d621dd755b #i10000# Condition always true. 2008-06-17 13:39:17 +00:00
Rüdiger Timm
33cc43a148 INTEGRATION: CWS swlists01 (1.70.34); FILE MERGED
2008/06/02 13:50:33 od 1.70.34.11: #i86732# method <SwDoc::SetNumRule(..)>
	 - correction on special handling, if there is no selection
	 --> paragraph has to be added to the list.
2008/05/14 12:57:10 od 1.70.34.10: #i86732# remove no longer needed code
2008/05/14 10:58:27 od 1.70.34.9: #i86732# further changes/adjustments for new list handling
2008/05/08 16:27:37 od 1.70.34.8: RESYNC: (1.72-1.73); FILE MERGED
2008/05/08 15:05:29 od 1.70.34.7: #i86732# minor adjustment to method <listfunc::CreateUniqueListId(..)>
2008/05/07 07:32:40 od 1.70.34.6: #i86732# further changes/adjustments for new list handling
2008/04/16 08:39:39 od 1.70.34.5: #i86732# further changes/adjustments for new list handling
2008/03/20 17:02:07 od 1.70.34.4: correction of merge
2008/03/20 14:22:02 od 1.70.34.3: RESYNC: (1.70-1.72); FILE MERGED
2008/03/20 09:22:22 od 1.70.34.2: #i86732# changes due to lists
2008/03/06 10:35:57 od 1.70.34.1: #i86732# - refactoring due to revised <SwTxtNode> interface
	 - refactoring due to revised <SwFmt> interface
	 - refactoring due to revised numbering tree interfaces/types
	 - refactoring due to deleted <SwNumRuleInfo>
           --> instead use of <SwNumRule::GetTxtNodeList(..)>
	 - after creation of list style from selection apply new list
	   style to all text nodes, which had the same former automatic
	   list style and belong to the same list.
2008-06-13 08:35:27 +00:00
Rüdiger Timm
16d27411cb INTEGRATION: CWS changefileheader (1.72.32); FILE MERGED
2008/04/01 15:56:56 thb 1.72.32.3: #i85898# Stripping all external header guards
2008/04/01 12:53:56 thb 1.72.32.2: #i85898# Stripping all external header guards
2008/03/31 16:53:47 rt 1.72.32.1: #i87441# Change license header to LPGL v3.
2008-04-10 12:22:14 +00:00
Kurt Zenker
ffd592f333 INTEGRATION: CWS swnewlistlevelattrs_DEV300 (1.68.142); FILE MERGED
2008/02/13 11:26:30 od 1.68.142.3: #i85348# - reset of indent attributes on applying list style at paragraphs
         - adjustment due to changed constructor of class <SwNumRule>
2008/02/06 07:53:19 od 1.68.142.2: RESYNC: (1.68-1.70); FILE MERGED
2008/01/23 14:45:13 od 1.68.142.1: #i85348# remove unnecessary code
2008-03-05 15:53:54 +00:00
Oliver Bolte
4034ffd079 INTEGRATION: CWS swcrossref01_DEV300 (1.68.20); FILE MERGED
2008/02/01 08:13:20 od 1.68.20.3: RESYNC: (1.68-1.70); FILE MERGED
2007/12/03 12:21:32 od 1.68.20.2: #i83479# - minor adjustment due to warning-free code
2007/11/22 14:03:41 od 1.68.20.1: #i83479# class <SwDoc>
	 - implementation of interfaces <IDocumentListItems> and <IDocumentOutlineNodes>
2008-02-26 09:37:38 +00:00
Vladimir Glazounov
11cee712f0 INTEGRATION: CWS sw8u10bf04 (1.68.122); FILE MERGED
2007/12/17 12:29:55 od 1.68.122.1: #151213# method <SwDoc::DelNumRule(..)>
	 - suppress deletion of outline list style
2008-01-29 07:37:24 +00:00
Jens-Heiner Rechtien
502d6b29b8 INTEGRATION: CWS sw8u10bf02 (1.68.96); FILE MERGED
2007/11/21 10:19:18 ama 1.68.96.1: Fix #i82689#: Undo of modifying numbering styles
2008-01-04 12:20:14 +00:00
Jens-Heiner Rechtien
0c48a6da6c INTEGRATION: CWS swwarnings (1.64.42); FILE MERGED
2007/08/20 15:26:34 tl 1.64.42.5: RESYNC: (1.66-1.67); FILE MERGED
2007/05/29 11:18:51 os 1.64.42.4: RESYNC: (1.64-1.66); FILE MERGED
2007/04/03 12:59:34 tl 1.64.42.3: #i69287# warning-free code
2007/03/09 13:03:25 ama 1.64.42.2: #i69287#: warning free code
2007/03/08 17:29:45 ama 1.64.42.1: #i69287#: warning free code
2007-09-27 07:36:31 +00:00
Rüdiger Timm
39343ca2f3 INTEGRATION: CWS swqbf101 (1.66.94); FILE MERGED
2007/07/12 10:47:07 od 1.66.94.1: #i56253# minor changes due to changes interface of <swRegHistory>
2007-07-26 07:18:47 +00:00
Kurt Zenker
73e0ded37a INTEGRATION: CWS pchfix04 (1.64.2); FILE MERGED
2007/02/05 08:27:18 os 1.64.2.1: #i73604# usage of ITEMID_* removed
2007-05-10 14:55:59 +00:00
Rüdiger Timm
5164bb52e1 INTEGRATION: CWS os94 (1.64.66); FILE MERGED
2007/03/12 08:10:37 os 1.64.66.1: #i75235# unused methods removed
2007-04-25 08:01:36 +00:00
Oliver Bolte
ad7b239ee9 INTEGRATION: CWS swqbf90 (1.62.14); FILE MERGED
2007/01/02 11:35:01 od 1.62.14.2: RESYNC: (1.62-1.63); FILE MERGED
2006/11/20 13:21:49 od 1.62.14.1: #i67136# method <SwDoc::PropagateOutlineRule()>
	 - check only on the list style, which is set at the paragraph style
	 - document setting OUTLINE_LEVEL_YIELDS_OUTLINE_RULE has no relevance any more
2007-01-23 07:30:17 +00:00
Rüdiger Timm
94faa9e956 INTEGRATION: CWS swautomatic01 (1.56.82); FILE MERGED
2006/11/16 14:43:21 fme 1.56.82.4: RESYNC: (1.60-1.62); FILE MERGED
2006/10/10 17:16:37 fme 1.56.82.3: RESYNC: (1.57-1.60); FILE MERGED
2006/09/01 12:16:28 fme 1.56.82.2: RESYNC: (1.56-1.57); FILE MERGED
2006/08/09 08:56:29 fme 1.56.82.1: #i64576# Automatic styles
2006-12-01 14:39:32 +00:00
Vladimir Glazounov
54b03a6558 INTEGRATION: CWS swqbf88 (1.60.6); FILE MERGED
2006/10/23 10:17:18 od 1.60.6.2: RESYNC: (1.60-1.61); FILE MERGED
2006/10/19 07:58:52 od 1.60.6.1: #134160# - method <SwDoc::SetNumRule(..)>
	 -- consider the case that the PaM doesn't denote a text node.
	 - method <SwDoc::NumUpDown(..)>
	 -- make code robust: consider that the node doesn't denote a text node.
2006-11-01 14:10:34 +00:00
Oliver Bolte
85ef05f73a INTEGRATION: CWS swqbf87 (1.57.42); FILE MERGED
2006/10/05 10:39:20 od 1.57.42.3: RESYNC: (1.57-1.60); FILE MERGED
2006/09/22 13:01:52 od 1.57.42.2: #i69289# method <lcl_FindOutlineNum(..)>
	 - assure that investigated text node is on correct numbering level
	 method <SwDoc::GotoOutline(..)>
	 - improvement by additional search on hyperlink URL without its
	   numbering part.
2006/09/21 12:32:38 od 1.57.42.1: #i69522# method <SwDoc::SetOutlineNumRule(..)>
	 - assure that the outline numbering rule is an automatic rule
2006-10-13 11:19:38 +00:00
Vladimir Glazounov
9af419ac48 INTEGRATION: CWS osxpatchpool (1.57.14); FILE MERGED
2006/08/28 12:33:39 obr 1.57.14.1: #i68810# applied 2nd patch from issue (tra)
2006-09-25 08:26:10 +00:00
Vladimir Glazounov
0f0a7193b1 INTEGRATION: CWS swqbf84 (1.57.12); FILE MERGED
2006/09/12 09:03:40 od 1.57.12.1: #i69145# classes <SwNumRule> and <SwNumRuleInfo>
	 - refactoring for <SwNumRule::pList> and remove of
	   memory leak <SwNumRule::pList>
2006-09-22 08:18:43 +00:00
Oliver Bolte
8e5caa926a INTEGRATION: CWS pchfix02 (1.57.2); FILE MERGED
2006/09/01 17:51:25 kaib 1.57.2.1: #i68856# Added header markers and pch files
2006-09-16 19:54:01 +00:00
Jens-Heiner Rechtien
2a9e2a5dd5 INTEGRATION: CWS writercorehandoff (1.49.18); FILE MERGED
2006/05/08 12:56:09 fme 1.49.18.18: RESYNC: (1.55-1.56); FILE MERGED
2006/05/03 07:43:17 fme 1.49.18.17: #i50348# make SwDoc interface based
2006/04/28 13:31:15 fme 1.49.18.16: RESYNC: (1.54-1.55); FILE MERGED
2006/03/17 08:02:20 tra 1.49.18.15: RESYNC: (1.53-1.54); FILE MERGED
2006/01/19 08:50:00 fme 1.49.18.14: #i50348# General cleanup - removed unused header files, functions, members, declarations
2005/12/21 15:16:24 tra 1.49.18.13: #i50348#
2005/12/20 15:07:42 tra 1.49.18.12: RESYNC: (1.52-1.53); FILE MERGED
2005/11/11 07:56:06 fme 1.49.18.11: #i50348# make SwDoc accessible via interfaces
2005/10/25 08:26:09 tra 1.49.18.10: RESYNC: (1.51-1.52); FILE MERGED
2005/10/24 16:01:14 tra 1.49.18.9: #50348#
2005/10/06 08:08:30 tra 1.49.18.8: #50348#
2005/09/28 14:00:02 tra 1.49.18.7: #i50348#
2005/09/13 13:19:41 tra 1.49.18.6: RESYNC: (1.50-1.51); FILE MERGED
2005/08/31 12:50:46 tra 1.49.18.5: #i50348# Introducing IDocumentRedlineAccess interface
2005/07/28 11:54:52 tra 1.49.18.4: RESYNC: (1.49-1.50); FILE MERGED
2005/06/24 11:43:14 fme 1.49.18.3: #i50348# Make SwDoc accessible via interfaces
2005/06/07 14:13:27 fme 1.49.18.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:27:07 tra 1.49.18.1: Unnecessary includes removed #i50348#
2006-08-14 14:59:04 +00:00
Rüdiger Timm
679a1f9b44 INTEGRATION: CWS swqbf62 (1.55.14); FILE MERGED
2006/04/27 11:53:53 od 1.55.14.1: #i64311# method <lcl_ChgNumRule(..)>
	 - invalidate numbering rule on change of <IsContinusNum()> state
2006-05-05 08:14:14 +00:00
Vladimir Glazounov
7578cd75ee INTEGRATION: CWS swstability01 (1.54.4); FILE MERGED
2006/03/06 11:15:09 ama 1.54.4.1: Fix #i57907#i62740#i62804#i62806#: Promtion/demotion of chapters (inkl. undo)
2006-03-31 08:50:38 +00:00
Rüdiger Timm
cf8019557c INTEGRATION: CWS swqbf51 (1.53.94); FILE MERGED
2006/01/17 09:11:39 od 1.53.94.2: #i60359# <SwDoc::SetNumRule(..)>
	 - Do not apply the outline numbering rule as hard attribute
	   to document content, namely paragraphs.
2006/01/16 15:45:43 od 1.53.94.1: #126588# - <SwDoc::PropagateOutlineRule()>
	   - Do not set numbering level at text node, if text node has
	     no numbering rule.
	 - <lcl_FindOutlineNum(..)>
	   - refine assertion condition.
2006-02-06 16:19:12 +00:00
Rüdiger Timm
f917bb6900 INTEGRATION: CWS swnumtree (1.49.32); FILE MERGED
2005/11/03 10:35:51 od 1.49.32.28: #i51089# improve performance
	 - method <SwDoc::GetOutlineNumRule> now inline implemented.
	 - consider change of <SwTxtNode::GetNum()>
2005/11/01 18:07:21 od 1.49.32.27: #i51089# - remove unused code
2005/10/26 10:47:23 od 1.49.32.26: RESYNC: (1.51-1.52); FILE MERGED
2005/10/26 09:34:37 od 1.49.32.25: #b6340308# <SwDoc::SetNumRule(..)>
	   - Only clear numbering rule attribute at current text node,
	     if its paragraph style already contains the new numbering rule.
2005/10/25 06:20:54 od 1.49.32.24: #i51089# - delete unused code.
2005/10/25 05:44:01 od 1.49.32.23: #i55391# <SwDoc::SearchNumRule(..)>
	 - Investigate given start node, if requested. Request is indicated
	   by new parameter <_bInvestigateStartNode>
2005/10/21 11:20:54 od 1.49.32.22: #i51089# - Only the counting of phantoms of the outline numbering rule
	   depends on <SwDoc::IsOldNumbering()>
2005/10/21 08:33:31 od 1.49.32.21: #i55391# <SwDoc::SearchNumRule(..)>
	 - start node has also been investigated.
2005/09/20 14:13:24 fme 1.49.32.20: #i51089# Removed compiler warnings
2005/09/20 11:16:23 hbrinkm 1.49.32.19: #i51089# SwNumRule::Invalidate->SwNumRule::SetInvalidRule(TRUE)
2005/09/14 13:37:29 hbrinkm 1.49.32.18: #i51089# SyncNumRulesAndNodes: UpdateOutlineNode
2005/09/13 20:27:33 hbrinkm 1.49.32.17: RESYNC: (1.50-1.51); FILE MERGED
2005/09/12 15:15:29 hbrinkm 1.49.32.16: #i51089# AddNumRuleRanges
2005/09/07 11:29:02 hbrinkm 1.49.32.15: #i51089# SyncNumRulesAndNodes
2005/09/01 14:46:47 hbrinkm 1.49.32.14: #i51089# NumOrNoNum: only remove hard numbering
2005/08/31 13:34:47 hbrinkm 1.49.32.13: #i51089# NumOrNoNum: Only touch paragraphs with hard numbering that shows number
2005/08/30 12:58:49 hbrinkm 1.49.32.12: #i51089# PropagateOutlineRule: SyncNumAndNumRule after setting of outline level
2005/08/26 13:43:44 hbrinkm 1.49.32.11: #i51089# SetNumRuleStart: bool <-> BOOL
2005/08/23 07:35:20 hbrinkm 1.49.32.10: #i51089# {Outline|Num}UpDown: call ChkCondColls if modified
2005/08/16 15:31:02 hbrinkm 1.49.32.9: #i51089# FindNumRulePtrWithPool
2005/08/11 09:27:49 hbrinkm 1.49.32.8: #i51089# SetNumRule: do not access zero pointer to numrule
2005/08/10 08:07:25 hbrinkm 1.49.32.7: #121445# PropagateOutlineRule: UpdateOutlineNode
2005/08/09 12:36:44 hbrinkm 1.49.32.6: #i51089#
2005/08/04 09:27:27 hbrinkm 1.49.32.5: #121445# PropagateOutlineRule: only propagate numrule if IsOutlineLevelYieldsOutlineRule returns false, #i51089#
2005/08/03 12:22:55 hbrinkm 1.49.32.4: RESYNC: (1.49-1.50); FILE MERGED
2005/07/11 09:14:57 hbrinkm 1.49.32.3: #i51089# NumOrNoNum: only succeed if a real change is made
2005/07/07 12:49:41 hbrinkm 1.49.32.2: #i51089# PropagateOutlineRule: If a paragraph style has outline level and no numbering rule, set the documents's outline numbering rule, MakeUniqueRules: do not alter outline numbering rules
2005/06/22 10:24:52 hbrinkm 1.49.32.1: #i51089# new implementation of numbering
2005-11-08 16:16:30 +00:00
Jens-Heiner Rechtien
dd0897d453 INTEGRATION: CWS swqbf35 (1.50.18); FILE MERGED
2005/09/22 15:06:20 fme 1.50.18.2: RESYNC: (1.50-1.51); FILE MERGED
2005/08/02 14:20:22 fme 1.50.18.1: #i52775# Update of chapter footnotes after update of outline nodes
2005-09-28 10:05:22 +00:00
Rüdiger Timm
c515fb704e INTEGRATION: CWS ooo19126 (1.50.78); FILE MERGED
2005/09/05 13:39:09 rt 1.50.78.1: #i54170# Change license header: remove SISSL
2005-09-09 02:14:04 +00:00
Oliver Bolte
84b450f8c5 INTEGRATION: CWS swnum03 (1.49.70); FILE MERGED
2005/07/14 11:28:59 hbrinkm 1.49.70.2: #i51827# lcl_UpdateNumRuleRange: also update number of first node if bInit is true
2005/06/29 14:08:52 hbrinkm 1.49.70.1: #i51029# MakeList: take nodes with outline level into account for nodes of outline rule
2005-07-18 12:33:55 +00:00
Oliver Bolte
457ad332c8 INTEGRATION: CWS fr8fix2 (1.48.26); FILE MERGED
2005/04/25 09:18:35 hbrinkm 1.48.26.2: #i47232# SetOutlineNumRule: invalidate outline numrule
2005/04/20 09:45:55 hbrinkm 1.48.26.1: #i47232# PropagateOutline: set level for outline paragraphs
2005-05-03 13:39:03 +00:00
Rüdiger Timm
7e54ef840e INTEGRATION: CWS swqcore08 (1.44.64); FILE MERGED
2005/03/02 11:59:43 hbrinkm 1.44.64.3: #b6234265# reset lower levels even if upper level is not numbered
2005/03/01 16:50:28 hbrinkm 1.44.64.2: RESYNC: (1.44-1.46); FILE MERGED
2005/03/01 15:37:59 hbrinkm 1.44.64.1: #i39822# PropagateOutlineRule: do not alter paragraphs with a numbering rule
2005-03-29 13:37:07 +00:00
Vladimir Glazounov
1ef4661f71 INTEGRATION: CWS swqcore07 (1.44.2); FILE MERGED
2005/02/21 12:49:17 od 1.44.2.4: #i42921# <SwDoc::SetNumRule(..)> - re-use unused 3rd parameter.
	 It's name is now <bSetitem> and replaces local variable <bSetItem>
2005/02/17 10:49:16 dvo 1.44.2.3: #i42851# assert when calling MakeUniqueNumRule on wrong doc
2005/02/11 09:00:46 hbrinkm 1.44.2.2: #i42273# lcl_UpdateNumRuleRange: start at a node that may be numbered
2005/02/10 17:23:20 hbrinkm 1.44.2.1: #i42354# UpdateNumRuleOld: use SwNumRule.Get() to get numbering format
2005-03-08 10:21:10 +00:00
Vladimir Glazounov
c1735067da INTEGRATION: CWS swqcore06 (1.42.102); FILE MERGED
2005/02/10 13:11:34 hbrinkm 1.42.102.2: RESYNC: (1.42-1.44); FILE MERGED
2005/02/07 21:02:14 dvo 1.42.102.1: #i42220# copy numbering type when changing list style
2005-02-22 09:02:43 +00:00
Vladimir Glazounov
1e39024821 INTEGRATION: CWS swqcore05 (1.42.68); FILE MERGED
2005/01/21 11:46:00 fme 1.42.68.3: #i38904# Correct default setting for new numbering/bullet adjustment
2005/01/17 11:26:04 hbrinkm 1.42.68.2: #i40048# MakeUniqueNumRules
2005/01/14 16:30:19 hbrinkm 1.42.68.1: #i39673# SetOutlineRule: use PropagateOutlineRule
2005-02-21 15:15:34 +00:00
Rüdiger Timm
4148d7fa38 INTEGRATION: CWS swqbetterbeta (1.43.12); FILE MERGED
2005/02/02 14:12:38 hbrinkm 1.43.12.2: #i39978# handle switched off numbering labels correctly in UpdateNumRuleOld
2005/02/02 09:31:16 hbrinkm 1.43.12.1: #i39978# handle switched off numbering labels correctly in UpdateNumRuleOld
2005-02-04 10:14:52 +00:00
Oliver Bolte
5dea286d73 INTEGRATION: CWS swqcore04 (1.42.24); FILE MERGED
2005/01/12 09:28:29 hbrinkm 1.42.24.1: #i40048# MakeUniqueNumRules
2005-01-25 12:59:21 +00:00
Kurt Zenker
4ee03c78d7 INTEGRATION: CWS hbbeta01 (1.41.2); FILE MERGED
2004/12/07 10:53:48 hbrinkm 1.41.2.2: #i38342# propagate outline level, too
2004/12/03 12:54:10 hbrinkm 1.41.2.1: #i38342# PropagateOutlineRule
2004-12-08 16:41:03 +00:00
Jens-Heiner Rechtien
ce50eaadc1 INTEGRATION: CWS swqcore01 (1.37.32); FILE MERGED
2004/11/27 10:14:35 os 1.37.32.4: RESYNC: (1.38-1.39); FILE MERGED
2004/11/22 16:05:09 hbrinkm 1.37.32.3: #118528# let numrule handle name->pointer relation, fallback in FindNumRulePtr
2004/11/17 14:52:56 hbrinkm 1.37.32.2: RESYNC: (1.37-1.38); FILE MERGED
2004/11/05 14:57:54 hbrinkm 1.37.32.1: #i36749# use AddNumRule to add numbering rules to document
2004-11-27 10:40:56 +00:00
Rüdiger Timm
563490c3c5 INTEGRATION: CWS oasisbf2 (1.36.62); FILE MERGED
2004/11/04 15:30:24 dvo 1.36.62.1: #i31024# prevent headings with outline num-rules from being written as lists
         (plus dependent changes for NO_NUM removal)
2004-11-26 12:24:12 +00:00
Oliver Bolte
3aaf6d0b07 INTEGRATION: CWS swqbugfixes09 (1.37.2); FILE MERGED
2004/11/15 14:06:52 od 1.37.2.8: RESYNC: (1.37-1.38); FILE MERGED
resolve merge conflict.
2004/11/11 17:17:59 hbrinkm 1.37.2.7: #i30310# remove from CWS
2004/11/11 13:31:35 hbrinkm 1.37.2.6: #30310# undo last changes, start updating numrule at previous node of numbering rule
2004/11/10 15:25:22 hbrinkm 1.37.2.5: #30310# use GetNumNoUpdate in UpdateNumrule
2004/11/03 12:05:55 fme 1.37.2.4: #i36571# SwNumRuleInfo and SwNumRule should have different instances of the SwTxtNodeTable
2004/11/02 12:03:21 fme 1.37.2.3: #i34097# DeleteAndDestroy deletes rName in DelNumRule is rName is directly taken from the numrule
2004/11/02 11:18:04 hbrinkm 1.37.2.2: #i36465# Validate numrule at end of UpdateNumRule
2004/11/02 11:11:26 hbrinkm 1.37.2.1: #i30310# if a text node has a numbering rule but no number assume it has one
2004-11-16 14:39:29 +00:00
Jens-Heiner Rechtien
7b6919746e INTEGRATION: CWS swqbugfixes08 (1.35.2); FILE MERGED
2004/10/27 12:20:51 fme 1.35.2.4: RESYNC: (1.36-1.37); FILE MERGED
2004/10/11 09:29:10 fme 1.35.2.3: RESYNC: (1.35-1.36); FILE MERGED
2004/10/07 17:22:43 dvo 1.35.2.2: #i33455# fix numbering of different document sections
2004/10/05 12:15:47 dvo 1.35.2.1: #i33455# determine numbering per document section
         (text body, each textframe, etc.)
2004-11-09 12:44:19 +00:00
Rüdiger Timm
77d4661798 INTEGRATION: CWS swqbugfixes07 (1.33.18); FILE MERGED
2004/10/12 06:56:37 fme 1.33.18.4: Resolved merge conflicts
2004/10/11 10:30:03 fme 1.33.18.3: RESYNC: (1.35-1.36); FILE MERGED
2004/09/20 14:03:48 hbrinkm 1.33.18.2: RESYNC: (1.33-1.35); FILE MERGED
2004/09/20 10:16:10 hbrinkm 1.33.18.1: #i32620# hash map for numrule pointers, no numrule update while reading
2004-10-22 07:11:47 +00:00
Rüdiger Timm
495a983a4b INTEGRATION: CWS swqbugfixes05 (1.31.58); FILE MERGED
2004/08/16 12:44:52 fme 1.31.58.2: RESYNC: (1.31-1.32); FILE MERGED
2004/08/06 08:18:49 fme 1.31.58.1: #i32203# Numbering alignment has to be obtained from layout if paragraph is set to use direction of environment
2004-09-20 14:20:33 +00:00