Commits

Thomas Lange [tl]  committed a0eb1c9 Merge

cws tl83: merge

  • Participants
  • Parent commits ee5cb27, 4c5492e

Comments (0)

Files changed (4)

File extras/source/wordbook/standard.dic

File contents unchanged.

File starmath/source/cfgitem.cxx

 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";
 

File starmath/source/makefile.mk

 
 # --- Settings -----------------------------------------------------
 
+ENABLE_EXCEPTIONS=TRUE
+
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------
 	$(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
 

File starmath/source/node.cxx

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