summaryrefslogtreecommitdiff
path: root/starmath/inc
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-11-14 00:02:01 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-11-14 09:43:02 +0100
commite2beb3ee1519ecb790c157853050d3b352d3839c (patch)
tree36e0826bd4ea3b5c81e1a8f29ce5d0e330ae6bed /starmath/inc
parentdbbfdf3d32760498b746d3d5c5dcbcccf7932225 (diff)
starmath: use global resource string
In favor of many getters and setters :) Change-Id: Ibdfe6e2cb70ec2e743def2f898c1b56713af2661
Diffstat (limited to 'starmath/inc')
-rw-r--r--starmath/inc/ElementsDockingWindow.hrc22
-rw-r--r--starmath/inc/ElementsDockingWindow.hxx42
-rw-r--r--starmath/inc/starmath.hrc11
3 files changed, 10 insertions, 65 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hrc b/starmath/inc/ElementsDockingWindow.hrc
deleted file mode 100644
index 6eb65b889f73..000000000000
--- a/starmath/inc/ElementsDockingWindow.hrc
+++ /dev/null
@@ -1,22 +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/.
- *
- */
-
-#include <starmath.hrc>
-
-#define STR_BLACK 1
-#define STR_BLUE 2
-#define STR_GREEN 3
-#define STR_RED 4
-#define STR_CYAN 5
-#define STR_MAGENTA 6
-#define STR_YELLOW 7
-#define STR_HIDE 8
-#define STR_SIZE 9
-#define STR_FONT 10
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index 66b410c4b124..a3a692e8228d 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -115,48 +115,6 @@ public:
void setVerticalMode(bool bVertical);
void SetSelectHdl(const Link& rLink) { aSelectHdlLink = rLink; }
-
- void setColorBlack(const OUString color) { maColorBlack = color; }
- OUString colorBlack() { return maColorBlack; }
-
- void setColorBlue(const OUString color) { maColorBlue = color; }
- OUString colorBlue() { return maColorBlue; }
-
- void setColorGreen(const OUString color) { maColorGreen = color; }
- OUString colorGreen() { return maColorGreen; }
-
- void setColorRed(const OUString color) { maColorRed = color; }
- OUString colorRed() { return maColorRed; }
-
- void setColorCyan(const OUString color) { maColorCyan = color; }
- OUString colorCyan() { return maColorCyan; }
-
- void setColorMagenta(const OUString color) { maColorMagenta = color; }
- OUString colorMagenta() { return maColorMagenta; }
-
- void setColorYellow(const OUString color) { maColorYellow = color; }
- OUString colorYellow() { return maColorYellow; }
-
- void setStringHide(const OUString string) { maStringHide = string; }
- OUString stringHide() { return maStringHide; }
-
- void setStringSize(const OUString string) { maStringSize = string; }
- OUString stringSize() { return maStringSize; }
-
- void setStringFont(const OUString string) { maStringFont = string; }
- OUString stringFont() { return maStringFont; }
-
-private:
- OUString maColorBlack;
- OUString maColorBlue;
- OUString maColorGreen;
- OUString maColorRed;
- OUString maColorCyan;
- OUString maColorMagenta;
- OUString maColorYellow;
- OUString maStringHide;
- OUString maStringSize;
- OUString maStringFont;
};
class SmElementsDockingWindow : public SfxDockingWindow
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 4d62b993af26..636a5ec88dc0 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -102,7 +102,16 @@
#define STR_STATSTR_READING (RID_APP_START + 823)
#define STR_STATSTR_WRITING (RID_APP_START + 824)
#define STR_CMDBOXWINDOW (RID_APP_START + 825)
-
+#define STR_BLACK (RID_APP_START + 826)
+#define STR_BLUE (RID_APP_START + 827)
+#define STR_GREEN (RID_APP_START + 828)
+#define STR_RED (RID_APP_START + 829)
+#define STR_CYAN (RID_APP_START + 830)
+#define STR_MAGENTA (RID_APP_START + 831)
+#define STR_YELLOW (RID_APP_START + 832)
+#define STR_HIDE (RID_APP_START + 833)
+#define STR_SIZE (RID_APP_START + 834)
+#define STR_FONT (RID_APP_START + 835)
#define STR_ALIGN_LEFT (RID_APP_START + 836)
#define STR_ALIGN_CENTER (RID_APP_START + 837)
#define STR_ALIGN_RIGHT (RID_APP_START + 838)