diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:32 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:32 +0200 |
| commit | c9ac7489ec5fd4652f0cff09722561ba5a27bcda (patch) | |
| tree | e9fb41b01f699d5a4202e719d5dc7e087fa701c1 /sc/source/filter/xml/xmlstyle.hxx | |
| parent | 69bb367315288b644439dc46d34743a2575a3527 (diff) | |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 5e369f0d3b306be13606c1558ecf7d0aac0048f4 (tag: refs/tags/libreoffice-3.3.0.4)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:15 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 2df81fdef39f29be15dc0a6e12031916de963f08
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:18:07 2011 -0500
Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c.
I created a patch between before and after the merge commit, and
reverse-applied it. This is because if you revert a merge commit
in git you are denying all future merges from that branch. I wasn't
sure if we really wanted that.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/inc/document.hxx | 22 +------
sc/inc/drwlayer.hxx | 2 +-
sc/inc/table.hxx | 16 +-----
sc/source/core/data/document.cxx | 7 +--
sc/source/core/data/drwlayer.cxx | 6 +-
sc/source/core/data/table1.cxx | 38 ++++--------
sc/source/core/data/table2.cxx | 91 ++++++------------------------
sc/source/core/data/table3.cxx | 71 +----------------------
sc/source/filter/xml/xmlrowi.cxx | 17 +----
sc/source/ui/docshell/externalrefmgr.cxx | 7 +-
sc/source/ui/view/dbfunc.cxx | 5 +-
sc/source/ui/view/tabvwshe.cxx | 4 +-
12 files changed, 52 insertions(+), 234 deletions(-)
commit 9ce94f52e8c404a5e19154d38c18a44281d961f0
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:04:14 2011 -0500
Revert "This is also part of the merge."
This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/source/core/data/table3.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 1e03f54cc4f8939867869a3570f56d0645b515f5
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:36 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
Notes:
split repo tag: calc_libreoffice-3.3.0.4
Diffstat (limited to 'sc/source/filter/xml/xmlstyle.hxx')
| -rw-r--r-- | sc/source/filter/xml/xmlstyle.hxx | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index 07a4d307a2c3..aa7c9dc2e45c 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,9 +46,9 @@ extern const XMLPropertyMapEntry aXMLScTableStylesProperties[]; extern const XMLPropertyMapEntry aXMLScTableStylesImportProperties[]; //CellStyles -#define XML_SC_TYPE_CELLPROTECTION (XML_SC_TYPES_START + 1) -#define XML_SC_TYPE_PRINTCONTENT (XML_SC_TYPES_START + 2) -#define XML_SC_TYPE_HORIJUSTIFY (XML_SC_TYPES_START + 3) +#define XML_SC_TYPE_CELLPROTECTION (XML_SC_TYPES_START + 1) +#define XML_SC_TYPE_PRINTCONTENT (XML_SC_TYPES_START + 2) +#define XML_SC_TYPE_HORIJUSTIFY (XML_SC_TYPES_START + 3) #define XML_SC_TYPE_HORIJUSTIFY_METHOD (XML_SC_TYPES_START + 4) #define XML_SC_TYPE_HORIJUSTIFYSOURCE (XML_SC_TYPES_START + 5) #define XML_SC_TYPE_HORIJUSTIFYREPEAT (XML_SC_TYPES_START + 6) @@ -65,46 +65,46 @@ extern const XMLPropertyMapEntry aXMLScTableStylesImportProperties[]; #define XML_SC_TYPE_EQUAL (XML_SC_TYPES_START + 17) #define XML_SC_TYPE_VERTICAL (XML_SC_TYPES_START + 18) -#define CTF_SC_HORIJUSTIFY (XML_SC_CTF_START + 1) -#define CTF_SC_HORIJUSTIFY_SOURCE (XML_SC_CTF_START + 2) -#define CTF_SC_ALLPADDING (XML_SC_CTF_START + 3) -#define CTF_SC_BOTTOMPADDING (XML_SC_CTF_START + 4) -#define CTF_SC_LEFTPADDING (XML_SC_CTF_START + 5) -#define CTF_SC_RIGHTPADDING (XML_SC_CTF_START + 6) -#define CTF_SC_TOPPADDING (XML_SC_CTF_START + 7) -#define CTF_SC_ALLBORDER (XML_SC_CTF_START + 8) -#define CTF_SC_LEFTBORDER (XML_SC_CTF_START + 9) -#define CTF_SC_RIGHTBORDER (XML_SC_CTF_START + 10) -#define CTF_SC_TOPBORDER (XML_SC_CTF_START + 11) -#define CTF_SC_BOTTOMBORDER (XML_SC_CTF_START + 12) -#define CTF_SC_ALLBORDERWIDTH (XML_SC_CTF_START + 13) -#define CTF_SC_LEFTBORDERWIDTH (XML_SC_CTF_START + 14) -#define CTF_SC_RIGHTBORDERWIDTH (XML_SC_CTF_START + 15) -#define CTF_SC_TOPBORDERWIDTH (XML_SC_CTF_START + 16) -#define CTF_SC_BOTTOMBORDERWIDTH (XML_SC_CTF_START + 17) -#define CTF_SC_NUMBERFORMAT (XML_SC_CTF_START + 18) -#define CTF_SC_MAP (XML_SC_CTF_START + 19) -#define CTF_SC_PARAINDENT (XML_SC_CTF_START + 20) -#define CTF_SC_OLDTEXTBACKGROUND (XML_SC_CTF_START + 21) -#define CTF_SC_IMPORT_MAP (XML_SC_CTF_START + 22) -#define CTF_SC_CELLSTYLE (XML_SC_CTF_START + 23) -#define CTF_SC_VALIDATION (XML_SC_CTF_START + 24) -#define CTF_SC_DIAGONALTLBR (XML_SC_CTF_START + 25) -#define CTF_SC_DIAGONALTLBRWIDTH (XML_SC_CTF_START + 26) -#define CTF_SC_DIAGONALBLTR (XML_SC_CTF_START + 27) -#define CTF_SC_DIAGONALBLTRWIDTH (XML_SC_CTF_START + 28) +#define CTF_SC_HORIJUSTIFY (XML_SC_CTF_START + 1) +#define CTF_SC_HORIJUSTIFY_SOURCE (XML_SC_CTF_START + 2) +#define CTF_SC_ALLPADDING (XML_SC_CTF_START + 3) +#define CTF_SC_BOTTOMPADDING (XML_SC_CTF_START + 4) +#define CTF_SC_LEFTPADDING (XML_SC_CTF_START + 5) +#define CTF_SC_RIGHTPADDING (XML_SC_CTF_START + 6) +#define CTF_SC_TOPPADDING (XML_SC_CTF_START + 7) +#define CTF_SC_ALLBORDER (XML_SC_CTF_START + 8) +#define CTF_SC_LEFTBORDER (XML_SC_CTF_START + 9) +#define CTF_SC_RIGHTBORDER (XML_SC_CTF_START + 10) +#define CTF_SC_TOPBORDER (XML_SC_CTF_START + 11) +#define CTF_SC_BOTTOMBORDER (XML_SC_CTF_START + 12) +#define CTF_SC_ALLBORDERWIDTH (XML_SC_CTF_START + 13) +#define CTF_SC_LEFTBORDERWIDTH (XML_SC_CTF_START + 14) +#define CTF_SC_RIGHTBORDERWIDTH (XML_SC_CTF_START + 15) +#define CTF_SC_TOPBORDERWIDTH (XML_SC_CTF_START + 16) +#define CTF_SC_BOTTOMBORDERWIDTH (XML_SC_CTF_START + 17) +#define CTF_SC_NUMBERFORMAT (XML_SC_CTF_START + 18) +#define CTF_SC_MAP (XML_SC_CTF_START + 19) +#define CTF_SC_PARAINDENT (XML_SC_CTF_START + 20) +#define CTF_SC_OLDTEXTBACKGROUND (XML_SC_CTF_START + 21) +#define CTF_SC_IMPORT_MAP (XML_SC_CTF_START + 22) +#define CTF_SC_CELLSTYLE (XML_SC_CTF_START + 23) +#define CTF_SC_VALIDATION (XML_SC_CTF_START + 24) +#define CTF_SC_DIAGONALTLBR (XML_SC_CTF_START + 25) +#define CTF_SC_DIAGONALTLBRWIDTH (XML_SC_CTF_START + 26) +#define CTF_SC_DIAGONALBLTR (XML_SC_CTF_START + 27) +#define CTF_SC_DIAGONALBLTRWIDTH (XML_SC_CTF_START + 28) #define CTF_SC_DIAGONALTLBRWIDTHS (XML_SC_CTF_START + 29) #define CTF_SC_DIAGONALBLTRWIDTHS (XML_SC_CTF_START + 30) -#define CTF_SC_ROWHEIGHT (XML_SC_CTF_START + 50) -#define CTF_SC_ROWOPTIMALHEIGHT (XML_SC_CTF_START + 51) -#define CTF_SC_ROWBREAKBEFORE (XML_SC_CTF_START + 52) -#define CTF_SC_ISVISIBLE (XML_SC_CTF_START + 53) +#define CTF_SC_ROWHEIGHT (XML_SC_CTF_START + 50) +#define CTF_SC_ROWOPTIMALHEIGHT (XML_SC_CTF_START + 51) +#define CTF_SC_ROWBREAKBEFORE (XML_SC_CTF_START + 52) +#define CTF_SC_ISVISIBLE (XML_SC_CTF_START + 53) -#define CTF_SC_MASTERPAGENAME (XML_SC_CTF_START + 53) +#define CTF_SC_MASTERPAGENAME (XML_SC_CTF_START + 53) //ColumnStyles -#define XML_SC_TYPE_BREAKBEFORE (XML_SC_TYPES_START + 50) +#define XML_SC_TYPE_BREAKBEFORE (XML_SC_TYPES_START + 50) class ScXMLExport; class ScXMLImport; |