From 3dfe2fc394ca1e168e800ffcc3ac0f69b4eeb173 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 2 May 2015 19:03:21 +0200 Subject: tdf#68871: Remove the old Elements panel from Math MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Conflicts: starmath/inc/toolbox.hxx starmath/source/toolbox.cxx Change-Id: Ie148d57dc14ed3f38566c24ee027f23e25987810 Reviewed-on: https://gerrit.libreoffice.org/15599 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- icon-themes/classic/classic_images.tar.gz | Bin 1683994 -> 1669069 bytes icon-themes/galaxy/starmath/res/im21101.png | Bin 166 -> 0 bytes icon-themes/galaxy/starmath/res/im21102.png | Bin 148 -> 0 bytes icon-themes/galaxy/starmath/res/im21103.png | Bin 154 -> 0 bytes icon-themes/galaxy/starmath/res/im21104.png | Bin 167 -> 0 bytes icon-themes/galaxy/starmath/res/im21105.png | Bin 149 -> 0 bytes icon-themes/galaxy/starmath/res/im21106.png | Bin 141 -> 0 bytes icon-themes/galaxy/starmath/res/im21107.png | Bin 172 -> 0 bytes icon-themes/galaxy/starmath/res/im21108.png | Bin 813 -> 0 bytes icon-themes/galaxy/starmath/res/im21117.png | Bin 158 -> 0 bytes icon-themes/galaxy/starmath/res/un21201.png | Bin 132 -> 0 bytes icon-themes/galaxy/starmath/res/un21202.png | Bin 130 -> 0 bytes icon-themes/galaxy/starmath/res/un21203.png | Bin 132 -> 0 bytes icon-themes/galaxy/starmath/res/un21204.png | Bin 134 -> 0 bytes icon-themes/galaxy/starmath/res/un21205.png | Bin 146 -> 0 bytes icon-themes/galaxy/starmath/res/un21206.png | Bin 147 -> 0 bytes icon-themes/galaxy/starmath/res/un21207.png | Bin 151 -> 0 bytes icon-themes/galaxy/starmath/res/un21208.png | Bin 154 -> 0 bytes icon-themes/galaxy/starmath/res/un21209.png | Bin 144 -> 0 bytes icon-themes/galaxy/starmath/res/un21210.png | Bin 152 -> 0 bytes icon-themes/galaxy/starmath/res/un21211.png | Bin 153 -> 0 bytes icon-themes/galaxy/starmath/res/un21212.png | Bin 165 -> 0 bytes icon-themes/galaxy/starmath/res/un21213.png | Bin 128 -> 0 bytes icon-themes/galaxy/starmath/res/un21214.png | Bin 155 -> 0 bytes icon-themes/galaxy/starmath/res/un21215.png | Bin 154 -> 0 bytes icon-themes/galaxy/starmath/res/un21221.png | Bin 145 -> 0 bytes icon-themes/hicontrast/starmath/res/im21101.png | Bin 150 -> 0 bytes icon-themes/hicontrast/starmath/res/im21102.png | Bin 133 -> 0 bytes icon-themes/hicontrast/starmath/res/im21103.png | Bin 138 -> 0 bytes icon-themes/hicontrast/starmath/res/im21104.png | Bin 142 -> 0 bytes icon-themes/hicontrast/starmath/res/im21105.png | Bin 134 -> 0 bytes icon-themes/hicontrast/starmath/res/im21106.png | Bin 114 -> 0 bytes icon-themes/hicontrast/starmath/res/im21107.png | Bin 146 -> 0 bytes icon-themes/hicontrast/starmath/res/im21108.png | Bin 216 -> 0 bytes icon-themes/hicontrast/starmath/res/im21117.png | Bin 136 -> 0 bytes icon-themes/hicontrast/starmath/res/un21201.png | Bin 116 -> 0 bytes icon-themes/hicontrast/starmath/res/un21202.png | Bin 114 -> 0 bytes icon-themes/hicontrast/starmath/res/un21203.png | Bin 119 -> 0 bytes icon-themes/hicontrast/starmath/res/un21204.png | Bin 118 -> 0 bytes icon-themes/hicontrast/starmath/res/un21205.png | Bin 125 -> 0 bytes icon-themes/hicontrast/starmath/res/un21206.png | Bin 124 -> 0 bytes icon-themes/hicontrast/starmath/res/un21207.png | Bin 129 -> 0 bytes icon-themes/hicontrast/starmath/res/un21208.png | Bin 132 -> 0 bytes icon-themes/hicontrast/starmath/res/un21209.png | Bin 124 -> 0 bytes icon-themes/hicontrast/starmath/res/un21210.png | Bin 116 -> 0 bytes icon-themes/hicontrast/starmath/res/un21211.png | Bin 128 -> 0 bytes icon-themes/hicontrast/starmath/res/un21212.png | Bin 131 -> 0 bytes icon-themes/hicontrast/starmath/res/un21213.png | Bin 115 -> 0 bytes icon-themes/hicontrast/starmath/res/un21214.png | Bin 127 -> 0 bytes icon-themes/hicontrast/starmath/res/un21215.png | Bin 127 -> 0 bytes icon-themes/hicontrast/starmath/res/un21221.png | Bin 129 -> 0 bytes icon-themes/human/starmath/res/im21101.png | Bin 171 -> 0 bytes icon-themes/human/starmath/res/im21102.png | Bin 148 -> 0 bytes icon-themes/human/starmath/res/im21103.png | Bin 154 -> 0 bytes icon-themes/human/starmath/res/im21104.png | Bin 166 -> 0 bytes icon-themes/human/starmath/res/im21106.png | Bin 141 -> 0 bytes icon-themes/human/starmath/res/im21108.png | Bin 817 -> 0 bytes icon-themes/human/starmath/res/im21117.png | Bin 158 -> 0 bytes icon-themes/human/starmath/res/un21201.png | Bin 132 -> 0 bytes icon-themes/human/starmath/res/un21202.png | Bin 130 -> 0 bytes icon-themes/human/starmath/res/un21203.png | Bin 132 -> 0 bytes icon-themes/human/starmath/res/un21204.png | Bin 134 -> 0 bytes icon-themes/human/starmath/res/un21205.png | Bin 146 -> 0 bytes icon-themes/human/starmath/res/un21206.png | Bin 147 -> 0 bytes icon-themes/human/starmath/res/un21207.png | Bin 152 -> 0 bytes icon-themes/human/starmath/res/un21208.png | Bin 154 -> 0 bytes icon-themes/human/starmath/res/un21209.png | Bin 144 -> 0 bytes icon-themes/human/starmath/res/un21211.png | Bin 153 -> 0 bytes icon-themes/human/starmath/res/un21213.png | Bin 128 -> 0 bytes icon-themes/human/starmath/res/un21214.png | Bin 155 -> 0 bytes icon-themes/human/starmath/res/un21215.png | Bin 154 -> 0 bytes icon-themes/oxygen/starmath/res/im21101.png | Bin 171 -> 0 bytes icon-themes/oxygen/starmath/res/im21102.png | Bin 148 -> 0 bytes icon-themes/oxygen/starmath/res/im21103.png | Bin 154 -> 0 bytes icon-themes/oxygen/starmath/res/im21104.png | Bin 166 -> 0 bytes icon-themes/oxygen/starmath/res/im21106.png | Bin 141 -> 0 bytes icon-themes/oxygen/starmath/res/im21108.png | Bin 244 -> 0 bytes icon-themes/oxygen/starmath/res/im21117.png | Bin 158 -> 0 bytes icon-themes/oxygen/starmath/res/un21201.png | Bin 132 -> 0 bytes icon-themes/oxygen/starmath/res/un21202.png | Bin 130 -> 0 bytes icon-themes/oxygen/starmath/res/un21203.png | Bin 132 -> 0 bytes icon-themes/oxygen/starmath/res/un21204.png | Bin 134 -> 0 bytes icon-themes/oxygen/starmath/res/un21205.png | Bin 146 -> 0 bytes icon-themes/oxygen/starmath/res/un21206.png | Bin 147 -> 0 bytes icon-themes/oxygen/starmath/res/un21207.png | Bin 152 -> 0 bytes icon-themes/oxygen/starmath/res/un21208.png | Bin 154 -> 0 bytes icon-themes/oxygen/starmath/res/un21209.png | Bin 144 -> 0 bytes icon-themes/oxygen/starmath/res/un21211.png | Bin 153 -> 0 bytes icon-themes/oxygen/starmath/res/un21213.png | Bin 128 -> 0 bytes icon-themes/oxygen/starmath/res/un21214.png | Bin 155 -> 0 bytes icon-themes/oxygen/starmath/res/un21215.png | Bin 154 -> 0 bytes starmath/Library_sm.mk | 1 - starmath/UIConfig_smath.mk | 1 - starmath/inc/toolbox.hxx | 91 ------ starmath/source/document.cxx | 1 - starmath/source/smdll.cxx | 2 - starmath/source/toolbox.cxx | 367 ------------------------ starmath/source/toolbox.src | 51 ---- starmath/source/view.cxx | 19 -- starmath/uiconfig/smath/ui/floatingelements.ui | 195 ------------- 100 files changed, 728 deletions(-) delete mode 100644 icon-themes/galaxy/starmath/res/im21101.png delete mode 100644 icon-themes/galaxy/starmath/res/im21102.png delete mode 100644 icon-themes/galaxy/starmath/res/im21103.png delete mode 100644 icon-themes/galaxy/starmath/res/im21104.png delete mode 100644 icon-themes/galaxy/starmath/res/im21105.png delete mode 100644 icon-themes/galaxy/starmath/res/im21106.png delete mode 100644 icon-themes/galaxy/starmath/res/im21107.png delete mode 100644 icon-themes/galaxy/starmath/res/im21108.png delete mode 100644 icon-themes/galaxy/starmath/res/im21117.png delete mode 100644 icon-themes/galaxy/starmath/res/un21201.png delete mode 100644 icon-themes/galaxy/starmath/res/un21202.png delete mode 100644 icon-themes/galaxy/starmath/res/un21203.png delete mode 100644 icon-themes/galaxy/starmath/res/un21204.png delete mode 100644 icon-themes/galaxy/starmath/res/un21205.png delete mode 100644 icon-themes/galaxy/starmath/res/un21206.png delete mode 100644 icon-themes/galaxy/starmath/res/un21207.png delete mode 100644 icon-themes/galaxy/starmath/res/un21208.png delete mode 100644 icon-themes/galaxy/starmath/res/un21209.png delete mode 100644 icon-themes/galaxy/starmath/res/un21210.png delete mode 100644 icon-themes/galaxy/starmath/res/un21211.png delete mode 100644 icon-themes/galaxy/starmath/res/un21212.png delete mode 100644 icon-themes/galaxy/starmath/res/un21213.png delete mode 100644 icon-themes/galaxy/starmath/res/un21214.png delete mode 100644 icon-themes/galaxy/starmath/res/un21215.png delete mode 100644 icon-themes/galaxy/starmath/res/un21221.png delete mode 100644 icon-themes/hicontrast/starmath/res/im21101.png delete mode 100644 icon-themes/hicontrast/starmath/res/im21102.png delete mode 100644 icon-themes/hicontrast/starmath/res/im21103.png delete mode 100644 icon-themes/hicontrast/starmath/res/im21104.png delete mode 100644 icon-themes/hicontrast/starmath/res/im21105.png delete mode 100644 icon-themes/hicontrast/starmath/res/im21106.png delete mode 100644 icon-themes/hicontrast/starmath/res/im21107.png delete mode 100644 icon-themes/hicontrast/starmath/res/im21108.png delete mode 100644 icon-themes/hicontrast/starmath/res/im21117.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21201.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21202.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21203.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21204.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21205.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21206.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21207.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21208.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21209.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21210.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21211.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21212.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21213.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21214.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21215.png delete mode 100644 icon-themes/hicontrast/starmath/res/un21221.png delete mode 100644 icon-themes/human/starmath/res/im21101.png delete mode 100644 icon-themes/human/starmath/res/im21102.png delete mode 100644 icon-themes/human/starmath/res/im21103.png delete mode 100644 icon-themes/human/starmath/res/im21104.png delete mode 100644 icon-themes/human/starmath/res/im21106.png delete mode 100644 icon-themes/human/starmath/res/im21108.png delete mode 100644 icon-themes/human/starmath/res/im21117.png delete mode 100644 icon-themes/human/starmath/res/un21201.png delete mode 100644 icon-themes/human/starmath/res/un21202.png delete mode 100644 icon-themes/human/starmath/res/un21203.png delete mode 100644 icon-themes/human/starmath/res/un21204.png delete mode 100644 icon-themes/human/starmath/res/un21205.png delete mode 100644 icon-themes/human/starmath/res/un21206.png delete mode 100644 icon-themes/human/starmath/res/un21207.png delete mode 100644 icon-themes/human/starmath/res/un21208.png delete mode 100644 icon-themes/human/starmath/res/un21209.png delete mode 100644 icon-themes/human/starmath/res/un21211.png delete mode 100644 icon-themes/human/starmath/res/un21213.png delete mode 100644 icon-themes/human/starmath/res/un21214.png delete mode 100644 icon-themes/human/starmath/res/un21215.png delete mode 100644 icon-themes/oxygen/starmath/res/im21101.png delete mode 100644 icon-themes/oxygen/starmath/res/im21102.png delete mode 100644 icon-themes/oxygen/starmath/res/im21103.png delete mode 100644 icon-themes/oxygen/starmath/res/im21104.png delete mode 100644 icon-themes/oxygen/starmath/res/im21106.png delete mode 100644 icon-themes/oxygen/starmath/res/im21108.png delete mode 100644 icon-themes/oxygen/starmath/res/im21117.png delete mode 100644 icon-themes/oxygen/starmath/res/un21201.png delete mode 100644 icon-themes/oxygen/starmath/res/un21202.png delete mode 100644 icon-themes/oxygen/starmath/res/un21203.png delete mode 100644 icon-themes/oxygen/starmath/res/un21204.png delete mode 100644 icon-themes/oxygen/starmath/res/un21205.png delete mode 100644 icon-themes/oxygen/starmath/res/un21206.png delete mode 100644 icon-themes/oxygen/starmath/res/un21207.png delete mode 100644 icon-themes/oxygen/starmath/res/un21208.png delete mode 100644 icon-themes/oxygen/starmath/res/un21209.png delete mode 100644 icon-themes/oxygen/starmath/res/un21211.png delete mode 100644 icon-themes/oxygen/starmath/res/un21213.png delete mode 100644 icon-themes/oxygen/starmath/res/un21214.png delete mode 100644 icon-themes/oxygen/starmath/res/un21215.png delete mode 100644 starmath/inc/toolbox.hxx delete mode 100644 starmath/source/toolbox.cxx delete mode 100644 starmath/uiconfig/smath/ui/floatingelements.ui diff --git a/icon-themes/classic/classic_images.tar.gz b/icon-themes/classic/classic_images.tar.gz index f013ecbad47f..808223c89753 100644 Binary files a/icon-themes/classic/classic_images.tar.gz and b/icon-themes/classic/classic_images.tar.gz differ diff --git a/icon-themes/galaxy/starmath/res/im21101.png b/icon-themes/galaxy/starmath/res/im21101.png deleted file mode 100644 index dd2a4864e7dc..000000000000 Binary files a/icon-themes/galaxy/starmath/res/im21101.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/im21102.png b/icon-themes/galaxy/starmath/res/im21102.png deleted file mode 100644 index f5803afad041..000000000000 Binary files a/icon-themes/galaxy/starmath/res/im21102.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/im21103.png b/icon-themes/galaxy/starmath/res/im21103.png deleted file mode 100644 index e1ac12a5053e..000000000000 Binary files a/icon-themes/galaxy/starmath/res/im21103.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/im21104.png b/icon-themes/galaxy/starmath/res/im21104.png deleted file mode 100644 index 5b6825262c92..000000000000 Binary files a/icon-themes/galaxy/starmath/res/im21104.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/im21105.png b/icon-themes/galaxy/starmath/res/im21105.png deleted file mode 100644 index 226dcd3c0f16..000000000000 Binary files a/icon-themes/galaxy/starmath/res/im21105.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/im21106.png b/icon-themes/galaxy/starmath/res/im21106.png deleted file mode 100644 index 427837483a73..000000000000 Binary files a/icon-themes/galaxy/starmath/res/im21106.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/im21107.png b/icon-themes/galaxy/starmath/res/im21107.png deleted file mode 100644 index 5130d8e56e3a..000000000000 Binary files a/icon-themes/galaxy/starmath/res/im21107.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/im21108.png b/icon-themes/galaxy/starmath/res/im21108.png deleted file mode 100644 index 36e1b7bc0bcf..000000000000 Binary files a/icon-themes/galaxy/starmath/res/im21108.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/im21117.png b/icon-themes/galaxy/starmath/res/im21117.png deleted file mode 100644 index db73bf8fb233..000000000000 Binary files a/icon-themes/galaxy/starmath/res/im21117.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21201.png b/icon-themes/galaxy/starmath/res/un21201.png deleted file mode 100644 index 043373cf49d6..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21201.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21202.png b/icon-themes/galaxy/starmath/res/un21202.png deleted file mode 100644 index bc991ee7af57..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21202.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21203.png b/icon-themes/galaxy/starmath/res/un21203.png deleted file mode 100644 index b90586d38c78..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21203.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21204.png b/icon-themes/galaxy/starmath/res/un21204.png deleted file mode 100644 index 85c808f00fc9..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21204.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21205.png b/icon-themes/galaxy/starmath/res/un21205.png deleted file mode 100644 index ae04edc90363..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21205.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21206.png b/icon-themes/galaxy/starmath/res/un21206.png deleted file mode 100644 index efd102c22545..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21206.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21207.png b/icon-themes/galaxy/starmath/res/un21207.png deleted file mode 100644 index 00504dafe1e2..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21207.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21208.png b/icon-themes/galaxy/starmath/res/un21208.png deleted file mode 100644 index 8f3f992a7553..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21208.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21209.png b/icon-themes/galaxy/starmath/res/un21209.png deleted file mode 100644 index 727a4c879808..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21209.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21210.png b/icon-themes/galaxy/starmath/res/un21210.png deleted file mode 100644 index 0aacca97d73b..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21210.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21211.png b/icon-themes/galaxy/starmath/res/un21211.png deleted file mode 100644 index d68c98d1f199..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21211.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21212.png b/icon-themes/galaxy/starmath/res/un21212.png deleted file mode 100644 index 38f45e01273d..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21212.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21213.png b/icon-themes/galaxy/starmath/res/un21213.png deleted file mode 100644 index c93f614b1a6a..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21213.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21214.png b/icon-themes/galaxy/starmath/res/un21214.png deleted file mode 100644 index 31c19752022b..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21214.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21215.png b/icon-themes/galaxy/starmath/res/un21215.png deleted file mode 100644 index 32066c757b15..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21215.png and /dev/null differ diff --git a/icon-themes/galaxy/starmath/res/un21221.png b/icon-themes/galaxy/starmath/res/un21221.png deleted file mode 100644 index b8bd5b4b62e8..000000000000 Binary files a/icon-themes/galaxy/starmath/res/un21221.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/im21101.png b/icon-themes/hicontrast/starmath/res/im21101.png deleted file mode 100644 index 74a08df0df6a..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/im21101.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/im21102.png b/icon-themes/hicontrast/starmath/res/im21102.png deleted file mode 100644 index 99678e665292..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/im21102.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/im21103.png b/icon-themes/hicontrast/starmath/res/im21103.png deleted file mode 100644 index 0f1564d60059..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/im21103.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/im21104.png b/icon-themes/hicontrast/starmath/res/im21104.png deleted file mode 100644 index 947f88b278a8..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/im21104.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/im21105.png b/icon-themes/hicontrast/starmath/res/im21105.png deleted file mode 100644 index d30145b85995..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/im21105.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/im21106.png b/icon-themes/hicontrast/starmath/res/im21106.png deleted file mode 100644 index 7c34b14211a2..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/im21106.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/im21107.png b/icon-themes/hicontrast/starmath/res/im21107.png deleted file mode 100644 index fd604c46e2e1..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/im21107.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/im21108.png b/icon-themes/hicontrast/starmath/res/im21108.png deleted file mode 100644 index 5955124b962e..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/im21108.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/im21117.png b/icon-themes/hicontrast/starmath/res/im21117.png deleted file mode 100644 index d420e9131250..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/im21117.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21201.png b/icon-themes/hicontrast/starmath/res/un21201.png deleted file mode 100644 index 57d2b4020c31..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21201.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21202.png b/icon-themes/hicontrast/starmath/res/un21202.png deleted file mode 100644 index 4c8458a573bf..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21202.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21203.png b/icon-themes/hicontrast/starmath/res/un21203.png deleted file mode 100644 index 0c8f8f1c87b6..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21203.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21204.png b/icon-themes/hicontrast/starmath/res/un21204.png deleted file mode 100644 index 2bde9f41d240..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21204.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21205.png b/icon-themes/hicontrast/starmath/res/un21205.png deleted file mode 100644 index b05c286f4c4c..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21205.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21206.png b/icon-themes/hicontrast/starmath/res/un21206.png deleted file mode 100644 index 1f2c52f34f56..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21206.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21207.png b/icon-themes/hicontrast/starmath/res/un21207.png deleted file mode 100644 index a68224a46e50..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21207.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21208.png b/icon-themes/hicontrast/starmath/res/un21208.png deleted file mode 100644 index c46742a87334..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21208.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21209.png b/icon-themes/hicontrast/starmath/res/un21209.png deleted file mode 100644 index de42599e8473..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21209.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21210.png b/icon-themes/hicontrast/starmath/res/un21210.png deleted file mode 100644 index 0f92b581d5da..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21210.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21211.png b/icon-themes/hicontrast/starmath/res/un21211.png deleted file mode 100644 index 685a776648a1..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21211.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21212.png b/icon-themes/hicontrast/starmath/res/un21212.png deleted file mode 100644 index e8d376a6a263..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21212.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21213.png b/icon-themes/hicontrast/starmath/res/un21213.png deleted file mode 100644 index 3170f692e841..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21213.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21214.png b/icon-themes/hicontrast/starmath/res/un21214.png deleted file mode 100644 index 23d3fd1ed28b..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21214.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21215.png b/icon-themes/hicontrast/starmath/res/un21215.png deleted file mode 100644 index b40a2be4f8a0..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21215.png and /dev/null differ diff --git a/icon-themes/hicontrast/starmath/res/un21221.png b/icon-themes/hicontrast/starmath/res/un21221.png deleted file mode 100644 index 7f1ec5bb41c8..000000000000 Binary files a/icon-themes/hicontrast/starmath/res/un21221.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/im21101.png b/icon-themes/human/starmath/res/im21101.png deleted file mode 100644 index a315d7179ff3..000000000000 Binary files a/icon-themes/human/starmath/res/im21101.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/im21102.png b/icon-themes/human/starmath/res/im21102.png deleted file mode 100644 index 04e1ad1d2667..000000000000 Binary files a/icon-themes/human/starmath/res/im21102.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/im21103.png b/icon-themes/human/starmath/res/im21103.png deleted file mode 100644 index b6a073bce337..000000000000 Binary files a/icon-themes/human/starmath/res/im21103.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/im21104.png b/icon-themes/human/starmath/res/im21104.png deleted file mode 100644 index f4a88edeaa34..000000000000 Binary files a/icon-themes/human/starmath/res/im21104.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/im21106.png b/icon-themes/human/starmath/res/im21106.png deleted file mode 100644 index a1c5fc5bc556..000000000000 Binary files a/icon-themes/human/starmath/res/im21106.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/im21108.png b/icon-themes/human/starmath/res/im21108.png deleted file mode 100644 index 7dcd27f65af1..000000000000 Binary files a/icon-themes/human/starmath/res/im21108.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/im21117.png b/icon-themes/human/starmath/res/im21117.png deleted file mode 100644 index db54dd8b3a09..000000000000 Binary files a/icon-themes/human/starmath/res/im21117.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21201.png b/icon-themes/human/starmath/res/un21201.png deleted file mode 100644 index 17a805a29965..000000000000 Binary files a/icon-themes/human/starmath/res/un21201.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21202.png b/icon-themes/human/starmath/res/un21202.png deleted file mode 100644 index 4b11808fd182..000000000000 Binary files a/icon-themes/human/starmath/res/un21202.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21203.png b/icon-themes/human/starmath/res/un21203.png deleted file mode 100644 index 82b330889c40..000000000000 Binary files a/icon-themes/human/starmath/res/un21203.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21204.png b/icon-themes/human/starmath/res/un21204.png deleted file mode 100644 index cfbef943fd29..000000000000 Binary files a/icon-themes/human/starmath/res/un21204.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21205.png b/icon-themes/human/starmath/res/un21205.png deleted file mode 100644 index 963c68ae8160..000000000000 Binary files a/icon-themes/human/starmath/res/un21205.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21206.png b/icon-themes/human/starmath/res/un21206.png deleted file mode 100644 index 64fd47d4ef5d..000000000000 Binary files a/icon-themes/human/starmath/res/un21206.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21207.png b/icon-themes/human/starmath/res/un21207.png deleted file mode 100644 index c1212092afdb..000000000000 Binary files a/icon-themes/human/starmath/res/un21207.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21208.png b/icon-themes/human/starmath/res/un21208.png deleted file mode 100644 index 045da4c5661c..000000000000 Binary files a/icon-themes/human/starmath/res/un21208.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21209.png b/icon-themes/human/starmath/res/un21209.png deleted file mode 100644 index e3079d9c498c..000000000000 Binary files a/icon-themes/human/starmath/res/un21209.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21211.png b/icon-themes/human/starmath/res/un21211.png deleted file mode 100644 index 88a7ded31ba3..000000000000 Binary files a/icon-themes/human/starmath/res/un21211.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21213.png b/icon-themes/human/starmath/res/un21213.png deleted file mode 100644 index 223e6b88cb36..000000000000 Binary files a/icon-themes/human/starmath/res/un21213.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21214.png b/icon-themes/human/starmath/res/un21214.png deleted file mode 100644 index f9662099b811..000000000000 Binary files a/icon-themes/human/starmath/res/un21214.png and /dev/null differ diff --git a/icon-themes/human/starmath/res/un21215.png b/icon-themes/human/starmath/res/un21215.png deleted file mode 100644 index efdb1c1d3987..000000000000 Binary files a/icon-themes/human/starmath/res/un21215.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/im21101.png b/icon-themes/oxygen/starmath/res/im21101.png deleted file mode 100644 index a315d7179ff3..000000000000 Binary files a/icon-themes/oxygen/starmath/res/im21101.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/im21102.png b/icon-themes/oxygen/starmath/res/im21102.png deleted file mode 100644 index 04e1ad1d2667..000000000000 Binary files a/icon-themes/oxygen/starmath/res/im21102.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/im21103.png b/icon-themes/oxygen/starmath/res/im21103.png deleted file mode 100644 index b6a073bce337..000000000000 Binary files a/icon-themes/oxygen/starmath/res/im21103.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/im21104.png b/icon-themes/oxygen/starmath/res/im21104.png deleted file mode 100644 index f4a88edeaa34..000000000000 Binary files a/icon-themes/oxygen/starmath/res/im21104.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/im21106.png b/icon-themes/oxygen/starmath/res/im21106.png deleted file mode 100644 index a1c5fc5bc556..000000000000 Binary files a/icon-themes/oxygen/starmath/res/im21106.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/im21108.png b/icon-themes/oxygen/starmath/res/im21108.png deleted file mode 100644 index 7222a9c6e10a..000000000000 Binary files a/icon-themes/oxygen/starmath/res/im21108.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/im21117.png b/icon-themes/oxygen/starmath/res/im21117.png deleted file mode 100644 index db54dd8b3a09..000000000000 Binary files a/icon-themes/oxygen/starmath/res/im21117.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21201.png b/icon-themes/oxygen/starmath/res/un21201.png deleted file mode 100644 index 17a805a29965..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21201.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21202.png b/icon-themes/oxygen/starmath/res/un21202.png deleted file mode 100644 index 4b11808fd182..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21202.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21203.png b/icon-themes/oxygen/starmath/res/un21203.png deleted file mode 100644 index 82b330889c40..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21203.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21204.png b/icon-themes/oxygen/starmath/res/un21204.png deleted file mode 100644 index cfbef943fd29..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21204.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21205.png b/icon-themes/oxygen/starmath/res/un21205.png deleted file mode 100644 index 963c68ae8160..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21205.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21206.png b/icon-themes/oxygen/starmath/res/un21206.png deleted file mode 100644 index 64fd47d4ef5d..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21206.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21207.png b/icon-themes/oxygen/starmath/res/un21207.png deleted file mode 100644 index c1212092afdb..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21207.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21208.png b/icon-themes/oxygen/starmath/res/un21208.png deleted file mode 100644 index 045da4c5661c..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21208.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21209.png b/icon-themes/oxygen/starmath/res/un21209.png deleted file mode 100644 index e3079d9c498c..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21209.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21211.png b/icon-themes/oxygen/starmath/res/un21211.png deleted file mode 100644 index 88a7ded31ba3..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21211.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21213.png b/icon-themes/oxygen/starmath/res/un21213.png deleted file mode 100644 index 223e6b88cb36..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21213.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21214.png b/icon-themes/oxygen/starmath/res/un21214.png deleted file mode 100644 index f9662099b811..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21214.png and /dev/null differ diff --git a/icon-themes/oxygen/starmath/res/un21215.png b/icon-themes/oxygen/starmath/res/un21215.png deleted file mode 100644 index efdb1c1d3987..000000000000 Binary files a/icon-themes/oxygen/starmath/res/un21215.png and /dev/null differ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 5358b59ef2ea..203143f09fe8 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -84,7 +84,6 @@ $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/smdll \ starmath/source/smmod \ starmath/source/symbol \ - starmath/source/toolbox \ starmath/source/tmpdevice \ starmath/source/typemap \ starmath/source/unodoc \ diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk index 8eb535d9940c..a798bf751bb7 100644 --- a/starmath/UIConfig_smath.mk +++ b/starmath/UIConfig_smath.mk @@ -27,7 +27,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\ starmath/uiconfig/smath/ui/alignmentdialog \ starmath/uiconfig/smath/ui/catalogdialog \ starmath/uiconfig/smath/ui/dockingelements \ - starmath/uiconfig/smath/ui/floatingelements \ starmath/uiconfig/smath/ui/fontdialog \ starmath/uiconfig/smath/ui/fontsizedialog \ starmath/uiconfig/smath/ui/fonttypedialog \ diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx deleted file mode 100644 index 5c03f5210e22..000000000000 --- a/starmath/inc/toolbox.hxx +++ /dev/null @@ -1,91 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_STARMATH_INC_TOOLBOX_HXX -#define INCLUDED_STARMATH_INC_TOOLBOX_HXX - -#include -#include -#include - -#include "smmod.hxx" -#include "config.hxx" -#include "toolbox.hrc" - -class SmToolBoxWindow : public SfxFloatingWindow -{ - -protected: - VclPtr m_pToolBoxCat; - sal_uInt16 m_nUnbinopsId; - sal_uInt16 m_nRelationsId; - sal_uInt16 m_nSetoperationsId; - sal_uInt16 m_nFunctionsId; - sal_uInt16 m_nOperatorsId; - sal_uInt16 m_nAttributesId; - sal_uInt16 m_nBracketsId; - sal_uInt16 m_nFormatId; - sal_uInt16 m_nMiscId; - VclPtr pToolBoxCmd; - VclPtr vToolBoxCategories[NUM_TBX_CATEGORIES]; - ImageList *aImageLists [NUM_TBX_CATEGORIES + 1]; /* regular */ - sal_uInt16 nActiveCategoryRID; - - virtual bool Close() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - - void ApplyImageLists( sal_uInt16 nCategoryRID ); - - DECL_LINK_TYPED( CategoryClickHdl, ToolBox*, void ); - DECL_LINK_TYPED( CmdSelectHdl, ToolBox*, void ); - - SmViewShell * GetView(); - const ImageList * GetImageList( sal_uInt16 nResId ); - - sal_uInt16 MapToolbarIdToCategory(sal_uInt16 nId) const; - -public: - SmToolBoxWindow(SfxBindings *pBindings, - SfxChildWindow *pChildWindow, - Window *pParent); - virtual ~SmToolBoxWindow(); - virtual void dispose() SAL_OVERRIDE; - - // Window - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent &rEvt ) SAL_OVERRIDE; - - void AdjustPos(); - void SetCategory(sal_uInt16 nCategory); -}; - -/**************************************************************************/ - -class SmToolBoxWrapper : public SfxChildWindow -{ - SFX_DECL_CHILDWINDOW_WITHID(SmToolBoxWrapper); - -protected: - SmToolBoxWrapper(vcl::Window *pParentWindow, - sal_uInt16, SfxBindings*, SfxChildWinInfo*); -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 8ceb44924dc4..12083e489158 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -79,7 +79,6 @@ #include #include #include -#include #include #include #include diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx index eea84b3e6080..d8335211daed 100644 --- a/starmath/source/smdll.cxx +++ b/starmath/source/smdll.cxx @@ -31,7 +31,6 @@ #include #include -#include #include #include @@ -74,7 +73,6 @@ namespace SvxUndoRedoControl::RegisterControl(SID_REDO, pModule); XmlSecStatusBarControl::RegisterControl(SID_SIGNATURE, pModule); - SmToolBoxWrapper::RegisterChildWindow(true); SmCmdBoxWrapper::RegisterChildWindow(true); SmElementsDockingWindowWrapper::RegisterChildWindow(true); diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx deleted file mode 100644 index 0182ce404f3a..000000000000 --- a/starmath/source/toolbox.cxx +++ /dev/null @@ -1,367 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "toolbox.hxx" -#include "starmath.hrc" -#include "toolbox.hrc" -#include "view.hxx" - - - - -static sal_uInt16 GetImageListRID( sal_uInt16 nCategoryRID ) -{ - sal_uInt16 nRes = 0xFFFF; - switch (nCategoryRID) - { - case RID_UNBINOPS_CAT : nRes = RID_IL_UNBINOPS; break; - case RID_RELATIONS_CAT : nRes = RID_IL_RELATIONS; break; - case RID_SETOPERATIONS_CAT : nRes = RID_IL_SETOPERATIONS; break; - case RID_FUNCTIONS_CAT : nRes = RID_IL_FUNCTIONS; break; - case RID_OPERATORS_CAT : nRes = RID_IL_OPERATORS; break; - case RID_ATTRIBUTES_CAT : nRes = RID_IL_ATTRIBUTES; break; - case RID_BRACKETS_CAT : nRes = RID_IL_BRACKETS; break; - case RID_FORMAT_CAT : nRes = RID_IL_FORMAT; break; - case RID_MISC_CAT : nRes = RID_IL_MISC; break; - default : - SAL_WARN( "starmath", "unknown category" ); - } - return nRes; -} - - -static sal_Int16 GetToolBoxCategoriesIndex( sal_uInt16 nCategoryRID ) -{ - sal_Int16 nIdx = -1; - switch (nCategoryRID) - { - case RID_UNBINOPS_CAT : nIdx = 0; break; - case RID_RELATIONS_CAT : nIdx = 1; break; - case RID_SETOPERATIONS_CAT : nIdx = 2; break; - case RID_FUNCTIONS_CAT : nIdx = 3; break; - case RID_OPERATORS_CAT : nIdx = 4; break; - case RID_ATTRIBUTES_CAT : nIdx = 5; break; - case RID_BRACKETS_CAT : nIdx = 6; break; - case RID_FORMAT_CAT : nIdx = 7; break; - case RID_MISC_CAT : nIdx = 8; break; - default: - ; - } - return nIdx; -} - - -static sal_uInt16 GetCategoryRID( sal_uInt16 nResId ) -{ - sal_uInt16 nRes = 0xFFFF; - switch (nResId) - { - case RID_IL_UNBINOPS : nRes = RID_UNBINOPS_CAT; break; - case RID_IL_RELATIONS : nRes = RID_RELATIONS_CAT; break; - case RID_IL_SETOPERATIONS : nRes = RID_SETOPERATIONS_CAT; break; - case RID_IL_FUNCTIONS : nRes = RID_FUNCTIONS_CAT; break; - case RID_IL_OPERATORS : nRes = RID_OPERATORS_CAT; break; - case RID_IL_ATTRIBUTES : nRes = RID_ATTRIBUTES_CAT; break; - case RID_IL_BRACKETS : nRes = RID_BRACKETS_CAT; break; - case RID_IL_FORMAT : nRes = RID_FORMAT_CAT; break; - case RID_IL_MISC : nRes = RID_MISC_CAT; break; - default : - SAL_WARN( "starmath", "unknown category" ); - break; - } - return nRes; -} - -SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings, - SfxChildWindow *pChildWindow, - vcl::Window *pParent) - : SfxFloatingWindow(pTmpBindings, pChildWindow, pParent, "FloatingElements", - "modules/smath/ui/floatingelements.ui") -{ - get(m_pToolBoxCat, "catalog"); - m_nUnbinopsId = m_pToolBoxCat->GetItemId("RID_UNBINOPS_CAT"); - m_nRelationsId = m_pToolBoxCat->GetItemId("RID_RELATIONS_CAT"); - m_nSetoperationsId = m_pToolBoxCat->GetItemId("RID_SETOPERATIONS_CAT"); - m_nFunctionsId = m_pToolBoxCat->GetItemId("RID_FUNCTIONS_CAT"); - m_nOperatorsId = m_pToolBoxCat->GetItemId("RID_OPERATORS_CAT"); - m_nAttributesId = m_pToolBoxCat->GetItemId("RID_ATTRIBUTES_CAT"); - m_nBracketsId = m_pToolBoxCat->GetItemId("RID_BRACKETS_CAT"); - m_nFormatId = m_pToolBoxCat->GetItemId("RID_FORMAT_CAT"); - m_nMiscId = m_pToolBoxCat->GetItemId("RID_MISC_CAT"); - m_pToolBoxCat->InsertSpace(7); - m_pToolBoxCat->InsertBreak(5); - m_pToolBoxCat->SetLineCount(2); - - // allow for cursor travelling between toolbox and sub-categories - SetStyle( GetStyle() | WB_DIALOGCONTROL ); - - nActiveCategoryRID = USHRT_MAX; - - m_pToolBoxCat->SetClickHdl(LINK(this, SmToolBoxWindow, CategoryClickHdl)); - - sal_uInt16 i; - for (i = 0; i < NUM_TBX_CATEGORIES; ++i) - { - VclPtrInstance pBox(get("box"), SmResId( TOOLBOX_CAT_A + i )); - vToolBoxCategories[i] = pBox; - pBox->SetSelectHdl(LINK(this, SmToolBoxWindow, CmdSelectHdl)); - } - pToolBoxCmd = vToolBoxCategories[0]; - - for (i = 0; i <= NUM_TBX_CATEGORIES; ++i) - aImageLists [i] = 0; -} - -SmToolBoxWindow::~SmToolBoxWindow() -{ - disposeOnce(); -} - -void SmToolBoxWindow::dispose() -{ - int i; - for (i = 0; i < NUM_TBX_CATEGORIES; ++i) - vToolBoxCategories[i].disposeAndClear(); - - pToolBoxCmd = 0; - for (i = 0; i < NUM_TBX_CATEGORIES + 1; ++i) - { - delete aImageLists[i]; - aImageLists[i] = 0; - } - m_pToolBoxCat.clear(); - pToolBoxCmd.clear(); - SfxFloatingWindow::dispose(); -} - -SmViewShell * SmToolBoxWindow::GetView() -{ - SfxViewShell *pView = GetBindings().GetDispatcher()->GetFrame()->GetViewShell(); - return PTR_CAST(SmViewShell, pView); -} - -const ImageList * SmToolBoxWindow::GetImageList( sal_uInt16 nResId ) -{ - // creates the image list via its resource id and stores that - // list for later use in the respective array. - - const ImageList *pIL = 0; - - // get index to use - sal_uInt16 nCategoryRID = GetCategoryRID( nResId ); - sal_Int16 nIndex = GetToolBoxCategoriesIndex( nCategoryRID ); - - if (nIndex >= 0) - { - ImageList **pImgList = aImageLists; - if (!pImgList[ nIndex ]) - pImgList[ nIndex ] = new ImageList( SmResId(nResId) ); - pIL = pImgList[ nIndex ]; - } - - OSL_ENSURE( pIL, "image list not found!" ); - return pIL; -} - - -void SmToolBoxWindow::ApplyImageLists( sal_uInt16 nCategoryRID ) -{ - // set image list for active (visible) category of 'catalog' - sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID ); - sal_uInt16 nResId = GetImageListRID( nCategoryRID ); - const ImageList *pImageList = GetImageList( nResId ); - OSL_ENSURE( pImageList && nIdx >= 0, "image list or index missing" ); - if (pImageList && nIdx >= 0) - vToolBoxCategories[ nIdx ]->SetImageList( *pImageList ); -} - -void SmToolBoxWindow::DataChanged( const DataChangedEvent &rEvt ) -{ - if ( (rEvt.GetType() == DataChangedEventType::SETTINGS) && (rEvt.GetFlags() & AllSettingsFlags::STYLE) ) - ApplyImageLists( nActiveCategoryRID ); - - SfxFloatingWindow::DataChanged( rEvt ); -} - -void SmToolBoxWindow::StateChanged( StateChangedType nStateChange ) -{ - static bool bSetPosition = true; - if (StateChangedType::InitShow == nStateChange) - { - SetCategory( nActiveCategoryRID == USHRT_MAX ? RID_UNBINOPS_CAT : nActiveCategoryRID ); - - // calculate initial position to be used after creation of the window... - if (bSetPosition) - { - AdjustPos(); - bSetPosition = false; - } - } - //... otherwise the base class will remember the last position of the window - SfxFloatingWindow::StateChanged( nStateChange ); -} - -void SmToolBoxWindow::AdjustPos() -{ - SmViewShell *pView = GetView(); - OSL_ENSURE( pView, "view shell missing" ); - Point aPos( 50, 75 ); - if (pView) - { - Size aWndSize(GetOutputSizePixel()); - SmGraphicWindow &rWin = pView->GetGraphicWindow(); - aPos = Point( rWin.OutputToScreenPixel( - Point( rWin.GetSizePixel().Width() - aWndSize.Width(), 0) ) ); - } - if (aPos.X() < 0) - aPos.X() = 0; - if (aPos.Y() < 0) - aPos.Y() = 0; - SetPosPixel( aPos ); -} - -bool SmToolBoxWindow::Close() -{ - SmViewShell *pViewSh = GetView(); - if (pViewSh) - pViewSh->GetViewFrame()->GetDispatcher()->Execute( - SID_TOOLBOX, SfxCallMode::RECORD, - new SfxBoolItem(SID_TOOLBOX, false), 0L); - return true; -} - -void SmToolBoxWindow::GetFocus() -{ - // give focus to category toolbox - // (allow for cursor travelling when a category is selected with the mouse) - m_pToolBoxCat->GrabFocus(); -} - -void SmToolBoxWindow::SetCategory(sal_uInt16 nCategoryRID) -{ - if (nCategoryRID != nActiveCategoryRID) - ApplyImageLists( nCategoryRID ); - - sal_uInt16 nLines; - // check for valid resource id - switch (nCategoryRID) - { - case RID_UNBINOPS_CAT : nLines = 4; break; - case RID_RELATIONS_CAT: nLines = 7; break; - case RID_SETOPERATIONS_CAT: nLines = 5; break; - case RID_FUNCTIONS_CAT: nLines = 5; break; - case RID_OPERATORS_CAT: nLines = 3; break; - case RID_ATTRIBUTES_CAT: nLines = 5; break; - case RID_MISC_CAT: nLines = 4; break; - case RID_BRACKETS_CAT: nLines = 5; break; - case RID_FORMAT_CAT: nLines = 3; break; - default: - // nothing to be done - return; - } - - pToolBoxCmd->Hide(); - - sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID ); - OSL_ENSURE( nIdx >= 0, "unknown category" ); - if (nIdx >= 0) - pToolBoxCmd = vToolBoxCategories[nIdx]; - - // calculate actual size of window to use - Size aCatSize( m_pToolBoxCat->CalcWindowSizePixel( 2 ) ); - Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( nLines ) ); - OSL_ENSURE( aCatSize.Width() == aCmdSize.Width(), "width mismatch" ); - // main window settings - Size aWndSize ( aCatSize.Width(), pToolBoxCmd->GetPosPixel().Y() + aCmdSize.Height() + 3); - SetOutputSizePixel( aWndSize ); - - if (nActiveCategoryRID) - m_pToolBoxCat->CheckItem(nActiveCategoryRID, false); - nActiveCategoryRID = nCategoryRID; - m_pToolBoxCat->CheckItem(nActiveCategoryRID, true); - - pToolBoxCmd->Show(); -} - -sal_uInt16 SmToolBoxWindow::MapToolbarIdToCategory(sal_uInt16 nId) const -{ - if (nId == m_nUnbinopsId) - return RID_UNBINOPS_CAT; - if (nId == m_nRelationsId) - return RID_RELATIONS_CAT; - if (nId == m_nSetoperationsId) - return RID_SETOPERATIONS_CAT; - if (nId == m_nFunctionsId) - return RID_FUNCTIONS_CAT; - if (nId == m_nOperatorsId) - return RID_OPERATORS_CAT; - if (nId == m_nAttributesId) - return RID_ATTRIBUTES_CAT; - if (nId == m_nBracketsId) - return RID_BRACKETS_CAT; - if (nId == m_nFormatId) - return RID_FORMAT_CAT; - return RID_MISC_CAT; -} - -IMPL_LINK_TYPED( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox, void) -{ - sal_uInt16 nItemId = pToolBox->GetCurItemId(); - if (nItemId != 0) - { - SetCategory(MapToolbarIdToCategory(nItemId)); - } -} - -IMPL_LINK_TYPED( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox, void) -{ - SmViewShell *pViewSh = GetView(); - if (pViewSh) - pViewSh->GetViewFrame()->GetDispatcher()->Execute( - SID_INSERTCOMMAND, SfxCallMode::RECORD, - new SfxInt16Item(SID_INSERTCOMMAND, pToolBox->GetCurItemId()), 0L); -} - - -/**************************************************************************/ - -SFX_IMPL_FLOATINGWINDOW_WITHID(SmToolBoxWrapper, SID_TOOLBOXWINDOW); - -SmToolBoxWrapper::SmToolBoxWrapper(vcl::Window *pParentWindow, - sal_uInt16 nId, SfxBindings* pBindings, - SfxChildWinInfo *pInfo) : - SfxChildWindow(pParentWindow, nId) -{ - eChildAlignment = SfxChildAlignment::NOALIGNMENT; - - pWindow.reset(VclPtr::Create(pBindings, this, pParentWindow)); - static_cast(pWindow.get())->Initialize(pInfo); -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src index 648b8c288efd..484f33b2a6d7 100644 --- a/starmath/source/toolbox.src +++ b/starmath/source/toolbox.src @@ -1411,35 +1411,6 @@ }; }; -#define UNBINOPS_IDLIST \ - IdList = \ - { \ - RID_PLUSX ; \ - RID_MINUSX ; \ - RID_PLUSMINUSX ; \ - RID_MINUSPLUSX ; \ - RID_XPLUSY ; \ - RID_XCDOTY ; \ - RID_XTIMESY ; \ - RID_XSYMTIMESY ; \ - RID_XMINUSY ; \ - RID_XOVERY ; \ - RID_XDIVY ; \ - RID_XSYMDIVIDEY ; \ - RID_NEGX ; \ - RID_XANDY ; \ - RID_XORY ; \ - RID_XCIRCY ; \ - }; \ - IdCount = { 16 ; }; - - ImageList RID_IL_UNBINOPS - { - Prefix = "un"; - MaskColor = IMAGE_STDBTN_COLOR ; - UNBINOPS_IDLIST - }; - #define RELATIONS_IDLIST \ IdList = \ { \ @@ -1710,26 +1681,4 @@ MISC_IDLIST }; -#define CATALOG_IDLIST \ - IdList = \ - { \ - RID_UNBINOPS_CAT ; \ - RID_RELATIONS_CAT ; \ - RID_SETOPERATIONS_CAT ; \ - RID_FUNCTIONS_CAT ; \ - RID_OPERATORS_CAT ; \ - RID_ATTRIBUTES_CAT ; \ - RID_MISC_CAT ; \ - RID_BRACKETS_CAT ; \ - RID_FORMAT_CAT ; \ - }; \ - IdCount = { 9 ; }; - - ImageList RID_IL_CATALOG - { - Prefix = "im"; - MaskColor = IMAGE_STDBTN_COLOR ; - CATALOG_IDLIST - }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index f8937e340c32..3de112fd4616 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -68,7 +68,6 @@ #include "dialog.hxx" #include "document.hxx" #include "starmath.hrc" -#include "toolbox.hxx" #include "mathmlimport.hxx" #include "cursor.hxx" #include "accessibility.hxx" @@ -935,7 +934,6 @@ void SmViewShell::InitInterface_Impl() //Dummy-Objectbar, to avoid quiver while activating GetStaticInterface()->RegisterChildWindow(SID_TASKPANE); - GetStaticInterface()->RegisterChildWindow(SmToolBoxWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SmCmdBoxWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SmElementsDockingWindowWrapper::GetChildWindowId()); } @@ -1801,12 +1799,6 @@ void SmViewShell::Execute(SfxRequest& rReq) } break; - case SID_TOOLBOX: - { - GetViewFrame()->ToggleChildWindow( SmToolBoxWrapper::GetChildWindowId() ); - } - break; - case SID_ELEMENTSDOCKINGWINDOW: { GetViewFrame()->ToggleChildWindow( SmElementsDockingWindowWrapper::GetChildWindowId() ); @@ -1919,17 +1911,6 @@ void SmViewShell::GetState(SfxItemSet &rSet) rSet.Put(SfxBoolItem(SID_ELEMENTSDOCKINGWINDOW, bState)); } break; - case SID_TOOLBOX: - { - bool bState = false; - SfxChildWindow *pChildWnd = GetViewFrame()-> - GetChildWindow( SmToolBoxWrapper::GetChildWindowId() ); - if (pChildWnd && pChildWnd->GetWindow()->IsVisible()) - bState = true; - rSet.Put(SfxBoolItem(SID_TOOLBOX, bState)); - } - break; - } } } diff --git a/starmath/uiconfig/smath/ui/floatingelements.ui b/starmath/uiconfig/smath/ui/floatingelements.ui deleted file mode 100644 index 899644a593bf..000000000000 --- a/starmath/uiconfig/smath/ui/floatingelements.ui +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - True - False - True - True - 6 - Elements - False - utility - False - - - True - False - True - True - 12 - - - True - False - - - 0 - 1 - 1 - 1 - - - - - True - False - icons - False - - - True - False - RID_UNBINOPS_CAT - Unary/Binary Operators - True - starmath/res/im21101.png - - - False - True - - - - - True - False - RID_RELATIONS_CAT - Relations - True - starmath/res/im21102.png - - - False - True - - - - - True - False - RID_SETOPERATIONS_CAT - Set Operations - True - starmath/res/im21103.png - - - False - True - - - - - True - False - RID_FUNCTIONS_CAT - Functions - True - starmath/res/im21104.png - - - False - True - - - - - True - False - RID_OPERATORS_CAT - Operators - True - starmath/res/im21105.png - - - False - True - - - - - True - False - RID_ATTRIBUTES_CAT - Attributes - True - starmath/res/im21106.png - - - False - True - - - - - True - False - RID_MISC_CAT - Others - True - starmath/res/im21117.png - - - False - True - - - - - True - False - RID_BRACKETS_CAT - Brackets - True - starmath/res/im21107.png - - - False - True - - - - - True - False - RID_FORMAT_CAT - Formats - True - starmath/res/im21108.png - - - False - True - - - - - 0 - 0 - 1 - 1 - - - - - True - False - True - True - vertical - - - - - - 0 - 2 - 1 - 1 - - - - - - -- cgit v1.2.3