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/ui/inc/submenu.hrc | |
| 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
split repo tag: calc_libreoffice-3.3.0.4
Diffstat (limited to 'sc/source/ui/inc/submenu.hrc')
| -rw-r--r-- | sc/source/ui/inc/submenu.hrc | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/sc/source/ui/inc/submenu.hrc b/sc/source/ui/inc/submenu.hrc index 4e5ad6d28d9e..1a77b40842f7 100644 --- a/sc/source/ui/inc/submenu.hrc +++ b/sc/source/ui/inc/submenu.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 @@ -25,44 +25,44 @@ * ************************************************************************/ -// IDs fuer Untermenues +// IDs fuer Untermenues -// 1 ist nicht erlaubt ???? -#define SUBMENU_EDIT 2 -#define SUBMENU_FILL 3 -#define SUBMENU_DELBREAK 4 -#define SUBMENU_VIEW 5 -#define SUBMENU_INSERT 6 -#define SUBMENU_INSBREAK 7 -#define SUBMENU_NAME 8 -#define SUBMENU_INSOBJ 9 -#define SUBMENU_DATA 10 -#define SUBMENU_FILTER 11 -#define SUBMENU_OUTLINE 12 -#define SUBMENU_PIVOT 13 -#define SUBMENU_EXTRA 14 -#define SUBMENU_AUDIT 15 -#define SUBMENU_PROTECT 16 -#define SUBMENU_ROW 17 -#define SUBMENU_COL 18 -#define SUBMENU_TAB 19 -#define SUBMENU_MERGE 20 -#define SUBMENU_AREA 21 -#define SUBMENU_MIRROR 22 -#define SUBMENU_OBJARRANGE 23 -#define SUBMENU_ANCHOR 24 -#define SUBMENU_POPARRANGE 25 -#define SUBMENU_OLEARRANGE 26 -#define SUBMENU_MAIL 27 -#define SUBMENU_OPTIONS 28 -#define SUBMENU_TOOLBARS 29 -#define SUBMENU_GRAPHIC 30 -#define SUBMENU_SPELLING 31 -#define SUBMENU_CELLCONT 32 -#define SUBMENU_OBJMIRROR 33 -#define SUBMENU_OBJALIGN 34 -#define SUBMENU_OBJANCHOR 35 -#define SUBMENU_SENDTO 36 -#define SUBMENU_CHANGES 37 +// 1 ist nicht erlaubt ???? +#define SUBMENU_EDIT 2 +#define SUBMENU_FILL 3 +#define SUBMENU_DELBREAK 4 +#define SUBMENU_VIEW 5 +#define SUBMENU_INSERT 6 +#define SUBMENU_INSBREAK 7 +#define SUBMENU_NAME 8 +#define SUBMENU_INSOBJ 9 +#define SUBMENU_DATA 10 +#define SUBMENU_FILTER 11 +#define SUBMENU_OUTLINE 12 +#define SUBMENU_PIVOT 13 +#define SUBMENU_EXTRA 14 +#define SUBMENU_AUDIT 15 +#define SUBMENU_PROTECT 16 +#define SUBMENU_ROW 17 +#define SUBMENU_COL 18 +#define SUBMENU_TAB 19 +#define SUBMENU_MERGE 20 +#define SUBMENU_AREA 21 +#define SUBMENU_MIRROR 22 +#define SUBMENU_OBJARRANGE 23 +#define SUBMENU_ANCHOR 24 +#define SUBMENU_POPARRANGE 25 +#define SUBMENU_OLEARRANGE 26 +#define SUBMENU_MAIL 27 +#define SUBMENU_OPTIONS 28 +#define SUBMENU_TOOLBARS 29 +#define SUBMENU_GRAPHIC 30 +#define SUBMENU_SPELLING 31 +#define SUBMENU_CELLCONT 32 +#define SUBMENU_OBJMIRROR 33 +#define SUBMENU_OBJALIGN 34 +#define SUBMENU_OBJANCHOR 35 +#define SUBMENU_SENDTO 36 +#define SUBMENU_CHANGES 37 #define SUBMENU_EDIT_TABLE 38 #define MN_TEMPLATES 39 |