Merge commit 'ooo/DEV300_m101' into intm101

Conflicts:
	default_images/res/commandimagelist/lch_showannotations.png
	default_images/shared/spinner-16-06.png
	default_images/svx/res/cropmarkersACC.png
	default_images/svx/res/markersACC.png
	default_images/svx/source/svdraw/cropmarkersACC.png
	default_images/svx/source/svdraw/markersACC.png
	default_images/toolkit/source/awt/spinner03-32-hc_01.png
	default_images/toolkit/source/awt/spinner03-32-hc_02.png
	default_images/toolkit/source/awt/spinner03-32-hc_03.png
	default_images/toolkit/source/awt/spinner03-32-hc_04.png
	default_images/toolkit/source/awt/spinner03-32-hc_05.png
	default_images/toolkit/source/awt/spinner03-32-hc_06.png
	default_images/toolkit/source/awt/spinner03-32-hc_07.png
	default_images/toolkit/source/awt/spinner03-32-hc_08.png
	default_images/toolkit/source/awt/spinner03-32-hc_09.png
	default_images/toolkit/source/awt/spinner03-32-hc_10.png
	default_images/toolkit/source/awt/spinner03-32-hc_11.png
	default_images/toolkit/source/awt/spinner03-32-hc_12.png
	default_images/toolkit/tk/spinner03-32-hc_01.png
	default_images/toolkit/tk/spinner03-32-hc_02.png
	default_images/toolkit/tk/spinner03-32-hc_03.png
	default_images/toolkit/tk/spinner03-32-hc_04.png
	default_images/toolkit/tk/spinner03-32-hc_05.png
	default_images/toolkit/tk/spinner03-32-hc_06.png
	default_images/toolkit/tk/spinner03-32-hc_07.png
	default_images/toolkit/tk/spinner03-32-hc_08.png
	default_images/toolkit/tk/spinner03-32-hc_09.png
	default_images/toolkit/tk/spinner03-32-hc_10.png
	default_images/toolkit/tk/spinner03-32-hc_11.png
	default_images/toolkit/tk/spinner03-32-hc_12.png
	ooo_custom_images/oxygen/svx/source/svdraw/cropmarkersACC.png
	ooo_custom_images/oxygen/svx/source/svdraw/markersACC.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_01.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_02.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_03.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_04.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_05.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_06.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_07.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_08.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_09.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_10.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_11.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_12.png

27 files changed, 0 insertions, 0 deletions

diff --git a/ooo_custom_images/hicontrast/res/commandimagelist/lc_showannotations.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showannotations.png
new file mode 100755
index 000000000000..b298f8cf843d
--- /dev/null
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showannotations.png
diff --git a/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkersACC.png b/ooo_custom_images/hicontrast/svx/res/cropmarkers.png
index 637704302148..637704302148 100644
--- a/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkersACC.png
+++ b/ooo_custom_images/hicontrast/svx/res/cropmarkers.png
diff --git a/ooo_custom_images/oxygen/svx/source/svdraw/markersACC.png b/ooo_custom_images/hicontrast/svx/res/markers.png
index e521d742164f..e521d742164f 100644
--- a/ooo_custom_images/oxygen/svx/source/svdraw/markersACC.png
+++ b/ooo_custom_images/hicontrast/svx/res/markers.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_01.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_01.png
index c3596c19f276..c3596c19f276 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_01.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_01.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_02.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_02.png
index e2ca6b965d23..e2ca6b965d23 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_02.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_02.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_03.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_03.png
index 6609d3a6d300..6609d3a6d300 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_03.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_03.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_04.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_04.png
index e70a393be204..e70a393be204 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_04.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_04.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_05.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_05.png
index 63eb3e10375c..63eb3e10375c 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_05.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_05.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_06.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_06.png
index c072e397cc00..c072e397cc00 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_06.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_06.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_07.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_07.png
index 801ea3b36f9e..801ea3b36f9e 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_07.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_07.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_08.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_08.png
index 60635b1e47e1..60635b1e47e1 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_08.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_08.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_09.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_09.png
index 0a4513daa636..0a4513daa636 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_09.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_09.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_10.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_10.png
index 06fbd02faf7f..06fbd02faf7f 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_10.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_10.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_11.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_11.png
index 89e14cd33786..89e14cd33786 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_11.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_11.png
diff --git a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_12.png b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_12.png
index 2ced9380408e..2ced9380408e 100644
--- a/ooo_custom_images/human/toolkit/source/awt/spinner03-32-hc_12.png
+++ b/ooo_custom_images/hicontrast/toolkit/tk/spinner03-grey_12.png
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_01.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_01.png
deleted file mode 100644
index c3596c19f276..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_01.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_02.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_02.png
deleted file mode 100644
index e2ca6b965d23..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_02.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_03.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_03.png
deleted file mode 100644
index 6609d3a6d300..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_03.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_04.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_04.png
deleted file mode 100644
index e70a393be204..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_04.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_05.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_05.png
deleted file mode 100644
index 63eb3e10375c..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_05.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_06.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_06.png
deleted file mode 100644
index c072e397cc00..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_06.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_07.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_07.png
deleted file mode 100644
index 801ea3b36f9e..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_07.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_08.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_08.png
deleted file mode 100644
index 60635b1e47e1..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_08.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_09.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_09.png
deleted file mode 100644
index 0a4513daa636..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_09.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_10.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_10.png
deleted file mode 100644
index 06fbd02faf7f..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_10.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_11.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_11.png
deleted file mode 100644
index 89e14cd33786..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_11.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_12.png b/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_12.png
deleted file mode 100644
index 2ced9380408e..000000000000
--- a/ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_12.png
+++ /dev/null