diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-07-29 13:55:28 +0200 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-07-29 13:55:28 +0200 |
| commit | 9382d479d3815d9a073322ad5c8ddfe0dfa13eaa (patch) | |
| tree | 02b7233236e0897c6cc19f798eac3dfdf36d6481 /starmath | |
| parent | 705af29850ea12bd23783ec2a6937a2bb0c25f12 (diff) | |
| parent | b1554766bf429bb1270e4aabb63f8cb91e819ebc (diff) | |
cws tl83: merge
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/cfgitem.cxx | 1 | ||||
| -rw-r--r-- | starmath/source/makefile.mk | 20 | ||||
| -rwxr-xr-x | starmath/source/node.cxx | 6 |
3 files changed, 5 insertions, 22 deletions
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 8066b88fd80d..43c0fbe27dd0 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -42,7 +42,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -#define A2OU(x) rtl::OUString::createFromAscii( x ) static const char* aRootName = "Office.Math"; diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk index 596060397e18..a409e55d2462 100644 --- a/starmath/source/makefile.mk +++ b/starmath/source/makefile.mk @@ -36,6 +36,8 @@ LIBTARGET=NO # --- Settings ----------------------------------------------------- +ENABLE_EXCEPTIONS=TRUE + .INCLUDE : settings.mk # --- Files -------------------------------------------------------- @@ -84,24 +86,6 @@ SLOFILES = \ $(SLO1FILES) \ $(SLO2FILES) -EXCEPTIONSFILES = \ - $(SLO)$/register.obj \ - $(SLO)$/accessibility.obj \ - $(SLO)$/cfgitem.obj \ - $(SLO)$/dialog.obj \ - $(SLO)$/document.obj \ - $(SLO)$/node.obj \ - $(SLO)$/parse.obj \ - $(SLO)$/mathmlimport.obj \ - $(SLO)$/mathmlexport.obj \ - $(SLO)$/mathtype.obj \ - $(SLO)$/smdll.obj \ - $(SLO)$/view.obj \ - $(SLO)$/unomodel.obj \ - $(SLO)$/smdetect.obj \ - $(SLO)$/symbol.obj \ - $(SLO)$/unodoc.obj - LIB1TARGET = \ $(SLB)$/$(TARGET).lib diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 2747d994a7eb..b986a046b205 100755 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2886,12 +2886,12 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell bItalic = true; else if (nStyle == 2) { - String aText( GetText() ); - if (aText.Len() > 0) + String aTmp( GetText() ); + if (aTmp.Len() > 0) { const sal_Unicode cUppercaseAlpha = 0x0391; const sal_Unicode cUppercaseOmega = 0x03A9; - sal_Unicode cChar = aText.GetBuffer()[0]; + sal_Unicode cChar = aTmp.GetBuffer()[0]; // uppercase letters should be straight and lowercase letters italic bItalic = !(cUppercaseAlpha <= cChar && cChar <= cUppercaseOmega); } |