sfx2/source/view/sfxbasecontroller.cxx | 16 +++---
sot/source/sdstor/stgelem.cxx | 2
starmath/source/mathmlexport.cxx | 2
starmath/source/mathmlimport.cxx | 48 +++++++++-----------
stoc/source/bootstrap/services.cxx | 2
stoc/source/corereflection/crbase.cxx | 2
stoc/source/corereflection/crefl.cxx | 2
stoc/source/invocation/invocation.cxx | 10 ++--
stoc/source/invocation_adapterfactory/iafactory.cxx | 4 -
stoc/source/javaloader/javaloader.cxx | 2
stoc/source/namingservice/namingservice.cxx | 2
stoc/source/proxy_factory/proxyfac.cxx | 2
stoc/source/stocservices/stocservices.cxx | 2
svl/source/numbers/zformat.cxx | 2
14 files changed, 47 insertions(+), 51 deletions(-)
New commits:
commit 98e20a37badecd868460ddbdc73262c494242b42
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Thu Aug 22 13:59:45 2013 +0900
Mark as const
Change-Id: I65a05b59da6dbc2d37a55129c54ca0f322702364
diff --git a/sfx2/source/view/sfxbasecontroller.cxx
b/sfx2/source/view/sfxbasecontroller.cxx
index 8783d61..f97567f 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -112,7 +112,7 @@ struct GroupIDToCommandGroup
const sal_Int16 MAX_COMMANDGROUP = frame::CommandGroup::CONTROLS;
static bool bGroupIDMapInitialized = false;
-static GroupIDToCommandGroup GroupIDCommandGroupMap[] =
+static const GroupIDToCommandGroup GroupIDCommandGroupMap[] =
{
{ GID_INTERN , frame::CommandGroup::INTERNAL },
{ GID_APPLICATION , frame::CommandGroup::APPLICATION },
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 37013ac..a4a2485 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -31,7 +31,7 @@
static const sal_uInt16 nMaxLegalStr = 31;
-static sal_uInt8 cStgSignature[ 8 ] = {
0xD0,0xCF,0x11,0xE0,0xA1,0xB1,0x1A,0xE1 };
+static const sal_uInt8 cStgSignature[ 8 ] = {
0xD0,0xCF,0x11,0xE0,0xA1,0xB1,0x1A,0xE1 };
////////////////////////////// struct ClsId /////////////////////////////
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index a1cabfa..c10bf97 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -1885,7 +1885,7 @@ SvXMLImportContext
*SmXMLFlatDocContext_Impl::CreateChildContext(
////////////////////////////////////////////////////////////
-static SvXMLTokenMapEntry aPresLayoutElemTokenMap[] =
+static const SvXMLTokenMapEntry aPresLayoutElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_SEMANTICS, XML_TOK_SEMANTICS },
{ XML_NAMESPACE_MATH, XML_MATH, XML_TOK_MATH },
@@ -1911,7 +1911,7 @@ static SvXMLTokenMapEntry aPresLayoutElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] =
+static const SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_FONTWEIGHT, XML_TOK_FONTWEIGHT },
{ XML_NAMESPACE_MATH, XML_FONTSTYLE, XML_TOK_FONTSTYLE },
@@ -1921,27 +1921,27 @@ static SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aFencedAttrTokenMap[] =
+static const SvXMLTokenMapEntry aFencedAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_OPEN, XML_TOK_OPEN },
{ XML_NAMESPACE_MATH, XML_CLOSE, XML_TOK_CLOSE },
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aOperatorAttrTokenMap[] =
+static const SvXMLTokenMapEntry aOperatorAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_STRETCHY, XML_TOK_STRETCHY },
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aAnnotationAttrTokenMap[] =
+static const SvXMLTokenMapEntry aAnnotationAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_ENCODING, XML_TOK_ENCODING },
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aPresElemTokenMap[] =
+static const SvXMLTokenMapEntry aPresElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_ANNOTATION, XML_TOK_ANNOTATION },
{ XML_NAMESPACE_MATH, XML_MI, XML_TOK_MI },
@@ -1954,21 +1954,21 @@ static SvXMLTokenMapEntry aPresElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aPresScriptEmptyElemTokenMap[] =
+static const SvXMLTokenMapEntry aPresScriptEmptyElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_MPRESCRIPTS, XML_TOK_MPRESCRIPTS },
{ XML_NAMESPACE_MATH, XML_NONE, XML_TOK_NONE },
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aPresTableElemTokenMap[] =
+static const SvXMLTokenMapEntry aPresTableElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_MTR, XML_TOK_MTR },
{ XML_NAMESPACE_MATH, XML_MTD, XML_TOK_MTD },
XML_TOKEN_MAP_END
};
-static SvXMLTokenMapEntry aColorTokenMap[] =
+static const SvXMLTokenMapEntry aColorTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_BLACK, TBLACK},
{ XML_NAMESPACE_MATH, XML_WHITE, TWHITE},
diff --git a/stoc/source/bootstrap/services.cxx
b/stoc/source/bootstrap/services.cxx
index e1295cb..7e81e13 100644
--- a/stoc/source/bootstrap/services.cxx
+++ b/stoc/source/bootstrap/services.cxx
@@ -35,7 +35,7 @@ using namespace osl;
using namespace stoc_bootstrap;
-static struct ImplementationEntry g_entries[] =
+static const struct ImplementationEntry g_entries[] =
{
//servicemanager
{
diff --git a/stoc/source/corereflection/crbase.cxx
b/stoc/source/corereflection/crbase.cxx
index 8d91b6e..b598a0f 100644
--- a/stoc/source/corereflection/crbase.cxx
+++ b/stoc/source/corereflection/crbase.cxx
@@ -105,7 +105,7 @@ sal_Bool IdlClassImpl::equals( const Reference< XIdlClass
>& xType )
(xType->getTypeClass() == _eTypeClass) && (xType->getName() ==
_aName));
}
-static sal_Bool s_aAssignableFromTab[11][11] =
+static const sal_Bool s_aAssignableFromTab[11][11] =
{
/* from CH,BO,BY,SH,US,LO,UL,HY,UH,FL,DO */
/* TypeClass_CHAR */ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
diff --git a/stoc/source/corereflection/crefl.cxx
b/stoc/source/corereflection/crefl.cxx
index 866c78a..a5eb2d3 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -445,7 +445,7 @@ Reference< XInterface > SAL_CALL
IdlReflectionServiceImpl_create(
using namespace stoc_corefl;
-static struct ImplementationEntry g_entries[] =
+static const struct ImplementationEntry g_entries[] =
{
{
IdlReflectionServiceImpl_create, core_getImplementationName,
diff --git a/stoc/source/invocation/invocation.cxx
b/stoc/source/invocation/invocation.cxx
index 13b9448..f6604f8 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -1177,7 +1177,7 @@ Reference<XInterface> SAL_CALL
InvocationService_CreateInstance( const Reference
}
using namespace stoc_inv;
-static struct ImplementationEntry g_entries[] =
+static const struct ImplementationEntry g_entries[] =
{
{
InvocationService_CreateInstance, inv_getImplementationName,
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx
b/stoc/source/invocation_adapterfactory/iafactory.cxx
index c430f34..2d0c862 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -937,7 +937,7 @@ static Reference< XInterface > SAL_CALL FactoryImpl_create(
//##############################################################################
//##############################################################################
-static struct ::cppu::ImplementationEntry g_entries[] =
+static const struct ::cppu::ImplementationEntry g_entries[] =
{
{
::stoc_invadp::FactoryImpl_create,
diff --git a/stoc/source/javaloader/javaloader.cxx
b/stoc/source/javaloader/javaloader.cxx
index d9590ef..02c6eb1 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -416,7 +416,7 @@ css::uno::Reference<XInterface> SAL_CALL
JavaComponentLoader_CreateInstance(cons
using namespace stoc_javaloader;
-static struct ImplementationEntry g_entries[] =
+static const struct ImplementationEntry g_entries[] =
{
{
JavaComponentLoader_CreateInstance, loader_getImplementationName,
diff --git a/stoc/source/namingservice/namingservice.cxx
b/stoc/source/namingservice/namingservice.cxx
index d4473b3..139de3c 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -177,7 +177,7 @@ void NamingService_Impl::revokeObject( const OUString& Name
) throw(Exception, R
}
using namespace stoc_namingservice;
-static struct ImplementationEntry g_entries[] =
+static const struct ImplementationEntry g_entries[] =
{
{
NamingService_Impl_create, ns_getImplementationName,
diff --git a/stoc/source/proxy_factory/proxyfac.cxx
b/stoc/source/proxy_factory/proxyfac.cxx
index 2b52096..f06f5a1 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -481,7 +481,7 @@ static Reference< XInterface > SAL_CALL proxyfac_create(
return xRet;
}
-static ::cppu::ImplementationEntry g_entries [] =
+static const ::cppu::ImplementationEntry g_entries [] =
{
{
proxyfac_create, proxyfac_getImplementationName,
diff --git a/stoc/source/stocservices/stocservices.cxx
b/stoc/source/stocservices/stocservices.cxx
index 3594b1b..44fcc4e 100644
--- a/stoc/source/stocservices/stocservices.cxx
+++ b/stoc/source/stocservices/stocservices.cxx
@@ -32,7 +32,7 @@ using namespace cppu;
using namespace osl;
using namespace stoc_services;
-static struct ImplementationEntry g_entries[] =
+static const struct ImplementationEntry g_entries[] =
{
// typeconv
{
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 909a1db..99f8167 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -71,7 +71,7 @@ const double D_EPS = 1.0E-2;
const double _D_MAX_D_BY_100 = 1.7E306;
const double _D_MIN_M_BY_1000 = 2.3E-305;
-static sal_uInt8 cCharWidths[ 128-32 ] = {
+static const sal_uInt8 cCharWidths[ 128-32 ] = {
1,1,1,2,2,3,2,1,1,1,1,2,1,1,1,1,
2,2,2,2,2,2,2,2,2,2,1,1,2,2,2,2,
3,2,2,2,2,2,2,3,2,1,2,2,2,3,3,3,
commit 43b989808142f49347929311347f9402f4c06368
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Thu Aug 22 12:05:18 2013 +0900
sal_Bool to bool
Change-Id: I4ab448a461a9fe37ba18838357d371f71b0a496c
diff --git a/sfx2/source/view/sfxbasecontroller.cxx
b/sfx2/source/view/sfxbasecontroller.cxx
index 93c217d..8783d61 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -111,7 +111,7 @@ struct GroupIDToCommandGroup
// Please update when a new command group is added
const sal_Int16 MAX_COMMANDGROUP = frame::CommandGroup::CONTROLS;
-static sal_Bool bGroupIDMapInitialized = sal_False;
+static bool bGroupIDMapInitialized = false;
static GroupIDToCommandGroup GroupIDCommandGroupMap[] =
{
{ GID_INTERN , frame::CommandGroup::INTERNAL },
@@ -160,7 +160,7 @@ sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID )
GroupIDCommandGroupMap[i].nCommandGroup ));
++i;
}
- bGroupIDMapInitialized = sal_True;
+ bGroupIDMapInitialized = true;
}
GroupHashMap::const_iterator pIter = mHashMap.find( nGroupID );
@@ -281,7 +281,7 @@ void SAL_CALL SfxStatusIndicator::setValue( sal_Int32
nValue ) throw(RuntimeExce
if ( xProgress.is() )
xProgress->setValue( nValue );
- sal_Bool bReschedule = (( Get10ThSec() - _nStartTime ) >
TIMEOUT_START_RESCHEDULE );
+ bool bReschedule = (( Get10ThSec() - _nStartTime ) >
TIMEOUT_START_RESCHEDULE );
if ( bReschedule )
reschedule();
}
@@ -400,7 +400,7 @@ struct IMPL_SfxBaseController_DataContainer
Reference< XStatusIndicator > m_xIndicator ;
SfxViewShell* m_pViewShell ;
SfxBaseController* m_pController ;
- sal_Bool m_bDisposing ;
+ bool m_bDisposing ;
sal_Bool m_bSuspendState ;
Reference< XTitle > m_xTitleHelper ;
Sequence< PropertyValue > m_aCreationArgs ;
@@ -415,7 +415,7 @@ struct IMPL_SfxBaseController_DataContainer
, m_aInterceptorContainer ( aMutex
)
, m_pViewShell ( pViewShell
)
, m_pController ( pController
)
- , m_bDisposing ( sal_False
)
+ , m_bDisposing ( false
)
, m_bSuspendState ( sal_False
)
{
}
@@ -631,7 +631,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool
bSuspend ) throw( Runtime
// More Views on the same document?
SfxObjectShell* pDocShell =
m_pData->m_pViewShell->GetObjectShell() ;
- sal_Bool bOther = sal_False
;
+ bool bOther = false
;
for ( const SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell
); !bOther && pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ) )
bOther = (pFrame != pActFrame);
@@ -974,7 +974,7 @@ void SAL_CALL SfxBaseController::dispose() throw(
RuntimeException )
{
SolarMutexGuard aGuard;
Reference< XController > xTmp( this );
- m_pData->m_bDisposing = sal_True ;
+ m_pData->m_bDisposing = true ;
lang::EventObject aEventObject;
aEventObject.Source = *this ;
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index d21a9b7..a1cabfa 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -106,7 +106,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
// try to get an XStatusIndicator from the Medium
uno::Reference<task::XStatusIndicator> xStatusIndicator;
- sal_Bool bEmbedded = sal_False;
+ bool bEmbedded = false;
uno::Reference <lang::XUnoTunnel> xTunnel;
xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
SmModel *pModel = reinterpret_cast<SmModel *>
@@ -129,7 +129,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
}
if ( SFX_CREATE_MODE_EMBEDDED == pDocShell->GetCreateMode() )
- bEmbedded = sal_True;
+ bEmbedded = true;
}
comphelper::PropertyMapEntry aInfoMap[] =
@@ -191,7 +191,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
}
}
- sal_Bool bOASIS = ( SotStorage::GetVersion( rMedium.GetStorage() ) >
SOFFICE_FILEFORMAT_60 );
+ bool bOASIS = ( SotStorage::GetVersion( rMedium.GetStorage() ) >
SOFFICE_FILEFORMAT_60 );
if (xStatusIndicator.is())
xStatusIndicator->setValue(nSteps++);
@@ -305,7 +305,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent(
// sax parser sends wrapped exceptions,
// try to find the original one
xml::sax::SAXException aSaxEx = *(xml::sax::SAXException*)(&r);
- sal_Bool bTryChild = sal_True;
+ bool bTryChild = true;
while( bTryChild )
{
@@ -313,7 +313,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent(
if ( aSaxEx.WrappedException >>= aTmp )
aSaxEx = aTmp;
else
- bTryChild = sal_False;
+ bTryChild = false;
}
packages::zip::ZipIOException aBrokenPackage;
@@ -635,7 +635,7 @@ struct SmXMLContext_Helper
sal_Int8 nIsBold;
sal_Int8 nIsItalic;
double nFontSize;
- sal_Bool bFontNodeNeeded;
+ bool bFontNodeNeeded;
OUString sFontFamily;
OUString sColor;
@@ -702,9 +702,9 @@ void SmXMLContext_Helper::RetrieveAttrs(const
uno::Reference<
if ((nOldIsBold!=nIsBold) || (nOldIsItalic!=nIsItalic) ||
(nOldFontSize!=nFontSize) || (sOldFontFamily!=sFontFamily)
|| !sColor.isEmpty())
- bFontNodeNeeded=sal_True;
+ bFontNodeNeeded=true;
else
- bFontNodeNeeded=sal_False;
+ bFontNodeNeeded=false;
}
void SmXMLContext_Helper::ApplyAttrs()
@@ -1152,12 +1152,12 @@ void SmXMLNumberContext_Impl::EndElement()
class SmXMLAnnotationContext_Impl : public SmXMLImportContext
{
- sal_Bool bIsStarMath;
+ bool bIsStarMath;
public:
SmXMLAnnotationContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
const OUString& rLName)
- : SmXMLImportContext(rImport,nPrefix,rLName), bIsStarMath(sal_False) {}
+ : SmXMLImportContext(rImport,nPrefix,rLName), bIsStarMath(false) {}
virtual void Characters(const OUString &rChars);
@@ -1320,9 +1320,9 @@ void SmXMLIdentifierContext_Impl::EndElement()
if ((-1!=aStyleHelper.nIsBold) || (0.0!=aStyleHelper.nFontSize) ||
(!aStyleHelper.sFontFamily.isEmpty()) ||
!aStyleHelper.sColor.isEmpty())
- aStyleHelper.bFontNodeNeeded=sal_True;
+ aStyleHelper.bFontNodeNeeded=true;
else
- aStyleHelper.bFontNodeNeeded=sal_False;
+ aStyleHelper.bFontNodeNeeded=false;
if (aStyleHelper.bFontNodeNeeded)
aStyleHelper.ApplyAttrs();
GetSmImport().GetNodeStack().push(pNode);
@@ -1337,7 +1337,7 @@ void SmXMLIdentifierContext_Impl::TCharacters(const
OUString &rChars)
class SmXMLOperatorContext_Impl : public SmXMLImportContext
{
- sal_Bool bIsStretchy;
+ bool bIsStretchy;
protected:
SmToken aToken;
@@ -1345,7 +1345,7 @@ protected:
public:
SmXMLOperatorContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
const OUString& rLName)
- : SmXMLImportContext(rImport,nPrefix,rLName), bIsStretchy(sal_False)
+ : SmXMLImportContext(rImport,nPrefix,rLName), bIsStretchy(false)
{
aToken.eType = TSPECIAL;
aToken.nLevel = 5;
diff --git a/stoc/source/invocation/invocation.cxx
b/stoc/source/invocation/invocation.cxx
index 8640f53..13b9448 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -876,7 +876,7 @@ InvocationInfo SAL_CALL Invocation_Impl::getInfoForName(
const OUString& aName,
return _xDirect2->getInfoForName( aName, bExact );
}
- sal_Bool bFound = sal_False;
+ bool bFound = false;
OUString aExactName = aName;
InvocationInfo aRetInfo;
@@ -889,7 +889,7 @@ InvocationInfo SAL_CALL Invocation_Impl::getInfoForName(
const OUString& aName,
Reference<XIdlMethod> xMethod = _xIntrospectionAccess->getMethod
( aExactName, MethodConcept::ALL ^ MethodConcept::DANGEROUS );
fillInfoForMethod( aRetInfo, xMethod );
- bFound = sal_True;
+ bFound = true;
}
else
{
@@ -899,13 +899,13 @@ InvocationInfo SAL_CALL Invocation_Impl::getInfoForName(
const OUString& aName,
Property aProp = _xIntrospectionAccess->getProperty
( aExactName, PropertyConcept::ALL ^
PropertyConcept::DANGEROUS );
fillInfoForProperty( aRetInfo, aProp );
- bFound = sal_True;
+ bFound = true;
}
// NameAccess
else if( _xNameAccess.is() && _xNameAccess->hasByName( aExactName
) )
{
fillInfoForNameAccess( aRetInfo, aExactName );
- bFound = sal_True;
+ bFound = true;
}
}
}
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx
b/stoc/source/invocation_adapterfactory/iafactory.cxx
index ad7dbec..c430f34 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -229,7 +229,7 @@ static inline void constructRuntimeException(
}
//------------------------------------------------------------------------------
-static inline sal_Bool type_equals(
+static inline bool type_equals(
typelib_TypeDescriptionReference * pType1,
typelib_TypeDescriptionReference * pType2 )
SAL_THROW(())
commit 92d18638045a1f8ebcb36d8a9f0a9fb8c481e50b
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Wed Aug 21 11:58:47 2013 +0900
Drop useless #undef
WANTEXCEPT disappeared with fc9fb12f58866c04636f61e073d39ba29806cbb5
Change-Id: I6ac9aeba0258797e18f5381a3876401e4dee4c89
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 659f5a9..ae33763 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -81,8 +81,6 @@ using namespace ::xmloff::token;
#define EXPORT_SVC_NAME "com.sun.star.xml.XMLExportFilter"
-#undef WANTEXCEPT
-
sal_Unicode ConvertMathToMathML( sal_Unicode cChar )
{
sal_Unicode cRes = cChar;
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index eb35796..d21a9b7 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -79,8 +79,6 @@ using namespace ::xmloff::token;
#define IMPORT_SVC_NAME "com.sun.star.xml.XMLImportFilter"
-#undef WANTEXCEPT
-
////////////////////////////////////////////////////////////
namespace {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
