[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - starmath/inc starmath/source
Andras Timar
atimar at suse.com
Thu Jun 13 00:07:06 PDT 2013
starmath/inc/starmath.hrc | 20 ++++++-------
starmath/source/ElementsDockingWindow.cxx | 44 +++++++++++++++---------------
starmath/source/commands.src | 20 ++++++-------
3 files changed, 42 insertions(+), 42 deletions(-)
New commits:
commit 127111bb12d7c59135afb7996c2cdf17b5a8f15f
Author: Andras Timar <atimar at suse.com>
Date: Thu Jun 13 08:00:58 2013 +0200
make categories localizable in Elements docking panel
Change-Id: Ic1e4af8f8dd60ab48d701b5d713beafd0ddd22df
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index ec4308a..d719d77 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -257,16 +257,16 @@ String RID_XSUCCEEDSEQUIVY { Text = "<?> succsim <?> " ; };
String RID_XNOTPRECEDESY { Text = "<?> nprec <?> " ; };
String RID_XNOTSUCCEEDSY { Text = "<?> nsucc <?> " ; };
-String RID_CATEGORY_UNARY_BINARY_OPERATORS { Text = "Unary/Binary Operators" ; };
-String RID_CATEGORY_RELATIONS { Text = "Relations" ; };
-String RID_CATEGORY_SET_OPERATIONS { Text = "Set Operations" ; };
-String RID_CATEGORY_FUNCTIONS { Text = "Functions" ; };
-String RID_CATEGORY_OPERATORS { Text = "Operators" ; };
-String RID_CATEGORY_ATTRIBUTES { Text = "Attributes" ; };
-String RID_CATEGORY_BRACKETS { Text = "Brackets" ; };
-String RID_CATEGORY_FORMATS { Text = "Formats" ; };
-String RID_CATEGORY_OTHERS { Text = "Others" ; };
-String RID_CATEGORY_EXAMPLES { Text = "Examples" ; };
+String RID_CATEGORY_UNARY_BINARY_OPERATORS { Text [ en-US ] = "Unary/Binary Operators" ; };
+String RID_CATEGORY_RELATIONS { Text [ en-US ] = "Relations" ; };
+String RID_CATEGORY_SET_OPERATIONS { Text [ en-US ] = "Set Operations" ; };
+String RID_CATEGORY_FUNCTIONS { Text [ en-US ] = "Functions" ; };
+String RID_CATEGORY_OPERATORS { Text [ en-US ] = "Operators" ; };
+String RID_CATEGORY_ATTRIBUTES { Text [ en-US ] = "Attributes" ; };
+String RID_CATEGORY_BRACKETS { Text [ en-US ] = "Brackets" ; };
+String RID_CATEGORY_FORMATS { Text [ en-US ] = "Formats" ; };
+String RID_CATEGORY_OTHERS { Text [ en-US ] = "Others" ; };
+String RID_CATEGORY_EXAMPLES { Text [ en-US ] = "Examples" ; };
//////////////////////////////////////////
commit 52f5ae89034b680a10d3fdbdf79f99105718ebdf
Author: Andras Timar <atimar at suse.com>
Date: Thu Jun 13 07:57:17 2013 +0200
typo: s/CATERGORY/CATEGORY/
Change-Id: I37f2db8b073ad1257101af02118cfbc91ee60f26
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index a9bfbfa..4290aee 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -432,16 +432,16 @@
#define RID_SPANISH_50_NAMES (RID_APP_START + 3113)
#define RID_SPANISH_60_NAMES (RID_APP_START + 3114)
-#define RID_CATERGORY_UNARY_BINARY_OPERATORS (RID_APP_START + 4001)
-#define RID_CATERGORY_RELATIONS (RID_APP_START + 4002)
-#define RID_CATERGORY_SET_OPERATIONS (RID_APP_START + 4003)
-#define RID_CATERGORY_FUNCTIONS (RID_APP_START + 4004)
-#define RID_CATERGORY_OPERATORS (RID_APP_START + 4005)
-#define RID_CATERGORY_ATTRIBUTES (RID_APP_START + 4006)
-#define RID_CATERGORY_BRACKETS (RID_APP_START + 4007)
-#define RID_CATERGORY_FORMATS (RID_APP_START + 4008)
-#define RID_CATERGORY_OTHERS (RID_APP_START + 4009)
-#define RID_CATERGORY_EXAMPLES (RID_APP_START + 4010)
+#define RID_CATEGORY_UNARY_BINARY_OPERATORS (RID_APP_START + 4001)
+#define RID_CATEGORY_RELATIONS (RID_APP_START + 4002)
+#define RID_CATEGORY_SET_OPERATIONS (RID_APP_START + 4003)
+#define RID_CATEGORY_FUNCTIONS (RID_APP_START + 4004)
+#define RID_CATEGORY_OPERATORS (RID_APP_START + 4005)
+#define RID_CATEGORY_ATTRIBUTES (RID_APP_START + 4006)
+#define RID_CATEGORY_BRACKETS (RID_APP_START + 4007)
+#define RID_CATEGORY_FORMATS (RID_APP_START + 4008)
+#define RID_CATEGORY_OTHERS (RID_APP_START + 4009)
+#define RID_CATEGORY_EXAMPLES (RID_APP_START + 4010)
#define BMP_ARROW_RIGHT 1
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 7be18ca..1ad05fc 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -364,34 +364,34 @@ void SmElementsControl::build()
switch(maCurrentSetId)
{
- case RID_CATERGORY_UNARY_BINARY_OPERATORS:
+ case RID_CATEGORY_UNARY_BINARY_OPERATORS:
addElements(aUnaryBinaryOperatorsList, sizeof(aUnaryBinaryOperatorsList) / sizeof(sal_uInt16));
break;
- case RID_CATERGORY_RELATIONS:
+ case RID_CATEGORY_RELATIONS:
addElements(aRelationsList, sizeof(aRelationsList) / sizeof(sal_uInt16));
break;
- case RID_CATERGORY_SET_OPERATIONS:
+ case RID_CATEGORY_SET_OPERATIONS:
addElements(aSetOperations, sizeof(aSetOperations) / sizeof(sal_uInt16));
break;
- case RID_CATERGORY_FUNCTIONS:
+ case RID_CATEGORY_FUNCTIONS:
addElements(aFunctions, sizeof(aFunctions) / sizeof(sal_uInt16));
break;
- case RID_CATERGORY_OPERATORS:
+ case RID_CATEGORY_OPERATORS:
addElements(aOperators, sizeof(aOperators) / sizeof(sal_uInt16));
break;
- case RID_CATERGORY_ATTRIBUTES:
+ case RID_CATEGORY_ATTRIBUTES:
addElements(aAttributes, sizeof(aAttributes) / sizeof(sal_uInt16));
break;
- case RID_CATERGORY_BRACKETS:
+ case RID_CATEGORY_BRACKETS:
addElements(aBrackets, sizeof(aBrackets) / sizeof(sal_uInt16));
break;
- case RID_CATERGORY_FORMATS:
+ case RID_CATEGORY_FORMATS:
addElements(aFormats, sizeof(aFormats) / sizeof(sal_uInt16));
break;
- case RID_CATERGORY_OTHERS:
+ case RID_CATEGORY_OTHERS:
addElements(aOthers, sizeof(aOthers) / sizeof(sal_uInt16));
break;
- case RID_CATERGORY_EXAMPLES:
+ case RID_CATEGORY_EXAMPLES:
{
OUString aEquation = OUString("C=%pi cdot d = 2 cdot %pi cdot r");
addElement(aEquation, aEquation);
@@ -412,16 +412,16 @@ void SmElementsControl::build()
//*******************
const sal_uInt16 SmElementsDockingWindow::aCategories[] = {
- RID_CATERGORY_UNARY_BINARY_OPERATORS,
- RID_CATERGORY_RELATIONS,
- RID_CATERGORY_SET_OPERATIONS,
- RID_CATERGORY_FUNCTIONS,
- RID_CATERGORY_OPERATORS,
- RID_CATERGORY_ATTRIBUTES,
- RID_CATERGORY_BRACKETS,
- RID_CATERGORY_FORMATS,
- RID_CATERGORY_OTHERS,
- RID_CATERGORY_EXAMPLES
+ RID_CATEGORY_UNARY_BINARY_OPERATORS,
+ RID_CATEGORY_RELATIONS,
+ RID_CATEGORY_SET_OPERATIONS,
+ RID_CATEGORY_FUNCTIONS,
+ RID_CATEGORY_OPERATORS,
+ RID_CATEGORY_ATTRIBUTES,
+ RID_CATEGORY_BRACKETS,
+ RID_CATEGORY_FORMATS,
+ RID_CATEGORY_OTHERS,
+ RID_CATEGORY_EXAMPLES
};
SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, SfxChildWindow* pChildWindow, Window* pParent) :
@@ -446,8 +446,8 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
maElementsControl.SetTextColor( Color( COL_BLACK ) );
maElementsControl.SetSelectHdl(LINK(this, SmElementsDockingWindow, SelectClickHdl));
- maElementListBox.SelectEntry(OUString(SmResId(RID_CATERGORY_UNARY_BINARY_OPERATORS)));
- maElementsControl.setElementSetId(RID_CATERGORY_UNARY_BINARY_OPERATORS);
+ maElementListBox.SelectEntry(OUString(SmResId(RID_CATEGORY_UNARY_BINARY_OPERATORS)));
+ maElementsControl.setElementSetId(RID_CATEGORY_UNARY_BINARY_OPERATORS);
}
SmElementsDockingWindow::~SmElementsDockingWindow ()
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index e6a002f..ec4308a 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -257,16 +257,16 @@ String RID_XSUCCEEDSEQUIVY { Text = "<?> succsim <?> " ; };
String RID_XNOTPRECEDESY { Text = "<?> nprec <?> " ; };
String RID_XNOTSUCCEEDSY { Text = "<?> nsucc <?> " ; };
-String RID_CATERGORY_UNARY_BINARY_OPERATORS { Text = "Unary/Binary Operators" ; };
-String RID_CATERGORY_RELATIONS { Text = "Relations" ; };
-String RID_CATERGORY_SET_OPERATIONS { Text = "Set Operations" ; };
-String RID_CATERGORY_FUNCTIONS { Text = "Functions" ; };
-String RID_CATERGORY_OPERATORS { Text = "Operators" ; };
-String RID_CATERGORY_ATTRIBUTES { Text = "Attributes" ; };
-String RID_CATERGORY_BRACKETS { Text = "Brackets" ; };
-String RID_CATERGORY_FORMATS { Text = "Formats" ; };
-String RID_CATERGORY_OTHERS { Text = "Others" ; };
-String RID_CATERGORY_EXAMPLES { Text = "Examples" ; };
+String RID_CATEGORY_UNARY_BINARY_OPERATORS { Text = "Unary/Binary Operators" ; };
+String RID_CATEGORY_RELATIONS { Text = "Relations" ; };
+String RID_CATEGORY_SET_OPERATIONS { Text = "Set Operations" ; };
+String RID_CATEGORY_FUNCTIONS { Text = "Functions" ; };
+String RID_CATEGORY_OPERATORS { Text = "Operators" ; };
+String RID_CATEGORY_ATTRIBUTES { Text = "Attributes" ; };
+String RID_CATEGORY_BRACKETS { Text = "Brackets" ; };
+String RID_CATEGORY_FORMATS { Text = "Formats" ; };
+String RID_CATEGORY_OTHERS { Text = "Others" ; };
+String RID_CATEGORY_EXAMPLES { Text = "Examples" ; };
//////////////////////////////////////////
More information about the Libreoffice-commits
mailing list