diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-02 19:58:58 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-03 07:54:23 -0300 |
| commit | b20dd01623f99e311a8a346e787c6917048379a2 (patch) | |
| tree | 6f4a4d9f24a359a776468d97c4a983f84997cd86 /starmath | |
| parent | 0683821d07132fb7635174b46d7423ecabc2703e (diff) | |
Some String <-> OUString replacements in starmath
Some string to OUString replacements in starmath
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/dialog.hxx | 2 | ||||
| -rw-r--r-- | starmath/inc/utility.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/dialog.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 23f129751e8c..7cb8521cd880 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -366,7 +366,7 @@ class SmSymbolDialog : public ModalDialog SmViewShell &rViewSh; SmSymbolManager &rSymbolMgr; - String aSymbolSetName; + rtl::OUString aSymbolSetName; SymbolPtrVec_t aSymbolSet; OutputDevice *pFontListDev; diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 58e59613d6a3..a80fc5d44f60 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -106,7 +106,7 @@ public: Font(), nBorderWidth(-1) { Impl_Init(); } SmFace(const Font& rFont) : Font(rFont), nBorderWidth(-1) { Impl_Init(); } - SmFace(const String& rName, const Size& rSize) : + SmFace(const rtl::OUString& rName, const Size& rSize) : Font(rName, rSize), nBorderWidth(-1) { Impl_Init(); } SmFace( FontFamily eFamily, const Size& rSize) : Font(eFamily, rSize), nBorderWidth(-1) { Impl_Init(); } diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 6679ae717ddc..0437c0ca7dbb 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1677,7 +1677,7 @@ bool SmSymbolDialog::SelectSymbolSet(const XubString &rSymbolSetName) void SmSymbolDialog::SelectSymbol(sal_uInt16 nSymbolNo) { const SmSym *pSym = NULL; - if (aSymbolSetName.Len() > 0 && nSymbolNo < static_cast< sal_uInt16 >(aSymbolSet.size())) + if (!aSymbolSetName.isEmpty() && nSymbolNo < static_cast< sal_uInt16 >(aSymbolSet.size())) pSym = aSymbolSet[ nSymbolNo ]; aSymbolSetDisplay.SelectSymbol(nSymbolNo); @@ -1689,7 +1689,7 @@ void SmSymbolDialog::SelectSymbol(sal_uInt16 nSymbolNo) const SmSym * SmSymbolDialog::GetSymbol() const { sal_uInt16 nSymbolNo = aSymbolSetDisplay.GetSelectSymbol(); - bool bValid = aSymbolSetName.Len() > 0 && nSymbolNo < static_cast< sal_uInt16 >(aSymbolSet.size()); + bool bValid = !aSymbolSetName.isEmpty() && nSymbolNo < static_cast< sal_uInt16 >(aSymbolSet.size()); return bValid ? aSymbolSet[ nSymbolNo ] : NULL; } |