summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/autoform.hxx5
-rw-r--r--sc/inc/docpool.hxx3
-rw-r--r--sc/inc/scitems.hxx187
-rw-r--r--sc/inc/unonames.hxx3
4 files changed, 103 insertions, 95 deletions
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index d5feb4840837..7171d8fe1cf4 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: autoform.hxx,v $
- * $Revision: 1.8.32.3 $
+ * $Revision: 1.8.144.1 $
*
* This file is part of OpenOffice.org.
*
@@ -95,6 +95,7 @@ private:
SvxPostureItem aCTLPosture;
SvxUnderlineItem aUnderline;
+ SvxOverlineItem aOverline;
SvxCrossedOutItem aCrossedOut;
SvxContourItem aContour;
SvxShadowedItem aShadowed;
@@ -139,6 +140,7 @@ public:
const SvxWeightItem& GetCTLWeight() const { return aCTLWeight; }
const SvxPostureItem& GetCTLPosture() const { return aCTLPosture; }
const SvxUnderlineItem& GetUnderline() const { return aUnderline; }
+ const SvxOverlineItem& GetOverline() const { return aOverline; }
const SvxCrossedOutItem& GetCrossedOut() const { return aCrossedOut; }
const SvxContourItem& GetContour() const { return aContour; }
const SvxShadowedItem& GetShadowed() const { return aShadowed; }
@@ -170,6 +172,7 @@ public:
void SetCTLWeight( const SvxWeightItem& rCTLWeight ) { aCTLWeight = rCTLWeight; }
void SetCTLPosture( const SvxPostureItem& rCTLPosture ) { aCTLPosture = rCTLPosture; }
void SetUnderline( const SvxUnderlineItem& rUnderline ) { aUnderline = rUnderline; }
+ void SetOverline( const SvxOverlineItem& rOverline ) { aOverline = rOverline; }
void SetCrossedOut( const SvxCrossedOutItem& rCrossedOut ) { aCrossedOut = rCrossedOut; }
void SetContour( const SvxContourItem& rContour ) { aContour = rContour; }
void SetShadowed( const SvxShadowedItem& rShadowed ) { aShadowed = rShadowed; }
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index 64bfa3ad3ddc..e16ba2c7993b 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: docpool.hxx,v $
- * $Revision: 1.10.32.1 $
+ * $Revision: 1.10.144.1 $
*
* This file is part of OpenOffice.org.
*
@@ -51,6 +51,7 @@ class ScDocumentPool: public SfxItemPool
static USHORT* pVersionMap8;
static USHORT* pVersionMap9;
static USHORT* pVersionMap10;
+ static USHORT* pVersionMap11;
public:
ScDocumentPool( SfxItemPool* pSecPool = NULL, BOOL bLoadRefCounts = FALSE );
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index 25b41945680c..51e5ccd457ba 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: scitems.hxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.144.1 $
*
* This file is part of OpenOffice.org.
*
@@ -71,99 +71,100 @@
#define ATTR_FONT_WEIGHT 102
#define ATTR_FONT_POSTURE 103
#define ATTR_FONT_UNDERLINE 104
-#define ATTR_FONT_CROSSEDOUT 105
-#define ATTR_FONT_CONTOUR 106
-#define ATTR_FONT_SHADOWED 107
-#define ATTR_FONT_COLOR 108
-#define ATTR_FONT_LANGUAGE 109
-#define ATTR_CJK_FONT 110
-#define ATTR_CJK_FONT_HEIGHT 111
-#define ATTR_CJK_FONT_WEIGHT 112
-#define ATTR_CJK_FONT_POSTURE 113
-#define ATTR_CJK_FONT_LANGUAGE 114
-#define ATTR_CTL_FONT 115
-#define ATTR_CTL_FONT_HEIGHT 116
-#define ATTR_CTL_FONT_WEIGHT 117
-#define ATTR_CTL_FONT_POSTURE 118
-#define ATTR_CTL_FONT_LANGUAGE 119
-#define ATTR_FONT_EMPHASISMARK 120
-#define ATTR_USERDEF 121 // not saved in binary files
-#define ATTR_FONT_WORDLINE 122
-#define ATTR_FONT_RELIEF 123
-#define ATTR_HYPHENATE 124
-#define ATTR_SCRIPTSPACE 125
-#define ATTR_HANGPUNCTUATION 126
-#define ATTR_FORBIDDEN_RULES 127
-#define ATTR_HOR_JUSTIFY 128
-#define ATTR_INDENT 129
-#define ATTR_VER_JUSTIFY 130
-#define ATTR_STACKED 131
-#define ATTR_ROTATE_VALUE 132
-#define ATTR_ROTATE_MODE 133
-#define ATTR_VERTICAL_ASIAN 134
-#define ATTR_WRITINGDIR 135
-#define ATTR_LINEBREAK 136
-#define ATTR_SHRINKTOFIT 137
-#define ATTR_BORDER_TLBR 138
-#define ATTR_BORDER_BLTR 139
-#define ATTR_MARGIN 140
-#define ATTR_MERGE 141
-#define ATTR_MERGE_FLAG 142
-#define ATTR_VALUE_FORMAT 143
-#define ATTR_LANGUAGE_FORMAT 144
-#define ATTR_BACKGROUND 145
-#define ATTR_PROTECTION 146
-#define ATTR_BORDER 147
-#define ATTR_BORDER_INNER 148 // innen, wg. Vorlagen-EditDialog
-#define ATTR_SHADOW 149
-#define ATTR_VALIDDATA 150
-#define ATTR_CONDITIONAL 151
-
-#define ATTR_PATTERN_END 151 // Ende Zellattribut-Pattern
-
-#define ATTR_PATTERN 152
+#define ATTR_FONT_OVERLINE 105
+#define ATTR_FONT_CROSSEDOUT 106
+#define ATTR_FONT_CONTOUR 107
+#define ATTR_FONT_SHADOWED 108
+#define ATTR_FONT_COLOR 109
+#define ATTR_FONT_LANGUAGE 110
+#define ATTR_CJK_FONT 111
+#define ATTR_CJK_FONT_HEIGHT 112
+#define ATTR_CJK_FONT_WEIGHT 113
+#define ATTR_CJK_FONT_POSTURE 114
+#define ATTR_CJK_FONT_LANGUAGE 115
+#define ATTR_CTL_FONT 116
+#define ATTR_CTL_FONT_HEIGHT 117
+#define ATTR_CTL_FONT_WEIGHT 118
+#define ATTR_CTL_FONT_POSTURE 119
+#define ATTR_CTL_FONT_LANGUAGE 120
+#define ATTR_FONT_EMPHASISMARK 121
+#define ATTR_USERDEF 122 // not saved in binary files
+#define ATTR_FONT_WORDLINE 123
+#define ATTR_FONT_RELIEF 124
+#define ATTR_HYPHENATE 125
+#define ATTR_SCRIPTSPACE 126
+#define ATTR_HANGPUNCTUATION 127
+#define ATTR_FORBIDDEN_RULES 128
+#define ATTR_HOR_JUSTIFY 129
+#define ATTR_INDENT 130
+#define ATTR_VER_JUSTIFY 131
+#define ATTR_STACKED 132
+#define ATTR_ROTATE_VALUE 133
+#define ATTR_ROTATE_MODE 134
+#define ATTR_VERTICAL_ASIAN 135
+#define ATTR_WRITINGDIR 136
+#define ATTR_LINEBREAK 137
+#define ATTR_SHRINKTOFIT 138
+#define ATTR_BORDER_TLBR 139
+#define ATTR_BORDER_BLTR 140
+#define ATTR_MARGIN 141
+#define ATTR_MERGE 142
+#define ATTR_MERGE_FLAG 143
+#define ATTR_VALUE_FORMAT 144
+#define ATTR_LANGUAGE_FORMAT 145
+#define ATTR_BACKGROUND 146
+#define ATTR_PROTECTION 147
+#define ATTR_BORDER 148
+#define ATTR_BORDER_INNER 149 // innen, wg. Vorlagen-EditDialog
+#define ATTR_SHADOW 150
+#define ATTR_VALIDDATA 151
+#define ATTR_CONDITIONAL 152
+
+#define ATTR_PATTERN_END 152 // Ende Zellattribut-Pattern
+
+#define ATTR_PATTERN 153
// Seitenattribute
-#define ATTR_LRSPACE 153 // Editor: PageDesc-TabPage
-#define ATTR_ULSPACE 154
-#define ATTR_PAGE 155
-#define ATTR_PAGE_PAPERTRAY 156
-#define ATTR_PAGE_PAPERBIN 157
-#define ATTR_PAGE_SIZE 158
-#define ATTR_PAGE_MAXSIZE 159
-#define ATTR_PAGE_HORCENTER 160
-#define ATTR_PAGE_VERCENTER 161
-
-#define ATTR_PAGE_ON 162 // Editor: Header/Footer-Page
-#define ATTR_PAGE_DYNAMIC 163
-#define ATTR_PAGE_SHARED 164
-
-#define ATTR_PAGE_NOTES 165 // Editor: Tabelle
-#define ATTR_PAGE_GRID 166
-#define ATTR_PAGE_HEADERS 167
-#define ATTR_PAGE_CHARTS 168
-#define ATTR_PAGE_OBJECTS 169
-#define ATTR_PAGE_DRAWINGS 170
-#define ATTR_PAGE_TOPDOWN 171
-#define ATTR_PAGE_SCALE 172
-#define ATTR_PAGE_SCALETOPAGES 173
-#define ATTR_PAGE_FIRSTPAGENO 174
-
-#define ATTR_PAGE_PRINTAREA 175 // Editor: Druckbereiche
-#define ATTR_PAGE_REPEATROW 176
-#define ATTR_PAGE_REPEATCOL 177
-#define ATTR_PAGE_PRINTTABLES 178
-
-#define ATTR_PAGE_HEADERLEFT 179 // Inhalte der Kopf-/
-#define ATTR_PAGE_FOOTERLEFT 180 // Fusszeilen (links)
-#define ATTR_PAGE_HEADERRIGHT 181 // Inhalte der Kopf-/
-#define ATTR_PAGE_FOOTERRIGHT 182 // Fusszeilen (rechts)
-#define ATTR_PAGE_HEADERSET 183 // die Sets dazu...
-#define ATTR_PAGE_FOOTERSET 184
-
-#define ATTR_PAGE_FORMULAS 185
-#define ATTR_PAGE_NULLVALS 186
-
-#define ATTR_PAGE_SCALETO 187 // #i8868# scale printout to with/height
+#define ATTR_LRSPACE 154 // Editor: PageDesc-TabPage
+#define ATTR_ULSPACE 155
+#define ATTR_PAGE 156
+#define ATTR_PAGE_PAPERTRAY 157
+#define ATTR_PAGE_PAPERBIN 158
+#define ATTR_PAGE_SIZE 159
+#define ATTR_PAGE_MAXSIZE 160
+#define ATTR_PAGE_HORCENTER 161
+#define ATTR_PAGE_VERCENTER 162
+
+#define ATTR_PAGE_ON 163 // Editor: Header/Footer-Page
+#define ATTR_PAGE_DYNAMIC 164
+#define ATTR_PAGE_SHARED 165
+
+#define ATTR_PAGE_NOTES 166 // Editor: Tabelle
+#define ATTR_PAGE_GRID 167
+#define ATTR_PAGE_HEADERS 168
+#define ATTR_PAGE_CHARTS 169
+#define ATTR_PAGE_OBJECTS 170
+#define ATTR_PAGE_DRAWINGS 171
+#define ATTR_PAGE_TOPDOWN 172
+#define ATTR_PAGE_SCALE 173
+#define ATTR_PAGE_SCALETOPAGES 174
+#define ATTR_PAGE_FIRSTPAGENO 175
+
+#define ATTR_PAGE_PRINTAREA 176 // Editor: Druckbereiche
+#define ATTR_PAGE_REPEATROW 177
+#define ATTR_PAGE_REPEATCOL 178
+#define ATTR_PAGE_PRINTTABLES 179
+
+#define ATTR_PAGE_HEADERLEFT 180 // Inhalte der Kopf-/
+#define ATTR_PAGE_FOOTERLEFT 181 // Fusszeilen (links)
+#define ATTR_PAGE_HEADERRIGHT 182 // Inhalte der Kopf-/
+#define ATTR_PAGE_FOOTERRIGHT 183 // Fusszeilen (rechts)
+#define ATTR_PAGE_HEADERSET 184 // die Sets dazu...
+#define ATTR_PAGE_FOOTERSET 185
+
+#define ATTR_PAGE_FORMULAS 186
+#define ATTR_PAGE_NULLVALS 187
+
+#define ATTR_PAGE_SCALETO 188 // #i8868# scale printout to with/height
#define ATTR_ENDINDEX ATTR_PAGE_SCALETO // Ende Pool-Range
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 24309245787c..78f25b0b39dd 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -62,6 +62,9 @@
#define SC_UNONAME_CUNDER "CharUnderline"
#define SC_UNONAME_CUNDLCOL "CharUnderlineColor"
#define SC_UNONAME_CUNDLHAS "CharUnderlineHasColor"
+#define SC_UNONAME_COVER "CharOverline"
+#define SC_UNONAME_COVRLCOL "CharOverlineColor"
+#define SC_UNONAME_COVRLHAS "CharOverlineHasColor"
#define SC_UNONAME_CWEIGHT "CharWeight"
#define SC_UNONAME_CPOST "CharPosture"
#define SC_UNONAME_CCROSS "CharCrossedOut"
generated by cgit (git 2.34.1) at 2025-03-13 12:35:43 +0000