[Libreoffice-commits] .: binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Sat Jan 29 13:41:34 PST 2011
binfilter/bf_xmloff/source/draw/xmloff_propimp0.cxx | 4 -
binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx | 17 ++--
binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx | 30 ++++----
binfilter/bf_xmloff/source/draw/xmloff_shapeexport.cxx | 22 ++---
binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx | 63 ++++++++---------
binfilter/bf_xmloff/source/draw/xmloff_ximpnote.cxx | 14 +--
7 files changed, 77 insertions(+), 75 deletions(-)
New commits:
commit 2b4da3e14d934900649d0b3ae73d300419cc6916
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 29 21:17:19 2011 +0000
WaE: throw out some warnings
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_propimp0.cxx b/binfilter/bf_xmloff/source/draw/xmloff_propimp0.cxx
index 5e4ce04..8218591 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_propimp0.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_propimp0.cxx
@@ -64,7 +64,7 @@ XMLDurationPropertyHdl::~XMLDurationPropertyHdl()
sal_Bool XMLDurationPropertyHdl::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
util::DateTime aTime;
SvXMLUnitConverter::convertTime( aTime, rStrImpValue );
@@ -78,7 +78,7 @@ sal_Bool XMLDurationPropertyHdl::importXML(
sal_Bool XMLDurationPropertyHdl::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Int32 nVal;
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
index 2df127d..de2317a 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
@@ -113,6 +113,7 @@ using namespace ::com::sun::star;
using namespace ::binfilter::xmloff::token;
#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context }
+#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0 }
//////////////////////////////////////////////////////////////////////////////
// entry list for graphic properties
@@ -307,7 +308,7 @@ const XMLPropertyMapEntry aXMLSDProperties[] =
// misc object properties
MAP( "MoveProtect", XML_NAMESPACE_DRAW, XML_MOVE_PROTECT, XML_TYPE_BOOL, CTF_SD_MOVE_PROTECT ),
MAP( "SizeProtect", XML_NAMESPACE_DRAW, XML_SIZE_PROTECT, XML_TYPE_BOOL, CTF_SD_SIZE_PROTECT ),
- { 0L }
+ MAP_ENTRY_END
};
//////////////////////////////////////////////////////////////////////////////
@@ -346,7 +347,7 @@ const XMLPropertyMapEntry aXMLSDPresPageProps[] =
MAP( "FillBitmapOffsetX", XML_NAMESPACE_DRAW, XML_TILE_REPEAT_OFFSET, XML_SD_TYPE_BITMAPREPOFFSETX|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_X ),
MAP( "FillBitmapOffsetY", XML_NAMESPACE_DRAW, XML_TILE_REPEAT_OFFSET, XML_SD_TYPE_BITMAPREPOFFSETY|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_Y ),
- { 0L }
+ MAP_ENTRY_END
};
//////////////////////////////////////////////////////////////////////////////
@@ -969,10 +970,10 @@ XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference<
mpListAutoPool( pListAutoPool ),
mrExport( rExport ),
maNumRuleExp( rExport ),
+ mbIsInAutoStyles( sal_True ),
msCDATA( GetXMLToken(XML_CDATA)),
msTrue( GetXMLToken(XML_TRUE)),
- msFalse( GetXMLToken(XML_FALSE)),
- mbIsInAutoStyles( sal_True )
+ msFalse( GetXMLToken(XML_FALSE))
{
}
@@ -1115,7 +1116,7 @@ void XMLShapeExportPropertyMapper::ContextFilter(
break;
case CTF_SD_MOVE_PROTECT:
{
- sal_Bool bProtected;
+ sal_Bool bProtected(sal_False);
property->maValue >>= bProtected;
if( !bProtected )
property->mnIndex = -1;
@@ -1123,7 +1124,7 @@ void XMLShapeExportPropertyMapper::ContextFilter(
break;
case CTF_SD_SIZE_PROTECT:
{
- sal_Bool bProtected;
+ sal_Bool bProtected(sal_False);
property->maValue >>= bProtected;
if( !bProtected )
property->mnIndex = -1;
@@ -1212,7 +1213,7 @@ void XMLShapeExportPropertyMapper::ContextFilter(
if( pCaptionIsEscRel )
{
- sal_Bool bIsRel;
+ sal_Bool bIsRel(sal_False);
pCaptionIsEscRel->maValue >>= bIsRel;
if( bIsRel )
@@ -1338,7 +1339,7 @@ void XMLPageExportPropertyMapper::ContextFilter(
break;
case CTF_PAGE_VISIBLE:
{
- sal_Bool bVisible;
+ sal_Bool bVisible(sal_False);
(*property).maValue >>= bVisible;
if( bVisible )
(*property).mnIndex = -1;
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
index 8fed627..b5d8480 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
@@ -1675,7 +1675,7 @@ void SdXMLExport::exportPresentationSettings()
sal_Bool bHasAttr = sal_False;
- sal_Bool bTemp;
+ sal_Bool bTemp(sal_False);
// export range
xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsShowAll" ) ) ) >>= bTemp;
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
index 783940c..dd095da 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
@@ -183,11 +183,11 @@ public:
//////////////////////////////////////////////////////////////////////////////
SdXMLDocContext_Impl::SdXMLDocContext_Impl(
- SdXMLImport& rImport,
+ SdXMLImport& rInImport,
USHORT nPrfx,
const OUString& rLName,
- const uno::Reference<xml::sax::XAttributeList>& xAttrList)
-: SvXMLImportContext(rImport, nPrfx, rLName)
+ const uno::Reference<xml::sax::XAttributeList>& /*xAttrList*/)
+: SvXMLImportContext(rInImport, nPrfx, rLName)
{
}
@@ -200,20 +200,20 @@ SdXMLDocContext_Impl::~SdXMLDocContext_Impl()
//////////////////////////////////////////////////////////////////////////////
SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList)
{
SvXMLImportContext* pContext = 0L;
const SvXMLTokenMap& rTokenMap = GetSdImport().GetDocElemTokenMap();
- switch(rTokenMap.Get(nPrefix, rLocalName))
+ switch(rTokenMap.Get(nInPrefix, rLocalName))
{
case XML_TOK_DOC_SETTINGS:
{
if( GetImport().getImportFlags() & IMPORT_SETTINGS )
{
- pContext = new XMLDocumentSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList );
+ pContext = new XMLDocumentSettingsContext(GetImport(), nInPrefix, rLocalName, xAttrList );
}
break;
}
@@ -275,7 +275,7 @@ SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext(
// call parent when no own context was created
if(!pContext)
- pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
+ pContext = SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName, xAttrList);
return pContext;
}
@@ -501,8 +501,8 @@ SdXMLImport::SdXMLImport(
mnStyleFamilyMask(0),
mnNewPageCount(0L),
mnNewMasterPageCount(0L),
- mbLoadDoc(sal_True),
mbIsDraw(bIsDraw),
+ mbLoadDoc(sal_True),
mbPreview(sal_False),
msPageLayouts( RTL_CONSTASCII_USTRINGPARAM( "PageLayouts" ) ),
msPreview( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) )
@@ -708,24 +708,24 @@ const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext *SdXMLImport::CreateContext(USHORT nPrefix,
+SvXMLImportContext *SdXMLImport::CreateContext(USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList)
{
SvXMLImportContext* pContext = 0;
- if(XML_NAMESPACE_OFFICE == nPrefix &&
+ if(XML_NAMESPACE_OFFICE == nInPrefix &&
( IsXMLToken( rLocalName, XML_DOCUMENT ) ||
IsXMLToken( rLocalName, XML_DOCUMENT_META ) ||
IsXMLToken( rLocalName, XML_DOCUMENT_STYLES ) ||
IsXMLToken( rLocalName, XML_DOCUMENT_CONTENT ) ||
IsXMLToken( rLocalName, XML_DOCUMENT_SETTINGS ) ))
{
- pContext = new SdXMLDocContext_Impl(*this, nPrefix, rLocalName, xAttrList);
+ pContext = new SdXMLDocContext_Impl(*this, nInPrefix, rLocalName, xAttrList);
}
else
{
- pContext = SvXMLImport::CreateContext(nPrefix, rLocalName, xAttrList);
+ pContext = SvXMLImport::CreateContext(nInPrefix, rLocalName, xAttrList);
}
return pContext;
@@ -734,7 +734,7 @@ SvXMLImportContext *SdXMLImport::CreateContext(USHORT nPrefix,
//////////////////////////////////////////////////////////////////////////////
SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName,
- const uno::Reference<xml::sax::XAttributeList>& xAttrList)
+ const uno::Reference<xml::sax::XAttributeList>& /*xAttrList*/)
{
SvXMLImportContext* pContext = 0L;
@@ -760,7 +760,7 @@ SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName,
//////////////////////////////////////////////////////////////////////////////
SvXMLImportContext *SdXMLImport::CreateBodyContext(const OUString& rLocalName,
- const uno::Reference<xml::sax::XAttributeList>& xAttrList)
+ const uno::Reference<xml::sax::XAttributeList>& /*xAttrList*/)
{
SvXMLImportContext *pContext = 0;
pContext = new SdXMLBodyContext(*this, XML_NAMESPACE_OFFICE, rLocalName);
@@ -798,7 +798,7 @@ SvXMLStylesContext *SdXMLImport::CreateAutoStylesContext(const OUString& rLocalN
//////////////////////////////////////////////////////////////////////////////
SvXMLImportContext* SdXMLImport::CreateMasterStylesContext(const OUString& rLocalName,
- const uno::Reference<xml::sax::XAttributeList>& xAttrList)
+ const uno::Reference<xml::sax::XAttributeList>& /*xAttrList*/)
{
if(mpMasterStylesContext)
return mpMasterStylesContext;
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport.cxx b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport.cxx
index 81d9d45..b1940a3 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport.cxx
@@ -75,9 +75,9 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
SvXMLExportPropertyMapper *pExtMapper )
: rExport( rExp ),
// #88546# init to FALSE
- mbHandleProgressBar( sal_False ),
mnNextUniqueShapeId(1),
mbExportLayer( sal_False ),
+ mbHandleProgressBar( sal_False ),
msZIndex( RTL_CONSTASCII_USTRINGPARAM("ZOrder") ),
msEmptyPres( RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ),
msModel( RTL_CONSTASCII_USTRINGPARAM("Model") ),
@@ -151,7 +151,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
ImplXMLShapeExportInfoVector& aShapeInfoVector = (*maCurrentShapesIter).second;
- if( aShapeInfoVector.size() <= nZIndex )
+ if( (sal_Int32)aShapeInfoVector.size() <= nZIndex )
{
DBG_ERROR( "XMLShapeExport::collectShapeAutoStyles(): no shape info allocated for a given shape" );
return;
@@ -325,8 +325,8 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
// is present which means "void"
// 102407 - 2002-11-01 - fs at openoffice.org
static const ::rtl::OUString s_sParaAdjustPropertyName( RTL_CONSTASCII_USTRINGPARAM( "ParaAdjust" ) );
- uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() );
- if ( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName( s_sParaAdjustPropertyName ) )
+ uno::Reference< beans::XPropertySetInfo > xLclPropSetInfo( xPropSet->getPropertySetInfo() );
+ if ( xLclPropSetInfo.is() && xLclPropSetInfo->hasPropertyByName( s_sParaAdjustPropertyName ) )
{
uno::Reference< beans::XPropertyState > xPropState( xPropSet, uno::UNO_QUERY );
if ( xPropState.is() && beans::PropertyState_DEFAULT_VALUE == xPropState->getPropertyState( s_sParaAdjustPropertyName ) )
@@ -428,7 +428,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
ImplXMLShapeExportInfoVector& aShapeInfoVector = (*maCurrentShapesIter).second;
- if( aShapeInfoVector.size() <= nZIndex )
+ if( (sal_Int32)aShapeInfoVector.size() <= nZIndex )
{
DBG_ERROR( "XMLShapeExport::exportShape(): no shape info collected for a given shape" );
return;
@@ -1020,11 +1020,11 @@ void XMLShapeExport::ExportGraphicDefaults()
XMLStyleExport aStEx(rExport, OUString(), rExport.GetAutoStylePool().get());
// construct PropertySetMapper
- UniReference< SvXMLExportPropertyMapper > xPropertySetMapper( CreateShapePropMapper( rExport ) );
- ((XMLShapeExportPropertyMapper*)xPropertySetMapper.get())->SetAutoStyles( sal_False );
+ UniReference< SvXMLExportPropertyMapper > xLclPropertySetMapper( CreateShapePropMapper( rExport ) );
+ ((XMLShapeExportPropertyMapper*)xLclPropertySetMapper.get())->SetAutoStyles( sal_False );
// chain text attributes
- xPropertySetMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(rExport));
+ xLclPropertySetMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(rExport));
// write graphic family default style
uno::Reference< lang::XMultiServiceFactory > xFact( rExport.GetModel(), uno::UNO_QUERY );
@@ -1035,10 +1035,10 @@ void XMLShapeExport::ExportGraphicDefaults()
uno::Reference< beans::XPropertySet > xDefaults( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults") ) ), uno::UNO_QUERY );
if( xDefaults.is() )
{
- aStEx.exportDefaultStyle( xDefaults, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xPropertySetMapper );
+ aStEx.exportDefaultStyle( xDefaults, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xLclPropertySetMapper );
// write graphic family styles
- aStEx.exportStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_NAME, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xPropertySetMapper, FALSE, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
+ aStEx.exportStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_NAME, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xLclPropertySetMapper, FALSE, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
}
}
catch( lang::ServiceNotRegisteredException& )
@@ -1047,7 +1047,7 @@ void XMLShapeExport::ExportGraphicDefaults()
}
}
-void XMLShapeExport::onExport( const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape >& xShape )
+void XMLShapeExport::onExport( const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape >& /*xShape*/ )
{
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx b/binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx
index a8b95ad..516bb2c 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx
@@ -53,7 +53,7 @@ using namespace ::com::sun::star;
//////////////////////////////////////////////////////////////////////////////
// Predeclarations
-void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen);
+void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos);
void Imp_CalcVectorValues(Vector2D& aVec1, Vector2D& aVec2, sal_Bool& bSameLength, sal_Bool& bSameDirection);
//////////////////////////////////////////////////////////////////////////////
@@ -137,7 +137,7 @@ void Imp_SkipNumberAndSpacesAndCommas(const OUString& rStr, sal_Int32& rPos,
void Imp_SkipDoubleAndSpacesAndCommas(const OUString& rStr, sal_Int32& rPos,
const sal_Int32 nLen)
{
- Imp_SkipDouble(rStr, rPos, nLen);
+ Imp_SkipDouble(rStr, rPos);
Imp_SkipSpacesAndCommas(rStr, rPos, nLen);
}
@@ -161,7 +161,7 @@ void Imp_PutNumberCharWithSpace(OUString& rStr, const SvXMLUnitConverter& rConv,
//////////////////////////////////////////////////////////////////////////////
// parsing help functions for double numbers
-void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen)
+void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos)
{
sal_Unicode aChar(rStr[rPos]);
@@ -1109,11 +1109,11 @@ SdXMLImExViewBox::SdXMLImExViewBox(sal_Int32 nX, sal_Int32 nY, sal_Int32 nW, sal
// #100617# Asked vincent hardy: svg:viewBox values may be double precision.
SdXMLImExViewBox::SdXMLImExViewBox(const OUString& rNew, const SvXMLUnitConverter& rConv)
-: mnX( 0L ),
- mnY( 0L ),
- mnW( 1000L ),
- mnH( 1000L ),
- msString(rNew)
+ : msString(rNew)
+ , mnX( 0L )
+ , mnY( 0L )
+ , mnW( 1000L )
+ , mnH( 1000L )
{
if(msString.getLength())
{
@@ -1260,13 +1260,13 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(const OUString& rNew,
while(nPos < nLen)
{
// skip number, #100617# be prepared for doubles
- Imp_SkipDouble(aStr, nPos, nLen);
+ Imp_SkipDouble(aStr, nPos);
// skip spaces and commas
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
// skip number, #100617# be prepared for doubles
- Imp_SkipDouble(aStr, nPos, nLen);
+ Imp_SkipDouble(aStr, nPos);
// skip spaces and commas
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
@@ -1415,7 +1415,7 @@ void SdXMLImExSvgDElement::AddPolygon(
{
// append polygon to string
OUString aNewString;
- sal_Unicode aLastCommand;
+ sal_Unicode aLastCommand(0);
awt::Point* pPointArray = pPoints->getArray();
// are the flags used at all? If not forget about them
@@ -2182,6 +2182,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
}
DBG_ASSERT(!bEllipticalArc, "XMLIMP: non-interpreted tags in svg:d element!");
+ (void)bEllipticalArc;
if(nNumPolys)
{
@@ -2867,36 +2868,36 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
for(sal_Int32 a(0); a < nOuterCnt; a++)
{
// get Polygon pointers
- awt::Point* pInnerSequence = pOuterSequence->getArray();
- drawing::PolygonFlags* pInnerFlags = pOuterFlags->getArray();
+ awt::Point* pLclInnerSequence = pOuterSequence->getArray();
+ drawing::PolygonFlags* pLclInnerFlags = pOuterFlags->getArray();
sal_Int32 nInnerCnt(pOuterSequence->getLength());
while( nInnerCnt >= 2
- && ((pInnerSequence + (nInnerCnt - 2))->X == (pInnerSequence + (nInnerCnt - 1))->X)
- && ((pInnerSequence + (nInnerCnt - 2))->Y == (pInnerSequence + (nInnerCnt - 1))->Y)
- && drawing::PolygonFlags_CONTROL != *(pInnerFlags + (nInnerCnt - 2)))
+ && ((pLclInnerSequence + (nInnerCnt - 2))->X == (pLclInnerSequence + (nInnerCnt - 1))->X)
+ && ((pLclInnerSequence + (nInnerCnt - 2))->Y == (pLclInnerSequence + (nInnerCnt - 1))->Y)
+ && drawing::PolygonFlags_CONTROL != *(pLclInnerFlags + (nInnerCnt - 2)))
{
// remove last point from array
pOuterSequence->realloc(nInnerCnt - 1);
pOuterFlags->realloc(nInnerCnt - 1);
// get new pointers
- pInnerSequence = pOuterSequence->getArray();
- pInnerFlags = pOuterFlags->getArray();
+ pLclInnerSequence = pOuterSequence->getArray();
+ pLclInnerFlags = pOuterFlags->getArray();
nInnerCnt = pOuterSequence->getLength();
}
// now evtl. correct the last curve flags
if(nInnerCnt >= 4)
{
- if( pInnerSequence->X == (pInnerSequence + (nInnerCnt - 1))->X
- && pInnerSequence->Y == (pInnerSequence + (nInnerCnt - 1))->Y
- && drawing::PolygonFlags_CONTROL == *(pInnerFlags + 1)
- && drawing::PolygonFlags_CONTROL == *(pInnerFlags + (nInnerCnt - 2)))
+ if( pLclInnerSequence->X == (pLclInnerSequence + (nInnerCnt - 1))->X
+ && pLclInnerSequence->Y == (pLclInnerSequence + (nInnerCnt - 1))->Y
+ && drawing::PolygonFlags_CONTROL == *(pLclInnerFlags + 1)
+ && drawing::PolygonFlags_CONTROL == *(pLclInnerFlags + (nInnerCnt - 2)))
{
- awt::Point aPrev = *(pInnerSequence + (nInnerCnt - 2));
- awt::Point aCurr = *pInnerSequence;
- awt::Point aNext = *(pInnerSequence + 1);
+ awt::Point aPrev = *(pLclInnerSequence + (nInnerCnt - 2));
+ awt::Point aCurr = *pLclInnerSequence;
+ awt::Point aNext = *(pLclInnerSequence + 1);
Vector2D aVec1(aPrev.X - aCurr.X, aPrev.Y - aCurr.Y);
Vector2D aVec2(aNext.X - aCurr.X, aNext.Y - aCurr.Y);
sal_Bool bSameLength(FALSE);
@@ -2911,21 +2912,21 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
if(bSameLength)
{
// set to PolygonFlags_SYMMETRIC
- *pInnerFlags = drawing::PolygonFlags_SYMMETRIC;
- *(pInnerFlags + (nInnerCnt - 1)) = drawing::PolygonFlags_SYMMETRIC;
+ *pLclInnerFlags = drawing::PolygonFlags_SYMMETRIC;
+ *(pLclInnerFlags + (nInnerCnt - 1)) = drawing::PolygonFlags_SYMMETRIC;
}
else
{
// set to PolygonFlags_SMOOTH
- *pInnerFlags = drawing::PolygonFlags_SMOOTH;
- *(pInnerFlags + (nInnerCnt - 1)) = drawing::PolygonFlags_SMOOTH;
+ *pLclInnerFlags = drawing::PolygonFlags_SMOOTH;
+ *(pLclInnerFlags + (nInnerCnt - 1)) = drawing::PolygonFlags_SMOOTH;
}
}
else
{
// set to PolygonFlags_NORMAL
- *pInnerFlags = drawing::PolygonFlags_NORMAL;
- *(pInnerFlags + (nInnerCnt - 1)) = drawing::PolygonFlags_NORMAL;
+ *pLclInnerFlags = drawing::PolygonFlags_NORMAL;
+ *(pLclInnerFlags + (nInnerCnt - 1)) = drawing::PolygonFlags_NORMAL;
}
}
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximpnote.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximpnote.cxx
index a27f197..e6a5bc2 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximpnote.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximpnote.cxx
@@ -39,22 +39,22 @@ using namespace ::com::sun::star;
//////////////////////////////////////////////////////////////////////////////
-SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
+SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rInImport,
USHORT nPrfx, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXMLGenericPageContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes )
{
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
const SvXMLTokenMap& rAttrTokenMap = GetSdImport().GetMasterPageAttrTokenMap();
- switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+ switch(rAttrTokenMap.Get(nLclPrefix, aLclLocalName))
{
case XML_TOK_MASTERPAGE_PAGE_MASTER_NAME:
{
@@ -88,7 +88,7 @@ SdXMLNotesContext::~SdXMLNotesContext()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext *SdXMLNotesContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLNotesContext::CreateChildContext( USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
{
@@ -106,7 +106,7 @@ SvXMLImportContext *SdXMLNotesContext::CreateChildContext( USHORT nPrefix,
// call parent when no own context was created
if(!pContext)
- pContext = SdXMLGenericPageContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
+ pContext = SdXMLGenericPageContext::CreateChildContext(nInPrefix, rLocalName, xAttrList);
return pContext;
}
More information about the Libreoffice-commits
mailing list