[Libreoffice-commits] .: binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Feb 25 08:40:54 PST 2011
binfilter/bf_xmloff/source/text/xmloff_XMLIndexIllustrationSourceContext.cxx | 12
binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingImportContext.cxx | 48 +-
binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameContext.cxx | 44 -
binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameHyperlinkContext.cxx | 22
binfilter/bf_xmloff/source/text/xmloff_XMLTextHeaderFooterContext.cxx | 19
binfilter/bf_xmloff/source/text/xmloff_XMLTextListAutoStylePool.cxx | 10
binfilter/bf_xmloff/source/text/xmloff_XMLTextListBlockContext.cxx | 24 -
binfilter/bf_xmloff/source/text/xmloff_XMLTextListItemContext.cxx | 24 -
binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx | 18
binfilter/bf_xmloff/source/text/xmloff_txtdropi.cxx | 12
binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx | 102 ++--
binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx | 233 ++++------
binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx | 56 +-
13 files changed, 308 insertions(+), 316 deletions(-)
New commits:
commit ed71d0cd8836f1fdd50e7c8c76372bd9421c9c58
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 25 10:31:43 2011 +0000
throw out some warnings
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexIllustrationSourceContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexIllustrationSourceContext.cxx
index 827e2b4..059275d 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexIllustrationSourceContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexIllustrationSourceContext.cxx
@@ -56,11 +56,11 @@ TYPEINIT1(XMLIndexIllustrationSourceContext, XMLIndexTableSourceContext);
XMLIndexIllustrationSourceContext::XMLIndexIllustrationSourceContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
Reference<XPropertySet> & rPropSet) :
- XMLIndexTableSourceContext(rImport, nPrfx, rLocalName, rPropSet)
+ XMLIndexTableSourceContext(rInImport, nPrfx, rLocalName, rPropSet)
{
}
@@ -69,15 +69,15 @@ XMLIndexIllustrationSourceContext::~XMLIndexIllustrationSourceContext()
}
SvXMLImportContext* XMLIndexIllustrationSourceContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
{
- if ( ( XML_NAMESPACE_TEXT == nPrefix ) &&
+ if ( ( XML_NAMESPACE_TEXT == nInPrefix ) &&
( IsXMLToken( rLocalName, XML_ILLUSTRATION_INDEX_ENTRY_TEMPLATE ) ) )
{
return new XMLIndexTemplateContext(GetImport(), rIndexPropertySet,
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
aLevelNameTableMap,
XML_TOKEN_INVALID, // no outline-level attr
aLevelStylePropNameTableMap,
@@ -85,7 +85,7 @@ SvXMLImportContext* XMLIndexIllustrationSourceContext::CreateChildContext(
}
else
{
- return XMLIndexSourceBaseContext::CreateChildContext(nPrefix,
+ return XMLIndexSourceBaseContext::CreateChildContext(nInPrefix,
rLocalName,
xAttrList);
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingImportContext.cxx
index 113409c..6e5474b 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingImportContext.cxx
@@ -62,11 +62,22 @@ TYPEINIT1( XMLLineNumberingImportContext, SvXMLStyleContext );
XMLLineNumberingImportContext::XMLLineNumberingImportContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList) :
- SvXMLStyleContext(rImport, nPrfx, rLocalName, xAttrList, XML_STYLE_FAMILY_TEXT_LINENUMBERINGCONFIG),
+ SvXMLStyleContext(rInImport, nPrfx, rLocalName, xAttrList, XML_STYLE_FAMILY_TEXT_LINENUMBERINGCONFIG),
+ sCharStyleName(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")),
+ sCountEmptyLines(RTL_CONSTASCII_USTRINGPARAM("CountEmptyLines")),
+ sCountLinesInFrames(RTL_CONSTASCII_USTRINGPARAM("CountLinesInFrames")),
+ sDistance(RTL_CONSTASCII_USTRINGPARAM("Distance")),
+ sInterval(RTL_CONSTASCII_USTRINGPARAM("Interval")),
+ sSeparatorText(RTL_CONSTASCII_USTRINGPARAM("SeparatorText")),
+ sNumberPosition(RTL_CONSTASCII_USTRINGPARAM("NumberPosition")),
+ sNumberingType(RTL_CONSTASCII_USTRINGPARAM("NumberingType")),
+ sIsOn(RTL_CONSTASCII_USTRINGPARAM("IsOn")),
+ sRestartAtEachPage(RTL_CONSTASCII_USTRINGPARAM("RestartAtEachPage")),
+ sSeparatorInterval(RTL_CONSTASCII_USTRINGPARAM("SeparatorInterval")),
sStyleName(),
sNumFormat(GetXMLToken(XML_1)),
sNumLetterSync(GetXMLToken(XML_FALSE)),
@@ -78,18 +89,7 @@ XMLLineNumberingImportContext::XMLLineNumberingImportContext(
bNumberLines(sal_True),
bCountEmptyLines(sal_True),
bCountInFloatingFrames(sal_False),
- bRestartNumbering(sal_False),
- sCharStyleName(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")),
- sCountEmptyLines(RTL_CONSTASCII_USTRINGPARAM("CountEmptyLines")),
- sCountLinesInFrames(RTL_CONSTASCII_USTRINGPARAM("CountLinesInFrames")),
- sDistance(RTL_CONSTASCII_USTRINGPARAM("Distance")),
- sInterval(RTL_CONSTASCII_USTRINGPARAM("Interval")),
- sSeparatorText(RTL_CONSTASCII_USTRINGPARAM("SeparatorText")),
- sNumberPosition(RTL_CONSTASCII_USTRINGPARAM("NumberPosition")),
- sNumberingType(RTL_CONSTASCII_USTRINGPARAM("NumberingType")),
- sIsOn(RTL_CONSTASCII_USTRINGPARAM("IsOn")),
- sRestartAtEachPage(RTL_CONSTASCII_USTRINGPARAM("RestartAtEachPage")),
- sSeparatorInterval(RTL_CONSTASCII_USTRINGPARAM("SeparatorInterval"))
+ bRestartNumbering(sal_False)
{
}
@@ -145,11 +145,11 @@ void XMLLineNumberingImportContext::StartElement(
for(sal_Int16 i=0; i<nLength; i++)
{
OUString sLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().
GetKeyByAttrName( xAttrList->getNameByIndex(i), &sLocalName );
ProcessAttribute(
- (enum LineNumberingToken)aTokenMap.Get(nPrefix, sLocalName),
+ (enum LineNumberingToken)aTokenMap.Get(nLclPrefix, sLocalName),
xAttrList->getValueByIndex(i));
}
}
@@ -213,11 +213,11 @@ void XMLLineNumberingImportContext::ProcessAttribute(
case XML_TOK_LINENUMBERING_NUMBER_POSITION:
{
- sal_uInt16 nTmp;
- if (SvXMLUnitConverter::convertEnum(nTmp, sValue,
+ sal_uInt16 nTmp16(0);
+ if (SvXMLUnitConverter::convertEnum(nTmp16, sValue,
aLineNumberPositionMap))
{
- nNumberPosition = nTmp;
+ nNumberPosition = nTmp16;
}
break;
}
@@ -232,7 +232,7 @@ void XMLLineNumberingImportContext::ProcessAttribute(
}
void XMLLineNumberingImportContext::CreateAndInsert(
- sal_Bool bOverwrite)
+ sal_Bool /*bOverwrite*/)
{
// insert and block mode is handled in insertStyleFamily
@@ -300,21 +300,21 @@ void XMLLineNumberingImportContext::CreateAndInsert(
}
SvXMLImportContext* XMLLineNumberingImportContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
{
- if ( (nPrefix == XML_NAMESPACE_TEXT) &&
+ if ( (nInPrefix == XML_NAMESPACE_TEXT) &&
IsXMLToken(rLocalName, XML_LINENUMBERING_SEPARATOR) )
{
return new XMLLineNumberingSeparatorImportContext(GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
*this);
}
else
{
// unknown element: default context
- return SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
+ return SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName,
xAttrList);
}
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameContext.cxx
index f128043..7fb4b64 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameContext.cxx
@@ -183,8 +183,8 @@ XMLTextFrameParam_Impl::XMLTextFrameParam_Impl(
const OUString& rValue = xAttrList->getValueByIndex( i );
OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName );
- if ( XML_NAMESPACE_DRAW == nPrefix )
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName );
+ if ( XML_NAMESPACE_DRAW == nLclPrefix )
{
if( IsXMLToken(aLocalName, XML_VALUE) )
{
@@ -244,10 +244,10 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
const OUString& rValue = xAttrList->getValueByIndex( i );
OUString aLocalName;
- sal_uInt16 nPrefix =
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
&aLocalName );
- switch( rTokenMap.Get( nPrefix, aLocalName ) )
+ switch( rTokenMap.Get( nLclPrefix, aLocalName ) )
{
case XML_TOK_TEXT_CONTOUR_VIEWBOX:
sViewBox = rValue;
@@ -707,10 +707,10 @@ XMLTextFrameContext::XMLTextFrameContext(
const OUString& rValue = xAttrList->getValueByIndex( i );
OUString aLocalName;
- sal_uInt16 nPrefix =
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
&aLocalName );
- switch( rTokenMap.Get( nPrefix, aLocalName ) )
+ switch( rTokenMap.Get( nLclPrefix, aLocalName ) )
{
case XML_TOK_TEXT_FRAME_STYLE_NAME:
sStyleName = rValue;
@@ -941,26 +941,26 @@ void XMLTextFrameContext::EndElement()
}
SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_SVG == nPrefix &&
+ if( XML_NAMESPACE_SVG == nInPrefix &&
IsXMLToken( rLocalName, XML_DESC ) )
{
pContext = new XMLTextFrameDescContext_Impl( GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
xAttrList, sDesc );
}
- else if( XML_NAMESPACE_DRAW == nPrefix )
+ else if( XML_NAMESPACE_DRAW == nInPrefix )
{
if ( (nType == XML_TEXT_FRAME_APPLET || nType == XML_TEXT_FRAME_PLUGIN) &&
IsXMLToken( rLocalName, XML_PARAM ) )
{
pContext = new XMLTextFrameParam_Impl( GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
xAttrList, nType, aParamMap );
}
else
@@ -969,14 +969,14 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
{
if( CreateIfNotThere() )
pContext = new XMLTextFrameContourContext_Impl( GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
xAttrList, xPropSet, sal_False );
}
else if( IsXMLToken( rLocalName, XML_CONTOUR_PATH ) )
{
if( CreateIfNotThere() )
pContext = new XMLTextFrameContourContext_Impl( GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
xAttrList, xPropSet, sal_True );
}
else if ( IsXMLToken( rLocalName, XML_IMAGE_MAP ) &&
@@ -985,12 +985,12 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
nType == XML_TEXT_FRAME_OBJECT_OLE ) )
{
if( CreateIfNotThere() )
- pContext = new XMLImageMapContext( GetImport(), nPrefix,
+ pContext = new XMLImageMapContext( GetImport(), nInPrefix,
rLocalName, xPropSet );
}
}
}
- else if( (XML_NAMESPACE_OFFICE == nPrefix) )
+ else if( (XML_NAMESPACE_OFFICE == nInPrefix) )
{
if( IsXMLToken( rLocalName, XML_EVENTS ) )
{
@@ -1002,7 +1002,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
if (xEventsSupplier.is())
{
// OK, we have the events, so create the context
- pContext = new XMLEventsImportContext(GetImport(), nPrefix,
+ pContext = new XMLEventsImportContext(GetImport(), nInPrefix,
rLocalName, xEventsSupplier);
}
// else: no events, no event import
@@ -1026,7 +1026,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
break;
}
if( xBase64Stream.is() )
- pContext = new XMLBase64ImportContext( GetImport(), nPrefix,
+ pContext = new XMLBase64ImportContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
xBase64Stream );
}
@@ -1034,15 +1034,15 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
}
if( !pContext &&
( XML_TEXT_FRAME_OBJECT == nType &&
- (XML_NAMESPACE_OFFICE == nPrefix &&
+ (XML_NAMESPACE_OFFICE == nInPrefix &&
IsXMLToken( rLocalName, XML_DOCUMENT )) ||
- (XML_NAMESPACE_MATH == nPrefix &&
+ (XML_NAMESPACE_MATH == nInPrefix &&
IsXMLToken(rLocalName, XML_MATH) ) ) )
{
if( !xPropSet.is() && !bCreateFailed )
{
XMLEmbeddedObjectImportContext *pEContext =
- new XMLEmbeddedObjectImportContext( GetImport(), nPrefix,
+ new XMLEmbeddedObjectImportContext( GetImport(), nInPrefix,
rLocalName, xAttrList );
sFilterService = pEContext->GetFilterServiceName();
if( sFilterService.getLength() != 0 )
@@ -1063,11 +1063,11 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
}
if( !pContext && xOldTextCursor.is() ) // text-box
pContext = GetImport().GetTextImport()->CreateTextChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
+ GetImport(), nInPrefix, rLocalName, xAttrList,
XML_TEXT_TYPE_TEXTBOX );
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameHyperlinkContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameHyperlinkContext.cxx
index 6eeb150..16cd6bc 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameHyperlinkContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextFrameHyperlinkContext.cxx
@@ -45,13 +45,13 @@ using rtl::OUString;
TYPEINIT1( XMLTextFrameHyperlinkContext, SvXMLImportContext );
XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & xAttrList,
TextContentAnchorType eATyp,
Reference < XTextContent> *pTxtCntnt,
TextContentAnchorType *pAnchrType ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
eAnchorType( eATyp ),
pTextContent( pTxtCntnt ),
pAnchorType( pAnchrType ),
@@ -67,11 +67,11 @@ XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(
const OUString& rAttrName = xAttrList->getNameByIndex( i );
const OUString& rValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
- switch( rTokenMap.Get( nPrefix, aLocalName ) )
+ &aLclLocalName );
+ switch( rTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_TEXT_HYPERLINK_HREF:
sHRef = GetImport().GetAbsoluteReference( rValue );
@@ -88,7 +88,7 @@ XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(
case XML_TOK_TEXT_HYPERLINK_SERVER_MAP:
{
sal_Bool bTmp;
- if( rImport.GetMM100UnitConverter().convertBool( bTmp,
+ if( rInImport.GetMM100UnitConverter().convertBool( bTmp,
rValue ) )
{
bMap = bTmp;
@@ -118,14 +118,14 @@ void XMLTextFrameHyperlinkContext::EndElement()
}
SvXMLImportContext *XMLTextFrameHyperlinkContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
XMLTextFrameContext *pTextFrameContext = 0;
- if( XML_NAMESPACE_DRAW == nPrefix )
+ if( XML_NAMESPACE_DRAW == nInPrefix )
{
sal_uInt16 nFrameType = USHRT_MAX;
if( IsXMLToken( rLocalName, XML_TEXT_BOX ) )
@@ -144,7 +144,7 @@ SvXMLImportContext *XMLTextFrameHyperlinkContext::CreateChildContext(
nFrameType = XML_TEXT_FRAME_FLOATING_FRAME;
if( USHRT_MAX != nFrameType )
- pTextFrameContext = new XMLTextFrameContext( GetImport(), nPrefix,
+ pTextFrameContext = new XMLTextFrameContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
eAnchorType,
nFrameType );
@@ -160,7 +160,7 @@ SvXMLImportContext *XMLTextFrameHyperlinkContext::CreateChildContext(
pContext = pTextFrameContext;
}
else
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTextHeaderFooterContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTextHeaderFooterContext.cxx
index 9847ac7..2a83f61 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextHeaderFooterContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextHeaderFooterContext.cxx
@@ -43,13 +43,13 @@ using namespace ::com::sun::star::beans;
TYPEINIT1( XMLTextHeaderFooterContext, SvXMLImportContext );
-XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference<
- xml::sax::XAttributeList > & xAttrList,
+ xml::sax::XAttributeList > & /*xAttrList*/,
const Reference < XPropertySet > & rPageStylePropSet,
sal_Bool bFooter, sal_Bool bLft ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
xPropSet( rPageStylePropSet ),
sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")) : OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")) ),
sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))
@@ -93,7 +93,7 @@ XMLTextHeaderFooterContext::~XMLTextHeaderFooterContext()
}
SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
@@ -124,7 +124,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext(
// The content has not to be removed, because the header
// or footer is empty already.
- bRemoveContent;
+ bRemoveContent = sal_False;
}
// If a header or footer is not shared, share it now.
@@ -144,10 +144,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext(
aAny >>= xText;
if( bRemoveContent )
- {
- OUString sText;
- xText->setString( sText );
- }
+ xText->setString( OUString() );
UniReference < XMLTextImportHelper > xTxtImport =
GetImport().GetTextImport();
@@ -158,11 +155,11 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext(
pContext =
GetImport().GetTextImport()->CreateTextChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
+ GetImport(), nInPrefix, rLocalName, xAttrList,
XML_TEXT_TYPE_HEADER_FOOTER );
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTextListAutoStylePool.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTextListAutoStylePool.cxx
index 0a10a77..7594943 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextListAutoStylePool.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextListAutoStylePool.cxx
@@ -82,8 +82,8 @@ public:
XMLTextListAutoStylePoolEntry_Impl(
const Reference < XIndexReplace > & rNumRules ) :
- nPos( 0 ),
xNumRules( rNumRules ),
+ nPos( 0 ),
bIsNamed( sal_False )
{
Reference < XNamed > xNamed( xNumRules, UNO_QUERY );
@@ -96,8 +96,8 @@ public:
XMLTextListAutoStylePoolEntry_Impl(
const OUString& rInternalName ) :
- nPos( 0 ),
sInternalName( rInternalName ),
+ nPos( 0 ),
bIsNamed( sal_True )
{
}
@@ -115,8 +115,8 @@ XMLTextListAutoStylePoolEntry_Impl::XMLTextListAutoStylePoolEntry_Impl(
XMLTextListAutoStylePoolNames_Impl& rNames,
const OUString& rPrefix,
sal_uInt32& rName ) :
- nPos( nP ),
xNumRules( rNumRules ),
+ nPos( nP ),
bIsNamed( sal_False )
{
Reference < XNamed > xNamed( xNumRules, UNO_QUERY );
@@ -171,10 +171,10 @@ IMPL_CONTAINER_SORT( XMLTextListAutoStylePool_Impl,
XMLTextListAutoStylePool::XMLTextListAutoStylePool( SvXMLExport& rExp ) :
rExport( rExp ),
+ sPrefix( RTL_CONSTASCII_USTRINGPARAM("L") ),
pPool( new XMLTextListAutoStylePool_Impl( 5, 5 ) ),
pNames( new XMLTextListAutoStylePoolNames_Impl( 5, 5 ) ),
- nName( 0 ),
- sPrefix( RTL_CONSTASCII_USTRINGPARAM("L") )
+ nName( 0 )
{
Reference<ucb::XAnyCompareFactory> xCompareFac( rExp.GetModel(), uno::UNO_QUERY );
if( xCompareFac.is() )
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTextListBlockContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTextListBlockContext.cxx
index 29bd0f3..eaf6a64 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextListBlockContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextListBlockContext.cxx
@@ -50,20 +50,20 @@ using rtl::OUString;
TYPEINIT1( XMLTextListBlockContext, SvXMLImportContext );
XMLTextListBlockContext::XMLTextListBlockContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
XMLTextImportHelper& rTxtImp,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_Bool bOrd ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rTxtImport( rTxtImp ),
+ sNumberingRules( RTL_CONSTASCII_USTRINGPARAM( "NumberingRules" ) ),
xParentListBlock( rTxtImp.GetListBlock() ),
nLevel( 0 ),
nLevels( 0 ),
bOrdered( bOrd ),
bRestartNumbering( sal_True ),
- bSetDefaults( sal_False ),
- sNumberingRules( RTL_CONSTASCII_USTRINGPARAM( "NumberingRules" ) )
+ bSetDefaults( sal_False )
{
// Inherit style name from parent list, as well as the flags whether
// numbering must be restarted and formats have to be created.
@@ -90,11 +90,11 @@ XMLTextListBlockContext::XMLTextListBlockContext(
const OUString& rAttrName = xAttrList->getNameByIndex( i );
const OUString& rValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
- switch( rTokenMap.Get( nPrefix, aLocalName ) )
+ &aLclLocalName );
+ switch( rTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING:
bRestartNumbering = !IsXMLToken(rValue, XML_TRUE);
@@ -206,7 +206,7 @@ void XMLTextListBlockContext::EndElement()
}
SvXMLImportContext *XMLTextListBlockContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
@@ -215,19 +215,19 @@ SvXMLImportContext *XMLTextListBlockContext::CreateChildContext(
const SvXMLTokenMap& rTokenMap =
rTxtImport.GetTextListBlockElemTokenMap();
sal_Bool bHeader = sal_False;
- switch( rTokenMap.Get( nPrefix, rLocalName ) )
+ switch( rTokenMap.Get( nInPrefix, rLocalName ) )
{
case XML_TOK_TEXT_LIST_HEADER:
bHeader = sal_True;
case XML_TOK_TEXT_LIST_ITEM:
pContext = new XMLTextListItemContext( GetImport(), rTxtImport,
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
xAttrList, bHeader );
break;
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTextListItemContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTextListItemContext.cxx
index b70a33e..aee9a4f 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextListItemContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextListItemContext.cxx
@@ -47,12 +47,12 @@ using rtl::OUString;
TYPEINIT1( XMLTextListItemContext, SvXMLImportContext );
XMLTextListItemContext::XMLTextListItemContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
XMLTextImportHelper& rTxtImp, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_Bool bIsHeader ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rTxtImport( rTxtImp ),
nStartValue( -1 )
{
@@ -62,12 +62,12 @@ XMLTextListItemContext::XMLTextListItemContext(
const OUString& rAttrName = xAttrList->getNameByIndex( i );
const OUString& rValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
- if( !bIsHeader && XML_NAMESPACE_TEXT == nPrefix &&
- IsXMLToken( aLocalName, XML_START_VALUE ) )
+ &aLclLocalName );
+ if( !bIsHeader && XML_NAMESPACE_TEXT == nLclPrefix &&
+ IsXMLToken( aLclLocalName, XML_START_VALUE ) )
{
sal_Int32 nTmp = rValue.toInt32();
if( nTmp >= 0 && nTmp <= SHRT_MAX )
@@ -95,7 +95,7 @@ void XMLTextListItemContext::EndElement()
}
SvXMLImportContext *XMLTextListItemContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
@@ -104,13 +104,13 @@ SvXMLImportContext *XMLTextListItemContext::CreateChildContext(
const SvXMLTokenMap& rTokenMap = rTxtImport.GetTextElemTokenMap();
sal_Bool bOrdered = sal_False;
sal_Bool bHeading = sal_False;
- switch( rTokenMap.Get( nPrefix, rLocalName ) )
+ switch( rTokenMap.Get( nInPrefix, rLocalName ) )
{
case XML_TOK_TEXT_H:
bHeading = sal_True;
case XML_TOK_TEXT_P:
pContext = new XMLParaContext( GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
xAttrList, bHeading );
if (rTxtImport.IsProgress())
GetImport().GetProgressBarHelper()->Increment();
@@ -120,13 +120,13 @@ SvXMLImportContext *XMLTextListItemContext::CreateChildContext(
bOrdered = sal_True;
case XML_TOK_TEXT_UNORDERED_LIST:
pContext = new XMLTextListBlockContext( GetImport(), rTxtImport,
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
xAttrList, bOrdered );
break;
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx
index b38132b..3265689 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx
@@ -64,11 +64,11 @@ using rtl::OUString;
TYPEINIT1( XMLTextMarkImportContext, SvXMLImportContext);
XMLTextMarkImportContext::XMLTextMarkImportContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
XMLTextImportHelper& rHlp,
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName ) :
- SvXMLImportContext(rImport, nPrefix, rLocalName),
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName),
rHelper(rHlp)
{
}
@@ -183,13 +183,13 @@ void XMLTextMarkImportContext::StartElement(
void XMLTextMarkImportContext::CreateAndInsertMark(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
const OUString& sServiceName,
const OUString& sMarkName,
const Reference<XTextRange> & rRange)
{
// create mark
- Reference<XMultiServiceFactory> xFactory(rImport.GetModel(),UNO_QUERY);
+ Reference<XMultiServiceFactory> xFactory(rInImport.GetModel(),UNO_QUERY);
if( xFactory.is() )
{
Reference<XInterface> xIfc = xFactory->createInstance(sServiceName);
@@ -206,7 +206,7 @@ void XMLTextMarkImportContext::CreateAndInsertMark(
{
// if inserting marks, bAbsorb==sal_False will cause
// collapsing of the given XTextRange.
- rImport.GetTextImport()->GetText()->insertTextContent(rRange,
+ rInImport.GetTextImport()->GetText()->insertTextContent(rRange,
xTextContent, sal_True);
}
}
@@ -214,7 +214,7 @@ void XMLTextMarkImportContext::CreateAndInsertMark(
}
sal_Bool XMLTextMarkImportContext::FindName(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
const Reference<XAttributeList> & xAttrList,
OUString& sName)
{
@@ -225,11 +225,11 @@ sal_Bool XMLTextMarkImportContext::FindName(
for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++)
{
OUString sLocalName;
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().
+ sal_uInt16 nLclPrefix = rInImport.GetNamespaceMap().
GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
&sLocalName );
- if ( (XML_NAMESPACE_TEXT == nPrefix) &&
+ if ( (XML_NAMESPACE_TEXT == nLclPrefix) &&
IsXMLToken(sLocalName, XML_NAME) )
{
sName = xAttrList->getValueByIndex(nAttr);
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtdropi.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtdropi.cxx
index 734c747..8eeb8dd 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtdropi.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtdropi.cxx
@@ -74,13 +74,13 @@ void XMLTextDropCapImportContext::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_DROP_LINES:
if( GetImport().GetMM100UnitConverter().convertNumber( nTmp, rValue, 0, 255 ) )
@@ -123,13 +123,13 @@ void XMLTextDropCapImportContext::ProcessAttrs(
}
XMLTextDropCapImportContext::XMLTextDropCapImportContext(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
const XMLPropertyState& rProp,
sal_Int32 nWholeWordIdx,
::std::vector< XMLPropertyState > &rProps ) :
- XMLElementPropertyContext( rImport, nPrfx, rLName, rProp, rProps ),
+ XMLElementPropertyContext( rInImport, nPrfx, rLName, rProp, rProps ),
aWholeWordProp( nWholeWordIdx )
{
ProcessAttrs( xAttrList );
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx
index ba89406..09bf12b 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx
@@ -405,9 +405,9 @@ XMLTextImportHelper::XMLTextImportHelper(
pTextElemTokenMap( 0 ),
pTextPElemTokenMap( 0 ),
pTextPAttrTokenMap( 0 ),
+ pTextFieldAttrTokenMap( 0 ),
pTextListBlockAttrTokenMap( 0 ),
pTextListBlockElemTokenMap( 0 ),
- pTextFieldAttrTokenMap( 0 ),
pTextFrameAttrTokenMap( 0 ),
pTextContourAttrTokenMap( 0 ),
pTextHyperlinkAttrTokenMap( 0 ),
@@ -416,32 +416,28 @@ XMLTextImportHelper::XMLTextImportHelper(
pNextFrmNames( 0 ),
pRenameMap( 0 ),
pOutlineStyles( 0 ),
+ pFootnoteBackpatcher( NULL ),
+ pSequenceIdBackpatcher( NULL ),
+ pSequenceNameBackpatcher( NULL ),
+ xServiceFactory( rModel, UNO_QUERY ),
bInsertMode( bInsertM ),
- bBlockMode( bBlockM ),
bStylesOnlyMode( bStylesOnlyM ),
+ bBlockMode( bBlockM ),
bProgress( bPrg ),
bOrganizerMode( bOrganizerM ),
bBodyContentStarted( sal_True ),
-
- // #107848#
- // Initialize inside_deleted_section flag correctly
- bInsideDeleteContext( sal_False ),
-
- pFootnoteBackpatcher( NULL ),
- pSequenceIdBackpatcher( NULL ),
- pSequenceNameBackpatcher( NULL ),
- xServiceFactory( rModel, UNO_QUERY ),
+ bInsideDeleteContext( sal_False ), // Initialize inside_deleted_section flag correctly
sParaStyleName(RTL_CONSTASCII_USTRINGPARAM("ParaStyleName")),
sCharStyleName(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")),
sHeadingStyleName(RTL_CONSTASCII_USTRINGPARAM("HeadingStyleName")),
sNumberingLevel(RTL_CONSTASCII_USTRINGPARAM("NumberingLevel")),
sNumberingStartValue(RTL_CONSTASCII_USTRINGPARAM("NumberingStartValue")),
- sParaIsNumberingRestart(RTL_CONSTASCII_USTRINGPARAM("ParaIsNumberingRestart")),
sNumberingRules(RTL_CONSTASCII_USTRINGPARAM("NumberingRules")),
+ sParaIsNumberingRestart(RTL_CONSTASCII_USTRINGPARAM("ParaIsNumberingRestart")),
+ sNumberingIsNumber(RTL_CONSTASCII_USTRINGPARAM("NumberingIsNumber")),
+ sCurrentPresentation(RTL_CONSTASCII_USTRINGPARAM("CurrentPresentation")),
sSequenceNumber(RTL_CONSTASCII_USTRINGPARAM("SequenceNumber")),
sSourceName(RTL_CONSTASCII_USTRINGPARAM("SourceName")),
- sCurrentPresentation(RTL_CONSTASCII_USTRINGPARAM("CurrentPresentation")),
- sNumberingIsNumber(RTL_CONSTASCII_USTRINGPARAM("NumberingIsNumber")),
sChainNextName(RTL_CONSTASCII_USTRINGPARAM("ChainNextName")),
sChainPrevName(RTL_CONSTASCII_USTRINGPARAM("ChainPrevName")),
sHyperLinkURL(RTL_CONSTASCII_USTRINGPARAM("HyperLinkURL")),
@@ -770,9 +766,9 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
{
UniReference<XMLPropertySetMapper> rPropMapper =
xImpPrMap->getPropertySetMapper();
- for( sal_Int32 i=0; i < nCount; i++ )
+ for( sal_Int32 j=0; j < nCount; j++ )
{
- const XMLPropertyState& rProp = pStyle->_GetProperties()[i];
+ const XMLPropertyState& rProp = pStyle->_GetProperties()[j];
sal_Int32 nIdx = rProp.mnIndex;
sal_uInt32 nContextId = rPropMapper->GetEntryContextId(nIdx);
if( CTF_FONTFAMILYNAME == nContextId )
@@ -1584,9 +1580,9 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
}
SvXMLImportContext *XMLTextImportHelper::CreateTableChildContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix, const OUString& rLocalName,
- const Reference< XAttributeList > & xAttrList )
+ SvXMLImport& /*rImport*/,
+ sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/,
+ const Reference< XAttributeList > & /*xAttrList*/ )
{
return 0;
}
@@ -1854,11 +1850,11 @@ sal_Bool XMLTextImportHelper::IsInHeaderFooter() const
}
Reference< XPropertySet> XMLTextImportHelper::createAndInsertOLEObject(
- SvXMLImport& rImport,
- const OUString& rHRef,
- const OUString& rStyleName,
- const OUString& rTblName,
- sal_Int32 nWidth, sal_Int32 nHeight )
+ SvXMLImport& /*rImport*/,
+ const OUString& /*rHRef*/,
+ const OUString& /*rStyleName*/,
+ const OUString& /*rTblName*/,
+ sal_Int32 /*nWidth*/, sal_Int32 /*nHeight*/ )
{
Reference< XPropertySet> xPropSet;
return xPropSet;
@@ -1866,53 +1862,53 @@ Reference< XPropertySet> XMLTextImportHelper::createAndInsertOLEObject(
Reference< XPropertySet> XMLTextImportHelper::createAndInsertApplet(
- const OUString& rCode,
- const OUString& rName,
- sal_Bool bMayScript,
- const OUString& rHRef,
- sal_Int32 nWidth, sal_Int32 nHeight )
+ const OUString& /*rCode*/,
+ const OUString& /*rName*/,
+ sal_Bool /*bMayScript*/,
+ const OUString& /*rHRef*/,
+ sal_Int32 /*nWidth*/, sal_Int32 /*nHeight*/ )
{
Reference< XPropertySet> xPropSet;
return xPropSet;
}
Reference< XPropertySet> XMLTextImportHelper::createAndInsertPlugin(
- const OUString& rMimeType,
- const OUString& rHRef,
- sal_Int32 nWidth, sal_Int32 nHeight )
+ const OUString& /*rMimeType*/,
+ const OUString& /*rHRef*/,
+ sal_Int32 /*nWidth*/, sal_Int32 /*nHeight*/ )
{
Reference< XPropertySet> xPropSet;
return xPropSet;
}
Reference< XPropertySet> XMLTextImportHelper::createAndInsertFloatingFrame(
- const OUString& rName,
- const OUString& rHRef,
- const OUString& rStyleName,
- sal_Int32 nWidth, sal_Int32 nHeight )
+ const OUString& /*rName*/,
+ const OUString& /*rHRef*/,
+ const OUString& /*rStyleName*/,
+ sal_Int32 /*nWidth*/, sal_Int32 /*nHeight*/ )
{
Reference< XPropertySet> xPropSet;
return xPropSet;
}
void XMLTextImportHelper::endAppletOrPlugin(
- Reference < XPropertySet> & rPropSet,
- ::std::map < const ::rtl::OUString, ::rtl::OUString, UStringLess > &rParamMap)
+ Reference < XPropertySet> & /*rPropSet*/,
+ ::std::map < const ::rtl::OUString, ::rtl::OUString, UStringLess > & /*rParamMap*/)
{
}
// redline helper: dummy implementation to be overridden in sw/filter/xml
void XMLTextImportHelper::RedlineAdd(
- const OUString& rType,
- const OUString& rId,
- const OUString& rAuthor,
- const OUString& rComment,
- const DateTime& rDateTime,
- sal_Bool bMergeLastPara)
+ const OUString& /*rType*/,
+ const OUString& /*rId*/,
+ const OUString& /*rAuthor*/,
+ const OUString& /*rComment*/,
+ const DateTime& /*rDateTime*/,
+ sal_Bool /*bMergeLastPara*/)
{
// dummy implementation: do nothing
}
Reference<XTextCursor> XMLTextImportHelper::RedlineCreateText(
- Reference<XTextCursor> & rOldCursor,
- const OUString& rId)
+ Reference<XTextCursor> & /*rOldCursor*/,
+ const OUString& /*rId*/)
{
// dummy implementation: do nothing
Reference<XTextCursor> xRet;
@@ -1920,30 +1916,30 @@ Reference<XTextCursor> XMLTextImportHelper::RedlineCreateText(
}
void XMLTextImportHelper::RedlineSetCursor(
- const OUString& rId,
- sal_Bool bStart,
- sal_Bool bIsOutsideOfParagraph)
+ const OUString& /*rId*/,
+ sal_Bool /*bStart*/,
+ sal_Bool /*bIsOutsideOfParagraph*/)
{
// dummy implementation: do nothing
}
void XMLTextImportHelper::RedlineAdjustStartNodeCursor(
- sal_Bool bStart)
+ sal_Bool /*bStart*/)
{
// dummy implementation: do nothing
}
-void XMLTextImportHelper::SetShowChanges( sal_Bool bShowChanges )
+void XMLTextImportHelper::SetShowChanges( sal_Bool /*bShowChanges*/ )
{
// dummy implementation: do nothing
}
-void XMLTextImportHelper::SetRecordChanges( sal_Bool bRecordChanges )
+void XMLTextImportHelper::SetRecordChanges( sal_Bool /*bRecordChanges*/ )
{
// dummy implementation: do nothing
}
void XMLTextImportHelper::SetChangesProtectionKey(
- const Sequence<sal_Int8> & rProtectionKey )
+ const Sequence<sal_Int8> & /*rProtectionKey*/ )
{
// dummy implementation: do nothing
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
index bd60069..e2791ac 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx
@@ -81,16 +81,16 @@ public:
XMLHint_Impl( sal_uInt8 nTyp,
const Reference < XTextRange > & rS,
const Reference < XTextRange > & rE ) :
- nType( nTyp ),
xStart( rS ),
- xEnd( rE )
+ xEnd( rE ),
+ nType( nTyp )
{
}
XMLHint_Impl( sal_uInt8 nTyp,
const Reference < XTextRange > & rS ) :
- nType( nTyp ),
- xStart( rS )
+ xStart( rS ),
+ nType( nTyp )
{
}
@@ -292,14 +292,14 @@ public:
TYPEINFO();
XMLImpCharContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_Unicode c,
sal_Bool bCount );
XMLImpCharContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
@@ -311,13 +311,13 @@ public:
TYPEINIT1( XMLImpCharContext_Impl, SvXMLImportContext );
XMLImpCharContext_Impl::XMLImpCharContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_Unicode c,
sal_Bool bCount ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
sal_uInt16 nCount = 1;
@@ -328,12 +328,12 @@ XMLImpCharContext_Impl::XMLImpCharContext_Impl(
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
+ OUString aLclLocalName;
sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
if( XML_NAMESPACE_TEXT == nLclPrefix &&
- IsXMLToken( aLocalName, XML_C ) )
+ IsXMLToken( aLclLocalName, XML_C ) )
{
sal_Int32 nTmp = xAttrList->getValueByIndex(i).toInt32();
if( nTmp > 0L )
@@ -363,12 +363,12 @@ XMLImpCharContext_Impl::XMLImpCharContext_Impl(
}
XMLImpCharContext_Impl::XMLImpCharContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
- const Reference< xml::sax::XAttributeList > & xAttrList,
+ const Reference< xml::sax::XAttributeList > & /*xAttrList*/,
sal_Int16 nControl ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
GetImport().GetTextImport()->InsertControlCharacter( nControl );
}
@@ -387,7 +387,7 @@ public:
// Do everything in constructor. Well ...
XMLStartReferenceContext_Impl (
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nInPrefix,
const OUString& rLocalName,
XMLHints_Impl& rHnts,
@@ -397,12 +397,12 @@ public:
TYPEINIT1( XMLStartReferenceContext_Impl, SvXMLImportContext );
XMLStartReferenceContext_Impl::XMLStartReferenceContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nInPrefix,
const OUString& rLocalName,
XMLHints_Impl& rHints,
const Reference<xml::sax::XAttributeList> & xAttrList) :
- SvXMLImportContext(rImport, nInPrefix, rLocalName)
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName)
{
OUString sName;
@@ -411,10 +411,10 @@ XMLStartReferenceContext_Impl::XMLStartReferenceContext_Impl(
if (XMLTextMarkImportContext::FindName(GetImport(), xAttrList, sName))
{
XMLHint_Impl* pHint = new XMLReferenceHint_Impl(
- sName, rImport.GetTextImport()->GetCursor()->getStart() );
+ sName, rInImport.GetTextImport()->GetCursor()->getStart() );
// degenerates to point reference, if no end is found!
- pHint->SetEnd(rImport.GetTextImport()->GetCursor()->getStart() );
+ pHint->SetEnd(rInImport.GetTextImport()->GetCursor()->getStart() );
rHints.Insert(pHint, rHints.Count());
}
@@ -430,7 +430,7 @@ public:
// Do everything in constructor. Well ...
XMLEndReferenceContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nInPrefix,
const OUString& rLocalName,
XMLHints_Impl& rHnts,
@@ -440,12 +440,12 @@ public:
TYPEINIT1( XMLEndReferenceContext_Impl, SvXMLImportContext );
XMLEndReferenceContext_Impl::XMLEndReferenceContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nInPrefix,
const OUString& rLocalName,
XMLHints_Impl& rHints,
const Reference<xml::sax::XAttributeList> & xAttrList) :
- SvXMLImportContext(rImport, nInPrefix, rLocalName)
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName)
{
OUString sName;
@@ -488,7 +488,7 @@ public:
TYPEINFO();
XMLImpSpanContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
@@ -500,7 +500,7 @@ public:
virtual ~XMLImpSpanContext_Impl();
static SvXMLImportContext *CreateChildContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nToken, XMLHints_Impl& rHnts,
@@ -527,7 +527,7 @@ public:
TYPEINFO();
XMLImpHyperlinkContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
@@ -546,17 +546,17 @@ public:
TYPEINIT1( XMLImpHyperlinkContext_Impl, SvXMLImportContext );
XMLImpHyperlinkContext_Impl::XMLImpHyperlinkContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLHints_Impl& rHnts,
sal_Bool& rIgnLeadSpace ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rHints( rHnts ),
- rIgnoreLeadingSpace( rIgnLeadSpace ),
pHint( new XMLHyperlinkHint_Impl(
- GetImport().GetTextImport()->GetCursorAsRange()->getStart() ) )
+ GetImport().GetTextImport()->GetCursorAsRange()->getStart() ) ),
+ rIgnoreLeadingSpace( rIgnLeadSpace )
{
OUString sShow;
const SvXMLTokenMap& rTokenMap =
@@ -568,11 +568,11 @@ XMLImpHyperlinkContext_Impl::XMLImpHyperlinkContext_Impl(
const OUString& rAttrName = xAttrList->getNameByIndex( i );
const OUString& rValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
+ OUString aLclLocalName;
sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
- switch( rTokenMap.Get( nLclPrefix, aLocalName ) )
+ &aLclLocalName );
+ switch( rTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_TEXT_HYPERLINK_HREF:
pHint->SetHRef( GetImport().GetAbsoluteReference( rValue ) );
@@ -656,7 +656,7 @@ public:
TYPEINFO();
XMLImpRubyBaseContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
@@ -675,13 +675,13 @@ public:
TYPEINIT1( XMLImpRubyBaseContext_Impl, SvXMLImportContext );
XMLImpRubyBaseContext_Impl::XMLImpRubyBaseContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
- const Reference< xml::sax::XAttributeList > & xAttrList,
+ const Reference< xml::sax::XAttributeList > & /*xAttrList*/,
XMLHints_Impl& rHnts,
sal_Bool& rIgnLeadSpace ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rHints( rHnts ),
rIgnoreLeadingSpace( rIgnLeadSpace )
{
@@ -720,7 +720,7 @@ public:
TYPEINFO();
XMLImpRubyTextContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
@@ -734,12 +734,12 @@ public:
TYPEINIT1( XMLImpRubyTextContext_Impl, SvXMLImportContext );
XMLImpRubyTextContext_Impl::XMLImpRubyTextContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLRubyHint_Impl *pHt ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
pHint( pHt )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -748,12 +748,12 @@ XMLImpRubyTextContext_Impl::XMLImpRubyTextContext_Impl(
const OUString& rAttrName = xAttrList->getNameByIndex( i );
const OUString& rValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
+ OUString aLclLocalName;
sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
if( XML_NAMESPACE_TEXT == nLclPrefix &&
- IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ IsXMLToken( aLclLocalName, XML_STYLE_NAME ) )
{
pHint->SetTextStyleName( rValue );
break;
@@ -784,7 +784,7 @@ public:
TYPEINFO();
XMLImpRubyContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
@@ -801,17 +801,17 @@ public:
TYPEINIT1( XMLImpRubyContext_Impl, SvXMLImportContext );
XMLImpRubyContext_Impl::XMLImpRubyContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLHints_Impl& rHnts,
sal_Bool& rIgnLeadSpace ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rHints( rHnts ),
- rIgnoreLeadingSpace( rIgnLeadSpace ),
pHint( new XMLRubyHint_Impl(
- GetImport().GetTextImport()->GetCursorAsRange()->getStart() ) )
+ GetImport().GetTextImport()->GetCursorAsRange()->getStart() ) ),
+ rIgnoreLeadingSpace( rIgnLeadSpace )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
@@ -819,12 +819,12 @@ XMLImpRubyContext_Impl::XMLImpRubyContext_Impl(
const OUString& rAttrName = xAttrList->getNameByIndex( i );
const OUString& rValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
+ OUString aLclLocalName;
sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
if( XML_NAMESPACE_TEXT == nLclPrefix &&
- IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ IsXMLToken( aLclLocalName, XML_STYLE_NAME ) )
{
pHint->SetStyleName( rValue );
break;
@@ -891,7 +891,7 @@ public:
TYPEINFO();
XMLIndexMarkImportContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nInPrefix,
const OUString& rLocalName,
enum XMLTextPElemTokens nTok,
@@ -929,15 +929,15 @@ protected:
TYPEINIT1( XMLIndexMarkImportContext_Impl, SvXMLImportContext );
XMLIndexMarkImportContext_Impl::XMLIndexMarkImportContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nInPrefix,
const OUString& rLocalName,
enum XMLTextPElemTokens eTok,
XMLHints_Impl& rHnts) :
- SvXMLImportContext(rImport, nInPrefix, rLocalName),
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName),
+ sAlternativeText(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")),
rHints(rHnts),
eToken(eTok),
- sAlternativeText(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")),
sID()
{
}
@@ -1175,7 +1175,7 @@ public:
TYPEINFO();
XMLTOCMarkImportContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nInPrefix,
const OUString& rLocalName,
enum XMLTextPElemTokens nTok,
@@ -1194,9 +1194,9 @@ TYPEINIT1( XMLTOCMarkImportContext_Impl, XMLIndexMarkImportContext_Impl );
XMLTOCMarkImportContext_Impl::XMLTOCMarkImportContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nInPrefix, const OUString& rLocalName,
+ SvXMLImport& rInImport, sal_uInt16 nInPrefix, const OUString& rLocalName,
enum XMLTextPElemTokens nTok, XMLHints_Impl& rHnts) :
- XMLIndexMarkImportContext_Impl(rImport, nInPrefix, rLocalName,
+ XMLIndexMarkImportContext_Impl(rInImport, nInPrefix, rLocalName,
nTok, rHnts),
sLevel(RTL_CONSTASCII_USTRINGPARAM("Level"))
{
@@ -1242,7 +1242,7 @@ public:
TYPEINFO();
XMLUserIndexMarkImportContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nInPrefix,
const OUString& rLocalName,
enum XMLTextPElemTokens nTok,
@@ -1260,9 +1260,9 @@ protected:
TYPEINIT1( XMLUserIndexMarkImportContext_Impl, XMLIndexMarkImportContext_Impl);
XMLUserIndexMarkImportContext_Impl::XMLUserIndexMarkImportContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nInPrefix, const OUString& rLocalName,
+ SvXMLImport& rInImport, sal_uInt16 nInPrefix, const OUString& rLocalName,
enum XMLTextPElemTokens nTok, XMLHints_Impl& rHnts) :
- XMLIndexMarkImportContext_Impl(rImport, nInPrefix, rLocalName,
+ XMLIndexMarkImportContext_Impl(rInImport, nInPrefix, rLocalName,
nTok, rHnts),
sUserIndexName(RTL_CONSTASCII_USTRINGPARAM("UserIndexName")),
sLevel(RTL_CONSTASCII_USTRINGPARAM("Level"))
@@ -1324,7 +1324,7 @@ public:
TYPEINFO();
XMLAlphaIndexMarkImportContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nInPrefix,
const OUString& rLocalName,
enum XMLTextPElemTokens nTok,
@@ -1343,9 +1343,9 @@ TYPEINIT1( XMLAlphaIndexMarkImportContext_Impl,
XMLIndexMarkImportContext_Impl );
XMLAlphaIndexMarkImportContext_Impl::XMLAlphaIndexMarkImportContext_Impl(
- SvXMLImport& rImport, sal_uInt16 nInPrefix, const OUString& rLocalName,
+ SvXMLImport& rInImport, sal_uInt16 nInPrefix, const OUString& rLocalName,
enum XMLTextPElemTokens nTok, XMLHints_Impl& rHnts) :
- XMLIndexMarkImportContext_Impl(rImport, nInPrefix, rLocalName,
+ XMLIndexMarkImportContext_Impl(rInImport, nInPrefix, rLocalName,
nTok, rHnts),
sPrimaryKey(RTL_CONSTASCII_USTRINGPARAM("PrimaryKey")),
sSecondaryKey(RTL_CONSTASCII_USTRINGPARAM("SecondaryKey")),
@@ -1422,7 +1422,7 @@ void XMLAlphaIndexMarkImportContext_Impl::ProcessAttribute(
TYPEINIT1( XMLImpSpanContext_Impl, SvXMLImportContext );
XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
@@ -1430,11 +1430,11 @@ XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
sal_Bool& rIgnLeadSpace,
sal_uInt8 nSFConvFlags
) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
+ sTextFrame(RTL_CONSTASCII_USTRINGPARAM("TextFrame")),
rHints( rHnts ),
- rIgnoreLeadingSpace( rIgnLeadSpace ),
pHint( 0 ),
- sTextFrame(RTL_CONSTASCII_USTRINGPARAM("TextFrame")),
+ rIgnoreLeadingSpace( rIgnLeadSpace ),
nStarFontsConvFlags( nSFConvFlags & (CONV_FROM_STAR_BATS|CONV_FROM_STAR_MATH) )
{
OUString aStyleName;
@@ -1444,12 +1444,12 @@ XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
+ OUString aLclLocalName;
sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
if( XML_NAMESPACE_TEXT == nLclPrefix &&
- IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ IsXMLToken( aLclLocalName, XML_STYLE_NAME ) )
aStyleName = xAttrList->getValueByIndex( i );
}
@@ -1469,7 +1469,7 @@ XMLImpSpanContext_Impl::~XMLImpSpanContext_Impl()
}
SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nToken,
@@ -1482,11 +1482,10 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
sal_Bool bInsertTextFrame = sal_False;
sal_uInt16 nTextFrameType = 0;
- sal_Bool bObjectOLE = sal_False;
switch( nToken )
{
case XML_TOK_TEXT_SPAN:
- pContext = new XMLImpSpanContext_Impl( rImport, nInPrefix,
+ pContext = new XMLImpSpanContext_Impl( rInImport, nInPrefix,
rLocalName, xAttrList,
rHints,
rIgnoreLeadingSpace,
@@ -1495,21 +1494,21 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
break;
case XML_TOK_TEXT_TAB_STOP:
- pContext = new XMLImpCharContext_Impl( rImport, nInPrefix,
+ pContext = new XMLImpCharContext_Impl( rInImport, nInPrefix,
rLocalName, xAttrList,
0x0009, sal_False );
rIgnoreLeadingSpace = sal_False;
break;
case XML_TOK_TEXT_LINE_BREAK:
- pContext = new XMLImpCharContext_Impl( rImport, nInPrefix,
+ pContext = new XMLImpCharContext_Impl( rInImport, nInPrefix,
rLocalName, xAttrList,
ControlCharacter::LINE_BREAK );
rIgnoreLeadingSpace = sal_False;
break;
case XML_TOK_TEXT_S:
- pContext = new XMLImpCharContext_Impl( rImport, nInPrefix,
+ pContext = new XMLImpCharContext_Impl( rInImport, nInPrefix,
rLocalName, xAttrList,
0x0020, sal_True );
break;
@@ -1520,7 +1519,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
// text property (StarWriter), else try to insert as text
// field (StarCalc, StarDraw, ...)
Reference<beans::XPropertySet> xPropSet(
- rImport.GetTextImport()->GetCursor(),
+ rInImport.GetTextImport()->GetCursor(),
UNO_QUERY );
const OUString sHyperLinkURL(
@@ -1528,15 +1527,15 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
if (xPropSet->getPropertySetInfo()->hasPropertyByName(sHyperLinkURL))
{
- pContext = new XMLImpHyperlinkContext_Impl( rImport, nInPrefix,
+ pContext = new XMLImpHyperlinkContext_Impl( rInImport, nInPrefix,
rLocalName, xAttrList,
rHints,
rIgnoreLeadingSpace );
}
else
{
- pContext = new XMLUrlFieldImportContext( rImport,
- *rImport.GetTextImport().get(),
+ pContext = new XMLUrlFieldImportContext( rInImport,
+ *rInImport.GetTextImport().get(),
nInPrefix, rLocalName);
//whitespace handling like other fields
rIgnoreLeadingSpace = sal_False;
@@ -1546,7 +1545,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
}
case XML_TOK_TEXT_RUBY:
- pContext = new XMLImpRubyContext_Impl( rImport, nInPrefix,
+ pContext = new XMLImpRubyContext_Impl( rInImport, nInPrefix,
rLocalName, xAttrList,
rHints,
rIgnoreLeadingSpace );
@@ -1555,21 +1554,21 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
case XML_TOK_TEXT_ENDNOTE:
case XML_TOK_TEXT_FOOTNOTE:
#ifndef SVX_LIGHT
- if (rImport.GetTextImport()->IsInFrame())
+ if (rInImport.GetTextImport()->IsInFrame())
{
// we must not insert footnotes into text frames
- pContext = new SvXMLImportContext( rImport, nInPrefix,
+ pContext = new SvXMLImportContext( rInImport, nInPrefix,
rLocalName );
}
else
{
- pContext = new XMLFootnoteImportContext( rImport,
- *rImport.GetTextImport().get(),
+ pContext = new XMLFootnoteImportContext( rInImport,
+ *rInImport.GetTextImport().get(),
nInPrefix, rLocalName );
}
#else
// create default context to skip content
- pContext = new SvXMLImportContext( rImport, nInPrefix, rLocalName );
+ pContext = new SvXMLImportContext( rInImport, nInPrefix, rLocalName );
#endif // #ifndef SVX_LIGHT
rIgnoreLeadingSpace = sal_False;
break;
@@ -1578,19 +1577,19 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
case XML_TOK_TEXT_BOOKMARK:
case XML_TOK_TEXT_BOOKMARK_START:
case XML_TOK_TEXT_BOOKMARK_END:
- pContext = new XMLTextMarkImportContext( rImport,
- *rImport.GetTextImport().get(),
+ pContext = new XMLTextMarkImportContext( rInImport,
+ *rInImport.GetTextImport().get(),
nInPrefix, rLocalName );
break;
case XML_TOK_TEXT_REFERENCE_START:
- pContext = new XMLStartReferenceContext_Impl( rImport,
+ pContext = new XMLStartReferenceContext_Impl( rInImport,
nInPrefix, rLocalName,
rHints, xAttrList );
break;
case XML_TOK_TEXT_REFERENCE_END:
- pContext = new XMLEndReferenceContext_Impl( rImport,
+ pContext = new XMLEndReferenceContext_Impl( rInImport,
nInPrefix, rLocalName,
rHints, xAttrList );
break;
@@ -1629,11 +1628,11 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
case XML_TOK_DRAW_A:
{
Reference < XTextRange > xAnchorPos =
- rImport.GetTextImport()->GetCursor()->getStart();
+ rInImport.GetTextImport()->GetCursor()->getStart();
XMLTextFrameHint_Impl *pHint =
new XMLTextFrameHint_Impl( xAnchorPos );
XMLTextFrameHyperlinkContext *pLinkContext =
- new XMLTextFrameHyperlinkContext( rImport, nInPrefix,
+ new XMLTextFrameHyperlinkContext( rInImport, nInPrefix,
rLocalName, xAttrList,
TextContentAnchorType_AS_CHARACTER,
&pHint->GetTextContentRef(),
@@ -1646,21 +1645,21 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
case XML_TOK_TEXT_TOC_MARK:
case XML_TOK_TEXT_TOC_MARK_START:
pContext = new XMLTOCMarkImportContext_Impl(
- rImport, nInPrefix, rLocalName,
+ rInImport, nInPrefix, rLocalName,
(enum XMLTextPElemTokens)nToken, rHints);
break;
case XML_TOK_TEXT_USER_INDEX_MARK:
case XML_TOK_TEXT_USER_INDEX_MARK_START:
pContext = new XMLUserIndexMarkImportContext_Impl(
- rImport, nInPrefix, rLocalName,
+ rInImport, nInPrefix, rLocalName,
(enum XMLTextPElemTokens)nToken, rHints);
break;
case XML_TOK_TEXT_ALPHA_INDEX_MARK:
case XML_TOK_TEXT_ALPHA_INDEX_MARK_START:
pContext = new XMLAlphaIndexMarkImportContext_Impl(
- rImport, nInPrefix, rLocalName,
+ rInImport, nInPrefix, rLocalName,
(enum XMLTextPElemTokens)nToken, rHints);
break;
@@ -1668,7 +1667,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
case XML_TOK_TEXT_USER_INDEX_MARK_END:
case XML_TOK_TEXT_ALPHA_INDEX_MARK_END:
pContext = new XMLIndexMarkImportContext_Impl(
- rImport, nInPrefix, rLocalName, (enum XMLTextPElemTokens)nToken,
+ rInImport, nInPrefix, rLocalName, (enum XMLTextPElemTokens)nToken,
rHints);
break;
@@ -1676,7 +1675,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
case XML_TOK_TEXTP_CHANGE_END:
case XML_TOK_TEXTP_CHANGE:
pContext = new XMLChangeImportContext(
- rImport, nInPrefix, rLocalName,
+ rInImport, nInPrefix, rLocalName,
(nToken != XML_TOK_TEXTP_CHANGE_END),
(nToken != XML_TOK_TEXTP_CHANGE_START),
sal_False);
@@ -1686,23 +1685,23 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
// none of the above? then it's probably a text field!
pContext =
XMLTextFieldImportContext::CreateTextFieldImportContext(
- rImport, *rImport.GetTextImport().get(), nInPrefix, rLocalName,
+ rInImport, *rInImport.GetTextImport().get(), nInPrefix, rLocalName,
nToken);
// #108784# import draw elements (except control shapes in headers)
if( pContext == NULL &&
- !( rImport.GetTextImport()->IsInHeaderFooter() &&
+ !( rInImport.GetTextImport()->IsInHeaderFooter() &&
nInPrefix == XML_NAMESPACE_DRAW &&
IsXMLToken( rLocalName, XML_CONTROL ) ) )
{
Reference < XShapes > xShapes;
- pContext = rImport.GetShapeImport()->CreateGroupChildContext(
- rImport, nInPrefix, rLocalName, xAttrList, xShapes );
+ pContext = rInImport.GetShapeImport()->CreateGroupChildContext(
+ rInImport, nInPrefix, rLocalName, xAttrList, xShapes );
}
if( !pContext )
{
// ignore unknown content
pContext =
- new SvXMLImportContext( rImport, nInPrefix, rLocalName );
+ new SvXMLImportContext( rInImport, nInPrefix, rLocalName );
}
// Behind fields, shapes and any unknown content blanks aren't ignored
rIgnoreLeadingSpace = sal_False;
@@ -1710,12 +1709,12 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
if( bInsertTextFrame )
{
- if( XMLTextImportHelper::HasDrawNameAttribute( xAttrList, rImport.GetNamespaceMap() ) )
+ if( XMLTextImportHelper::HasDrawNameAttribute( xAttrList, rInImport.GetNamespaceMap() ) )
{
Reference < XTextRange > xAnchorPos =
- rImport.GetTextImport()->GetCursor()->getStart();
+ rInImport.GetTextImport()->GetCursor()->getStart();
XMLTextFrameContext *pTextFrameContext =
- new XMLTextFrameContext( rImport, nInPrefix,
+ new XMLTextFrameContext( rInImport, nInPrefix,
rLocalName, xAttrList,
TextContentAnchorType_AS_CHARACTER,
nTextFrameType );
@@ -1732,8 +1731,8 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
else
{
Reference < XShapes > xShapes;
- pContext = rImport.GetShapeImport()->CreateGroupChildContext(
- rImport, nInPrefix, rLocalName, xAttrList, xShapes );
+ pContext = rInImport.GetShapeImport()->CreateGroupChildContext(
+ rInImport, nInPrefix, rLocalName, xAttrList, xShapes );
}
rIgnoreLeadingSpace = sal_False;
@@ -1743,14 +1742,14 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
}
SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
const SvXMLTokenMap& rTokenMap =
GetImport().GetTextImport()->GetTextPElemTokenMap();
- sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName );
+ sal_uInt16 nToken = rTokenMap.Get( nInPrefix, rLocalName );
- return CreateChildContext( GetImport(), nPrefix, rLocalName, xAttrList,
+ return CreateChildContext( GetImport(), nInPrefix, rLocalName, xAttrList,
nToken, rHints, rIgnoreLeadingSpace,
nStarFontsConvFlags
);
@@ -1773,13 +1772,13 @@ void XMLImpSpanContext_Impl::Characters( const OUString& rChars )
TYPEINIT1( XMLParaContext, SvXMLImportContext );
XMLParaContext::XMLParaContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_Bool bHead ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
- xStart( rImport.GetTextImport()->GetCursorAsRange()->getStart() ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
+ xStart( rInImport.GetTextImport()->GetCursorAsRange()->getStart() ),
nOutlineLevel( 1 ),
pHints( 0 ),
bIgnoreLeadingSpace( sal_True ),
@@ -1797,11 +1796,11 @@ XMLParaContext::XMLParaContext(
const OUString& rAttrName = xAttrList->getNameByIndex( i );
const OUString& rValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
- switch( rTokenMap.Get( nPrefix, aLocalName ) )
+ &aLclLocalName );
+ switch( rTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_TEXT_P_STYLE_NAME:
sStyleName = rValue;
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx
index 8274ec2..d4ca2f4 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx
@@ -268,18 +268,18 @@ sal_Bool XMLDropCapPropHdl_Impl::equals(
}
sal_Bool XMLDropCapPropHdl_Impl::importXML(
- const OUString& rStrImpValue,
- Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const OUString& /*rStrImpValue*/,
+ Any& /*rValue*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
DBG_ASSERT( !this, "drop caps are an element import property" );
return sal_False;
}
sal_Bool XMLDropCapPropHdl_Impl::exportXML(
- OUString& rStrExpValue,
- const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ OUString& /*rStrExpValue*/,
+ const Any& /*rValue*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
DBG_ASSERT( !this, "drop caps are an element export property" );
return sal_False;
@@ -305,7 +305,7 @@ public:
sal_Bool XMLOpaquePropHdl_Impl::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_True;
sal_Bool bVal = sal_False;
@@ -323,7 +323,7 @@ sal_Bool XMLOpaquePropHdl_Impl::importXML(
sal_Bool XMLOpaquePropHdl_Impl::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
if( *(sal_Bool *)rValue.getValue() )
rStrExpValue = GetXMLToken( XML_FOREGROUND );
@@ -357,7 +357,7 @@ public:
sal_Bool XMLContourModePropHdl_Impl::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_True;
sal_Bool bVal = sal_False;
@@ -375,7 +375,7 @@ sal_Bool XMLContourModePropHdl_Impl::importXML(
sal_Bool XMLContourModePropHdl_Impl::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
if( *(sal_Bool *)rValue.getValue() )
rStrExpValue = GetXMLToken( XML_OUTSIDE );
@@ -430,7 +430,7 @@ sal_Bool XMLParagraphOnlyPropHdl_Impl::importXML(
sal_Bool XMLParagraphOnlyPropHdl_Impl::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
if( *(sal_Bool *)rValue.getValue() )
rStrExpValue = GetXMLToken( XML_1 );
@@ -531,7 +531,7 @@ public:
sal_Bool XMLFrameProtectPropHdl_Impl::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_True;
sal_Bool bVal = sal_False;
@@ -560,7 +560,7 @@ sal_Bool XMLFrameProtectPropHdl_Impl::importXML(
sal_Bool XMLFrameProtectPropHdl_Impl::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
if( *(sal_Bool *)rValue.getValue() )
{
@@ -697,18 +697,18 @@ sal_Bool XMLTextColumnsPropertyHandler::equals(
}
sal_Bool XMLTextColumnsPropertyHandler::importXML(
- const OUString& rStrImpValue,
- Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const OUString& /*rStrImpValue*/,
+ Any& /*rValue*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
DBG_ASSERT( !this, "columns are an element import property" );
return sal_False;
}
sal_Bool XMLTextColumnsPropertyHandler::exportXML(
- OUString& rStrExpValue,
- const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ OUString& /*rStrExpValue*/,
+ const Any& /*rValue*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
DBG_ASSERT( !this, "columns are an element export property" );
return sal_False;
@@ -750,9 +750,9 @@ sal_Bool XMLHoriMirrorPropHdl_Impl::importXML(
}
sal_Bool XMLHoriMirrorPropHdl_Impl::exportXML(
- OUString& rStrExpValue,
- const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ OUString& /*rStrExpValue*/,
+ const Any& /*rValue*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
DBG_ASSERT( !this, "HorMirror properyt shouldn't be exported" );
@@ -789,7 +789,7 @@ public:
sal_Bool XMLGrfMirrorPropHdl_Impl::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_True;
sal_Bool bVal = sal_False;
@@ -819,7 +819,7 @@ sal_Bool XMLGrfMirrorPropHdl_Impl::importXML(
sal_Bool XMLGrfMirrorPropHdl_Impl::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
if( *(sal_Bool *)rValue.getValue() )
{
@@ -990,7 +990,7 @@ public:
sal_Bool XMLTextCombineCharPropHdl_Impl::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
if( rStrImpValue.getLength() )
rValue <<= rStrImpValue.copy( 0, 1 );
@@ -1003,7 +1003,7 @@ sal_Bool XMLTextCombineCharPropHdl_Impl::importXML(
sal_Bool XMLTextCombineCharPropHdl_Impl::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
rValue >>= rStrExpValue;
@@ -1093,7 +1093,7 @@ public:
sal_Bool XMLTextSyncWidthHeightPropHdl_Impl::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bValue = (rStrImpValue == sValue );
rValue.setValue( &bValue, ::getBooleanCppuType() );
@@ -1104,7 +1104,7 @@ sal_Bool XMLTextSyncWidthHeightPropHdl_Impl::importXML(
sal_Bool XMLTextSyncWidthHeightPropHdl_Impl::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
if( *(sal_Bool *)rValue.getValue() )
More information about the Libreoffice-commits
mailing list