[Libreoffice-commits] .: 3 commits - binfilter/bf_xmloff binfilter/inc unoxml/test writerfilter/qa
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Feb 24 12:49:17 PST 2011
binfilter/bf_xmloff/source/core/makefile.mk | 1
binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx | 9
binfilter/bf_xmloff/source/style/makefile.mk | 1
binfilter/bf_xmloff/source/style/xmloff_AttributeContainerHandler.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_FillStyleContext.cxx | 8
binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_XMLFontAutoStylePool.cxx | 30 +--
binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx | 8
binfilter/bf_xmloff/source/style/xmloff_impastp1.cxx | 9
binfilter/bf_xmloff/source/style/xmloff_splithdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx | 97 ++++------
binfilter/bf_xmloff/source/style/xmloff_xmlprcon.cxx | 30 +--
binfilter/bf_xmloff/source/style/xmloff_xmltabi.cxx | 34 +--
binfilter/bf_xmloff/source/text/makefile.mk | 1
binfilter/bf_xmloff/source/text/txtparai.hxx | 4
binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx | 64 +-----
binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx | 24 --
binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx | 4
binfilter/inc/bf_xmloff/txtimp.hxx | 3
binfilter/inc/bf_xmloff/txtstyli.hxx | 2
binfilter/inc/bf_xmloff/xmlimp.hxx | 2
unoxml/test/makefile.mk | 1
writerfilter/qa/cppunittests/doctok/makefile.mk | 1
writerfilter/qa/cppunittests/odiapi/makefile.mk | 2
writerfilter/qa/cppunittests/qname/makefile.mk | 2
writerfilter/qa/cppunittests/sl/makefile.mk | 2
writerfilter/qa/cppunittests/xxml/makefile.mk | 2
31 files changed, 140 insertions(+), 225 deletions(-)
New commits:
commit 1e52d2f8f67eaf62826b76d8d23ba786cbbdf737
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 24 20:46:32 2011 +0000
throw out some warnings
diff --git a/binfilter/bf_xmloff/source/core/makefile.mk b/binfilter/bf_xmloff/source/core/makefile.mk
index 65e1ca7..d86ac6d 100644
--- a/binfilter/bf_xmloff/source/core/makefile.mk
+++ b/binfilter/bf_xmloff/source/core/makefile.mk
@@ -35,7 +35,6 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-CDEFS+=-DCONV_STAR_FONTS
INC+= -I$(PRJ)$/inc$/bf_xmloff
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx
index b418a35..db80267 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx
@@ -60,9 +60,7 @@
#include <rtl/logfile.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/extract.hxx>
-#ifdef CONV_STAR_FONTS
#include <unotools/fontcvt.hxx>
-#endif
#include "bf_so3/staticbaseurl.hxx"
namespace binfilter {
@@ -105,8 +103,6 @@ sal_Char const sXML_np__meta_old[] = "__meta";
#define LOGFILE_AUTHOR "mb93740"
-#ifdef CONV_STAR_FONTS
-
class SvXMLImportEventListener : public ::cppu::WeakImplHelper1<
::com::sun::star::lang::XEventListener >
{
@@ -158,7 +154,6 @@ public:
DestroyFontToSubsFontConverter( hMathFontConv );
}
};
-#endif
typedef SvXMLImportContext *SvXMLImportContextPtr;
SV_DECL_PTRARR( SvXMLImportContexts_Impl, SvXMLImportContextPtr, 20, 5 )
@@ -1223,7 +1218,6 @@ void SvXMLImport::_CreateDataStylesImport()
}
-#ifdef CONV_STAR_FONTS
sal_Unicode SvXMLImport::ConvStarBatsCharToStarSymbol( sal_Unicode c )
{
sal_Unicode cNew = c;
@@ -1259,9 +1253,6 @@ sal_Unicode SvXMLImport::ConvStarMathCharToStarSymbol( sal_Unicode c )
return cNew;
}
-#endif
-
-
void SvXMLImport::SetError(
sal_Int32 nId,
diff --git a/binfilter/bf_xmloff/source/style/makefile.mk b/binfilter/bf_xmloff/source/style/makefile.mk
index 1e9cbc5..f70cf65 100644
--- a/binfilter/bf_xmloff/source/style/makefile.mk
+++ b/binfilter/bf_xmloff/source/style/makefile.mk
@@ -37,7 +37,6 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-CDEFS += -DCONV_STAR_FONTS
INC+= -I$(PRJ)$/inc$/bf_xmloff
# --- Files --------------------------------------------------------
diff --git a/binfilter/bf_xmloff/source/style/xmloff_AttributeContainerHandler.cxx b/binfilter/bf_xmloff/source/style/xmloff_AttributeContainerHandler.cxx
index 316dc97..7a88706 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_AttributeContainerHandler.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_AttributeContainerHandler.cxx
@@ -91,12 +91,12 @@ sal_Bool XMLAttributeContainerHandler::equals(
return sal_False;
}
-sal_Bool XMLAttributeContainerHandler::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLAttributeContainerHandler::importXML( const OUString& /*rStrImpValue*/, Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
return sal_True;
}
-sal_Bool XMLAttributeContainerHandler::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLAttributeContainerHandler::exportXML( OUString& /*rStrExpValue*/, const Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
return sal_True;
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx
index dd2f2a7..69dde7c 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx
@@ -64,7 +64,7 @@ XMLEnumPropertyHdl::~XMLEnumPropertyHdl()
// Nothing to do
}
-sal_Bool XMLEnumPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLEnumPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
USHORT nValue = 0;
@@ -94,7 +94,7 @@ sal_Bool XMLEnumPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValu
return sal_False;
}
-sal_Bool XMLEnumPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLEnumPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Int32 nValue;
if(!(rValue >>= nValue ))
diff --git a/binfilter/bf_xmloff/source/style/xmloff_FillStyleContext.cxx b/binfilter/bf_xmloff/source/style/xmloff_FillStyleContext.cxx
index 86de988..82605cd 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_FillStyleContext.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_FillStyleContext.cxx
@@ -162,10 +162,10 @@ XMLBitmapStyleContext::~XMLBitmapStyleContext()
{
}
-SvXMLImportContext* XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList )
+SvXMLImportContext* XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = NULL;
- if( (XML_NAMESPACE_OFFICE == nPrefix) && xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_BINARY_DATA ) )
+ if( (XML_NAMESPACE_OFFICE == nInPrefix) && xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_BINARY_DATA ) )
{
OUString sURL;
maAny >>= sURL;
@@ -173,14 +173,14 @@ SvXMLImportContext* XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nPrefi
{
mxBase64Stream = GetImport().GetStreamForGraphicObjectURLFromBase64();
if( mxBase64Stream.is() )
- pContext = new XMLBase64ImportContext( GetImport(), nPrefix,
+ pContext = new XMLBase64ImportContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
mxBase64Stream );
}
}
if( !pContext )
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx b/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx
index c028492..a18b475 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx
@@ -171,14 +171,14 @@ sal_Bool XMLGradientStyleImport::importXML(
case XML_TOK_GRADIENT_STARTCOLOR:
{
Color aColor;
- if( bHasStartColor = rUnitConverter.convertColor( aColor, rStrValue ) )
+ if( (bHasStartColor = rUnitConverter.convertColor( aColor, rStrValue )) )
aGradient.StartColor = (sal_Int32)( aColor.GetColor() );
}
break;
case XML_TOK_GRADIENT_ENDCOLOR:
{
Color aColor;
- if( bHasStartColor = rUnitConverter.convertColor( aColor, rStrValue ) )
+ if( (bHasStartColor = rUnitConverter.convertColor( aColor, rStrValue )) )
aGradient.EndColor = (sal_Int32)( aColor.GetColor() );
}
break;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx b/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx
index 9ca9700..ddcf638 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx
@@ -129,14 +129,14 @@ sal_Bool XMLHatchStyleImport::importXML(
case XML_TOK_HATCH_STYLE:
{
sal_uInt16 eValue;
- if( bHasStyle = rUnitConverter.convertEnum( eValue, rStrValue, pXML_HatchStyle_Enum ) )
+ if( (bHasStyle = rUnitConverter.convertEnum( eValue, rStrValue, pXML_HatchStyle_Enum )) )
aHatch.Style = (drawing::HatchStyle) eValue;
}
break;
case XML_TOK_HATCH_COLOR:
{
Color aColor;
- if( bHasColor = rUnitConverter.convertColor( aColor, rStrValue ) )
+ if( (bHasColor = rUnitConverter.convertColor( aColor, rStrValue )) )
aHatch.Color = (sal_Int32)( aColor.GetColor() );
}
break;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLFontAutoStylePool.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLFontAutoStylePool.cxx
index 419018a..98cf1b4 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLFontAutoStylePool.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLFontAutoStylePool.cxx
@@ -173,38 +173,38 @@ OUString XMLFontAutoStylePool::Add(
}
else
{
- OUString sName;
+ OUString sLclName;
sal_Int32 nLen = rFamilyName.indexOf( sal_Unicode(';'), 0 );
if( -1 == nLen )
{
- sName = rFamilyName;
+ sLclName = rFamilyName;
}
else if( nLen > 0 )
{
- sName = rFamilyName.copy( 0, nLen );
- sName.trim();
+ sLclName = rFamilyName.copy( 0, nLen );
+ sLclName.trim();
}
- if( !sName.getLength() )
- sName = OUString::valueOf( sal_Unicode( 'F' ) );
+ if( !sLclName.getLength() )
+ sLclName = OUString::valueOf( sal_Unicode( 'F' ) );
- if( pNames->Seek_Entry( &sName, 0 ) )
+ if( pNames->Seek_Entry( &sLclName, 0 ) )
{
sal_Int32 nCount = 1;
- OUString sPrefix( sName );
- sName += OUString::valueOf( nCount );
- while( pNames->Seek_Entry( &sName, 0 ) )
+ OUString sPrefix( sLclName );
+ sLclName += OUString::valueOf( nCount );
+ while( pNames->Seek_Entry( &sLclName, 0 ) )
{
- sName = sPrefix;
- sName += OUString::valueOf( ++nCount );
+ sLclName = sPrefix;
+ sLclName += OUString::valueOf( ++nCount );
}
}
XMLFontAutoStylePoolEntry_Impl *pEntry =
- new XMLFontAutoStylePoolEntry_Impl( sName, rFamilyName, rStyleName,
+ new XMLFontAutoStylePoolEntry_Impl( sLclName, rFamilyName, rStyleName,
nFamily, nPitch, eEnc );
pPool->Insert( pEntry );
- pNames->Insert( new OUString( sName ) );
+ pNames->Insert( new OUString( sLclName ) );
}
return sName;
@@ -277,7 +277,7 @@ void XMLFontAutoStylePool::exportXML()
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_FONT_CHARSET, sTmp );
- SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
+ SvXMLElementExport aAnotherElem( GetExport(), XML_NAMESPACE_STYLE,
XML_FONT_DECL,
sal_True, sal_True );
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx
index 59201d8..885c58c 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx
@@ -72,7 +72,7 @@ XMLFontFamilyNamePropHdl::~XMLFontFamilyNamePropHdl()
// Nothing to do
}
-sal_Bool XMLFontFamilyNamePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLFontFamilyNamePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
String sValue;
@@ -125,7 +125,7 @@ sal_Bool XMLFontFamilyNamePropHdl::importXML( const OUString& rStrImpValue, uno:
return bRet;
}
-sal_Bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
OUString aStrFamilyName;
@@ -248,7 +248,7 @@ XMLFontEncodingPropHdl::~XMLFontEncodingPropHdl()
// Nothing to do
}
-sal_Bool XMLFontEncodingPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLFontEncodingPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_True;
@@ -258,7 +258,7 @@ sal_Bool XMLFontEncodingPropHdl::importXML( const OUString& rStrImpValue, uno::A
return bRet;
}
-sal_Bool XMLFontEncodingPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLFontEncodingPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
OUStringBuffer aOut;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_impastp1.cxx b/binfilter/bf_xmloff/source/style/xmloff_impastp1.cxx
index f085c09..89895f0 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_impastp1.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_impastp1.cxx
@@ -48,8 +48,13 @@ XMLFamilyData_Impl::XMLFamilyData_Impl(
const UniReference < SvXMLExportPropertyMapper > &rMapper,
const OUString& rStrPrefix,
sal_Bool bAsFam )
- : mnFamily( nFamily ), maStrFamilyName( rStrName), mxMapper( rMapper ), maStrPrefix( rStrPrefix ),
- mnCount( 0 ), mnName( 0 ), bAsFamily( bAsFam )
+ : mnFamily( nFamily )
+ , maStrFamilyName( rStrName)
+ , mxMapper( rMapper )
+ , mnCount( 0 )
+ , mnName( 0 )
+ , maStrPrefix( rStrPrefix )
+ , bAsFamily( bAsFam )
{
mpParentList = new SvXMLAutoStylePoolParentsP_Impl( 5, 5 );
mpNameList = new SvXMLAutoStylePoolNamesP_Impl( 5, 5 );
diff --git a/binfilter/bf_xmloff/source/style/xmloff_splithdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_splithdl.cxx
index 270eed4..6e12f01 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_splithdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_splithdl.cxx
@@ -50,14 +50,14 @@ XMLFmtSplitPropHdl::~XMLFmtSplitPropHdl()
// nothing to do
}
-sal_Bool XMLFmtSplitPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLFmtSplitPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bValue = IsXMLToken( rStrImpValue, XML_COLUMNSPLIT_AUTO );
rValue <<= sal_Bool(bValue);
return sal_True;
}
-sal_Bool XMLFmtSplitPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLFmtSplitPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
sal_Bool bValue;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
index a75d00e..e366559 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
@@ -103,7 +103,7 @@ class SvxXMLListLevelStyleAttrContext_Impl : public SvXMLImportContext
public:
SvxXMLListLevelStyleAttrContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList >& xAttrList,
SvxXMLListLevelStyleContext_Impl& rLLevel );
@@ -154,10 +154,8 @@ static SvXMLTokenMapEntry aLevelAttrTokenMap[] =
class SvxXMLListLevelStyleContext_Impl : public SvXMLImportContext
{
friend class SvxXMLListLevelStyleAttrContext_Impl;
-#ifdef CONV_STAR_FONTS
const OUString sStarBats;
const OUString sStarMath;
-#endif
OUString sPrefix;
OUString sSuffix;
@@ -218,13 +216,13 @@ class SvxXMLListLevelStyleContext_Impl : public SvXMLImportContext
public:
SvxXMLListLevelStyleContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SvxXMLListLevelStyleContext_Impl();
virtual SvXMLImportContext *CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
sal_Int32 GetLevel() const { return nLevel; }
@@ -233,11 +231,13 @@ public:
};
SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
+ sStarBats( RTL_CONSTASCII_USTRINGPARAM( "StarBats" ) ),
+ sStarMath( RTL_CONSTASCII_USTRINGPARAM( "StarMath" ) ),
sNumFormat( OUString( RTL_CONSTASCII_USTRINGPARAM( "1" )) ),
nLevel( -1L ),
nSpaceBefore( 0L ),
@@ -253,15 +253,11 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
eBulletFontEncoding( RTL_TEXTENCODING_DONTKNOW ),
cBullet( 0 ),
nRelSize(0),
- bNum( sal_False ),
+ aColor( 0 ),
bBullet( sal_False ),
bImage( sal_False ),
- bHasColor( sal_False ),
- aColor( 0 )
-#ifdef CONV_STAR_FONTS
- ,sStarBats( RTL_CONSTASCII_USTRINGPARAM( "StarBats" ) ),
- sStarMath( RTL_CONSTASCII_USTRINGPARAM( "StarMath" ) )
-#endif
+ bNum( sal_False ),
+ bHasColor( sal_False )
{
if( IsXMLToken( rLName, XML_LIST_LEVEL_STYLE_NUMBER ) ||
IsXMLToken( rLName, XML_OUTLINE_LEVEL_STYLE ) )
@@ -276,13 +272,13 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
- switch( aTokenMap.Get( nPrefix, aLocalName ) )
+ switch( aTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_TEXT_LEVEL_ATTR_LEVEL:
nLevel = rValue.toInt32();
@@ -347,34 +343,34 @@ SvxXMLListLevelStyleContext_Impl::~SvxXMLListLevelStyleContext_Impl()
}
SvXMLImportContext *SvxXMLListLevelStyleContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix &&
+ if( XML_NAMESPACE_STYLE == nInPrefix &&
IsXMLToken( rLocalName, XML_PROPERTIES ) )
{
pContext = new SvxXMLListLevelStyleAttrContext_Impl( GetImport(),
- nPrefix,
+ nInPrefix,
rLocalName,
xAttrList,
*this );
}
- else if( (XML_NAMESPACE_OFFICE == nPrefix) && xmloff::token::IsXMLToken( rLocalName,
+ else if( (XML_NAMESPACE_OFFICE == nInPrefix) && xmloff::token::IsXMLToken( rLocalName,
xmloff::token::XML_BINARY_DATA ) )
{
if( bImage && !sImageURL.getLength() && !xBase64Stream.is() )
{
xBase64Stream = GetImport().GetStreamForGraphicObjectURLFromBase64();
if( xBase64Stream.is() )
- pContext = new XMLBase64ImportContext( GetImport(), nPrefix,
+ pContext = new XMLBase64ImportContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
xBase64Stream );
}
}
if( !pContext )
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
@@ -470,7 +466,6 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
aFDesc.CharSet = eBulletFontEncoding;
aFDesc.Weight = WEIGHT_DONTKNOW;
//aFDesc.Transparant = sal_True;
-#ifdef CONV_STAR_FONTS
sal_Bool bStarSymbol = sal_False;
if( aFDesc.Name.equalsIgnoreAsciiCase( sStarBats ) )
{
@@ -485,7 +480,6 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
if( bStarSymbol )
aFDesc.Name =
OUString( RTL_CONSTASCII_USTRINGPARAM("StarSymbol" ) );
-#endif
}
if( cBullet )
@@ -629,11 +623,11 @@ static SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] =
XML_TOKEN_MAP_END
};
SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
SvxXMLListLevelStyleContext_Impl& rLLevel ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rListLevel( rLLevel )
{
SvXMLTokenMap aTokenMap( aStyleAttributesAttrTokenMap );
@@ -647,14 +641,14 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl(
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
sal_Int32 nVal;
- switch( aTokenMap.Get( nPrefix, aLocalName ) )
+ switch( aTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_STYLE_ATTRIBUTES_ATTR_SPACE_BEFORE:
if( rUnitConv.convertMeasure( nVal, rValue, 0, USHRT_MAX ) )
@@ -887,21 +881,20 @@ void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
}
-SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
+SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_Bool bOutl ) :
- SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, bOutl ? XML_STYLE_FAMILY_TEXT_OUTLINE : XML_STYLE_FAMILY_TEXT_LIST ),
- pLevelStyles( 0 ),
- nLevels( 0 ),
- bConsecutive( sal_False ),
- bOutline( bOutl ),
-// bUsed( sal_False ),
+ SvXMLStyleContext( rInImport, nPrfx, rLName, xAttrList, bOutl ? XML_STYLE_FAMILY_TEXT_OUTLINE : XML_STYLE_FAMILY_TEXT_LIST ),
sIsPhysical( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ) ),
sNumberingRules( RTL_CONSTASCII_USTRINGPARAM( "NumberingRules" ) ),
sName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ),
- sIsContinuousNumbering( RTL_CONSTASCII_USTRINGPARAM( "IsContinuousNumbering" ) )
+ sIsContinuousNumbering( RTL_CONSTASCII_USTRINGPARAM( "IsContinuousNumbering" ) ),
+ pLevelStyles( 0 ),
+ nLevels( 0 ),
+ bConsecutive( sal_False ),
+ bOutline( bOutl )
{
}
@@ -924,13 +917,13 @@ SvxXMLListStyleContext::~SvxXMLListStyleContext()
TYPEINIT1( SvxXMLListStyleContext, SvXMLStyleContext );
SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_TEXT == nPrefix &&
+ if( XML_NAMESPACE_TEXT == nInPrefix &&
( bOutline
? IsXMLToken( rLocalName, XML_OUTLINE_LEVEL_STYLE )
: ( IsXMLToken( rLocalName, XML_LIST_LEVEL_STYLE_NUMBER ) ||
@@ -938,7 +931,7 @@ SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext(
IsXMLToken( rLocalName, XML_LIST_LEVEL_STYLE_IMAGE ) ) ) )
{
SvxXMLListLevelStyleContext_Impl *pLevelStyle =
- new SvxXMLListLevelStyleContext_Impl( GetImport(), nPrefix,
+ new SvxXMLListLevelStyleContext_Impl( GetImport(), nInPrefix,
rLocalName, xAttrList );
if( !pLevelStyles )
pLevelStyles = new SvxXMLListStyle_Impl;
@@ -949,7 +942,7 @@ SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext(
}
else
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
@@ -962,13 +955,13 @@ void SvxXMLListStyleContext::FillUnoNumRule(
if( pLevelStyles )
{
sal_uInt16 nCount = pLevelStyles->Count();
- sal_Int32 nLevels = rNumRule->getCount();
+ sal_Int32 nLclLevels = rNumRule->getCount();
for( sal_uInt16 i=0; i < nCount; i++ )
{
SvxXMLListLevelStyleContext_Impl *pLevelStyle =
(*pLevelStyles)[i];
sal_Int32 nLevel = pLevelStyle->GetLevel();
- if( nLevel >= 0 && nLevel < nLevels )
+ if( nLevel >= 0 && nLevel < nLclLevels )
{
Sequence<beans::PropertyValue> aProps =
pLevelStyle->GetProperties( pI18NMap );
@@ -1025,7 +1018,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite )
return;
}
- sal_Bool bNew = sal_False;
+ sal_Bool bLclNew = sal_False;
if( rNumStyles->hasByName( rName ) )
{
Any aAny = rNumStyles->getByName( rName );
@@ -1050,22 +1043,22 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite )
Any aAny;
aAny <<= xStyle;
rNumStyles->insertByName( rName, aAny );
- bNew = sal_True;
+ bLclNew = sal_True;
}
Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY );
Reference< XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
- if( !bNew && xPropSetInfo->hasPropertyByName( sIsPhysical ) )
+ if( !bLclNew && xPropSetInfo->hasPropertyByName( sIsPhysical ) )
{
Any aAny = xPropSet->getPropertyValue( sIsPhysical );
- bNew = !*(sal_Bool *)aAny.getValue();
+ bLclNew = !*(sal_Bool *)aAny.getValue();
}
Any aAny = xPropSet->getPropertyValue( sNumberingRules );
aAny >>= xNumRules;
nLevels = xNumRules->getCount();
- if( bOverwrite || bNew )
+ if( bOverwrite || bLclNew )
{
FillUnoNumRule( xNumRules, 0 );
aAny <<= xNumRules;
@@ -1076,7 +1069,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite )
SetValid( sal_False );
}
- SetNew( bNew );
+ SetNew( bLclNew );
}
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlprcon.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlprcon.cxx
index c0d99fc..8fe29db 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlprcon.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlprcon.cxx
@@ -42,12 +42,12 @@ SvXMLPropertySetContext::SvXMLPropertySetContext(
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
vector< XMLPropertyState > &rProps,
const UniReference < SvXMLImportPropertyMapper > &rMap,
- sal_Int32 nSIdx, sal_Int32 nEIdx ):
- SvXMLImportContext( rImp, nPrfx, rLName ),
- rProperties( rProps ),
- xMapper ( rMap ),
- nStartIdx( nSIdx ),
- nEndIdx( nEIdx )
+ sal_Int32 nSIdx, sal_Int32 nEIdx )
+ : SvXMLImportContext( rImp, nPrfx, rLName )
+ , nStartIdx( nSIdx )
+ , nEndIdx( nEIdx )
+ , rProperties( rProps )
+ , xMapper( rMap )
{
xMapper->importXML( rProperties, xAttrList,
GetImport().GetMM100UnitConverter(),
@@ -59,13 +59,13 @@ SvXMLPropertySetContext::~SvXMLPropertySetContext()
}
SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
UniReference< XMLPropertySetMapper > aSetMapper(
xMapper->getPropertySetMapper() );
- sal_Int32 nEntryIndex = aSetMapper->GetEntryIndex( nPrefix, rLocalName,
+ sal_Int32 nEntryIndex = aSetMapper->GetEntryIndex( nInPrefix, rLocalName,
nStartIdx );
if( ( nEntryIndex != -1 ) && (-1 == nEndIdx || nEntryIndex < nEndIdx ) &&
@@ -73,12 +73,12 @@ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext(
& MID_FLAG_ELEMENT_ITEM_IMPORT ) ) )
{
XMLPropertyState aProp( nEntryIndex );
- return CreateChildContext( nPrefix, rLocalName, xAttrList,
+ return CreateChildContext( nInPrefix, rLocalName, xAttrList,
rProperties, aProp );
}
else
{
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
}
@@ -87,13 +87,13 @@ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext(
SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT
*/
SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList >& xAttrList,
- ::std::vector< XMLPropertyState > &rProperties,
- const XMLPropertyState& rProp )
+ const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/,
+ ::std::vector< XMLPropertyState > & /*rProperties*/,
+ const XMLPropertyState& /*rProp*/ )
{
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmltabi.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmltabi.cxx
index 62772e5..09ff7a6 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmltabi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmltabi.cxx
@@ -76,13 +76,13 @@ private:
public:
TYPEINFO();
- SvxXMLTabStopContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvxXMLTabStopContext_Impl( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SvxXMLTabStopContext_Impl();
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
@@ -92,10 +92,10 @@ public:
TYPEINIT1( SvxXMLTabStopContext_Impl, SvXMLImportContext );
SvxXMLTabStopContext_Impl::SvxXMLTabStopContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
-: SvXMLImportContext( rImport, nPrfx, rLName )
+: SvXMLImportContext( rInImport, nPrfx, rLName )
{
aTabStop.Position = 0;
aTabStop.Alignment = style::TabAlign_LEFT;
@@ -108,14 +108,14 @@ SvxXMLTabStopContext_Impl::SvxXMLTabStopContext_Impl(
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
sal_Int32 nVal;
- switch( aTokenMap.Get( nPrefix, aLocalName ) )
+ switch( aTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_TABSTOP_POSITION:
if( GetImport().GetMM100UnitConverter().convertMeasure( nVal,
@@ -161,11 +161,11 @@ SvxXMLTabStopContext_Impl::~SvxXMLTabStopContext_Impl()
}
SvXMLImportContext *SvxXMLTabStopContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList )
+ const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/ )
{
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
@@ -180,11 +180,11 @@ SV_DECL_PTRARR( SvxXMLTabStopArray_Impl, SvxXMLTabStopContext_Impl_ImplPtr, 20,
TYPEINIT1( SvxXMLTabStopImportContext, XMLElementPropertyContext );
SvxXMLTabStopImportContext::SvxXMLTabStopImportContext(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const XMLPropertyState& rProp,
::std::vector< XMLPropertyState > &rProps )
-: XMLElementPropertyContext( rImport, nPrfx, rLName, rProp, rProps ),
+: XMLElementPropertyContext( rInImport, nPrfx, rLName, rProp, rProps ),
mpTabStops( NULL )
{
}
@@ -207,17 +207,17 @@ SvxXMLTabStopImportContext::~SvxXMLTabStopImportContext()
}
SvXMLImportContext *SvxXMLTabStopImportContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLocalName, XML_TAB_STOP ) )
+ if( XML_NAMESPACE_STYLE == nInPrefix && IsXMLToken( rLocalName, XML_TAB_STOP ) )
{
// create new tabstop import context
SvxXMLTabStopContext_Impl *pTabStopContext =
- new SvxXMLTabStopContext_Impl( GetImport(), nPrefix, rLocalName,
+ new SvxXMLTabStopContext_Impl( GetImport(), nInPrefix, rLocalName,
xAttrList );
// add new tabstop to array of tabstops
@@ -231,7 +231,7 @@ SvXMLImportContext *SvxXMLTabStopImportContext::CreateChildContext(
}
else
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
diff --git a/binfilter/bf_xmloff/source/text/makefile.mk b/binfilter/bf_xmloff/source/text/makefile.mk
index f862e00..0170600 100644
--- a/binfilter/bf_xmloff/source/text/makefile.mk
+++ b/binfilter/bf_xmloff/source/text/makefile.mk
@@ -37,7 +37,6 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-CDEFS += -DCONV_STAR_FONTS
INC+= -I$(PRJ)$/inc$/bf_xmloff
diff --git a/binfilter/bf_xmloff/source/text/txtparai.hxx b/binfilter/bf_xmloff/source/text/txtparai.hxx
index 07037de..d6ca72c 100644
--- a/binfilter/bf_xmloff/source/text/txtparai.hxx
+++ b/binfilter/bf_xmloff/source/text/txtparai.hxx
@@ -40,11 +40,9 @@ namespace binfilter {
class XMLHints_Impl;
-#ifdef CONV_STAR_FONTS
#define CONV_FROM_STAR_BATS 1
#define CONV_FROM_STAR_MATH 2
#define CONV_STAR_FONT_FLAGS_VALID 4
-#endif
class XMLParaContext : public SvXMLImportContext
{
@@ -55,9 +53,7 @@ class XMLParaContext : public SvXMLImportContext
XMLHints_Impl *pHints;
sal_Bool bIgnoreLeadingSpace;
sal_Bool bHeading;
-#ifdef CONV_STAR_FONTS
sal_uInt8 nStarFontsConvFlags;
-#endif
public:
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx
index 62c094a..ba89406 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx
@@ -733,7 +733,6 @@ void XMLTextImportHelper::DeleteParagraph()
}
}
-#ifdef CONV_STAR_FONTS
OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
const OUString& rStyleName,
sal_uInt8& rFlags,
@@ -812,7 +811,6 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
return bConverted ? sChars.makeStringAndClear() : rChars;
}
-#endif
OUString XMLTextImportHelper::SetStyleAndAttrs(
const Reference < XTextCursor >& rCursor,
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
index 4aa8a5c..a3cf700 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
@@ -113,7 +113,6 @@ sal_Bool XMLTextImportPropertyMapper::handleSpecialItem(
}
break;
-#ifdef CONV_STAR_FONTS
// If we want to do StarMath/StarSymbol font conversion, then we'll
// want these special items to be treated just like regular ones...
// For the Writer, we'll catch and convert them in _FillPropertySet;
@@ -125,7 +124,6 @@ sal_Bool XMLTextImportPropertyMapper::handleSpecialItem(
bRet = getPropertySetMapper()->importXML( rValue, rProperty,
rUnitConverter );
break;
-#endif
default:
bRet = SvXMLImportPropertyMapper::handleSpecialItem( rProperty,
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
index 68a2314..bd60069 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
@@ -481,9 +481,7 @@ class XMLImpSpanContext_Impl : public SvXMLImportContext
sal_Bool& rIgnoreLeadingSpace;
-#ifdef CONV_STAR_FONTS
sal_uInt8 nStarFontsConvFlags;
-#endif
public:
@@ -495,10 +493,8 @@ public:
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace
-#ifdef CONV_STAR_FONTS
- ,sal_uInt8 nSFConvFlags
-#endif
+ sal_Bool& rIgnLeadSpace,
+ sal_uInt8 nSFConvFlags
);
virtual ~XMLImpSpanContext_Impl();
@@ -508,10 +504,8 @@ public:
sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nToken, XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace
-#ifdef CONV_STAR_FONTS
- ,sal_uInt8 nStarFontsConvFlags = 0
-#endif
+ sal_Bool& rIgnLeadSpace,
+ sal_uInt8 nStarFontsConvFlags = 0
);
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nInPrefix, const OUString& rLocalName,
@@ -1433,19 +1427,15 @@ XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace
-#ifdef CONV_STAR_FONTS
- ,sal_uInt8 nSFConvFlags
-#endif
+ sal_Bool& rIgnLeadSpace,
+ sal_uInt8 nSFConvFlags
) :
SvXMLImportContext( rImport, nPrfx, rLName ),
rHints( rHnts ),
rIgnoreLeadingSpace( rIgnLeadSpace ),
pHint( 0 ),
- sTextFrame(RTL_CONSTASCII_USTRINGPARAM("TextFrame"))
-#ifdef CONV_STAR_FONTS
- ,nStarFontsConvFlags( nSFConvFlags & (CONV_FROM_STAR_BATS|CONV_FROM_STAR_MATH) )
-#endif
+ sTextFrame(RTL_CONSTASCII_USTRINGPARAM("TextFrame")),
+ nStarFontsConvFlags( nSFConvFlags & (CONV_FROM_STAR_BATS|CONV_FROM_STAR_MATH) )
{
OUString aStyleName;
@@ -1484,10 +1474,8 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nToken,
XMLHints_Impl& rHints,
- sal_Bool& rIgnoreLeadingSpace
-#ifdef CONV_STAR_FONTS
- ,sal_uInt8 nStarFontsConvFlags
-#endif
+ sal_Bool& rIgnoreLeadingSpace,
+ sal_uInt8 nStarFontsConvFlags
)
{
SvXMLImportContext *pContext = 0;
@@ -1501,10 +1489,8 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
pContext = new XMLImpSpanContext_Impl( rImport, nInPrefix,
rLocalName, xAttrList,
rHints,
- rIgnoreLeadingSpace
-#ifdef CONV_STAR_FONTS
- ,nStarFontsConvFlags
-#endif
+ rIgnoreLeadingSpace,
+ nStarFontsConvFlags
);
break;
@@ -1765,16 +1751,13 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName );
return CreateChildContext( GetImport(), nPrefix, rLocalName, xAttrList,
- nToken, rHints, rIgnoreLeadingSpace
-#ifdef CONV_STAR_FONTS
- ,nStarFontsConvFlags
-#endif
+ nToken, rHints, rIgnoreLeadingSpace,
+ nStarFontsConvFlags
);
}
void XMLImpSpanContext_Impl::Characters( const OUString& rChars )
{
-#ifdef CONV_STAR_FONTS
OUString sStyleName;
if( pHint )
sStyleName = pHint->GetStyleName();
@@ -1783,9 +1766,6 @@ void XMLImpSpanContext_Impl::Characters( const OUString& rChars )
nStarFontsConvFlags,
sal_False, GetImport() );
GetImport().GetTextImport()->InsertString( sChars, rIgnoreLeadingSpace );
-#else
- GetImport().GetTextImport()->InsertString( rChars, rIgnoreLeadingSpace );
-#endif
}
// ---------------------------------------------------------------------
@@ -1803,10 +1783,8 @@ XMLParaContext::XMLParaContext(
nOutlineLevel( 1 ),
pHints( 0 ),
bIgnoreLeadingSpace( sal_True ),
- bHeading( bHead )
-#ifdef CONV_STAR_FONTS
- ,nStarFontsConvFlags( 0 )
-#endif
+ bHeading( bHead ),
+ nStarFontsConvFlags( 0 )
{
const SvXMLTokenMap& rTokenMap =
GetImport().GetTextImport()->GetTextPAttrTokenMap();
@@ -1979,24 +1957,18 @@ SvXMLImportContext *XMLParaContext::CreateChildContext(
pHints = new XMLHints_Impl;
return XMLImpSpanContext_Impl::CreateChildContext(
GetImport(), nInPrefix, rLocalName, xAttrList,
- nToken, *pHints, bIgnoreLeadingSpace
-#ifdef CONV_STAR_FONTS
- , nStarFontsConvFlags
-#endif
+ nToken, *pHints, bIgnoreLeadingSpace,
+ nStarFontsConvFlags
);
}
void XMLParaContext::Characters( const OUString& rChars )
{
-#ifdef CONV_STAR_FONTS
OUString sChars =
GetImport().GetTextImport()->ConvertStarFonts( rChars, sStyleName,
nStarFontsConvFlags,
sal_True, GetImport() );
GetImport().GetTextImport()->InsertString( sChars, bIgnoreLeadingSpace );
-#else
- GetImport().GetTextImport()->InsertString( rChars, bIgnoreLeadingSpace );
-#endif
}
}//end of namespace binfilter
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx
index f84209a..e087989 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx
@@ -76,11 +76,7 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
M_E( "CharEscapementHeight", STYLE, TEXT_POSITION, XML_TYPE_TEXT_ESCAPEMENT_HEIGHT|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY, 0 ),
// RES_CHRATR_FONT
M_ED( "CharFontName", STYLE, FONT_NAME, XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTNAME ),
-#ifdef CONV_STAR_FONTS
M_ED( "CharFontName", FO, FONT_FAMILY, XML_TYPE_TEXT_FONTFAMILYNAME|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTFAMILYNAME ),
-#else
- M_ED( "CharFontName", FO, FONT_FAMILY, XML_TYPE_TEXT_FONTFAMILYNAME, CTF_FONTFAMILYNAME ),
-#endif
M_ED( "CharFontStyleName",STYLE, FONT_STYLE_NAME, XML_TYPE_STRING, CTF_FONTSTYLENAME ),
M_ED( "CharFontFamily", STYLE, FONT_FAMILY_GENERIC,XML_TYPE_TEXT_FONTFAMILY, CTF_FONTFAMILY ),
M_ED( "CharFontPitch", STYLE, FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, CTF_FONTPITCH ),
@@ -122,11 +118,7 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
M_E( "CharBackColor", FO, TEXT_BACKGROUND_COLOR, XML_TYPE_COLOR|MID_FLAG_SPECIAL_ITEM_EXPORT, CTF_OLDTEXTBACKGROUND ),
// RES_CHRATR_CJK_FONT
M_ED( "CharFontNameAsian", STYLE, FONT_NAME_ASIAN, XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTNAME_CJK ),
-#ifdef CONV_STAR_FONTS
M_ED( "CharFontNameAsian", STYLE, FONT_FAMILY_ASIAN, XML_TYPE_TEXT_FONTFAMILYNAME|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTFAMILYNAME_CJK ),
-#else
- M_ED( "CharFontNameAsian", STYLE, FONT_FAMILY_ASIAN, XML_TYPE_TEXT_FONTFAMILYNAME, CTF_FONTFAMILYNAME_CJK ),
-#endif
M_ED( "CharFontStyleNameAsian",STYLE, FONT_STYLE_NAME_ASIAN, XML_TYPE_STRING, CTF_FONTSTYLENAME_CJK ),
M_ED( "CharFontFamilyAsian", STYLE, FONT_FAMILY_GENERIC_ASIAN,XML_TYPE_TEXT_FONTFAMILY, CTF_FONTFAMILY_CJK ),
M_ED( "CharFontPitchAsian", STYLE, FONT_PITCH_ASIAN, XML_TYPE_TEXT_FONTPITCH, CTF_FONTPITCH_CJK ),
@@ -144,11 +136,7 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
M_E( "CharWeightAsian", STYLE, FONT_WEIGHT_ASIAN, XML_TYPE_TEXT_WEIGHT, 0 ),
// RES_CHRATR_CTL_FONT
M_ED( "CharFontNameComplex", STYLE, FONT_NAME_COMPLEX, XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTNAME_CTL ),
-#ifdef CONV_STAR_FONTS
M_ED( "CharFontNameComplex", STYLE, FONT_FAMILY_COMPLEX, XML_TYPE_TEXT_FONTFAMILYNAME|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTFAMILYNAME_CTL ),
-#else
- M_ED( "CharFontNameComplex", STYLE, FONT_FAMILY_COMPLEX, XML_TYPE_TEXT_FONTFAMILYNAME, CTF_FONTFAMILYNAME_CTL ),
-#endif
M_ED( "CharFontStyleNameComplex",STYLE, FONT_STYLE_NAME_COMPLEX, XML_TYPE_STRING, CTF_FONTSTYLENAME_CTL ),
M_ED( "CharFontFamilyComplex", STYLE, FONT_FAMILY_GENERIC_COMPLEX,XML_TYPE_TEXT_FONTFAMILY, CTF_FONTFAMILY_CTL ),
M_ED( "CharFontPitchComplex", STYLE, FONT_PITCH_COMPLEX, XML_TYPE_TEXT_FONTPITCH, CTF_FONTPITCH_CTL ),
@@ -350,11 +338,7 @@ XMLPropertyMapEntry aXMLTextPropMap[] =
M_E( "CharEscapementHeight", STYLE, TEXT_POSITION, XML_TYPE_TEXT_ESCAPEMENT_HEIGHT|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY, 0 ),
// RES_CHRATR_FONT
M_ED( "CharFontName", STYLE, FONT_NAME, XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTNAME ),
-#ifdef CONV_STAR_FONTS
M_ED( "CharFontName", FO, FONT_FAMILY, XML_TYPE_TEXT_FONTFAMILYNAME|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTFAMILYNAME ),
-#else
- M_ED( "CharFontName", FO, FONT_FAMILY, XML_TYPE_TEXT_FONTFAMILYNAME, CTF_FONTFAMILYNAME ),
-#endif
M_ED( "CharFontStyleName",STYLE, FONT_STYLE_NAME, XML_TYPE_STRING, CTF_FONTSTYLENAME ),
M_ED( "CharFontFamily", STYLE, FONT_FAMILY_GENERIC,XML_TYPE_TEXT_FONTFAMILY, CTF_FONTFAMILY ),
M_ED( "CharFontPitch", STYLE, FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, CTF_FONTPITCH ),
@@ -397,11 +381,7 @@ XMLPropertyMapEntry aXMLTextPropMap[] =
M_E( "CharBackColor", FO, TEXT_BACKGROUND_COLOR, XML_TYPE_COLOR|MID_FLAG_SPECIAL_ITEM_EXPORT, CTF_OLDTEXTBACKGROUND ),
// RES_CHRATR_CJK_FONT
M_ED( "CharFontNameAsian", STYLE, FONT_NAME_ASIAN, XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTNAME_CJK ),
-#ifdef CONV_STAR_FONTS
M_ED( "CharFontNameAsian", STYLE, FONT_FAMILY_ASIAN, XML_TYPE_TEXT_FONTFAMILYNAME|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTFAMILYNAME_CJK ),
-#else
- M_ED( "CharFontNameAsian", STYLE, FONT_FAMILY_ASIAN, XML_TYPE_TEXT_FONTFAMILYNAME, CTF_FONTFAMILYNAME_CJK ),
-#endif
M_ED( "CharFontStyleNameAsian",STYLE, FONT_STYLE_NAME_ASIAN, XML_TYPE_STRING, CTF_FONTSTYLENAME_CJK ),
M_ED( "CharFontFamilyAsian", STYLE, FONT_FAMILY_GENERIC_ASIAN,XML_TYPE_TEXT_FONTFAMILY, CTF_FONTFAMILY_CJK ),
M_ED( "CharFontPitchAsian", STYLE, FONT_PITCH_ASIAN, XML_TYPE_TEXT_FONTPITCH, CTF_FONTPITCH_CJK ),
@@ -419,11 +399,7 @@ XMLPropertyMapEntry aXMLTextPropMap[] =
M_E( "CharWeightAsian", STYLE, FONT_WEIGHT_ASIAN, XML_TYPE_TEXT_WEIGHT, 0 ),
// RES_CHRATR_CTL_FONT
M_ED( "CharFontNameComplex", STYLE, FONT_NAME_COMPLEX, XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTNAME_CTL ),
-#ifdef CONV_STAR_FONTS
M_ED( "CharFontNameComplex", STYLE, FONT_FAMILY_COMPLEX, XML_TYPE_TEXT_FONTFAMILYNAME|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTFAMILYNAME_CTL ),
-#else
- M_ED( "CharFontNameComplex", STYLE, FONT_FAMILY_COMPLEX, XML_TYPE_TEXT_FONTFAMILYNAME, CTF_FONTFAMILYNAME_CTL ),
-#endif
M_ED( "CharFontStyleNameComplex",STYLE, FONT_STYLE_NAME_COMPLEX, XML_TYPE_STRING, CTF_FONTSTYLENAME_CTL ),
M_ED( "CharFontFamilyComplex", STYLE, FONT_FAMILY_GENERIC_COMPLEX,XML_TYPE_TEXT_FONTFAMILY, CTF_FONTFAMILY_CTL ),
M_ED( "CharFontPitchComplex", STYLE, FONT_PITCH_COMPLEX, XML_TYPE_TEXT_FONTPITCH, CTF_FONTPITCH_CTL ),
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx
index 900b41b..7510d0a 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx
@@ -314,11 +314,9 @@ void XMLTextStyleContext::FillPropertySet(
struct _ContextID_Index_Pair aContextIDs[] =
{
{ CTF_COMBINED_CHARACTERS_FIELD, -1 },
-#ifdef CONV_STAR_FONTS
{ CTF_FONTFAMILYNAME, -1 },
{ CTF_FONTFAMILYNAME_CJK, -1 },
{ CTF_FONTFAMILYNAME_CTL, -1 },
-#endif
{ -1, -1 }
};
@@ -352,7 +350,6 @@ void XMLTextStyleContext::FillPropertySet(
bHasCombinedCharactersLetter = bVal;
}
-#ifdef CONV_STAR_FONTS
// check for StarBats and StarMath fonts
// iterate over aContextIDs entries 1..3
@@ -396,7 +393,6 @@ void XMLTextStyleContext::FillPropertySet(
// else: no style name found -> illegal value -> ignore
}
}
-#endif
}
}
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_xmloff/txtimp.hxx b/binfilter/inc/bf_xmloff/txtimp.hxx
index c38e23a..3f3d57b 100644
--- a/binfilter/inc/bf_xmloff/txtimp.hxx
+++ b/binfilter/inc/bf_xmloff/txtimp.hxx
@@ -557,13 +557,12 @@ public:
void SetListItem( XMLTextListItemContext *pListItem );
void _SetListItem( SvXMLImportContext *pListItem );
-#ifdef CONV_STAR_FONTS
::rtl::OUString ConvertStarFonts( const ::rtl::OUString& rChars,
const ::rtl::OUString& rStyleName,
sal_uInt8& rFlags,
sal_Bool bPara,
SvXMLImport& rImport ) const;
-#endif
+
// insert a string without special whitespace processing enabled
void InsertString( const ::rtl::OUString& rChars );
// insert a string with special whitespace processing enabled
diff --git a/binfilter/inc/bf_xmloff/txtstyli.hxx b/binfilter/inc/bf_xmloff/txtstyli.hxx
index a5b0092..b17a0a6 100644
--- a/binfilter/inc/bf_xmloff/txtstyli.hxx
+++ b/binfilter/inc/bf_xmloff/txtstyli.hxx
@@ -97,9 +97,7 @@ public:
inline sal_Bool HasCombinedCharactersLetter()
{ return bHasCombinedCharactersLetter; }
-#ifdef CONV_STAR_FONTS
const ::std::vector< XMLPropertyState > & _GetProperties() { return GetProperties(); }
-#endif
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_xmloff/xmlimp.hxx b/binfilter/inc/bf_xmloff/xmlimp.hxx
index 3b85f29..fcdd427 100644
--- a/binfilter/inc/bf_xmloff/xmlimp.hxx
+++ b/binfilter/inc/bf_xmloff/xmlimp.hxx
@@ -312,10 +312,8 @@ public:
#endif
::rtl::OUString GetAbsoluteReference(const ::rtl::OUString& rValue);
-#ifdef CONV_STAR_FONTS
sal_Unicode ConvStarBatsCharToStarSymbol( sal_Unicode c );
sal_Unicode ConvStarMathCharToStarSymbol( sal_Unicode c );
-#endif
/**
* Record an error condition that occurred during import. The
commit 4dc6905191f2e766f961496c4288b718221a10d3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 24 20:46:16 2011 +0000
remove empty TESTSHL2LIB
diff --git a/unoxml/test/makefile.mk b/unoxml/test/makefile.mk
index 11fe888..790a34a 100644
--- a/unoxml/test/makefile.mk
+++ b/unoxml/test/makefile.mk
@@ -64,7 +64,6 @@ SHL1STDLIBS= \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPUNITLIB) \
- $(TESTSHL2LIB) \
$(CPPULIB) \
$(SAXLIB) \
$(SALLIB)\
commit 9ad637eeba0b5d839dc9b59a0be5af9f2ce4baaa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 24 20:46:06 2011 +0000
remove empty TESTSHL2LIB
diff --git a/writerfilter/qa/cppunittests/doctok/makefile.mk b/writerfilter/qa/cppunittests/doctok/makefile.mk
index 298bb4d..f4b012c 100644
--- a/writerfilter/qa/cppunittests/doctok/makefile.mk
+++ b/writerfilter/qa/cppunittests/doctok/makefile.mk
@@ -50,7 +50,6 @@ SHL1STDLIBS=\
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(TESTSHL2LIB) \
$(CPPUNITLIB)
SHL1LIBS=\
diff --git a/writerfilter/qa/cppunittests/odiapi/makefile.mk b/writerfilter/qa/cppunittests/odiapi/makefile.mk
index 4c8be2b..c8fddac 100644
--- a/writerfilter/qa/cppunittests/odiapi/makefile.mk
+++ b/writerfilter/qa/cppunittests/odiapi/makefile.mk
@@ -43,7 +43,7 @@ SHL1OBJS=\
$(SLO)$/testCore.obj
SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(TESTSHL2LIB) $(CPPUNITLIB)
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB)
.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= $(LB)$/iodiapi.lib
diff --git a/writerfilter/qa/cppunittests/qname/makefile.mk b/writerfilter/qa/cppunittests/qname/makefile.mk
index c2e989d..bde10a1 100644
--- a/writerfilter/qa/cppunittests/qname/makefile.mk
+++ b/writerfilter/qa/cppunittests/qname/makefile.mk
@@ -51,7 +51,7 @@ SHL1OBJS=\
SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL1STDLIBS+= $(LB)$/iodiapi.lib
diff --git a/writerfilter/qa/cppunittests/sl/makefile.mk b/writerfilter/qa/cppunittests/sl/makefile.mk
index b7a943e..df1a6ab 100644
--- a/writerfilter/qa/cppunittests/sl/makefile.mk
+++ b/writerfilter/qa/cppunittests/sl/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS=\
$(SLO)$/ExternalViewLogger.obj
SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL1STDLIBS+=$(LB)$/iodiapi.lib
diff --git a/writerfilter/qa/cppunittests/xxml/makefile.mk b/writerfilter/qa/cppunittests/xxml/makefile.mk
index 32d0feb..d42426b 100644
--- a/writerfilter/qa/cppunittests/xxml/makefile.mk
+++ b/writerfilter/qa/cppunittests/xxml/makefile.mk
@@ -50,7 +50,7 @@ SHL1OBJS=\
$(SLO)$/testXXML.obj
SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL1STDLIBS+=$(LB)$/iodiapi.lib
More information about the Libreoffice-commits
mailing list