String to OUString

And removed nearly all xub_StrLen in starmath.

Some sal_uInt16 which were xub_StrLen before
9a0d753b are also converted to sal_Int32
where applicable.

Change-Id: I31d7794f4c7aa840545edff41a102b76bb39e042
Reviewed-on: https://gerrit.libreoffice.org/5817Reviewed-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Tested-by: Andrzej J.R. Hunt <andrzej@ahunt.org>

starmath/inc/node.hxx

@@ -159,7 +159,7 @@ public:
 
     virtual void    GetAccessibleText( OUStringBuffer &rText ) const;
     sal_Int32       GetAccessibleIndex() const { return nAccIndex; }
-    const SmNode *  FindNodeWithAccessibleIndex(xub_StrLen nAccIndex) const;
+    const SmNode *  FindNodeWithAccessibleIndex(sal_Int32 nAccIndex) const;
 
     sal_uInt16  GetRow() const    { return (sal_uInt16)aNodeToken.nRow; }
     sal_uInt16  GetColumn() const { return (sal_uInt16)aNodeToken.nCol; }

starmath/inc/parse.hxx

@@ -118,8 +118,8 @@ struct SmToken
     sal_uInt16      nLevel;
 
     // token position
-    sal_uInt16      nRow;
-    xub_StrLen      nCol;
+    sal_Int32      nRow;
+    sal_Int32      nCol;
 
     SmToken();
     SmToken(SmTokenType eTokenType,
@@ -150,7 +150,7 @@ struct SmErrorDesc
 {
     SmParseError  Type;
     SmNode       *pNode;
-    String        Text;
+    OUString      Text;
 };
 
 
@@ -180,15 +180,15 @@ struct SmTokenTableEntry
 
 class SmParser
 {
-    String          m_aBufferString;
+    OUString        m_aBufferString;
     SmToken         m_aCurToken;
     SmNodeStack     m_aNodeStack;
     SmErrDescList   m_aErrDescList;
     int             m_nCurError;
     LanguageType    m_nLang;
-    xub_StrLen      m_nBufferIndex,
+    sal_Int32       m_nBufferIndex,
                     m_nTokenIndex;
-    sal_uInt16          m_Row,
+    sal_Int32       m_Row,
                     m_nColOff;
     SmConvert       m_eConversion;
     bool            bImportSymNames,
@@ -206,12 +206,12 @@ class SmParser
 
 protected:
 #if OSL_DEBUG_LEVEL > 1
-    bool            IsDelimiter( const String &rTxt, xub_StrLen nPos );
+    bool            IsDelimiter( const OUString &rTxt, sal_Int32 nPos );
 #endif
     void            NextToken();
-    xub_StrLen      GetTokenIndex() const   { return m_nTokenIndex; }
-    void            Insert(const String &rText, sal_uInt16 nPos);
-    void            Replace( sal_uInt16 nPos, sal_uInt16 nLen, const String &rText );
+    sal_Int32       GetTokenIndex() const   { return m_nTokenIndex; }
+    void            Insert(const OUString &rText, sal_Int32 nPos);
+    void            Replace( sal_Int32 nPos, sal_Int32 nLen, const OUString &rText );
 
     inline bool     TokenInGroup( sal_uLong nGroup );
 
@@ -253,17 +253,17 @@ protected:
     void    Error(SmParseError Error);
 
     void    ClearUsedSymbols()                              { m_aUsedSymbols.clear(); }
-    void    AddToUsedSymbols( const String &rSymbolName )   { m_aUsedSymbols.insert( rSymbolName ); }
+    void    AddToUsedSymbols( const OUString &rSymbolName ) { m_aUsedSymbols.insert( rSymbolName ); }
 
 public:
                  SmParser();
 
     /** Parse rBuffer to formula tree */
-    SmNode      *Parse(const String &rBuffer);
+    SmNode      *Parse(const OUString &rBuffer);
     /** Parse rBuffer to formula subtree that constitutes an expression */
     SmNode      *ParseExpression(const OUString &rBuffer);
 
-    const String & GetText() const { return m_aBufferString; };
+    const OUString & GetText() const { return m_aBufferString; };
 
     SmConvert   GetConversion() const              { return m_eConversion; }
     void        SetConversion(SmConvert eConv)     { m_eConversion = eConv; }
@@ -277,8 +277,8 @@ public:
     const SmErrorDesc*  NextError();
     const SmErrorDesc*  PrevError();
     const SmErrorDesc*  GetError(size_t i = size_t(-1) );
-    static const SmTokenTableEntry* GetTokenTableEntry( const String &rName );
-    bool    IsUsedSymbol( const String &rSymbolName ) const { return m_aUsedSymbols.find( rSymbolName ) != m_aUsedSymbols.end(); }
+    static const SmTokenTableEntry* GetTokenTableEntry( const OUString &rName );
+    bool    IsUsedSymbol( const OUString &rSymbolName ) const { return m_aUsedSymbols.find( rSymbolName ) != m_aUsedSymbols.end(); }
     std::set< OUString >   GetUsedSymbols() const      { return m_aUsedSymbols; }
 };
 

starmath/qa/cppunit/test_starmath.cxx

@@ -142,7 +142,7 @@ void Test::editMarker()
 
 void Test::editFailure()
 {
-    m_xDocShRef->SetText(String("color a b over {a/}"));
+    m_xDocShRef->SetText("color a b over {a/}");
 
     const SmErrorDesc *pErrorDesc = m_xDocShRef->GetParser().NextError();
 

starmath/source/accessibility.cxx

@@ -504,7 +504,7 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getCharacterBounds( sal_Int32 nInde
             --nIndex;
 
         const SmNode *pTree = pDoc->GetFormulaTree();
-        const SmNode *pNode = pTree->FindNodeWithAccessibleIndex( (xub_StrLen) nIndex );
+        const SmNode *pNode = pTree->FindNodeWithAccessibleIndex( nIndex );
         //! pNode may be 0 if the index belongs to a char that was inserted
         //! only for the accessible text!
         if (pNode)
@@ -1450,7 +1450,7 @@ void SmTextForwarder::AppendParagraph()
 
 sal_uInt16 SmTextForwarder::AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet )
 {
-    xub_StrLen nRes = 0;
+    sal_uInt16 nRes = 0;
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     if (pEditEngine && nPara < pEditEngine->GetParagraphCount())
     {

starmath/source/edit.cxx

@@ -823,7 +823,7 @@ void SmEditWindow::MarkError(const Point &rPos)
     OSL_ENSURE( pEditView, "EditView missing" );
     if (pEditView)
     {
-        const xub_StrLen    nCol = sal::static_int_cast< xub_StrLen >(rPos.X());
+        const sal_uInt16        nCol = sal::static_int_cast< sal_uInt16 >(rPos.X());
         const sal_uInt16        nRow = sal::static_int_cast< sal_uInt16 >(rPos.Y() - 1);
 
         pEditView->SetSelection(ESelection(nRow, nCol - 1, nRow, nCol));

starmath/source/node.cxx

@@ -519,7 +519,7 @@ void SmNode::GetAccessibleText( OUStringBuffer &/*rText*/ ) const
     OSL_FAIL( "SmNode: GetAccessibleText not overloaded" );
 }
 
-const SmNode * SmNode::FindNodeWithAccessibleIndex(xub_StrLen nAccIdx) const
+const SmNode * SmNode::FindNodeWithAccessibleIndex(sal_Int32 nAccIdx) const
 {
     const SmNode *pResult = 0;
 

starmath/source/smmod.cxx

@@ -86,8 +86,8 @@ const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportNa
     const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
     const ResStringArray &rUiNames = rData.GetUiSymbolNamesArray();
     const ResStringArray &rExportNames = rData.GetExportSymbolNamesArray();
-    sal_uInt16 nCount = sal::static_int_cast< xub_StrLen >(rExportNames.Count());
-    for (sal_uInt16 i = 0;  i < nCount  &&  aRes.isEmpty();  ++i)
+    sal_uInt32 nCount = rExportNames.Count();
+    for (sal_uInt32 i = 0;  i < nCount  &&  aRes.isEmpty();  ++i)
     {
         if (rExportNames.GetString(i).equals(rExportName))
         {
@@ -107,8 +107,8 @@ const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiNa
     const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
     const ResStringArray &rUiNames = rData.GetUiSymbolNamesArray();
     const ResStringArray &rExportNames = rData.GetExportSymbolNamesArray();
-    sal_uInt16 nCount = sal::static_int_cast< xub_StrLen >(rUiNames.Count());
-    for (sal_uInt16 i = 0;  i < nCount  &&  aRes.isEmpty();  ++i)
+    sal_uInt32 nCount = rUiNames.Count();
+    for (sal_uInt32 i = 0;  i < nCount  &&  aRes.isEmpty();  ++i)
     {
         if (rUiNames.GetString(i).equals(rUiName))
         {
@@ -128,8 +128,8 @@ const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExpor
     const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
     const ResStringArray &rUiNames = rData.GetUiSymbolSetNamesArray();
     const ResStringArray &rExportNames = rData.GetExportSymbolSetNamesArray();
-    sal_uInt16 nCount = sal::static_int_cast< xub_StrLen >(rExportNames.Count());
-    for (sal_uInt16 i = 0;  i < nCount  &&  aRes.isEmpty();  ++i)
+    sal_uInt32 nCount = rExportNames.Count();
+    for (sal_uInt32 i = 0;  i < nCount  &&  aRes.isEmpty();  ++i)
     {
         if (rExportNames.GetString(i).equals(rExportName))
         {
@@ -149,8 +149,8 @@ const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rU
     const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
     const ResStringArray &rUiNames = rData.GetUiSymbolSetNamesArray();
     const ResStringArray &rExportNames = rData.GetExportSymbolSetNamesArray();
-    sal_uInt16 nCount = sal::static_int_cast< xub_StrLen >(rUiNames.Count());
-    for (sal_uInt16 i = 0;  i < nCount  &&  aRes.isEmpty();  ++i)
+    sal_uInt32 nCount = rUiNames.Count();
+    for (sal_uInt32 i = 0;  i < nCount  &&  aRes.isEmpty();  ++i)
     {
         if (rUiNames.GetString(i).equals(rUiName))
         {