summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-07-04 23:58:05 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-07-09 12:16:56 +0100
commit104261010aa5ccbb7df4a82a3a3cafcfb0591fa7 (patch)
treeb8db79d2707ff5925ad01dba8a41bd8ab6d66847 /starmath
parent1a1e953ee33c213dc8b88dd96a69ca9fc5e42d50 (diff)
some UniString->rtl::OUString
Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
Diffstat (limited to 'starmath')
-rw-r--r--starmath/inc/node.hxx4
-rw-r--r--starmath/source/dialog.cxx4
-rw-r--r--starmath/source/document.cxx2
-rw-r--r--starmath/source/node.cxx4
-rw-r--r--starmath/source/parse.cxx8
-rw-r--r--starmath/source/symbol.cxx6
-rw-r--r--starmath/source/view.cxx4
7 files changed, 16 insertions, 16 deletions
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index f7b5115859b2..78167251c563 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -563,7 +563,7 @@ protected:
{
xub_Unicode cChar = GetToken().cMathChar;
if ((xub_Unicode) '\0' != cChar)
- SetText( cChar );
+ SetText(rtl::OUString(cChar));
}
public:
@@ -640,7 +640,7 @@ public:
SmErrorNode(SmParseError /*eError*/, const SmToken &rNodeToken)
: SmMathSymbolNode(NERROR, rNodeToken)
{
- SetText((xub_Unicode) MS_ERROR);
+ SetText(rtl::OUString(MS_ERROR));
}
virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 32967d0f0bf8..92c4ba424b20 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -904,7 +904,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory)
{
eUnit = FUNIT_CUSTOM;
nDigits = 0;
- pMF->SetCustomUnitText( '%' );
+ pMF->SetCustomUnitText(rtl::OUString('%'));
}
else
{
@@ -1519,7 +1519,7 @@ IMPL_LINK( SmSymbolDialog, GetClickHdl, Button *, EMPTYARG pButton )
const SmSym *pSym = GetSymbol();
if (pSym)
{
- String aText ('%');
+ String aText = rtl::OUString('%');
aText += pSym->GetName();
aText += (sal_Unicode)' ';
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index cd4575596641..2aa4b8213d8a 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -1246,7 +1246,7 @@ void SmDocShell::GetState(SfxItemSet &rSet)
sal_Unicode cMod = ' ';
if (IsModified())
cMod = '*';
- rSet.Put(SfxStringItem(SID_MODIFYSTATUS, String(cMod)));
+ rSet.Put(SfxStringItem(SID_MODIFYSTATUS, rtl::OUString(cMod)));
}
break;
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 9132d772e4af..be17a9867ead 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2671,7 +2671,7 @@ SmMathSymbolNode::SmMathSymbolNode(const SmToken &rNodeToken)
{
xub_Unicode cChar = GetToken().cMathChar;
if ((xub_Unicode) '\0' != cChar)
- SetText( cChar );
+ SetText(rtl::OUString(cChar));
}
void SmMathSymbolNode::AdaptToX(const OutputDevice &rDev, sal_uLong nWidth)
@@ -3087,7 +3087,7 @@ void SmBlankNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
nSpace = nNum * nDist;
// ein SmRect mit Baseline und allem drum und dran besorgen
- SmRect::operator = (SmRect(aTmpDev, &rFormat, XubString(xub_Unicode(' ')),
+ SmRect::operator = (SmRect(aTmpDev, &rFormat, rtl::OUString(' '),
GetFont().GetBorderWidth()));
// und dieses auf die gewuenschte Breite bringen
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index afa6a8ef5a0b..827ff16251d5 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1025,7 +1025,7 @@ void SmParser::Align()
if (CONVERT_40_TO_50 == GetConversion())
// encapsulate expression to be aligned in group braces
// (here group-open brace)
- { Insert('{', GetTokenIndex());
+ { Insert(rtl::OUString('{'), GetTokenIndex());
bNeedGroupClose = true;
// get first valid align statement in sequence
@@ -1061,7 +1061,7 @@ void SmParser::Align()
Expression();
if (bNeedGroupClose)
- Insert('}', GetTokenIndex());
+ Insert(rtl::OUString('}'), GetTokenIndex());
if (pSNode)
{
@@ -1551,7 +1551,7 @@ void SmParser::Term()
else // encapsulate old 4.0 style parsing in braces
{
// insert opening brace
- Insert('{', GetTokenIndex());
+ Insert(rtl::OUString('{'), GetTokenIndex());
//
// parse in 4.0 style
@@ -1568,7 +1568,7 @@ void SmParser::Term()
}
// insert closing brace
- Insert('}', GetTokenIndex());
+ Insert(rtl::OUString('}'), GetTokenIndex());
SmStructureNode *pSNode = new SmExpressionNode(pFunc->GetToken());
pSNode->SetSubNodes(pFunc, lcl_popOrZero(m_aNodeStack));
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 6d5c5454e9a7..0cb52c93509b 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -262,7 +262,7 @@ void SmSymbolManager::Load()
SmLocalizedSymbolData aLocalizedData;
const String aGreekSymbolSetName( aLocalizedData.GetUiSymbolSetName( OUString::createFromAscii( "Greek" ) ));
const SymbolPtrVec_t aGreekSymbols( GetSymbolSet( aGreekSymbolSetName ) );
- String aSymbolSetName( (sal_Unicode) 'i' );
+ String aSymbolSetName = rtl::OUString('i');
aSymbolSetName += aGreekSymbolSetName;
size_t nSymbols = aGreekSymbols.size();
for (size_t i = 0; i < nSymbols; ++i)
@@ -272,7 +272,7 @@ void SmSymbolManager::Load()
Font aFont( rSym.GetFace() );
OSL_ENSURE( aFont.GetItalic() == ITALIC_NONE, "expected Font with ITALIC_NONE, failed." );
aFont.SetItalic( ITALIC_NORMAL );
- String aSymbolName( (sal_Unicode)'i' );
+ String aSymbolName = rtl::OUString('i');
aSymbolName += rSym.GetName();
SmSym aSymbol( aSymbolName, aFont, rSym.GetCharacter(),
aSymbolSetName, true /*bIsPredefined*/ );
@@ -289,7 +289,7 @@ void SmSymbolManager::Save()
// prepare to skip symbols from iGreek on saving
SmLocalizedSymbolData aLocalizedData;
- String aSymbolSetName( (sal_Unicode) 'i' );
+ String aSymbolSetName = rtl::OUString('i');
aSymbolSetName += aLocalizedData.GetUiSymbolSetName( OUString::createFromAscii( "Greek" ));
SymbolPtrVec_t aTmp( GetSymbols() );
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index e3f567b73f34..f1365b4470e1 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1060,7 +1060,7 @@ Size SmViewShell::GetTextLineSize(OutputDevice& rDevice, const String& rLine)
if (nTabs > 0)
{
- long TabPos = rDevice.GetTextWidth('n') * 8;
+ long TabPos = rDevice.GetTextWidth(rtl::OUString('n')) * 8;
aSize.Width() = 0;
@@ -1152,7 +1152,7 @@ void SmViewShell::DrawTextLine(OutputDevice& rDevice, const Point& rPosition, co
if (nTabs > 0)
{
- long TabPos = rDevice.GetTextWidth('n') * 8;
+ long TabPos = rDevice.GetTextWidth(rtl::OUString('n')) * 8;
for (sal_uInt16 i = 0; i < nTabs; i++)
{