remove intermediate Strings on res loading

Change-Id: I5ae2f445bb2c0e3fa3dd42f972dae54dfee42cc8

4 files changed, 9 insertions, 9 deletions

diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 2d01c2dc3000..b90f4fa21c25 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -509,7 +509,7 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
 
     for (sal_uInt16 i = 0; i < sizeof(aCategories) / sizeof(sal_uInt16) ; i++)
     {
-        maElementListBox.InsertEntry(OUString(SmResId(aCategories[i])));
+        maElementListBox.InsertEntry(SM_RESSTR(aCategories[i]));
     }
 
     maElementListBox.SetSelectHdl(LINK(this, SmElementsDockingWindow, ElementSelectedHandle));
@@ -520,7 +520,7 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
     maElementsControl.SetTextColor( Color( COL_BLACK ) );
     maElementsControl.SetSelectHdl(LINK(this, SmElementsDockingWindow, SelectClickHdl));
 
-    maElementListBox.SelectEntry(OUString(SmResId(RID_CATEGORY_UNARY_BINARY_OPERATORS)));
+    maElementListBox.SelectEntry(SM_RESSTR(RID_CATEGORY_UNARY_BINARY_OPERATORS));
     maElementsControl.setElementSetId(RID_CATEGORY_UNARY_BINARY_OPERATORS);
 
     FreeResource();
@@ -555,7 +555,7 @@ IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox*, pList)
     for (sal_uInt16 i = 0; i < sizeof(aCategories) / sizeof(sal_uInt16) ; i++)
     {
         sal_uInt16 aCurrentCategory = aCategories[i];
-        OUString aCurrentCategoryString = OUString(SmResId(aCurrentCategory));
+        OUString aCurrentCategoryString = SM_RESSTR(aCurrentCategory);
         if (aCurrentCategoryString == pList->GetSelectEntry())
         {
             maElementsControl.setElementSetId(aCurrentCategory);
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index c33c0d569e94..5d1fde88cfb5 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -1406,15 +1406,15 @@ void SmDocShell::FillClass(SvGlobalName* pClassName,
     {
         *pClassName     = SvGlobalName(SO3_SM_CLASSID_60);
         *pFormat        = SOT_FORMATSTR_ID_STARMATH_60;
-        *pFullTypeName  = OUString(SmResId(STR_MATH_DOCUMENT_FULLTYPE_CURRENT));
-        *pShortTypeName = OUString(SmResId(RID_DOCUMENTSTR));
+        *pFullTypeName  = SM_RESSTR(STR_MATH_DOCUMENT_FULLTYPE_CURRENT);
+        *pShortTypeName = SM_RESSTR(RID_DOCUMENTSTR);
     }
     else if (nFileFormat == SOFFICE_FILEFORMAT_8 )
     {
         *pClassName     = SvGlobalName(SO3_SM_CLASSID_60);
         *pFormat        = bTemplate ? SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE : SOT_FORMATSTR_ID_STARMATH_8;
-        *pFullTypeName  = OUString(SmResId(STR_MATH_DOCUMENT_FULLTYPE_CURRENT));
-        *pShortTypeName = OUString(SmResId(RID_DOCUMENTSTR));
+        *pFullTypeName  = SM_RESSTR(STR_MATH_DOCUMENT_FULLTYPE_CURRENT);
+        *pShortTypeName = SM_RESSTR(RID_DOCUMENTSTR);
     }
 }
 
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index edf32af659c0..87ad75d38b8b 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2873,7 +2873,7 @@ static bool lcl_IsFromGreekSymbolSet( const OUString &rTokenText )
     bool bRes = false;
 
     // valid symbol name needs to have a '%' at pos 0 and at least an additonal char
-    if (rTokenText.getLength() > 2 && rTokenText.getStr()[0] == (sal_Unicode)'%')
+    if (rTokenText.getLength() > 2 && rTokenText[0] == (sal_Unicode)'%')
     {
         OUString aName( rTokenText.copy(1) );
         SmSym *pSymbol = SM_MOD()->GetSymbolManager().GetSymbolByName( aName );
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 8cdd5d7ecb23..bbc6377ac772 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2531,7 +2531,7 @@ size_t SmParser::AddError(SmParseError Type, SmNode *pNode)
 
     pErrDesc->Type  = Type;
     pErrDesc->pNode = pNode;
-    pErrDesc->Text  = String(SmResId(RID_ERR_IDENT));
+    pErrDesc->Text  = SM_RESSTR(RID_ERR_IDENT);
 
     sal_uInt16  nRID;
     switch (Type)