diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:43 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:43 +0200 |
| commit | b4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch) | |
| tree | 26e22c8ab20d2c38bc88dfcc041c8143e0609557 /sc/source/ui/inc/acredlin.hrc | |
| parent | 69bb367315288b644439dc46d34743a2575a3527 (diff) | |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 8964ceb596c66db5e9677de1ad99f9747342b87b (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:42 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit 737b6a92adca9a8285370918671b93b56a028537
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:21 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 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.
commit d4d6a678bf169eebee2fe4d71c8ec66de6898d6e
Author: Jani Monoses <jani.monoses@canonical.com>
Date: Thu Jan 27 15:33:06 2011 +0200
Remove unused declaration
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
sc/source/core/tool/token.cxx | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
commit 96bee1507119ca0525845022019d90f0694996aa
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 20 23:44:52 2011 -0500
Fixed incorrect page number in page preview mode. (fdo#33155)
When the window is large enough to show several 'Page X' strings,
the page number was not properly incremented. This commit fixes
it.
sc/source/ui/view/gridwin4.cxx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
commit ed46df1fcb5869818f5f74e0c7a5b19c65102e83
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Wed Jan 19 00:24:24 2011 -0500
Fixed incorrect import of cell attributes from Excel documents.
When a cell with non-default formatting attribute starts with non-first
row in a column, the filter would incorrectly apply the same format to
all the cells above it if they didn't have any formats. This commit
fixes it.
sc/source/filter/excel/xistyle.cxx | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
commit af63319fcdeea3f9b5018eab83ef5a9e64905446
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 5ada5635cff38af87830b091b36159cf80e4cf5d
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 c900e3db767518b7a60eaf24bdf298c94315f685
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:56 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit 15d298ba7c4e89b043b3077e17747ba027a62c43
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:06 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
split repo tag: calc_libreoffice-3.3.1.1
split repo tag: calc_libreoffice-3.3.1.2
Diffstat (limited to 'sc/source/ui/inc/acredlin.hrc')
| -rw-r--r-- | sc/source/ui/inc/acredlin.hrc | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/sc/source/ui/inc/acredlin.hrc b/sc/source/ui/inc/acredlin.hrc index b21676ee6ae9..468c57333780 100644 --- a/sc/source/ui/inc/acredlin.hrc +++ b/sc/source/ui/inc/acredlin.hrc @@ -1,7 +1,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 @@ -28,48 +28,48 @@ #include "sc.hrc" // -> RID_SCDLG_CHANGES #define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 5 +#define BTN_CANCEL 2 +#define BTN_HELP 5 // -#define CTR_REDLINING 10 -#define TP_FILTER 11 -#define TP_VIEW 12 +#define CTR_REDLINING 10 +#define TP_FILTER 11 +#define TP_VIEW 12 -#define FT_ASSIGN 14 -#define ED_ASSIGN 15 -#define RB_ASSIGN 16 +#define FT_ASSIGN 14 +#define ED_ASSIGN 15 +#define RB_ASSIGN 16 #define STR_INSERT_COLS 20 -#define STR_INSERT_ROWS 21 -#define STR_INSERT_TABS 22 -#define STR_DELETE_COLS 23 -#define STR_DELETE_ROWS 24 -#define STR_DELETE_TABS 25 -#define STR_MOVE 26 -#define STR_CONTENT 27 -#define STR_REJECT 28 -#define STR_ACCEPTED 29 -#define STR_REJECTED 30 -#define STR_NO_ENTRY 31 -#define STR_CONTENT_WITH_CHILD 32 -#define STR_CHILD_CONTENT 33 -#define STR_CHILD_ORGCONTENT 34 -#define STR_EMPTY 35 +#define STR_INSERT_ROWS 21 +#define STR_INSERT_TABS 22 +#define STR_DELETE_COLS 23 +#define STR_DELETE_ROWS 24 +#define STR_DELETE_TABS 25 +#define STR_MOVE 26 +#define STR_CONTENT 27 +#define STR_REJECT 28 +#define STR_ACCEPTED 29 +#define STR_REJECTED 30 +#define STR_NO_ENTRY 31 +#define STR_CONTENT_WITH_CHILD 32 +#define STR_CHILD_CONTENT 33 +#define STR_CHILD_ORGCONTENT 34 +#define STR_EMPTY 35 // Bitmaps -#define BMP_STR_CLOSE 41 -#define BMP_STR_OPEN 42 -#define BMP_STR_END 43 -#define BMP_STR_ERROR 44 +#define BMP_STR_CLOSE 41 +#define BMP_STR_OPEN 42 +#define BMP_STR_END 43 +#define BMP_STR_ERROR 44 -#define SC_CHANGES_COMMENT 49 -#define SC_SUB_SORT 50 -#define SC_SORT_ACTION 51 -#define SC_SORT_POSITION 52 -#define SC_SORT_AUTHOR 53 -#define SC_SORT_DATE 54 -#define SC_SORT_COMMENT 55 +#define SC_CHANGES_COMMENT 49 +#define SC_SUB_SORT 50 +#define SC_SORT_ACTION 51 +#define SC_SORT_POSITION 52 +#define SC_SORT_AUTHOR 53 +#define SC_SORT_DATE 54 +#define SC_SORT_COMMENT 55 // |