summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-10-19 05:34:48 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-10-19 10:55:56 +0000
commit8eb5db89978547547510b2954918c9881eeecb52 (patch)
treea3b7bb76eb6b0aa6376fe54aa78d1ce8884a6f59 /starmath
parentbd5921b7371c41267ec42a2784778e7b34641ac5 (diff)
replace sxub_Unicode by sal_Unicode
Change-Id: Icf4b434a1961cc4964ee6e362491868e898a1831 Reviewed-on: https://gerrit.libreoffice.org/887 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/inc/dialog.hxx2
-rw-r--r--starmath/inc/node.hxx4
-rw-r--r--starmath/source/dialog.cxx2
-rw-r--r--starmath/source/node.cxx6
-rw-r--r--starmath/source/rect.cxx22
5 files changed, 18 insertions, 18 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 6636ad0330e4..51782f0ecb91 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -514,7 +514,7 @@ public:
bool SelectFont(const OUString &rFontName) { return SelectFont(rFontName, true); }
bool SelectStyle(const OUString &rStyleName) { return SelectStyle(rStyleName, true); };
- void SelectChar(xub_Unicode cChar);
+ void SelectChar(sal_Unicode cChar);
};
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 45c96696d433..eb706dd86d1d 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -561,8 +561,8 @@ protected:
SmMathSymbolNode(SmNodeType eNodeType, const SmToken &rNodeToken)
: SmSpecialNode(eNodeType, rNodeToken, FNT_MATH)
{
- xub_Unicode cChar = GetToken().cMathChar;
- if ((xub_Unicode) '\0' != cChar)
+ sal_Unicode cChar = GetToken().cMathChar;
+ if ((sal_Unicode) '\0' != cChar)
SetText(rtl::OUString(cChar));
}
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 82a0e7228068..95610873a281 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -2485,7 +2485,7 @@ bool SmSymDefineDialog::SelectStyle(const OUString &rStyleName, bool bApplyFont)
}
-void SmSymDefineDialog::SelectChar(xub_Unicode cChar)
+void SmSymDefineDialog::SelectChar(sal_Unicode cChar)
{
aCharsetDisplay.SelectCharacter( cChar );
aSymbolDisplay.SetSymbol( cChar, aCharsetDisplay.GetFont() );
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 972f725827a0..fc86c6ed6ea4 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1750,7 +1750,7 @@ void SmBraceNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
aTmpSize.Width() *= 182;
aTmpSize.Width() /= 267;
- xub_Unicode cChar = pLeft->GetToken().cMathChar;
+ sal_Unicode cChar = pLeft->GetToken().cMathChar;
if (cChar != MS_LINE && cChar != MS_DLINE)
pLeft ->GetFont().SetSize(aTmpSize);
@@ -2651,8 +2651,8 @@ SmNode * SmMatrixNode::GetLeftMost()
SmMathSymbolNode::SmMathSymbolNode(const SmToken &rNodeToken)
: SmSpecialNode(NMATH, rNodeToken, FNT_MATH)
{
- xub_Unicode cChar = GetToken().cMathChar;
- if ((xub_Unicode) '\0' != cChar)
+ sal_Unicode cChar = GetToken().cMathChar;
+ if ((sal_Unicode) '\0' != cChar)
SetText(rtl::OUString(cChar));
}
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index fc93660ab8bc..31cf876f35ac 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -35,17 +35,17 @@
// '\0' terminated Array with symbol, which should be treat as letters in
// StarMath Font, (to get a normal (non-clipped) SmRect in contrast to the
// other operators and symbols).
-static xub_Unicode const aMathAlpha[] =
+static sal_Unicode const aMathAlpha[] =
{
MS_ALEPH, MS_IM, MS_RE,
- MS_WP, xub_Unicode(0xE070), MS_EMPTYSET,
- xub_Unicode(0x2113), xub_Unicode(0xE0D6), xub_Unicode(0x2107),
- xub_Unicode(0x2127), xub_Unicode(0x210A), MS_HBAR,
+ MS_WP, sal_Unicode(0xE070), MS_EMPTYSET,
+ sal_Unicode(0x2113), sal_Unicode(0xE0D6), sal_Unicode(0x2107),
+ sal_Unicode(0x2127), sal_Unicode(0x210A), MS_HBAR,
MS_LAMBDABAR, MS_SETN, MS_SETZ,
MS_SETQ, MS_SETR, MS_SETC,
- xub_Unicode(0x2373), xub_Unicode(0xE0A5), xub_Unicode(0x2112),
- xub_Unicode(0x2130), xub_Unicode(0x2131),
- xub_Unicode('\0')
+ sal_Unicode(0x2373), sal_Unicode(0xE0A5), sal_Unicode(0x2112),
+ sal_Unicode(0x2130), sal_Unicode(0x2131),
+ sal_Unicode('\0')
};
bool SmIsMathAlpha(const rtl::OUString &rText)
@@ -55,18 +55,18 @@ bool SmIsMathAlpha(const rtl::OUString &rText)
return false;
OSL_ENSURE(rText.getLength() == 1, "Sm : string must be exactly one character long");
- xub_Unicode cChar = rText[0];
+ sal_Unicode cChar = rText[0];
// is it a greek symbol?
- if (xub_Unicode(0xE0AC) <= cChar && cChar <= xub_Unicode(0xE0D4))
+ if (sal_Unicode(0xE0AC) <= cChar && cChar <= sal_Unicode(0xE0D4))
return true;
else
{
// appears it in 'aMathAlpha'?
- const xub_Unicode *pChar = aMathAlpha;
+ const sal_Unicode *pChar = aMathAlpha;
while (*pChar && *pChar != cChar)
pChar++;
- return *pChar != xub_Unicode('\0');
+ return *pChar != sal_Unicode('\0');
}
}