[Libreoffice-commits] .: 3 commits - binfilter/bf_sc binfilter/bf_svx binfilter/bf_xmloff filter/source oox/source writerfilter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 31 13:27:27 PST 2011
binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx | 13
binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx | 4
binfilter/bf_xmloff/source/draw/makefile.mk | 2
binfilter/bf_xmloff/source/draw/xmloff_XMLGraphicsDefaultStyle.cxx | 4
binfilter/bf_xmloff/source/draw/xmloff_XMLNumberStyles.cxx | 44 +-
binfilter/bf_xmloff/source/draw/xmloff_animexp.cxx | 20 -
binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx | 67 +--
binfilter/bf_xmloff/source/draw/xmloff_eventimp.cxx | 76 ++--
binfilter/bf_xmloff/source/draw/xmloff_layerexp.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_layerimp.cxx | 18 -
binfilter/bf_xmloff/source/draw/xmloff_numithdl.cxx | 4
binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx | 57 +--
binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_viewcontext.cxx | 8
binfilter/bf_xmloff/source/draw/xmloff_ximpbody.cxx | 40 +-
binfilter/bf_xmloff/source/draw/xmloff_ximpshow.cxx | 64 +--
binfilter/bf_xmloff/source/draw/xmloff_ximpstyl.cxx | 178 ++++------
filter/source/graphicfilter/icgm/actimpr.cxx | 20 -
oox/source/core/filterdetect.cxx | 24 -
oox/source/ppt/timenodelistcontext.cxx | 1
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2
22 files changed, 309 insertions(+), 343 deletions(-)
New commits:
commit d071e489743247d30923a32098707373cf2871f9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 31 11:41:53 2011 +0000
WaE: throw out some warnings
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
index 3f8e095..ab7559f 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
@@ -117,8 +117,6 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ ScDocShellModificator aModificator( rDocShell );
/*M*/
/*M*/ BOOL bSuccess = FALSE;
-/*M*/ BOOL bTruncated = FALSE; // for warning
-/*M*/ USHORT nErrStringId = 0;
/*M*/ String aErrorMessage;
/*M*/
/*M*/ USHORT nCol = rParam.nCol1;
@@ -128,7 +126,6 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ long i;
/*M*/
/*M*/ BOOL bDoSelection = FALSE;
-/*M*/ BOOL bRealSelection = FALSE; // TRUE if not everything is selected
/*M*/ ULONG nListPos = 0;
/*M*/ ULONG nRowsRead = 0;
/*M*/ ULONG nListCount = 0;
@@ -264,7 +261,6 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ ULONG nNextRow = (ULONG) pSelection->GetObject(nListPos);
/*M*/ while (nRowsRead+1 < nNextRow && !bEnd)
/*M*/ {
-/*M*/ bRealSelection = TRUE;
/*M*/ if ( !xRowSet->next() )
/*M*/ bEnd = TRUE;
/*M*/ ++nRowsRead;
@@ -273,7 +269,6 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ }
/*M*/ else
/*M*/ {
-/*M*/ bRealSelection = TRUE; // more data available but not used
/*M*/ bEnd = TRUE;
/*M*/ }
/*M*/ }
@@ -302,7 +297,6 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ else // past the end of the spreadsheet
/*M*/ {
/*M*/ bEnd = TRUE; // don't continue
-/*M*/ bTruncated = TRUE; // warning flag
/*M*/ }
/*M*/ }
/*M*/
@@ -355,12 +349,10 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*N*/ aTester.TestBlock( pDoc, nTab, rParam.nCol1,rParam.nRow1,nEndCol,nEndRow );
/*N*/ if ( !aTester.IsEditable() )
/*N*/ {
-/*N*/ nErrStringId = aTester.GetMessageId();
/*N*/ bSuccess = FALSE;
/*N*/ }
/*N*/ else if ( pDoc->GetChangeTrack() != NULL )
/*M*/ {
-/*M*/ nErrStringId = STR_PROTECTIONERR;
/*M*/ bSuccess = FALSE;
/*M*/ }
/*M*/ }
@@ -373,7 +365,6 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ nEndCol+nFormulaCols, nEndRow, nTab );
/*M*/ if (!pDoc->CanFitBlock( aOld, aNew ))
/*M*/ {
-/*M*/ nErrStringId = STR_MSSG_DOSUBTOTALS_2; // can't insert cells
/*M*/ bSuccess = FALSE;
/*M*/ }
/*M*/ }
@@ -426,14 +417,10 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ USHORT nUndoEndRow = Max( nEndRow, rParam.nRow2 );
/*M*/
/*M*/ ScDocument* pUndoDoc = NULL;
-/*M*/ ScDBData* pUndoDBData = NULL;
/*M*/ if ( bRecord )
/*M*/ {
/*M*/ pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
/*M*/ pUndoDoc->InitUndo( pDoc, nTab, nTab );
-/*M*/
-/*M*/ if ( !bAddrInsert )
-/*M*/ pUndoDBData = new ScDBData( *pDBData );
/*M*/ }
/*M*/
/*M*/ ScMarkData aNewMark;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
index b95f3a4..ad3a237 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
@@ -140,11 +140,7 @@ namespace binfilter {
/*N*/ BOOL SdrCreateView::CheckEdgeMode()
/*N*/ {
-/*N*/ UINT32 nInv=nAktInvent;
-/*N*/ UINT16 nIdn=nAktIdent;
/*N*/ if (pAktCreate!=NULL) {
-/*?*/ nInv=pAktCreate->GetObjInventor();
-/*?*/ nIdn=pAktCreate->GetObjIdentifier();
/*?*/ // wird vom EdgeObj gemanaged
/*?*/ if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return FALSE;
/*N*/ }
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index 98eff06..9970d48 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -210,7 +210,6 @@ void CGMImpressOutAct::ImplSetFillBundle()
sal_uInt32 nFillColor;
FillInteriorStyle eFillStyle;
- long nPatternIndex;
sal_uInt32 nHatchIndex;
if ( mpCGM->pElement->eEdgeVisibility == EV_ON )
@@ -243,10 +242,6 @@ void CGMImpressOutAct::ImplSetFillBundle()
nHatchIndex = (sal_uInt32)mpCGM->pElement->pFillBundle->nFillHatchIndex;
else
nHatchIndex = (sal_uInt32)mpCGM->pElement->aFillBundle.nFillHatchIndex;
- if ( mpCGM->pElement->nAspectSourceFlags & ASF_PATTERNINDEX )
- nPatternIndex = mpCGM->pElement->pFillBundle->nFillPatternIndex;
- else
- nPatternIndex = mpCGM->pElement->aFillBundle.nFillPatternIndex;
aAny <<= (sal_Int32)nFillColor;
maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
@@ -384,28 +379,13 @@ void CGMImpressOutAct::ImplSetFillBundle()
void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XPropertySet > & rProperty )
{
uno::Any aAny;
- TextPrecision eTextPrecision;
sal_uInt32 nTextFontIndex;
sal_uInt32 nTextColor;
- double fCharacterExpansion;
- double fCharacterSpacing;
if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTFONTINDEX )
nTextFontIndex = mpCGM->pElement->pTextBundle->nTextFontIndex;
else
nTextFontIndex = mpCGM->pElement->aTextBundle.nTextFontIndex;
- if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTPRECISION )
- eTextPrecision = mpCGM->pElement->pTextBundle->eTextPrecision;
- else
- eTextPrecision = mpCGM->pElement->aTextBundle.eTextPrecision;
- if ( mpCGM->pElement->nAspectSourceFlags & ASF_CHARACTEREXPANSION )
- fCharacterExpansion = mpCGM->pElement->pTextBundle->nCharacterExpansion;
- else
- fCharacterExpansion = mpCGM->pElement->aTextBundle.nCharacterExpansion;
- if ( mpCGM->pElement->nAspectSourceFlags & ASF_CHARACTERSPACING )
- fCharacterSpacing = mpCGM->pElement->pTextBundle->nCharacterSpacing;
- else
- fCharacterSpacing = mpCGM->pElement->aTextBundle.nCharacterSpacing;
if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTCOLOR )
nTextColor = mpCGM->pElement->pTextBundle->GetColor();
else
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index c5ed40c..46ceed4 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -346,9 +346,9 @@ void lclDeriveKey( const sal_uInt8* pnHash, sal_uInt32 nHashLen, sal_uInt8* pnKe
pnBuffer[ i ] ^= pnHash[ i ];
rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
- rtlDigestError aError = rtl_digest_update( aDigest, pnBuffer, sizeof( pnBuffer ) );
+ rtl_digest_update( aDigest, pnBuffer, sizeof( pnBuffer ) );
sal_uInt8 pnX1[ RTL_DIGEST_LENGTH_SHA1 ];
- aError = rtl_digest_get( aDigest, pnX1, RTL_DIGEST_LENGTH_SHA1 );
+ rtl_digest_get( aDigest, pnX1, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest );
memset( pnBuffer, 0x5C, sizeof( pnBuffer ) );
@@ -356,9 +356,9 @@ void lclDeriveKey( const sal_uInt8* pnHash, sal_uInt32 nHashLen, sal_uInt8* pnKe
pnBuffer[ i ] ^= pnHash[ i ];
aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
- aError = rtl_digest_update( aDigest, pnBuffer, sizeof( pnBuffer ) );
+ rtl_digest_update( aDigest, pnBuffer, sizeof( pnBuffer ) );
sal_uInt8 pnX2[ RTL_DIGEST_LENGTH_SHA1 ];
- aError = rtl_digest_get( aDigest, pnX2, RTL_DIGEST_LENGTH_SHA1 );
+ rtl_digest_get( aDigest, pnX2, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest );
if( nRequiredKeyLen > RTL_DIGEST_LENGTH_SHA1 )
@@ -383,28 +383,28 @@ bool lclGenerateEncryptionKey( const PackageEncryptionInfo& rEncrInfo, const OUS
ByteOrderConverter::writeLittleEndian( pnPasswordLoc, static_cast< sal_uInt16 >( *pStr ) );
rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
- rtlDigestError aError = rtl_digest_update( aDigest, pnBuffer, nBufferSize );
+ rtl_digest_update( aDigest, pnBuffer, nBufferSize );
delete[] pnBuffer;
size_t nHashSize = RTL_DIGEST_LENGTH_SHA1 + 4;
sal_uInt8* pnHash = new sal_uInt8[ nHashSize ];
- aError = rtl_digest_get( aDigest, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 );
+ rtl_digest_get( aDigest, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest );
for( sal_uInt32 i = 0; i < 50000; ++i )
{
ByteOrderConverter::writeLittleEndian( pnHash, i );
aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
- aError = rtl_digest_update( aDigest, pnHash, nHashSize );
- aError = rtl_digest_get( aDigest, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 );
+ rtl_digest_update( aDigest, pnHash, nHashSize );
+ rtl_digest_get( aDigest, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest );
}
memmove( pnHash, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 );
memset( pnHash + RTL_DIGEST_LENGTH_SHA1, 0, 4 );
aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
- aError = rtl_digest_update( aDigest, pnHash, nHashSize );
- aError = rtl_digest_get( aDigest, pnHash, RTL_DIGEST_LENGTH_SHA1 );
+ rtl_digest_update( aDigest, pnHash, nHashSize );
+ rtl_digest_get( aDigest, pnHash, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest );
lclDeriveKey( pnHash, RTL_DIGEST_LENGTH_SHA1, pnKey, nRequiredKeyLen );
@@ -428,9 +428,9 @@ bool lclGenerateEncryptionKey( const PackageEncryptionInfo& rEncrInfo, const OUS
EVP_CIPHER_CTX_cleanup( &aes_ctx );
aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
- aError = rtl_digest_update( aDigest, pnVerifier, sizeof( pnVerifier ) );
+ rtl_digest_update( aDigest, pnVerifier, sizeof( pnVerifier ) );
sal_uInt8 pnSha1Hash[ RTL_DIGEST_LENGTH_SHA1 ];
- aError = rtl_digest_get( aDigest, pnSha1Hash, RTL_DIGEST_LENGTH_SHA1 );
+ rtl_digest_get( aDigest, pnSha1Hash, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest );
return memcmp( pnSha1Hash, pnVerifierHash, RTL_DIGEST_LENGTH_SHA1 ) == 0;
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index bac176e..1df3cf4 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -941,6 +941,7 @@ namespace oox { namespace ppt {
// CT_TLPoint
Point p = GetPointPercent( xAttribs );
// TODO push
+ (void)p;
break;
}
default:
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 9a58c79..2d38dc7 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -57,7 +57,7 @@ typedef std::vector<PropertyMapVector1> PropertyMapVector2;
class DomainMapper_Impl;
class TableStyleSheetEntry;
struct TableInfo;
-class DomainMapperTableHandler : public TableDataHandler<Handle_t , TablePropertyMapPtr >
+class WRITERFILTER_DLLPRIVATE DomainMapperTableHandler : public TableDataHandler<Handle_t , TablePropertyMapPtr >
{
TextReference_t m_xText;
DomainMapper_Impl& m_rDMapper_Impl;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 39d3e7f..4810d7c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -269,7 +269,7 @@ struct LineNumberSettings
-----------------------------------------------------------------------*/
class DomainMapper;
-class DomainMapper_Impl
+class WRITERFILTER_DLLPRIVATE DomainMapper_Impl
{
public:
typedef TableManager< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >, PropertyMapPtr > TableManager_t;
commit 6665844aadc69e879345ace3450d796c4f83cf51
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 31 11:41:16 2011 +0000
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_xmloff/source/draw/makefile.mk b/binfilter/bf_xmloff/source/draw/makefile.mk
index 02952e6..9e3d713 100644
--- a/binfilter/bf_xmloff/source/draw/makefile.mk
+++ b/binfilter/bf_xmloff/source/draw/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
PRJNAME=binfilter
TARGET=xmloff_draw
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
index 77f6be6..43a3cef 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
@@ -376,7 +376,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
SdXMLImplSetEffect( eEffect, eKind, eDirection, nStartScale, bIn );
- if( eEffect != EK_none )
+ if( eKind != EK_none )
{
SvXMLUnitConverter::convertEnum( msBuffer, eKind, aXML_AnimationEffect_EnumMap );
rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_EFFECT, msBuffer.makeStringAndClear() );
commit 7b8d63e6754121b7f9026f0f3117b53b330f4678
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 31 11:35:48 2011 +0000
WaE: throw out some warnings
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLGraphicsDefaultStyle.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLGraphicsDefaultStyle.cxx
index 8376584..7094af3 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLGraphicsDefaultStyle.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLGraphicsDefaultStyle.cxx
@@ -55,8 +55,8 @@ using ::binfilter::xmloff::token::XML_PROPERTIES;
TYPEINIT1( XMLGraphicsDefaultStyle, XMLPropStyleContext );
-XMLGraphicsDefaultStyle::XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList, SvXMLStylesContext& rStyles )
-: XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, sal_True )
+XMLGraphicsDefaultStyle::XMLGraphicsDefaultStyle( SvXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList, SvXMLStylesContext& rStyles )
+: XMLPropStyleContext( rInImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, sal_True )
{
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLNumberStyles.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLNumberStyles.cxx
index 6ed14f8..4eced96 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLNumberStyles.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLNumberStyles.cxx
@@ -74,7 +74,7 @@ struct SdXMLDataStyleNumber
{ XML_AM_PM, sal_False, sal_False, sal_False, NULL },
{ XML_SECONDS, sal_False, sal_False, sal_False, NULL },
{ XML_SECONDS, sal_False, sal_False, sal_True, NULL },
- { XML_TOKEN_INVALID, NULL }
+ { XML_TOKEN_INVALID,sal_False, sal_False, sal_False, NULL }
};
// date
@@ -446,7 +446,7 @@ private:
public:
TYPEINFO();
- SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport,
+ SdXMLNumberFormatMemberImportContext( SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -454,7 +454,7 @@ public:
SvXMLImportContext* pSlaveContext );
virtual ~SdXMLNumberFormatMemberImportContext();
- virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -467,8 +467,8 @@ public:
TYPEINIT1( SdXMLNumberFormatMemberImportContext, SvXMLImportContext );
-SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext )
-: SvXMLImportContext(rImport, nPrfx, rLocalName),
+SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext )
+: SvXMLImportContext(rInImport, nPrfx, rLocalName),
mpParent( pParent ),
maNumberStyle( rLocalName ),
mpSlaveContext( pSlaveContext )
@@ -481,21 +481,21 @@ SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXM
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
- if( nPrefix == XML_NAMESPACE_NUMBER )
+ if( nLclPrefix == XML_NAMESPACE_NUMBER )
{
- if( IsXMLToken( aLocalName, XML_DECIMAL_PLACES ) )
+ if( IsXMLToken( aLclLocalName, XML_DECIMAL_PLACES ) )
{
mbDecimal02 = IsXMLToken( sValue, XML_2 );
}
- else if( IsXMLToken( aLocalName, XML_STYLE ) )
+ else if( IsXMLToken( aLclLocalName, XML_STYLE ) )
{
mbLong = IsXMLToken( sValue, XML_LONG );
}
- else if( IsXMLToken( aLocalName, XML_TEXTUAL ) )
+ else if( IsXMLToken( aLclLocalName, XML_TEXTUAL ) )
{
mbTextual = IsXMLToken( sValue, XML_TRUE );
}
@@ -508,11 +508,11 @@ SdXMLNumberFormatMemberImportContext::~SdXMLNumberFormatMemberImportContext()
{
}
-SvXMLImportContext *SdXMLNumberFormatMemberImportContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLNumberFormatMemberImportContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
{
- return mpSlaveContext->CreateChildContext( nPrefix, rLocalName, xAttrList );
+ return mpSlaveContext->CreateChildContext( nInPrefix, rLocalName, xAttrList );
}
void SdXMLNumberFormatMemberImportContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
@@ -537,9 +537,9 @@ void SdXMLNumberFormatMemberImportContext::Characters( const ::rtl::OUString& rC
TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext );
-SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles)
-: SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles),
- mbAutomatic( sal_False ), mnIndex(0), mrImport( rImport ), mnKey( -1 )
+SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rInImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles)
+: SvXMLNumFormatContext(rInImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles),
+ mrImport( rInImport ), mbAutomatic( sal_False ), mnIndex(0), mnKey( -1 )
{
mbTimeStyle = IsXMLToken( rLocalName, XML_TIME_STYLE );
@@ -547,13 +547,13 @@ SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rIm
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
- if( nPrefix == XML_NAMESPACE_NUMBER )
+ if( nLclPrefix == XML_NAMESPACE_NUMBER )
{
- if( IsXMLToken( aLocalName, XML_AUTOMATIC_ORDER ) )
+ if( IsXMLToken( aLclLocalName, XML_AUTOMATIC_ORDER ) )
{
mbAutomatic = IsXMLToken( sValue, XML_TRUE );
}
@@ -638,9 +638,9 @@ void SdXMLNumberFormatImportContext::EndElement()
}
}
-SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( USHORT nInPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
- return new SdXMLNumberFormatMemberImportContext( GetImport(), nPrefix, rLocalName, xAttrList, this, SvXMLNumFormatContext::CreateChildContext( nPrefix, rLocalName, xAttrList ) );
+ return new SdXMLNumberFormatMemberImportContext( GetImport(), nInPrefix, rLocalName, xAttrList, this, SvXMLNumFormatContext::CreateChildContext( nInPrefix, rLocalName, xAttrList ) );
}
}//end of namespace binfilter
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_animexp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_animexp.cxx
index 6af3611..85c3dd9 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_animexp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_animexp.cxx
@@ -265,8 +265,8 @@ public:
msSoundOn( RTL_CONSTASCII_USTRINGPARAM( "SoundOn" ) ),
msSpeed( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ),
msTextEffect( RTL_CONSTASCII_USTRINGPARAM( "TextEffect" ) ),
- msAnimPath( RTL_CONSTASCII_USTRINGPARAM( "AnimationPath" ) ),
- msIsAnimation( RTL_CONSTASCII_USTRINGPARAM( "IsAnimation" ) )
+ msIsAnimation( RTL_CONSTASCII_USTRINGPARAM( "IsAnimation" ) ),
+ msAnimPath( RTL_CONSTASCII_USTRINGPARAM( "AnimationPath" ) )
{}
};
@@ -343,7 +343,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape )
xProps->getPropertyValue( mpImpl->msSpeed ) >>= aEffect.meSpeed;
- sal_Bool bIsAnimation;
+ sal_Bool bIsAnimation(sal_False);
xProps->getPropertyValue( mpImpl->msIsAnimation ) >>= bIsAnimation;
if( bIsAnimation )
{
@@ -403,8 +403,8 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape )
aEffect.maSoundURL = aEmptyStr;
}
- sal_Bool bDimPrev;
- sal_Bool bDimHide;
+ sal_Bool bDimPrev(sal_False);
+ sal_Bool bDimHide(sal_False);
xProps->getPropertyValue( mpImpl->msDimPrev ) >>= bDimPrev;
xProps->getPropertyValue( mpImpl->msDimHide ) >>= bDimHide;
if( bDimPrev || bDimHide )
@@ -415,7 +415,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape )
aEffect.meSpeed = AnimationSpeed_MEDIUM;
if( bDimPrev )
{
- sal_Int32 nColor;
+ sal_Int32 nColor(0);
xProps->getPropertyValue( mpImpl->msDimColor ) >>= nColor;
aEffect.maDimColor.SetColor( nColor );
}
@@ -466,7 +466,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
SvXMLUnitConverter::convertColor( sTmp, rEffect.maDimColor );
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_COLOR, sTmp.makeStringAndClear() );
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_DIM, sal_True, sal_True );
+ SvXMLElementExport aLclElem( rExport, XML_NAMESPACE_PRESENTATION, XML_DIM, sal_True, sal_True );
}
else if( rEffect.meKind == XMLE_PLAY )
{
@@ -476,7 +476,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, sTmp.makeStringAndClear() );
}
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_PLAY, sal_True, sal_True );
+ SvXMLElementExport aLclElem( rExport, XML_NAMESPACE_PRESENTATION, XML_PLAY, sal_True, sal_True );
}
else
{
@@ -526,7 +526,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
eLocalName = XML_HIDE_SHAPE;
}
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, eLocalName, sal_True, sal_True );
+ SvXMLElementExport aInnerElem( rExport, XML_NAMESPACE_PRESENTATION, eLocalName, sal_True, sal_True );
if( rEffect.maSoundURL.getLength() != 0 )
{
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, rExport.GetRelativeReference(rEffect.maSoundURL) );
@@ -536,7 +536,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
if( rEffect.mbPlayFull )
rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE );
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True );
+ SvXMLElementExport aLclElem( rExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True );
}
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx
index 45a4000..8cfe5d6 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx
@@ -128,7 +128,7 @@ SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, sal_Bool bIn )
+AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, sal_Bool /*bIn*/ )
{
switch( eKind )
{
@@ -412,7 +412,7 @@ public:
public:
TYPEINFO();
- XMLAnimationsEffectContext( SvXMLImport& rImport,
+ XMLAnimationsEffectContext( SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const Reference< XAttributeList >& xAttrList,
@@ -421,7 +421,7 @@ public:
virtual void EndElement();
- virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const OUString& rLocalName,
+ virtual SvXMLImportContext * CreateChildContext( USHORT nInPrefix, const OUString& rLocalName,
const Reference< XAttributeList >& xAttrList );
};
@@ -432,14 +432,14 @@ class XMLAnimationsSoundContext : public SvXMLImportContext
public:
TYPEINFO();
- XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent );
+ XMLAnimationsSoundContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent );
virtual ~XMLAnimationsSoundContext();
};
TYPEINIT1( XMLAnimationsSoundContext, SvXMLImportContext );
-XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent )
-: SvXMLImportContext( rImport, nPrfx, rLocalName ), mpParent( pParent )
+XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent )
+: SvXMLImportContext( rInImport, nPrfx, rLocalName ), mpParent( pParent )
{
if( mpParent && nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SOUND ) )
{
@@ -447,20 +447,20 @@ XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, sal_
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
- switch( nPrefix )
+ switch( nLclPrefix )
{
case XML_NAMESPACE_XLINK:
- if( IsXMLToken( aLocalName, XML_HREF ) )
+ if( IsXMLToken( aLclLocalName, XML_HREF ) )
{
- mpParent->maSoundURL = rImport.GetAbsoluteReference(sValue);
+ mpParent->maSoundURL = rInImport.GetAbsoluteReference(sValue);
}
break;
case XML_NAMESPACE_PRESENTATION:
- if( IsXMLToken( aLocalName, XML_PLAY_FULL ) )
+ if( IsXMLToken( aLclLocalName, XML_PLAY_FULL ) )
{
mpParent->mbPlayFull = IsXMLToken( sValue, XML_TRUE );
}
@@ -476,12 +476,13 @@ XMLAnimationsSoundContext::~XMLAnimationsSoundContext()
TYPEINIT1( XMLAnimationsEffectContext, SvXMLImportContext );
-XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, AnimImpImpl* pImpl )
-: SvXMLImportContext(rImport, nPrfx, rLocalName),
+XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, AnimImpImpl* pImpl )
+: SvXMLImportContext(rInImport, nPrfx, rLocalName),
mpImpl( pImpl ),
- meKind( XMLE_SHOW ), mbTextEffect( sal_False ), mnShapeId( -1 ), mnPathShapeId( -1 ),
+ meKind( XMLE_SHOW ), mbTextEffect( sal_False ), mnShapeId( -1 ),
meEffect( EK_none ), meDirection( ED_none ), mnStartScale( 100 ),
- meSpeed( AnimationSpeed_MEDIUM ), maDimColor(0), mbPlayFull( sal_False )
+ meSpeed( AnimationSpeed_MEDIUM ), maDimColor(0), mbPlayFull( sal_False ),
+ mnPathShapeId( -1 )
{
if( IsXMLToken( rLocalName, XML_SHOW_SHAPE ) )
{
@@ -520,49 +521,49 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, s
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
- switch( nPrefix )
+ switch( nLclPrefix )
{
case XML_NAMESPACE_DRAW:
- if( IsXMLToken( aLocalName, XML_SHAPE_ID ) )
+ if( IsXMLToken( aLclLocalName, XML_SHAPE_ID ) )
{
SvXMLUnitConverter::convertNumber(mnShapeId, sValue);
}
- else if( IsXMLToken( aLocalName, XML_COLOR ) )
+ else if( IsXMLToken( aLclLocalName, XML_COLOR ) )
{
SvXMLUnitConverter::convertColor(maDimColor, sValue);
}
break;
case XML_NAMESPACE_PRESENTATION:
- if( IsXMLToken( aLocalName, XML_EFFECT ) )
+ if( IsXMLToken( aLclLocalName, XML_EFFECT ) )
{
USHORT eEnum;
if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationEffect_EnumMap ) )
meEffect = (XMLEffect)eEnum;
}
- else if( IsXMLToken(aLocalName, XML_DIRECTION ) )
+ else if( IsXMLToken(aLclLocalName, XML_DIRECTION ) )
{
USHORT eEnum;
if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationDirection_EnumMap ) )
meDirection = (XMLEffectDirection)eEnum;
}
- else if( IsXMLToken( aLocalName, XML_START_SCALE ) )
+ else if( IsXMLToken( aLclLocalName, XML_START_SCALE ) )
{
sal_Int32 nScale;
if( SvXMLUnitConverter::convertPercent( nScale, sValue ) )
mnStartScale = (sal_Int16)nScale;
}
- else if( IsXMLToken( aLocalName, XML_SPEED ) )
+ else if( IsXMLToken( aLclLocalName, XML_SPEED ) )
{
USHORT eEnum;
if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationSpeed_EnumMap ) )
meSpeed = (AnimationSpeed)eEnum;
}
- else if( IsXMLToken( aLocalName, XML_PATH_ID ) )
+ else if( IsXMLToken( aLclLocalName, XML_PATH_ID ) )
{
SvXMLUnitConverter::convertNumber(mnPathShapeId, sValue);
}
@@ -575,9 +576,9 @@ XMLAnimationsEffectContext::~XMLAnimationsEffectContext()
{
}
-SvXMLImportContext * XMLAnimationsEffectContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
+SvXMLImportContext * XMLAnimationsEffectContext::CreateChildContext( USHORT nInPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
{
- return new XMLAnimationsSoundContext( GetImport(), nPrefix, rLocalName, xAttrList, this );
+ return new XMLAnimationsSoundContext( GetImport(), nInPrefix, rLocalName, xAttrList, this );
}
void XMLAnimationsEffectContext::EndElement()
@@ -687,9 +688,9 @@ void XMLAnimationsEffectContext::EndElement()
TYPEINIT1( XMLAnimationsContext, SvXMLImportContext );
-XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList)
-: SvXMLImportContext(rImport, nPrfx, rLocalName)
+XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/)
+: SvXMLImportContext(rInImport, nPrfx, rLocalName)
{
mpImpl = new AnimImpImpl();
}
@@ -699,10 +700,10 @@ XMLAnimationsContext::~XMLAnimationsContext()
delete mpImpl;
}
-SvXMLImportContext * XMLAnimationsContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * XMLAnimationsContext::CreateChildContext( USHORT nInPrefix, const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
- return new XMLAnimationsEffectContext( GetImport(), nPrefix, rLocalName, xAttrList, mpImpl );
+ return new XMLAnimationsEffectContext( GetImport(), nInPrefix, rLocalName, xAttrList, mpImpl );
}
}//end of namespace binfilter
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_eventimp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_eventimp.cxx
index a9b589b..0112dea 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_eventimp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_eventimp.cxx
@@ -97,10 +97,10 @@ private:
public:
TYPEINFO();
- SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, const Reference< XShape >& rxShape );
+ SdXMLEventContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, const Reference< XShape >& rxShape );
virtual ~SdXMLEventContext();
- virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList );
+ virtual SvXMLImportContext * CreateChildContext( USHORT nInPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList );
virtual void EndElement();
sal_Bool mbValid;
@@ -129,14 +129,14 @@ class XMLEventSoundContext : public SvXMLImportContext
public:
TYPEINFO();
- XMLEventSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent );
+ XMLEventSoundContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent );
virtual ~XMLEventSoundContext();
};
TYPEINIT1( XMLEventSoundContext, SvXMLImportContext );
-XMLEventSoundContext::XMLEventSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent )
-: SvXMLImportContext( rImport, nPrfx, rLocalName ), mpParent( pParent )
+XMLEventSoundContext::XMLEventSoundContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent )
+: SvXMLImportContext( rInImport, nPrfx, rLocalName ), mpParent( pParent )
{
if( mpParent && nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SOUND ) )
{
@@ -144,20 +144,20 @@ XMLEventSoundContext::XMLEventSoundContext( SvXMLImport& rImport, sal_uInt16 nPr
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
- switch( nPrefix )
+ switch( nLclPrefix )
{
case XML_NAMESPACE_XLINK:
- if( IsXMLToken( aLocalName, XML_HREF ) )
+ if( IsXMLToken( aLclLocalName, XML_HREF ) )
{
- mpParent->msSoundURL = rImport.GetAbsoluteReference(sValue);
+ mpParent->msSoundURL = rInImport.GetAbsoluteReference(sValue);
}
break;
case XML_NAMESPACE_PRESENTATION:
- if( IsXMLToken( aLocalName, XML_PLAY_FULL ) )
+ if( IsXMLToken( aLclLocalName, XML_PLAY_FULL ) )
{
mpParent->mbPlayFull = IsXMLToken( sValue, XML_TRUE );
}
@@ -174,8 +174,8 @@ XMLEventSoundContext::~XMLEventSoundContext()
TYPEINIT1( SdXMLEventContext, SvXMLImportContext );
-SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape )
-: SvXMLImportContext(rImport, nPrfx, rLocalName),
+SdXMLEventContext::SdXMLEventContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape )
+: SvXMLImportContext(rInImport, nPrfx, rLocalName),
mxShape( rxShape ), mbScript( sal_False ), meClickAction( ClickAction_NONE ),
meEffect( EK_none ), meDirection( ED_none ), mnStartScale( 100 ),
meSpeed( AnimationSpeed_MEDIUM ), mnVerb(0), mbPlayFull( sal_False )
@@ -201,73 +201,73 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, c
for(sal_Int16 i=0; (i < nAttrCount) && mbValid; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
- switch( nPrefix )
+ switch( nLclPrefix )
{
case XML_NAMESPACE_PRESENTATION:
- if( IsXMLToken( aLocalName, XML_ACTION ) )
+ if( IsXMLToken( aLclLocalName, XML_ACTION ) )
{
USHORT eEnum;
if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_EventActions_EnumMap ) )
meClickAction = (ClickAction)eEnum;
}
- if( IsXMLToken( aLocalName, XML_EFFECT ) )
+ if( IsXMLToken( aLclLocalName, XML_EFFECT ) )
{
USHORT eEnum;
if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationEffect_EnumMap ) )
meEffect = (XMLEffect)eEnum;
}
- else if( IsXMLToken( aLocalName, XML_DIRECTION ) )
+ else if( IsXMLToken( aLclLocalName, XML_DIRECTION ) )
{
USHORT eEnum;
if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationDirection_EnumMap ) )
meDirection = (XMLEffectDirection)eEnum;
}
- else if( IsXMLToken( aLocalName, XML_START_SCALE ) )
+ else if( IsXMLToken( aLclLocalName, XML_START_SCALE ) )
{
sal_Int32 nScale;
if( SvXMLUnitConverter::convertPercent( nScale, sValue ) )
mnStartScale = (sal_Int16)nScale;
}
- else if( IsXMLToken( aLocalName, XML_SPEED ) )
+ else if( IsXMLToken( aLclLocalName, XML_SPEED ) )
{
USHORT eEnum;
if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationSpeed_EnumMap ) )
meSpeed = (AnimationSpeed)eEnum;
}
- else if( IsXMLToken( aLocalName, XML_VERB ) )
+ else if( IsXMLToken( aLclLocalName, XML_VERB ) )
{
SvXMLUnitConverter::convertNumber( mnVerb, sValue );
}
break;
case XML_NAMESPACE_SCRIPT:
- if( IsXMLToken( aLocalName, XML_EVENT_NAME ) )
+ if( IsXMLToken( aLclLocalName, XML_EVENT_NAME ) )
{
msEventName = sValue;
mbValid = msEventName == msXMLEventName;
}
- else if( IsXMLToken( aLocalName, XML_LANGUAGE ) )
+ else if( IsXMLToken( aLclLocalName, XML_LANGUAGE ) )
{
msLanguage = sValue;
}
- else if( IsXMLToken( aLocalName, XML_MACRO_NAME ) )
+ else if( IsXMLToken( aLclLocalName, XML_MACRO_NAME ) )
{
msMacroName = sValue;
}
- else if( IsXMLToken( aLocalName, XML_LIBRARY ) )
+ else if( IsXMLToken( aLclLocalName, XML_LIBRARY ) )
{
msLibrary = sValue;
}
break;
case XML_NAMESPACE_XLINK:
- if( IsXMLToken( aLocalName, XML_HREF ) )
+ if( IsXMLToken( aLclLocalName, XML_HREF ) )
{
- const rtl::OUString &rTmp( rImport.GetAbsoluteReference(sValue) );
+ const rtl::OUString &rTmp( rInImport.GetAbsoluteReference(sValue) );
INetURLObject::translateToInternal( rTmp, msBookmark, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 );
}
break;
@@ -282,9 +282,9 @@ SdXMLEventContext::~SdXMLEventContext()
{
}
-SvXMLImportContext * SdXMLEventContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLEventContext::CreateChildContext( USHORT nInPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
{
- return new XMLEventSoundContext( GetImport(), nPrefix, rLocalName, xAttrList, this );
+ return new XMLEventSoundContext( GetImport(), nInPrefix, rLocalName, xAttrList, this );
}
void SdXMLEventContext::EndElement()
@@ -337,6 +337,9 @@ void SdXMLEventContext::EndElement()
case ClickAction_VANISH:
nPropertyCount += 4;
break;
+
+ default:
+ break;
}
uno::Sequence< beans::PropertyValue > aProperties( nPropertyCount );
@@ -441,6 +444,9 @@ void SdXMLEventContext::EndElement()
pProperties->Value <<= mnVerb;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
break;
+
+ default:
+ break;
}
}
@@ -455,9 +461,9 @@ void SdXMLEventContext::EndElement()
TYPEINIT1( SdXMLEventsContext, SvXMLImportContext );
-SdXMLEventsContext::SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
- const Reference< XAttributeList>& xAttrList, const Reference< XShape >& rxShape)
-: SvXMLImportContext(rImport, nPrfx, rLocalName), mxShape( rxShape )
+SdXMLEventsContext::SdXMLEventsContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLocalName,
+ const Reference< XAttributeList>& /*xAttrList*/, const Reference< XShape >& rxShape)
+: SvXMLImportContext(rInImport, nPrfx, rLocalName), mxShape( rxShape )
{
}
@@ -465,10 +471,10 @@ SdXMLEventsContext::~SdXMLEventsContext()
{
}
-SvXMLImportContext * SdXMLEventsContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * SdXMLEventsContext::CreateChildContext( USHORT nInPrefix, const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
- return new SdXMLEventContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape );
+ return new SdXMLEventContext( GetImport(), nInPrefix, rLocalName, xAttrList, mxShape );
}
}//end of namespace binfilter
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_layerexp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_layerexp.cxx
index 93eaa1b..deb6b00 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_layerexp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_layerexp.cxx
@@ -86,7 +86,7 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport )
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aName );
}
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_LAYER, sal_True, sal_True );
+ SvXMLElementExport aLclElem( rExport, XML_NAMESPACE_DRAW, XML_LAYER, sal_True, sal_True );
}
}
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_layerimp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_layerimp.cxx
index 3316622..04b12f6 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_layerimp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_layerimp.cxx
@@ -61,11 +61,11 @@ using rtl::OUString;
TYPEINIT1( SdXMLLayerSetContext, SvXMLImportContext );
-SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList)
-: SvXMLImportContext(rImport, nPrfx, rLocalName)
+SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rInImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/)
+: SvXMLImportContext(rInImport, nPrfx, rLocalName)
{
- Reference< XLayerSupplier > xLayerSupplier( rImport.GetModel(), UNO_QUERY );
+ Reference< XLayerSupplier > xLayerSupplier( rInImport.GetModel(), UNO_QUERY );
DBG_ASSERT( xLayerSupplier.is(), "XModel is not supporting XLayerSupplier!" );
if( xLayerSupplier.is() )
mxLayerManager = xLayerSupplier->getLayerManager();
@@ -75,7 +75,7 @@ SdXMLLayerSetContext::~SdXMLLayerSetContext()
{
}
-SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( USHORT nInPrefix, const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
if( mxLayerManager.is() )
@@ -87,12 +87,12 @@ SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( USHORT nPrefix, c
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
{
- OUString aLocalName;
- if( GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &aLocalName ) == XML_NAMESPACE_DRAW )
+ OUString aLclLocalName;
+ if( GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &aLclLocalName ) == XML_NAMESPACE_DRAW )
{
const OUString sValue( xAttrList->getValueByIndex( i ) );
- if( IsXMLToken( aLocalName, XML_NAME ) )
+ if( IsXMLToken( aLclLocalName, XML_NAME ) )
{
aName = sValue;
}
@@ -126,7 +126,7 @@ SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( USHORT nPrefix, c
}
}
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
}//end of namespace binfilter
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_numithdl.cxx b/binfilter/bf_xmloff/source/draw/xmloff_numithdl.cxx
index b970e44..aa442d9 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_numithdl.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_numithdl.cxx
@@ -51,12 +51,12 @@ sal_Bool XMLNumRulePropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) con
return mxNumRuleCompare.is() && mxNumRuleCompare->compare( r1, r2 ) == 0;
}
-sal_Bool XMLNumRulePropHdl::importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
+sal_Bool XMLNumRulePropHdl::importXML( const ::rtl::OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
return sal_False;
}
-sal_Bool XMLNumRulePropHdl::exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
+sal_Bool XMLNumRulePropHdl::exportXML( ::rtl::OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
return sal_False;
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
index c5eda34..a1e4497 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
@@ -369,6 +369,10 @@ SdXMLExport::SdXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
sal_Bool bIsDraw, sal_uInt16 nExportFlags )
: SvXMLExport( xServiceFactory, MAP_CM, bIsDraw ? XML_DRAWING : XML_PRESENTATION, nExportFlags ),
+ mnDocMasterPageCount(0L),
+ mnDocDrawPageCount(0L),
+ mnShapeStyleInfoIndex(0L),
+ mnObjectCount(0L),
mpPageMasterInfoList(new ImpXMLEXPPageMasterList()),
mpPageMasterUsageList(new ImpXMLEXPPageMasterList()),
mpNotesPageMasterUsageList(new ImpXMLEXPPageMasterList()),
@@ -377,10 +381,8 @@ SdXMLExport::SdXMLExport(
mpSdPropHdlFactory(0L),
mpPropertySetMapper(0L),
mpPresPagePropsMapper(0L),
- mnDocMasterPageCount(0L),
- mnDocDrawPageCount(0L),
- mnShapeStyleInfoIndex(0L),
- mnObjectCount(0L),
+ mnUsedDateStyles( 0 ),
+ mnUsedTimeStyles( 0 ),
mbIsDraw(bIsDraw),
mbFamilyGraphicUsed(FALSE),
mbFamilyPresentationUsed(FALSE),
@@ -389,9 +391,7 @@ SdXMLExport::SdXMLExport(
msModel( RTL_CONSTASCII_USTRINGPARAM("Model") ),
msStartShape( RTL_CONSTASCII_USTRINGPARAM("StartShape") ),
msEndShape( RTL_CONSTASCII_USTRINGPARAM("EndShape") ),
- msPageLayoutNames( RTL_CONSTASCII_USTRINGPARAM("PageLayoutNames") ),
- mnUsedDateStyles( 0 ),
- mnUsedTimeStyles( 0 )
+ msPageLayoutNames( RTL_CONSTASCII_USTRINGPARAM("PageLayoutNames") )
{
@@ -1339,8 +1339,8 @@ void SdXMLExport::ImpPrepDrawPageInfos()
uno::Reference< beans::XPropertySetInfo > xInfo( xPropSet1->getPropertySetInfo() );
if( xInfo.is() && xInfo->hasPropertyByName( aBackground ) )
{
- uno::Any aAny( xPropSet1->getPropertyValue( aBackground ) );
- aAny >>= xPropSet2;
+ uno::Any aLclAny( xPropSet1->getPropertyValue( aBackground ) );
+ aLclAny >>= xPropSet2;
}
uno::Reference< beans::XPropertySet > xPropSet;
@@ -1405,8 +1405,8 @@ void SdXMLExport::ImpPrepMasterPageInfos()
uno::Reference< beans::XPropertySetInfo > xInfo( xPropSet1->getPropertySetInfo() );
if( xInfo.is() && xInfo->hasPropertyByName( aBackground ) )
{
- uno::Any aAny( xPropSet1->getPropertyValue( aBackground ) );
- aAny >>= xPropSet2;
+ uno::Any aLclAny( xPropSet1->getPropertyValue( aBackground ) );
+ aLclAny >>= xPropSet2;
}
uno::Reference< beans::XPropertySet > xPropSet;
@@ -1614,8 +1614,8 @@ void SdXMLExport::_ExportContent()
uno::Reference< drawing::XDrawPage > xNotesPage(xPresPage->getNotesPage());
if(xNotesPage.is())
{
- uno::Reference< drawing::XShapes > xShapes(xNotesPage, uno::UNO_QUERY);
- if(xShapes.is() && xShapes->getCount())
+ uno::Reference< drawing::XShapes > xLclShapes(xNotesPage, uno::UNO_QUERY);
+ if(xLclShapes.is() && xLclShapes->getCount())
{
// write presentation notes
SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, XML_NOTES, sal_True, sal_True);
@@ -1624,7 +1624,7 @@ void SdXMLExport::_ExportContent()
exportFormsElement( xNotesPage );
// write shapes per se
- GetShapeExport()->exportShapes( xShapes );
+ GetShapeExport()->exportShapes( xLclShapes );
}
}
}
@@ -1683,7 +1683,7 @@ void SdXMLExport::exportPresentationSettings()
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_ENDLESS, XML_TRUE );
bHasAttr = sal_True;
- sal_Int32 nPause;
+ sal_Int32 nPause(0);
xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Pause" ) ) ) >>= nPause;
util::DateTime aTime( 0, (sal_uInt16)nPause, 0, 0, 0, 0, 0 );
@@ -1958,9 +1958,9 @@ void SdXMLExport::_ExportAutoStyles()
// collect layer information
GetFormExport()->examineForms( xNotesPage );
- uno::Reference< drawing::XShapes > xShapes(xNotesPage, uno::UNO_QUERY);
- if(xShapes.is() && xShapes->getCount())
- GetShapeExport()->collectShapesAutoStyles( xShapes );
+ uno::Reference< drawing::XShapes > xLclShapes(xNotesPage, uno::UNO_QUERY);
+ if(xLclShapes.is() && xLclShapes->getCount())
+ GetShapeExport()->collectShapesAutoStyles( xLclShapes );
}
}
}
@@ -2027,9 +2027,9 @@ void SdXMLExport::_ExportAutoStyles()
// collect layer information
GetFormExport()->examineForms( xNotesPage );
- uno::Reference< drawing::XShapes > xShapes(xNotesPage, uno::UNO_QUERY);
- if(xShapes.is() && xShapes->getCount())
- GetShapeExport()->collectShapesAutoStyles( xShapes );
+ uno::Reference< drawing::XShapes > xLclShapes(xNotesPage, uno::UNO_QUERY);
+ if(xLclShapes.is() && xLclShapes->getCount())
+ GetShapeExport()->collectShapesAutoStyles( xLclShapes );
}
}
}
@@ -2111,7 +2111,7 @@ void SdXMLExport::_ExportMasterStyles()
AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, sMasterPageName);
}
- ImpXMLEXPPageMasterInfo* pInfo = (nMPageId < mpPageMasterUsageList->size()) ? (*mpPageMasterUsageList)[ nMPageId ] : NULL;
+ ImpXMLEXPPageMasterInfo* pInfo = (nMPageId < static_cast<sal_Int32>(mpPageMasterUsageList->size())) ? (*mpPageMasterUsageList)[ nMPageId ] : NULL;
if(pInfo)
{
OUString sString = pInfo->GetName();
@@ -2142,13 +2142,13 @@ void SdXMLExport::_ExportMasterStyles()
uno::Reference< drawing::XDrawPage > xNotesPage(xPresPage->getNotesPage());
if(xNotesPage.is())
{
- uno::Reference< drawing::XShapes > xShapes(xNotesPage, uno::UNO_QUERY);
- if(xShapes.is() && xShapes->getCount())
+ uno::Reference< drawing::XShapes > xLclShapes(xNotesPage, uno::UNO_QUERY);
+ if(xLclShapes.is() && xLclShapes->getCount())
{
- ImpXMLEXPPageMasterInfo* pInfo = (nMPageId < mpNotesPageMasterUsageList->size() ) ? (*mpNotesPageMasterUsageList)[ nMPageId ] : NULL;
- if(pInfo)
+ ImpXMLEXPPageMasterInfo* pLclInfo = (nMPageId < static_cast<sal_Int32>(mpNotesPageMasterUsageList->size()) ) ? (*mpNotesPageMasterUsageList)[ nMPageId ] : NULL;
+ if(pLclInfo)
{
- OUString sString = pInfo->GetName();
+ OUString sString = pLclInfo->GetName();
AddAttribute(XML_NAMESPACE_STYLE, XML_PAGE_MASTER_NAME, sString);
}
@@ -2159,7 +2159,7 @@ void SdXMLExport::_ExportMasterStyles()
exportFormsElement( xNotesPage );
// write shapes per se
- GetShapeExport()->exportShapes( xShapes );
+ GetShapeExport()->exportShapes( xLclShapes );
}
}
}
@@ -2186,6 +2186,7 @@ void SdXMLExport::exportFormsElement( uno::Reference< drawing::XDrawPage > xDraw
sal_Bool bRet = GetFormExport()->seekPage( xDrawPage );
DBG_ASSERT( bRet, "OFormLayerXMLExport::seekPage failed!" );
+ (void)bRet;
}
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_viewcontext.cxx b/binfilter/bf_xmloff/source/draw/xmloff_viewcontext.cxx
index 5c5c50e..dc1ecd1 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_viewcontext.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_viewcontext.cxx
@@ -45,14 +45,14 @@ SdXMLViewSettingsContext::~SdXMLViewSettingsContext()
{
}
-SvXMLImportContext *SdXMLViewSettingsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLViewSettingsContext::CreateChildContext( USHORT nInPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext *pContext = 0;
- if (nPrefix == XML_NAMESPACE_OFFICE)
+ if (nInPrefix == XML_NAMESPACE_OFFICE)
{
if ( IsXMLToken( rLocalName, XML_EMBEDDED_VISIBLE_AREA ) )
{
@@ -62,12 +62,12 @@ SvXMLImportContext *SdXMLViewSettingsContext::CreateChildContext( USHORT nPrefix
if( xProps.is() )
xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "MapUnit" ) ) ) >>= nMeasureUnit;
- pContext = new XMLVisAreaContext(GetImport(), nPrefix, rLocalName, xAttrList, maVisArea, nMeasureUnit);
+ pContext = new XMLVisAreaContext(GetImport(), nInPrefix, rLocalName, xAttrList, maVisArea, nMeasureUnit);
}
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximpbody.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximpbody.cxx
index 30d37c1..b300279 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximpbody.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximpbody.cxx
@@ -61,11 +61,11 @@ using namespace ::com::sun::star;
//////////////////////////////////////////////////////////////////////////////
-SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
+SdXMLDrawPageContext::SdXMLDrawPageContext( 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 )
{
sal_Int32 nPageId = -1;
@@ -74,12 +74,12 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- USHORT nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ USHORT nLclPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
const SvXMLTokenMap& rAttrTokenMap = GetSdImport().GetDrawPageAttrTokenMap();
- switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+ switch(rAttrTokenMap.Get(nLclPrefix, aLclLocalName))
{
case XML_TOK_DRAWPAGE_NAME:
{
@@ -122,7 +122,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
// set an id?
if( nPageId != -1 && xDrawPage.is() )
- rImport.setDrawPageId( nPageId, xDrawPage );
+ rInImport.setDrawPageId( nPageId, xDrawPage );
// set PageName?
if(maName.getLength())
@@ -144,10 +144,10 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
// compare the wanted masterpage-name with the existing masterpages
// which were loaded and created in the styles section loading.
uno::Reference< drawing::XDrawPages > xMasterPages(GetSdImport().GetLocalMasterPages(), uno::UNO_QUERY);
- uno::Reference < drawing::XMasterPageTarget > xDrawPage(rShapes, uno::UNO_QUERY);
+ uno::Reference < drawing::XMasterPageTarget > xLclDrawPage(rShapes, uno::UNO_QUERY);
uno::Reference< drawing::XDrawPage > xMasterPage;
- if(xDrawPage.is() && xMasterPages.is())
+ if(xLclDrawPage.is() && xMasterPages.is())
{
sal_Bool bDone(FALSE);
@@ -165,7 +165,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
if(sMasterPageName.getLength() && sMasterPageName.equals(maMasterPageName))
{
- xDrawPage->setMasterPage(xMasterPage);
+ xLclDrawPage->setMasterPage(xMasterPage);
bDone = TRUE;
}
}
@@ -272,7 +272,7 @@ SdXMLDrawPageContext::~SdXMLDrawPageContext()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( USHORT nInPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
@@ -280,7 +280,7 @@ SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( USHORT nPrefix,
const SvXMLTokenMap& rTokenMap = GetSdImport().GetDrawPageElemTokenMap();
// some special objects inside draw:page context
- switch(rTokenMap.Get(nPrefix, rLocalName))
+ switch(rTokenMap.Get(nInPrefix, rLocalName))
{
case XML_TOK_DRAWPAGE_NOTES:
{
@@ -297,7 +297,7 @@ SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( USHORT nPrefix,
if(xNewShapes.is())
{
// presentation:notes inside draw:page context
- pContext = new SdXMLNotesContext( GetSdImport(), nPrefix, rLocalName, xAttrList, xNewShapes);
+ pContext = new SdXMLNotesContext( GetSdImport(), nInPrefix, rLocalName, xAttrList, xNewShapes);
}
}
}
@@ -307,7 +307,7 @@ SvXMLImportContext *SdXMLDrawPageContext::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;
}
@@ -321,9 +321,9 @@ void SdXMLDrawPageContext::EndElement()
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-SdXMLBodyContext::SdXMLBodyContext( SdXMLImport& rImport,
+SdXMLBodyContext::SdXMLBodyContext( SdXMLImport& rInImport,
USHORT nPrfx, const OUString& rLocalName )
-: SvXMLImportContext( rImport, nPrfx, rLocalName )
+: SvXMLImportContext( rInImport, nPrfx, rLocalName )
{
}
@@ -336,14 +336,14 @@ SdXMLBodyContext::~SdXMLBodyContext()
//////////////////////////////////////////////////////////////////////////////
SvXMLImportContext *SdXMLBodyContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext *pContext = 0L;
const SvXMLTokenMap& rTokenMap = GetSdImport().GetBodyElemTokenMap();
- switch(rTokenMap.Get(nPrefix, rLocalName))
+ switch(rTokenMap.Get(nInPrefix, rLocalName))
{
case XML_TOK_BODY_PAGE:
{
@@ -375,7 +375,7 @@ SvXMLImportContext *SdXMLBodyContext::CreateChildContext(
if(xNewShapes.is())
{
// draw:page inside office:body context
- pContext = new SdXMLDrawPageContext(GetSdImport(), nPrefix, rLocalName, xAttrList,
+ pContext = new SdXMLDrawPageContext(GetSdImport(), nInPrefix, rLocalName, xAttrList,
xNewShapes);
}
}
@@ -384,13 +384,13 @@ SvXMLImportContext *SdXMLBodyContext::CreateChildContext(
}
case XML_TOK_BODY_SETTINGS:
{
- pContext = new SdXMLShowsContext( GetSdImport(), nPrefix, rLocalName, xAttrList );
+ pContext = new SdXMLShowsContext( GetSdImport(), nInPrefix, rLocalName, xAttrList );
}
}
// call parent when no own context was created
if(!pContext)
- pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
+ pContext = SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName, xAttrList);
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximpshow.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximpshow.cxx
index 3f646fa..f152953 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximpshow.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximpshow.cxx
@@ -73,8 +73,8 @@ public:
OUString maCustomShowName;
SdXMLImport& mrImport;
- ShowsImpImpl( SdXMLImport& rImport )
- : mrImport( rImport )
+ ShowsImpImpl( SdXMLImport& rInImport )
+ : mrImport( rInImport )
{}
};
@@ -82,23 +82,23 @@ public:
TYPEINIT1( SdXMLShowsContext, SvXMLImportContext );
-SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
-: SvXMLImportContext(rImport, nPrfx, rLocalName)
+SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+: SvXMLImportContext(rInImport, nPrfx, rLocalName)
{
- mpImpl = new ShowsImpImpl( rImport );
+ mpImpl = new ShowsImpImpl( rInImport );
- Reference< XCustomPresentationSupplier > xShowsSupplier( rImport.GetModel(), UNO_QUERY );
+ Reference< XCustomPresentationSupplier > xShowsSupplier( rInImport.GetModel(), UNO_QUERY );
if( xShowsSupplier.is() )
{
mpImpl->mxShows = xShowsSupplier->getCustomPresentations();
mpImpl->mxShowFactory = Reference< XSingleServiceFactory >::query( mpImpl->mxShows );
}
- Reference< XDrawPagesSupplier > xDrawPagesSupplier( rImport.GetModel(), UNO_QUERY );
+ Reference< XDrawPagesSupplier > xDrawPagesSupplier( rInImport.GetModel(), UNO_QUERY );
if( xDrawPagesSupplier.is() )
mpImpl->mxPages = Reference< XNameAccess >::query( xDrawPagesSupplier->getDrawPages() );
- Reference< XPresentationSupplier > xPresentationSupplier( rImport.GetModel(), UNO_QUERY );
+ Reference< XPresentationSupplier > xPresentationSupplier( rInImport.GetModel(), UNO_QUERY );
if( xPresentationSupplier.is() )
mpImpl->mxPresProps = Reference< XPropertySet >::query( xPresentationSupplier->getPresentation() );
@@ -113,25 +113,25 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
- switch( nPrefix )
+ switch( nLclPrefix )
{
case XML_NAMESPACE_PRESENTATION:
- if( IsXMLToken( aLocalName, XML_START_PAGE ) )
+ if( IsXMLToken( aLclLocalName, XML_START_PAGE ) )
{
aAny <<= sValue;
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPage" ) ), aAny );
bAll = sal_False;
}
- else if( IsXMLToken( aLocalName, XML_SHOW ) )
+ else if( IsXMLToken( aLclLocalName, XML_SHOW ) )
{
mpImpl->maCustomShowName = sValue;
bAll = sal_False;
}
- else if( IsXMLToken( aLocalName, XML_PAUSE ) )
+ else if( IsXMLToken( aLclLocalName, XML_PAUSE ) )
{
DateTime aTime;
if( !SvXMLUnitConverter::convertTime( aTime, sValue ) )
@@ -141,52 +141,52 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c
aAny <<= nMS;
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Pause" ) ), aAny );
}
- else if( IsXMLToken( aLocalName, XML_ANIMATIONS ) )
+ else if( IsXMLToken( aLclLocalName, XML_ANIMATIONS ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) );
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowAnimations" ) ), aAny );
}
- else if( IsXMLToken( aLocalName, XML_STAY_ON_TOP ) )
+ else if( IsXMLToken( aLclLocalName, XML_STAY_ON_TOP ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAlwaysOnTop" ) ), aAny );
}
- else if( IsXMLToken( aLocalName, XML_FORCE_MANUAL ) )
+ else if( IsXMLToken( aLclLocalName, XML_FORCE_MANUAL ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAutomatic" ) ), aAny );
}
- else if( IsXMLToken( aLocalName, XML_ENDLESS ) )
+ else if( IsXMLToken( aLclLocalName, XML_ENDLESS ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ), aAny );
}
- else if( IsXMLToken( aLocalName, XML_FULL_SCREEN ) )
+ else if( IsXMLToken( aLclLocalName, XML_FULL_SCREEN ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFullScreen" ) ), aAny );
}
- else if( IsXMLToken( aLocalName, XML_MOUSE_VISIBLE ) )
+ else if( IsXMLToken( aLclLocalName, XML_MOUSE_VISIBLE ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsMouseVisible" ) ), aAny );
}
- else if( IsXMLToken( aLocalName, XML_START_WITH_NAVIGATOR ) )
+ else if( IsXMLToken( aLclLocalName, XML_START_WITH_NAVIGATOR ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "StartWithNavigator" ) ), aAny );
}
- else if( IsXMLToken( aLocalName, XML_MOUSE_AS_PEN ) )
+ else if( IsXMLToken( aLclLocalName, XML_MOUSE_AS_PEN ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "UsePen" ) ), aAny );
}
- else if( IsXMLToken( aLocalName, XML_TRANSITION_ON_CLICK ) )
+ else if( IsXMLToken( aLclLocalName, XML_TRANSITION_ON_CLICK ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) );
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTransitionOnClick" ) ), aAny );
}
- else if( IsXMLToken( aLocalName, XML_SHOW_LOGO ) )
+ else if( IsXMLToken( aLclLocalName, XML_SHOW_LOGO ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsShowLogo" ) ), aAny );
@@ -210,9 +210,9 @@ SdXMLShowsContext::~SdXMLShowsContext()
delete mpImpl;
}
-SvXMLImportContext * SdXMLShowsContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLShowsContext::CreateChildContext( USHORT nInPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
{
- if( mpImpl && nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SHOW ) )
+ if( mpImpl && nInPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SHOW ) )
{
OUString aName;
OUString aPages;
@@ -222,18 +222,18 @@ SvXMLImportContext * SdXMLShowsContext::CreateChildContext( USHORT nPrefix, cons
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
- switch( nPrefix )
+ switch( nLclPrefix )
{
case XML_NAMESPACE_PRESENTATION:
- if( IsXMLToken( aLocalName, XML_NAME ) )
+ if( IsXMLToken( aLclLocalName, XML_NAME ) )
{
aName = sValue;
}
- else if( IsXMLToken( aLocalName, XML_PAGES ) )
+ else if( IsXMLToken( aLclLocalName, XML_PAGES ) )
{
aPages = sValue;
}
@@ -277,7 +277,7 @@ SvXMLImportContext * SdXMLShowsContext::CreateChildContext( USHORT nPrefix, cons
}
}
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
}//end of namespace binfilter
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximpstyl.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximpstyl.cxx
index a191f28..74da019 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximpstyl.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximpstyl.cxx
@@ -88,7 +88,7 @@ public:
TYPEINFO();
- SdXMLDrawingPagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SdXMLDrawingPagePropertySetContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList >& xAttrList,
@@ -97,22 +97,22 @@ public:
virtual ~SdXMLDrawingPagePropertySetContext();
- virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
- ::std::vector< XMLPropertyState > &rProperties,
+ ::std::vector< XMLPropertyState > &rInProperties,
const XMLPropertyState& rProp);
};
TYPEINIT1( SdXMLDrawingPagePropertySetContext, SvXMLPropertySetContext );
SdXMLDrawingPagePropertySetContext::SdXMLDrawingPagePropertySetContext(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
::std::vector< XMLPropertyState > &rProps,
const UniReference < SvXMLImportPropertyMapper > &rMap ) :
- SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList, rProps, rMap )
+ SvXMLPropertySetContext( rInImport, nPrfx, rLName, xAttrList, rProps, rMap )
{
}
@@ -121,10 +121,10 @@ SdXMLDrawingPagePropertySetContext::~SdXMLDrawingPagePropertySetContext()
}
SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
- ::std::vector< XMLPropertyState > &rProperties,
+ ::std::vector< XMLPropertyState > &rInProperties,
const XMLPropertyState& rProp )
{
SvXMLImportContext *pContext = 0;
@@ -136,15 +136,15 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext(
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
{
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(xAttrList->getNameByIndex(i), &aLocalName);
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(xAttrList->getNameByIndex(i), &aLclLocalName);
- if( (nPrefix == XML_NAMESPACE_XLINK) && IsXMLToken( aLocalName, XML_HREF ) )
+ if( (nLclPrefix == XML_NAMESPACE_XLINK) && IsXMLToken( aLclLocalName, XML_HREF ) )
{
uno::Any aAny;
aAny <<= GetImport().GetAbsoluteReference( xAttrList->getValueByIndex(i) );
XMLPropertyState aPropState( rProp.mnIndex, aAny );
- rProperties.push_back( aPropState );
+ rInProperties.push_back( aPropState );
}
}
break;
@@ -152,9 +152,9 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext(
}
if( !pContext )
- pContext = SvXMLPropertySetContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = SvXMLPropertySetContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList,
- rProperties, rProp );
+ rInProperties, rProp );
return pContext;
}
@@ -167,7 +167,7 @@ public:
TYPEINFO();
SdXMLDrawingPageStyleContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
@@ -184,13 +184,13 @@ public:
TYPEINIT1( SdXMLDrawingPageStyleContext, XMLPropStyleContext );
SdXMLDrawingPageStyleContext::SdXMLDrawingPageStyleContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
SvXMLStylesContext& rStyles,
- sal_uInt16 nFamily)
-: XMLPropStyleContext(rImport, nPrfx, rLName, xAttrList, rStyles, nFamily )
+ sal_uInt16 nInFamily)
+: XMLPropStyleContext(rInImport, nPrfx, rLName, xAttrList, rStyles, nInFamily )
{
}
@@ -199,26 +199,26 @@ SdXMLDrawingPageStyleContext::~SdXMLDrawingPageStyleContext()
}
SvXMLImportContext *SdXMLDrawingPageStyleContext::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 &&
+ if( XML_NAMESPACE_STYLE == nInPrefix &&
IsXMLToken( rLocalName, XML_PROPERTIES ) )
{
UniReference < SvXMLImportPropertyMapper > xImpPrMap =
GetStyles()->GetImportPropertyMapper( GetFamily() );
if( xImpPrMap.is() )
- pContext = new SdXMLDrawingPagePropertySetContext( GetImport(), nPrefix,
+ pContext = new SdXMLDrawingPagePropertySetContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
GetProperties(),
xImpPrMap );
}
if( !pContext )
- pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = XMLPropStyleContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList );
return pContext;
@@ -229,11 +229,11 @@ SvXMLImportContext *SdXMLDrawingPageStyleContext::CreateChildContext(
TYPEINIT1( SdXMLPageMasterStyleContext, SvXMLStyleContext );
SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
- SdXMLImport& rImport,
+ SdXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList)
-: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PAGEMASTERSTYLECONEXT_ID),
+: SvXMLStyleContext(rInImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PAGEMASTERSTYLECONEXT_ID),
mnBorderBottom( 0L ),
mnBorderLeft( 0L ),
mnBorderRight( 0L ),
@@ -249,12 +249,12 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
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().GetPageMasterStyleAttrTokenMap();
- switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+ switch(rAttrTokenMap.Get(nLclPrefix, aLclLocalName))
{
case XML_TOK_PAGEMASTERSTYLE_MARGIN_TOP:
{
@@ -310,11 +310,11 @@ SdXMLPageMasterStyleContext::~SdXMLPageMasterStyleContext()
TYPEINIT1( SdXMLPageMasterContext, SvXMLStyleContext );
SdXMLPageMasterContext::SdXMLPageMasterContext(
- SdXMLImport& rImport,
+ SdXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList)
-: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PAGEMASTERCONEXT_ID),
+: SvXMLStyleContext(rInImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PAGEMASTERCONEXT_ID),
mpPageMasterStyle( 0L )
{
// set family to something special at SvXMLStyleContext
@@ -324,12 +324,12 @@ SdXMLPageMasterContext::SdXMLPageMasterContext(
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().GetPageMasterAttrTokenMap();
- switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+ switch(rAttrTokenMap.Get(nLclPrefix, aLclLocalName))
{
case XML_TOK_PAGEMASTER_NAME:
{
@@ -355,15 +355,15 @@ SdXMLPageMasterContext::~SdXMLPageMasterContext()
//////////////////////////////////////////////////////////////////////////////
SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
SvXMLImportContext* pContext = 0;
- if(nPrefix == XML_NAMESPACE_STYLE && IsXMLToken( rLocalName, XML_PROPERTIES) )
+ if(nInPrefix == XML_NAMESPACE_STYLE && IsXMLToken( rLocalName, XML_PROPERTIES) )
{
- pContext = new SdXMLPageMasterStyleContext(GetSdImport(), nPrefix, rLocalName, xAttrList);
+ pContext = new SdXMLPageMasterStyleContext(GetSdImport(), nInPrefix, rLocalName, xAttrList);
// remember SdXMLPresentationPlaceholderContext for later evaluation
if(pContext)
@@ -376,7 +376,7 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
// call base class
if(!pContext)
- pContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
+ pContext = SvXMLStyleContext::CreateChildContext(nInPrefix, rLocalName, xAttrList);
return pContext;
}
@@ -387,11 +387,11 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
TYPEINIT1( SdXMLPresentationPageLayoutContext, SvXMLStyleContext );
SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext(
- SdXMLImport& rImport,
+ SdXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
-: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PRESENTATIONPAGELAYOUT_ID),
+: SvXMLStyleContext(rInImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PRESENTATIONPAGELAYOUT_ID),
mnTypeId( 20 ) // AUTOLAYOUT_NONE
{
// set family to somethiong special at SvXMLStyleContext
@@ -401,10 +401,10 @@ SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext(
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLclLocalName );
- if(nPrefix == XML_NAMESPACE_STYLE && IsXMLToken( aLocalName, XML_NAME ) )
+ if(nLclPrefix == XML_NAMESPACE_STYLE && IsXMLToken( aLclLocalName, XML_NAME ) )
{
msName = xAttrList->getValueByIndex( i );
}
@@ -416,17 +416,17 @@ SdXMLPresentationPageLayoutContext::~SdXMLPresentationPageLayoutContext()
}
SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
SvXMLImportContext* pContext = 0;
- if(nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_PLACEHOLDER ) )
+ if(nInPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_PLACEHOLDER ) )
{
// presentation:placeholder inside style:presentation-page-layout context
pContext = new SdXMLPresentationPlaceholderContext(
- GetSdImport(), nPrefix, rLocalName, xAttrList);
+ GetSdImport(), nInPrefix, rLocalName, xAttrList);
// remember SdXMLPresentationPlaceholderContext for later evaluation
if(pContext)
@@ -438,7 +438,7 @@ SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext(
// call base class
if(!pContext)
- pContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
+ pContext = SvXMLStyleContext::CreateChildContext(nInPrefix, rLocalName, xAttrList);
return pContext;
}
@@ -643,11 +643,11 @@ void SdXMLPresentationPageLayoutContext::EndElement()
//////////////////////////////////////////////////////////////////////////////
SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
- SdXMLImport& rImport,
+ SdXMLImport& rInImport,
sal_uInt16 nPrfx, const
OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList)
-: SvXMLImportContext( rImport, nPrfx, rLName),
+: SvXMLImportContext( rInImport, nPrfx, rLName),
mnX(0L),
mnY(0L),
mnWidth(1L),
@@ -657,12 +657,12 @@ SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
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().GetPresentationPlaceholderAttrTokenMap();
- switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+ switch(rAttrTokenMap.Get(nLclPrefix, aLclLocalName))
{
case XML_TOK_PRESENTATIONPLACEHOLDER_OBJECTNAME:
{
@@ -705,12 +705,12 @@ SdXMLPresentationPlaceholderContext::~SdXMLPresentationPlaceholderContext()
TYPEINIT1( SdXMLMasterPageContext, SdXMLGenericPageContext );
SdXMLMasterPageContext::SdXMLMasterPageContext(
- SdXMLImport& rImport,
+ SdXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLGenericPageContext( rImport, nPrfx, rLName, xAttrList, rShapes )
+: SdXMLGenericPageContext( rInImport, nPrfx, rLName, xAttrList, rShapes )
{
const sal_Bool bHandoutMaster = IsXMLToken( rLName, XML_HANDOUT_MASTER );
@@ -718,12 +718,12 @@ SdXMLMasterPageContext::SdXMLMasterPageContext(
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_NAME:
{
@@ -858,7 +858,7 @@ void SdXMLMasterPageContext::EndElement()
//////////////////////////////////////////////////////////////////////////////
SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
{
@@ -866,7 +866,7 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
const SvXMLTokenMap& rTokenMap = GetSdImport().GetMasterPageElemTokenMap();
// some special objects inside style:masterpage context
- switch(rTokenMap.Get(nPrefix, rLocalName))
+ switch(rTokenMap.Get(nInPrefix, rLocalName))
{
case XML_TOK_MASTERPAGE_STYLE:
{
@@ -874,7 +874,7 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
{
// style:style inside master-page context -> presentation style
XMLShapeStyleContext* pNew = new XMLShapeStyleContext(
- GetSdImport(), nPrefix, rLocalName, xAttrList,
+ GetSdImport(), nInPrefix, rLocalName, xAttrList,
*GetSdImport().GetShapeImport()->GetStylesContext(),
XML_STYLE_FAMILY_SD_PRESENTATION_ID);
@@ -902,7 +902,7 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
if(xNewShapes.is())
{
// presentation:notes inside master-page context
- pContext = new SdXMLNotesContext( GetSdImport(), nPrefix, rLocalName, xAttrList, xNewShapes);
+ pContext = new SdXMLNotesContext( GetSdImport(), nInPrefix, rLocalName, xAttrList, xNewShapes);
}
}
}
@@ -912,7 +912,7 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
// call base class
if(!pContext)
- pContext = SdXMLGenericPageContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
+ pContext = SdXMLGenericPageContext::CreateChildContext(nInPrefix, rLocalName, xAttrList);
return pContext;
}
@@ -923,22 +923,18 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
TYPEINIT1( SdXMLStylesContext, SvXMLStyleContext );
SdXMLStylesContext::SdXMLStylesContext(
- SdXMLImport& rImport,
+ SdXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
sal_Bool bIsAutoStyle)
-: SvXMLStylesContext(rImport, nPrfx, rLName, xAttrList),
+: SvXMLStylesContext(rInImport, nPrfx, rLName, xAttrList),
mbIsAutoStyle(bIsAutoStyle)
{
- // #110680#
- // Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
- Reference< lang::XMultiServiceFactory > xMSF = rImport.getServiceFactory();
+ Reference< lang::XMultiServiceFactory > xMSF = rInImport.getServiceFactory();
mpNumFormatter = new SvNumberFormatter( xMSF, LANGUAGE_SYSTEM );
- // #110680#
- // mpNumFmtHelper = new SvXMLNumFmtHelper( mpNumFormatter );
mpNumFmtHelper = new SvXMLNumFmtHelper( mpNumFormatter, xMSF );
}
@@ -953,39 +949,39 @@ SdXMLStylesContext::~SdXMLStylesContext()
//////////////////////////////////////////////////////////////////////////////
SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
{
SvXMLStyleContext* pContext = 0;
const SvXMLTokenMap& rTokenMap = GetSdImport().GetStylesElemTokenMap();
- switch(rTokenMap.Get(nPrefix, rLocalName))
+ switch(rTokenMap.Get(nInPrefix, rLocalName))
{
case XML_TOK_STYLES_PAGE_MASTER:
{
// style:page-master inside office:styles context
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list