summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc/filter.hrc
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
commitb4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch)
tree26e22c8ab20d2c38bc88dfcc041c8143e0609557 /sc/source/ui/inc/filter.hrc
parent69bb367315288b644439dc46d34743a2575a3527 (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/filter.hrc')
-rw-r--r--sc/source/ui/inc/filter.hrc80
1 files changed, 40 insertions, 40 deletions
diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc
index 508c5af9aab5..9d708c9799c5 100644
--- a/sc/source/ui/inc/filter.hrc
+++ b/sc/source/ui/inc/filter.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
@@ -24,59 +24,59 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "sc.hrc" // -> RID_SCDLG_FILTER
+#include "sc.hrc" // -> RID_SCDLG_FILTER
// -> RID_SCDLG_SPEC_FILTER
// -> RID_SCDLG_PIVOTFILTER
// allgemein
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
+#define BTN_OK 1
+#define BTN_CANCEL 1
+#define BTN_HELP 1
#define BTN_MORE 1
-#define BTN_UNIQUE 1
-#define BTN_CASE 2
-#define BTN_REGEXP 3
-#define BTN_HEADER 4
-#define BTN_COPY_RESULT 5
-#define LB_COPY_AREA 6
-#define ED_COPY_AREA 7
-#define RB_COPY_AREA 8
+#define BTN_UNIQUE 1
+#define BTN_CASE 2
+#define BTN_REGEXP 3
+#define BTN_HEADER 4
+#define BTN_COPY_RESULT 5
+#define LB_COPY_AREA 6
+#define ED_COPY_AREA 7
+#define RB_COPY_AREA 8
#define FL_OPTIONS 9
-#define FT_DBAREA_LABEL 10
-#define FT_DBAREA 11
-#define BTN_DEST_PERS 12
+#define FT_DBAREA_LABEL 10
+#define FT_DBAREA 11
+#define BTN_DEST_PERS 12
// Filter:
-#define FT_OP 20
-#define FT_FIELD 21
-#define FT_COND 22
-#define FT_VAL 23
-#define LB_FIELD1 24
-#define LB_FIELD2 25
-#define LB_FIELD3 26
-#define LB_OP1 27
-#define LB_OP2 28
-#define LB_COND1 29
-#define LB_COND2 30
-#define LB_COND3 31
-#define ED_VAL1 32
-#define ED_VAL2 33
-#define ED_VAL3 34
+#define FT_OP 20
+#define FT_FIELD 21
+#define FT_COND 22
+#define FT_VAL 23
+#define LB_FIELD1 24
+#define LB_FIELD2 25
+#define LB_FIELD3 26
+#define LB_OP1 27
+#define LB_OP2 28
+#define LB_COND1 29
+#define LB_COND2 30
+#define LB_COND3 31
+#define ED_VAL1 32
+#define ED_VAL2 33
+#define ED_VAL3 34
#define FL_CRITERIA 35
#define FL_SEPARATOR 36
-#define LB_OP3 37
-#define LB_FIELD4 38
-#define LB_COND4 39
-#define ED_VAL4 40
+#define LB_OP3 37
+#define LB_FIELD4 38
+#define LB_COND4 39
+#define ED_VAL4 40
#define LB_SCROLL 41
-#define LB_OP4 42
+#define LB_OP4 42
// Spezialfilter
-#define FT_CRITERIA_AREA 50
-#define LB_CRITERIA_AREA 51
-#define ED_CRITERIA_AREA 52
-#define RB_CRITERIA_AREA 53
+#define FT_CRITERIA_AREA 50
+#define LB_CRITERIA_AREA 51
+#define ED_CRITERIA_AREA 52
+#define RB_CRITERIA_AREA 53