summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-01-07 11:57:24 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-01-07 11:57:24 +0000
commit57d9cc8bae84156f7e6a73e96d6531227b0a4f4c (patch)
tree94981e47bc35844afff39f8a8e0fd5d9eec29fcc /sw/inc
parent8ecedd6a64f682007f714e21a48bf48a6ceae81c (diff)
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
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/cmdid.h2
-rw-r--r--sw/inc/doc.hxx5
-rw-r--r--sw/inc/editsh.hxx4
-rw-r--r--sw/inc/fmtcol.hxx31
-rw-r--r--sw/inc/hintids.hxx139
-rw-r--r--sw/inc/ndarr.hxx2
-rw-r--r--sw/inc/ndtxt.hxx14
-rw-r--r--sw/inc/swtypes.hxx2
-rw-r--r--sw/inc/unoprnms.hxx5
9 files changed, 114 insertions, 90 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index f5de3d518082..04808bd1a8fc 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -892,7 +892,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_UNO_COMPONENT (FN_EXTRA2 + 97)
#define FN_WORDCOUNT_DIALOG (FN_EXTRA2 + 98)
-#define FN_UNO_DEFAULT_OUTLINE_LEVEL (FN_EXTRA2 + 99)
+//#define FN_UNO_DEFAULT_OUTLINE_LEVEL (FN_EXTRA2 + 99)//#outline level,removed by zahojianwei
#define FN_XFORMS_DESIGN_MODE (FN_EXTRA2 + 100)
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 920f7495a63f..da5c9c70d3f1 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -701,6 +701,8 @@ private:
// falls keine angegeben ist, nehme die Kapitelvorlage der 1. Ebene
sal_Bool SplitDoc( sal_uInt16 eDocType, const String& rPath,
const SwTxtFmtColl* pSplitColl );
+ sal_Bool SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaijianwei.
+
// Charts der angegebenen Tabelle updaten
void _UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const;
@@ -1890,8 +1892,11 @@ public:
// falls keine angegeben ist, nehme die Kapitelvorlage der 1. Ebene
sal_Bool GenerateGlobalDoc( const String& rPath,
const SwTxtFmtColl* pSplitColl = 0 );
+ sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaojianwei
sal_Bool GenerateHTMLDoc( const String& rPath,
const SwTxtFmtColl* pSplitColl = 0 );
+ sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaojianwei
+
// vergleiche zwei Dokument miteinander
long CompareDoc( const SwDoc& rDoc );
// merge zweier Dokumente
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 771e8bfcc8f3..4e1eba53115b 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -488,6 +488,10 @@ public:
// detect highest and lowest level to check moving of outline levels
void GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower );
+
+ // get Outline level of current paragraph
+ int GetCurrentParaOutlineLevel( ) const;// #outlinelevel add by zhaojianwei
+
// -> i29560
BOOL HasNumber() const;
BOOL HasBullet() const;
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 4b8de2d8bd9b..7dcb6720d593 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -69,8 +69,11 @@ class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl
// --> OD 2007-01-24 #i73790#
bool mbStayAssignedToListLevelOfOutlineStyle;
// <--
+
protected:
- BYTE nOutlineLevel;
+ //BYTE nOutlineLevel; //<-#outline level, removed by zhaojianwei
+ bool mbAssignedToOutlineStyle;//<-#outline level added by zhaojianwei
+
SwTxtFmtColl *pNextTxtFmtColl;
SwTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
@@ -81,7 +84,8 @@ protected:
// --> OD 2007-01-24 #i73790#
mbStayAssignedToListLevelOfOutlineStyle( false ),
// <--
- nOutlineLevel( NO_NUMBERING )
+ //nOutlineLevel( NO_NUMBERING ) //<-#outline level,removed by zhaojianwei
+ mbAssignedToOutlineStyle(false) //<-#outline level,added by zhaojianwei
{ pNextTxtFmtColl = this; }
SwTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName,
@@ -92,9 +96,9 @@ protected:
// --> OD 2007-01-24 #i73790#
mbStayAssignedToListLevelOfOutlineStyle( false ),
// <--
- nOutlineLevel( NO_NUMBERING )
+ //nOutlineLevel( NO_NUMBERING ) //<-#outline level,removed by zhaojianwei
+ mbAssignedToOutlineStyle(false) //<-#outline level,added by zhaojianwei
{ pNextTxtFmtColl = this; }
-
public:
// zum "abfischen" von UL-/LR-/FontHeight Aenderungen
@@ -102,24 +106,23 @@ public:
TYPEINFO(); //Bereits in Basisklasse Client drin.
- void SetOutlineLevel( BYTE );
- inline BYTE GetOutlineLevel() const { return nOutlineLevel; }
-
inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext);
SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; }
BOOL IsAtDocNodeSet() const;
// --> OD 2006-11-22 #i71574#
- inline bool AssignedToListLevelOfOutlineStyle() const
- {
- return ( /*0 <= GetOutlineLevel() &&*/ GetOutlineLevel() < MAXLEVEL );
- }
-
- inline void DeleteAssignmentToListLevelOfOutlineStyle()
+ //<-#outline level,zhaojianwei
+ void SetAttrOutlineLevel( int );
+ int GetAttrOutlineLevel() const;
+ int GetAssignedOutlineStyleLevel() const;
+ inline const bool IsAssignedToListLevelOfOutlineStyle() const
{
- SetOutlineLevel( NO_NUMBERING );
+ return mbAssignedToOutlineStyle;
}
+ void AssignToListLevelOfOutlineStyle(const int nAssignedListLevel);
+ void DeleteAssignmentToListLevelOfOutlineStyle();
+ //<-end
// <--
// --> OD 2008-03-04 #refactorlists#
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index af29b40df0c9..53fcb75910f5 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -163,6 +163,7 @@ RES_PARATR_BEGIN = RES_TXTATR_END,
RES_PARATR_VERTALIGN, // 71
RES_PARATR_SNAPTOGRID, // 72
RES_PARATR_CONNECT_BORDER, // 73
+ RES_PARATR_OUTLINELEVEL, // 74
RES_PARATR_END
};
@@ -172,11 +173,11 @@ RES_PARATR_END
enum RES_PARATR_LIST
{
RES_PARATR_LIST_BEGIN = RES_PARATR_END,
- RES_PARATR_LIST_ID = RES_PARATR_LIST_BEGIN, // 74
- RES_PARATR_LIST_LEVEL, // 75
- RES_PARATR_LIST_ISRESTART, // 76
- RES_PARATR_LIST_RESTARTVALUE, // 77
- RES_PARATR_LIST_ISCOUNTED, // 78
+ RES_PARATR_LIST_ID = RES_PARATR_LIST_BEGIN, // 75
+ RES_PARATR_LIST_LEVEL, // 76
+ RES_PARATR_LIST_ISRESTART, // 77
+ RES_PARATR_LIST_RESTARTVALUE, // 78
+ RES_PARATR_LIST_ISCOUNTED, // 79
RES_PARATR_LIST_END
};
// <--
@@ -184,92 +185,92 @@ RES_PARATR_LIST_END
enum RES_FRMATR
{
RES_FRMATR_BEGIN = RES_PARATR_LIST_END,
- RES_FILL_ORDER = RES_FRMATR_BEGIN, // 79
- RES_FRM_SIZE, // 80
- RES_PAPER_BIN, // 81
- RES_LR_SPACE, // 82
- RES_UL_SPACE, // 83
- RES_PAGEDESC, // 84
- RES_BREAK, // 85
- RES_CNTNT, // 86
- RES_HEADER, // 87
- RES_FOOTER, // 88
- RES_PRINT, // 89
- RES_OPAQUE, // 90
- RES_PROTECT, // 91
- RES_SURROUND, // 92
- RES_VERT_ORIENT, // 93
- RES_HORI_ORIENT, // 94
- RES_ANCHOR, // 95
- RES_BACKGROUND, // 96
- RES_BOX, // 97
- RES_SHADOW, // 98
- RES_FRMMACRO, // 99
- RES_COL, // 100
- RES_KEEP, // 101
- RES_URL, // 102
- RES_EDIT_IN_READONLY, // 103
- RES_LAYOUT_SPLIT, // 104
- RES_CHAIN, // 105
- RES_TEXTGRID, // 106
- RES_LINENUMBER , // 107
- RES_FTN_AT_TXTEND, // 108
- RES_END_AT_TXTEND, // 109
- RES_COLUMNBALANCE, // 110
- RES_FRAMEDIR, // 111
- RES_HEADER_FOOTER_EAT_SPACING, // 112
- RES_ROW_SPLIT, // 113
+ RES_FILL_ORDER = RES_FRMATR_BEGIN, // 80
+ RES_FRM_SIZE, // 81
+ RES_PAPER_BIN, // 82
+ RES_LR_SPACE, // 83
+ RES_UL_SPACE, // 84
+ RES_PAGEDESC, // 85
+ RES_BREAK, // 86
+ RES_CNTNT, // 87
+ RES_HEADER, // 88
+ RES_FOOTER, // 89
+ RES_PRINT, // 90
+ RES_OPAQUE, // 91
+ RES_PROTECT, // 92
+ RES_SURROUND, // 93
+ RES_VERT_ORIENT, // 94
+ RES_HORI_ORIENT, // 95
+ RES_ANCHOR, // 96
+ RES_BACKGROUND, // 97
+ RES_BOX, // 98
+ RES_SHADOW, // 99
+ RES_FRMMACRO, // 100
+ RES_COL, // 101
+ RES_KEEP, // 102
+ RES_URL, // 103
+ RES_EDIT_IN_READONLY, // 104
+ RES_LAYOUT_SPLIT, // 105
+ RES_CHAIN, // 106
+ RES_TEXTGRID, // 107
+ RES_LINENUMBER , // 108
+ RES_FTN_AT_TXTEND, // 109
+ RES_END_AT_TXTEND, // 110
+ RES_COLUMNBALANCE, // 111
+ RES_FRAMEDIR, // 112
+ RES_HEADER_FOOTER_EAT_SPACING, // 113
+ RES_ROW_SPLIT, // 114
// OD 18.09.2003 #i18732# - insert new item and 5 dummies
- RES_FOLLOW_TEXT_FLOW, // 114
+ RES_FOLLOW_TEXT_FLOW, // 115
// --> collapsing borders FME 2005-05-27 #i29550#
- RES_COLLAPSING_BORDERS, // 115
+ RES_COLLAPSING_BORDERS, // 116
// <-- collapsing
// OD 2004-05-04 #i28701# - use dummy1 for new item
- RES_WRAP_INFLUENCE_ON_OBJPOS, // 116
- RES_AUTO_STYLE, // 117
- RES_FRMATR_STYLE_NAME, // 118
- RES_FRMATR_CONDITIONAL_STYLE_NAME, // 119
+ RES_WRAP_INFLUENCE_ON_OBJPOS, // 117
+ RES_AUTO_STYLE, // 118
+ RES_FRMATR_STYLE_NAME, // 119
+ RES_FRMATR_CONDITIONAL_STYLE_NAME, // 120
RES_FRMATR_END
};
enum RES_GRFATR
{
RES_GRFATR_BEGIN = RES_FRMATR_END,
- RES_GRFATR_MIRRORGRF = RES_GRFATR_BEGIN, // 120
- RES_GRFATR_CROPGRF, // 121
-
- RES_GRFATR_ROTATION, // 122
- RES_GRFATR_LUMINANCE, // 123
- RES_GRFATR_CONTRAST, // 124
- RES_GRFATR_CHANNELR, // 125
- RES_GRFATR_CHANNELG, // 126
- RES_GRFATR_CHANNELB, // 127
- RES_GRFATR_GAMMA, // 128
- RES_GRFATR_INVERT, // 129
- RES_GRFATR_TRANSPARENCY, // 130
- RES_GRFATR_DRAWMODE, // 131
-
- RES_GRFATR_DUMMY1, // 132
- RES_GRFATR_DUMMY2, // 133
- RES_GRFATR_DUMMY3, // 134
- RES_GRFATR_DUMMY4, // 135
- RES_GRFATR_DUMMY5, // 136
+ RES_GRFATR_MIRRORGRF = RES_GRFATR_BEGIN, // 121
+ RES_GRFATR_CROPGRF, // 122
+
+ RES_GRFATR_ROTATION, // 123
+ RES_GRFATR_LUMINANCE, // 124
+ RES_GRFATR_CONTRAST, // 125
+ RES_GRFATR_CHANNELR, // 126
+ RES_GRFATR_CHANNELG, // 127
+ RES_GRFATR_CHANNELB, // 128
+ RES_GRFATR_GAMMA, // 129
+ RES_GRFATR_INVERT, // 130
+ RES_GRFATR_TRANSPARENCY, // 131
+ RES_GRFATR_DRAWMODE, // 132
+
+ RES_GRFATR_DUMMY1, // 133
+ RES_GRFATR_DUMMY2, // 134
+ RES_GRFATR_DUMMY3, // 135
+ RES_GRFATR_DUMMY4, // 136
+ RES_GRFATR_DUMMY5, // 137
RES_GRFATR_END
};
enum RES_BOXATR
{
RES_BOXATR_BEGIN = RES_GRFATR_END,
- RES_BOXATR_FORMAT = RES_BOXATR_BEGIN, // 137
- RES_BOXATR_FORMULA, // 138
- RES_BOXATR_VALUE, // 139
+ RES_BOXATR_FORMAT = RES_BOXATR_BEGIN, // 138
+ RES_BOXATR_FORMULA, // 139
+ RES_BOXATR_VALUE, // 140
RES_BOXATR_END
};
enum RES_UNKNOWNATR
{
RES_UNKNOWNATR_BEGIN = RES_BOXATR_END,
- RES_UNKNOWNATR_CONTAINER = RES_UNKNOWNATR_BEGIN,// 140
+ RES_UNKNOWNATR_CONTAINER = RES_UNKNOWNATR_BEGIN,// 141
RES_UNKNOWNATR_END
};
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 55b38090545a..fe58df27613b 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -250,7 +250,7 @@ public:
// Array aller GliederiungsNodes;
const SwOutlineNodes& GetOutLineNds() const;
- void UpdateOutlineNode( const SwNode&, BYTE nOldLevel, BYTE nNewLevel );
+ //void UpdateOutlineNode( const SwNode&, BYTE nOldLevel, BYTE nNewLevel );//#outline level,removed by zhaojianwei
// alle Nodes Updaten - Rule/Format-Aenderung
void UpdateOutlineNode(SwNode & rNd);
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 79b0003cfbaf..33fd760ab108 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -118,7 +118,10 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode
bool bNotifiable;
mutable BOOL bLastOutlineState : 1;
- BYTE nOutlineLevel;
+ // BYTE nOutlineLevel; //#outline level, removed by zhaojianwei.
+ // --> OD 2008-11-19 #i70748#
+ bool mbEmptyListStyleSetDueToSetOutlineLevelAttr;
+ // <--
// --> OD 2008-03-27 #refactorlists#
// boolean, indicating that a <SetAttr(..)> or <ResetAttr(..)> or
@@ -564,7 +567,7 @@ public:
@return outline level or NO_NUMBERING if there is no outline level
*/
- int GetOutlineLevel() const;
+ int GetAttrOutlineLevel() const;//#OutlineLevel,added by zhaojianwei
/**
Sets the out line level *at* a text node.
@@ -580,6 +583,13 @@ public:
NOTE: This is subject to change, see GetOutlineLevel.
*/
//void SetOutlineLevel(int nLevel);
+ void SetAttrOutlineLevel(int nLevel);//#OutlineLevel,added by zhaojianwei
+
+ // --> OD 2008-11-19 #i70748#
+ bool IsEmptyListStyleDueToSetOutlineLevelAttr();
+ void SetEmptyListStyleDueToSetOutlineLevelAttr();
+ void ResetEmptyListStyleDueToResetOutlineLevelAttr();
+ // <--
/**
Returns the width of leading tabs/blanks in this paragraph.
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index f19df7fd1894..b424afb64bae 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -122,7 +122,7 @@ enum SwLabelType
const BYTE OLD_MAXLEVEL = 5;
const BYTE MAXLEVEL = 10; //Ehemals numrule.hxx
const BYTE NO_NUM = 200; //Ehemals numrule.hxx
-const BYTE NO_NUMBERING = 201; //Ehemals numrule.hxx
+//const BYTE NO_NUMBERING = 201; //Ehemals numrule.hxx //#outline level,removed by zhaojianwei
//const BYTE NO_INIT = 202; //Ehemals numrule.hxx
// fuer Absaetze mit NO_NUM aber auf unterschiedlichen Leveln
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 02d81ec9628d..16cb57764515 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -722,7 +722,7 @@ enum SwPropNameIds
/* 0674 */ UNO_NAME_POSITION_LAYOUT_DIR,
// <--
/* 0675 */ UNO_NAME_NUMBERING_IS_OUTLINE,
-/* 0676 */ UNO_NAME_DEFAULT_OUTLINE_LEVEL,
+///* 0676 */ UNO_NAME_DEFAULT_OUTLINE_LEVEL, //#outline level, removed by zhaojianwei
// --> OD 2004-10-28 #i36248#
/* 0677 */ UNO_NAME_STARTPOSITION_IN_HORI_L2R,
/* 0678 */ UNO_NAME_ENDPOSITION_IN_HORI_L2R,
@@ -803,7 +803,8 @@ enum SwPropNameIds
/* 0733 */ UNO_NAME_CHAR_OVERLINE,
/* 0734 */ UNO_NAME_CHAR_OVERLINE_COLOR,
/* 0735 */ UNO_NAME_CHAR_OVERLINE_HAS_COLOR,
-/* 0736 */ SW_PROPNAME_END
+/* 0736 */ UNO_NAME_OUTLINE_LEVEL, //#outline level,add<-zhaojianwei outlinelevel
+/* 0737 */ SW_PROPNAME_END
};
generated by cgit (git 2.34.1) at 2024-08-01 08:03:10 +0000