[Libreoffice-commits] .: 4 commits - binfilter/bf_sw binfilter/inc hwpfilter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Mar 10 05:39:08 PST 2011
binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx | 10
binfilter/bf_sw/source/filter/lotus/makefile.mk | 2
binfilter/bf_sw/source/filter/lotus/sw_lotread.cxx | 1
binfilter/bf_sw/source/filter/xml/makefile.mk | 2
binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx | 6
binfilter/bf_sw/source/filter/xml/sw_xmlbrsh.cxx | 22
binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx | 14
binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx | 174 ++---
binfilter/bf_sw/source/filter/xml/sw_xmlfonte.cxx | 8
binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx | 58 -
binfilter/bf_sw/source/filter/xml/sw_xmlitem.cxx | 12
binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx | 66 +-
binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx | 6
binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx | 16
binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx | 300 +++++-----
binfilter/bf_sw/source/filter/xml/sw_xmltext.cxx | 14
binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx | 75 +-
binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx | 12
binfilter/inc/bf_sw/swddetbl.hxx | 4
hwpfilter/source/drawing.h | 18
20 files changed, 417 insertions(+), 403 deletions(-)
New commits:
commit b29e6744ec4b23ec039d3c534e31eb080bea4be1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 10 11:08:10 2011 +0000
throw out some warnings
diff --git a/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx b/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
index 473f617..2ae23ee 100644
--- a/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
+++ b/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
@@ -53,13 +53,15 @@ class SwApplet_Impl
SfxItemSet aItemSet;
public:
- static USHORT GetOptionType( const String& rName, BOOL bApplet ){DBG_BF_ASSERT(0, "STRIP"); return 0;}
+ static USHORT GetOptionType( const String& /*rName*/, BOOL /*bApplet*/ )
+ {DBG_BF_ASSERT(0, "STRIP"); return 0;}
SwApplet_Impl( SfxItemSet& rSet ): aItemSet ( rSet) {}
~SwApplet_Impl(){DBG_BF_ASSERT(0, "STRIP");};
- void CreateApplet( const String& rCode, const String& rName,
- BOOL bMayScript, const String& rCodeBase ){DBG_BF_ASSERT(0, "STRIP");};
- sal_Bool CreateApplet();
+ void CreateApplet( const String& /*rCode*/, const String& /*rName*/,
+ BOOL /*bMayScript*/, const String& /*rCodeBase*/ )
+ {DBG_BF_ASSERT(0, "STRIP");};
+ sal_Bool CreateApplet();
SvAppletObject* GetApplet() { return &xApplet; }
SfxItemSet& GetItemSet() { return aItemSet; }
};
diff --git a/binfilter/inc/bf_sw/swddetbl.hxx b/binfilter/inc/bf_sw/swddetbl.hxx
index e5bf78a..e77dc20 100644
--- a/binfilter/inc/bf_sw/swddetbl.hxx
+++ b/binfilter/inc/bf_sw/swddetbl.hxx
@@ -39,8 +39,8 @@ public:
TYPEINFO();
// Constructor movet alle Lines/Boxen aus der SwTable zu sich.
// Die SwTable ist danach Leer und muss geloescht werden.
- SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType,
- BOOL bUpdate = TRUE ):SwTable( rTable ){DBG_BF_ASSERT(0, "STRIP");}
+ SwDDETable( SwTable& rTable, SwDDEFieldType*,
+ BOOL =TRUE ):SwTable( rTable ){DBG_BF_ASSERT(0, "STRIP");}
SwDDEFieldType* GetDDEFldType();
inline const SwDDEFieldType* GetDDEFldType() const;
};
commit d9cc266f0d72d1bc6bfd42f34827cef31eb45a23
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 10 11:07:44 2011 +0000
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/filter/xml/makefile.mk b/binfilter/bf_sw/source/filter/xml/makefile.mk
index 9d80218..a7ead53 100644
--- a/binfilter/bf_sw/source/filter/xml/makefile.mk
+++ b/binfilter/bf_sw/source/filter/xml/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx b/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
index 8e79ebd..0270747 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
@@ -171,6 +171,7 @@ void XTextRangeOrNodeIndexPosition::SetAsNodeIndex(
SwUnoInternalPaM aPaM(*pDoc);
sal_Bool bSuccess = SwXTextRange::XTextRangeToSwPaM( aPaM, rRange);
DBG_ASSERT(bSuccess, "illegal range");
+ (void)bSuccess;
// PaM -> Index
Set(aPaM.GetPoint()->nNode);
@@ -186,6 +187,7 @@ void XTextRangeOrNodeIndexPosition::CopyPositionInto(SwPosition& rPos)
SwUnoInternalPaM aUnoPaM(*GetDoc());
sal_Bool bSuccess = SwXTextRange::XTextRangeToSwPaM(aUnoPaM, xRange);
DBG_ASSERT(bSuccess, "illegal range");
+ (void)bSuccess;
rPos = *aUnoPaM.GetPoint();
}
@@ -252,12 +254,12 @@ RedlineInfo::RedlineInfo() :
sAuthor(),
sComment(),
aDateTime(),
+ bMergeLastParagraph( sal_False ),
aAnchorStart(),
aAnchorEnd(),
pContentIndex(NULL),
pNextRedline(NULL),
- bNeedsAdjustment( sal_False ),
- bMergeLastParagraph( sal_False )
+ bNeedsAdjustment( sal_False )
{
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlbrsh.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlbrsh.cxx
index 6fd7c5e..ae68e22 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlbrsh.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlbrsh.cxx
@@ -95,13 +95,13 @@ void SwXMLBrushItemImportContext::ProcessAttrs(
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
- switch( aTokenMap.Get( nPrefix, aLocalName ) )
+ switch( aTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_BGIMG_HREF:
SvXMLImportItemMapper::PutXMLValue(
@@ -130,7 +130,7 @@ void SwXMLBrushItemImportContext::ProcessAttrs(
}
SvXMLImportContext *SwXMLBrushItemImportContext::CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
@@ -141,14 +141,14 @@ SvXMLImportContext *SwXMLBrushItemImportContext::CreateChildContext(
{
xBase64Stream = GetImport().GetStreamForGraphicObjectURLFromBase64();
if( xBase64Stream.is() )
- pContext = new XMLBase64ImportContext( GetImport(), nPrefix,
+ pContext = new XMLBase64ImportContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
xBase64Stream );
}
}
if( !pContext )
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
@@ -170,12 +170,12 @@ void SwXMLBrushItemImportContext::EndElement()
}
SwXMLBrushItemImportContext::SwXMLBrushItemImportContext(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList >& xAttrList,
const SvXMLUnitConverter& rUnitConv,
const SvxBrushItem& rItem ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
pItem( new SvxBrushItem( rItem ) )
{
// delete any grephic that is existing
@@ -185,12 +185,12 @@ SwXMLBrushItemImportContext::SwXMLBrushItemImportContext(
}
SwXMLBrushItemImportContext::SwXMLBrushItemImportContext(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
const SvXMLUnitConverter& rUnitConv,
sal_uInt16 nWhich ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
pItem( new SvxBrushItem( nWhich ) )
{
ProcessAttrs( xAttrList, rUnitConv );
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
index 3ad9235..9219561 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
@@ -229,7 +229,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
SwDoc *pDoc = pText->GetDoc();
- sal_Bool bExtended = sal_False;
+ sal_Bool bLclExtended = sal_False;
if( (getExportFlags() & (EXPORT_FONTDECLS|EXPORT_STYLES|
EXPORT_MASTERSTYLES|EXPORT_CONTENT)) != 0 )
{
@@ -267,7 +267,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
XML_NAMESPACE_UNKNOWN );
nIdx = pUnknown->GetNextNamespaceIndex( nIdx );
}
- bExtended = sal_True;
+ bLclExtended = sal_True;
}
}
}
@@ -282,7 +282,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
pTwipUnitConv->setXMLMeasureUnit( eUnit );
}
- SetExtended( bExtended );
+ SetExtended( bLclExtended );
SwDocStat aDocStat( pDoc->GetDocStat() );
if( (getExportFlags() & EXPORT_META) != 0 )
@@ -356,8 +356,8 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
if( !GetGraphicResolver().is() )
{
pGraphicResolver = SvXMLGraphicHelper::Create( GRAPHICHELPER_MODE_WRITE );
- Reference< XGraphicObjectResolver > xGraphicResolver( pGraphicResolver );
- SetGraphicResolver( xGraphicResolver );
+ Reference< XGraphicObjectResolver > xLclGraphicResolver( pGraphicResolver );
+ SetGraphicResolver( xLclGraphicResolver );
}
SvXMLEmbeddedObjectHelper *pEmbeddedResolver = 0;
@@ -369,8 +369,8 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
pEmbeddedResolver = SvXMLEmbeddedObjectHelper::Create(
*pPersist,
EMBEDDEDOBJECTHELPER_MODE_WRITE );
- Reference< XEmbeddedObjectResolver > xEmbeddedResolver( pEmbeddedResolver );
- SetEmbeddedResolver( xEmbeddedResolver );
+ Reference< XEmbeddedObjectResolver > xLclEmbeddedResolver( pEmbeddedResolver );
+ SetEmbeddedResolver( xLclEmbeddedResolver );
}
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx
index f5d8178..5beddb5 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx
@@ -168,10 +168,10 @@ inline sal_Bool SwXMLConditionParser_Impl::MatchNumber( sal_uInt32& rNumber )
SwXMLConditionParser_Impl::SwXMLConditionParser_Impl( const OUString& rInp ) :
sInput( rInp ),
- nPos( 0 ),
- nLength( rInp.getLength() ),
nCondition( 0 ),
- nSubCondition( 0 )
+ nSubCondition( 0 ),
+ nPos( 0 ),
+ nLength( rInp.getLength() )
{
OUString sFunc;
sal_Bool bHasSub = sal_False;
@@ -241,7 +241,7 @@ class SwXMLConditionContext_Impl : public SvXMLImportContext
public:
SwXMLConditionContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SwXMLConditionContext_Impl();
@@ -254,10 +254,10 @@ public:
};
SwXMLConditionContext_Impl::SwXMLConditionContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
nCondition( 0 ),
nSubCondition( 0 )
{
@@ -265,16 +265,16 @@ SwXMLConditionContext_Impl::SwXMLConditionContext_Impl(
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
// TODO: use a map here
- if( XML_NAMESPACE_STYLE == nPrefix )
+ if( XML_NAMESPACE_STYLE == nLclPrefix )
{
- if( IsXMLToken( aLocalName, XML_CONDITION ) )
+ if( IsXMLToken( aLclLocalName, XML_CONDITION ) )
{
SwXMLConditionParser_Impl aCondParser( rValue );
if( aCondParser.IsValid() )
@@ -283,7 +283,7 @@ SwXMLConditionContext_Impl::SwXMLConditionContext_Impl(
nSubCondition = aCondParser.GetSubCondition();
}
}
- else if( IsXMLToken( aLocalName, XML_APPLY_STYLE_NAME ) )
+ else if( IsXMLToken( aLclLocalName, XML_APPLY_STYLE_NAME ) )
{
sApplyStyle = rValue;
}
@@ -312,15 +312,15 @@ public:
TYPEINFO();
- SwXMLTextStyleContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
+ SwXMLTextStyleContext_Impl( SwXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- sal_uInt16 nFamily,
+ sal_uInt16 nInFamily,
SvXMLStylesContext& rStyles );
virtual ~SwXMLTextStyleContext_Impl();
virtual SvXMLImportContext *CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
@@ -355,12 +355,12 @@ Reference < XStyle > SwXMLTextStyleContext_Impl::Create()
return xNewStyle;
}
-SwXMLTextStyleContext_Impl::SwXMLTextStyleContext_Impl( SwXMLImport& rImport,
+SwXMLTextStyleContext_Impl::SwXMLTextStyleContext_Impl( SwXMLImport& rInImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- sal_uInt16 nFamily,
+ sal_uInt16 nInFamily,
SvXMLStylesContext& rStyles ) :
- XMLTextStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily ),
+ XMLTextStyleContext( rInImport, nPrfx, rLName, xAttrList, rStyles, nInFamily ),
pConditions( 0 )
{
}
@@ -380,16 +380,16 @@ SwXMLTextStyleContext_Impl::~SwXMLTextStyleContext_Impl()
}
SvXMLImportContext *SwXMLTextStyleContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLocalName, XML_MAP ) )
+ if( XML_NAMESPACE_STYLE == nInPrefix && IsXMLToken( rLocalName, XML_MAP ) )
{
SwXMLConditionContext_Impl *pCond =
- new SwXMLConditionContext_Impl( GetImport(), nPrefix,
+ new SwXMLConditionContext_Impl( GetImport(), nInPrefix,
rLocalName, xAttrList );
if( pCond->IsValid() )
{
@@ -402,7 +402,7 @@ SvXMLImportContext *SwXMLTextStyleContext_Impl::CreateChildContext(
}
if( !pContext )
- pContext = XMLTextStyleContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = XMLTextStyleContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList );
return pContext;
@@ -415,12 +415,12 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite )
if( !pConditions || XML_STYLE_FAMILY_TEXT_PARAGRAPH != GetFamily() )
return;
- Reference < XStyle > xStyle = GetStyle();
- if( !xStyle.is() )
+ Reference < XStyle > xLclStyle = GetStyle();
+ if( !xLclStyle.is() )
return;
const SwXStyle* pStyle = 0;
- Reference<XUnoTunnel> xStyleTunnel( xStyle, UNO_QUERY);
+ Reference<XUnoTunnel> xStyleTunnel( xLclStyle, UNO_QUERY);
if( xStyleTunnel.is() )
{
pStyle = (SwXStyle*)xStyleTunnel->getSomething(
@@ -473,7 +473,7 @@ class SwXMLItemSetStyleContext_Impl : public SvXMLStyleContext
sal_Bool bDataStyleIsResolved;
SvXMLImportContext *CreateItemSetContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList);
@@ -492,14 +492,14 @@ public:
TYPEINFO();
SwXMLItemSetStyleContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- sal_uInt16 nFamily);
+ sal_uInt16 nInFamily);
virtual ~SwXMLItemSetStyleContext_Impl();
virtual SvXMLImportContext *CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
@@ -548,7 +548,7 @@ void SwXMLItemSetStyleContext_Impl::SetAttribute( sal_uInt16 nPrefixKey,
}
SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateItemSetContext(
- sal_uInt16 nPrefix, const OUString& rLName,
+ sal_uInt16 nInPrefix, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
OSL_ENSURE( !pItemSet,
@@ -584,7 +584,7 @@ SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateItemSetContext(
}
if( pItemSet )
pContext = GetSwImport().CreateTableItemImportContext(
- nPrefix, rLName, xAttrList, GetFamily(),
+ nInPrefix, rLName, xAttrList, GetFamily(),
*pItemSet );
if( !pContext )
{
@@ -597,15 +597,15 @@ SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateItemSetContext(
TYPEINIT1( SwXMLItemSetStyleContext_Impl, SvXMLStyleContext );
-SwXMLItemSetStyleContext_Impl::SwXMLItemSetStyleContext_Impl( SwXMLImport& rImport,
+SwXMLItemSetStyleContext_Impl::SwXMLItemSetStyleContext_Impl( SwXMLImport& rInImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- sal_uInt16 nFamily ) :
- SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, nFamily ),
+ sal_uInt16 nInFamily ) :
+ SvXMLStyleContext( rInImport, nPrfx, rLName, xAttrList, nInFamily ),
pItemSet( 0 ),
+ sDataStyleName(),
bHasMasterPageName( sal_False ),
bPageDescConnected( sal_False ),
- sDataStyleName(),
bDataStyleIsResolved( sal_True )
{
}
@@ -616,22 +616,22 @@ SwXMLItemSetStyleContext_Impl::~SwXMLItemSetStyleContext_Impl()
}
SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix )
+ if( XML_NAMESPACE_STYLE == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_PROPERTIES ) )
{
- pContext = CreateItemSetContext( nPrefix, rLocalName, xAttrList );
+ pContext = CreateItemSetContext( nInPrefix, rLocalName, xAttrList );
}
}
if( !pContext )
- pContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = SvXMLStyleContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList );
return pContext;
@@ -748,20 +748,20 @@ class SwXMLStylesContext_Impl : public SvXMLStylesContext
protected:
- virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily,
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nInFamily,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext(
- sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInFamily, sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
// HACK
virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
- sal_uInt16 nFamily ) const;
+ sal_uInt16 nInFamily ) const;
virtual ::com::sun::star::uno::Reference <
::com::sun::star::container::XNameContainer >
- GetStylesContainer( sal_uInt16 nFamily ) const;
- virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const;
+ GetStylesContainer( sal_uInt16 nInFamily ) const;
+ virtual ::rtl::OUString GetServiceName( sal_uInt16 nInFamily ) const;
// HACK
public:
@@ -769,13 +769,13 @@ public:
TYPEINFO();
SwXMLStylesContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName ,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_Bool bAuto );
virtual ~SwXMLStylesContext_Impl();
- virtual sal_Bool InsertStyleFamily( sal_uInt16 nFamily ) const;
+ virtual sal_Bool InsertStyleFamily( sal_uInt16 nInFamily ) const;
virtual void EndElement();
};
@@ -789,33 +789,33 @@ inline SwXMLItemSetStyleContext_Impl *SwXMLStylesContext_Impl::GetSwStyle(
}
SvXMLStyleContext *SwXMLStylesContext_Impl::CreateStyleStyleChildContext(
- sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInFamily, sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLStyleContext *pStyle = 0;
- switch( nFamily )
+ switch( nInFamily )
{
case XML_STYLE_FAMILY_TEXT_PARAGRAPH:
- pStyle = new SwXMLTextStyleContext_Impl( GetSwImport(), nPrefix,
- rLocalName, xAttrList, nFamily, *this );
+ pStyle = new SwXMLTextStyleContext_Impl( GetSwImport(), nInPrefix,
+ rLocalName, xAttrList, nInFamily, *this );
break;
case XML_STYLE_FAMILY_TABLE_TABLE:
case XML_STYLE_FAMILY_TABLE_COLUMN:
case XML_STYLE_FAMILY_TABLE_ROW:
case XML_STYLE_FAMILY_TABLE_CELL:
- pStyle = new SwXMLItemSetStyleContext_Impl( GetSwImport(), nPrefix,
- rLocalName, xAttrList, nFamily );
+ pStyle = new SwXMLItemSetStyleContext_Impl( GetSwImport(), nInPrefix,
+ rLocalName, xAttrList, nInFamily );
break;
case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
// As long as there are no element items, we can use the text
// style class.
- pStyle = new XMLTextShapeStyleContext( GetImport(), nPrefix,
- rLocalName, xAttrList, *this, nFamily );
+ pStyle = new XMLTextShapeStyleContext( GetImport(), nInPrefix,
+ rLocalName, xAttrList, *this, nInFamily );
break;
default:
- pStyle = SvXMLStylesContext::CreateStyleStyleChildContext( nFamily,
- nPrefix,
+ pStyle = SvXMLStylesContext::CreateStyleStyleChildContext( nInFamily,
+ nInPrefix,
rLocalName,
xAttrList );
break;
@@ -825,26 +825,26 @@ SvXMLStyleContext *SwXMLStylesContext_Impl::CreateStyleStyleChildContext(
}
SvXMLStyleContext *SwXMLStylesContext_Impl::CreateDefaultStyleStyleChildContext(
- sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInFamily, sal_uInt16 nInPrefix, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLStyleContext *pStyle = 0;
- switch( nFamily )
+ switch( nInFamily )
{
case XML_STYLE_FAMILY_TEXT_PARAGRAPH:
- pStyle = new XMLTextStyleContext( GetImport(), nPrefix, rLocalName,
- xAttrList, *this, nFamily,
+ pStyle = new XMLTextStyleContext( GetImport(), nInPrefix, rLocalName,
+ xAttrList, *this, nInFamily,
sal_True );
break;
case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
// There are no writer specific defaults for graphic styles!
- pStyle = new XMLGraphicsDefaultStyle( GetImport(), nPrefix,
+ pStyle = new XMLGraphicsDefaultStyle( GetImport(), nInPrefix,
rLocalName, xAttrList, *this );
break;
default:
- pStyle = SvXMLStylesContext::CreateDefaultStyleStyleChildContext( nFamily,
- nPrefix,
+ pStyle = SvXMLStylesContext::CreateDefaultStyleStyleChildContext( nInFamily,
+ nInPrefix,
rLocalName,
xAttrList );
break;
@@ -855,10 +855,10 @@ SvXMLStyleContext *SwXMLStylesContext_Impl::CreateDefaultStyleStyleChildContext(
SwXMLStylesContext_Impl::SwXMLStylesContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_Bool bAuto ) :
- SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ),
+ SvXMLStylesContext( rInImport, nPrfx, rLName, xAttrList ),
bAutoStyles( bAuto )
{
}
@@ -867,13 +867,13 @@ SwXMLStylesContext_Impl::~SwXMLStylesContext_Impl()
{
}
-sal_Bool SwXMLStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const
+sal_Bool SwXMLStylesContext_Impl::InsertStyleFamily( sal_uInt16 nInFamily ) const
{
const SwXMLImport& rSwImport = GetSwImport();
sal_uInt16 nStyleFamilyMask = rSwImport.GetStyleFamilyMask();
sal_Bool bIns = sal_True;
- switch( nFamily )
+ switch( nInFamily )
{
case XML_STYLE_FAMILY_TEXT_PARAGRAPH:
bIns = (nStyleFamilyMask & SFX_STYLE_FAMILY_PARA) != 0;
@@ -896,7 +896,7 @@ sal_Bool SwXMLStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const
rSwImport.IsBlockMode());
break;
default:
- bIns = SvXMLStylesContext::InsertStyleFamily( nFamily );
+ bIns = SvXMLStylesContext::InsertStyleFamily( nInFamily );
break;
}
@@ -904,37 +904,37 @@ sal_Bool SwXMLStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const
}
UniReference < SvXMLImportPropertyMapper > SwXMLStylesContext_Impl::GetImportPropertyMapper(
- sal_uInt16 nFamily ) const
+ sal_uInt16 nInFamily ) const
{
UniReference < SvXMLImportPropertyMapper > xMapper;
-// if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily )
+// if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nInFamily )
// xMapper = ((SvXMLImport *)&GetImport())->GetTextImport()
// ->GetFrameImportPropertySetMapper();
// else
- xMapper = SvXMLStylesContext::GetImportPropertyMapper( nFamily );
+ xMapper = SvXMLStylesContext::GetImportPropertyMapper( nInFamily );
return xMapper;
}
Reference < XNameContainer > SwXMLStylesContext_Impl::GetStylesContainer(
- sal_uInt16 nFamily ) const
+ sal_uInt16 nInFamily ) const
{
Reference < XNameContainer > xStyles;
- if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily )
+ if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nInFamily )
xStyles = ((SvXMLImport *)&GetImport())->GetTextImport()->GetFrameStyles();
else
- xStyles = SvXMLStylesContext::GetStylesContainer( nFamily );
+ xStyles = SvXMLStylesContext::GetStylesContainer( nInFamily );
return xStyles;
}
-OUString SwXMLStylesContext_Impl::GetServiceName( sal_uInt16 nFamily ) const
+OUString SwXMLStylesContext_Impl::GetServiceName( sal_uInt16 nInFamily ) const
{
String sServiceName;
- if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily )
+ if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nInFamily )
sServiceName = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.FrameStyle") );
else
- sServiceName = SvXMLStylesContext::GetServiceName( nFamily );
+ sServiceName = SvXMLStylesContext::GetServiceName( nInFamily );
return sServiceName;
}
@@ -949,7 +949,7 @@ void SwXMLStylesContext_Impl::EndElement()
class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext
{
protected:
- virtual sal_Bool InsertStyleFamily( sal_uInt16 nFamily ) const;
+ virtual sal_Bool InsertStyleFamily( sal_uInt16 nInFamily ) const;
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
const SwXMLImport& GetSwImport() const
@@ -960,7 +960,7 @@ public:
TYPEINFO();
SwXMLMasterStylesContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName ,
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SwXMLMasterStylesContext_Impl();
@@ -970,10 +970,10 @@ public:
TYPEINIT1( SwXMLMasterStylesContext_Impl, XMLTextMasterStylesContext );
SwXMLMasterStylesContext_Impl::SwXMLMasterStylesContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName ,
const Reference< xml::sax::XAttributeList > & xAttrList ) :
- XMLTextMasterStylesContext( rImport, nPrfx, rLName, xAttrList )
+ XMLTextMasterStylesContext( rInImport, nPrfx, rLName, xAttrList )
{
}
@@ -981,16 +981,16 @@ SwXMLMasterStylesContext_Impl::~SwXMLMasterStylesContext_Impl()
{
}
-sal_Bool SwXMLMasterStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const
+sal_Bool SwXMLMasterStylesContext_Impl::InsertStyleFamily( sal_uInt16 nInFamily ) const
{
sal_Bool bIns;
const SwXMLImport& rSwImport = GetSwImport();
sal_uInt16 nStyleFamilyMask = rSwImport.GetStyleFamilyMask();
- if( XML_STYLE_FAMILY_MASTER_PAGE == nFamily )
+ if( XML_STYLE_FAMILY_MASTER_PAGE == nInFamily )
bIns = (nStyleFamilyMask & SFX_STYLE_FAMILY_PAGE) != 0;
else
- bIns = XMLTextMasterStylesContext::InsertStyleFamily( nFamily );
+ bIns = XMLTextMasterStylesContext::InsertStyleFamily( nInFamily );
return bIns;
}
@@ -1091,7 +1091,7 @@ void SwXMLImport::UpdateTxtCollConditions( SwDoc *pDoc )
}
sal_Bool SwXMLImport::FindAutomaticStyle(
- sal_uInt16 nFamily,
+ sal_uInt16 nInFamily,
const OUString& rName,
const SfxItemSet **ppItemSet,
OUString *pParent ) const
@@ -1101,7 +1101,7 @@ sal_Bool SwXMLImport::FindAutomaticStyle(
{
pStyle = PTR_CAST( SwXMLItemSetStyleContext_Impl,
GetAutoStyles()->
- FindStyleChildContext( nFamily, rName,
+ FindStyleChildContext( nInFamily, rName,
sal_True ) );
if( pStyle )
{
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlfonte.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlfonte.cxx
index 5f61b91..e1054dd 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlfonte.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlfonte.cxx
@@ -60,18 +60,18 @@ class SwXMLFontAutoStylePool_Impl: public XMLFontAutoStylePool
{
public:
- SwXMLFontAutoStylePool_Impl( SwXMLExport& rExport );
+ SwXMLFontAutoStylePool_Impl( SwXMLExport& rInExport );
};
SwXMLFontAutoStylePool_Impl::SwXMLFontAutoStylePool_Impl(
- SwXMLExport& rExport ) :
- XMLFontAutoStylePool( rExport )
+ SwXMLExport& rInExport ) :
+ XMLFontAutoStylePool( rInExport )
{
sal_uInt16 aWhichIds[3] = { RES_CHRATR_FONT, RES_CHRATR_CJK_FONT,
RES_CHRATR_CTL_FONT };
- Reference < XTextDocument > xTextDoc( rExport.GetModel(), UNO_QUERY );
+ Reference < XTextDocument > xTextDoc( rInExport.GetModel(), UNO_QUERY );
Reference < XText > xText = xTextDoc->getText();
Reference<XUnoTunnel> xTextTunnel( xText, UNO_QUERY);
OSL_ENSURE( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
index 011fafe..84e27c6 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
@@ -142,20 +142,20 @@ class SwXMLDocContext_Impl : public SvXMLImportContext
public:
- SwXMLDocContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
+ SwXMLDocContext_Impl( SwXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SwXMLDocContext_Impl();
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
};
-SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport,
+SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rInImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
// process document class
// global-text is handled via document shell;
@@ -164,11 +164,11 @@ SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport,
for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++)
{
OUString sLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().
GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
&sLocalName );
- if ( (XML_NAMESPACE_OFFICE == nPrefix) &&
+ if ( (XML_NAMESPACE_OFFICE == nLclPrefix) &&
IsXMLToken( sLocalName, XML_CLASS ) )
{
if ( IsXMLToken( xAttrList->getValueByIndex(nAttr), XML_LABEL ) )
@@ -198,14 +198,14 @@ SwXMLDocContext_Impl::~SwXMLDocContext_Impl()
}
SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
const SvXMLTokenMap& rTokenMap = GetSwImport().GetDocElemTokenMap();
- switch( rTokenMap.Get( nPrefix, rLocalName ) )
+ switch( rTokenMap.Get( nInPrefix, rLocalName ) )
{
case XML_TOK_DOC_FONTDECLS:
pContext = GetSwImport().CreateFontDeclsContext( rLocalName,
@@ -243,12 +243,12 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
pContext = GetSwImport().CreateBodyContext( rLocalName );
break;
case XML_TOK_DOC_SETTINGS:
- pContext = new XMLDocumentSettingsContext ( GetImport(), nPrefix, rLocalName, xAttrList );
+ pContext = new XMLDocumentSettingsContext ( GetImport(), nInPrefix, rLocalName, xAttrList );
break;
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
@@ -265,22 +265,22 @@ const SvXMLTokenMap& SwXMLImport::GetDocElemTokenMap()
}
SvXMLImportContext *SwXMLImport::CreateContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const 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_SETTINGS ) ||
IsXMLToken( rLocalName, XML_DOCUMENT_STYLES ) ||
IsXMLToken( rLocalName, XML_DOCUMENT_CONTENT ) ))
- pContext = new SwXMLDocContext_Impl( *this, nPrefix, rLocalName,
+ pContext = new SwXMLDocContext_Impl( *this, nInPrefix, rLocalName,
xAttrList );
else
- pContext = SvXMLImport::CreateContext( nPrefix, rLocalName, xAttrList );
+ pContext = SvXMLImport::CreateContext( nInPrefix, rLocalName, xAttrList );
return pContext;
}
@@ -290,20 +290,20 @@ SwXMLImport::SwXMLImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
sal_uInt16 nImportFlags)
: SvXMLImport( xServiceFactory, nImportFlags ),
- bLoadDoc( sal_True ),
- bInsert( sal_False ),
- bBlock( sal_False ),
- bOrganizerMode( sal_False ),
- nStyleFamilyMask( SFX_STYLE_FAMILY_ALL ),
+ pSttNdIdx( 0 ),
+ pTableItemMapper( 0 ),
pDocElemTokenMap( 0 ),
pTableElemTokenMap( 0 ),
pTableCellAttrTokenMap( 0 ),
- pTableItemMapper( 0 ),
- pSttNdIdx( 0 ),
- bShowProgress( sal_True ),
- bPreserveRedlineMode( sal_True ),
pGraphicResolver( 0 ),
- pEmbeddedResolver( 0 )
+ pEmbeddedResolver( 0 ),
+ nStyleFamilyMask( SFX_STYLE_FAMILY_ALL ),
+ bLoadDoc( sal_True ),
+ bInsert( sal_False ),
+ bBlock( sal_False ),
+ bShowProgress( sal_True ),
+ bOrganizerMode( sal_False ),
+ bPreserveRedlineMode( sal_True )
{
_InitItemImport();
@@ -516,8 +516,8 @@ void SwXMLImport::startDocument( void )
if( !GetGraphicResolver().is() )
{
pGraphicResolver = SvXMLGraphicHelper::Create( GRAPHICHELPER_MODE_READ );
- Reference< document::XGraphicObjectResolver > xGraphicResolver( pGraphicResolver );
- SetGraphicResolver( xGraphicResolver );
+ Reference< document::XGraphicObjectResolver > xLclGraphicResolver( pGraphicResolver );
+ SetGraphicResolver( xLclGraphicResolver );
}
if( !GetEmbeddedResolver().is() )
@@ -528,8 +528,8 @@ void SwXMLImport::startDocument( void )
pEmbeddedResolver = SvXMLEmbeddedObjectHelper::Create(
*pPersist,
EMBEDDEDOBJECTHELPER_MODE_READ );
- Reference< document::XEmbeddedObjectResolver > xEmbeddedResolver( pEmbeddedResolver );
- SetEmbeddedResolver( xEmbeddedResolver );
+ Reference< document::XEmbeddedObjectResolver > xLclEmbeddedResolver( pEmbeddedResolver );
+ SetEmbeddedResolver( xLclEmbeddedResolver );
}
}
}
@@ -815,7 +815,7 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps)
sal_Int32 nCount = aViewProps.getLength();
const PropertyValue *pValue = aViewProps.getConstArray();
- long nTmp;
+ long nTmp(0);
sal_Bool bShowRedlineChanges = sal_False, bBrowseMode = sal_False,
bShowFooter = sal_False, bShowHeader = sal_False;
sal_Bool bChangeShowRedline = sal_False, bChangeBrowseMode = sal_False,
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlitem.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlitem.cxx
index 7c72115..1473ac6 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlitem.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlitem.cxx
@@ -57,21 +57,21 @@ SvXMLItemSetContext::~SvXMLItemSetContext()
{
}
-SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
SvXMLItemMapEntriesRef xMapEntries = rIMapper.getMapEntries();
- SvXMLItemMapEntry* pEntry = xMapEntries->getByName( nPrefix, rLocalName );
+ SvXMLItemMapEntry* pEntry = xMapEntries->getByName( nInPrefix, rLocalName );
if( pEntry && 0 != (pEntry->nMemberId & MID_FLAG_ELEMENT_ITEM_IMPORT) )
{
- return CreateChildContext( nPrefix, rLocalName, xAttrList,
+ return CreateChildContext( nInPrefix, rLocalName, xAttrList,
rItemSet, *pEntry, rUnitConv );
}
else
{
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
}
@@ -79,14 +79,14 @@ SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( USHORT nPrefix,
CreateChildContext if the element matches an entry in the
SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT
*/
-SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/,
SfxItemSet& /*rItemSet*/,
const SvXMLItemMapEntry& /*rEntry*/,
const SvXMLUnitConverter& /*rUnitConv*/ )
{
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx
index 794c8b6..637b617 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlitemi.cxx
@@ -85,7 +85,7 @@ public:
SfxPoolItem& rItem,
SfxItemSet& rSet,
const OUString& rValue,
- const SvXMLUnitConverter& rUnitConverter,
+ const SvXMLUnitConverter& rInUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap ) const;
virtual void finished( SfxItemSet& rSet ) const;
};
@@ -103,9 +103,9 @@ SwXMLImportTableItemMapper_Impl::~SwXMLImportTableItemMapper_Impl()
sal_Bool SwXMLImportTableItemMapper_Impl::handleSpecialItem(
const SvXMLItemMapEntry& rEntry,
SfxPoolItem& rItem,
- SfxItemSet& rItemSet,
+ SfxItemSet& rInItemSet,
const OUString& rValue,
- const SvXMLUnitConverter& rUnitConv,
+ const SvXMLUnitConverter& rInUnitConv,
const SvXMLNamespaceMap& ) const
{
sal_Bool bRet = sal_False;
@@ -118,10 +118,10 @@ sal_Bool SwXMLImportTableItemMapper_Impl::handleSpecialItem(
case MID_FRMSIZE_COL_WIDTH:
// If the item is existing already, a relative value has been set
// already that must be preserved.
- if( SFX_ITEM_SET != rItemSet.GetItemState( RES_FRM_SIZE,
+ if( SFX_ITEM_SET != rInItemSet.GetItemState( RES_FRM_SIZE,
sal_False ) )
bRet = SvXMLImportItemMapper::PutXMLValue(
- rItem, rValue, nMemberId, rUnitConv );
+ rItem, rValue, nMemberId, rInUnitConv );
break;
}
}
@@ -138,31 +138,31 @@ class SwXMLItemSetContext_Impl : public SvXMLItemSetContext
SvXMLImportContextRef xBackground;
public:
- SwXMLItemSetContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
+ SwXMLItemSetContext_Impl( SwXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- SfxItemSet& rItemSet,
- const SvXMLImportItemMapper& rIMapper,
- const SvXMLUnitConverter& rUnitConv );
+ SfxItemSet& rInItemSet,
+ const SvXMLImportItemMapper& rInIMapper,
+ const SvXMLUnitConverter& rInUnitConv );
virtual ~SwXMLItemSetContext_Impl();
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- SfxItemSet& rItemSet,
+ SfxItemSet& rInItemSet,
const SvXMLItemMapEntry& rEntry,
- const SvXMLUnitConverter& rUnitConv );
+ const SvXMLUnitConverter& rInUnitConv );
};
SwXMLItemSetContext_Impl::SwXMLItemSetContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- SfxItemSet& rItemSet,
- const SvXMLImportItemMapper& rIMapper,
- const SvXMLUnitConverter& rUnitConv ) :
- SvXMLItemSetContext( rImport, nPrfx, rLName, xAttrList,
- rItemSet, rIMapper, rUnitConv )
+ SfxItemSet& rInItemSet,
+ const SvXMLImportItemMapper& rInIMapper,
+ const SvXMLUnitConverter& rInUnitConv ) :
+ SvXMLItemSetContext( rInImport, nPrfx, rLName, xAttrList,
+ rInItemSet, rInIMapper, rInUnitConv )
{
}
@@ -177,12 +177,12 @@ SwXMLItemSetContext_Impl::~SwXMLItemSetContext_Impl()
}
SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- SfxItemSet& rItemSet,
+ SfxItemSet& rInItemSet,
const SvXMLItemMapEntry& rEntry,
- const SvXMLUnitConverter& rUnitConv )
+ const SvXMLUnitConverter& rInUnitConv )
{
SvXMLImportContext *pContext = 0;
@@ -191,18 +191,18 @@ SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext(
case RES_BACKGROUND:
{
const SfxPoolItem *pItem;
- if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND,
+ if( SFX_ITEM_SET == rInItemSet.GetItemState( RES_BACKGROUND,
sal_False, &pItem ) )
{
pContext = new SwXMLBrushItemImportContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
- rUnitConv, *(const SvxBrushItem *)pItem );
+ GetImport(), nInPrefix, rLocalName, xAttrList,
+ rInUnitConv, *(const SvxBrushItem *)pItem );
}
else
{
pContext = new SwXMLBrushItemImportContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
- rUnitConv, RES_BACKGROUND );
+ GetImport(), nInPrefix, rLocalName, xAttrList,
+ rInUnitConv, RES_BACKGROUND );
}
xBackground = pContext;
}
@@ -210,9 +210,9 @@ SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext(
}
if( !pContext )
- pContext = SvXMLItemSetContext::CreateChildContext( nPrefix, rLocalName,
- xAttrList, rItemSet,
- rEntry, rUnitConv );
+ pContext = SvXMLItemSetContext::CreateChildContext( nInPrefix, rLocalName,
+ xAttrList, rInItemSet,
+ rEntry, rInUnitConv );
return pContext;
}
@@ -239,11 +239,11 @@ void SwXMLImport::_FinitItemImport()
}
SvXMLImportContext *SwXMLImport::CreateTableItemImportContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nFamily,
- SfxItemSet& rItemSet )
+ SfxItemSet& rInItemSet )
{
SvXMLItemMapEntriesRef xItemMap;
@@ -265,8 +265,8 @@ SvXMLImportContext *SwXMLImport::CreateTableItemImportContext(
pTableItemMapper->setMapEntries( xItemMap );
- return new SwXMLItemSetContext_Impl( *this, nPrefix, rLocalName,
- xAttrList, rItemSet,
+ return new SwXMLItemSetContext_Impl( *this, nInPrefix, rLocalName,
+ xAttrList, rInItemSet,
GetTableItemMapper(),
GetTwipUnitConverter() );
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx
index f6fd430..7b4c8fb 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx
@@ -351,6 +351,9 @@ void lcl_frmitems_MergeXMLHoriPos( SvxGraphicPosition& ePos,
case GPOS_RB:
ePos = GPOS_LM==eHori ? GPOS_LB : (GPOS_MM==eHori ? GPOS_MB : GPOS_RB);
break;
+
+ default:
+ break;
}
}
@@ -380,6 +383,9 @@ void lcl_frmitems_MergeXMLVertPos( SvxGraphicPosition& ePos,
case GPOS_RB:
ePos = GPOS_MT==eVert ? GPOS_RT : (GPOS_MM==eVert ? GPOS_RM : GPOS_RB);
break;
+
+ default:
+ break;
}
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx
index e527c5f..fae3e11 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx
@@ -560,7 +560,7 @@ void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol )
}
{
- SvXMLElementExport aElem( *this, XML_NAMESPACE_STYLE,
+ SvXMLElementExport aLclElem( *this, XML_NAMESPACE_STYLE,
XML_PROPERTIES, sal_True, sal_True );
}
}
@@ -686,10 +686,10 @@ void SwXMLExport::ExportTableLinesAutoStyles(
const SwStartNode *pBoxSttNd = pBox->GetSttNd();
if( pBoxSttNd )
{
- SwFrmFmt *pFrmFmt = pBox->GetFrmFmt();
- if( rExpCells.AddCell( *pFrmFmt, rNamePrefix, nOldCol, nLine,
+ SwFrmFmt *pLclFrmFmt = pBox->GetFrmFmt();
+ if( rExpCells.AddCell( *pLclFrmFmt, rNamePrefix, nOldCol, nLine,
bTop) )
- ExportFmt( *pFrmFmt, XML_TABLE_CELL );
+ ExportFmt( *pLclFrmFmt, XML_TABLE_CELL );
Reference < XCell > xCell = SwXCell::CreateXCell(
(SwFrmFmt *)rTblInfo.GetTblFmt(),
@@ -897,7 +897,7 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox, sal_uInt16 nColSpan,
SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE,
XML_TABLE_CELL, sal_True, sal_True );
{
- SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE,
+ SvXMLElementExport aLclElem( *this, XML_NAMESPACE_TABLE,
XML_SUB_TABLE, sal_True, sal_True );
ExportTableLines( rBox.GetTabLines(), rTblInfo );
}
@@ -945,7 +945,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
ExportTableBox( *pBox, nColSpan, rTblInfo );
for( sal_uInt16 i=nOldCol; i<nCol; i++ )
{
- SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE,
+ SvXMLElementExport aLclElem( *this, XML_NAMESPACE_TABLE,
XML_COVERED_TABLE_CELL, sal_True,
sal_False );
}
@@ -1134,10 +1134,10 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd )
void SwXMLTextParagraphExport::exportTable(
const Reference < XTextContent > & rTextContent,
- sal_Bool bAutoStyles, sal_Bool bProgress )
+ sal_Bool bAutoStyles, sal_Bool bInProgress )
{
sal_Bool bOldShowProgress = ((SwXMLExport&)GetExport()).IsShowProgress();
- ((SwXMLExport&)GetExport()).SetShowProgress( bProgress );
+ ((SwXMLExport&)GetExport()).SetShowProgress( bInProgress );
Reference < XTextTable > xTxtTbl( rTextContent, UNO_QUERY );
DBG_ASSERT( xTxtTbl.is(), "text table missing" );
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
index 156dd42..05f6db4 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
@@ -206,9 +206,9 @@ class SwXMLTableCell_Impl
public:
SwXMLTableCell_Impl( sal_uInt32 nRSpan=1UL, sal_uInt32 nCSpan=1UL ) :
+ pStartNode( 0 ),
nRowSpan( nRSpan ),
nColSpan( nCSpan ),
- pStartNode( 0 ),
bProtected( sal_False )
{}
@@ -407,14 +407,14 @@ class SwXMLTableCellContext_Impl : public SvXMLImportContext
public:
SwXMLTableCellContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable );
virtual ~SwXMLTableCellContext_Impl();
virtual SvXMLImportContext *CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual void EndElement();
@@ -422,34 +422,34 @@ public:
};
SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
+ sFormula(),
xMyTable( pTable ),
+ fValue( 0.0 ),
+ bHasValue( sal_False ),
+ bProtect( sal_False ),
nRowSpan( 1UL ),
nColSpan( 1UL ),
nColRepeat( 1UL ),
bHasTextContent( sal_False ),
- bHasTableContent( sal_False ),
- sFormula(),
- fValue( 0.0 ),
- bHasValue( sal_False ),
- bProtect( sal_False )
+ bHasTableContent( sal_False )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
const SvXMLTokenMap& rTokenMap =
GetSwImport().GetTableCellAttrTokenMap();
- switch( rTokenMap.Get( nPrefix, aLocalName ) )
+ switch( rTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_TABLE_STYLE_NAME:
aStyleName = rValue;
@@ -558,19 +558,19 @@ inline void SwXMLTableCellContext_Impl::InsertContent(
}
SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_TABLE == nPrefix &&
+ if( XML_NAMESPACE_TABLE == nInPrefix &&
IsXMLToken( rLocalName, XML_SUB_TABLE ) )
{
if( !HasContent() )
{
SwXMLTableContext *pTblContext =
- new SwXMLTableContext( GetSwImport(), nPrefix, rLocalName,
+ new SwXMLTableContext( GetSwImport(), nInPrefix, rLocalName,
xAttrList, GetTable() );
pContext = pTblContext;
if( GetTable()->IsValid() )
@@ -582,12 +582,12 @@ SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext(
if( GetTable()->IsValid() )
InsertContentIfNotThere();
pContext = GetImport().GetTextImport()->CreateTextChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
+ GetImport(), nInPrefix, rLocalName, xAttrList,
XML_TEXT_TYPE_CELL );
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -662,7 +662,7 @@ class SwXMLTableColContext_Impl : public SvXMLImportContext
public:
SwXMLTableColContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable );
@@ -672,10 +672,10 @@ public:
};
SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
xMyTable( pTable )
{
sal_uInt32 nColRep = 1UL;
@@ -686,18 +686,18 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
- if( XML_NAMESPACE_TABLE == nPrefix )
+ if( XML_NAMESPACE_TABLE == nLclPrefix )
{
- if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ if( IsXMLToken( aLclLocalName, XML_STYLE_NAME ) )
aStyleName = rValue;
- else if( IsXMLToken( aLocalName, XML_NUMBER_COLUMNS_REPEATED ) )
+ else if( IsXMLToken( aLclLocalName, XML_NUMBER_COLUMNS_REPEATED ) )
nColRep = (sal_uInt32)rValue.toInt32();
- else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) )
+ else if( IsXMLToken( aLclLocalName, XML_DEFAULT_CELL_STYLE_NAME ) )
aDfltCellStyleName = rValue;
}
}
@@ -742,7 +742,7 @@ class SwXMLTableColsContext_Impl : public SvXMLImportContext
public:
SwXMLTableColsContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable,
@@ -751,17 +751,17 @@ public:
virtual ~SwXMLTableColsContext_Impl();
virtual SvXMLImportContext *CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
};
SwXMLTableColsContext_Impl::SwXMLTableColsContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & /*xAttrList*/,
SwXMLTableContext *pTable, sal_Bool bHead ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
xMyTable( pTable ),
bHeader( bHead )
{
@@ -772,21 +772,21 @@ SwXMLTableColsContext_Impl::~SwXMLTableColsContext_Impl()
}
SvXMLImportContext *SwXMLTableColsContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_TABLE == nPrefix &&
+ if( XML_NAMESPACE_TABLE == nInPrefix &&
IsXMLToken( rLocalName, XML_TABLE_COLUMN ) &&
GetTable()->IsInsertColPossible() )
- pContext = new SwXMLTableColContext_Impl( GetSwImport(), nPrefix,
+ pContext = new SwXMLTableColContext_Impl( GetSwImport(), nInPrefix,
rLocalName, xAttrList,
GetTable() );
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -802,13 +802,13 @@ class SwXMLTableRowContext_Impl : public SvXMLImportContext
public:
SwXMLTableRowContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
+ SwXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable, sal_Bool bInHead=sal_False );
virtual ~SwXMLTableRowContext_Impl();
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
@@ -817,13 +817,13 @@ public:
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
};
-SwXMLTableRowContext_Impl::SwXMLTableRowContext_Impl( SwXMLImport& rImport,
+SwXMLTableRowContext_Impl::SwXMLTableRowContext_Impl( SwXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable,
sal_Bool bInHead ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
xMyTable( pTable ),
nRowRepeat( 1 )
{
@@ -834,24 +834,24 @@ SwXMLTableRowContext_Impl::SwXMLTableRowContext_Impl( SwXMLImport& rImport,
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
- if( XML_NAMESPACE_TABLE == nPrefix )
+ if( XML_NAMESPACE_TABLE == nLclPrefix )
{
- if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ if( IsXMLToken( aLclLocalName, XML_STYLE_NAME ) )
{
aStyleName = rValue;
}
- else if( IsXMLToken( aLocalName, XML_NUMBER_ROWS_REPEATED ) )
+ else if( IsXMLToken( aLclLocalName, XML_NUMBER_ROWS_REPEATED ) )
{
nRowRepeat = (sal_uInt32)rValue.toInt32();
if( nRowRepeat < 1UL )
nRowRepeat = 1UL;
}
- else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) )
+ else if( IsXMLToken( aLclLocalName, XML_DEFAULT_CELL_STYLE_NAME ) )
{
aDfltCellStyleName = rValue;
}
@@ -877,29 +877,29 @@ SwXMLTableRowContext_Impl::~SwXMLTableRowContext_Impl()
}
SvXMLImportContext *SwXMLTableRowContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_TABLE == nPrefix )
+ if( XML_NAMESPACE_TABLE == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_TABLE_CELL ) )
{
if( !GetTable()->IsValid() || GetTable()->IsInsertCellPossible() )
pContext = new SwXMLTableCellContext_Impl( GetSwImport(),
- nPrefix,
+ nInPrefix,
rLocalName,
xAttrList,
GetTable() );
}
else if( IsXMLToken( rLocalName, XML_COVERED_TABLE_CELL ) )
- pContext = new SvXMLImportContext( GetImport(), nPrefix,
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix,
rLocalName );
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -915,7 +915,7 @@ class SwXMLTableRowsContext_Impl : public SvXMLImportContext
public:
- SwXMLTableRowsContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
+ SwXMLTableRowsContext_Impl( SwXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable,
@@ -923,20 +923,20 @@ public:
virtual ~SwXMLTableRowsContext_Impl();
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
};
-SwXMLTableRowsContext_Impl::SwXMLTableRowsContext_Impl( SwXMLImport& rImport,
+SwXMLTableRowsContext_Impl::SwXMLTableRowsContext_Impl( SwXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & /*xAttrList*/,
SwXMLTableContext *pTable,
sal_Bool bHead ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
xMyTable( pTable ),
bHeader( bHead )
{
@@ -947,22 +947,22 @@ SwXMLTableRowsContext_Impl::~SwXMLTableRowsContext_Impl()
}
SvXMLImportContext *SwXMLTableRowsContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_TABLE == nPrefix &&
+ if( XML_NAMESPACE_TABLE == nInPrefix &&
IsXMLToken( rLocalName, XML_TABLE_ROW ) &&
GetTable()->IsInsertRowPossible() )
- pContext = new SwXMLTableRowContext_Impl( GetSwImport(), nPrefix,
+ pContext = new SwXMLTableRowContext_Impl( GetSwImport(), nInPrefix,
rLocalName, xAttrList,
GetTable(),
bHeader );
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -981,7 +981,7 @@ public:
TYPEINFO();
SwXMLDDETableContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName);
+ SwXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLName);
~SwXMLDDETableContext_Impl();
@@ -998,8 +998,8 @@ public:
TYPEINIT1( SwXMLDDETableContext_Impl, SvXMLImportContext );
SwXMLDDETableContext_Impl::SwXMLDDETableContext_Impl(
- SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName) :
- SvXMLImportContext(rImport, nPrfx, rLName),
+ SwXMLImport& rInImport, sal_uInt16 nPrfx, const OUString& rLName) :
+ SvXMLImportContext(rInImport, nPrfx, rLName),
sConnectionName(),
sDDEApplication(),
sDDEItem(),
@@ -1020,31 +1020,31 @@ void SwXMLDDETableContext_Impl::StartElement(
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
- if (XML_NAMESPACE_OFFICE == nPrefix)
+ if (XML_NAMESPACE_OFFICE == nLclPrefix)
{
- if ( IsXMLToken( aLocalName, XML_DDE_APPLICATION ) )
+ if ( IsXMLToken( aLclLocalName, XML_DDE_APPLICATION ) )
{
sDDEApplication = rValue;
}
- else if ( IsXMLToken( aLocalName, XML_DDE_TOPIC ) )
+ else if ( IsXMLToken( aLclLocalName, XML_DDE_TOPIC ) )
{
sDDETopic = rValue;
}
- else if ( IsXMLToken( aLocalName, XML_DDE_ITEM ) )
+ else if ( IsXMLToken( aLclLocalName, XML_DDE_ITEM ) )
{
sDDEItem = rValue;
}
- else if ( IsXMLToken( aLocalName, XML_NAME ) )
+ else if ( IsXMLToken( aLclLocalName, XML_NAME ) )
{
sConnectionName = rValue;
}
- else if ( IsXMLToken( aLocalName, XML_AUTOMATIC_UPDATE ) )
+ else if ( IsXMLToken( aLclLocalName, XML_AUTOMATIC_UPDATE ) )
{
sal_Bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
@@ -1196,26 +1196,26 @@ SwXMLTableCell_Impl *SwXMLTableContext::GetCell( sal_uInt32 nRow,
TYPEINIT1( SwXMLTableContext, XMLTextTableContext );
-SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
+SwXMLTableContext::SwXMLTableContext( SwXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList ) :
- XMLTextTableContext( rImport, nPrfx, rLName ),
- pRows( new SwXMLTableRows_Impl ),
+ XMLTextTableContext( rInImport, nPrfx, rLName ),
pColumnDefaultCellStyleNames( 0 ),
+ pRows( new SwXMLTableRows_Impl ),
pTableNode( 0 ),
pBox1( 0 ),
pSttNd1( 0 ),
pBoxFmt( 0 ),
pLineFmt( 0 ),
- nCurRow( 0UL ),
- nCurCol( 0UL ),
- nWidth( 0UL ),
+ pSharedBoxFormats(NULL),
+ pDDESource(NULL),
bFirstSection( sal_True ),
bRelWidth( sal_True ),
bHasHeading( sal_False ),
- pDDESource(NULL),
- pSharedBoxFormats(NULL)
+ nCurRow( 0UL ),
+ nCurCol( 0UL ),
+ nWidth( 0UL )
{
OUString aName;
@@ -1227,23 +1227,23 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
- if( XML_NAMESPACE_TABLE == nPrefix )
+ if( XML_NAMESPACE_TABLE == nLclPrefix )
{
- if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ if( IsXMLToken( aLclLocalName, XML_STYLE_NAME ) )
aStyleName = rValue;
- else if( IsXMLToken( aLocalName, XML_NAME ) )
+ else if( IsXMLToken( aLclLocalName, XML_NAME ) )
aName = rValue;
- else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) )
+ else if( IsXMLToken( aLclLocalName, XML_DEFAULT_CELL_STYLE_NAME ) )
aDfltCellStyleName = rValue;
}
}
- SwXMLImport& rSwImport = GetSwImport();
+ /*SwXMLImport& rSwImport =*/ GetSwImport();
Reference<XUnoTunnel> xCrsrTunnel( GetImport().GetTextImport()->GetCursor(),
UNO_QUERY);
OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
@@ -1334,28 +1334,28 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
}
}
-SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
+SwXMLTableContext::SwXMLTableContext( SwXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & /*xAttrList*/,
SwXMLTableContext *pTable ) :
- XMLTextTableContext( rImport, nPrfx, rLName ),
- xParentTable( pTable ),
- pRows( new SwXMLTableRows_Impl ),
+ XMLTextTableContext( rInImport, nPrfx, rLName ),
pColumnDefaultCellStyleNames( 0 ),
+ pRows( new SwXMLTableRows_Impl ),
pTableNode( pTable->pTableNode ),
pBox1( 0 ),
pSttNd1( 0 ),
pBoxFmt( 0 ),
pLineFmt( 0 ),
- nCurRow( 0UL ),
- nCurCol( 0UL ),
- nWidth( 0UL ),
+ pSharedBoxFormats(NULL),
+ xParentTable( pTable ),
+ pDDESource(NULL),
bFirstSection( sal_False ),
bRelWidth( sal_True ),
bHasHeading( sal_False ),
- pDDESource(NULL),
- pSharedBoxFormats(NULL)
+ nCurRow( 0UL ),
+ nCurCol( 0UL ),
+ nWidth( 0UL )
{
}
@@ -1369,7 +1369,7 @@ SwXMLTableContext::~SwXMLTableContext()
GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(sal_False);
}
-SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
@@ -1377,32 +1377,32 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
const SvXMLTokenMap& rTokenMap = GetSwImport().GetTableElemTokenMap();
sal_Bool bHeader = sal_False;
- switch( rTokenMap.Get( nPrefix, rLocalName ) )
+ switch( rTokenMap.Get( nInPrefix, rLocalName ) )
{
case XML_TOK_TABLE_HEADER_COLS:
bHeader = sal_True;
case XML_TOK_TABLE_COLS:
if( IsValid() )
- pContext = new SwXMLTableColsContext_Impl( GetSwImport(), nPrefix,
+ pContext = new SwXMLTableColsContext_Impl( GetSwImport(), nInPrefix,
rLocalName, xAttrList,
this, bHeader );
break;
case XML_TOK_TABLE_COL:
if( IsValid() && IsInsertColPossible() )
- pContext = new SwXMLTableColContext_Impl( GetSwImport(), nPrefix,
+ pContext = new SwXMLTableColContext_Impl( GetSwImport(), nInPrefix,
rLocalName, xAttrList,
this );
break;
case XML_TOK_TABLE_HEADER_ROWS:
bHeader = sal_True;
case XML_TOK_TABLE_ROWS:
- pContext = new SwXMLTableRowsContext_Impl( GetSwImport(), nPrefix,
+ pContext = new SwXMLTableRowsContext_Impl( GetSwImport(), nInPrefix,
rLocalName, xAttrList,
this, bHeader );
break;
case XML_TOK_TABLE_ROW:
if( IsInsertRowPossible() )
- pContext = new SwXMLTableRowContext_Impl( GetSwImport(), nPrefix,
+ pContext = new SwXMLTableRowContext_Impl( GetSwImport(), nInPrefix,
rLocalName, xAttrList,
this );
break;
@@ -1414,7 +1414,7 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
{
pDDESource->ReleaseRef();
}
- pDDESource = new SwXMLDDETableContext_Impl( GetSwImport(), nPrefix,
+ pDDESource = new SwXMLDDETableContext_Impl( GetSwImport(), nInPrefix,
rLocalName );
pDDESource->AddRef();
pContext = pDDESource;
@@ -1423,12 +1423,12 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
-void SwXMLTableContext::InsertColumn( sal_Int32 nWidth, sal_Bool bRelWidth,
+void SwXMLTableContext::InsertColumn( sal_Int32 nInWidth, sal_Bool bInRelWidth,
const OUString *pDfltCellStyleName )
{
OSL_ENSURE( nCurCol < USHRT_MAX,
@@ -1436,12 +1436,12 @@ void SwXMLTableContext::InsertColumn( sal_Int32 nWidth, sal_Bool bRelWidth,
if( nCurCol >= USHRT_MAX )
return;
- if( nWidth < MINLAY )
- nWidth = MINLAY;
- else if( nWidth > USHRT_MAX )
- nWidth = USHRT_MAX;
- aColumnWidths.Insert( (sal_uInt16)nWidth, aColumnWidths.Count() );
- aColumnRelWidths.Insert( bRelWidth, aColumnRelWidths.Count() );
+ if( nInWidth < MINLAY )
+ nInWidth = MINLAY;
+ else if( nInWidth > USHRT_MAX )
+ nInWidth = USHRT_MAX;
+ aColumnWidths.Insert( (sal_uInt16)nInWidth, aColumnWidths.Count() );
+ aColumnRelWidths.Insert( bInRelWidth, aColumnRelWidths.Count() );
if( (pDfltCellStyleName && pDfltCellStyleName->getLength() > 0) ||
pColumnDefaultCellStyleNames )
{
@@ -1467,11 +1467,11 @@ sal_Int32 SwXMLTableContext::GetColumnWidth( sal_uInt32 nCol,
if( nLast > aColumnWidths.Count() )
nLast = aColumnWidths.Count();
- sal_Int32 nWidth = 0L;
+ sal_Int32 nLclWidth = 0L;
for( sal_uInt16 i=(sal_uInt16)nCol; i < nLast; i++ )
- nWidth += aColumnWidths[i];
+ nLclWidth += aColumnWidths[i];
- return nWidth;
+ return nLclWidth;
}
OUString SwXMLTableContext::GetColumnDefaultCellStyleName( sal_uInt32 nCol ) const
@@ -1559,9 +1559,9 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName,
// Add rows
if( pRows->Count() < nRowsReq )
{
- OUString aStyleName;
+ OUString aLclStyleName;
for( i=pRows->Count(); i<nRowsReq; i++ )
- pRows->Insert( new SwXMLTableRow_Impl(aStyleName,GetColumnCount()),
+ pRows->Insert( new SwXMLTableRow_Impl(aLclStyleName,GetColumnCount()),
pRows->Count() );
}
@@ -1658,8 +1658,8 @@ void SwXMLTableContext::FinishRow()
// Insert an empty cell at the end of the line if the row is not complete
if( nCurCol < GetColumnCount() )
{
- OUString aStyleName;
- InsertCell( aStyleName, 1U, GetColumnCount() - nCurCol,
+ OUString aLclStyleName;
+ InsertCell( aLclStyleName, 1U, GetColumnCount() - nCurCol,
InsertTableSection() );
}
@@ -1785,7 +1785,7 @@ SwTableBoxFmt* SwXMLTableContext::GetSharedBoxFormat(
if ( pSharedBoxFormats == NULL )
pSharedBoxFormats = new map_BoxFmt();
- SwTableBoxFmt* pBoxFmt;
+ SwTableBoxFmt* pLclBoxFmt;
TableBoxIndex aKey( rStyleName, nColumnWidth, bProtected );
map_BoxFmt::iterator aIter = pSharedBoxFormats->find( aKey );
@@ -1795,36 +1795,36 @@ SwTableBoxFmt* SwXMLTableContext::GetSharedBoxFormat(
// get the old format, and reset all attributes
// (but preserve FillOrder)
- pBoxFmt = (SwTableBoxFmt*)pBox->ClaimFrmFmt();
- SwFmtFillOrder aFillOrder( pBoxFmt->GetFillOrder() );
- pBoxFmt->ResetAllAttr();
- pBoxFmt->SetAttr( aFillOrder );
+ pLclBoxFmt = (SwTableBoxFmt*)pBox->ClaimFrmFmt();
+ SwFmtFillOrder aFillOrder( pLclBoxFmt->GetFillOrder() );
+ pLclBoxFmt->ResetAllAttr();
+ pLclBoxFmt->SetAttr( aFillOrder );
bNew = sal_True; // it's a new format now
// share this format, if allowed
if ( bMayShare )
- (*pSharedBoxFormats)[ aKey ] = pBoxFmt;
+ (*pSharedBoxFormats)[ aKey ] = pLclBoxFmt;
}
else
{
// set the shared format
- pBoxFmt = aIter->second;
- pBox->ChgFrmFmt( pBoxFmt );
+ pLclBoxFmt = aIter->second;
+ pBox->ChgFrmFmt( pLclBoxFmt );
bNew = sal_False; // copied from an existing format
// claim it, if we are not allowed to share
if ( !bMayShare )
- pBoxFmt = (SwTableBoxFmt*)pBox->ClaimFrmFmt();
+ pLclBoxFmt = (SwTableBoxFmt*)pBox->ClaimFrmFmt();
}
// lock format (if so desired)
if ( pModifyLocked != NULL )
{
- (*pModifyLocked) = pBoxFmt->IsModifyLocked();
- pBoxFmt->LockModify();
+ (*pModifyLocked) = pLclBoxFmt->IsModifyLocked();
+ pLclBoxFmt->LockModify();
}
- return pBoxFmt;
+ return pLclBoxFmt;
}
SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper,
@@ -1902,12 +1902,12 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper,
{
if( pPrevRow->GetCell(i)->GetRowSpan() > 1UL )
{
- const SwXMLTableCell_Impl *pCell =
+ const SwXMLTableCell_Impl *pLclCell =
GetCell( nStartRow, i );
- sal_uInt32 nColSpan = pCell->GetColSpan();
- FixRowSpan( nStartRow-1UL, i, nColSpan );
+ sal_uInt32 nLclColSpan = pLclCell->GetColSpan();
+ FixRowSpan( nStartRow-1UL, i, nLclColSpan );
ReplaceWithEmptyCell( nStartRow, i );
- i += nColSpan;
+ i += nLclColSpan;
}
else
{
@@ -1925,7 +1925,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper,
SwTableBox *SwXMLTableContext::MakeTableBox(
SwTableLine *pUpper, const SwXMLTableCell_Impl *pCell,
- sal_uInt32 nTopRow, sal_uInt32 nLeftCol, sal_uInt32 nBottomRow,
+ sal_uInt32 /*nTopRow*/, sal_uInt32 nLeftCol, sal_uInt32 /*nBottomRow*/,
sal_uInt32 nRightCol )
{
SwTableBox *pBox;
@@ -1949,7 +1949,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
OUString sStyleName = pCell->GetStyleName();
sal_Bool bModifyLocked;
sal_Bool bNew;
- SwTableBoxFmt *pBoxFmt = GetSharedBoxFormat(
+ SwTableBoxFmt *pLclBoxFmt = GetSharedBoxFormat(
pBox, sStyleName, nColWidth, pCell->IsProtected(),
pCell->GetStartNode() && pCell->GetFormula().getLength() == 0 &&
! pCell->HasValue(),
@@ -1965,7 +1965,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
XML_STYLE_FAMILY_TABLE_CELL, sStyleName, &pAutoItemSet ) )
{
if( pAutoItemSet )
- pBoxFmt->SetAttr( *pAutoItemSet );
+ pLclBoxFmt->SetAttr( *pAutoItemSet );
}
}
@@ -1986,7 +1986,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
{
// default num format?
const SfxPoolItem* pItem = NULL;
- if( pBoxFmt->GetItemState( RES_BOXATR_FORMAT, FALSE, &pItem )
+ if( pLclBoxFmt->GetItemState( RES_BOXATR_FORMAT, FALSE, &pItem )
== SFX_ITEM_SET )
{
const SwTblBoxNumFormat* pNumFormat =
@@ -2019,9 +2019,9 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
if( bSuppressNumericContent )
{
// suppress numeric content? Then reset number format!
- pBoxFmt->ResetAttr( RES_BOXATR_FORMULA );
- pBoxFmt->ResetAttr( RES_BOXATR_FORMAT );
- pBoxFmt->ResetAttr( RES_BOXATR_VALUE );
+ pLclBoxFmt->ResetAttr( RES_BOXATR_FORMULA );
+ pLclBoxFmt->ResetAttr( RES_BOXATR_FORMAT );
+ pLclBoxFmt->ResetAttr( RES_BOXATR_VALUE );
}
else
{
@@ -2032,14 +2032,14 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
{
// formula cell: insert formula if valid
SwTblBoxFormula aFormulaItem( rFormula );
- pBoxFmt->SetAttr( aFormulaItem );
+ pLclBoxFmt->SetAttr( aFormulaItem );
}
// always insert value, even if default
if( pCell->HasValue() )
{
SwTblBoxValue aValueItem( pCell->GetValue() );
- pBoxFmt->SetAttr( aValueItem );
+ pLclBoxFmt->SetAttr( aValueItem );
}
}
@@ -2052,14 +2052,14 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
{
SvxProtectItem aProtectItem;
aProtectItem.SetCntntProtect( sal_True );
- pBoxFmt->SetAttr( aProtectItem );
+ pLclBoxFmt->SetAttr( aProtectItem );
}
// restore old modify-lock state
if (! bModifyLocked)
- pBoxFmt->UnlockModify();
+ pLclBoxFmt->UnlockModify();
- pBoxFmt->SetAttr( SwFmtFrmSize( ATT_VAR_SIZE, nColWidth ) );
+ pLclBoxFmt->SetAttr( SwFmtFrmSize( ATT_VAR_SIZE, nColWidth ) );
return pBox;
}
@@ -2244,8 +2244,8 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox )
if( 0UL == pRows->Count() )
{
- OUString aStyleName;
- InsertCell( aStyleName, 1U, nCols, InsertTableSection() );
+ OUString aLclStyleName;
+ InsertCell( aLclStyleName, 1U, nCols, InsertTableSection() );
}
// TODO: Do we have to keep both values, the realtive and the absolute
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltext.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltext.cxx
index 872eda3..6990795 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltext.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltext.cxx
@@ -49,21 +49,21 @@ class SwXMLBodyContext_Impl : public SvXMLImportContext
public:
- SwXMLBodyContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
+ SwXMLBodyContext_Impl( SwXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName );
virtual ~SwXMLBodyContext_Impl();
virtual SvXMLImportContext *CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual void EndElement();
};
-SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport,
+SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
}
@@ -72,16 +72,16 @@ SwXMLBodyContext_Impl::~SwXMLBodyContext_Impl()
}
SvXMLImportContext *SwXMLBodyContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
pContext = GetSwImport().GetTextImport()->CreateTextChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
+ GetImport(), nInPrefix, rLocalName, xAttrList,
XML_TEXT_TYPE_BODY );
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx
index 9844b1c..61716a4 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx
@@ -202,8 +202,8 @@ void SwXMLTextParagraphExport::exportStyleContent(
SwXMLTextParagraphExport::SwXMLTextParagraphExport(
SwXMLExport& rExp,
- SvXMLAutoStylePoolP& rAutoStylePool ) :
- XMLTextParagraphExport( rExp, rAutoStylePool ),
+ SvXMLAutoStylePoolP& rInAutoStylePool ) :
+ XMLTextParagraphExport( rExp, rInAutoStylePool ),
sTextTable( RTL_CONSTASCII_USTRINGPARAM( "TextTable" ) ),
sEmbeddedObjectProtocol( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" ) ),
aAppletClassId( SO3_APPLET_CLASSID ),
@@ -233,13 +233,13 @@ void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
}
}
-static void lcl_addParam ( SvXMLExport &rExport, const SvCommand &rCommand )
+static void lcl_addParam ( SvXMLExport &rInExport, const SvCommand &rCommand )
{
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rCommand.GetCommand() );
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, rCommand.GetArgument() );
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True );
+ rInExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rCommand.GetCommand() );
+ rInExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, rCommand.GetArgument() );
+ SvXMLElementExport aElem( rInExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True );
}
-static void lcl_addURL ( SvXMLExport &rExport, const String &rURL,
+static void lcl_addURL ( SvXMLExport &rInExport, const String &rURL,
sal_Bool bToRel = sal_True )
{
String sRelURL;
@@ -253,10 +253,10 @@ static void lcl_addURL ( SvXMLExport &rExport, const String &rURL,
if (sRelURL.Len())
{
- rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, sRelURL );
- rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
- rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
- rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
+ rInExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, sRelURL );
+ rInExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
+ rInExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
+ rInExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
}
}
@@ -418,7 +418,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
SvULongs aParams;
enum XMLTokenEnum eElementName;
- SvXMLExport &rExport = GetExport();
+ SvXMLExport &rLclExport = GetExport();
// First the stuff common to each of Applet/Plugin/Floating Frame
OUString sStyle;
@@ -440,6 +440,8 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
lcl_addOutplaceProperties( pInfo, aStates,
GetAutoFramePropMapper()->getPropertySetMapper() );
break;
+ default:
+ break;
}
OUString sAutoStyle( sStyle );
@@ -453,19 +455,19 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
}
if( sAutoStyle.getLength() )
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE_NAME, sAutoStyle );
+ rLclExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE_NAME, sAutoStyle );
addTextFrameAttributes( rPropSet, sal_False );
switch (nType)
{
case SV_EMBEDDED_OUTPLACE:
case SV_EMBEDDED_OWN:
- if( (rExport.getExportFlags() & EXPORT_EMBEDDED) == 0 )
+ if( (rLclExport.getExportFlags() & EXPORT_EMBEDDED) == 0 )
{
OUString sURL( sEmbeddedObjectProtocol );
sURL += pInfo->GetStorageName();
sURL = GetExport().AddEmbeddedObject( sURL );
- lcl_addURL( rExport, sURL, sal_False );
+ lcl_addURL( rLclExport, sURL, sal_False );
}
if( SV_EMBEDDED_OWN == nType && pOLENd->GetChartTblName().Len() )
{
@@ -499,7 +501,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
sRange = aBuffer.makeStringAndClear();
}
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NOTIFY_ON_UPDATE_OF_RANGES,
+ rLclExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NOTIFY_ON_UPDATE_OF_RANGES,
sRange );
}
eElementName = SV_EMBEDDED_OUTPLACE==nType ? XML_OBJECT_OLE
@@ -510,14 +512,14 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
// It's an applet!
const XubString & rURL = xApplet->GetCodeBase();
if (rURL.Len() )
- lcl_addURL(rExport, rURL);
+ lcl_addURL(rLclExport, rURL);
const String &rName = xApplet->GetName();
if (rName.Len())
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME,
+ rLclExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME,
rName );
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE,
+ rLclExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE,
xApplet->GetClass() );
const SvCommandList& rCommands = xApplet->GetCommandList();
@@ -526,16 +528,16 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
while ( i > 0 )
{
const SvCommand& rCommand = rCommands [ --i ];
- const String &rName = rCommand.GetCommand();
- USHORT nType = SwApplet_Impl::GetOptionType( rName, TRUE );
- if ( nType == SWHTML_OPTTYPE_TAG)
- rExport.AddAttribute( XML_NAMESPACE_DRAW, rName, rCommand.GetArgument());
- else if (SWHTML_OPTTYPE_PARAM == nType ||
- SWHTML_OPTTYPE_SIZE == nType )
+ const String &rLclName = rCommand.GetCommand();
+ USHORT nLclType = SwApplet_Impl::GetOptionType( rLclName, TRUE );
+ if ( nLclType == SWHTML_OPTTYPE_TAG)
+ rLclExport.AddAttribute( XML_NAMESPACE_DRAW, rLclName, rCommand.GetArgument());
+ else if (SWHTML_OPTTYPE_PARAM == nLclType ||
+ SWHTML_OPTTYPE_SIZE == nLclType )
aParams.Insert( i, aParams.Count() );
}
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT,
+ rLclExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT,
xApplet->IsMayScript() ? XML_TRUE : XML_FALSE );
eElementName = XML_APPLET;
}
@@ -543,10 +545,10 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
case SV_EMBEDDED_PLUGIN:
{
// It's a plugin!
- lcl_addURL( rExport, xPlugin->GetURL()->GetMainURL( INetURLObject::NO_DECODE ) );
+ lcl_addURL( rLclExport, xPlugin->GetURL()->GetMainURL( INetURLObject::NO_DECODE ) );
const String &rType = xPlugin->GetMimeType();
if (rType.Len())
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, rType );
+ rLclExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, rType );
eElementName = XML_PLUGIN;
}
break;
@@ -555,11 +557,11 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
// It's a floating frame!
const SfxFrameDescriptor *pDescriptor = xFrame->GetFrameDescriptor();
- lcl_addURL( rExport, pDescriptor->GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
+ lcl_addURL( rLclExport, pDescriptor->GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
const String &rName = pDescriptor->GetName();
if (rName.Len())
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_FRAME_NAME, rName );
+ rLclExport.AddAttribute( XML_NAMESPACE_DRAW, XML_FRAME_NAME, rName );
eElementName = XML_FLOATING_FRAME;
}
break;
@@ -567,21 +569,21 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
OSL_ENSURE( !this, "unknown object type! Base class should have been called!" );
}
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, eElementName,
+ SvXMLElementExport aElem( rLclExport, XML_NAMESPACE_DRAW, eElementName,
sal_False, sal_True );
switch( nType )
{
case SV_EMBEDDED_OWN:
- if( (rExport.getExportFlags() & EXPORT_EMBEDDED) != 0 )
+ if( (rLclExport.getExportFlags() & EXPORT_EMBEDDED) != 0 )
{
Reference < XEmbeddedObjectSupplier > xEOS( rPropSet, UNO_QUERY );
OSL_ENSURE( xEOS.is(), "no embedded object supplier for own object" );
Reference < XComponent > xComp = xEOS->getEmbeddedObject();
- rExport.ExportEmbeddedOwnObject( xComp );
+ rLclExport.ExportEmbeddedOwnObject( xComp );
}
break;
case SV_EMBEDDED_OUTPLACE:
- if( (rExport.getExportFlags() & EXPORT_EMBEDDED) != 0 )
+ if( (rLclExport.getExportFlags() & EXPORT_EMBEDDED) != 0 )
{
OUString sURL( sEmbeddedObjectProtocol );
sURL += rOLEObj.GetName();
@@ -595,7 +597,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
while ( ii > 0 )
{
const SvCommand& rCommand = rCommands [ aParams [ --ii] ];
- lcl_addParam (rExport, rCommand );
+ lcl_addParam (rLclExport, rCommand );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list