dev/null |binary icon-themes/galaxy/sc/res/icon-set-bars-empty.png |binary icon-themes/galaxy/sc/res/icon-set-bars-full.png |binary icon-themes/galaxy/sc/res/icon-set-bars-half.png |binary icon-themes/galaxy/sc/res/icon-set-bars-one-quarter.png |binary icon-themes/galaxy/sc/res/icon-set-bars-three-quarters.png |binary icon-themes/galaxy/sc/res/icon-set-circles1-gray.png |binary icon-themes/galaxy/sc/res/icon-set-circles1-green.png |binary icon-themes/galaxy/sc/res/icon-set-circles1-red.png |binary icon-themes/galaxy/sc/res/icon-set-circles1-yellow.png |binary icon-themes/galaxy/sc/res/icon-set-circles2-dark-gray.png |binary icon-themes/galaxy/sc/res/icon-set-circles2-dark-red.png |binary icon-themes/galaxy/sc/res/icon-set-circles2-light-gray.png |binary icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png |binary icon-themes/galaxy/sc/res/icon-set-colorarrows-down.png |binary icon-themes/galaxy/sc/res/icon-set-colorarrows-same.png |binary icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-down.png |binary icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-up.png |binary icon-themes/galaxy/sc/res/icon-set-colorarrows-up.png |binary icon-themes/galaxy/sc/res/icon-set-flags-green.png |binary icon-themes/galaxy/sc/res/icon-set-flags-red.png |binary icon-themes/galaxy/sc/res/icon-set-flags-yellow.png |binary icon-themes/galaxy/sc/res/icon-set-grayarrows-down.png |binary icon-themes/galaxy/sc/res/icon-set-grayarrows-same.png |binary icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-down.png |binary icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-up.png |binary icon-themes/galaxy/sc/res/icon-set-grayarrows-up.png |binary icon-themes/galaxy/sc/res/icon-set-pies-empty.png |binary icon-themes/galaxy/sc/res/icon-set-pies-full.png |binary icon-themes/galaxy/sc/res/icon-set-pies-half.png |binary icon-themes/galaxy/sc/res/icon-set-pies-one-quarter.png |binary icon-themes/galaxy/sc/res/icon-set-pies-three-quarters.png |binary icon-themes/galaxy/sc/res/icon-set-shapes-circle.png |binary icon-themes/galaxy/sc/res/icon-set-shapes-diamond.png |binary icon-themes/galaxy/sc/res/icon-set-shapes-triangle.png |binary icon-themes/galaxy/sc/res/icon-set-squares-empty.png |binary icon-themes/galaxy/sc/res/icon-set-squares-full.png |binary icon-themes/galaxy/sc/res/icon-set-squares-half.png |binary icon-themes/galaxy/sc/res/icon-set-squares-one-quarter.png |binary icon-themes/galaxy/sc/res/icon-set-squares-three-quarters.png |binary icon-themes/galaxy/sc/res/icon-set-stars-empty.png |binary icon-themes/galaxy/sc/res/icon-set-stars-full.png |binary icon-themes/galaxy/sc/res/icon-set-stars-half.png |binary icon-themes/galaxy/sc/res/icon-set-symbols1-check.png |binary icon-themes/galaxy/sc/res/icon-set-symbols1-cross.png |binary icon-themes/galaxy/sc/res/icon-set-symbols1-exclamation-mark.png |binary icon-themes/galaxy/sc/res/icon-set-trafficlights-green.png |binary icon-themes/galaxy/sc/res/icon-set-trafficlights-red.png |binary icon-themes/galaxy/sc/res/icon-set-trafficlights-yellow.png |binary icon-themes/galaxy/sc/res/icon-set-triangles-down.png |binary icon-themes/galaxy/sc/res/icon-set-triangles-same.png |binary icon-themes/galaxy/sc/res/icon-set-triangles-up.png |binary sc/source/core/data/colorscale.cxx | 2 sc/source/ui/dbgui/tpsort.cxx | 5 sc/source/ui/inc/iconsets.hrc | 71 ++- sc/source/ui/src/iconsets.src | 205 ++++++++-- sc/source/ui/view/output.cxx | 74 ++- 57 files changed, 283 insertions(+), 74 deletions(-)
New commits: commit a1ac2538e9b287444500618ab4d2f0f06c25cf34 Author: Markus Mohrhard <[email protected]> Date: Mon Nov 12 05:21:07 2012 +0100 implement the missing icon-sets Artwork by Astron Change-Id: I35261a233bee7ccb0181238e87d83e9c503b188e diff --git a/icon-themes/galaxy/sc/res/black_circle_1_4th.png b/icon-themes/galaxy/sc/res/black_circle_1_4th.png deleted file mode 100644 index f5390af..0000000 Binary files a/icon-themes/galaxy/sc/res/black_circle_1_4th.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/black_circle_3_4th.png b/icon-themes/galaxy/sc/res/black_circle_3_4th.png deleted file mode 100644 index 7fb7202..0000000 Binary files a/icon-themes/galaxy/sc/res/black_circle_3_4th.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/black_circle_empty.png b/icon-themes/galaxy/sc/res/black_circle_empty.png deleted file mode 100644 index 0b037e8..0000000 Binary files a/icon-themes/galaxy/sc/res/black_circle_empty.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/black_circle_full.png b/icon-themes/galaxy/sc/res/black_circle_full.png deleted file mode 100644 index 8bfc1fe..0000000 Binary files a/icon-themes/galaxy/sc/res/black_circle_full.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/black_circle_half.png b/icon-themes/galaxy/sc/res/black_circle_half.png deleted file mode 100644 index 1b1328c..0000000 Binary files a/icon-themes/galaxy/sc/res/black_circle_half.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/cancel.png b/icon-themes/galaxy/sc/res/cancel.png deleted file mode 100644 index ae3f7a6..0000000 Binary files a/icon-themes/galaxy/sc/res/cancel.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/exclamation_mark.png b/icon-themes/galaxy/sc/res/exclamation_mark.png deleted file mode 100644 index 1c0ba39..0000000 Binary files a/icon-themes/galaxy/sc/res/exclamation_mark.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/green_arrow_up.png b/icon-themes/galaxy/sc/res/green_arrow_up.png deleted file mode 100644 index c407a3c..0000000 Binary files a/icon-themes/galaxy/sc/res/green_arrow_up.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/green_circle.png b/icon-themes/galaxy/sc/res/green_circle.png deleted file mode 100644 index 82f9b22..0000000 Binary files a/icon-themes/galaxy/sc/res/green_circle.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/icon-set-bars-empty.png b/icon-themes/galaxy/sc/res/icon-set-bars-empty.png new file mode 100644 index 0000000..7d32285 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-bars-empty.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-bars-full.png b/icon-themes/galaxy/sc/res/icon-set-bars-full.png new file mode 100644 index 0000000..afd16cd Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-bars-full.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-bars-half.png b/icon-themes/galaxy/sc/res/icon-set-bars-half.png new file mode 100644 index 0000000..94f5018 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-bars-half.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-bars-one-quarter.png b/icon-themes/galaxy/sc/res/icon-set-bars-one-quarter.png new file mode 100644 index 0000000..1ea109b Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-bars-one-quarter.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-bars-three-quarters.png b/icon-themes/galaxy/sc/res/icon-set-bars-three-quarters.png new file mode 100644 index 0000000..cbac2d0 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-bars-three-quarters.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-circles1-gray.png b/icon-themes/galaxy/sc/res/icon-set-circles1-gray.png new file mode 100644 index 0000000..7b624df Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-circles1-gray.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-circles1-green.png b/icon-themes/galaxy/sc/res/icon-set-circles1-green.png new file mode 100644 index 0000000..82f9b22 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-circles1-green.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-circles1-red.png b/icon-themes/galaxy/sc/res/icon-set-circles1-red.png new file mode 100644 index 0000000..8da3f79 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-circles1-red.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-circles1-yellow.png b/icon-themes/galaxy/sc/res/icon-set-circles1-yellow.png new file mode 100644 index 0000000..d39cc66 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-circles1-yellow.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-circles2-dark-gray.png b/icon-themes/galaxy/sc/res/icon-set-circles2-dark-gray.png new file mode 100644 index 0000000..453def9 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-circles2-dark-gray.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-circles2-dark-red.png b/icon-themes/galaxy/sc/res/icon-set-circles2-dark-red.png new file mode 100644 index 0000000..484bcb0 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-circles2-dark-red.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-circles2-light-gray.png b/icon-themes/galaxy/sc/res/icon-set-circles2-light-gray.png new file mode 100644 index 0000000..e627b1b Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-circles2-light-gray.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png b/icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png new file mode 100644 index 0000000..936e46f Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-circles2-light-red.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-colorarrows-down.png b/icon-themes/galaxy/sc/res/icon-set-colorarrows-down.png new file mode 100644 index 0000000..7989707 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-colorarrows-down.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-colorarrows-same.png b/icon-themes/galaxy/sc/res/icon-set-colorarrows-same.png new file mode 100644 index 0000000..f38d0d9 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-colorarrows-same.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-down.png b/icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-down.png new file mode 100644 index 0000000..2935587 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-down.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-up.png b/icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-up.png new file mode 100644 index 0000000..ea78f27 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-colorarrows-slightly-up.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-colorarrows-up.png b/icon-themes/galaxy/sc/res/icon-set-colorarrows-up.png new file mode 100644 index 0000000..c407a3c Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-colorarrows-up.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-flags-green.png b/icon-themes/galaxy/sc/res/icon-set-flags-green.png new file mode 100644 index 0000000..b3ce53b Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-flags-green.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-flags-red.png b/icon-themes/galaxy/sc/res/icon-set-flags-red.png new file mode 100644 index 0000000..7f16138 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-flags-red.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-flags-yellow.png b/icon-themes/galaxy/sc/res/icon-set-flags-yellow.png new file mode 100644 index 0000000..7c980ed Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-flags-yellow.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-grayarrows-down.png b/icon-themes/galaxy/sc/res/icon-set-grayarrows-down.png new file mode 100644 index 0000000..c27aefa Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-grayarrows-down.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-grayarrows-same.png b/icon-themes/galaxy/sc/res/icon-set-grayarrows-same.png new file mode 100644 index 0000000..6defc10 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-grayarrows-same.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-down.png b/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-down.png new file mode 100644 index 0000000..1f05a1d Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-down.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-up.png b/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-up.png new file mode 100644 index 0000000..b954d0a Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-grayarrows-slightly-up.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-grayarrows-up.png b/icon-themes/galaxy/sc/res/icon-set-grayarrows-up.png new file mode 100644 index 0000000..3abc7c1 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-grayarrows-up.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-pies-empty.png b/icon-themes/galaxy/sc/res/icon-set-pies-empty.png new file mode 100644 index 0000000..0b037e8 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-pies-empty.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-pies-full.png b/icon-themes/galaxy/sc/res/icon-set-pies-full.png new file mode 100644 index 0000000..8bfc1fe Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-pies-full.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-pies-half.png b/icon-themes/galaxy/sc/res/icon-set-pies-half.png new file mode 100644 index 0000000..1b1328c Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-pies-half.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-pies-one-quarter.png b/icon-themes/galaxy/sc/res/icon-set-pies-one-quarter.png new file mode 100644 index 0000000..f5390af Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-pies-one-quarter.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-pies-three-quarters.png b/icon-themes/galaxy/sc/res/icon-set-pies-three-quarters.png new file mode 100644 index 0000000..7fb7202 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-pies-three-quarters.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-shapes-circle.png b/icon-themes/galaxy/sc/res/icon-set-shapes-circle.png new file mode 100644 index 0000000..9bf4c53 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-shapes-circle.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-shapes-diamond.png b/icon-themes/galaxy/sc/res/icon-set-shapes-diamond.png new file mode 100644 index 0000000..0545ccc Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-shapes-diamond.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-shapes-triangle.png b/icon-themes/galaxy/sc/res/icon-set-shapes-triangle.png new file mode 100644 index 0000000..761be2c Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-shapes-triangle.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-squares-empty.png b/icon-themes/galaxy/sc/res/icon-set-squares-empty.png new file mode 100644 index 0000000..8d3ce84 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-squares-empty.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-squares-full.png b/icon-themes/galaxy/sc/res/icon-set-squares-full.png new file mode 100644 index 0000000..d05c79f Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-squares-full.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-squares-half.png b/icon-themes/galaxy/sc/res/icon-set-squares-half.png new file mode 100644 index 0000000..a865124 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-squares-half.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-squares-one-quarter.png b/icon-themes/galaxy/sc/res/icon-set-squares-one-quarter.png new file mode 100644 index 0000000..aec9334 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-squares-one-quarter.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-squares-three-quarters.png b/icon-themes/galaxy/sc/res/icon-set-squares-three-quarters.png new file mode 100644 index 0000000..358b1d2 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-squares-three-quarters.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-stars-empty.png b/icon-themes/galaxy/sc/res/icon-set-stars-empty.png new file mode 100644 index 0000000..6107e73 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-stars-empty.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-stars-full.png b/icon-themes/galaxy/sc/res/icon-set-stars-full.png new file mode 100644 index 0000000..503199c Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-stars-full.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-stars-half.png b/icon-themes/galaxy/sc/res/icon-set-stars-half.png new file mode 100644 index 0000000..2c966ad Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-stars-half.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-symbols1-check.png b/icon-themes/galaxy/sc/res/icon-set-symbols1-check.png new file mode 100644 index 0000000..7df727b Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-symbols1-check.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-symbols1-cross.png b/icon-themes/galaxy/sc/res/icon-set-symbols1-cross.png new file mode 100644 index 0000000..09b7bae Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-symbols1-cross.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-symbols1-exclamation-mark.png b/icon-themes/galaxy/sc/res/icon-set-symbols1-exclamation-mark.png new file mode 100644 index 0000000..b16f317 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-symbols1-exclamation-mark.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-trafficlights-green.png b/icon-themes/galaxy/sc/res/icon-set-trafficlights-green.png new file mode 100644 index 0000000..38ddaa5 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-trafficlights-green.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-trafficlights-red.png b/icon-themes/galaxy/sc/res/icon-set-trafficlights-red.png new file mode 100644 index 0000000..83857c8 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-trafficlights-red.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-trafficlights-yellow.png b/icon-themes/galaxy/sc/res/icon-set-trafficlights-yellow.png new file mode 100644 index 0000000..daa4d16 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-trafficlights-yellow.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-triangles-down.png b/icon-themes/galaxy/sc/res/icon-set-triangles-down.png new file mode 100644 index 0000000..569e1c6 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-triangles-down.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-triangles-same.png b/icon-themes/galaxy/sc/res/icon-set-triangles-same.png new file mode 100644 index 0000000..28c8711 Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-triangles-same.png differ diff --git a/icon-themes/galaxy/sc/res/icon-set-triangles-up.png b/icon-themes/galaxy/sc/res/icon-set-triangles-up.png new file mode 100644 index 0000000..216530a Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-triangles-up.png differ diff --git a/icon-themes/galaxy/sc/res/minus_black.png b/icon-themes/galaxy/sc/res/minus_black.png deleted file mode 100644 index 3f02a7d..0000000 Binary files a/icon-themes/galaxy/sc/res/minus_black.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/red_arrow_down.png b/icon-themes/galaxy/sc/res/red_arrow_down.png deleted file mode 100644 index 7989707..0000000 Binary files a/icon-themes/galaxy/sc/res/red_arrow_down.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/red_circle.png b/icon-themes/galaxy/sc/res/red_circle.png deleted file mode 100644 index 8da3f79..0000000 Binary files a/icon-themes/galaxy/sc/res/red_circle.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/sign.png b/icon-themes/galaxy/sc/res/sign.png deleted file mode 100644 index 58e4f2f..0000000 Binary files a/icon-themes/galaxy/sc/res/sign.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/triangle_down_red.png b/icon-themes/galaxy/sc/res/triangle_down_red.png deleted file mode 100644 index 569e1c6..0000000 Binary files a/icon-themes/galaxy/sc/res/triangle_down_red.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/triangle_up_green.png b/icon-themes/galaxy/sc/res/triangle_up_green.png deleted file mode 100644 index 216530a..0000000 Binary files a/icon-themes/galaxy/sc/res/triangle_up_green.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/yellow_arrow_down_right.png b/icon-themes/galaxy/sc/res/yellow_arrow_down_right.png deleted file mode 100644 index 2935587..0000000 Binary files a/icon-themes/galaxy/sc/res/yellow_arrow_down_right.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/yellow_arrow_right.png b/icon-themes/galaxy/sc/res/yellow_arrow_right.png deleted file mode 100644 index f38d0d9..0000000 Binary files a/icon-themes/galaxy/sc/res/yellow_arrow_right.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/yellow_arrow_up_right.png b/icon-themes/galaxy/sc/res/yellow_arrow_up_right.png deleted file mode 100644 index ea78f27..0000000 Binary files a/icon-themes/galaxy/sc/res/yellow_arrow_up_right.png and /dev/null differ diff --git a/icon-themes/galaxy/sc/res/yellow_circle.png b/icon-themes/galaxy/sc/res/yellow_circle.png deleted file mode 100644 index d39cc66..0000000 Binary files a/icon-themes/galaxy/sc/res/yellow_circle.png and /dev/null differ diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 4089bf9..5c087e0 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -1050,7 +1050,7 @@ ScIconSetMap* ScIconSetFormat::getIconSetMap() { "4TrafficLights", IconSet_4TrafficLights, 4 }, { "5Arrows", IconSet_5Arrows, 5 }, { "5ArrowsGray", IconSet_5ArrowsGray, 5 }, - { "5Ratings", IconSet_5Ratings, 5 }, + { "5Rating", IconSet_5Ratings, 5 }, { "5Quarters", IconSet_5Quarters, 5 }, { NULL, IconSet_3Arrows, 0 } }; diff --git a/sc/source/ui/inc/iconsets.hrc b/sc/source/ui/inc/iconsets.hrc index 2173fd2..f4761c0 100644 --- a/sc/source/ui/inc/iconsets.hrc +++ b/sc/source/ui/inc/iconsets.hrc @@ -7,25 +7,56 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#define BMP_GREEN_CIRCLE 999 -#define BMP_YELLOW_CIRCLE 998 -#define BMP_RED_CIRCLE 997 -#define BMP_BLACK_CIRCLE 991 -#define BMP_BLACK_CIRCLE_EMPTY 990 -#define BMP_BLACK_CIRCLE_HALF 989 -#define BMP_BLACK_CIRCLE_1_4TH 988 -#define BMP_BLACK_CIRCLE_3_4TH 987 -#define BMP_ARROW_GREEN_UP 996 -#define BMP_ARROW_RED_DOWN 995 -#define BMP_ARROW_YELLOW_RIGHT 994 -#define BMP_ARROW_YELLOW_UP_RIGHT 993 -#define BMP_ARROW_YELLOW_DOWN_RIGHT 992 -#define BMP_GREEN_TRIANGLE_UP 986 -#define BMP_BLACK_MINUS 985 -#define BMP_RED_TRIANGLE_DOWN 984 -#define BMP_SIGN 983 -#define BMP_EXCLAMATION_MARK 982 -#define BMP_CANCEL 981 +#define BMP_ICON_SET_CIRCLES1_GRAY 999 +#define BMP_ICON_SET_CIRCLES1_GREEN 998 +#define BMP_ICON_SET_CIRCLES1_YELLOW 997 +#define BMP_ICON_SET_CIRCLES1_RED 996 +#define BMP_ICON_SET_BARS_EMPTY 995 +#define BMP_ICON_SET_BARS_ONE_QUARTER 994 +#define BMP_ICON_SET_BARS_HALF 993 +#define BMP_ICON_SET_BARS_THREE_QUARTER 992 +#define BMP_ICON_SET_BARS_FULL 991 +#define BMP_ICON_SET_CIRCLES2_DARK_GRAY 990 +#define BMP_ICON_SET_CIRCLES2_LIGHT_GRAY 989 +#define BMP_ICON_SET_CIRCLES2_LIGHT_RED 988 +#define BMP_ICON_SET_CIRCLES2_DARK_RED 987 +#define BMP_ICON_SET_COLORARROWS_DOWN 986 +#define BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN 985 +#define BMP_ICON_SET_COLORARROWS_SAME 984 +#define BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP 983 +#define BMP_ICON_SET_COLORARROWS_UP 982 +#define BMP_ICON_SET_FLAGS_RED 981 +#define BMP_ICON_SET_FLAGS_YELLOW 980 +#define BMP_ICON_SET_FLAGS_GREEN 979 +#define BMP_ICON_SET_GRAYARROWS_DOWN 978 +#define BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN 977 +#define BMP_ICON_SET_GRAYARROWS_SAME 976 +#define BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP 975 +#define BMP_ICON_SET_GRAYARROWS_UP 974 +#define BMP_ICON_SET_PIES_EMPTY 973 +#define BMP_ICON_SET_PIES_ONE_QUARTER 972 +#define BMP_ICON_SET_PIES_HALF 971 +#define BMP_ICON_SET_PIES_THREE_QUARTER 970 +#define BMP_ICON_SET_PIES_FULL 969 +#define BMP_ICON_SET_SHAPES_CIRCLE 968 +#define BMP_ICON_SET_SHAPES_TRIANGLE 967 +#define BMP_ICON_SET_SHAPES_DIAMOND 966 +#define BMP_ICON_SET_SQUARES_EMPTY 965 +#define BMP_ICON_SET_SQUARES_ONE_QUARTER 964 +#define BMP_ICON_SET_SQUARES_HALF 963 +#define BMP_ICON_SET_SQUARES_THREE_QUARTER 962 +#define BMP_ICON_SET_SQUARES_FULL 961 +#define BMP_ICON_SET_STARS_EMPTY 960 +#define BMP_ICON_SET_STARS_HALF 959 +#define BMP_ICON_SET_STARS_FULL 958 +#define BMP_ICON_SET_SYMBOLS1_CHECK 957 +#define BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK 956 +#define BMP_ICON_SET_SYMBOLS1_CROSS 955 +#define BMP_ICON_SET_TRAFFICLIGHTS_RED 954 +#define BMP_ICON_SET_TRAFFICLIGHTS_YELLOW 953 +#define BMP_ICON_SET_TRAFFICLIGHTS_GREEN 952 +#define BMP_ICON_SET_TRIANGLES_DOWN 951 +#define BMP_ICON_SET_TRIANGLES_SAME 950 +#define BMP_ICON_SET_TRIANGLES_UP 949 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/src/iconsets.src b/sc/source/ui/src/iconsets.src index 4a7df5b..da3c350 100644 --- a/sc/source/ui/src/iconsets.src +++ b/sc/source/ui/src/iconsets.src @@ -9,82 +9,209 @@ #include "iconsets.hrc" -Bitmap BMP_GREEN_CIRCLE +Bitmap BMP_ICON_SET_CIRCLES1_GRAY { - File = "green_circle.png"; + File = "icon-set-circles1-gray.png"; }; -Bitmap BMP_YELLOW_CIRCLE +Bitmap BMP_ICON_SET_CIRCLES1_GREEN { - File = "yellow_circle.png"; + File = "icon-set-circles1-green.png"; }; -Bitmap BMP_RED_CIRCLE +Bitmap BMP_ICON_SET_CIRCLES1_YELLOW { - File = "red_circle.png"; + File = "icon-set-circles1-yellow.png"; }; -Bitmap BMP_BLACK_CIRCLE +Bitmap BMP_ICON_SET_CIRCLES1_RED { - File = "black_circle_full.png"; + File = "icon-set-circles1-red.png"; }; -Bitmap BMP_BLACK_CIRCLE_EMPTY +Bitmap BMP_ICON_SET_BARS_EMPTY { - File = "black_circle_empty.png"; + File = "icon-set-bars-empty.png"; }; -Bitmap BMP_BLACK_CIRCLE_HALF +Bitmap BMP_ICON_SET_BARS_ONE_QUARTER { - File = "black_circle_half.png"; + File = "icon-set-bars-one-quarter.png"; }; -Bitmap BMP_BLACK_CIRCLE_1_4TH +Bitmap BMP_ICON_SET_BARS_HALF { - File = "black_circle_1_4th.png"; + File = "icon-set-bars-half.png"; }; -Bitmap BMP_BLACK_CIRCLE_3_4TH +Bitmap BMP_ICON_SET_BARS_THREE_QUARTER { - File = "black_circle_3_4th.png"; + File = "icon-set-bars-three-quarters.png"; }; -Bitmap BMP_ARROW_GREEN_UP +Bitmap BMP_ICON_SET_BARS_FULL { - File = "green_arrow_up.png"; + File = "icon-set-bars-full.png"; }; -Bitmap BMP_ARROW_YELLOW_RIGHT +Bitmap BMP_ICON_SET_CIRCLES2_DARK_GRAY { - File = "yellow_arrow_right.png"; + File = "icon-set-circles2-dark-gray.png"; }; -Bitmap BMP_ARROW_RED_DOWN +Bitmap BMP_ICON_SET_CIRCLES2_LIGHT_GRAY { - File = "red_arrow_down.png"; + File = "icon-set-circles2-light-gray.png"; }; -Bitmap BMP_ARROW_YELLOW_UP_RIGHT +Bitmap BMP_ICON_SET_CIRCLES2_LIGHT_RED { - File = "yellow_arrow_up_right.png"; + File = "icon-set-circles2-light-red.png"; }; -Bitmap BMP_ARROW_YELLOW_DOWN_RIGHT +Bitmap BMP_ICON_SET_CIRCLES2_DARK_RED { - File = "yellow_arrow_down_right.png"; + File = "icon-set-circles2-dark-red.png"; }; -Bitmap BMP_GREEN_TRIANGLE_UP +Bitmap BMP_ICON_SET_COLORARROWS_DOWN { - File = "triangle_up_green.png"; + File = "icon-set-colorarrows-down.png"; }; -Bitmap BMP_BLACK_MINUS +Bitmap BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN { - File = "minus.png"; + File = "icon-set-colorarrows-slightly-down.png"; }; -Bitmap BMP_RED_TRIANGLE_DOWN +Bitmap BMP_ICON_SET_COLORARROWS_SAME { - File = "triangle_down_red.png"; + File = "icon-set-colorarrows-same.png"; }; -Bitmap BMP_SIGN +Bitmap BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP { - File = "sign.png"; + File = "icon-set-colorarrows-slightly-up.png"; }; -Bitmap BMP_EXCLAMATION_MARK +Bitmap BMP_ICON_SET_COLORARROWS_UP { - File = "exclamation_mark.png"; + File = "icon-set-colorarrows-up.png"; }; -Bitmap BMP_CANCEL +Bitmap BMP_ICON_SET_FLAGS_RED { - File = "cancel.png"; + File = "icon-set-flags-red.png"; +}; +Bitmap BMP_ICON_SET_FLAGS_YELLOW +{ + File = "icon-set-flags-yellow.png"; +}; +Bitmap BMP_ICON_SET_FLAGS_GREEN +{ + File = "icon-set-flags-green.png"; +}; +Bitmap BMP_ICON_SET_GRAYARROWS_DOWN +{ + File = "icon-set-grayarrows-down.png"; +}; +Bitmap BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN +{ + File = "icon-set-grayarrows-slightly-down.png"; +}; +Bitmap BMP_ICON_SET_GRAYARROWS_SAME +{ + File = "icon-set-grayarrows-same.png"; +}; +Bitmap BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP +{ + File = "icon-set-grayarrows-slightly-up.png"; +}; +Bitmap BMP_ICON_SET_GRAYARROWS_UP +{ + File = "icon-set-grayarrows-up.png"; +}; +Bitmap BMP_ICON_SET_PIES_EMPTY +{ + File = "icon-set-pies-empty.png"; +}; +Bitmap BMP_ICON_SET_PIES_ONE_QUARTER +{ + File = "icon-set-pies-one-quarter.png"; +}; +Bitmap BMP_ICON_SET_PIES_HALF +{ + File = "icon-set-pies-half.png"; +}; +Bitmap BMP_ICON_SET_PIES_THREE_QUARTER +{ + File = "icon-set-pies-three-quarters.png"; +}; +Bitmap BMP_ICON_SET_PIES_FULL +{ + File = "icon-set-pies-full.png"; +}; +Bitmap BMP_ICON_SET_SHAPES_CIRCLE +{ + File = "icon-set-shapes-circle.png"; +}; +Bitmap BMP_ICON_SET_SHAPES_TRIANGLE +{ + File = "icon-set-shapes-triangle"; +}; +Bitmap BMP_ICON_SET_SHAPES_DIAMOND +{ + File = "icon-set-shapes-diamond.png"; +}; +Bitmap BMP_ICON_SET_SQUARES_EMPTY +{ + File = "icon-set-squares-empty.png"; +}; +Bitmap BMP_ICON_SET_SQUARES_ONE_QUARTER +{ + File = "icon-set-squares-one-quarter.png"; +}; +Bitmap BMP_ICON_SET_SQUARES_HALF +{ + File = "icon-set-squares-half.png"; +}; +Bitmap BMP_ICON_SET_SQUARES_THREE_QUARTER +{ + File = "icon-set-squares-three-quarters.png"; +}; +Bitmap BMP_ICON_SET_SQUARES_FULL +{ + File = "icon-set-squares-full.png"; +}; +Bitmap BMP_ICON_SET_STARS_EMPTY +{ + File = "icon-set-stars-empty.png"; +}; +Bitmap BMP_ICON_SET_STARS_HALF +{ + File = "icon-set-stars-half.png"; +}; +Bitmap BMP_ICON_SET_STARS_FULL +{ + File = "icon-set-stars-full.png"; +}; +Bitmap BMP_ICON_SET_SYMBOLS1_CHECK +{ + File = "icon-set-symbols1-check.png"; +}; +Bitmap BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK +{ + File = "icon-set-symbols1-exclamation-mark.png"; +}; +Bitmap BMP_ICON_SET_SYMBOLS1_CROSS +{ + File = "icon-set-symbols1-cross.png"; +}; +Bitmap BMP_ICON_SET_TRAFFICLIGHTS_RED +{ + File = "icon-set-trafficlights-red.png"; +}; +Bitmap BMP_ICON_SET_TRAFFICLIGHTS_YELLOW +{ + File = "icon-set-trafficlights-yellow.png"; +}; +Bitmap BMP_ICON_SET_TRAFFICLIGHTS_GREEN +{ + File = "icon-set-trafficlights-green.png"; +}; +Bitmap BMP_ICON_SET_TRIANGLES_DOWN +{ + File = "icon-set-triangles-down.png"; +}; +Bitmap BMP_ICON_SET_TRIANGLES_SAME +{ + File = "icon-set-triangles-same.png"; +}; +Bitmap BMP_ICON_SET_TRIANGLES_UP +{ + File = "icon-set-triangles-up.png"; }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 81af7ba..16e253f 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -94,31 +94,74 @@ static ColorData nAuthorColor[ SC_AUTHORCOLORCOUNT ] = { COL_BROWN, COL_MAGENTA, COL_CYAN }; sal_Int32 a3TrafficLights1[] = { - BMP_RED_CIRCLE, BMP_YELLOW_CIRCLE, BMP_GREEN_CIRCLE + BMP_ICON_SET_CIRCLES1_RED, BMP_ICON_SET_CIRCLES1_YELLOW, BMP_ICON_SET_CIRCLES1_GREEN +}; + +sal_Int32 a3TrafficLights2[] = { + BMP_ICON_SET_TRAFFICLIGHTS_RED, BMP_ICON_SET_TRAFFICLIGHTS_YELLOW, BMP_ICON_SET_TRAFFICLIGHTS_GREEN }; sal_Int32 a3Arrows[] = { - BMP_ARROW_RED_DOWN, BMP_ARROW_YELLOW_RIGHT, BMP_ARROW_GREEN_UP + BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SAME, BMP_ICON_SET_COLORARROWS_UP +}; + +sal_Int32 a3ArrowsGray[] = { + BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SAME, BMP_ICON_SET_GRAYARROWS_UP +}; + +sal_Int32 a3Flags[] = { + BMP_ICON_SET_FLAGS_RED, BMP_ICON_SET_FLAGS_YELLOW, BMP_ICON_SET_FLAGS_GREEN }; sal_Int32 a4Arrows[] = { - BMP_ARROW_RED_DOWN, BMP_ARROW_YELLOW_DOWN_RIGHT, BMP_ARROW_YELLOW_UP_RIGHT, BMP_ARROW_GREEN_UP + BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, BMP_ICON_SET_COLORARROWS_UP +}; + +sal_Int32 a4ArrowsGray[] = { + BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, BMP_ICON_SET_GRAYARROWS_UP }; sal_Int32 a5Arrows[] = { - BMP_ARROW_RED_DOWN, BMP_ARROW_YELLOW_DOWN_RIGHT, BMP_ARROW_YELLOW_RIGHT, BMP_ARROW_YELLOW_UP_RIGHT, BMP_ARROW_GREEN_UP + BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN, + BMP_ICON_SET_COLORARROWS_SAME, BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, BMP_ICON_SET_COLORARROWS_UP +}; + +sal_Int32 a5ArrowsGray[] = { + BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN, + BMP_ICON_SET_GRAYARROWS_SAME, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, BMP_ICON_SET_GRAYARROWS_UP }; sal_Int32 a4TrafficLights[] = { - BMP_BLACK_CIRCLE, BMP_RED_CIRCLE, BMP_YELLOW_CIRCLE, BMP_GREEN_CIRCLE + BMP_ICON_SET_CIRCLES1_GRAY, BMP_ICON_SET_CIRCLES1_RED, + BMP_ICON_SET_CIRCLES1_YELLOW, BMP_ICON_SET_CIRCLES1_GREEN }; sal_Int32 a5Quarters[] = { - BMP_BLACK_CIRCLE_EMPTY, BMP_BLACK_CIRCLE_1_4TH, BMP_BLACK_CIRCLE_HALF, BMP_BLACK_CIRCLE_3_4TH, BMP_BLACK_CIRCLE + BMP_ICON_SET_PIES_EMPTY, BMP_ICON_SET_PIES_ONE_QUARTER, BMP_ICON_SET_PIES_HALF, + BMP_ICON_SET_PIES_THREE_QUARTER, BMP_ICON_SET_PIES_FULL, }; sal_Int32 a3Symbols1[] = { - BMP_CANCEL, BMP_EXCLAMATION_MARK, BMP_SIGN + BMP_ICON_SET_SYMBOLS1_CHECK, BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK, BMP_ICON_SET_SYMBOLS1_CROSS +}; + +sal_Int32 a3Signs[] = { + BMP_ICON_SET_SHAPES_DIAMOND, BMP_ICON_SET_SHAPES_TRIANGLE, BMP_ICON_SET_SHAPES_CIRCLE +}; + +sal_Int32 a4RedToBlack[] = { + BMP_ICON_SET_CIRCLES2_DARK_GRAY, BMP_ICON_SET_CIRCLES2_LIGHT_GRAY, + BMP_ICON_SET_CIRCLES2_LIGHT_RED, BMP_ICON_SET_CIRCLES2_DARK_RED +}; + +sal_Int32 a4Ratings[] = { + BMP_ICON_SET_BARS_ONE_QUARTER, BMP_ICON_SET_BARS_HALF, + BMP_ICON_SET_BARS_THREE_QUARTER, BMP_ICON_SET_BARS_FULL +}; + +sal_Int32 a5Ratings[] = { + BMP_ICON_SET_BARS_EMPTY, BMP_ICON_SET_BARS_ONE_QUARTER, BMP_ICON_SET_BARS_HALF, + BMP_ICON_SET_BARS_THREE_QUARTER, BMP_ICON_SET_BARS_FULL }; struct ScIconSetBitmapMap { @@ -127,18 +170,23 @@ struct ScIconSetBitmapMap { }; static ScIconSetBitmapMap aBitmapMap[] = { - { IconSet_3TrafficLights1, a3TrafficLights1 }, - { IconSet_3TrafficLights2, a3TrafficLights1 }, { IconSet_3Arrows, a3Arrows }, - { IconSet_3ArrowsGray, a3Arrows }, + { IconSet_3ArrowsGray, a3ArrowsGray }, + { IconSet_3Flags, a3Flags }, + { IconSet_3Signs, a3Signs }, { IconSet_3Symbols, a3Symbols1 }, { IconSet_3Symbols2, a3Symbols1 }, + { IconSet_3TrafficLights1, a3TrafficLights1 }, + { IconSet_3TrafficLights2, a3TrafficLights2 }, { IconSet_4Arrows, a4Arrows }, - { IconSet_4ArrowsGray, a4Arrows }, + { IconSet_4ArrowsGray, a4ArrowsGray }, + { IconSet_4Rating, a4Ratings }, + { IconSet_4RedToBlack, a4RedToBlack }, { IconSet_4TrafficLights, a4TrafficLights }, { IconSet_5Arrows, a5Arrows }, - { IconSet_5ArrowsGray, a5Arrows }, - { IconSet_5Quarters, a5Quarters } + { IconSet_5ArrowsGray, a5ArrowsGray }, + { IconSet_5Quarters, a5Quarters }, + { IconSet_5Ratings, a5Ratings } }; static std::map< sal_Int32, BitmapEx > aIconSetBitmaps; commit cd545dcf511daedd548c11159b8c244f272e9cb6 Author: Markus Mohrhard <[email protected]> Date: Mon Nov 12 03:08:54 2012 +0100 make sure that the sort vector is large enough, fdo#56958 Change-Id: I7099e984a8b05ccd3324f3b9231c193e716eaf83 diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 3e557a1..0955b8a 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -246,6 +246,9 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) if ( nSortPos[i] == LISTBOX_ENTRY_NOTFOUND ) nSortPos[i] = 0; } + if( nSortKeyCount >= aNewSortData.maKeyState.size() ) + aNewSortData.maKeyState.resize(nSortKeyCount); + if ( nSortPos[0] > 0 ) { for ( sal_uInt16 i=0; i<nSortKeyCount; i++ ) commit c45b6496e87fe74570a41821bc5f4fbdb3d3cf8e Author: Markus Mohrhard <[email protected]> Date: Mon Nov 12 03:07:38 2012 +0100 only set entries for existing sort entries, related fdo#56958 Change-Id: Ib48606402fb90b259f705badeac294d7c336cb9c diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 5de7f74..3e557a1 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -163,7 +163,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) { for ( sal_uInt16 i=0; i<nSortKeyCount; i++ ) { - if ( aSortData.maKeyState[i].bDoSort ) + if ( i < aSortData.maKeyState.size() && aSortData.maKeyState[i].bDoSort ) { maSortKeyItems[i].aLbSort.SelectEntryPos( GetFieldSelPos( aSortData.maKeyState[i].nField ) ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
