strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some String <-> OUString replacements in starmath

Browse source 
Some string to OUString replacements in starmath
This commit is contained in:
Olivier Hallot 2012-04-02 19:58:58 -03:00
parent 0683821d07
commit b20dd01623
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
starmath/inc/dialog.hxx
View file

@ -366,7 +366,7 @@ class SmSymbolDialog : public ModalDialog
SmViewShell &rViewSh;
SmSymbolManager &rSymbolMgr;
String aSymbolSetName;
rtl::OUString aSymbolSetName;
SymbolPtrVec_t aSymbolSet;
OutputDevice *pFontListDev;

2
starmath/inc/utility.hxx
View file

@ -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(); }

4
starmath/source/dialog.cxx
View file

@ -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;
}